Skip to content

Commit

Permalink
TGS Test Merge (#6040)
Browse files Browse the repository at this point in the history
  • Loading branch information
Blue authored and Blue committed Oct 2, 2023
2 parents 9767842 + fb83642 commit 60dd49d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 5 additions & 3 deletions code/datums/outfits/outfit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 60dd49d

Please sign in to comment.