Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

code/game/objects/buckling.dm

@@ -49,6 +49,13 @@
 	M.throw_alert("buckled", /obj/screen/alert/restrained/buckled, new_master = src)
 	return 1
 
+/obj/buckle_mob(mob/living/M)
+	. = ..()
+	if(.)
+		if(burn_state == ON_FIRE) //Sets the mob on fire if you buckle them to a burning atom/movableect
+			M.adjust_fire_stacks(1)
+			M.IgniteMob()
+
 /atom/movable/proc/unbuckle_mob()
 	if(buckled_mob && buckled_mob.buckled == src && buckled_mob.can_unbuckle(usr))
 		. = buckled_mob

code/game/objects/effects/biomass_rift.dm

@@ -1,127 +0,0 @@
-/*
-/obj/effect/biomass
-	icon = 'icons/obj/biomass.dmi'
-	icon_state = "stage1"
-	opacity = 0
-	density = 0
-	anchored = 1
-	layer = 20 //DEBUG
-	plane = HUD_PLANE //DEBUG
-	var/health = 10
-	var/stage = 1
-	var/obj/effect/rift/originalRift = null //the originating rift of that biomass
-	var/maxDistance = 15 //the maximum length of a thread
-	var/newSpreadDistance = 10 //the length of a thread at which new ones are created
-	var/curDistance = 1 //the current length of a thread
-	var/continueChance = 3 //weighed chance of continuing in the same direction. turning left or right has 1 weight both
-	var/spreadDelay = 1 //will change to something bigger later, but right now I want it to spread as fast as possible for testing
-
-/obj/effect/rift
-	icon = 'icons/obj/biomass.dmi'
-	icon_state = "rift"
-	var/list/obj/effect/biomass/linkedBiomass = list() //all the biomass patches that have spread from it
-	var/newicon = 1 //DEBUG
-
-/obj/effect/rift/New()
-	set background = 1
-
-	..()
-
-	for(var/turf/T in orange(1,src))
-		if(!IsValidBiomassLoc(T))
-			continue
-		var/obj/effect/biomass/starting = new /obj/effect/biomass(T)
-		starting.dir = get_dir(src,starting)
-		starting.originalRift = src
-		linkedBiomass += starting
-		spawn(1) //DEBUG
-			starting.icon_state = "[newicon]"
-
-/obj/effect/rift/Del()
-	for(var/obj/effect/biomass/biomass in linkedBiomass)
-		del(biomass)
-	..()
-
-/obj/effect/biomass/New()
-	set background = 1
-
-	..()
-	if(!IsValidBiomassLoc(loc,src))
-		del(src)
-		return
-	spawn(1) //so that the dir and stuff can be set by the source first
-		if(curDistance >= maxDistance)
-			return
-		switch(dir)
-			if(NORTHWEST)
-				dir = NORTH
-			if(NORTHEAST)
-				dir = EAST
-			if(SOUTHWEST)
-				dir = WEST
-			if(SOUTHEAST)
-				dir = SOUTH
-		sleep(spreadDelay)
-		Spread()
-
-/obj/effect/biomass/proc/Spread(var/direction = dir)
-	set background = 1
-	var/possibleDirsInt = 0
-
-	for(var/newDirection in cardinal)
-		if(newDirection == turn(direction,180)) //can't go backwards
-			continue
-		var/turf/T = get_step(loc,newDirection)
-		if(!IsValidBiomassLoc(T,src))
-			continue
-		possibleDirsInt |= newDirection
-
-	var/list/possibleDirs = list()
-
-	if(possibleDirsInt & direction)
-		for(var/i=0 , i<continueChance , i++)
-			possibleDirs += direction
-	if(possibleDirsInt & turn(direction,90))
-		possibleDirs += turn(direction,90)
-	if(possibleDirsInt & turn(direction,-90))
-		possibleDirs += turn(direction,-90)
-
-	if(!possibleDirs.len)
-		return
-
-	direction = pick(possibleDirs)
-
-	var/obj/effect/biomass/newBiomass = new /obj/effect/biomass(get_step(src,direction))
-	newBiomass.curDistance = curDistance + 1
-	newBiomass.maxDistance = maxDistance
-	newBiomass.dir = direction
-	newBiomass.originalRift = originalRift
-	newBiomass.icon_state = "[originalRift.newicon]" //DEBUG
-	originalRift.linkedBiomass += newBiomass
-
-	if(!(curDistance%newSpreadDistance))
-		var/obj/effect/rift/newrift = new /obj/effect/rift(loc)
-		if(originalRift.newicon <= 3)
-			newrift.newicon = originalRift.newicon + 1
-//		NewSpread()
-
-/obj/effect/biomass/proc/NewSpread(maxDistance = 15)
-	set background = 1
-	for(var/turf/T in orange(1,src))
-		if(!IsValidBiomassLoc(T,src))
-			continue
-		var/obj/effect/biomass/starting = new /obj/effect/biomass(T)
-		starting.dir = get_dir(src,starting)
-		starting.maxDistance = maxDistance
-
-/proc/IsValidBiomassLoc(turf/location,obj/effect/biomass/source = null)
-	set background = 1
-	for(var/obj/effect/biomass/biomass in location)
-		if(biomass != source)
-			return 0
-	if(istype(location,/turf/space))
-		return 0
-	if(location.density)
-		return 0
-	return 1
-*/

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -84,6 +84,10 @@
 	layer = 3
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "cobweb1"
+	burntime = 1
+
+/obj/effect/decal/cleanable/cobweb/fire_act()
+	qdel(src)
 
 /obj/effect/decal/cleanable/molten_item
 	name = "gooey grey mass"

code/game/objects/effects/decals/cleanable.dm

@@ -38,6 +38,7 @@
 	..()
 
 /obj/effect/decal/cleanable/fire_act()
-	reagents.chem_temp += 30
-	reagents.handle_reactions()
+	if(reagents)
+		reagents.chem_temp += 30
+		reagents.handle_reactions()
 	..()

code/game/objects/effects/decals/contraband.dm

@@ -18,6 +18,7 @@
 	var/serial_number = 0
 	var/obj/structure/sign/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor
 	var/subtype = 0
+	burn_state = FLAMMABLE
 
 
 /obj/item/weapon/contraband/poster/New(turf/loc, given_serial = 0)

code/game/objects/effects/effect_system.dm

