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

Merge pull request #6641 from Citadel-Station-13/upstream-merge-37447

Browse Source 
[MIRROR] Fixes mousetraps not going off from being dumped out
This commit is contained in:
LetterJay
2018-05-05 09:38:11 -05:00
committed by GitHub
parent 889716fbd6 5f339b73e7
commit 4dd07fe4e7
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/components/storage/storage.dm
View File

@@ -232,13 +232,15 @@
stoplag(1)
qdel(progress)
/datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress)
/datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress, trigger_on_found = TRUE)
var/atom/real_location = real_location()
for(var/obj/item/I in things)
things -= I
if(I.loc != real_location)
continue
remove_from_storage(I, target)
if(trigger_on_found && I.on_found())
return FALSE
if(TICK_CHECK)
progress.update(progress.goal - length(things))
return TRUE

19
code/modules/assembly/mousetrap.dm
View File

@@ -46,10 +46,10 @@
var/mob/living/carbon/human/H = target
if(H.has_trait(TRAIT_PIERCEIMMUNE))
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
armed = 0
armed = FALSE
update_icon()
pulse(0)
return 0
return FALSE
switch(type)
if("feet")
if(!H.shoes)
@@ -67,7 +67,7 @@
visible_message("<span class='boldannounce'>SPLAT!</span>")
M.splat()
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
armed = 0
armed = FALSE
update_icon()
pulse(0)
@@ -124,11 +124,16 @@
/obj/item/assembly/mousetrap/on_found(mob/finder)
if(armed)
finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking their fingers.</span>", \
if(finder)
finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking their fingers.</span>", \
"<span class='warning'>You accidentally trigger [src]!</span>")
triggered(finder, (finder.active_hand_index % 2 == 0) ? BODY_ZONE_PRECISE_R_HAND : BODY_ZONE_PRECISE_L_HAND)
return 1 //end the search!
return 0
triggered(finder, (finder.active_hand_index % 2 == 0) ? BODY_ZONE_PRECISE_R_HAND : BODY_ZONE_PRECISE_L_HAND)
return TRUE //end the search!
else
visible_message("<span class='warning'>[src] snaps shut!</span>")
triggered(loc)
return FALSE
return FALSE
/obj/item/assembly/mousetrap/hitby(A as mob|obj)