Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10

Polaris Sync 2018 01 10

code/__defines/species_languages.dm

@@ -9,6 +9,7 @@
 #define NO_HALLUCINATION  0x80	 // Don't hallucinate, ever
 #define NO_BLOOD		  0x100  // Never bleed, never show blood amount
 #define UNDEAD			  0x200	 // Various things that living things don't do, mostly for skeletons
+#define NO_INFECT		  0x400  // Don't allow infections in limbs or organs, similar to IS_PLANT, without other strings.
 // unused: 0x8000 - higher than this will overflow
 
 // Species spawn flags

code/game/antagonist/station/infiltrator.dm

@@ -1,4 +1,4 @@
-// Infiltrator is a varient of Traitor, except that the traitors are in a team and can communicate with a special headset.
+// Infiltrator is a variant of Traitor, except that the traitors are in a team and can communicate with a special headset.
 
 var/datum/antagonist/traitor/infiltrator/infiltrators
 

code/game/gamemodes/technomancer/devices/hypos.dm

@@ -86,7 +86,7 @@
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity
 	name = "purity hypo"
-	desc = "A refined version of the standard autoinjector, allowing greater capacity.  This varient excels at \
+	desc = "A refined version of the standard autoinjector, allowing greater capacity.  This variant excels at \
 	resolving viruses, infections, radiation, and genetic maladies."
 	filled_reagents = list("spaceacillin" = 9, "arithrazine" = 5, "ryetalyn" = 1)
 
@@ -97,7 +97,7 @@
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ
 	name = "organ hypo"
-	desc = "A refined version of the standard autoinjector, allowing greater capacity.  Organ damage is resolved by this varient."
+	desc = "A refined version of the standard autoinjector, allowing greater capacity.  Organ damage is resolved by this variant."
 	filled_reagents = list("alkysine" = 1, "imidazoline" = 1, "peridaxon" = 13)
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat

code/game/machinery/atmoalter/area_atmos_computer.dm

@@ -16,8 +16,10 @@
 
 /obj/machinery/computer/area_atmos/New()
 	..()
-	//So the scrubbers have time to spawn
 	desc += "[range] meters."
+
+/obj/machinery/computer/area_atmos/initialize()
+	. = ..()
 	scanscrubbers()
 
 /obj/machinery/computer/area_atmos/attack_ai(var/mob/user as mob)

code/game/machinery/cryo.dm

@@ -30,16 +30,9 @@
 	var/turf/T = src.loc
 	T.contents += contents
 	if(beaker)
