shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BM requests.

Browse Source
This commit is contained in:
Fermi
2019-07-09 02:44:17 +01:00
parent e7224991b7
commit 1b3de620f9
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/datums/status_effects/chems.dm
+1
View File
@@ -548,6 +548,7 @@
//Remove all stuff
/datum/status_effect/chem/enthrall/on_remove()
var/mob/living/carbon/M = owner
M.mind.remove_antag_datum(/datum/antagonist/brainwashed)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "enthrall")
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "enthrallpraise")
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "enthrallscold")
modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
+5 -2
View File
@@ -102,12 +102,15 @@
M.Jitter(200)
M.Knockdown(200)
M.Stun(80)
var/items = M.get_contents()
if(!LAZYLEN(items))
return ..()
var/obj/item/I = pick(items)
M.dropItemToGround(I, TRUE)
if(istype(I, /obj/item/implant))
qdel(I)
to_chat(M, "<span class='userdanger'>You feel your implant rip itself out of you, sent flying off to another dimention!</span>")
else
M.dropItemToGround(I, TRUE)
do_sparks(5,FALSE,I)
do_teleport(I, get_turf(I), 5, no_effects=TRUE);
do_sparks(5,FALSE,I)