Merge branch 'master' of https://github.com/wonderinghost/Yogstation

Author: wonderinghost

_maps/RandomRuins/LavaRuins/lavaland_surface_meteorite.dmm

@@ -50,7 +50,7 @@
 /obj/structure/stone_tile/burnt{
 	dir = 8
 	},
-/obj/item/clothing/under/ash_robe/tunic,
+/obj/item/clothing/under/tribal/ash_robe/tunic,
 /mob/living/simple_animal/hostile/skeleton/plasmaminer/jackhammer{
 	desc = "A plasma-soaked miner, this one still seems to hold their mining tool in their hand, gripping tightly. Seemed to have been quite the crafty miner in their past life.";
 	faction = list("mining");
@@ -483,7 +483,7 @@
 	pixel_x = -1;
 	pixel_y = -2
 	},
-/obj/item/clothing/under/ash_robe/chief,
+/obj/item/clothing/under/tribal/ash_robe/chief,
 /obj/item/clothing/suit/armor/bone/heavy,
 /obj/item/clothing/suit/armor/tribalcoat,
 /turf/open/floor/plasteel/lavaland,
@@ -1036,7 +1036,7 @@
 	pixel_x = -5;
 	pixel_y = -5
 	},
-/obj/item/clothing/under/ash_robe/hunter,
+/obj/item/clothing/under/tribal/ash_robe/hunter,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "sQ" = (
@@ -1847,7 +1847,7 @@
 /obj/effect/turf_decal/sand,
 /obj/structure/closet/cabinet,
 /obj/item/clothing/suit/armor/pathfinder,
-/obj/item/clothing/under/rank/miner/lavaland,
+/obj/item/clothing/under/rank/cargo/miner/lavaland,
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/item/clothing/under/plasmaman/mining,
@@ -1881,7 +1881,7 @@
 /obj/item/scalpel/bone{
 	pixel_y = 16
 	},
-/obj/item/clothing/under/ash_robe/shaman,
+/obj/item/clothing/under/tribal/ash_robe/shaman,
 /obj/item/oar{
 	pixel_y = -1
 	},
@@ -2019,7 +2019,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2244,7 +2244,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 8
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2349,7 +2349,7 @@
 /obj/structure/stone_tile/block/cracked{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 10
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2662,7 +2662,7 @@
 /obj/item/cautery/bone{
 	pixel_x = -4
 	},
-/obj/item/clothing/under/ash_robe/young,
+/obj/item/clothing/under/tribal/ash_robe/young,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "Wc" = (

code/__DEFINES/inventory.dm

@@ -119,7 +119,7 @@
 
 //flags for covering body parts
 #define GLASSESCOVERSEYES	(1<<0)
-#define MASKCOVERSEYES		(1<<1)		// get rid of some of the other retardation in these flags
+#define MASKCOVERSEYES		(1<<1)		// get rid of some of the other ridiculousness in these flags
 #define HEADCOVERSEYES		(1<<2)		// feel free to realloc these numbers for other purposes
 #define MASKCOVERSMOUTH		(1<<3)		// on other items, these are just for mask/head
 #define HEADCOVERSMOUTH		(1<<4)

code/__HELPERS/game.dm

@@ -231,7 +231,7 @@
 
 	return
 
-// Better recursive loop, technically sort of not actually recursive cause that shit is retarded, enjoy.
+// Better recursive loop, technically sort of not actually recursive cause that shit is stupid, enjoy.
 //No need for a recursive limit either
 /proc/recursive_mob_check(atom/O,client_check=1,sight_check=1,include_radio=1)
 

code/datums/mutations/speech.dm

@@ -73,7 +73,7 @@
 		message = " [message] "
 		//Time for a friendly game of SS13
 		message = replacetext(message," stupid "," smart ")
-		message = replacetext(message," retard "," genius ")
+		message = replacetext(message," idiot "," genius ")
 		message = replacetext(message," unrobust "," robust ")
 		message = replacetext(message," dumb "," smart ")
 		message = replacetext(message," awful "," great ")

code/game/gamemodes/objective.dm

@@ -1573,7 +1573,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 
 /datum/objective/break_machinery/finalize()
 	target_areas = list()
-	var/station_z = SSmapping.levels_by_trait(ZTRAIT_STATION)[1]
+	var/list/station_zs = SSmapping.levels_by_trait(ZTRAIT_STATION)
 	if(!target_obj_type) // Select our target machine if there is none pre-set
 		potential_target_types = list(
 			// SCIENCE
@@ -1597,7 +1597,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 		var/iteration = 1
 		while(!target_obj_type && targets_len >= iteration)
 			for(var/obj/machinery/machine as anything in GLOB.machines)
-				if(machine.z == station_z && istype(machine, potential_target_types[iteration]))
+				if((machine.z in station_zs) && istype(machine, potential_target_types[iteration]) && (get_area(machine) in GLOB.the_station_areas))
 					target_obj_type = potential_target_types[iteration]
 					break
 			iteration++
@@ -1612,12 +1612,10 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	for(var/obj/machinery/machine as anything in GLOB.machines)
 		if(!istype(machine, target_obj_type))
 			continue
-		if(machine.z != station_z)
+		if(!(machine.z in station_zs))
 			continue
-		if(!istype(get_area(machine), /area))
+		if(!(get_area(machine) in GLOB.the_station_areas))
 			continue
-		if(istype(get_area(machine), /area/shuttle))
-			continue //no whiteship machines
 		eligible_machines |= machine
 
 	eligible_machines = shuffle(eligible_machines)

code/game/machinery/cryopod.dm

@@ -292,7 +292,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
 			if((O.type in subtypesof(/datum/objective/assassinate)) && O.check_completion()) //kill once/kill+clone objective that's already been completed, don't give a new objective
 				continue
 			O.target = null
-			O.find_target()
+			O.find_target(blacklist = list(mob_occupant.mind)) // don't pick the same person again, they're about to be deleted
 			O.update_explanation_text()
 
 			var/list/owners = O.get_owners()

code/game/machinery/doors/checkForMultipleDoors.dm

@@ -12,5 +12,5 @@
 	for(var/obj/machinery/door/D in locate(src.x,src.y,src.z))
 		if(!istype(D, /obj/machinery/door/window) && D.density)
 			return 0
-	//There are no false wall checks because that would be fucking retarded
-	return 1
+	//There are no false wall checks because that would be fucking stupid
+	return 1

code/game/objects/effects/countdown.dm

@@ -51,7 +51,7 @@
 	displayed_text = new_val
 
 	if(displayed_text)
-		maptext = "<font size = [text_size]>[displayed_text]</font>"
+		maptext = MAPTEXT("<font size = [text_size]>[displayed_text]</font>")
 	else
 		maptext = null
 

code/game/objects/structures/flora.dm

@@ -375,7 +375,7 @@
 	icon_state = "basalt"
 	desc = "A volcanic rock. Pioneers used to ride these babies for miles."
 	icon = 'icons/obj/flora/rocks.dmi'
-	resistance_flags = parent_type::resistance_flags | FIRE_PROOF
+	resistance_flags = FLAMMABLE | UNACIDABLE | FIRE_PROOF
 	density = TRUE
 	var/obj/item/stack/mineResult = /obj/item/stack/ore/glass/basalt
 

code/game/objects/structures/signs/signs_plaques.dm

@@ -23,7 +23,7 @@
 
 /obj/structure/sign/plaques/kiddie
 	name = "\improper AI developers plaque"
-	desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"."
+	desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. \"The first child to be sent through a cable\" What? Beneath the image, someone has scratched the word \"PACKETS\"."
 	icon_state = "kiddieplaque"