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

fixes runtime errors and let bodybags be placed adjacent (#12774)

Browse Source
This commit is contained in:
Casper3667
2021-11-21 21:03:54 +01:00
committed by GitHub
parent 431d0def40
commit 9344e224ba
3 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/buckling.dm
+18 -10
View File
@@ -94,26 +94,34 @@
if(MA == user)
MA.visible_message(\
"<b>[MA.name]</b> buckles themselves to [src].",\
"<span class='notice'>You buckle yourself to [src].</span>",\
"<span class='notice'>You hear metal clanking.</span>")
SPAN_NOTICE("You buckle yourself to [src]."),\
SPAN_NOTICE("You hear metal clanking."))
else if(isliving(MA))
MA.visible_message(\
SPAN_DANGER("[MA.name] is buckled to [src] by [user.name]!"),\
SPAN_DANGER("You are buckled to [src] by [user.name]!"),\
SPAN_NOTICE("You hear metal clanking."))
else
MA.visible_message(\
"<span class='danger'>[MA.name] is buckled to [src] by [user.name]!</span>",\
"<span class='danger'>You are buckled to [src] by [user.name]!</span>",\
"<span class='notice'>You hear metal clanking.</span>")
SPAN_DANGER("\The [MA] is buckled to [src] by [user.name]!"),\
SPAN_NOTICE("You hear metal clanking."))
/obj/proc/user_unbuckle(mob/user)
var/atom/movable/MA = unbuckle()
if(MA)
if(MA != user)
if(MA == user)
MA.visible_message(\
"<b>[MA.name]</b> unbuckles themselves.",\
SPAN_NOTICE("You unbuckle yourself from [src]."),\
SPAN_NOTICE("You hear metal clanking."))
else if(isliving(MA))
MA.visible_message(\
"<b>[user.name]</b> unbuckles [MA.name].", \
"<span class='notice'>You were unbuckled from [src] by [user.name].</span>",\
"<span class='notice'>You hear metal clanking.</span>")
SPAN_NOTICE("You were unbuckled from [src] by [user.name]."),\
SPAN_NOTICE("You hear metal clanking."))
else
MA.visible_message(\
"<b>[MA.name]</b> unbuckles themselves.",\
"<span class='notice'>You unbuckle yourself from [src].</span>",\
"<span class='notice'>You hear metal clanking.</span>")
SPAN_NOTICE("You hear metal clanking."))
add_fingerprint(user)
return MA
code/game/objects/items/bodybag.dm
+12 -1
View File
@@ -10,7 +10,18 @@
pickup_sound = 'sound/items/pickup/cloth.ogg'
/obj/item/bodybag/attack_self(mob/user)
var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
deploy_bag(user, user.loc)
/obj/item/bodybag/afterattack(obj/target, mob/user, proximity)
if(!proximity)
return
if(isturf(target))
var/turf/T = target
if(!T.density)
deploy_bag(user, target)
/obj/item/bodybag/proc/deploy_bag(mob/user, atom/location)
var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(location)
R.add_fingerprint(user)
playsound(src, 'sound/items/drop/cloth.ogg', 30)
qdel(src)