@@ -673,7 +673,7 @@ steam.start() -- spawns the effect
 	for(var/mob/living/carbon/human/R in get_turf(src))
 		if(R.internal != null && usr.wear_mask && (R.wear_mask.flags & AIRTIGHT) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
 		else
-			R.burn_skin(0.75)
+			R.adjustFireLoss(0.75)
 			if(R.coughedtime != 1)
 				R.coughedtime = 1
 				R.emote("gasp")
@@ -687,7 +687,7 @@ steam.start() -- spawns the effect
 	if(istype(R, /mob/living/carbon/human))
 		if(R.internal != null && usr.wear_mask && (R.wear_mask.flags & AIRTIGHT) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
 			return
-		R.burn_skin(0.75)
+		R.adjustFireLoss(0.75)
 		if(R.coughedtime != 1)
 			R.coughedtime = 1
 			R.emote("gasp")

code/game/objects/effects/portals.dm

@@ -8,21 +8,21 @@
 	var/failchance = 5
 	var/obj/item/target = null
 	var/creator = null
-	anchored = 1.0
+	anchored = 1
 	var/precision = 1 // how close to the portal you will teleport. 0 = on the portal, 1 = adjacent
 	var/can_multitool_to_remove = 0
 
 /obj/effect/portal/Bumped(mob/M as mob|obj)
-	src.teleport(M)
+	teleport(M)
 
-/obj/effect/portal/New(loc, turf/target, creator)
+/obj/effect/portal/New(loc, turf/target, creator=null, lifespan=300)
 	portals += src
 	src.loc = loc
 	src.target = target
 	src.creator = creator
-	spawn(300)
-		qdel(src)
-	return
+	if(lifespan > 0)
+		spawn(lifespan)
+			qdel(src)
 
 /obj/effect/portal/Destroy()
 	portals -= src
@@ -33,6 +33,7 @@
 		var/obj/item/weapon/gun/energy/wormhole_projector/P = creator
 		P.portal_destroyed(src)
 	creator = null
+	target = null
 	return ..()
 
 /obj/effect/portal/proc/teleport(atom/movable/M as mob|obj)

code/game/objects/items.dm

@@ -192,6 +192,22 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 			to_chat(user, "<span class='warning'>You try to move your [temp.name], but cannot!</span>")
 			return 0
 
+	if(burn_state == ON_FIRE)
+		var/mob/living/carbon/human/H = user
+		if(istype(H))
+			if(H.gloves && (H.gloves.max_heat_protection_temperature > 360))
+				extinguish()
+				to_chat(user, "<span class='notice'>You put out the fire on [src].</span>")
+			else
+				to_chat(user, "<span class='warning'>You burn your hand on [src]!</span>")
+				var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_arm")
+				if(affecting && affecting.take_damage(0, 5))		// 5 burn damage
+					H.UpdateDamageIcon()
+				H.updatehealth()
+				return
+		else
+			extinguish()
+
 	if(istype(src.loc, /obj/item/weapon/storage))
 		//If the item is in a storage item, take it out
 		var/obj/item/weapon/storage/S = src.loc

code/game/objects/items/candle.dm

@@ -1,81 +1,90 @@
 /obj/item/candle
 	name = "red candle"
-	desc = "a candle"
+	desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to humankind. The jewelry he kept for himself."
 	icon = 'icons/obj/candle.dmi'
 	icon_state = "candle1"
 	item_state = "candle1"
 	w_class = 1
-
-	light_color = "#E09D37"
-
 	var/wax = 200
 	var/lit = 0
-	proc
-		light(var/flavor_text = "\red [usr] lights the [name].")
+	var/infinite = 0
+	var/start_lit = 0
+	light_color = "#E09D37"
+
+/obj/item/candle/New()
+	..()
+	if(start_lit)
+		// No visible message
+		light(show_message = 0)
+
+/obj/item/candle/update_icon()
+	var/i
+	if(wax>150)
+		i = 1
+	else if(wax>80)
+		i = 2
+	else i = 3
+	icon_state = "candle[i][lit ? "_lit" : ""]"
 
 
-	update_icon()
-		var/i
-		if(wax>150)
-			i = 1
-		else if(wax>80)
-			i = 2
-		else i = 3
-		icon_state = "candle[i][lit ? "_lit" : ""]"
+/obj/item/candle/attackby(obj/item/weapon/W, mob/user, params)
+	..()
+	if(istype(W, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
+		if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
+			light("<span class='notice'>[user] casually lights [src] with [WT], what a badass.")
+	else if(istype(W, /obj/item/weapon/lighter))
+		var/obj/item/weapon/lighter/L = W
+		if(L.lit)
+			light("<span class='notice'>After some fiddling, [user] manages to light [src] with [L].</span>")
+	else if(istype(W, /obj/item/weapon/match))
+		var/obj/item/weapon/match/M = W
+		if(M.lit)
+			light("<span class='notice'>[user] lights [src] with [M]</span>")
+	else if(istype(W, /obj/item/candle))
+		var/obj/item/candle/C = W
+		if(C.lit)
+			light("<span class='notice'>[user] tilts [C] and lights [src] with it.</span>")
 
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-		..()
-		if(istype(W, /obj/item/weapon/weldingtool))
-			var/obj/item/weapon/weldingtool/WT = W
-			if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
-				light("\red [user] casually lights the [name] with [W], what a badass.")
-		else if(istype(W, /obj/item/weapon/lighter))
-			var/obj/item/weapon/lighter/L = W
-			if(L.lit)
-				light()
-		else if(istype(W, /obj/item/weapon/match))
-			var/obj/item/weapon/match/M = W
-			if(M.lit)
-				light()
-		else if(istype(W, /obj/item/candle))
-			var/obj/item/candle/C = W
-			if(C.lit)
-				light()
+/obj/item/candle/fire_act()
+	if(!lit)
+		light() //honk
 
-
-	light(var/flavor_text = "\red [usr] lights the [name].")
-		if(!src.lit)
-			src.lit = 1
-			//src.damtype = "fire"
-			for(var/mob/O in viewers(usr, null))
-				O.show_message(flavor_text, 1)
-			set_light(CANDLE_LUM)
-			processing_objects.Add(src)
-
-
-	process()
-		if(!lit)
-			return
-		wax--
-		if(!wax)
-			new/obj/item/trash/candle(src.loc)
-			if(istype(src.loc, /mob))
-				var/mob/M = src.loc
-				M.unEquip(src, 1) //src is being deleted anyway
-			qdel(src)
+/obj/item/candle/proc/light(show_message)
+	if(!lit)
+		lit = 1
+		if(show_message)
+			usr.visible_message(show_message)
+		set_light(CANDLE_LUM)
+		processing_objects.Add(src)
 		update_icon()
-		if(istype(loc, /turf)) //start a fire if possible
-			var/turf/T = loc
-			T.hotspot_expose(700, 5)
 
 
-	attack_self(mob/user as mob)
-		if(lit)
-			lit = 0
-			update_icon()
-			set_light(0)
+/obj/item/candle/process()
+	if(!lit)
+		return
+	if(!infinite)
+		wax--
+	if(!wax)
+		new/obj/item/trash/candle(src.loc)
+		if(istype(src.loc, /mob))
+			var/mob/M = src.loc
+			M.unEquip(src, 1) //src is being deleted anyway
+		qdel(src)
+	update_icon()
+	if(isturf(loc)) //start a fire if possible
+		var/turf/T = loc
+		T.hotspot_expose(700, 5)
+
+
+/obj/item/candle/attack_self(mob/user)
+	if(lit)
+		user.visible_message("<span class='notice'>[user] snuffs out [src].</span>")
+		lit = 0
+		update_icon()
+		set_light(0)
 
 /obj/item/candle/eternal
 	desc = "A candle. This one seems to have an odd quality about the wax."
-	wax = 10000
+	infinite = 1

code/game/objects/items/control_wand.dm

@@ -18,6 +18,12 @@
 	ID = new /obj/item/weapon/card/id
 	ID.access = get_region_accesses(region_access)
 
+/obj/item/weapon/door_remote/Destroy()
+	if(ID)
+		qdel(ID)
+		ID = null
+	return ..()
+
 /obj/item/weapon/door_remote/attack_self(mob/user)
 	switch(mode)
 		if(WAND_OPEN)

code/game/objects/items/devices/camera_bug.dm

@@ -61,6 +61,7 @@
 		return null
 
 	var/turf/T = get_turf(user.loc)
+	// TODO: Tie into space manager
 	if(T.z != current.z || !current.can_use())
 		to_chat(user, "<span class='danger'>[src] has lost the signal.</span>")
 		current = null
@@ -225,6 +226,7 @@
 				to_chat(usr, "<span class='danger'>Something's wrong with that camera.  You can't get a feed.</span>")
 				return
 			var/turf/T = get_turf(loc)
+			// TODO: Tie into space manager
 			if(!T || C.z != T.z)
 				to_chat(usr, "<span class='danger'>You can't get a signal.</span>")
 				return
@@ -284,4 +286,4 @@
 
 #undef BUGMODE_LIST
 #undef BUGMODE_MONITOR
-#undef BUGMODE_TRACK
+#undef BUGMODE_TRACK

code/game/objects/items/devices/guitar.dm

@@ -7,6 +7,8 @@
 	icon_state = "guitar"
 	item_state = "guitar"
 	force = 10
+	burn_state = FLAMMABLE
+	burntime = 20
 	var/datum/song/handheld/song
 	hitsound = 'sound/effects/guitarsmash.ogg'
 

code/game/objects/items/devices/laserpointer.dm

@@ -11,7 +11,6 @@
 	w_class = 2 //Increased to 2, because diodes are w_class 2. Conservation of matter.
 	origin_tech = "combat=1"
 	origin_tech = "magnets=2"
-	var/turf/pointer_loc
 	var/energy = 5
 	var/max_energy = 5
 	var/effectchance = 33
@@ -35,6 +34,12 @@
 	if(!pointer_icon_state)
 		pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser")
 
+/obj/item/device/laser_pointer/Destroy()
+	if(diode)
+		qdel(diode)
+		diode = null
+	return ..()
+
 /obj/item/device/laser_pointer/upgraded/New()
 	..()
 	diode = new /obj/item/weapon/stock_parts/micro_laser/ultra

code/game/objects/items/devices/paicard.dm

@@ -24,9 +24,13 @@
 	overlays += "pai-off"
 
 /obj/item/device/paicard/Destroy()
-	//Will stop people throwing friend pAIs into the singularity so they can respawn
-	if(!isnull(pai))
-		pai.death(0)
+	if(pai)
+		pai.ghostize()
+		qdel(pai)
+		pai = null
+	if(radio)
+		qdel(radio)
+		radio = null
 	return ..()
 
 /obj/item/device/paicard/attack_self(mob/user)

code/game/objects/items/devices/radio/intercom.dm

@@ -124,6 +124,7 @@
 		return -1
 	if(!(0 in level))
 		var/turf/position = get_turf(src)
+		// TODO: Tie into space manager
 		if(isnull(position) || !(position.z in level))
 			return -1
 	if(!src.listening)

code/game/objects/items/devices/taperecorder.dm

@@ -20,6 +20,12 @@
 	mytape = new /obj/item/device/tape/random(src)
 	update_icon()
 
+/obj/item/device/taperecorder/Destroy()
+	if(mytape)
+		qdel(mytape)
+		mytape = null
+	return ..()
+
 /obj/item/device/taperecorder/examine(mob/user)
 	if(..(user, 1))
 		to_chat(user, "The wire panel is [open_panel ? "opened" : "closed"].")
@@ -42,6 +48,10 @@
 		update_icon()
 
 
+/obj/item/device/taperecorder/fire_act()
+	mytape.ruin() //Fires destroy the tape
+	return ..()
+
 /obj/item/device/taperecorder/attack_hand(mob/user)
 	if(loc == user)
 		if(mytape)
@@ -253,6 +263,8 @@
 	var/list/timestamp = list()
 	var/ruined = 0
 
+/obj/item/device/tape/fire_act()
+	ruin()
 
 /obj/item/device/tape/attack_self(mob/user)
 	if(!ruined)
@@ -277,7 +289,8 @@
 	timestamp.Cut()
 
 /obj/item/device/tape/proc/ruin()
-	overlays += "ribbonoverlay"
+	if(!ruined)
+		overlays += "ribbonoverlay"
 	ruined = 1
 
 

code/game/objects/items/devices/transfer_valve.dm

@@ -11,6 +11,18 @@
 	var/toggle = 1
 	origin_tech = "materials=1;engineering=1"
 
+/obj/item/device/transfer_valve/Destroy()
+	if(tank_one)
+		qdel(tank_one)
+		tank_one = null
+	if(tank_two)
+		qdel(tank_two)
+		tank_two = null
+	if(attached_device)
+		qdel(attached_device)
+		attached_device = null
+	return ..()
+
 /obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
 
 /obj/item/device/transfer_valve/IsAssemblyHolder()

code/game/objects/items/devices/violin.dm

@@ -7,6 +7,8 @@
 	icon_state = "violin"
 	item_state = "violin"
 	force = 10
+	burn_state = FLAMMABLE
+	burntime = 20
 	hitsound = 'sound/weapons/smash.ogg'
 	var/datum/song/handheld/song
 
@@ -18,7 +20,7 @@
 	qdel(song)
 	song = null
 	return ..()
-	
+
 /obj/item/device/violin/initialize()
 	song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
 	..()

code/game/objects/items/flag.dm

@@ -1,77 +1,14 @@
 /obj/item/flag
 	icon = 'icons/obj/flag.dmi'
 	w_class = 4
-	var/lit = 0
-	var/burntime = 30
+	burntime = 20
+	burn_state = FLAMMABLE
 
-/obj/item/flag/fire_act(null, temperature, volume)
-	if(!lit)
-		Ignite()
-		return
-
-/obj/item/flag/proc/Ignite()
-	if(lit) return
-	lit = 1
-	update_icons()
-	processing_objects.Add(src)
-
-/obj/item/flag/process()
-	burntime--
-	if(burntime < 1)
-		processing_objects.Remove(src)
-		if(istype(src.loc,/turf))
-			new /obj/effect/decal/cleanable/ash(src.loc)
-			new /obj/item/stack/rods(src.loc)
-			qdel(src)
-			return
-		if(istype(src.loc,/mob/living/carbon))
-			var/mob/living/carbon/C = src.loc
-			var/turf/location = get_turf(C)
-			new /obj/effect/decal/cleanable/ash(location)
-			new /obj/item/stack/rods(location)
-			qdel(src)
-			return
-		else
-			qdel(src)
-			return
-
-/obj/item/flag/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/flag/attackby(obj/item/weapon/W, mob/user, params)
 	..()
-	if(istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
-		if(WT.isOn())//Badasses dont get blinded while lighting their cig with a welding tool
-			light("<span class='notice'>[user] casually lights the [name] with [W], what a badass.</span>")
-
-	else if(istype(W, /obj/item/weapon/lighter/zippo))
-		var/obj/item/weapon/lighter/zippo/Z = W
-		if(Z.lit)
-			light("<span class='rose'>With a single flick of their wrist, [user] smoothly lights the [name] with their [W]. Damn they're cool.</span>")
-
-	else if(istype(W, /obj/item/weapon/lighter))
-		var/obj/item/weapon/lighter/L = W
-		if(L.lit)
-			light("<span class='notice'>After some fiddling, [user] manages to light the [name] with [W].</span>")
-
-	else if(istype(W, /obj/item/weapon/match))
-		var/obj/item/weapon/match/M = W
-		if(M.lit)
-			light("<span class='notice'>[user] lights the [name] with their [W].</span>")
-
-	else if(istype(W, /obj/item/weapon/melee/energy/sword/saber))
-		var/obj/item/weapon/melee/energy/sword/saber/S = W
-		if(S.active)
-			light("<span class='warning'>[user] swings their [W], barely missing their nose. They light the [name] in the process.</span>")
-
-	else if(istype(W, /obj/item/device/assembly/igniter))
-		light("<span class='notice'>[user] fiddles with [W], and manages to light the [name].</span>")
-
-/obj/item/flag/proc/light(var/flavor_text = "[usr] lights the [name].")
-	if(!src.lit)
-		src.lit = 1
-		var/turf/T = get_turf(src)
-		T.visible_message(flavor_text)
-		update_icons()
-		processing_objects.Add(src)
+	if(is_hot(W) && burn_state != ON_FIRE)
+		user.visible_message("<span class='notice'>[user] lights the [name] with [W].</span>")
+		fire_act()
 
 /obj/item/flag/proc/update_icons()
 	overlays = null

code/game/objects/items/latexballoon.dm

@@ -11,6 +11,12 @@
 	var/state
 	var/datum/gas_mixture/air_contents = null
 
+/obj/item/latexballon/Destroy()
+	if(air_contents)
+		qdel(air_contents)
+		air_contents = null
+	return ..()
+
 /obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank, mob/user)
 	if(icon_state == "latexballon_bursted")
 		return

code/game/objects/items/stacks/medical.dm

@@ -2,16 +2,18 @@
 	name = "medical pack"
 	singular_name = "medical pack"
 	icon = 'icons/obj/items.dmi'
-	amount = 5
-	max_amount = 5
+	amount = 6
+	max_amount = 6
 	w_class = 1
 	throw_speed = 3
 	throw_range = 7
 	var/heal_brute = 0
 	var/heal_burn = 0
+	var/self_delay = 20
+	var/unique_handling = 0 //some things give a special prompt, do we want to bypass some checks in parent?
 
-/obj/item/stack/medical/attack(mob/living/carbon/M, mob/user)
-	if(!istype(M))
+/obj/item/stack/medical/attack(mob/living/M, mob/user)
+	if(!iscarbon(M) && !isanimal(M))
 		to_chat(user, "<span class='danger'>[src] cannot be applied to [M]!</span>")
 		return 1
 
@@ -20,13 +22,12 @@
 		return 1
 
 
-	if(istype(M, /mob/living/carbon/human))
+	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
-		if(isliving(M))
-			if(!M.can_inject(user, 1))
-				return 1
+		if(!H.can_inject(user, 1))
+			return 1
 
 		if(!affecting)
 			to_chat(user, "<span class='danger'>That limb is missing!</span>")
@@ -36,16 +37,36 @@
 			to_chat(user, "<span class='danger'>This can't be used on a robotic limb.</span>")
 			return 1
 
+		if(M == user && !unique_handling)
+			user.visible_message("<span class='notice'>[user] starts to apply [src] on [H]...</span>")
+			if(!do_mob(user, H, self_delay))
+				return 1
+		return
 
-		H.UpdateDamageIcon()
+	if(isanimal(M))
+		var/mob/living/simple_animal/critter = M
+		if(!(critter.healable))
+			to_chat(user, "<span class='notice'>You cannot use [src] on [critter]!</span>")
+			return
+		else if (critter.health == critter.maxHealth)
+			to_chat(user, "<span class='notice'>[critter] is at full health.</span>")
+			return
+		else if(heal_brute < 1)
+			to_chat(user, "<span class='notice'>[src] won't help [critter] at all.</span>")
+			return
+
+		critter.heal_organ_damage(heal_brute, heal_burn)
+		user.visible_message("<span class='green'>[user] applies [src] on [critter].</span>", \
+							 "<span class='green'>You apply [src] on [critter].</span>")
 
-	else
-		M.heal_organ_damage(heal_brute/2, heal_burn/2)
-		user.visible_message("<span class='notice'>[M] has been applied with [src] by [user].</span>", \
-							 "<span class='notice'>You apply [src] to [M].</span>")
 		use(1)
 
-	M.updatehealth()
+	else
+		M.heal_organ_damage(heal_brute, heal_burn)
+		M.updatehealth()
+		user.visible_message("<span class='green'>[user] applies [src] on [M].</span>", \
+							 "<span class='green'>You apply [src] on [M].</span>")
+		use(1)
 
 //Bruise Packs//
 
@@ -56,11 +77,11 @@
 	icon_state = "gauze"
 	origin_tech = "biotech=1"
 
-/obj/item/stack/medical/bruise_pack/attack(mob/living/carbon/M, mob/user)
+/obj/item/stack/medical/bruise_pack/attack(mob/living/M, mob/user)
 	if(..())
 		return 1
 
-	if(istype(M, /mob/living/carbon/human))
+	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
@@ -69,26 +90,17 @@
 			var/disinfected = affecting.disinfect()
 
 			if(!(bandaged || disinfected))
-				to_chat(user, "<span class='warning'>The wounds on [M]'s [affecting.name] have already been bandaged.</span>")
+				to_chat(user, "<span class='warning'>The wounds on [H]'s [affecting.name] have already been bandaged.</span>")
 				return 1
 			else
-				for(var/datum/wound/W in affecting.wounds)
-					if(W.internal)
-						continue
-					if(W.current_stage <= W.max_bleeding_stage)
-						user.visible_message("<span class='notice'>[user] bandages \the [W.desc] on [M]'s [affecting.name].</span>", \
-											 "<span class='notice'>You bandage \the [W.desc] on [M]'s [affecting.name].</span>" )
-					else if(istype(W,/datum/wound/bruise))
-						user.visible_message("<span class='notice'>[user] places a bruise patch over \the [W.desc] on [M]'s [affecting.name].</span>", \
-											 "<span class='notice'>You place a bruise patch over \the [W.desc] on [M]'s [affecting.name].</span>" )
-					else
-						user.visible_message("<span class='notice'>[user] places a bandaid over \the [W.desc] on [M]'s [affecting.name].</span>", \
-											 "<span class='notice'>You place a bandaid over \the [W.desc] on [M]'s [affecting.name].</span>" )
-				if(bandaged)
-					affecting.heal_damage(heal_brute, heal_burn)
+				user.visible_message("<span class='green'>[user] bandages the wounds on [H]'s [affecting.name].", \
+								 	 "<span class='green'>You bandage the wounds on [H]'s [affecting.name].</span>" )
+
+				affecting.heal_damage(heal_brute, heal_burn)
+				H.UpdateDamageIcon()
 				use(1)
 		else
-			to_chat(user, "<span class='notice'>[affecting] is cut open, you'll need more than a bandage!</span>")
+			to_chat(user, "<span class='warning'>[affecting] is cut open, you'll need more than a bandage!</span>")
 
 
 /obj/item/stack/medical/bruise_pack/advanced
@@ -96,7 +108,7 @@
 	singular_name = "advanced trauma kit"
 	desc = "An advanced trauma kit for severe injuries."
 	icon_state = "traumakit"
-	heal_brute = 12
+	heal_brute = 25
 
 
 
@@ -111,25 +123,26 @@
 	icon_state = "ointment"
 	origin_tech = "biotech=1"
 
-/obj/item/stack/medical/ointment/attack(mob/living/carbon/M, mob/user)
+/obj/item/stack/medical/ointment/attack(mob/living/M, mob/user)
 	if(..())
 		return 1
 
-	if(istype(M, /mob/living/carbon/human))
+	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
 		if(affecting.open == 0)
 			if(!affecting.salve())
-				to_chat(user, "<span class='warning'>The wounds on [M]'s [affecting.name] have already been salved.</span>")
+				to_chat(user, "<span class='warning'>The wounds on [H]'s [affecting.name] have already been salved.</span>")
 				return 1
 			else
-				user.visible_message("<span class='notice'>[user] salves the wounds on [M]'s [affecting.name].", \
-									 "<span class='notice'>You salve the wounds on [M]'s [affecting.name].</span>" )
+				user.visible_message("<span class='green'>[user] salves the wounds on [H]'s [affecting.name].", \
+								 	 "<span class='green'>You salve the wounds on [H]'s [affecting.name].</span>" )
 				affecting.heal_damage(heal_brute, heal_burn)
+				H.UpdateDamageIcon()
 				use(1)
 		else
-			to_chat(user, "<span class='notice'>[affecting] is cut open, you'll need more than some ointment!</span>")
+			to_chat(user, "<span class='warning'>[affecting] is cut open, you'll need more than some ointment!</span>")
 
 
 /obj/item/stack/medical/ointment/advanced
@@ -137,7 +150,7 @@
 	singular_name = "advanced burn kit"
 	desc = "An advanced treatment kit for severe burns."
 	icon_state = "burnkit"
-	heal_burn = 12
+	heal_burn = 25
 
 
 
@@ -151,7 +164,7 @@
 	icon = 'icons/obj/hydroponics_products.dmi'
 	icon_state = "alien3-product"
 	color = "#378C61"
-	heal_brute = 7
+	heal_brute = 12
 
 
 /obj/item/stack/medical/ointment/aloe
@@ -161,7 +174,7 @@
 	icon = 'icons/obj/hydroponics_products.dmi'
 	icon_state = "ambrosia-product"
 	color = "#4CC5C7"
-	heal_burn = 7
+	heal_burn = 12
 
 
 
@@ -172,14 +185,14 @@
 	name = "medical splints"
 	singular_name = "medical splint"
 	icon_state = "splint"
-	amount = 5
-	max_amount = 5
+	unique_handling = 1
+	self_delay = 100
 
-/obj/item/stack/medical/splint/attack(mob/living/carbon/M, mob/user)
+/obj/item/stack/medical/splint/attack(mob/living/M, mob/user)
 	if(..())
 		return 1
 
-	if(istype(M, /mob/living/carbon/human))
+	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 		var/limb = affecting.name
@@ -187,36 +200,21 @@
 			to_chat(user, "<span class='danger'>You can't apply a splint there!</span>")
 			return
 		if(affecting.status & ORGAN_SPLINTED)
-			to_chat(user, "<span class='danger'>[M]'s [limb] is already splinted!</span>")
-			if(alert(user, "Would you like to remove the splint from [M]'s [limb]?", "Removing.", "Yes", "No") == "Yes")
+			to_chat(user, "<span class='danger'>[H]'s [limb] is already splinted!</span>")
+			if(alert(user, "Would you like to remove the splint from [H]'s [limb]?", "Removing.", "Yes", "No") == "Yes")
 				affecting.status &= ~ORGAN_SPLINTED
-				to_chat(user, "<span class='notice'>You remove the splint from [M]'s [limb].</span>")
+				to_chat(user, "<span class='notice'>You remove the splint from [H]'s [limb].</span>")
 			return
-		if(M != user)
-			user.visible_message("<span class='notice'>[user] starts to apply [src] to [M]'s [limb].</span>", \
-								 "<span class='notice'>You start to apply [src] to [M]'s [limb].</span>", \
+		if(M == user)
+			user.visible_message("<span class='notice'>[user] starts to apply [src] to [H]'s [limb].</span>", \
+								 "<span class='notice'>You start to apply [src] to [H]'s [limb].</span>", \
 								 "<span class='notice'>You hear something being wrapped.</span>")
-		else
-			if((!user.hand && affecting.limb_name in list("r_arm", "r_hand")) || (user.hand && affecting.limb_name in list("l_arm", "l_hand")))
-				to_chat(user, "<span class='danger'>You can't apply a splint to the arm you're using!</span>")
+			if(!do_mob(user, H, self_delay))
 				return
-			user.visible_message("<span class='notice'>[user] starts to apply [src] to their [limb].</span>", \
-								 "<span class='notice'>You start to apply [src] to your [limb].</span>", \
-								 "<span class='notice'>You hear something being wrapped.</span>")
-		if(do_after(user, 50, target = M))
-			if(M != user)
-				user.visible_message("<span class='notice'>[user] finishes applying [src] to [M]'s [limb].</span>", \
-									"<span class='notice'>You finish applying [src] to [M]'s [limb].</span>", \
-									"<span class='notice'>You hear something being wrapped.</span>")
-			else
-				if(prob(25))
-					user.visible_message("<span class='notice'>[user] successfully applies [src] to their [limb].</span>", \
-										 "<span class='notice'>You successfully apply [src] to your [limb].</span>", \
-										 "<span class='notice'>You hear something being wrapped.</span>")
-				else
-					user.visible_message("<span class='warning'>[user] fumbles [src].</span>",
-										 "<span class='warning'>You fumble [src].</span>",
-										 "<span class='warning'>You hear something being wrapped.</span>")
-					return
-			affecting.status |= ORGAN_SPLINTED
-			use(1)
+		else
+			user.visible_message("<span class='green'>[user] applies [src] to their [limb].</span>", \
+								 "<span class='green'>You apply [src] to your [limb].</span>", \
+								 "<span class='green'>You hear something being wrapped.</span>")
+
+		affecting.status |= ORGAN_SPLINTED
+		use(1)

code/game/objects/items/stacks/sheets/light.dm

@@ -21,16 +21,16 @@
 		new/obj/item/stack/sheet/glass(user.loc)
 		if(amount <= 0)
 			user.unEquip(src, 1)
-			del(src)
+			qdel(src)
 
 	if(istype(O,/obj/item/stack/sheet/metal))
 		var/obj/item/stack/sheet/metal/M = O
 		M.amount--
 		if(M.amount <= 0)
 			user.unEquip(src, 1)
-			del(M)
+			qdel(M)
 		amount--
 		new/obj/item/stack/tile/light(user.loc)
 		if(amount <= 0)
 			user.unEquip(src, 1)
-			del(src)
+			qdel(src)

code/game/objects/items/stacks/sheets/mineral.dm

@@ -125,11 +125,25 @@ var/global/list/datum/stack_recipe/mime_recipes = list ( \
 	origin_tech = "plasmatech=2;materials=2"
 	sheettype = "plasma"
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
+	burn_state = FLAMMABLE
+	burntime = 5
 
 /obj/item/stack/sheet/mineral/plasma/New()
 	..()
 	recipes = plasma_recipes
 
+/obj/item/stack/sheet/mineral/plasma/attackby(obj/item/weapon/W, mob/user, params)
+	if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite
+		message_admins("Plasma sheets ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+		log_game("Plasma sheets ignited by [key_name(user)] in ([x],[y],[z])")
+		fire_act()
+	else
+		return ..()
+
+/obj/item/stack/sheet/mineral/plasma/fire_act()
+	atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, amount*10)
+	qdel(src)
+
 /obj/item/stack/sheet/mineral/plastic
 	name = "Plastic"
 	icon_state = "sheet-plastic"

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -10,80 +10,82 @@
 /*
  * Metal
  */
-var/global/list/datum/stack_recipe/metal_recipes = list ( \
-	new/datum/stack_recipe("stool", /obj/structure/stool, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("chair", /obj/structure/stool/bed/chair, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("sofa (middle)", /obj/structure/stool/bed/chair/sofa, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("sofa (left)", /obj/structure/stool/bed/chair/sofa/left, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("sofa (right)", /obj/structure/stool/bed/chair/sofa/right, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("sofa (corner)", /obj/structure/stool/bed/chair/sofa/corner, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("barber chair", /obj/structure/stool/bed/chair/barber, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("wheelchair", /obj/structure/stool/bed/chair/wheelchair, 15, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1), \
-	null, \
-	new/datum/stack_recipe_list("office chairs",list( \
-		new/datum/stack_recipe("dark office chair", /obj/structure/stool/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("light office chair", /obj/structure/stool/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1), \
-		), 5), \
-	new/datum/stack_recipe_list("comfy chairs", list( \
-		new/datum/stack_recipe("beige comfy chair", /obj/structure/stool/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("black comfy chair", /obj/structure/stool/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("brown comfy chair", /obj/structure/stool/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("lime comfy chair", /obj/structure/stool/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("teal comfy chair", /obj/structure/stool/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("red comfy chair", /obj/structure/stool/bed/chair/comfy/red, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("blue comfy chair", /obj/structure/stool/bed/chair/comfy/blue, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("purple comfy chair", /obj/structure/stool/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("green comfy chair", /obj/structure/stool/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1), \
-		), 2), \
-	null, \
-	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2), \
-	new/datum/stack_recipe("glass table frame parts", /obj/item/weapon/table_parts/glass, 2), \
-	new/datum/stack_recipe("rack parts", /obj/item/weapon/rack_parts), \
-	new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = 1, on_floor = 1), \
-	null, \
-	new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = 1, on_floor = 1), \
-	null, \
-	new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
-	new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
-	null, \
-	new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, time = 25, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = 1, on_floor = 1), \
-	null, \
-	new/datum/stack_recipe_list("airlock assemblies", list( \
-		new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-/*		new/datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), \ */
-		new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 50, one_per_turf = 1, on_floor = 1), \
-		), 4), \
-	null, \
-	new/datum/stack_recipe("mass driver button frame", /obj/item/mounted/frame/driver_button, 1, time = 50, one_per_turf = 0, on_floor = 1), \
-	new/datum/stack_recipe("light switch frame", /obj/item/mounted/frame/light_switch, 1, time = 50, one_per_turf = 0, on_floor = 1), \
-	null, \
-	new/datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade), \
-	new/datum/stack_recipe("light fixture frame", /obj/item/mounted/frame/light_fixture, 2), \
-	new/datum/stack_recipe("small light fixture frame", /obj/item/mounted/frame/light_fixture/small, 1), \
-	null, \
-	new/datum/stack_recipe("apc frame", /obj/item/mounted/frame/apc_frame, 2), \
-	new/datum/stack_recipe("air alarm frame", /obj/item/mounted/frame/alarm_frame, 2), \
-	new/datum/stack_recipe("fire alarm frame", /obj/item/mounted/frame/firealarm, 2), \
-	new/datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2), \
-	null, \
+var/global/list/datum/stack_recipe/metal_recipes = list(
+	new /datum/stack_recipe("stool", /obj/structure/stool, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("chair", /obj/structure/stool/bed/chair, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("sofa (middle)", /obj/structure/stool/bed/chair/sofa, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("sofa (left)", /obj/structure/stool/bed/chair/sofa/left, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("sofa (right)", /obj/structure/stool/bed/chair/sofa/right, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("sofa (corner)", /obj/structure/stool/bed/chair/sofa/corner, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("barber chair", /obj/structure/stool/bed/chair/barber, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("wheelchair", /obj/structure/stool/bed/chair/wheelchair, 15, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1),
+	null,
+	new /datum/stack_recipe_list("office chairs",list(
+		new /datum/stack_recipe("dark office chair", /obj/structure/stool/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("light office chair", /obj/structure/stool/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1),
+	), 5),
+
+	new /datum/stack_recipe_list("comfy chairs", list(
+		new /datum/stack_recipe("beige comfy chair", /obj/structure/stool/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("black comfy chair", /obj/structure/stool/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("brown comfy chair", /obj/structure/stool/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("lime comfy chair", /obj/structure/stool/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("teal comfy chair", /obj/structure/stool/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("red comfy chair", /obj/structure/stool/bed/chair/comfy/red, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("blue comfy chair", /obj/structure/stool/bed/chair/comfy/blue, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("purple comfy chair", /obj/structure/stool/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("green comfy chair", /obj/structure/stool/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1),
+	), 2),
+
+	null,
+	new /datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2),
+	new /datum/stack_recipe("glass table frame parts", /obj/item/weapon/table_parts/glass, 2),
+	new /datum/stack_recipe("rack parts", /obj/item/weapon/rack_parts),
+	new /datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = 1, on_floor = 1),
+	null,
+	new /datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = 1, on_floor = 1),
+	null,
+	new /datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20),
+	new /datum/stack_recipe/rods("metal rod", /obj/item/stack/rods, 1, 2, 60),
+	null,
+	new /datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, time = 25, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
+	null,
+	new /datum/stack_recipe_list("airlock assemblies", list(
+		new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1),
+/*		new /datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), */
+		new /datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 50, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 50, one_per_turf = 1, on_floor = 1),
+	), 4),
+	null,
+	new /datum/stack_recipe("mass driver button frame", /obj/item/mounted/frame/driver_button, 1, time = 50, one_per_turf = 0, on_floor = 1),
+	new /datum/stack_recipe("light switch frame", /obj/item/mounted/frame/light_switch, 1, time = 50, one_per_turf = 0, on_floor = 1),
+	null,
+	new /datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade),
+	new /datum/stack_recipe("light fixture frame", /obj/item/mounted/frame/light_fixture, 2),
+	new /datum/stack_recipe("small light fixture frame", /obj/item/mounted/frame/light_fixture/small, 1),
+	null,
+	new /datum/stack_recipe("apc frame", /obj/item/mounted/frame/apc_frame, 2),
+	new /datum/stack_recipe("air alarm frame", /obj/item/mounted/frame/alarm_frame, 2),
+	new /datum/stack_recipe("fire alarm frame", /obj/item/mounted/frame/firealarm, 2),
+	new /datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2),
+	null
 )
 
 /obj/item/stack/sheet/metal
@@ -106,13 +108,12 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 /*
  * Plasteel
  */
-var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
-	new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1), \
-	new/datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 50, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1), \
-	new/datum/stack_recipe("Mass Driver frame", /obj/machinery/mass_driver_frame, 3, time = 50, one_per_turf = 1), \
-
-	)
+var/global/list/datum/stack_recipe/plasteel_recipes = list(
+	new /datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1),
+	new /datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 50, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1),
+	new /datum/stack_recipe("Mass Driver frame", /obj/machinery/mass_driver_frame, 3, time = 50, one_per_turf = 1)
+)
 
 /obj/item/stack/sheet/plasteel
 	name = "plasteel"
@@ -132,21 +133,21 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 /*
  * Wood
  */
-var/global/list/datum/stack_recipe/wood_recipes = list ( \
-	new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
-	new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
-	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2), \
-	new/datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
-	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("wooden buckler", /obj/item/weapon/shield/riot/buckler, 20, time = 40), \
-	new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
-	new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
-	)
+var/global/list/datum/stack_recipe/wood_recipes = list(
+	new /datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1),
+	new /datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20),
+	new /datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2),
+	new /datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40),
+	new /datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("wooden buckler", /obj/item/weapon/shield/riot/buckler, 20, time = 40),
+	new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),
+	new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10)
+)
 
 /obj/item/stack/sheet/wood
 	name = "wooden planks"
@@ -155,6 +156,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	singular_name = "wood plank"
 	icon_state = "sheet-wood"
 	origin_tech = "materials=1;biotech=1"
+	burn_state = FLAMMABLE
 
 /obj/item/stack/sheet/wood/New(var/loc, var/amount=null)
 	recipes = wood_recipes
@@ -169,22 +171,23 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	singular_name = "cloth roll"
 	icon_state = "sheet-cloth"
 	origin_tech = "materials=2"
+	burn_state = FLAMMABLE
 
 /*
  * Cardboard
  */
-var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
-	new/datum/stack_recipe("box", /obj/item/weapon/storage/box), \
-	new/datum/stack_recipe("large box", /obj/item/weapon/storage/box/large, 4), \
-	new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/box/lights/tubes), \
-	new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/box/lights/bulbs), \
-	new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/box/mousetraps), \
-	new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
-	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
-	new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
-	new/datum/stack_recipe("folder", /obj/item/weapon/folder), \
-	new/datum/stack_recipe("cardboard tube", /obj/item/weapon/c_tube), \
-	new/datum/stack_recipe("cardboard box", /obj/structure/closet/cardboard, 4), \
+var/global/list/datum/stack_recipe/cardboard_recipes = list (
+	new /datum/stack_recipe("box", /obj/item/weapon/storage/box),
+	new /datum/stack_recipe("large box", /obj/item/weapon/storage/box/large, 4),
+	new /datum/stack_recipe("light tubes", /obj/item/weapon/storage/box/lights/tubes),
+	new /datum/stack_recipe("light bulbs", /obj/item/weapon/storage/box/lights/bulbs),
+	new /datum/stack_recipe("mouse traps", /obj/item/weapon/storage/box/mousetraps),
+	new /datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3),
+	new /datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg),
+	new /datum/stack_recipe("pizza box", /obj/item/pizzabox),
+	new /datum/stack_recipe("folder", /obj/item/weapon/folder),
+	new /datum/stack_recipe("cardboard tube", /obj/item/weapon/c_tube),
+	new /datum/stack_recipe("cardboard box", /obj/structure/closet/cardboard, 4),
 )
 
 /obj/item/stack/sheet/cardboard	//BubbleWrap
@@ -193,7 +196,8 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
 	singular_name = "cardboard sheet"
 	icon_state = "sheet-card"
 	origin_tech = "materials=1"
+	burn_state = FLAMMABLE
 
-/obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null)
-		recipes = cardboard_recipes
-		return ..()
+/obj/item/stack/sheet/cardboard/New(var/loc, var/amt = null)
+	recipes = cardboard_recipes
+	return ..()

code/game/objects/items/stacks/stack.dm

@@ -10,156 +10,172 @@
  */
 /obj/item/stack
 	origin_tech = "materials=1"
-	var/list/datum/stack_recipe/recipes
+	var/list/recipes = list() // /datum/stack_recipe
 	var/singular_name
 	var/amount = 1
 	var/max_amount //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount
 
-/obj/item/stack/New(var/loc, var/amount=null)
+/obj/item/stack/New(var/loc, var/amt = null)
 	..()
-	if(amount!=null)	//Allow for stacks with the amount=0
-		src.amount=amount
-	return
+	if(amt != null)	//Allow for stacks with the amount=0
+		amount = amt
 
 /obj/item/stack/Destroy()
-	if(usr && usr.machine==src)
+	if(usr && usr.machine == src)
 		usr << browse(null, "window=stack")
-	return ..()
+	..()
+	return QDEL_HINT_HARDDEL_NOW // because qdel'd stacks act strange for cyborgs
 
 /obj/item/stack/examine(mob/user)
 	if(..(user, 1))
-		to_chat(user, "There are [src.amount] [src.singular_name]\s in the stack.")
+		to_chat(user, "There are [amount] [singular_name]\s in the stack.")
 
-
-/obj/item/stack/attack_self(mob/user as mob)
+/obj/item/stack/attack_self(mob/user)
 	list_recipes(user)
 
-/obj/item/stack/proc/list_recipes(mob/user as mob, recipes_sublist)
+/obj/item/stack/proc/list_recipes(mob/user, recipes_sublist)
 	if(!recipes)
 		return
-	if(!src || amount<=0)
+
+	if(amount <= 0)
 		user << browse(null, "window=stack")
+		return
+
 	user.set_machine(src) //for correct work of onclose
+
 	var/list/recipe_list = recipes
 	if(recipes_sublist && recipe_list[recipes_sublist] && istype(recipe_list[recipes_sublist], /datum/stack_recipe_list))
 		var/datum/stack_recipe_list/srl = recipe_list[recipes_sublist]
 		recipe_list = srl.recipes
+
 	var/t1 = "Amount Left: [amount]<br>"
-	for(var/i=1;i<=recipe_list.len,i++)
+	for(var/i in 1 to recipe_list.len)
 		var/E = recipe_list[i]
 		if(isnull(E))
 			t1 += "<hr>"
 			continue
 
-		if(i>1 && !isnull(recipe_list[i-1]))
-			t1+="<br>"
+		if(i > 1 && !isnull(recipe_list[i - 1]))
+			t1 += "<br>"
 
 		if(istype(E, /datum/stack_recipe_list))
 			var/datum/stack_recipe_list/srl = E
-			if(src.amount >= srl.req_amount)
-				t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title] ([srl.req_amount] [src.singular_name]\s)</a>"
+			if(amount >= srl.req_amount)
+				t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title] ([srl.req_amount] [singular_name]\s)</a>"
 			else
-				t1 += "[srl.title] ([srl.req_amount] [src.singular_name]\s)<br>"
+				t1 += "[srl.title] ([srl.req_amount] [singular_name]\s)<br>"
 
 		if(istype(E, /datum/stack_recipe))
 			var/datum/stack_recipe/R = E
 			var/max_multiplier = round(src.amount / R.req_amount)
-			var/title as text
+			var/title
 			var/can_build = 1
-			can_build = can_build && (max_multiplier>0)
+			can_build = can_build && (max_multiplier > 0)
 			/*
 			if(R.one_per_turf)
 				can_build = can_build && !(locate(R.result_type) in usr.loc)
 			if(R.on_floor)
 				can_build = can_build && istype(usr.loc, /turf/simulated/floor)
 			*/
-			if(R.res_amount>1)
-				title+= "[R.res_amount]x [R.title]\s"
+			if(R.res_amount > 1)
+				title += "[R.res_amount]x [R.title]\s"
 			else
-				title+= "[R.title]"
-			title+= " ([R.req_amount] [src.singular_name]\s)"
+				title += "[R.title]"
+			title += " ([R.req_amount] [src.singular_name]\s)"
 			if(can_build)
-				t1 += text("<A href='?src=\ref[src];sublist=[recipes_sublist];make=[i]'>[title]</A>  ")
+				t1 += "<A href='?src=\ref[src];sublist=[recipes_sublist];make=[i]'>[title]</A>  "
 			else
-				t1 += text("[]", title)
+				t1 += "[title]"
 				continue
 			if(R.max_res_amount>1 && max_multiplier>1)
-				max_multiplier = min(max_multiplier, round(R.max_res_amount/R.res_amount))
+				max_multiplier = min(max_multiplier, round(R.max_res_amount / R.res_amount))
 				t1 += " |"
 				var/list/multipliers = list(5,10,25)
 				for(var/n in multipliers)
 					if(max_multiplier>=n)
-						t1 += " <A href='?src=\ref[src];make=[i];multiplier=[n]'>[n*R.res_amount]x</A>"
+						t1 += " <A href='?src=\ref[src];make=[i];multiplier=[n]'>[n * R.res_amount]x</A>"
 				if(!(max_multiplier in multipliers))
-					t1 += " <A href='?src=\ref[src];make=[i];multiplier=[max_multiplier]'>[max_multiplier*R.res_amount]x</A>"
+					t1 += " <A href='?src=\ref[src];make=[i];multiplier=[max_multiplier]'>[max_multiplier * R.res_amount]x</A>"
 
 	var/datum/browser/popup = new(user, "stack", name, 400, 400)
 	popup.set_content(t1)
 	popup.open(0)
 	onclose(user, "stack")
-	return
 
 /obj/item/stack/Topic(href, href_list)
 	..()
-	if((usr.restrained() || usr.stat || usr.get_active_hand() != src))
-		return
+	if(usr.incapacitated() || usr.get_active_hand() != src)
+		return 0
 
 	if(href_list["sublist"] && !href_list["make"])
 		list_recipes(usr, text2num(href_list["sublist"]))
 
 	if(href_list["make"])
-		if(src.amount < 1) del(src) //Never should happen
+		if(amount < 1)
+			qdel(src) //Never should happen
 
 		var/list/recipes_list = recipes
 		if(href_list["sublist"])
 			var/datum/stack_recipe_list/srl = recipes_list[text2num(href_list["sublist"])]
 			recipes_list = srl.recipes
+
 		var/datum/stack_recipe/R = recipes_list[text2num(href_list["make"])]
 		var/multiplier = text2num(href_list["multiplier"])
-		if(!multiplier) multiplier = 1
-		if(src.amount < R.req_amount*multiplier)
-			if(R.req_amount*multiplier>1)
-				to_chat(usr, "\red You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!")
+		if(!multiplier)
+			multiplier = 1
+
+		if(amount < R.req_amount * multiplier)
+			if(R.req_amount * multiplier>1)
+				to_chat(usr, "<span class='warning'>You haven't got enough [src] to build \the [R.req_amount * multiplier] [R.title]\s!</span>")
 			else
-				to_chat(usr, "\red You haven't got enough [src] to build \the [R.title]!")
-			return
+				to_chat(usr, "<span class='warning'>You haven't got enough [src] to build \the [R.title]!</span>")
+			return 0
+
 		if(R.one_per_turf && (locate(R.result_type) in usr.loc))
-			to_chat(usr, "\red There is another [R.title] here!")
-			return
+			to_chat(usr, "<span class='warning'>There is another [R.title] here!</span>")
+			return 0
+
 		if(R.on_floor && !istype(usr.loc, /turf/simulated))
-			to_chat(usr, "\red \The [R.title] must be constructed on the floor!")
-			return
+			to_chat(usr, "<span class='warning'>\The [R.title] must be constructed on the floor!</span>")
+			return 0
+
 		if(R.time)
-			to_chat(usr, "\blue Building [R.title] ...")
+			to_chat(usr, "<span class='notice'>Building [R.title] ...</span>")
 			if(!do_after(usr, R.time, target = usr))
-				return
-		if(src.amount < R.req_amount*multiplier)
+				return 0
+
+		if(amount < R.req_amount * multiplier)
 			return
-		var/atom/O = new R.result_type( usr.loc )
+
+		var/atom/O = new R.result_type(usr.loc)
 		O.dir = usr.dir
-		if(R.max_res_amount>1)
+		if(R.max_res_amount > 1)
 			var/obj/item/stack/new_item = O
-			new_item.amount = R.res_amount*multiplier
+			new_item.amount = R.res_amount * multiplier
 			//new_item.add_to_stacks(usr)
-		src.amount-=R.req_amount*multiplier
-		if(src.amount < 1) // Just in case a stack's amount ends up fractional somehow
+
+		R.post_build(src, O)
+
+		amount -= R.req_amount * multiplier
+		if(amount < 1) // Just in case a stack's amount ends up fractional somehow
 			var/oldsrc = src
 			src = null //dont kill proc after del()
 			usr.unEquip(oldsrc, 1)
-			del(oldsrc) // Not qdel, because qdel'd stacks act strange for cyborgs
-			if(istype(O,/obj/item))
+			qdel(oldsrc)
+			if(istype(O, /obj/item))
 				usr.put_in_hands(O)
+
 		O.add_fingerprint(usr)
 		//BubbleWrap - so newly formed boxes are empty
-		if( istype(O, /obj/item/weapon/storage) )
+		if(istype(O, /obj/item/weapon/storage))
 			for(var/obj/item/I in O)
-				del(I)
+				qdel(I)
 		//BubbleWrap END
-	if(src && usr.machine==src) //do not reopen closed window
-		spawn( 0 )
-			src.interact(usr)
+
+	if(src && usr.machine == src) //do not reopen closed window
+		spawn(0)
+			interact(usr)
 			return
-	return
 
 /obj/item/stack/proc/use(var/used)
 	if(amount < used)
@@ -169,19 +185,19 @@
 		if(usr)
 			usr.unEquip(src, 1)
 		spawn()
-			del(src) // Not qdel, because qdel'd stacks act strange for cyborgs
+			qdel(src)
 	update_icon()
 	return 1
 
-/obj/item/stack/proc/add_to_stacks(mob/usr as mob)
+/obj/item/stack/proc/add_to_stacks(mob/usr)
 	var/obj/item/stack/oldsrc = src
 	src = null
 	for(var/obj/item/stack/item in usr.loc)
-		if(item==oldsrc)
+		if(item == oldsrc)
 			continue
 		if(!istype(item, oldsrc.type))
 			continue
-		if(item.amount>=item.max_amount)
+		if(item.amount >= item.max_amount)
 			continue
 		oldsrc.attackby(item, usr)
 		to_chat(usr, "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s.")
@@ -204,7 +220,7 @@
 	use(amt)
 	return F
 
-/obj/item/stack/attack_hand(mob/user as mob)
+/obj/item/stack/attack_hand(mob/user)
 	if(user.get_inactive_hand() == src)
 		var/obj/item/stack/F = split(user, 1)
 		user.put_in_hands(F)
@@ -214,14 +230,15 @@
 	else
 		..()
 
-/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/stack/attackby(obj/item/W, mob/user, params)
 	..()
-	if(istype(W, src.type))
+	if(istype(W, type))
 		var/obj/item/stack/S = W
 		if(S.amount >= max_amount)
 			return 1
-		var/to_transfer as num
-		if(user.get_inactive_hand()==src)
+
+		var/to_transfer
+		if(user.get_inactive_hand() == src)
 			var/desired = input("How much would you like to transfer from this stack?", "How much?", 1) as null|num
 			if(!desired)
 				return
@@ -229,52 +246,22 @@
 			to_transfer = max(1,min(desired,S.max_amount-S.amount,src.amount))
 		else
 			to_transfer = min(src.amount, S.max_amount-S.amount)
-		S.amount+=to_transfer
-		if(S && usr.machine==S)
-			spawn(0) S.interact(usr)
-		src.use(to_transfer)
-		if(src && usr.machine==src)
-			spawn(0) src.interact(usr)
+
+		S.amount += to_transfer
+		if(S && usr.machine == S)
+			spawn(0)
+				S.interact(usr)
+		use(to_transfer)
+		if(src && usr.machine == src)
+			spawn(0)
+				interact(usr)
 		S.update_icon()
-	else return ..()
+	else
+		return ..()
 
-/obj/item/stack/proc/copy_evidences(obj/item/stack/from as obj)
-	src.blood_DNA = from.blood_DNA
-	src.fingerprints  = from.fingerprints
-	src.fingerprintshidden  = from.fingerprintshidden
-	src.fingerprintslast  = from.fingerprintslast
-	//TODO bloody overlay
-
-/*
- * Recipe datum
- */
-/datum/stack_recipe
-	var/title = "ERROR"
-	var/result_type
-	var/req_amount = 1
-	var/res_amount = 1
-	var/max_res_amount = 1
-	var/time = 0
-	var/one_per_turf = 0
-	var/on_floor = 0
-	New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1, time = 0, one_per_turf = 0, on_floor = 0)
-		src.title = title
-		src.result_type = result_type
-		src.req_amount = req_amount
-		src.res_amount = res_amount
-		src.max_res_amount = max_res_amount
-		src.time = time
-		src.one_per_turf = one_per_turf
-		src.on_floor = on_floor
-
-/*
- * Recipe list datum
- */
-/datum/stack_recipe_list
-	var/title = "ERROR"
-	var/list/recipes = null
-	var/req_amount = 1
-	New(title, recipes, req_amount = 1)
-		src.title = title
-		src.recipes = recipes
-		src.req_amount = req_amount
+/obj/item/stack/proc/copy_evidences(obj/item/stack/from)
+	blood_DNA			= from.blood_DNA
+	fingerprints		= from.fingerprints
+	fingerprintshidden	= from.fingerprintshidden
+	fingerprintslast	= from.fingerprintslast
+	//TODO bloody overlay

code/game/objects/items/stacks/stack_recipe.dm

@@ -0,0 +1,55 @@
+
+/*
+ * Recipe datum
+ */
+/datum/stack_recipe
+	var/title = "ERROR"
+	var/result_type
+	var/req_amount = 1
+	var/res_amount = 1
+	var/max_res_amount = 1
+	var/time = 0
+	var/one_per_turf = 0
+	var/on_floor = 0
+
+/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1, time = 0, one_per_turf = 0, on_floor = 0)
+	src.title = title
+	src.result_type = result_type
+	src.req_amount = req_amount
+	src.res_amount = res_amount
+	src.max_res_amount = max_res_amount
+	src.time = time
+	src.one_per_turf = one_per_turf
+	src.on_floor = on_floor
+
+/datum/stack_recipe/proc/post_build(var/obj/item/stack/S, var/obj/result)
+	return
+
+/* Special Recipes */
+
+/datum/stack_recipe/cable_restraints
+/datum/stack_recipe/cable_restraints/post_build(var/obj/item/stack/S, var/obj/result)
+	if(istype(result, /obj/item/weapon/restraints/handcuffs/cable))
+		result.color = S.color
+	..()
+
+/datum/stack_recipe/rods
+/datum/stack_recipe/rods/post_build(var/obj/item/stack/S, var/obj/result)
+	if(istype(result, /obj/item/stack/rods))
+		var/obj/item/stack/rods/R = result
+		R.update_icon()
+	..()
+
+/*
+ * Recipe list datum
+ */
+/datum/stack_recipe_list
+	var/title = "ERROR"
+	var/list/recipes = null
+	var/req_amount = 1
+
+/datum/stack_recipe_list/New(title, recipes, req_amount = 1)
+	src.title = title
+	src.recipes = recipes
+	src.req_amount = req_amount
+

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -37,6 +37,7 @@
 	icon_state = "tile_grass"
 	origin_tech = "biotech=1"
 	turf_type = /turf/simulated/floor/grass
+	burn_state = FLAMMABLE
 
 /*
  * Wood
@@ -48,6 +49,7 @@
 	desc = "an easy to fit wood floor tile"
 	icon_state = "tile-wood"
 	turf_type = /turf/simulated/floor/wood
+	burn_state = FLAMMABLE
 
 /*
  * Carpets
@@ -58,6 +60,7 @@
 	desc = "A piece of carpet. It is the same size as a floor tile"
 	icon_state = "tile-carpet"
 	turf_type = /turf/simulated/floor/carpet
+	burn_state = FLAMMABLE
 
 /*
  * Plasteel
@@ -100,6 +103,7 @@
 	desc = "A piece of carpet with a convincing star pattern."
 	icon_state = "tile_space"
 	turf_type = /turf/simulated/floor/fakespace
+	burn_state = FLAMMABLE
 
 /obj/item/stack/tile/fakespace/loaded
 	amount = 30

code/game/objects/items/toys.dm

@@ -257,31 +257,31 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "snappop"
 	w_class = 1
+	var/ash_type = /obj/effect/decal/cleanable/ash
 
-/obj/item/toy/snappop/throw_impact(atom/hit_atom)
-	..()
-	var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
-	s.set_up(3, 1, src)
+/obj/item/toy/snappop/proc/pop_burst(var/n=3, var/c=1)
+	var/datum/effect/system/spark_spread/s = new()
+	s.set_up(n, c, src)
 	s.start()
-	new /obj/effect/decal/cleanable/ash(src.loc)
-	visible_message("<span class='warning'>The [src.name] explodes!</span>","<span class='warning'>You hear a snap!</span>")
+	new ash_type(loc)
+	visible_message("<span class='warning'>[src] explodes!</span>",
+		"<span class='italics'>You hear a snap!</span>")
 	playsound(src, 'sound/effects/snap.ogg', 50, 1)
 	qdel(src)
 
+/obj/item/toy/snappop/fire_act()
+	pop_burst()
+
+/obj/item/toy/snappop/throw_impact(atom/hit_atom)
+	..()
+	pop_burst()
+
 /obj/item/toy/snappop/Crossed(H as mob|obj)
-	if((ishuman(H))) //i guess carp and shit shouldn't set them off
+	if(ishuman(H) || issilicon(H)) //i guess carp and shit shouldn't set them off
 		var/mob/living/carbon/M = H
-		if(M.m_intent == "run")
-			to_chat(M, "<span class='warning'>You step on the snap pop!</span>")
-
-			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
-			s.set_up(2, 0, src)
-			s.start()
-			new /obj/effect/decal/cleanable/ash(src.loc)
-			visible_message("<span class='warning'>The [name] explodes!</span>","<span class='warning'>You hear a snap!</span>")
-			playsound(src, 'sound/effects/snap.ogg', 50, 1)
-			qdel(src)
-
+		if(issilicon(H) || M.m_intent == "run")
+			to_chat(M, "<span class='danger'>You step on the snap pop!</span>")
+			pop_burst(2, 0)
 
 
 /*
@@ -394,6 +394,8 @@
 
 
 obj/item/toy/cards
+	burn_state = FLAMMABLE
+	burntime = 5
 	var/parentdeck = null
 	var/deckstyle = "nanotrasen"
 	var/card_hitsound = null
@@ -749,6 +751,7 @@ obj/item/toy/cards/deck/syndicate
 	card_throw_speed = 3
 	card_throw_range = 20
 	card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
+	burn_state = FIRE_PROOF
 
 /*
 || Custom card decks ||
@@ -884,6 +887,7 @@ obj/item/toy/cards/deck/syndicate/black
 	icon_state = "carpplushie"
 	attack_verb = list("bitten", "eaten", "fin slapped")
 	var/bitesound = 'sound/weapons/bite.ogg'
+	burn_state = FLAMMABLE
 
 // Attack mob
 /obj/item/toy/carpplushie/attack(mob/M as mob, mob/user as mob)
@@ -946,6 +950,7 @@ obj/item/toy/cards/deck/syndicate/black
 	icon = 'icons/obj/toy.dmi'
 	var/poof_sound = 'sound/weapons/thudswoosh.ogg'
 	attack_verb = list("poofed", "bopped", "whapped","cuddled","fluffed")
+	burn_state = FLAMMABLE
 
 /obj/item/toy/plushie/attack(mob/M as mob, mob/user as mob)
 	playsound(loc, poof_sound, 20, 1)	// Play the whoosh sound in local area
@@ -1071,6 +1076,7 @@ obj/item/toy/cards/deck/syndicate/black
  	item_state = "arm_blade"
  	attack_verb = list("pricked", "absorbed", "gored")
  	w_class = 2
+ 	burn_state = FLAMMABLE
 
 /*
  * Toy/fake flash

code/game/objects/items/trash.dm

@@ -6,6 +6,7 @@
 	icon = 'icons/obj/trash.dmi'
 	w_class = 1
 	desc = "This is rubbish."
+	burn_state = FLAMMABLE
 
 /obj/item/trash/raisins
 	name = "4no raisins"
@@ -42,6 +43,7 @@
 /obj/item/trash/plate
 	name = "Plate"
 	icon_state = "plate"
+	burn_state = FIRE_PROOF
 
 /obj/item/trash/snack_bowl
 	name = "Snack bowl"
@@ -58,6 +60,7 @@
 /obj/item/trash/tray
 	name = "Tray"
 	icon_state = "tray"
+	burn_state = FIRE_PROOF
 
 /obj/item/trash/candle
 	name = "candle"
@@ -73,6 +76,7 @@
 	icon_state = "cola"
 	var/is_glass = 0
 	var/is_plastic = 0
+	burn_state = FIRE_PROOF
 
 /obj/item/trash/gum
 	name = "chewed gum"

code/game/objects/items/weapons/RCD.dm

@@ -91,13 +91,13 @@ RCD
 	data["max_matter"] = max_matter
 	data["one_access"] = one_access
 	data["locked"] = locked
-	
+
 	if(menu == 2)
 		var/list/door_types_list = list()
 		for(var/type in allowed_door_types)
 			door_types_list[++door_types_list.len] = list("name" = allowed_door_types[type], "type" = type)
 		data["allowed_door_types"] = door_types_list
-		
+
 		data["door_accesses"] = door_accesses_list
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
@@ -110,14 +110,14 @@ RCD
 /obj/item/weapon/rcd/Topic(href, href_list, nowindow, state)
 	if(..())
 		return 1
-	
+
 	if(prob(20))
 		spark_system.start()
-	
+
 	if(href_list["mode"])
 		mode = text2num(href_list["mode"])
 		. = 1
-	
+
 	if(href_list["door_type"])
 		var/new_door_type = text2path(href_list["door_type"])
 		if(!(new_door_type in allowed_door_types))
@@ -125,11 +125,11 @@ RCD
 			return
 		door_type = new_door_type
 		. = 1
-	
+
 	if(href_list["menu"])
 		menu = text2num(href_list["menu"])
 		. = 1
-	
+
 	if(href_list["login"])
 		if(istype(usr,/mob/living/silicon))
 			locked = 0
@@ -142,15 +142,15 @@ RCD
 			if(istype(ID) && ID && check_access(ID))
 				locked = 0
 		. = 1
-	
+
 	if(href_list["logout"])
 		locked = 1
 		. = 1
-	
+
 	if(href_list["toggle_one_access"] && !locked)
 		one_access = !one_access
 		. = 1
-	
+
 	if(href_list["toggle_access"] && !locked)
 		var/href_access = text2num(href_list["toggle_access"])
 		if(href_access in door_accesses)
@@ -251,10 +251,10 @@ RCD
 						qdel(A)
 						return 1
 				return	0
-				
+
 			if(istype(A, /obj/structure/window)) // You mean the grille of course, do you?
 				A = locate(/obj/structure/grille) in A.loc
-			
+
 			if(istype(A, /obj/structure/grille))
 				if(!checkResource(2, user))
 					return 0
@@ -326,7 +326,7 @@ RCD
 		else
 			to_chat(user, "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin.")
 			return 0
-	
+
 	nanomanager.update_uis(src)
 
 /obj/item/weapon/rcd/proc/useResource(var/amount, var/mob/user)
@@ -354,6 +354,18 @@ RCD
 	desc = "A device used to rapidly build and deconstruct walls and floors."
 	canRwall = 1
 
+
+/obj/item/weapon/rcd/proc/detonate_pulse()
+	audible_message("<span class='danger'><b>[src] begins to vibrate and \
+		buzz loudly!</b></span>","<span class='danger'><b>[src] begins \
+		vibrating violently!</b></span>")
+	// 5 seconds to get rid of it
+	addtimer(src, "detonate_pulse_explode", 50)
+
+/obj/item/weapon/rcd/proc/detonate_pulse_explode()
+	explosion(src, 0, 0, 3, 1, flame_range = 1)
+	qdel(src)
+
 /obj/item/weapon/rcd/combat
 	name = "combat RCD"
 	max_matter = 500

code/game/objects/items/weapons/bee_briefcase.dm

@@ -64,6 +64,7 @@
 			//Play sound through the station intercomms, so everyone knows the doom you have wrought.
 			for(var/O in global_intercoms)
 				var/obj/item/device/radio/intercom/I = O
+				// TODO: Tie into space manager
 				if(I.z != ZLEVEL_STATION)	//Only broadcast to the station intercoms
 					continue
 				if(!I.on)					//Only broadcast to active intercoms (powered, switched on)
@@ -75,4 +76,4 @@
 			var/mob/living/simple_animal/hostile/poison/bees/syndi/B = new /mob/living/simple_animal/hostile/poison/bees/syndi(null)
 			B.master_and_friends = blood_list	//Doesn't automatically add the person who opens the case, so the bees will attack the user unless they gave their blood
 			B.forceMove(get_turf(user))			//RELEASE THE BEES!
-		bees_left -= 5
+		bees_left -= 5

code/game/objects/items/weapons/cards_ids.dm

@@ -105,13 +105,13 @@
 	var/photo
 	var/dat
 	var/stamped = 0
-	
+
 	var/obj/item/weapon/card/id/guest/guest_pass = null // Guest pass attached to the ID
 
 /obj/item/weapon/card/id/New()
 	..()
 	spawn(30)
-		if(ishuman(loc))
+		if(ishuman(loc) && blood_type == "\[UNSET\]")
 			var/mob/living/carbon/human/H = loc
 			SetOwnerInfo(H)
 
@@ -242,10 +242,10 @@
 	set name = "Remove Guest Pass"
 	set category = "Object"
 	set src in range(0)
-	
+
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	
+
 	if(guest_pass)
 		to_chat(usr, "<span class='notice'>You remove the guest pass from this ID.</span>")
 		guest_pass.forceMove(get_turf(src))
@@ -253,6 +253,37 @@
 	else
 		to_chat(usr, "<span class='warning'>There is no guest pass attached to this ID</span>")
 
+/obj/item/weapon/card/id/serialize()
+	var/list/data = ..()
+
+	data["sex"] = sex
+	data["age"] = age
+	data["btype"] = blood_type
+	data["dna_hash"] = dna_hash
+	data["fprint_hash"] = fingerprint_hash
+	data["access"] = access
+	data["job"] = assignment
+	data["account"] = associated_account_number
+	data["owner"] = registered_name
+	data["mining"] = mining_points
+	return data
+
+/obj/item/weapon/card/id/deserialize(list/data)
+	sex = data["sex"]
+	age = data["age"]
+	blood_type = data["btype"]
+	dna_hash = data["dna_hash"]
+	fingerprint_hash = data["fprint_hash"]
+	access = data["access"] // No need for a copy, the list isn't getting touched
+	assignment = data["job"]
+	associated_account_number = data["account"]
+	registered_name = data["owner"]
+	mining_points = data["mining"]
+	// We'd need to use icon serialization(b64) to save the photo, and I don't feel like i
+	UpdateName()
+	RebuildHTML()
+	..()
+
 /obj/item/weapon/card/id/silver
 	name = "identification card"
 	desc = "A silver card which shows honour and dedication."
@@ -767,4 +798,4 @@
 		if("TDgreen")
 			return "Thunderdome Green"
 		else
-			return capitalize(skin)
+			return capitalize(skin)

code/game/objects/items/weapons/cash.dm

@@ -23,6 +23,7 @@ var/global/list/moneytypes=list(
 	throw_speed = 1
 	throw_range = 2
 	w_class = 1
+	burn_state = FLAMMABLE
 	var/access = list()
 	access = access_crate_cash
 	var/worth = 1 // Per chip

code/game/objects/items/weapons/cigs.dm

@@ -59,6 +59,9 @@ LIGHTERS ARE IN LIGHTERS.DM
 		return ..()
 
 
+/obj/item/clothing/mask/cigarette/fire_act()
+	light()
+
 /obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/weapon/weldingtool))
@@ -110,7 +113,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 				to_chat(user, "<span class='notice'>[src] is full.</span>")
 
 
-/obj/item/clothing/mask/cigarette/proc/light(var/flavor_text = "[usr] lights the [name].")
+/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null)
 	if(!src.lit)
 		src.lit = 1
 		damtype = "fire"
@@ -136,8 +139,9 @@ LIGHTERS ARE IN LIGHTERS.DM
 		reagents.handle_reactions()
 		icon_state = icon_on
 		item_state = icon_on
-		var/turf/T = get_turf(src)
-		T.visible_message(flavor_text)
+		if(flavor_text)
+			var/turf/T = get_turf(src)
+			T.visible_message(flavor_text)
 		set_light(2, 0.25, "#E38F46")
 		processing_objects.Add(src)
 
@@ -321,14 +325,15 @@ LIGHTERS ARE IN LIGHTERS.DM
 	..()
 	reagents.add_reagent("nicotine", chem_volume)
 
-/obj/item/clothing/mask/cigarette/pipe/light(var/flavor_text = "[usr] lights the [name].")
+/obj/item/clothing/mask/cigarette/pipe/light(flavor_text = null)
 	if(!src.lit)
 		src.lit = 1
 		damtype = "fire"
 		icon_state = icon_on
 		item_state = icon_on
-		var/turf/T = get_turf(src)
-		T.visible_message(flavor_text)
+		if(flavor_text)
+			var/turf/T = get_turf(src)
+			T.visible_message(flavor_text)
 		processing_objects.Add(src)
 
 /obj/item/clothing/mask/cigarette/pipe/process()

code/game/objects/items/weapons/courtroom.dm

@@ -11,6 +11,7 @@
 	throwforce = 6.0
 	w_class = 2
 	attack_verb = list("bashed", "battered", "judged", "whacked")
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/gavelhammer/suicide_act(mob/user)
 	user.visible_message("<span class='warning'>[user] has sentenced \himself to death with the [src.name]! It looks like \he's trying to commit suicide.</span>")
@@ -25,6 +26,7 @@
 	force = 2.0
 	throwforce = 2.0
 	w_class = 1
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/gavelhammer))

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -13,6 +13,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "gift1"
 	item_state = "gift1"
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/a_gift/New()
 	..()
@@ -139,6 +140,7 @@
 	flags = NOBLUDGEON
 	amount = 25
 	max_amount = 25
+	burn_state = FLAMMABLE
 
 /obj/item/stack/wrapping_paper/attack_self(mob/user)
 	to_chat(user, "<span class='notice'>You need to use it on a package that has already been wrapped!</span>")

code/game/objects/items/weapons/grenades/atmosgrenade.dm

@@ -0,0 +1,24 @@
+
+
+
+/obj/item/weapon/grenade/gas
+	name = "Plasma Fire Grenade"
+	desc = "A compressed plasma grenade, used to start horrific plasma fires."
+	origin_tech = "materials=3;magnets=4;syndicate=4"
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "syndicate"
+	item_state = "flashbang"
+	var/spawn_contents = SPAWN_HEAT | SPAWN_TOXINS
+	var/spawn_amount = 100
+
+/obj/item/weapon/grenade/gas/prime()
+	var/turf/simulated/target_turf = get_turf(src)
+	if(istype(target_turf))
+		target_turf.atmos_spawn_air(spawn_contents, spawn_amount)
+		target_turf.air_update_turf()
+	qdel(src)
+
+/obj/item/weapon/grenade/gas/knockout
+	name = "Knockout Grenade"
+	desc = "A grenade that completely removes all air and heat from its detonation area."
+	spawn_contents = SPAWN_20C | SPAWN_N2O

code/game/objects/items/weapons/grenades/clusterbuster.dm

@@ -242,6 +242,16 @@
 	desc = "Reserved for those pesky request."
 	payload = /mob/living/simple_animal/crab
 
+/obj/item/weapon/grenade/clusterbuster/plasma
+	name = "Plasma Cluster Grenade"
+	desc = "For when everything needs to die in a fire."
+	payload = /obj/item/weapon/grenade/gas
+
+/obj/item/weapon/grenade/clusterbuster/n2o
+	name = "N2O Cluster Grenade"
+	desc = "For when you need to knock out EVERYONE."
+	payload = /obj/item/weapon/grenade/gas/knockout
+
 ////////////Clusterbuster of Clusterbusters////////////
 
 /obj/item/weapon/grenade/clusterbuster/mega_fox

code/game/objects/items/weapons/grenades/grenade.dm

@@ -9,6 +9,8 @@
 	throw_range = 20
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
+	burn_state = FLAMMABLE
+	burntime = 5
 	var/active = 0
 	var/det_time = 50
 	var/display_timer = 1

code/game/objects/items/weapons/handcuffs.dm

@@ -65,7 +65,7 @@
 /obj/item/weapon/restraints/handcuffs/cable
 	name = "cable restraints"
 	desc = "Looks like some cables tied together. Could be used to tie something up."
-	icon_state = "cuff_red"
+	icon_state = "cuff_white"
 	materials = list(MAT_METAL=150, MAT_GLASS=75)
 	breakouttime = 300 //Deciseconds = 30s
 	cuffsound = 'sound/weapons/cablecuff.ogg'

code/game/objects/items/weapons/mop.dm

@@ -11,6 +11,7 @@
 	throw_range = 7
 	w_class = 3
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
+	burn_state = FLAMMABLE
 	var/mopping = 0
 	var/mopcount = 0
 	var/mopcap = 5

code/game/objects/items/weapons/paint.dm

@@ -8,6 +8,8 @@
 	item_state = "paintcan"
 	materials = list(MAT_METAL=200)
 	w_class = 3
+	burn_state = FLAMMABLE
+	burntime = 5
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(5,10,20,30,50,70)
 	volume = 70

code/game/objects/items/weapons/pneumaticCannon.dm

@@ -16,6 +16,14 @@
 	var/list/loadedItems = list() //The items loaded into the cannon that will be fired out
 	var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws
 
+/obj/item/weapon/pneumatic_cannon/Destroy()
+	if(tank)
+		qdel(tank)
+		tank = null
+	for(var/obj/item/I in loadedItems)
+		qdel(I)
+	loadedItems.Cut()
+	return ..()
 
 /obj/item/weapon/pneumatic_cannon/examine(mob/user)
 	..()

code/game/objects/items/weapons/scrolls.dm

@@ -9,6 +9,7 @@
 	throw_speed = 4
 	throw_range = 20
 	origin_tech = "bluespace=4"
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/teleportation_scroll/apprentice
 	name = "lesser scroll of teleportation"

code/game/objects/items/weapons/shields.dm

@@ -44,6 +44,7 @@
 	icon_state = "buckler"
 	item_state = "buckler"
 	materials = list()
+	burn_state = FLAMMABLE
 	block_chance = 30
 
 /obj/item/weapon/shield/energy

code/game/objects/items/weapons/signs.dm

@@ -6,6 +6,7 @@
 	force = 5
 	w_class = 4
 	attack_verb = list("bashed","smacked")
+	burn_state = FLAMMABLE
 
 	var/delayed = 0 //used to do delays
 

code/game/objects/items/weapons/staff.dm

@@ -10,6 +10,7 @@
 	w_class = 2
 	armour_penetration = 100
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/twohanded/staff/broom
 	name = "broom"

code/game/objects/items/weapons/storage/backpack.dm

@@ -15,6 +15,8 @@
 	max_w_class = 3
 	max_combined_w_class = 21
 	storage_slots = 21
+	burn_state = FLAMMABLE
+	burntime = 20
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/back.dmi'
@@ -22,7 +24,7 @@
 
 /obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	playsound(src.loc, "rustle", 50, 1, -5)
-	..()
+	return ..()
 
 /*
  * Backpack Types
@@ -35,6 +37,7 @@
 	icon_state = "holdingpack"
 	max_w_class = 5
 	max_combined_w_class = 35
+	burn_state = FIRE_PROOF
 
 	New()
 		..()
@@ -123,12 +126,14 @@
 	desc = "It's a special backpack made exclusively for Nanotrasen officers."
 	icon_state = "captainpack"
 	item_state = "captainpack"
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/storage/backpack/industrial
 	name = "industrial backpack"
 	desc = "It's a tough backpack for the daily grind of station life."
 	icon_state = "engiepack"
 	item_state = "engiepack"
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/storage/backpack/botany
 	name = "botany backpack"
@@ -153,6 +158,7 @@
 	desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
 	icon_state = "toxpack"
 	item_state = "toxpack"
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/storage/backpack/virology
 	name = "virology backpack"
@@ -168,6 +174,7 @@
 	name = "leather satchel"
 	desc = "It's a very fancy satchel made with fine leather."
 	icon_state = "satchel"
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/storage/backpack/satcheldeluxe
 	name = "leather satchel"
@@ -188,6 +195,7 @@
 	name = "industrial satchel"
 	desc = "A tough satchel with extra pockets."
 	icon_state = "satchel-eng"
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/storage/backpack/satchel_med
 	name = "medical satchel"
@@ -213,6 +221,7 @@
 	name = "scientist satchel"
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/storage/backpack/satchel_sec
 	name = "security satchel"
@@ -228,6 +237,7 @@
 	name = "captain's satchel"
 	desc = "An exclusive satchel for Nanotrasen officers."
 	icon_state = "satchel-cap"
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/storage/backpack/satchel_flat
 	name = "smuggler's satchel"
@@ -266,8 +276,8 @@
 	slowdown = 1
 
 /obj/item/weapon/storage/backpack/duffel/syndie
-	name = "suspicious looking dufflebag"
-	desc = "A large dufflebag for holding extra tactical supplies."
+	name = "suspicious looking duffelbag"
+	desc = "A large duffelbag for holding extra tactical supplies."
 	icon_state = "duffel-syndi"
 	item_state = "duffel-syndimed"
 	origin_tech = "syndicate=1"
@@ -287,7 +297,7 @@
 	item_state = "duffel-syndiammo"
 
 /obj/item/weapon/storage/backpack/duffel/syndie/ammo/loaded
-	desc = "A large dufflebag, packed to the brim with Bulldog shotgun ammo."
+	desc = "A large duffelbag, packed to the brim with Bulldog shotgun ammo."
 
 /obj/item/weapon/storage/backpack/duffel/syndie/ammo/loaded/New()
 	..()
@@ -302,10 +312,10 @@
 	new /obj/item/ammo_box/magazine/m12g/dragon(src)
 
 /obj/item/weapon/storage/backpack/duffel/syndie/surgery
-	name = "surgery dufflebag"
-	desc = "A suspicious looking dufflebag for holding surgery tools."
+	name = "surgery duffelbag"
+	desc = "A suspicious looking duffelbag for holding surgery tools."
 	icon_state = "duffel-syndimed"
-	item_state = "duffle-syndimed"
+	item_state = "duffel-syndimed"
 
 /obj/item/weapon/storage/backpack/duffel/syndie/surgery/New()
 	..()
@@ -323,10 +333,10 @@
 	new /obj/item/device/mmi/syndie(src)
 
 /obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake //for maint spawns
-	name = "surgery dufflebag"
-	desc = "A suspicious looking dufflebag for holding surgery tools."
+	name = "surgery duffelbag"
+	desc = "A suspicious looking duffelbag for holding surgery tools."
 	icon_state = "duffel-syndimed"
-	item_state = "duffle-syndimed"
+	item_state = "duffel-syndimed"
 
 /obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake/New()
 	..()
@@ -346,6 +356,7 @@
 	desc = "A duffelbag designed to hold large quantities of condoms."
 	icon_state = "duffel-captain"
 	item_state = "duffel-captain"
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/storage/backpack/duffel/security
 	name = "security duffelbag"
@@ -388,6 +399,7 @@
 	desc = "A duffelbag designed to hold tools."
 	icon_state = "duffel-eng"
 	item_state = "duffel-eng"
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/storage/backpack/duffel/hydro
 	name = "hydroponics duffelbag"

code/game/objects/items/weapons/storage/bags.dm

@@ -162,7 +162,7 @@
 	max_w_class = 3
 	w_class = 1
 	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown", "/obj/item/stack/tile/grass","/obj/item/stack/medical/ointment/aloe","/obj/item/stack/medical/bruise_pack/comfrey", "/obj/item/weapon/reagent_containers/honeycomb")
-
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/storage/bag/plants/portaseeder
 	name = "portable seed extractor"
@@ -375,7 +375,8 @@
 	max_combined_w_class = 21
 	max_w_class = 3
 	w_class = 4 //Bigger than a book because physics
-	can_hold = list("/obj/item/weapon/book", "/obj/item/weapon/spellbook") //No bibles, consistent with bookcase
+	can_hold = list("/obj/item/weapon/book", "/obj/item/weapon/storage/bible", "/obj/item/weapon/tome", "/obj/item/weapon/spellbook")
+	burn_state = FLAMMABLE
 
 /*
  * Trays - Agouri
@@ -484,7 +485,7 @@
 	max_combined_w_class = 200
 	w_class = 1
 	can_hold = list("/obj/item/weapon/reagent_containers/food/pill","/obj/item/weapon/reagent_containers/glass/beaker","/obj/item/weapon/reagent_containers/glass/bottle")
-
+	burn_state = FLAMMABLE
 /*
  *  Biowaste bag (mostly for xenobiologists)
  */
@@ -497,4 +498,5 @@
 	storage_slots = 25
 	max_combined_w_class = 200
 	w_class = 1
-	can_hold = list("/obj/item/slime_extract","/obj/item/weapon/reagent_containers/food/snacks/monkeycube","/obj/item/weapon/reagent_containers/syringe","/obj/item/weapon/reagent_containers/glass/beaker","/obj/item/weapon/reagent_containers/glass/bottle","/obj/item/weapon/reagent_containers/blood","/obj/item/weapon/reagent_containers/hypospray/autoinjector")
+	can_hold = list("/obj/item/slime_extract","/obj/item/weapon/reagent_containers/food/snacks/monkeycube","/obj/item/weapon/reagent_containers/syringe","/obj/item/weapon/reagent_containers/glass/beaker","/obj/item/weapon/reagent_containers/glass/bottle","/obj/item/weapon/reagent_containers/blood","/obj/item/weapon/reagent_containers/hypospray/autoinjector")
+	burn_state = FLAMMABLE

code/game/objects/items/weapons/storage/belt.dm

@@ -37,7 +37,9 @@
 		src.add_fingerprint(usr)
 		return
 
-
+/obj/item/weapon/storage/belt/deserialize(list/data)
+	..()
+	update_icon()
 
 /obj/item/weapon/storage/belt/utility
 	name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.

code/game/objects/items/weapons/storage/bible.dm

@@ -5,6 +5,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3
+	burn_state = FLAMMABLE
 	var/mob/affecting = null
 	var/deity_name = "Christ"
 

code/game/objects/items/weapons/storage/boxes.dm

@@ -24,6 +24,7 @@
 	desc = "It's just an ordinary box."
 	icon_state = "box"
 	item_state = "syringe_kit"
+	burn_state = FLAMMABLE
 	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap
 
 /obj/item/weapon/storage/box/large

code/game/objects/items/weapons/storage/briefcase.dm

@@ -12,6 +12,8 @@
 	max_w_class = 3
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+	burn_state = FLAMMABLE
+	burntime = 20
 
 /obj/item/weapon/storage/briefcase/New()
 	..()

code/game/objects/items/weapons/storage/fancy.dm

@@ -17,6 +17,7 @@
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = "donutbox6"
 	name = "donut box"
+	burn_state = FLAMMABLE
 	var/icon_type = "donut"
 
 /obj/item/weapon/storage/fancy/update_icon(var/itemremoved = 0)

code/game/objects/items/weapons/storage/firstaid.dm

@@ -138,15 +138,15 @@
 
 /obj/item/weapon/storage/firstaid/adv/New()
 	..()
-	if(empty) return
-	new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
-	new /obj/item/stack/medical/bruise_pack/advanced(src)
+	if(empty)
+		return
+	new /obj/item/stack/medical/bruise_pack(src)
 	new /obj/item/stack/medical/bruise_pack/advanced(src)
 	new /obj/item/stack/medical/bruise_pack/advanced(src)
 	new /obj/item/stack/medical/ointment/advanced(src)
 	new /obj/item/stack/medical/ointment/advanced(src)
-	new /obj/item/stack/medical/splint(src)
-	return
+	new /obj/item/weapon/reagent_containers/hypospray/autoinjector(src)
+	new /obj/item/device/healthanalyzer(src)
 
 /obj/item/weapon/storage/firstaid/adv/empty
 	empty = 1

code/game/objects/items/weapons/storage/storage.dm

@@ -323,7 +323,7 @@
 	return 1
 
 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target
-/obj/item/weapon/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location)
+/obj/item/weapon/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location, burn = 0)
 	if(!istype(W)) return 0
 
 	if(istype(src, /obj/item/weapon/storage/fancy))
