Merge pull request #1097 from ariaworld/fix-tailbags

[REFACTOR] Refactor, clean and optimize tailbag code.

code/controllers/subsystem/shuttle.dm

@@ -5,6 +5,7 @@ SUBSYSTEM_DEF(shuttle)
 	wait = 10
 	init_order = INIT_ORDER_SHUTTLE
 	flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK
+	runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // Splurt edit: Add RUNLEVEL_POSTGAME to let shuttles move after round is over.
 
 	var/list/mobile = list()
 	var/list/stationary = list()

modular_splurt/code/datums/components/crafting/recipes/recipes_clothing.dm

@@ -1,14 +1,14 @@
 /datum/crafting_recipe/tailbag
 	name = "Tailbag"
-	result = /obj/item/storage/tailbag
+	result = /obj/item/storage/wallet/tailbag
 	reqs = list(/obj/item/stack/sheet/leather = 2)
 	time = 30
 	category = CAT_CLOTHING
 
 /datum/crafting_recipe/tailbag_xl
 	name = "XL Tailbag"
-	result = /obj/item/storage/tailbag/xtralg
-	reqs = list(/obj/item/storage/tailbag = 1,
+	result = /obj/item/storage/wallet/tailbag/xtralg
+	reqs = list(/obj/item/storage/wallet/tailbag = 1,
 	/obj/item/stack/sheet/leather = 2)
 	time = 30
 	category = CAT_CLOTHING

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

@@ -18,3 +18,43 @@
 /obj/item/storage/wallet/bluespace/update_icon_state()
 	// Don't update icons
 	return
+
+// Tailbags
+/obj/item/storage/wallet/tailbag
+	name = "tailbag"
+	desc = "A bag for holding small items. It fastens around the base of the tail."
+	icon = 'modular_splurt/icons/obj/storage.dmi'
+	icon_state = "tailbag"
+
+/obj/item/storage/wallet/tailbag/update_icon_state()
+	// Don't update icons
+	return
+
+/obj/item/storage/wallet/tailbag/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_items = 6
+	STR.can_hold += typecacheof(list( // Extra items that can go in tailbags, more than wallets
+	/obj/item/restraints/handcuffs,
+	/obj/item/assembly/flash,
+	/obj/item/laser_pointer,
+	/obj/item/pda,
+	/obj/item/paicard
+	))
+
+/obj/item/storage/wallet/tailbag/xtralg
+	name = "XL Tailbag"
+	desc = "A larger tail bag for larger creatures"
+	icon = 'modular_splurt/icons/obj/storage.dmi'
+	icon_state = "tailbag_xl"
+
+/obj/item/storage/wallet/tailbag/xtralg/update_icon_state()
+	// Don't update icons
+	return
+
+/obj/item/storage/wallet/tailbag/xtralg/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_items = 8
+
+//

modular_splurt/code/modules/client/loadout/hands.dm

@@ -1,24 +1,24 @@
-/datum/gear/hands/paicard
-	name = "pAI device"
-	description = "A personal AI device for checking and downloading various personalities."
-	path = /obj/item/paicard
-
-/datum/gear/hands/tailbag
-	name = "Tailbag"
-	description = "A bag for holding small personal items, which fastens around the base of the tail."
-	path = /obj/item/storage/tailbag
-
-/datum/gear/hands/tarotdeck
-	name = "Tarot Deck"
-	description = "A full 78 card deck of Tarot Cards, no refunds on false predicitons."
-	path = /obj/item/toy/cards/deck/tarot
-
-//MODIFIED COSTS - MODULAR SPLURT
-/datum/gear/hands/straightrazor
-	cost = 6
-
-/datum/gear/hands/flask
-	cost = 1
-
-/datum/gear/hands/cigar
-	cost = 2
+/datum/gear/hands/paicard
+	name = "pAI device"
+	description = "A personal AI device for checking and downloading various personalities."
+	path = /obj/item/paicard
+
+/datum/gear/hands/tailbag
+	name = "Tailbag"
+	description = "A bag for holding small personal items, which fastens around the base of the tail."
+	path = /obj/item/storage/wallet/tailbag
+
+/datum/gear/hands/tarotdeck
+	name = "Tarot Deck"
+	description = "A full 78 card deck of Tarot Cards, no refunds on false predicitons."
+	path = /obj/item/toy/cards/deck/tarot
+
+//MODIFIED COSTS - MODULAR SPLURT
+/datum/gear/hands/straightrazor
+	cost = 6
+
+/datum/gear/hands/flask
+	cost = 1
+
+/datum/gear/hands/cigar
+	cost = 2

tgstation.dme

@@ -4584,7 +4584,6 @@
 #include "modular_splurt\code\game\objects\items\storage\boxes.dm"
 #include "modular_splurt\code\game\objects\items\storage\firstaid.dm"
 #include "modular_splurt\code\game\objects\items\storage\secure.dm"
-#include "modular_splurt\code\game\objects\items\storage\tailbag.dm"
 #include "modular_splurt\code\game\objects\items\storage\wallets.dm"
 #include "modular_splurt\code\game\objects\items\tanks\tank_types.dm"
 #include "modular_splurt\code\game\objects\items\weaponry\armyknife.dm"