cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds missing duffelbags for some jobs and update their respective vendors and closets. (#56505)

Browse Source 
add: Added duffelbags for Science, Botany, Virology, Genetics, Mining and Chemistry.
This commit is contained in:
Tristrian
2021-01-30 19:36:00 -05:00
committed by GitHub
parent 86bba3dd9a
commit a4a7cf03bf
17 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/job_types/botanist.dm
+1 -1
View File
@@ -29,5 +29,5 @@
backpack = /obj/item/storage/backpack/botany
satchel = /obj/item/storage/backpack/satchel/hyd
duffelbag = /obj/item/storage/backpack/duffelbag/hydroponics
code/modules/jobs/job_types/chemist.dm
+1 -1
View File
@@ -33,7 +33,7 @@
suit = /obj/item/clothing/suit/toggle/labcoat/chemist
backpack = /obj/item/storage/backpack/chemistry
satchel = /obj/item/storage/backpack/satchel/chem
duffelbag = /obj/item/storage/backpack/duffelbag/med
duffelbag = /obj/item/storage/backpack/duffelbag/chemistry
box = /obj/item/storage/box/survival/medical
chameleon_extras = /obj/item/gun/syringe
code/modules/jobs/job_types/geneticist.dm
+1
View File
@@ -33,3 +33,4 @@
backpack = /obj/item/storage/backpack/genetics
satchel = /obj/item/storage/backpack/satchel/gen
duffelbag = /obj/item/storage/backpack/duffelbag/genetics
code/modules/jobs/job_types/research_director.dm
+1
View File
@@ -50,6 +50,7 @@
backpack = /obj/item/storage/backpack/science
satchel = /obj/item/storage/backpack/satchel/tox
duffelbag = /obj/item/storage/backpack/duffelbag/toxins
skillchips = list(/obj/item/skillchip/job/research_director)
code/modules/jobs/job_types/roboticist.dm
+1
View File
@@ -33,6 +33,7 @@
backpack = /obj/item/storage/backpack/science
satchel = /obj/item/storage/backpack/satchel/tox
duffelbag = /obj/item/storage/backpack/duffelbag/toxins
pda_slot = ITEM_SLOT_LPOCKET
code/modules/jobs/job_types/scientist.dm
+1
View File
@@ -34,6 +34,7 @@
backpack = /obj/item/storage/backpack/science
satchel = /obj/item/storage/backpack/satchel/tox
duffelbag = /obj/item/storage/backpack/duffelbag/toxins
/datum/outfit/job/scientist/pre_equip(mob/living/carbon/human/H)
..()
code/modules/jobs/job_types/shaft_miner.dm
+1 -1
View File
@@ -36,7 +36,7 @@
backpack = /obj/item/storage/backpack/explorer
satchel = /obj/item/storage/backpack/satchel/explorer
duffelbag = /obj/item/storage/backpack/duffelbag
duffelbag = /obj/item/storage/backpack/duffelbag/explorer
box = /obj/item/storage/box/survival/mining
chameleon_extras = /obj/item/gun/energy/kinetic_accelerator
code/modules/jobs/job_types/virologist.dm
+1 -1
View File
@@ -35,5 +35,5 @@
backpack = /obj/item/storage/backpack/virology
satchel = /obj/item/storage/backpack/satchel/vir
duffelbag = /obj/item/storage/backpack/duffelbag/med
duffelbag = /obj/item/storage/backpack/duffelbag/virology
box = /obj/item/storage/box/survival/medical
code/modules/mining/machine_vending.dm
+2
View File
@@ -279,6 +279,8 @@
/obj/item/storage/backpack/duffelbag/mining_conscript
name = "mining conscription kit"
desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
icon_state = "duffel-explorer"
inhand_icon_state = "duffel-explorer"
/obj/item/storage/backpack/duffelbag/mining_conscript/PopulateContents()
new /obj/item/clothing/glasses/meson(src)
code/modules/vending/wardrobes.dm
+7 -2
View File
@@ -169,6 +169,7 @@
products = list(/obj/item/clothing/accessory/pocketprotector = 3,
/obj/item/storage/backpack/science = 3,
/obj/item/storage/backpack/satchel/tox = 3,
/obj/item/storage/backpack/duffelbag/toxins = 3,
/obj/item/clothing/head/beret/science = 3,
/obj/item/clothing/suit/hooded/wintercoat/science = 3,
/obj/item/clothing/under/rank/rnd/scientist = 3,
@@ -190,6 +191,7 @@
vend_reply = "Thank you for using the Hydrobe!"
products = list(/obj/item/storage/backpack/botany = 2,
/obj/item/storage/backpack/satchel/hyd = 2,
/obj/item/storage/backpack/duffelbag/hydroponics = 2,
/obj/item/clothing/suit/hooded/wintercoat/hydro = 2,
/obj/item/clothing/suit/apron = 2,
/obj/item/clothing/suit/apron/overalls = 3,
@@ -398,6 +400,7 @@
/obj/item/clothing/suit/toggle/labcoat/chemist = 2,
/obj/item/storage/backpack/chemistry = 2,
/obj/item/storage/backpack/satchel/chem = 2,
/obj/item/storage/backpack/duffelbag/chemistry = 2,
/obj/item/storage/bag/chemistry = 2)
contraband = list(/obj/item/reagent_containers/spray/syndicate = 2)
refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe
@@ -416,7 +419,8 @@
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/storage/backpack/genetics = 2,
/obj/item/storage/backpack/satchel/gen = 2)
/obj/item/storage/backpack/satchel/gen = 2,
/obj/item/storage/backpack/duffelbag/genetics = 2)
refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe
payment_department = ACCOUNT_SCI
/obj/item/vending_refill/wardrobe/gene_wardrobe
@@ -434,7 +438,8 @@
/obj/item/clothing/suit/toggle/labcoat/virologist = 2,
/obj/item/clothing/mask/surgical = 2,
/obj/item/storage/backpack/virology = 2,
/obj/item/storage/backpack/satchel/vir = 2)
/obj/item/storage/backpack/satchel/vir = 2,
/obj/item/storage/backpack/duffelbag/virology = 2)
refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe
payment_department = ACCOUNT_MED
/obj/item/vending_refill/wardrobe/viro_wardrobe