@@ -357,8 +357,14 @@
 	W.on_exit_storage(src)
 	update_icon()
 	W.mouse_opacity = initial(W.mouse_opacity)
+	if(burn)
+		W.fire_act()
 	return 1
 
+/obj/item/weapon/storage/empty_object_contents(burn, loc)
+	for(var/obj/item/Item in contents)
+		remove_from_storage(Item, loc, burn)
+
 //This proc is called when you want to place an item into the storage item.
 /obj/item/weapon/storage/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
@@ -541,3 +547,34 @@
 
 	return depth
 
+/obj/item/weapon/storage/serialize()
+	var data = ..()
+	var/list/content_list = list()
+	data["content"] = content_list
+	data["slots"] = storage_slots
+	data["max_w_class"] = max_w_class
+	data["max_c_w_class"] = max_combined_w_class
+	for(var/thing in contents)
+		var/atom/movable/AM = thing
+		// This code does not watch out for infinite loops
+		// But then again a tesseract would destroy the server anyways
+		// Also I wish I could just insert a list instead of it reading it the wrong way
+		content_list.len++
+		content_list[content_list.len] = AM.serialize()
+	return data
+
+/obj/item/weapon/storage/deserialize(list/data)
+	if(isnum(data["slots"]))
+		storage_slots = data["slots"]
+	if(isnum(data["max_w_class"]))
+		max_w_class = data["max_w_class"]
+	if(isnum(data["max_c_w_class"]))
+		max_combined_w_class = data["max_c_w_class"]
+	for(var/thing in contents)
+		qdel(thing) // out with the old
+	for(var/thing in data["content"])
+		if(islist(thing))
+			list_to_object(thing, src)
+		else
+			log_debug("Non-list thing: [thing]. We are a [name]")
+	..()

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -195,4 +195,13 @@
 	new /obj/item/ammo_casing/shotgun/dart/assassination(src)
 	new /obj/item/ammo_casing/shotgun/dart/assassination(src)
 	new /obj/item/ammo_casing/shotgun/dart/assassination(src)
