cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-02 04:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes locker bolts moving mobs not valid for insertion into lockers. (#43439)

Browse Source
This commit is contained in:
ShizCalev
2019-04-02 16:10:58 -04:00
committed by moo
parent 6f81c4daa5
commit 27c66097c6
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/projectiles/projectile/magic.dm
View File

@@ -378,15 +378,20 @@
var/weld = TRUE var/weld = TRUE
var/created = FALSE //prevents creation of more then one locker if it has multiple hits var/created = FALSE //prevents creation of more then one locker if it has multiple hits
var/locker_suck = TRUE var/locker_suck = TRUE
var/obj/structure/closet/locker_temp_instance = /obj/structure/closet/decay
/obj/item/projectile/magic/locker/Initialize()
. = ..()
locker_temp_instance = new(src)
/obj/item/projectile/magic/locker/prehit(atom/A) /obj/item/projectile/magic/locker/prehit(atom/A)
if(ismob(A) && locker_suck) if(isliving(A) && locker_suck)
var/mob/M = A var/mob/living/M = A
if(M.anti_magic_check()) if(M.anti_magic_check())
M.visible_message("<span class='warning'>[src] vanishes on contact with [A]!</span>") M.visible_message("<span class='warning'>[src] vanishes on contact with [A]!</span>")
qdel(src) qdel(src)
return return
if(M.anchored) if(!locker_temp_instance.insertion_allowed(M))
return ..() return ..()
M.forceMove(src) M.forceMove(src)
return FALSE return FALSE
@@ -395,7 +400,7 @@
/obj/item/projectile/magic/locker/on_hit(target) /obj/item/projectile/magic/locker/on_hit(target)
if(created) if(created)
return ..() return ..()
var/obj/structure/closet/decay/C = new(get_turf(src)) var/obj/structure/closet/C = new locker_temp_instance(get_turf(src))
if(LAZYLEN(contents)) if(LAZYLEN(contents))
for(var/atom/movable/AM in contents) for(var/atom/movable/AM in contents)
C.insert(AM) C.insert(AM)