Merge branch 'master' into findnreplace

code/modules/surgery/organs/parasites.dm

@@ -28,7 +28,7 @@
 				owner.emote("scream")
 				var/spiders = rand(3,5)
 				for(var/i in 1 to spiders)
-					new/obj/effect/spider/spiderling(get_turf(owner))
+					new/obj/structure/spider/spiderling(get_turf(owner))
 				owner.visible_message("<span class='danger'>[owner] bursts open! Holy fuck!</span>")
 				owner.gib()
 
@@ -60,8 +60,8 @@
 		// the spider eggs secrete stimulants to keep their host alive until they hatch
 	switch(current_cycle)
 		if(1) // immediately
-			to_chat(owner,"<span class='danger'>Your spider bite wound hurts horribly! </span>")
-			if(istype(get_area(owner), /area/awaycontent) || istype(get_area(owner), /area/awaymission))
+			to_chat(owner,"<span class='danger'>Your wound hurts horribly! </span>")
+			if(is_away_level(owner.z))
 				awaymission_infection = 1
 		if(15) // 30s... enough time for the nerve agent to kick in, the pain to be blocked, and healing to begin
 			to_chat(owner,"<span class='notice'>The pain has faded, and stopped bleeding, though the skin around it has turned black.</span>")
@@ -76,7 +76,7 @@
 		if(110) // 3m40s...
 			to_chat(owner,"<span class='danger'>The black flesh splits open completely, revealing a cluster of small black oval shapes inside you, shapes that seem to be moving!</span>")
 		if(120) // 4m...
-			if(awaymission_infection && is_away_level(owner.z))
+			if(awaymission_infection && !is_away_level(owner.z))
 				// we started in the awaymission, we ended on the station.
 				// To prevent someone bringing an infection back, we're going to trigger an alternate, equally-bad result here.
 				// Actually, let's make it slightly worse... just to discourage people from bringing back infections.
@@ -86,17 +86,17 @@
 			owner.Stun(20)
 			owner.Weaken(20)
 			// yes, this is a long stun - that's intentional. Gotta give the spiderlings time to escape.
-			var/obj/effect/spider/spiderling/terror_spiderling/S1 = new(get_turf(owner))
+			var/obj/structure/spider/spiderling/terror_spiderling/S1 = new(get_turf(owner))
 			S1.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/red
 			S1.name = "red spiderling"
 			if(prob(50))
 				S1.stillborn = 1
-			var/obj/effect/spider/spiderling/terror_spiderling/S2 = new(get_turf(owner))
+			var/obj/structure/spider/spiderling/terror_spiderling/S2 = new(get_turf(owner))
 			S2.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/gray
 			S2.name = "gray spiderling"
 			if(prob(50))
 				S2.stillborn = 1
-			var/obj/effect/spider/spiderling/terror_spiderling/S3 = new(get_turf(owner))
+			var/obj/structure/spider/spiderling/terror_spiderling/S3 = new(get_turf(owner))
 			S3.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/green
 			S3.name = "green spiderling"
 			if(prob(50))
@@ -108,7 +108,7 @@
 				owner.gib()
 			else
 				owner.adjustToxLoss(rand(100,180)) // normal case, range: 100-180, average 140, almost crit (150).
-		if(190) // 6m 30s
+		if(130) // 4m 20s
 			to_chat(owner,"<span class='danger'>The spiderlings are gone. Your wound, though, looks worse than ever. Remnants of tiny spider eggs, and dead spiders, inside your flesh. Disgusting.</span>")
 			qdel(src)
 

code/modules/surgery/organs/robolimbs.dm

@@ -119,4 +119,23 @@ var/global/datum/robolimb/basic_robolimb
 	company = "Zeng-Hu Pharmaceuticals"
 	desc = "This limb has a rubbery fleshtone covering with visible seams."
 	icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi'
-	has_subtypes = 2
+	has_subtypes = 2
+
+/datum/robolimb/shellguard
+	company = "Shellguard Munitions Standard Series"
+	desc = "This limb features exposed robust steel and paint to match Shellguards motifs"
+	icon = 'icons/mob/human_races/cyberlimbs/shellguard/shellguard_main.dmi'
+	has_subtypes = 1
+
+/datum/robolimb/shellguard/alt1
+	company = "Shellguard Munitions Elite Series"
+	icon = 'icons/mob/human_races/cyberlimbs/shellguard/shellguard_alt1.dmi'
+	parts = list("head")
+	has_subtypes = null
+
+/datum/robolimb/shellguard/monitor
+	company = "Shellguard Munitions Monitor Series"
+	icon = 'icons/mob/human_races/cyberlimbs/shellguard/shellguard_monitor.dmi'
+	parts = list("head")
+	is_monitor = 1
+	has_subtypes = null