Merge branch 'master' into spellcheck

code/game/objects/structures/beds_chairs/chair.dm

@@ -148,14 +148,17 @@
 	resistance_flags = FLAMMABLE
 	max_integrity = 70
 	buildstackamount = 2
-	var/mutable_appearance/armrest
 	item_chair = null
+	var/mutable_appearance/armrest
 
 /obj/structure/chair/comfy/Initialize()
-	armrest = mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
+	armrest = GetArmrest()
 	armrest.layer = ABOVE_MOB_LAYER
 	return ..()
 
+/obj/structure/chair/comfy/proc/GetArmrest()
+	return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
+
 /obj/structure/chair/comfy/Destroy()
 	QDEL_NULL(armrest)
 	return ..()
@@ -194,7 +197,6 @@
 	buildstackamount = 5
 	item_chair = null
 
-
 /obj/structure/chair/office/Moved()
 	. = ..()
 	if(has_gravity())
@@ -411,12 +413,6 @@
 /obj/structure/chair/shuttle
 	name = "shuttle seat"
 	desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
-	icon_state = "shuttle_chair"
-	buildstackamount = 2
-	var/mutable_appearance/armrest
-	item_chair = null
+	icon = 'goon/icons/obj/chairs.dmi'
+	icon_state = "shuttle_chair" //thanks gannets!
 
-/obj/structure/chair/shuttle/Initialize()
-	armrest = mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
-	armrest.layer = ABOVE_MOB_LAYER
-	return ..()

code/game/objects/structures/extinguisher.dm

@@ -8,23 +8,23 @@
 	max_integrity = 200
 	integrity_failure = 50
 	var/obj/item/extinguisher/stored_extinguisher
-	var/opened = 0
+	var/opened = FALSE
 
-/obj/structure/extinguisher_cabinet/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to [opened ? "close":"open"] it.</span>")
-
-/obj/structure/extinguisher_cabinet/New(loc, ndir, building)
-	..()
+/obj/structure/extinguisher_cabinet/Initialize(mapload, ndir, building)
+	. = ..()
 	if(building)
 		setDir(ndir)
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -27 : 27)
 		pixel_y = (dir & 3)? (dir ==1 ? -30 : 30) : 0
-		opened = 1
+		opened = TRUE
 		icon_state = "extinguisher_empty"
 	else
 		stored_extinguisher = new /obj/item/extinguisher(src)
 
+/obj/structure/extinguisher_cabinet/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to [opened ? "close":"open"] it.</span>")
+
 /obj/structure/extinguisher_cabinet/Destroy()
 	if(stored_extinguisher)
 		qdel(stored_extinguisher)

code/game/objects/structures/fireaxe.dm

@@ -1,19 +1,20 @@
 /obj/structure/fireaxecabinet
 	name = "fire axe cabinet"
 	desc = "There is a small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
-	var/obj/item/twohanded/fireaxe/fireaxe = new/obj/item/twohanded/fireaxe
 	icon = 'icons/obj/wallmounts.dmi'
 	icon_state = "fireaxe"
 	anchored = TRUE
 	density = FALSE
 	armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
-	var/locked = TRUE
-	var/open = FALSE
 	max_integrity = 150
 	integrity_failure = 50
+	var/locked = TRUE
+	var/open = FALSE
+	var/obj/item/twohanded/fireaxe/fireaxe
 
 /obj/structure/fireaxecabinet/Initialize()
 	. = ..()
+	fireaxe = new
 	update_icon()
 
 /obj/structure/fireaxecabinet/Destroy()