cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11156 from farie82/big-wrapper-fix

Browse Source 
Wrapping big objects and welding lockers now takes time
This commit is contained in:
variableundefined
2019-04-02 18:34:05 +08:00
committed by GitHub
parent 8c202b0375 7f8837723f
commit 58f253ad33
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+3 -1
View File
@@ -278,9 +278,11 @@
if(src == user.loc)
to_chat(user, "<span class='notice'>You can not [welded?"unweld":"weld"] the locker from inside.</span>")
return
if(!WT.remove_fuel(0,user))
if(!WT.remove_fuel(0, user))
to_chat(user, "<span class='notice'>You need more welding fuel to complete this task.</span>")
return
if(!do_after_once(user, 15, target = src))
return
welded = !welded
update_icon()
for(var/mob/M in viewers(src))
code/modules/recycling/sortingmachinery.dm
+6 -2
View File
@@ -177,7 +177,9 @@
var/obj/structure/closet/crate/O = target
if(O.opened)
return
if(use(3))
if(amount >= 3 && do_after_once(user, 15, target = target))
if(O.opened || !use(3))
return
var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc))
P.icon_state = "deliverycrate"
P.wrapped = O
@@ -189,7 +191,9 @@
var/obj/structure/closet/O = target
if(O.opened)
return
if(use(3))
if(amount >= 3 && do_after_once(user, 15, target = target))
if(O.opened || !use(3))
return
var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc))
P.wrapped = O
P.init_welded = O.welded