TGS Test Merge (#6040)

Citadel-Station-13 · Oct 4, 2023 · dfd2e4a · dfd2e4a
2 parents 358b642 + effca2d
commit dfd2e4a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
@@ -40,7 +40,7 @@ var/list/obj/item/uplink/world_uplinks = list()
 //!Underwear
 var/datum/category_collection/underwear/global_underwear = new()
 //!Backpacks - The load order here is important to maintain. Don't go swapping these around.
-var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag", "RIG", "Duffle Bag")
+var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Satchel Invis", "Messenger Bag", "RIG", "Duffle Bag")
 var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged","Minimalist", "Holographic", "Wrist-Bound")
 var/global/list/exclude_jobs = list(/datum/role/job/station/ai,/datum/role/job/station/cyborg)
 

diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
@@ -47,6 +47,7 @@
 	var/backpack = /obj/item/storage/backpack
 	var/satchel_one  = /obj/item/storage/backpack/satchel/norm
 	var/satchel_two  = /obj/item/storage/backpack/satchel
+	var/satchel_three = /obj/item/storage/backpack/satchel/invisible
 	var/messenger_bag = /obj/item/storage/backpack/messenger
 	var/rig = /obj/item/storage/backpack/rig
 	var/dufflebag = /obj/item/storage/backpack/dufflebag
@@ -61,9 +62,10 @@
 			if(2) back = backpack
 			if(3) back = satchel_one
 			if(4) back = satchel_two
-			if(5) back = messenger_bag
-			if(6) back = rig
-			if(7) back = dufflebag
+			if(5) back = satchel_three
+			if(6) back = messenger_bag
+			if(7) back = rig
+			if(8) back = dufflebag
 			else  back = null
 
 /datum/outfit/proc/post_equip(mob/living/carbon/human/H)

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/jobs/job.dm b/code/modules/jobs/job.dm
@@ -444,8 +444,10 @@
 		if(4)
 			H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), SLOT_ID_BACK)
 		if(5)
-			H.equip_to_slot_or_del(new /obj/item/storage/backpack/messenger(H), SLOT_ID_BACK)
+			H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/invisible(H), SLOT_ID_BACK)
 		if(6)
-			H.equip_to_slot_or_del(new /obj/item/storage/backpack/rig(H), SLOT_ID_BACK)
+			H.equip_to_slot_or_del(new /obj/item/storage/backpack/messenger(H), SLOT_ID_BACK)
 		if(7)
+			H.equip_to_slot_or_del(new /obj/item/storage/backpack/rig(H), SLOT_ID_BACK)
+		if(8)
 			H.equip_to_slot_or_del(new /obj/item/storage/backpack/dufflebag(H), SLOT_ID_BACK)
diff --git a/code/modules/preferences/preference_setup/general/04_equipment.dm b/code/modules/preferences/preference_setup/general/04_equipment.dm
@@ -42,7 +42,7 @@
 			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)
+	if(pref.backbag > 8 || pref.backbag < 1)
 		pref.backbag = 1 //Same as above
 	character.backbag = pref.backbag
 

diff --git a/code/modules/preferences/preferences_setup.dm b/code/modules/preferences/preferences_setup.dm
@@ -28,7 +28,7 @@
 			var/datum/category_item/underwear/WRI = pick(WRC.items)
 			all_underwear[WRC.name] = WRI.name
 
-	backbag = rand(1, 7)
+	backbag = rand(1, 8)
 	pdachoice = rand(1, 7)
 	age = rand(current_species.min_age, current_species.max_age)
 	b_type = RANDOM_BLOOD_TYPE