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

[MIRROR] Adds wire brush to janivend and janiborg. Also adds ability to put it in janibelt. [MDB IGNORE] (#20012)

Browse Source 
* Adds wire brush to janivend and janiborg. Also adds ability to put it in janibelt.

* merge conflicts

---------

Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com>
Co-authored-by: lessthnthree <three@lessthanthree.dk>
This commit is contained in:
SkyratBot
2023-03-25 01:28:55 -07:00
committed by GitHub
co-authored by Helg2 lessthnthree
parent b032bd2980
commit 1210dfb9ef
3 changed files with 105 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/belt.dm
+38 -37
View File
@@ -74,7 +74,7 @@
/obj/item/weldingtool,
/obj/item/wirecutters,
/obj/item/wrench,
))
))
/obj/item/storage/belt/utility/chief
name = "\improper Chief Engineer's toolbelt" //"the Chief Engineer's toolbelt", because "Chief Engineer's toolbelt" is not a proper noun
@@ -266,7 +266,7 @@
/obj/item/tank/internals/emergency_oxygen,
/obj/item/weaponcell/medical, //SKYRAT EDIT MEDIGUNS
/obj/item/wrench/medical,
))
))
/obj/item/storage/belt/medical/paramedic
preload = TRUE
@@ -438,7 +438,7 @@
/obj/item/wirecutters,
/obj/item/wrench,
/obj/item/wormhole_jaunter,
))
))
/obj/item/storage/belt/mining/vendor/PopulateContents()
@@ -480,8 +480,8 @@
. = ..()
atom_storage.max_slots = 6
atom_storage.set_holdable(list(
/obj/item/soulstone
))
/obj/item/soulstone,
))
/obj/item/storage/belt/soulstone/full/PopulateContents()
for(var/i in 1 to 6)
@@ -503,8 +503,8 @@
. = ..()
atom_storage.max_slots = 1
atom_storage.set_holdable(list(
/obj/item/clothing/mask/luchador
))
/obj/item/clothing/mask/luchador,
))
/obj/item/storage/belt/military
name = "chest rig"
@@ -529,8 +529,8 @@
atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
atom_storage.set_holdable(list(
/obj/item/food,
/obj/item/reagent_containers/cup/glass
))
/obj/item/reagent_containers/cup/glass,
))
/obj/item/storage/belt/military/snack/full
@@ -540,28 +540,28 @@
var/rig_snacks
while(contents.len <= amount)
rig_snacks = pick(list(
/obj/item/food/candy,
/obj/item/food/cheesiehonkers,
/obj/item/food/cheesynachos,
/obj/item/food/chips,
/obj/item/food/cubannachos,
/obj/item/food/donkpocket,
/obj/item/food/nachos,
/obj/item/food/nugget,
/obj/item/food/rofflewaffles,
/obj/item/food/sosjerky,
/obj/item/food/spacetwinkie,
/obj/item/food/spaghetti/pastatomato,
/obj/item/food/syndicake,
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola,
/obj/item/reagent_containers/cup/glass/dry_ramen,
/obj/item/reagent_containers/cup/soda_cans/cola,
/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/obj/item/reagent_containers/cup/soda_cans/lemon_lime,
/obj/item/reagent_containers/cup/soda_cans/pwr_game,
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind,
/obj/item/reagent_containers/cup/soda_cans/space_up,
/obj/item/reagent_containers/cup/soda_cans/starkist,
/obj/item/food/candy,
/obj/item/food/cheesiehonkers,
/obj/item/food/cheesynachos,
/obj/item/food/chips,
/obj/item/food/cubannachos,
/obj/item/food/donkpocket,
/obj/item/food/nachos,
/obj/item/food/nugget,
/obj/item/food/rofflewaffles,
/obj/item/food/sosjerky,
/obj/item/food/spacetwinkie,
/obj/item/food/spaghetti/pastatomato,
/obj/item/food/syndicake,
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola,
/obj/item/reagent_containers/cup/glass/dry_ramen,
/obj/item/reagent_containers/cup/soda_cans/cola,
/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/obj/item/reagent_containers/cup/soda_cans/lemon_lime,
/obj/item/reagent_containers/cup/soda_cans/pwr_game,
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind,
/obj/item/reagent_containers/cup/soda_cans/space_up,
/obj/item/reagent_containers/cup/soda_cans/starkist,
))
new rig_snacks(src)
@@ -629,7 +629,7 @@
/obj/item/multitool,
/obj/item/reagent_containers/cup/glass/bottle/molotov,
/obj/item/screwdriver,
))
))
/obj/item/storage/belt/grenade/full/PopulateContents()
generate_items_inside(list(
@@ -657,8 +657,8 @@
. = ..()
atom_storage.max_slots = 6
atom_storage.set_holdable(list(
/obj/item/gun/magic/wand
))
/obj/item/gun/magic/wand,
))
/obj/item/storage/belt/wands/full/PopulateContents()
new /obj/item/gun/magic/wand/death(src)
@@ -701,7 +701,8 @@
/obj/item/reagent_containers/cup/bucket, //SKYRAT EDIT - Bucket
/obj/item/reagent_containers/spray,
/obj/item/soap,
))
/obj/item/wirebrush,
))
/obj/item/storage/belt/janitor/full/PopulateContents()
new /obj/item/lightreplacer(src)
@@ -725,7 +726,7 @@
atom_storage.set_holdable(list(
/obj/item/ammo_casing/a762,
/obj/item/ammo_casing/shotgun,
))
))
/obj/item/storage/belt/fannypack
name = "fannypack"
@@ -875,4 +876,4 @@
/obj/item/secateurs,
/obj/item/seeds,
/obj/item/shovel/spade,
))
))
code/modules/mob/living/silicon/robot/robot_model.dm
+45 -22
View File
@@ -315,10 +315,12 @@
/obj/item/borg/lollipop,
/obj/item/picket_sign/cyborg,
/obj/item/reagent_containers/borghypo/clown,
/obj/item/extinguisher/mini)
/obj/item/extinguisher/mini,
)
emag_modules = list(
/obj/item/reagent_containers/borghypo/clown/hacked,
/obj/item/reagent_containers/spray/waterflower/cyborg/hacked)
/obj/item/reagent_containers/spray/waterflower/cyborg/hacked,
)
model_select_icon = "service"
cyborg_base_icon = "clown"
hat_offset = -2
@@ -355,9 +357,12 @@
/obj/item/stack/rods/cyborg,
/obj/item/lightreplacer/cyborg, // Skyrat Edit - Surprised Engie borgs don't get these
/obj/item/stack/tile/iron/base/cyborg,
/obj/item/stack/cable_coil)
/obj/item/stack/cable_coil,
)
radio_channels = list(RADIO_CHANNEL_ENGINEERING)
emag_modules = list(/obj/item/borg/stun)
emag_modules = list(
/obj/item/borg/stun,
)
cyborg_base_icon = "engineer"
model_select_icon = "engineer"
model_traits = list(TRAIT_NEGATES_GRAVITY)
@@ -379,9 +384,13 @@
/obj/item/paint/paint_remover,
/obj/item/lightreplacer/cyborg,
/obj/item/holosign_creator,
/obj/item/reagent_containers/spray/cyborg_drying)
/obj/item/reagent_containers/spray/cyborg_drying,
/obj/item/wirebrush,
)
radio_channels = list(RADIO_CHANNEL_SERVICE)
emag_modules = list(/obj/item/reagent_containers/spray/cyborg_lube)
emag_modules = list(
/obj/item/reagent_containers/spray/cyborg_lube,
)
cyborg_base_icon = "janitor"
model_select_icon = "janitor"
hat_offset = -5
@@ -642,9 +651,12 @@
/obj/item/stack/medical/gauze,
/obj/item/stack/medical/bone_gel,
/obj/item/borg/apparatus/organ_storage,
/obj/item/borg/lollipop)
/obj/item/borg/lollipop,
)
radio_channels = list(RADIO_CHANNEL_MEDICAL)
emag_modules = list(/obj/item/reagent_containers/borghypo/medical/hacked)
emag_modules = list(
/obj/item/reagent_containers/borghypo/medical/hacked,
)
cyborg_base_icon = "medical"
model_select_icon = "medical"
model_traits = list(TRAIT_PUSHIMMUNE)
@@ -664,9 +676,12 @@
/obj/item/storage/bag/sheetsnatcher/borg,
/obj/item/gun/energy/recharge/kinetic_accelerator/cyborg,
/obj/item/gps/cyborg,
/obj/item/stack/marker_beacon)
/obj/item/stack/marker_beacon,
)
radio_channels = list(RADIO_CHANNEL_SCIENCE, RADIO_CHANNEL_SUPPLY)
emag_modules = list(/obj/item/borg/stun)
emag_modules = list(
/obj/item/borg/stun,
)
cyborg_base_icon = "miner"
model_select_icon = "miner"
hat_offset = 0
@@ -696,8 +711,11 @@
/obj/item/holosign_creator/cyborg,
/obj/item/borg/cyborghug/peacekeeper,
/obj/item/extinguisher,
/obj/item/borg/projectile_dampen)
emag_modules = list(/obj/item/reagent_containers/borghypo/peace/hacked)
/obj/item/borg/projectile_dampen,
)
emag_modules = list(
/obj/item/reagent_containers/borghypo/peace/hacked,
)
cyborg_base_icon = "peace"
model_select_icon = "standard"
model_traits = list(TRAIT_PUSHIMMUNE)
@@ -716,9 +734,12 @@
/obj/item/melee/baton/security/loaded,
/obj/item/gun/energy/disabler/cyborg,
/obj/item/clothing/mask/gas/sechailer/cyborg,
/obj/item/extinguisher/mini)
/obj/item/extinguisher/mini,
)
radio_channels = list(RADIO_CHANNEL_SECURITY)
emag_modules = list(/obj/item/gun/energy/laser/cyborg)
emag_modules = list(
/obj/item/gun/energy/laser/cyborg,
)
cyborg_base_icon = "sec"
model_select_icon = "security"
model_traits = list(TRAIT_PUSHIMMUNE)
@@ -772,7 +793,9 @@
/obj/item/chisel,
)
radio_channels = list(RADIO_CHANNEL_SERVICE)
emag_modules = list(/obj/item/reagent_containers/borghypo/borgshaker/hacked)
emag_modules = list(
/obj/item/reagent_containers/borghypo/borgshaker/hacked,
)
cyborg_base_icon = "service_m" // display as butlerborg for radial model selection
model_select_icon = "service"
special_light_key = "service"
@@ -801,8 +824,8 @@
/obj/item/card/emag,
/obj/item/crowbar/cyborg,
/obj/item/extinguisher/mini,
/obj/item/pinpointer/syndicate_cyborg)
/obj/item/pinpointer/syndicate_cyborg,
)
cyborg_base_icon = "synd_sec"
model_select_icon = "malf"
model_traits = list(TRAIT_PUSHIMMUNE)
@@ -838,8 +861,8 @@
/obj/item/pinpointer/syndicate_cyborg,
/obj/item/stack/medical/gauze,
/obj/item/gun/medbeam,
/obj/item/borg/apparatus/organ_storage)
/obj/item/borg/apparatus/organ_storage,
)
cyborg_base_icon = "synd_medical"
model_select_icon = "malf"
model_traits = list(TRAIT_PUSHIMMUNE)
@@ -871,8 +894,7 @@
/obj/item/pinpointer/syndicate_cyborg,
/obj/item/borg_chameleon,
/obj/item/card/emag,
)
)
cyborg_base_icon = "synd_engi"
model_select_icon = "malf"
model_traits = list(TRAIT_PUSHIMMUNE, TRAIT_NEGATES_GRAVITY)
@@ -883,7 +905,8 @@
name = "Highlander"
basic_modules = list(
/obj/item/claymore/highlander/robot,
/obj/item/pinpointer/nuke,)
/obj/item/pinpointer/nuke,
)
model_select_icon = "kilt"
cyborg_base_icon = "kilt"
hat_offset = -2
code/modules/vending/wardrobes.dm
+22 -21
View File
@@ -31,7 +31,7 @@
/obj/item/clothing/under/rank/security/officer/grey = 3,
/obj/item/clothing/under/pants/slacks = 3,
/obj/item/clothing/under/rank/security/officer/blueshirt = 3,
)
)
premium = list(
/obj/item/clothing/under/rank/security/officer/formal = 3,
/obj/item/clothing/suit/jacket/officer/blue = 3,
@@ -79,7 +79,7 @@
/obj/item/clothing/shoes/sneakers/blue = 4,
/obj/item/clothing/suit/apron/surgical = 4,
/obj/item/clothing/mask/surgical = 4,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe
payment_department = ACCOUNT_MED
@@ -107,7 +107,7 @@
/obj/item/clothing/mask/bandana/striped/engineering = 3,
/obj/item/clothing/head/utility/hardhat = 3,
/obj/item/clothing/head/utility/hardhat/welding = 3,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe
payment_department = ACCOUNT_ENG
light_color = COLOR_VIVID_YELLOW
@@ -130,7 +130,7 @@
/obj/item/clothing/under/rank/engineering/atmospheric_technician = 3,
/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3,
/obj/item/clothing/shoes/sneakers/black = 3,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
payment_department = ACCOUNT_ENG
light_color = COLOR_VIVID_YELLOW
@@ -183,12 +183,12 @@
/obj/item/clothing/gloves/fingerless = 2,
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/mask/bandana/skull/black = 2,
)
)
contraband = list(
/obj/item/clothing/suit/hooded/techpriest = 2,
/obj/item/clothing/under/costume/mech_suit = 2,
/obj/item/organ/internal/tongue/robot = 2,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
extra_price = PAYCHECK_COMMAND * 1.2
payment_department = ACCOUNT_SCI
@@ -215,7 +215,7 @@
/obj/item/clothing/shoes/sneakers/white = 3,
/obj/item/radio/headset/headset_sci = 3,
/obj/item/clothing/mask/gas = 3,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe
payment_department = ACCOUNT_SCI
/obj/item/vending_refill/wardrobe/science_wardrobe
@@ -239,7 +239,7 @@
/obj/item/clothing/under/rank/civilian/hydroponics/skirt = 3,
/obj/item/clothing/mask/bandana/striped/botany = 3,
/obj/item/clothing/accessory/armband/hydro = 3,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
payment_department = ACCOUNT_SRV
light_color = LIGHT_COLOR_ELECTRIC_GREEN
@@ -271,7 +271,7 @@
/obj/item/clothing/glasses/regular/jamjar = 1,
/obj/item/storage/bag/books = 1,
/obj/item/radio/headset/headset_srv = 2,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/curator_wardrobe
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/curator_wardrobe
@@ -303,10 +303,10 @@
/obj/item/storage/belt/bandolier = 1,
/obj/item/storage/dice/hazard = 1,
/obj/item/storage/bag/money = 2,
)
)
premium = list(
/obj/item/storage/box/dishdrive = 1,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
payment_department = ACCOUNT_SRV
extra_price = PAYCHECK_COMMAND
@@ -335,7 +335,7 @@
/obj/item/clothing/shoes/cookflops = 2,
/obj/item/reagent_containers/cup/rag = 1,
/obj/item/clothing/suit/hooded/wintercoat = 2,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/chef_wardrobe
@@ -367,8 +367,9 @@
/obj/item/watertank/janitor = 1,
/obj/item/storage/belt/janitor = 2,
/obj/item/plunger = 2,
/obj/item/wirebrush = 2,
/obj/item/radio/headset/headset_srv = 2,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND * 0.8
@@ -408,7 +409,7 @@
/obj/item/clothing/shoes/laceup = 2,
/obj/item/clothing/accessory/lawyers_badge = 2,
/obj/item/radio/headset/headset_srv = 2,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/law_wardrobe
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/law_wardrobe
@@ -440,18 +441,18 @@
/obj/item/clothing/head/rasta = 1,
/obj/item/clothing/suit/chaplainsuit/shrinehand = 1,
/obj/item/radio/headset/headset_srv = 2,
)
)
contraband = list(
/obj/item/toy/plush/ratplush = 1,
/obj/item/toy/plush/narplush = 1,
/obj/item/clothing/head/chaplain/medievaljewhat = 3,
/obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
/obj/item/clothing/head/chaplain/clownmitre = 1,
)
)
premium = list(
/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1,
/obj/item/clothing/head/chaplain/bishopmitre = 1,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/chap_wardrobe
@@ -475,10 +476,10 @@
/obj/item/storage/backpack/duffelbag/chemistry = 2,
/obj/item/storage/bag/chemistry = 2,
/obj/item/ph_booklet = 3,
)
)
contraband = list(
/obj/item/reagent_containers/spray/syndicate = 2,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe
payment_department = ACCOUNT_MED
/obj/item/vending_refill/wardrobe/chem_wardrobe
@@ -522,7 +523,7 @@
/obj/item/storage/backpack/virology = 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
@@ -564,7 +565,7 @@
)
premium = list(
/obj/item/clothing/head/flatcap = 1,
)
)
refill_canister = /obj/item/vending_refill/wardrobe/det_wardrobe
extra_price = PAYCHECK_COMMAND * 1.75
payment_department = ACCOUNT_SEC