Merge conflicts begone

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/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'
@@ -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"
@@ -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"
@@ -376,6 +376,7 @@
 	max_w_class = 3
 	w_class = 4 //Bigger than a book because physics
 	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/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/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