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

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.
@@ -181,8 +183,8 @@
 		"/obj/item/weapon/melee/classic_baton",
 		"/obj/item/device/flashlight/seclite",
 		"/obj/item/taperoll/police",
-		"/obj/item/weapon/melee/classic_baton/telescopic"
-		)
+		"/obj/item/weapon/melee/classic_baton/telescopic",
+		"/obj/item/weapon/restraints/legcuffs/bola")
 
 /obj/item/weapon/storage/belt/security/sec/New()
 	..()
@@ -312,6 +314,10 @@
 		"/obj/item/ammo_casing/shotgun"
 		)
 
+/obj/item/weapon/storage/belt/bandolier/New()
+	..()
+	update_icon()
+
 /obj/item/weapon/storage/belt/bandolier/full/New()
 	..()
 	new /obj/item/ammo_casing/shotgun/beanbag(src)
@@ -435,6 +441,31 @@
 	icon_state = "fannypack_yellow"
 	item_state = "fannypack_yellow"
 
+/obj/item/weapon/storage/belt/rapier
+	name = "rapier sheath"
+	desc = "Can hold rapiers."
+	icon_state = "sheath"
+	item_state = "sheath"
+	storage_slots = 1
+	max_w_class = 4
+	can_hold = list("/obj/item/weapon/melee/rapier")
+
+/obj/item/weapon/storage/belt/rapier/update_icon()
+	icon_state = "[initial(icon_state)]"
+	item_state = "[initial(item_state)]"
+	if(contents.len)
+		icon_state = "[initial(icon_state)]-rapier"
+		item_state = "[initial(item_state)]-rapier"
+	if(isliving(loc))
+		var/mob/living/L = loc
+		L.update_inv_belt()
+	..()
+
+/obj/item/weapon/storage/belt/rapier/New()
+	..()
+	new /obj/item/weapon/melee/rapier(src)
+	update_icon()
+
 // -------------------------------------
 //     Bluespace Belt
 // -------------------------------------
@@ -476,7 +507,7 @@
 	allow_quick_empty = 1
 	can_hold = list(
 		"/obj/item/weapon/grenade/smokebomb",
-		"/obj/item/weapon/legcuffs/bolas"
+		"/obj/item/weapon/restraints/legcuffs/bola"
 		)
 
 	flags = NODROP
@@ -492,8 +523,8 @@
 	new /obj/item/weapon/grenade/smokebomb(src)
 	new /obj/item/weapon/grenade/smokebomb(src)
 	new /obj/item/weapon/grenade/smokebomb(src)
-	new /obj/item/weapon/legcuffs/bolas(src)
-	new /obj/item/weapon/legcuffs/bolas(src)
+	new /obj/item/weapon/restraints/legcuffs/bola(src)
+	new /obj/item/weapon/restraints/legcuffs/bola(src)
 	processing_objects.Add(src)
 	cooldown = world.time
 
@@ -504,7 +535,7 @@
 		for(S in src)
 			smokecount++
 		bolacount = 0
-		var/obj/item/weapon/legcuffs/bolas/B
+		var/obj/item/weapon/restraints/legcuffs/bola/B
 		for(B in src)
 			bolacount++
 		if(smokecount < 4)
@@ -513,7 +544,7 @@
 				smokecount++
 		if(bolacount < 2)
 			while(bolacount < 2)
-				new /obj/item/weapon/legcuffs/bolas(src)
+				new /obj/item/weapon/restraints/legcuffs/bola(src)
 				bolacount++
 		cooldown = world.time
 		update_icon()

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"
 
@@ -77,7 +78,7 @@
 		if((istype(M, /mob/living/carbon/human) && prob(60)))
 			bless(M)
 			for(var/mob/O in viewers(M, null))
-				O.show_message(text("\red <B>[] heals [] with the power of [src.deity_name]!</B>", user, M), 1)
+				O.show_message(text("<span class='danger'>[] heals [] with the power of [src.deity_name]!</span>", user, M), 1)
 			to_chat(M, "\red May the power of [src.deity_name] compel you to be healed!")
 			playsound(src.loc, "punch", 25, 1, -1)
 		else
