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

[MIRROR] Adds missing duffelbags for some jobs and update their respective vendors and closets. (#2967)

Browse Source 
* Adds missing duffelbags for some jobs and update their respective vendors and closets.

* Update roboticist.dm

Co-authored-by: Tristrian <Tiago.A.C.9@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-01-31 16:39:53 +00:00
committed by GitHub
co-authored by Tristrian Gandalf2k15
parent 52ca9be36b
commit 1a1d7be11a
15 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/backpack.dm
+38
View File
@@ -435,6 +435,44 @@
name = "surgical duffel bag"
desc = "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools."
/obj/item/storage/backpack/duffelbag/explorer
name = "explorator's duffel bag"
desc = "A large duffel bag for holding extra exotic treasures."
icon_state = "duffel-explorer"
inhand_icon_state = "duffel-explorer"
/obj/item/storage/backpack/duffelbag/hydroponics
name = "hydroponic's duffel bag"
desc = "A large duffel bag for holding extra gardening tools."
icon_state = "duffel-hydroponics"
inhand_icon_state = "duffel-hydroponics"
/obj/item/storage/backpack/duffelbag/chemistry
name = "chemistry duffel bag"
desc = "A large duffel bag for holding extra chemical substances."
icon_state = "duffel-chemistry"
inhand_icon_state = "duffel-chemistry"
/obj/item/storage/backpack/duffelbag/genetics
name = "geneticist's duffel bag"
desc = "A large duffel bag for holding extra genetic mutations."
icon_state = "duffel-genetics"
inhand_icon_state = "duffel-genetics"
/obj/item/storage/backpack/duffelbag/toxins
name = "scientist's duffel bag"
desc = "A large duffel bag for holding extra scientific components."
icon_state = "duffel-toxins"
inhand_icon_state = "duffel-toxins"
/obj/item/storage/backpack/duffelbag/virology
name = "virologist's duffel bag"
desc = "A large duffel bag for holding extra viral bottles."
icon_state = "duffel-virology"
inhand_icon_state = "duffel-virology"
/obj/item/storage/backpack/duffelbag/med/surgery/PopulateContents()
new /obj/item/scalpel(src)
new /obj/item/hemostat(src)
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+7 -2
View File
@@ -232,6 +232,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)
generate_items_inside(items_inside,src)
return
@@ -247,7 +248,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)
generate_items_inside(items_inside,src)
return
@@ -263,7 +265,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,)
generate_items_inside(items_inside,src)
return
@@ -276,6 +279,7 @@
/obj/item/clothing/accessory/pocketprotector = 1,
/obj/item/storage/backpack/science = 2,
/obj/item/storage/backpack/satchel/tox = 2,
/obj/item/storage/backpack/duffelbag/toxins = 2,
/obj/item/clothing/suit/hooded/wintercoat/science = 1,
/obj/item/clothing/under/rank/rnd/scientist = 3,
/obj/item/clothing/suit/toggle/labcoat/science = 3,
@@ -293,6 +297,7 @@
var/static/items_inside = 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 = 1,
/obj/item/clothing/suit/apron = 2,
/obj/item/clothing/suit/apron/overalls = 2,
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/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,
@@ -403,6 +405,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
@@ -421,7 +424,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
@@ -439,7 +443,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
icons/mob/clothing/back.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 128 KiB

icons/mob/inhands/equipment/backpack_lefthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 23 KiB

icons/mob/inhands/equipment/backpack_righthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 24 KiB

icons/obj/storage.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 82 KiB