-	new /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane(src)
+	new /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane(src)
+
+
+/obj/item/weapon/storage/box/syndie_kit/atmosgasgrenades
+	name = "Atmos Grenades"
+
+/obj/item/weapon/storage/box/syndie_kit/atmosgasgrenades/New()
+	..()
+	new /obj/item/weapon/grenade/clusterbuster/plasma(src)
+	new /obj/item/weapon/grenade/clusterbuster/n2o(src)

code/game/objects/items/weapons/storage/wallets.dm

@@ -5,6 +5,7 @@
 	icon = 'icons/obj/wallets.dmi'
 	icon_state = "wallet"
 	w_class = 2
+	burn_state = FLAMMABLE
 	can_hold = list(
 		"/obj/item/weapon/spacecash",
 		"/obj/item/weapon/card",

code/game/objects/items/weapons/stunbaton.dm

@@ -23,6 +23,12 @@
 	update_icon()
 	return
 
+/obj/item/weapon/melee/baton/Destroy()
+	if(bcell)
+		qdel(bcell)
+		bcell = null
+	return ..()
+
 /obj/item/weapon/melee/baton/CheckParts(list/parts_list)
 	..()
 	bcell = locate(/obj/item/weapon/stock_parts/cell) in contents

code/game/objects/items/weapons/table_rack_parts.dm

@@ -40,6 +40,7 @@
 	icon_state = "wood_tableparts"
 	flags = null
 	upgradable = 0
+	burn_state = FLAMMABLE
 	result = /obj/structure/table/woodentable
 	parts = list(
 		/obj/item/stack/sheet/wood,

code/game/objects/items/weapons/tanks/tanks.dm

@@ -35,6 +35,7 @@
 /obj/item/weapon/tank/Destroy()
 	if(air_contents)
 		qdel(air_contents)
+		air_contents = null
 
 	processing_objects.Remove(src)
 

code/game/objects/items/weapons/tanks/watertank.dm

@@ -373,7 +373,8 @@
 			V.visible_message("<span class='danger'>[V] was frozen shut!</span>")
 		for(var/mob/living/L in T)
 			L.ExtinguishMob()
-	return
+		for(var/obj/item/Item in T)
+			Item.extinguish()
 
 /datum/effect/system/freezing_smoke_spread
 

code/game/objects/items/weapons/teleportation.dm

@@ -48,6 +48,7 @@ Frequency:
 		return 1
 
 	var/turf/current_location = get_turf(usr)//What turf is the user on?
+	// TODO: Tie into space manager
 	if(!current_location ||( current_location.z in config.admin_levels))//If turf was not found or they're on z level 2.
 		to_chat(usr, "<span class='warning'>\The [src] is malfunctioning.</span>")
 		return 1
@@ -61,6 +62,7 @@ Frequency:
 
 			for(var/obj/item/device/radio/beacon/W in beacons)
 				if(W.frequency == frequency && !W.syndicate)
+					// TODO: Tie into space manager
 					if(W && W.z == z)
 						var/turf/TB = get_turf(W)
 						temp += "[W.code]: [TB.x], [TB.y], [TB.z]<BR>"
@@ -107,7 +109,8 @@ Frequency:
 
 /obj/item/weapon/hand_tele/attack_self(mob/user as mob)
 	var/turf/current_location = get_turf(user)//What turf is the user on?
-	if(!current_location||(current_location.z in config.admin_levels)||current_location.z>=7)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
+	// TODO: Tie into space manager
+	if(!current_location||(current_location.z in config.admin_levels)||current_location.z>=ZLEVEL_EMPTY)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
 		to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
 		return
 	var/list/L = list(  )

code/game/objects/items/weapons/twohanded.dm

@@ -140,7 +140,7 @@
 	if(get_dist(src,user) > 1)
 		return 0
 	if(H != null)
-		user.visible_message("<span class='notice'>[src.name] is too cumbersome to carry in one hand!</span>")
+		to_chat(user, "<span class='notice'>[src.name] is too cumbersome to carry in one hand!</span>")
 		return
 	var/obj/item/weapon/twohanded/offhand/O = new(user)
 	user.put_in_inactive_hand(O)
@@ -365,6 +365,7 @@
 		if(!L.stat && prob(50))
 			var/mob/living/simple_animal/hostile/illusion/M = new(user.loc)
 			M.faction = user.faction.Copy()
+			M.attack_sound = hitsound
 			M.Copy_Parent(user, 100, user.health/2.5, 12, 30)
 			M.GiveTarget(L)
 
@@ -693,3 +694,55 @@
 				Z.ex_act(2)
 				charged = 3
 				playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
+
+// Energized Fire axe
+/obj/item/weapon/twohanded/energizedfireaxe
+	name = "energized fire axe"
+	desc = "Someone with a love for fire axes decided to turn one into a single-charge energy weapon. Seems excessive."
+	icon_state = "fireaxe0"
+	force = 5
+	throwforce = 15
+	sharp = 1
+	edge = 1
+	w_class = 5
+	armour_penetration = 20
+	slot_flags = SLOT_BACK
+	force_unwielded  = 5
+	force_wielded = 30
+	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	var/charged = 1
+
+/obj/item/weapon/twohanded/energizedfireaxe/update_icon()
+	if(wielded)
+		icon_state = "fireaxe2"
+	else
+		icon_state = "fireaxe0"
+
+/obj/item/weapon/twohanded/energizedfireaxe/afterattack(atom/A, mob/user, proximity)
+	if(!proximity)
+		return
+	if(wielded)
+		if(istype(A, /mob/living))
+			var/mob/living/Z = A
+			if(charged)
+				charged--
+				Z.take_organ_damage(0,30)
+				user.visible_message("<span class='danger'>[user] slams the charged axe into [Z.name] with all their might!</span>")
+				playsound(loc, 'sound/magic/lightningbolt.ogg', 5, 1)
+				var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+				sparks.set_up(1, 1, src)
+				sparks.start()
+
+		if(A && wielded && (istype(A, /obj/structure/window) || istype(A, /obj/structure/grille)))
+			if(istype(A, /obj/structure/window))
+				var/obj/structure/window/W = A
+				W.destroy()
+				if(prob(4))
+					charged++
+					user.visible_message("<span class='notice'>The axe starts to emit an electric buzz!</span>")
+			else
+				qdel(A)
+				if(prob(4))
+					charged++
+					user.visible_message("<span class='notice'>The axe starts to emit an electric buzz!</span>")

code/game/objects/objs.dm

@@ -16,7 +16,9 @@
 
 	var/Mtoollink = 0 // variable to decide if an object should show the multitool menu linking menu, not all objects use it
 
-
+	var/burn_state = FIRE_PROOF // LAVA_PROOF | FIRE_PROOF | FLAMMABLE | ON_FIRE
+	var/burntime = 10 //How long it takes to burn to ashes, in seconds
+	var/burn_world_time //What world time the object will burn up completely
 	var/being_shocked = 0
 
 	var/on_blueprints = FALSE //Are we visible on the station blueprints at roundstart?
@@ -288,4 +290,32 @@ a {
 	being_shocked = 0
 
 /obj/proc/CanAStarPass()
-	. = !density
+	. = !density
+
+/obj/fire_act(global_overlay=1)
+	if(!burn_state)
+		burn_state = ON_FIRE
+		fire_master.burning += src
+		burn_world_time = world.time + burntime*rand(10,20)
+		if(global_overlay)
+			overlays += fire_overlay
+		return 1
+
+/obj/proc/burn()
+	empty_object_contents(1, loc)
+	var/obj/effect/decal/cleanable/ash/A = new(loc)
+	A.desc = "Looks like this used to be a [name] some time ago."
+	fire_master.burning -= src
+	qdel(src)
+
+/obj/proc/extinguish()
+	if(burn_state == ON_FIRE)
+		burn_state = FLAMMABLE
+		overlays -= fire_overlay
+		fire_master.burning -= src
+
+/obj/proc/empty_object_contents(burn = 0, new_loc = loc)
+	for(var/obj/item/Item in contents) //Empty out the contents
+		Item.forceMove(new_loc)
+		if(burn)
+			Item.fire_act() //Set them on fire, too

code/game/objects/structures/artstuff.dm

@@ -15,6 +15,8 @@
 	icon = 'icons/obj/artstuff.dmi'
 	icon_state = "easel"
 	density = 1
+	burn_state = FLAMMABLE
+	burntime = 15
 	var/obj/item/weapon/canvas/painting = null
 
 
@@ -56,6 +58,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 	desc = "Draw out your soul on this canvas! Only crayons can draw on it. Examine it to focus on the canvas."
 	icon = 'icons/obj/artstuff.dmi'
 	icon_state = "11x11"
+	burn_state = FLAMMABLE
 	var/whichGlobalBackup = 1 //List index
 
 /obj/item/weapon/canvas/nineteenXnineteen

code/game/objects/structures/bedsheet_bin.dm

@@ -16,6 +16,7 @@ LINEN BINS
 	throw_range = 2
 	w_class = 1
 	item_color = "white"
+	burn_state = FLAMMABLE
 	slot_flags = SLOT_BACK
 
 
@@ -161,6 +162,8 @@ LINEN BINS
 	icon = 'icons/obj/structures.dmi'
 	icon_state = "linenbin-full"
 	anchored = 1
+	burn_state = FLAMMABLE
+	burntime = 20
 	var/amount = 20
 	var/list/sheets = list()
 	var/obj/item/hidden = null
@@ -184,6 +187,16 @@ LINEN BINS
 		else				icon_state = "linenbin-full"
 
 
+/obj/structure/bedsheetbin/fire_act()
+	if(!amount)
+		return
+	..()
+
+/obj/structure/bedsheetbin/burn()
+	amount = 0
+	extinguish()
+	update_icon()
+
 /obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params)
 	if(istype(I, /obj/item/weapon/bedsheet))
 		user.drop_item()

code/game/objects/structures/crates_lockers/closets.dm

@@ -192,6 +192,7 @@
 			return
 		var/obj/item/weapon/rcs/E = W
 		if(E.rcell && (E.rcell.charge >= E.chargecost))
+			// TODO: Tie into space manager
 			if(!(src.z in config.contact_levels))
 				to_chat(user, "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>")
 				return

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -5,6 +5,8 @@
 	icon_opened = "cardboard_open"
 	icon_closed = "cardboard"
 	health = 10
+	burn_state = FLAMMABLE
+	burntime = 20
 	sound = 'sound/effects/rustle2.ogg'
 	material_drop = /obj/item/stack/sheet/cardboard
 	cutting_sound = 'sound/items/poster_ripped.ogg'

code/game/objects/structures/crates_lockers/closets/coffin.dm

@@ -4,6 +4,9 @@
 	icon_state = "coffin"
 	icon_closed = "coffin"
 	icon_opened = "coffin_open"
+	burn_state = FLAMMABLE
+	burntime = 20
+	material_drop = /obj/item/stack/sheet/wood
 
 /obj/structure/closet/coffin/update_icon()
 	if(!opened)
@@ -16,4 +19,5 @@
 	icon_state = "sarc"
 	icon_closed = "sarc"
 	icon_opened = "sarc_open"
-	sound = 'sound/effects/stonedoor_openclose.ogg'
+	sound = 'sound/effects/stonedoor_openclose.ogg'
+	material_drop = /obj/item/stack/sheet/mineral/sandstone

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -4,6 +4,8 @@
 	icon_state = "cabinet_closed"
 	icon_closed = "cabinet_closed"
 	icon_opened = "cabinet_open"
+	burn_state = FLAMMABLE
+	burntime = 20
 
 /obj/structure/closet/cabinet/update_icon()
 	if(!opened)

code/game/objects/structures/crates_lockers/closets/secure/bar.dm

@@ -7,6 +7,8 @@
 	icon_opened = "cabinetdetective_open"
 	icon_broken = "cabinetdetective_broken"
 	icon_off = "cabinetdetective_broken"
+	burn_state = FLAMMABLE
+	burntime = 20
 
 
 	New()

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -117,12 +117,12 @@
 /obj/structure/closet/secure_closet/atmos_personal
 	name = "technician's locker"
 	req_access = list(access_atmospherics)
-	icon_state = "secureeng1"
-	icon_closed = "secureeng"
-	icon_locked = "secureeng1"
-	icon_opened = "secureengopen"
-	icon_broken = "secureengbroken"
-	icon_off = "secureengoff"
+	icon_state = "secureatm1"
+	icon_closed = "secureatm"
+	icon_locked = "secureatm1"
+	icon_opened = "secureatmopen"
+	icon_broken = "secureatmbroken"
+	icon_off = "secureatmoff"
 
 
 	New()

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -33,6 +33,8 @@
 	icon_opened = "cabinetdetective_open"
 	icon_broken = "cabinetdetective_broken"
 	icon_off = "cabinetdetective_broken"
+	burn_state = FLAMMABLE
+	burntime = 20
 
 /obj/structure/closet/secure_closet/personal/cabinet/update_icon()
 	if(broken)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -317,6 +317,8 @@
 	icon_opened = "cabinetdetective_open"
 	icon_broken = "cabinetdetective_broken"
 	icon_off = "cabinetdetective_broken"
+	burn_state = FLAMMABLE
+	burntime = 20
 
 	New()
 		..()
@@ -339,6 +341,7 @@
 		new /obj/item/clothing/accessory/holster/armpit(src)
 		new /obj/item/clothing/glasses/sunglasses/yeah(src)
 		new /obj/item/device/flashlight/seclite(src)
+		new /obj/item/clothing/accessory/black(src)
 
 /obj/structure/closet/secure_closet/detective/update_icon()
 	if(broken)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -168,8 +168,8 @@
 
 /obj/structure/closet/wardrobe/atmospherics_yellow
 	name = "atmospherics wardrobe"
-	icon_state = "yellow"
-	icon_closed = "yellow"
+	icon_state = "atmostech"
+	icon_closed = "atmostech"
 
 /obj/structure/closet/wardrobe/atmospherics_yellow/New()
 	..()
@@ -193,8 +193,8 @@
 
 /obj/structure/closet/wardrobe/engineering_yellow
 	name = "engineering wardrobe"
-	icon_state = "yellow"
-	icon_closed = "yellow"
+	icon_state = "engineer"
+	icon_closed = "engineer"
 
 /obj/structure/closet/wardrobe/engineering_yellow/New()
 	..()

code/game/objects/structures/crates_lockers/crates.dm

@@ -84,6 +84,7 @@
 	if(istype(W, /obj/item/weapon/rcs) && !src.opened)
 		var/obj/item/weapon/rcs/E = W
 		if(E.rcell && (E.rcell.charge >= E.chargecost))
+			// TODO: Tie into space manager
 			if(!(src.z in config.player_levels))
 				to_chat(user, "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>")
 				return

code/game/objects/structures/electricchair.dm

@@ -77,13 +77,10 @@
 	s.start()
 	visible_message("<span class='danger'>The electric chair went off!</span>", "<span class='danger'>You hear a deep sharp shock!</span>")
 	if(buckled_mob)
-		buckled_mob.burn_skin(90)
+		buckled_mob.electrocute_act(110, src, 1)
 		to_chat(buckled_mob, "<span class='danger'>You feel a deep shock course through your body!</span>")
-		sleep(1)
-		buckled_mob.burn_skin(90)
-		sleep(5)
-		buckled_mob.burn_skin(max(rand(5,20),rand(5,20),rand(5,20)))
-
+		spawn(1)
+			buckled_mob.electrocute_act(110, src, 1)
 	A.power_light = light
 	A.updateicon()
 	return

code/game/objects/structures/flora.dm

@@ -1,3 +1,7 @@
+/obj/structure/flora
+	burn_state = FLAMMABLE
+	burntime = 30
+
 //trees
 /obj/structure/flora/tree
 	name = "tree"
@@ -230,6 +234,7 @@
 	desc = "a rock"
 	icon_state = "rock1"
 	icon = 'icons/obj/flora/rocks.dmi'
+	burn_state = FIRE_PROOF
 	anchored = 1
 
 /obj/structure/flora/rock/New()

code/game/objects/structures/mineral_doors.dm

@@ -219,6 +219,8 @@
 /obj/structure/mineral_door/wood
 	mineralType = "wood"
 	hardness = 1
+	burn_state = FLAMMABLE
+	burntime = 30
 
 	Open()
 		isSwitchingStates = 1

code/game/objects/structures/morgue.dm

@@ -361,6 +361,8 @@
 				user.attack_log +="\[[time_stamp()]\] <font color='red'>Cremated [M.name] ([M.ckey])</font>"
 				log_attack("[user.name] ([user.ckey]) cremated [M.name] ([M.ckey])")
 			M.death(1)
+			if(!M || !isnull(M.gcDestroyed))
+				continue // Re-check for mobs that delete themselves on death
 			M.ghostize()
 			qdel(M)
 

code/game/objects/structures/signs.dm

@@ -41,6 +41,7 @@
 	desc = ""
 	icon = 'icons/obj/decals.dmi'
 	w_class = 3		//big
+	burn_state = FLAMMABLE
 	var/sign_state = ""
 
 /obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob)	//construction

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -13,6 +13,8 @@
 	icon_state = "bed"
 	can_buckle = 1
 	buckle_lying = 1
+	burn_state = FLAMMABLE
+	burntime = 30
 	var/movable = 0 // For mobility checks
 
 /obj/structure/stool/bed/MouseDrop(atom/over_object)
@@ -46,6 +48,7 @@
 	name = "roller bed"
 	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "down"
+	burn_state = FIRE_PROOF
 	anchored = 0
 
 /obj/structure/stool/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob, params)

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -3,6 +3,7 @@
 	desc = "You sit in this. Either by will or force."
 	icon_state = "chair"
 	buckle_lying = 0 //you sit in a chair, not lay
