TGS Test Merge (#6040)

Citadel-Station-13 · Oct 9, 2023 · 457c432 · 457c432
2 parents ae00885 + 4011c6a
commit 457c432
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
@@ -350,6 +350,10 @@
 	desc = "A grotesque satchel made of sinew and bone."
 	icon_state = "satchel-bone"
 
+/obj/item/storage/backpack/satchel/invisible
+	name = "integrated satchel"
+	desc = "A minimalist satchel designed to fit inside of clothing, directly against the skin."
+	item_state = "none"
 
 //ERT backpacks.
 /obj/item/storage/backpack/ert

diff --git a/code/modules/holidays/halloween_loadout_masquarade.dm b/code/modules/holidays/halloween_loadout_masquarade.dm
@@ -648,4 +648,16 @@
 /obj/item/toy/ninja_katana
 */
 
+/**
+ * Non-costume seasonally restricted items.
+ */
+
+/datum/loadout_entry/seasonal/masquarade/aesthetic
+	antag_name = "Aesthetic"
+	abstract_type = /datum/loadout_entry/seasonal/masquarade/aesthetic
+
+/datum/loadout_entry/seasonal/masquarade/aesthetic/invisible_satchel
+	display_name = "Invisible Satchel"
+	path = /obj/item/storage/backpack/satchel/invisible
+
 #undef STD_DEF
diff --git a/code/modules/preferences/preference_setup/general/04_equipment.dm b/code/modules/preferences/preference_setup/general/04_equipment.dm
@@ -41,13 +41,7 @@
 		else
 			pref.all_underwear -= underwear_category_name
 
-	// TODO - Looks like this is duplicating the work of sanitize_character() if so, remove
-	if(pref.backbag > 7 || pref.backbag < 1)
-		pref.backbag = 1 //Same as above
 	character.backbag = pref.backbag
-
-	if(pref.pdachoice > 7 || pref.pdachoice < 1)
-		pref.pdachoice = 1
 	character.pdachoice = pref.pdachoice
 	return TRUE