Merge pull request #7489 from Citadel-Station-13/nanites

Nanites port
2018-09-03 13:47:28 -04:00
parent 5425f02612 4446251a6d
commit c8a3f56af6
109 changed files with 5816 additions and 3795 deletions
@@ -19,6 +19,7 @@
 	else if(iscarbon(target))
 		var/mob/living/carbon/C = target
 		SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "tased", /datum/mood_event/tased)
+		SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK)
 		if(C.dna && C.dna.check_mutation(HULK))
 			C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		else if((C.status_flags & CANKNOCKDOWN) && !C.has_trait(TRAIT_STUNIMMUNE))