cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring and fixing bugs in animal traps (#6860)

Browse Source 
refactor: "Traps have been refectored code-wise to work like chairs/beds. Hence eliminating craptons of bugs." Fixes #6667
    spellcheck: "Fixed spelling in messages from traps."
This commit is contained in:
Mykhailo Bykhovtsev
2019-08-19 22:49:22 +03:00
committed by Erki
parent 7ecc8c7ce0
commit c3382c9c14
3 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
-3
View File
@@ -660,9 +660,6 @@ default behaviour is:
if( src.loc && istype(src.loc, /obj/structure/closet) )
var/obj/structure/closet/C = loc
spawn() C.mob_breakout(src)
else if(src.loc && istype(src.loc, /obj/item/weapon/trap/animal))
var/obj/item/weapon/trap/animal/A = loc
spawn() A.mob_breakout(src)
/mob/living/proc/escape_inventory(obj/item/weapon/holder/H)
if(H != src.loc) return