cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strapless satchel moved to bag selection

Browse Source
This commit is contained in:
Casey
2022-03-20 14:32:26 -04:00
committed by CHOMPStation2
parent 5e9ad542d1
commit 361a2f1568
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_helpers/global_lists.dm
View File

@@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(custom_species_bases, new) // Species that can be used for a Cu
var/datum/category_collection/underwear/global_underwear = new() var/datum/category_collection/underwear/global_underwear = new()
//Backpacks //Backpacks
var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag", "Sports Bag") var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag", "Sports Bag", "Strapless Satchel") //VOREStation edit
var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic", "Wrist-Bound", "Slider") var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic", "Wrist-Bound", "Slider")
var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg) var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg)

2
code/datums/outfits/outfit.dm
View File

@@ -57,6 +57,7 @@ var/list/outfits_decls_by_type_
var/satchel_two = /obj/item/weapon/storage/backpack/satchel var/satchel_two = /obj/item/weapon/storage/backpack/satchel
var/messenger_bag = /obj/item/weapon/storage/backpack/messenger var/messenger_bag = /obj/item/weapon/storage/backpack/messenger
var/sports_bag = /obj/item/weapon/storage/backpack/sport var/sports_bag = /obj/item/weapon/storage/backpack/sport
var/satchel_three = /obj/item/weapon/storage/backpack/satchel/strapless
var/flags // Specific flags var/flags // Specific flags
@@ -78,6 +79,7 @@ var/list/outfits_decls_by_type_
if(4) back = satchel_two if(4) back = satchel_two
if(5) back = messenger_bag if(5) back = messenger_bag
if(6) back = sports_bag if(6) back = sports_bag
if(7) back = satchel_three
else back = null else back = null
/decl/hierarchy/outfit/proc/post_equip(mob/living/carbon/human/H) /decl/hierarchy/outfit/proc/post_equip(mob/living/carbon/human/H)

3
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
View File

@@ -74,9 +74,12 @@
display_name = "bluespace bracelet" display_name = "bluespace bracelet"
path = /obj/item/clothing/gloves/bluespace path = /obj/item/clothing/gloves/bluespace
cost = 5 cost = 5
<<<<<<< HEAD
/datum/gear/utility/satchel_strapless /datum/gear/utility/satchel_strapless
display_name = "satchel strapless" display_name = "satchel strapless"
path = /obj/item/weapon/storage/backpack/satchel/strapless path = /obj/item/weapon/storage/backpack/satchel/strapless
slot = slot_back slot = slot_back
cost = 1 cost = 1
=======
>>>>>>> a23bb91159... Merge pull request #12466 from BonniePandora/Strap-on,-more-like-strap-off