+	burn_state = FIRE_PROOF
 
 	var/propelled = 0 // Check for fire-extinguisher-driven chairs
 
@@ -76,6 +77,8 @@
 
 // Chair types
 /obj/structure/stool/bed/chair/wood
+	burn_state = FLAMMABLE
+	burntime = 20
 	// TODO:  Special ash subtype that looks like charred chair legs
 
 /obj/structure/stool/bed/chair/wood/normal
@@ -103,6 +106,8 @@
 	desc = "It looks comfy."
 	icon_state = "comfychair"
 	color = rgb(255,255,255)
+	burn_state = FLAMMABLE
+	burntime = 30
 	var/image/armrest = null
 
 /obj/structure/stool/bed/chair/comfy/New()

code/game/objects/structures/tables_racks.dm

@@ -369,6 +369,8 @@
 	parts = /obj/item/weapon/table_parts/wood
 	health = 50
 	canSmoothWith = list(/obj/structure/table/woodentable, /obj/structure/table/woodentable/poker)
+	burn_state = FLAMMABLE
+	burntime = 20
 	var/canPokerize = 1
 
 /obj/structure/table/woodentable/attackby(obj/item/I as obj, mob/user as mob, params)

code/game/objects/structures/watercloset.dm

@@ -249,12 +249,16 @@
 /obj/machinery/shower/proc/wash(atom/movable/O as obj|mob)
 	if(!on) return
 
+	if(istype(O, /obj/item))
+		var/obj/item/I = O
+		I.extinguish()
+
 	O.water_act(100, convertHeat(), src)
 
 	if(isliving(O))
 		var/mob/living/L = O
 		L.ExtinguishMob()
-		L.fire_stacks = -20 //Douse ourselves with water to avoid fire more easily
+		L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
 		to_chat(L, "<span class='warning'>You've been drenched in water!</span>")
 		if(iscarbon(O))
 			var/mob/living/carbon/M = O

code/game/objects/structures/window.dm

@@ -425,11 +425,6 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 		hit(round(exposed_volume / 1000), 0)
 	..()
 
-/obj/structure/window/plasmabasic/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > T0C + 32000)
-		hit(round(exposed_volume / 1000), 0)
-	..()
-
 /obj/structure/window/plasmabasic/BlockSuperconductivity()
 	return 1
 
@@ -457,9 +452,6 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 /obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	return
 
-/obj/structure/window/plasmareinforced/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	return
-
 /obj/structure/window/plasmareinforced/BlockSuperconductivity()
 	return 1 //okay this SHOULD MAKE THE TOXINS CHAMBER WORK