Merge remote-tracking branch 'upstream/master' into loadout-json

modular_citadel/code/modules/admin/holder2.dm

@@ -10,4 +10,4 @@
 	if(owner)
 		owner.remove_mentor_verbs()
 		owner.mentor_datum = null
-	..()
+	..()

modular_citadel/code/modules/admin/secrets.dm

@@ -5,4 +5,4 @@
 
 	if(!GLOB.mentorlog.len)
 		dat += "No mentors have done anything this round!"
-	usr << browse(dat, "window=mentor_log")
+	usr << browse(dat, "window=mentor_log")

modular_citadel/code/modules/clothing/suits/suits.dm

@@ -11,7 +11,7 @@
 	mob_overlay_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
 	icon_state = "hostrench"
 	item_state = "hostrench"
-	mutantrace_variation = NONE
+	mutantrace_variation = STYLE_DIGITIGRADE
 	body_parts_covered = CHEST|ARMS|LEGS
 
 /obj/item/clothing/suit/hooded/cloak/david
@@ -20,7 +20,7 @@
 	desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids"
 	hoodtype = /obj/item/clothing/head/hooded/cloakhood/david
 	body_parts_covered = CHEST|GROIN|ARMS
-	mutantrace_variation = NONE
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 /obj/item/clothing/head/hooded/cloakhood/david
 	name = "red cloak hood"

modular_citadel/code/modules/mob/living/carbon/reindex_screams.dm

@@ -42,4 +42,4 @@
 
 /mob/living/proc/clear_screams()
 	LAZYINITLIST(alternate_screams)
-	LAZYCLEARLIST(alternate_screams)
+	LAZYCLEARLIST(alternate_screams)

modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm

@@ -1,3 +1,3 @@
 /obj/item/ammo_box/magazine/wt550m9/wttx
 	name = "wt550 magazine (Toxin Tipped 4.6x30mm)"
-	ammo_type = /obj/item/ammo_casing/c46x30mm/tx
+	ammo_type = /obj/item/ammo_casing/c46x30mm/tx

modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm

@@ -1,4 +1,4 @@
 /obj/item/projectile/bullet/c46x30mm_tx
 	name = "toxin tipped 4.6x30mm bullet"
 	damage = 10
-	damage_type = TOX
+	damage_type = TOX

modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm

@@ -64,4 +64,4 @@
 	icon_state = "spinfusorbox"
 	ammo_type = /obj/item/ammo_casing/caseless/spinfusor
 	w_class = WEIGHT_CLASS_NORMAL
-	max_ammo = 4
+	max_ammo = 4

modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm

@@ -210,6 +210,8 @@
 	var/datum/component/nanites/N = C.GetComponent(/datum/component/nanites)
 	if(isnull(N))
 		return ..()
+	if(HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM))
+		C.adjustToxLoss(1, toxins_type = TOX_SYSCORRUPT) //Interferes with robots. Rare chem, so, pretty good at that too.
 	N.nanite_volume += -cached_purity*5//0.5 seems to be the default to me, so it'll neuter them.
 	..()