From a387fa093f38c589d97fe56031b0cbf41ffcccb8 Mon Sep 17 00:00:00 2001 From: Captain277 Date: Sun, 1 Oct 2023 11:23:46 -0700 Subject: [PATCH 1/3] Adds an Invisible Satchel for Aesthetics --- code/__HELPERS/global_lists.dm | 2 +- code/datums/outfits/outfit.dm | 8 +++++--- code/game/objects/items/storage/backpack.dm | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index cbdad2423fc2..b4a35aa25530 100644 --- 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 index 616f8af012c8..712443054274 100644 --- 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 index f496e6c3a1c3..55bbcc0796b7 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -350,6 +350,9 @@ desc = "A grotesque satchel made of sinew and bone." icon_state = "satchel-bone" +/obj/item/storage/backpack/satchel/invisible + icon_state = "satchel" + item_state = "none" //ERT backpacks. /obj/item/storage/backpack/ert From fb83642a5d588b6de74f653e6c408aa090aac990 Mon Sep 17 00:00:00 2001 From: Captain277 Date: Sun, 1 Oct 2023 11:31:54 -0700 Subject: [PATCH 2/3] Give it a special name and desc for examine. --- code/game/objects/items/storage/backpack.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 55bbcc0796b7..6501a2467937 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -351,7 +351,8 @@ icon_state = "satchel-bone" /obj/item/storage/backpack/satchel/invisible - icon_state = "satchel" + name = "integrated satchel" + desc = "A minimalist satchel designed to fit inside of clothing, directly against the skin." item_state = "none" //ERT backpacks. From effca2dede18dd2c2b25d68cba528836bd20ca90 Mon Sep 17 00:00:00 2001 From: Captain277 Date: Tue, 3 Oct 2023 10:51:38 -0700 Subject: [PATCH 3/3] Haha whoops. --- code/modules/jobs/job.dm | 6 ++++-- .../preferences/preference_setup/general/04_equipment.dm | 2 +- code/modules/preferences/preferences_setup.dm | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/jobs/job.dm b/code/modules/jobs/job.dm index ae99a808d2a8..5c4e8fd7329e 100644 --- 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 index ab57ec111d84..70145bc3b5b3 100644 --- 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 index ef1f401dcd1b..29675c8af5b5 100644 --- 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