-		beaker.loc = get_step(src.loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube
+		beaker.forceMove(get_step(loc, SOUTH)) //Beaker is carefully ejected from the wreckage of the cryotube
-	..()
+		beaker = null
-
+	. = ..()
-/obj/machinery/atmospherics/unary/cryo_cell/initialize()
-	if(node) return
-	var/node_connect = dir
-	for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
-		if(target.initialize_directions & get_dir(target,src))
-			node = target
-			break
 
 /obj/machinery/atmospherics/unary/cryo_cell/process()
 	..()

code/game/machinery/portable_turret.dm

@@ -81,7 +81,7 @@
 
 /obj/machinery/porta_turret/ai_defense
 	name = "defense turret"
-	desc = "This varient appears to be much more durable."
+	desc = "This variant appears to be much more durable."
 	installation = /obj/item/weapon/gun/energy/xray // For the armor pen.
 	health = 250 // Since lasers do 40 each.
 	maxhealth = 250

code/game/objects/structures/loot_piles.dm

@@ -6,7 +6,7 @@ If that roll fails, they do one final roll, using chance_uncommon.  If they succ
 If that fails again, they walk away with some common junk.
 
 The same player cannot roll again, however other players can.  This has two benefits.  The first benefit is that someone raiding all of
-maintenance will not deprive other people from a shot at loot, and that for the surface varients, it quietly encourages bringing along
+maintenance will not deprive other people from a shot at loot, and that for the surface variants, it quietly encourages bringing along
 buddies, to get more chances at getting cool things instead of someone going solo to hoard all the stuff.
 
 Loot piles can be depleted, if loot_depleted is turned on.  Note that players who searched the pile already won't deplete the loot furthers when searching again.

code/modules/examine/descriptions/machines.dm

@@ -4,6 +4,6 @@
 	description_antag = "Turrets can be emagged to target anyone and everyone, on lethals, and cannot be turned off if emagged."
 
 /obj/machinery/porta_turret/ai_defense
-	description_info = "This is a varient of the normal turret, utilizing an internal energy weapon.  This version can fire stun \
+	description_info = "This is a variant of the normal turret, utilizing an internal energy weapon.  This version can fire stun \
 	beams, or an xray laser, which is much harder for solid objects to stop than normal laser light, and can be configured remotely \
-	with a turret control switch.  This varient is also much more durable, and is hardened against electromagnetic pulses."
+	with a turret control switch.  This variant is also much more durable, and is hardened against electromagnetic pulses."

code/modules/mob/living/carbon/human/species/station/prometheans.dm

@@ -20,7 +20,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 	bump_flag =        SLIME
 	swap_flags =       MONKEY|SLIME|SIMPLE_ANIMAL
 	push_flags =       MONKEY|SLIME|SIMPLE_ANIMAL
-	flags =            NO_SCAN | NO_SLIP | NO_MINOR_CUT | NO_HALLUCINATION
+	flags =            NO_SCAN | NO_SLIP | NO_MINOR_CUT | NO_HALLUCINATION | NO_INFECT
 	appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | RADIATION_GLOWS | HAS_UNDERWEAR
 	spawn_flags		 = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
 	health_hud_intensity = 2

code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm

@@ -23,7 +23,7 @@
 	cold_level_2 = -1
 	cold_level_3 = -1
 
-	flags =  NO_SCAN | NO_PAIN | NO_SLIP | NO_POISON | NO_MINOR_CUT
+	flags =  NO_SCAN | NO_PAIN | NO_SLIP | NO_POISON | NO_MINOR_CUT | NO_INFECT
 	spawn_flags = SPECIES_IS_RESTRICTED
 
 	reagent_tag = IS_XENOS

code/modules/multiz/pipes.dm

@@ -26,8 +26,11 @@ obj/machinery/atmospherics/pipe/zpipe
 
 		level = 1
 
-obj/machinery/atmospherics/pipe/zpipe/New()
+/obj/machinery/atmospherics/pipe/zpipe/New()
 	..()
+	init_dir()
+
+/obj/machinery/atmospherics/pipe/zpipe/init_dir()
 	switch(dir)
 		if(SOUTH)
 			initialize_directions = SOUTH
@@ -122,7 +125,7 @@ obj/machinery/atmospherics/pipe/zpipe/up
 		name = "upwards pipe"
 		desc = "A pipe segment to connect upwards."
 
-obj/machinery/atmospherics/pipe/zpipe/up/initialize()
+obj/machinery/atmospherics/pipe/zpipe/up/atmos_init()
 	normalize_dir()
 	var/node1_dir
 
@@ -160,7 +163,7 @@ obj/machinery/atmospherics/pipe/zpipe/down
 		name = "downwards pipe"
 		desc = "A pipe segment to connect downwards."
 
-obj/machinery/atmospherics/pipe/zpipe/down/initialize()
+obj/machinery/atmospherics/pipe/zpipe/down/atmos_init()
 	normalize_dir()
 	var/node1_dir
 

code/modules/organs/organ.dm

@@ -108,7 +108,7 @@ var/list/organ_cache = list()
 	if(preserved)
 		return
 	//Process infections
-	if ((robotic >= ORGAN_ROBOT) || (owner && owner.species && (owner.species.flags & IS_PLANT)))
+	if(robotic >= ORGAN_ROBOT || (owner && owner.species && (owner.species.flags & IS_PLANT || (owner.species.flags & NO_INFECT))))
 		germ_level = 0
 		return
 

code/modules/organs/organ_external.dm

@@ -605,7 +605,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 */
 /obj/item/organ/external/proc/update_germs()
 
-	if(robotic >= ORGAN_ROBOT || (owner.species && owner.species.flags & IS_PLANT)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
+	if(robotic >= ORGAN_ROBOT || (owner.species && (owner.species.flags & IS_PLANT || (owner.species.flags & NO_INFECT)))) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
 		germ_level = 0
 		return
 

code/modules/projectiles/guns/energy/laser.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/energy/laser
 	name = "laser rifle"
-	desc = "A Hephaestus Industries G40E rifle, designed to kill with concentrated energy blasts.  This varient has the ability to \
+	desc = "A Hephaestus Industries G40E rifle, designed to kill with concentrated energy blasts.  This variant has the ability to \
 	switch between standard fire and a more efficent but weaker 'suppressive' fire."
 	icon_state = "laser"
 	item_state = "laser"

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm

@@ -134,7 +134,7 @@
 /datum/reagent/toxin/mold
 	name = "Mold"
 	id = "mold"
-	description = "A mold is a fungus that causes biodegradation of natural materials. This varient contains mycotoxins, and is dangerous to humans."
+	description = "A mold is a fungus that causes biodegradation of natural materials. This variant contains mycotoxins, and is dangerous to humans."
 	taste_description = "mold"
 	reagent_state = SOLID
 	strength = 5