From a7088757edf0cc7a4fc52cd79c3fc850f0212b8c Mon Sep 17 00:00:00 2001
From: c0 <Core0verload@users.noreply.github.com>
Date: Fri, 29 Apr 2016 15:31:23 +0300
Subject: [PATCH] Wall-mounted extinguisher cabinets are now
 constructable/deconstructable

---
 .../items/stacks/sheets/sheet_types.dm        |   1 +
 code/game/objects/structures/extinguisher.dm  |  39 +++++++++++++++---
 icons/obj/apc_repair.dmi                      | Bin 577 -> 761 bytes
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 6c9b9254103..a12c51ed506 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -42,6 +42,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	new/datum/stack_recipe("apc frame", /obj/item/wallframe/apc, 2), \
 	new/datum/stack_recipe("air alarm frame", /obj/item/wallframe/airalarm, 2), \
 	new/datum/stack_recipe("fire alarm frame", /obj/item/wallframe/firealarm, 2), \
+	new/datum/stack_recipe("extinguisher cabinet frame", /obj/item/wallframe/extinguisher_cabinet, 2), \
 	new/datum/stack_recipe("button frame", /obj/item/wallframe/button, 1), \
 	null, \
 	new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1), \
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index 8741c8698e0..e011d83fa6e 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -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
diff --git a/icons/obj/apc_repair.dmi b/icons/obj/apc_repair.dmi
index 8f66aa27c86a43d92809786dd1a9efd572ad3a61..220a267fe7acb926bbc3eb7ff115eb33e771ef21 100644
GIT binary patch
delta 600
zcmV-e0;m1K1o;IeiBL{Q4GJ0x0000DNk~Le0001B0000$2m=5B0MhD$JOBUyZ;>S~
zTEM`-|M}|l<<dGjIwvPA%DJWD(7gZp@cHQ0Z;qpCiJkx$7;1!;WPXrFMn++Gg?@g1
zTU%TIW;0@9Vk09XTylU)N=p0o<&*#b00DGTPE!Ct=GbNc005kkeS?32D^9H_$;?YH
z%`DDHEyAxwS;5uM1spB_iWX9F08bMg0004yNkl<ZScUDEjc$V=5P+*v+?<V8Dw~^K
zZP)jI#v%TnAoT{xviYSoCI@_8I23lfjg7yA2e3ZAKfw!D_9uY7DIToqE?R&moCzom
zLrS|Vg#s8>2u6O71T%lZ(+GtChE;;+4rhYsC5{eK;28vDSwJ*`_~8tYg2=Vt;96jw
zWKhd11%@&W1)vcOH|PYu*F9gL63F!f(uCmwO$NhXAs|Ew#<dK?w7$w)Wd^|*Z3Zzm
zgFRr@q6XCR5P-ea-OYenMvk&9P*1Wwfu>BY38uB|KrpRk2ZDcTE!!7tZ2Wh+U1yDx
zB}S4YP0|`iYnUX29J4GtW{k}~cvb{yD>&u3TLI5s+3yq>j$i#8@ca!WXv?rDG)348
zPW&A;2ZcEQ$e&S=BL&^o)ttcxR?u&o!$m=k7nCgq!5KBlQt)}Hs)}Bh1sp2~{ql0F
zx30?q#?RO)@=HuHx-kQW%s?Oo4`lF#7hD^3g1g`+g5jK{7G$;H&Nz4THcguGg@HMG
mo3@Dam6I=;g#*&Y28wTSODO%lx0DY60000<MNUMnLSTXoGXXIG

delta 415
zcmV;Q0bu_51;GR*iBL{Q4GJ0x0000DNk~Le0000$0000$2m=5B0G+pi>;M1&KanLa
zDgYQ5Mn*<{etuh9TmNP=Vq#(=BO`5>^wa<V00DGTPE!Ct=GbNc004}Ut%HA2R&e!m
z0ecbvRJuY+7C8I50003PNkl<ZScUDD>k@(>5Ju%9lzB<*{hu`@F<2JC^<QzO9B07e
z%E!!7RfYe80Zu>9J(vLF5>Thc0|9tLAW%wcrR-H90!PoJ2n08Wh~RD^3z|pUbVk4u
z0*MRS><S`+=Bl8(Do8IP$QpkL5;5upFv%BiX8i&anC%0~3@Z5k5rLFO;ARaf5H8UQ
z+E@iOpuzxIqjL@cS(5~@Ma&gMW6TuzS<@<TvZhqvWqn>yDEvIB<3U;g+y7|+?B2+n
z!{bqgVEeef587fVkeHxfzR&!~0y}y^u(xGR6$~46!E>CZNzIr*??gidnh)b^-6fbn
z`QRz=VHt{4VA{W0ujUrtiAF%KzzF6Kp#Yu^aKU$-(BVRX%o~zf7Pr>QLB#+7002ov
JPDHLkV1k6Ks7n9<