@@ -85,11 +86,11 @@
 				M.adjustBrainLoss(10)
 				to_chat(M, "\red You feel dumber.")
 			for(var/mob/O in viewers(M, null))
-				O.show_message(text("\red <B>[] beats [] over the head with []!</B>", user, M, src), 1)
+				O.show_message(text("<span class='danger'>[] beats [] over the head with []!</span>", user, M, src), 1)
 			playsound(src.loc, "punch", 25, 1, -1)
 	else if(M.stat == 2)
 		for(var/mob/O in viewers(M, null))
-			O.show_message(text("\red <B>[] smacks []'s lifeless corpse with [].</B>", user, M, src), 1)
+			O.show_message(text("<span class='danger'>[] smacks []'s lifeless corpse with [].</span>", user, M, src), 1)
 		playsound(src.loc, "punch", 25, 1, -1)
 	return
 

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
@@ -705,3 +706,73 @@
 	new /obj/item/weapon/lipstick/green(src)
 	new /obj/item/weapon/lipstick/blue(src)
 	new /obj/item/weapon/lipstick/white(src)
+
+#define NODESIGN "None"
+#define NANOTRASEN "NanotrasenStandard"
+#define SYNDI "SyndiSnacks"
+#define HEART "Heart"
+#define SMILE "SmileyFace"
+
+/obj/item/weapon/storage/box/papersack
+	name = "paper sack"
+	desc = "A sack neatly crafted out of paper."
+	icon_state = "paperbag_None"
+	item_state = "paperbag_None"
+	foldable = null
+	var/design = NODESIGN
+
+/obj/item/weapon/storage/box/papersack/update_icon()
+	if(!contents.len)
+		icon_state = "[item_state]"
+	else icon_state = "[item_state]_closed"
+
+/obj/item/weapon/storage/box/papersack/attackby(obj/item/weapon/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/pen))
+		//if a pen is used on the sack, dialogue to change its design appears
+		if(contents.len)
+			to_chat(user, "<span class='warning'>You can't modify [src] with items still inside!</span>")
+			return
+		var/list/designs = list(NODESIGN, NANOTRASEN, SYNDI, HEART, SMILE)
+		var/switchDesign = input("Select a Design:", "Paper Sack Design", designs[1]) as null|anything in designs
+		if(!switchDesign)
+			return
+		if(get_dist(usr, src) > 1 && !usr.incapacitated())
+			to_chat(usr, "<span class='warning'>You have moved too far away!</span>")
+			return
+		if(design == switchDesign)
+			return
+		to_chat(usr, "<span class='notice'>You make some modifications to [src] using your pen.</span>")
+		design = switchDesign
+		icon_state = "paperbag_[design]"
+		item_state = "paperbag_[design]"
+		switch(design)
+			if(NODESIGN)
+				desc = "A sack neatly crafted out of paper."
+			if(NANOTRASEN)
+				desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go."
+			if(SYNDI)
+				desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program."
+			if(HEART)
+				desc = "A paper sack with a heart etched onto the side."
+			if(SMILE)
+				desc = "A paper sack with a crude smile etched onto the side."
+		return
+	else if(is_sharp(W))
+		if(!contents.len)
+			if(item_state == "paperbag_None")
+				to_chat(user, "<span class='notice'>You cut eyeholes into [src].</span>")
+				new /obj/item/clothing/head/papersack(user.loc)
+				qdel(src)
+				return
+			else if(item_state == "paperbag_SmileyFace")
+				to_chat(user, "<span class='notice'>You cut eyeholes into [src] and modify the design.</span>")
+				new /obj/item/clothing/head/papersack/smiley(user.loc)
+				qdel(src)
+				return
+	return ..()
+
+#undef NODESIGN
+#undef NANOTRASEN
+#undef SYNDI
+#undef HEART
+#undef SMILE

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/advanced/bruise_pack(src)
-	new /obj/item/stack/medical/advanced/bruise_pack(src)
-	new /obj/item/stack/medical/advanced/bruise_pack(src)
-	new /obj/item/stack/medical/advanced/ointment(src)
-	new /obj/item/stack/medical/advanced/ointment(src)
-	new /obj/item/stack/medical/splint(src)
-	return
+	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/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",