cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17240 from Core0verload/firecabinet_decon

Browse Source 
Wall-mounted extinguisher cabinets are now constructable/deconstructable
This commit is contained in:
Jordie
2016-05-01 18:09:25 +10:00
parent 5b945c4b9a a7088757ed
commit 9c53ce5f85
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/extinguisher.dm
+33 -6
View File
@@ -5,9 +5,19 @@
icon_state = "extinguisher_closed"
anchored = 1
density = 0
var/obj/item/weapon/extinguisher/has_extinguisher = new/obj/item/weapon/extinguisher
var/obj/item/weapon/extinguisher/has_extinguisher
var/opened = 0
/obj/structure/extinguisher_cabinet/New(loc, ndir, building)
..()
if(building)
dir = ndir
pixel_x = (dir & 3)? 0 : (dir == 4 ? -27 : 27)
pixel_y = (dir & 3)? (dir ==1 ? -30 : 30) : 0
opened = 1
icon_state = "extinguisher_empty"
else
has_extinguisher = new /obj/item/weapon/extinguisher(src)
/obj/structure/extinguisher_cabinet/ex_act(severity, target)
switch(severity)
@@ -24,16 +34,26 @@
return
/obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user, params)
/obj/structure/extinguisher_cabinet/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench) && !has_extinguisher)
user << "<span class='notice'>You start unsecuring [name]...</span>"
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 60/I.toolspeed, target = src))
playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
user << "<span class='notice'>You unsecure [name].</span>"
new /obj/item/wallframe/extinguisher_cabinet(loc)
qdel(src)
return
if(isrobot(user) || isalien(user))
return
if(istype(O, /obj/item/weapon/extinguisher))
if(istype(I, /obj/item/weapon/extinguisher))
if(!has_extinguisher && opened)
if(!user.drop_item())
return
contents += O
has_extinguisher = O
user << "<span class='notice'>You place [O] in [src].</span>"
contents += I
has_extinguisher = I
user << "<span class='notice'>You place [I] in [src].</span>"
else
opened = !opened
else
@@ -84,3 +104,10 @@
icon_state = "extinguisher_full"
else
icon_state = "extinguisher_empty"
/obj/item/wallframe/extinguisher_cabinet
name = "extinguisher cabinet frame"
desc = "Used for building wall-mounted extinguisher cabinets."
icon = 'icons/obj/apc_repair.dmi'
icon_state = "extinguisher_frame"
result_path = /obj/structure/extinguisher_cabinet