mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 06:40:08 +01:00
[MIRROR] Multi Bugfix (#12824)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
0bfbc28d10
commit
3eabaa37be
@@ -126,6 +126,9 @@
|
||||
s.set_up(5, 1, src)
|
||||
s.start()
|
||||
shield_active = 0
|
||||
if(isliving(loc))
|
||||
var/mob/living/our_user = loc
|
||||
our_user.remove_modifiers_of_type(/datum/modifier/shield_projection)
|
||||
if(bcell.charge_delay) //It WILL blow up soon. Downside of self-charging cells.
|
||||
to_chat(src.loc, span_critical("Your shield generator sparks and suddenly goes down! A warning message pops up on screen: \
|
||||
'WARNING, INTERNAL CELL MELTDOWN IMMINENT. TIME TILL EXPLOSION: [bcell.charge_delay/10] SECONDS. DISCARD UNIT IMMEDIATELY!'"))
|
||||
|
||||
@@ -72,6 +72,10 @@ GLOBAL_DATUM(sleevemate_mob, /mob/living/carbon/human/dummy/mannequin)
|
||||
M.ooc_notes_maybes = ooc_notes_maybes
|
||||
M.ooc_notes_style = ooc_notes_style
|
||||
M.soulcatcher_pref_flags = soulcatcher_pref_flags
|
||||
if(ishuman(M)) //Has to be done here since making someone a changeling requires an active mind.
|
||||
var/mob/living/carbon/human/ling_test = M
|
||||
if(ling_test.changeling_locked)
|
||||
M.make_changeling()
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_RESLEEVED_MIND, M, stored_mind)
|
||||
clear_mind()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user