cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 14:08:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add sports bags to outfits

Browse Source
This commit is contained in:
Aronai Sieyes
2021-06-28 17:00:41 -04:00
parent c9dfea4fa7
commit 414e8c97a3
10 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_helpers/global_lists.dm
+1 -1
View File
@@ -50,7 +50,7 @@ GLOBAL_LIST_INIT(custom_species_bases, new) // Species that can be used for a Cu
var/datum/category_collection/underwear/global_underwear = new()
//Backpacks
var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag")
var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag", "Sports Bag")
var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic", "Wrist-Bound")
var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg)
code/datums/outfits/jobs/civilian.dm
+1
View File
@@ -68,6 +68,7 @@
backpack = /obj/item/weapon/storage/backpack/hydroponics
satchel_one = /obj/item/weapon/storage/backpack/satchel/hyd
messenger_bag = /obj/item/weapon/storage/backpack/messenger/hyd
sports_bag = /obj/item/weapon/storage/backpack/sport/hyd
id_type = /obj/item/weapon/card/id/civilian/service/botanist //VOREStation Edit
pda_type = /obj/item/device/pda/botanist
code/datums/outfits/jobs/medical.dm
+1
View File
@@ -65,6 +65,7 @@
suit = /obj/item/clothing/suit/storage/toggle/labcoat/chemist
backpack = /obj/item/weapon/storage/backpack/chemistry
satchel_one = /obj/item/weapon/storage/backpack/satchel/chem
sports_bag = /obj/item/weapon/storage/backpack/sport/chem
id_type = /obj/item/weapon/card/id/medical/chemist
pda_type = /obj/item/device/pda/chemist
code/datums/outfits/jobs/science.dm
+1
View File
@@ -7,6 +7,7 @@
backpack = /obj/item/weapon/storage/backpack/toxins
satchel_one = /obj/item/weapon/storage/backpack/satchel/tox
messenger_bag = /obj/item/weapon/storage/backpack/messenger/tox
sports_bag = /obj/item/weapon/storage/backpack/sport/tox
/decl/hierarchy/outfit/job/science/rd
name = OUTFIT_JOB_NAME("Research Director")
code/datums/outfits/jobs/security.dm
+1
View File
@@ -8,6 +8,7 @@
satchel_one = /obj/item/weapon/storage/backpack/satchel/sec
backpack_contents = list(/obj/item/weapon/handcuffs = 1)
messenger_bag = /obj/item/weapon/storage/backpack/messenger/sec
sports_bag = /obj/item/weapon/storage/backpack/sport/sec
/decl/hierarchy/outfit/job/security/hos
name = OUTFIT_JOB_NAME("Head of security")
code/datums/outfits/outfit.dm
+2
View File
@@ -56,6 +56,7 @@ var/list/outfits_decls_by_type_
var/satchel_one = /obj/item/weapon/storage/backpack/satchel/norm
var/satchel_two = /obj/item/weapon/storage/backpack/satchel
var/messenger_bag = /obj/item/weapon/storage/backpack/messenger
var/sports_bag = /obj/item/weapon/storage/backpack/sport
var/flags // Specific flags
@@ -76,6 +77,7 @@ var/list/outfits_decls_by_type_
if(3) back = satchel_one
if(4) back = satchel_two
if(5) back = messenger_bag
if(6) back = sports_bag
else back = null
/decl/hierarchy/outfit/proc/post_equip(mob/living/carbon/human/H)
code/game/antagonist/outsider/mercenary.dm
+1
View File
@@ -42,6 +42,7 @@ var/datum/antagonist/mercenary/mercs
if(player.backbag == 3) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(player), slot_back)
if(player.backbag == 4) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(player), slot_back)
if(player.backbag == 5) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(player), slot_back)
if(player.backbag == 6) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/sport(player), slot_back)
player.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(player), slot_in_backpack)
player.mind.tcrystals = DEFAULT_TELECRYSTAL_AMOUNT
code/game/antagonist/outsider/wizard.dm
+2 -1
View File
@@ -83,7 +83,8 @@ var/datum/antagonist/wizard/wizards
if(wizard_mob.backbag == 2) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back)
if(wizard_mob.backbag == 3) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(wizard_mob), slot_back)
if(wizard_mob.backbag == 4) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(wizard_mob), slot_back)
if(wizard_mob.backbag == 5) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back)
if(wizard_mob.backbag == 5) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(wizard_mob), slot_back)
if(wizard_mob.backbag == 6) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/sport(wizard_mob), slot_back)
wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box(wizard_mob), slot_in_backpack)
wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(wizard_mob), slot_r_store)
wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/spellbook(wizard_mob), slot_r_hand)
code/modules/client/preference_setup/general/04_equipment.dm
+2 -2
View File
@@ -36,8 +36,8 @@
pref.all_underwear -= underwear_category_name
// TODO - Looks like this is duplicating the work of sanitize_character() if so, remove
if(pref.backbag > 5 || pref.backbag < 1)
pref.backbag = 1 //Same as above
if(pref.backbag > backbaglist.len || pref.backbag < 1)
pref.backbag = 2 //Same as above
character.backbag = pref.backbag
if(pref.pdachoice > 6 || pref.pdachoice < 1)
code/modules/mob/new_player/preferences_setup.dm
+1 -1
View File
@@ -29,7 +29,7 @@
all_underwear[WRC.name] = WRI.name
backbag = rand(1,5)
backbag = rand(1,6)
pdachoice = rand(1,5)
age = rand(current_species.min_age, current_species.max_age)
b_type = RANDOM_BLOOD_TYPE