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

Deptartment jackets cleanup and organization (#5613)

Browse Source 
## About The Pull Request

Organizes all the dept/dept. guard jackets into the same subtpe, moves
them from skyrat master_files into modular_zubbers, places them
consistently in the vending machines/garment bags/loadout.

## Why It's Good For The Game

Clean up and consistency of the jackets.

## Changelog

🆑 LT3
fix: Fixed missing textures for the dark medical jacket
add: Department/department guard jackets are now consistent and
available in garment bags, vending machines, and loadouts
/🆑
This commit is contained in:
LT3
2026-05-18 16:54:27 -04:00
committed by GitHub
parent c0740236ba
commit df4c8e355e
14 changed files with 230 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm
+1 -7
View File
@@ -3,7 +3,7 @@
/obj/item/clothing/suit/toggle/labcoat/Initialize(mapload)
. = ..()
allowed += list(/obj/item/flashlight, /obj/item/hypospray, /obj/item/storage/hypospraykit)
allowed += list(/obj/item/flashlight, /obj/item/handheld_soulcatcher, /obj/item/hypospray, /obj/item/storage/hypospraykit)
/obj/item/clothing/suit/toggle/labcoat/skyrat
name = "SR LABCOAT SUIT DEBUG"
@@ -101,9 +101,3 @@
/obj/item/clothing/suit/toggle/labcoat/interdyne
greyscale_config_worn_teshari = /datum/greyscale_config/labcoat/worn/teshari //tacks teshari override onto labcoats
/obj/item/clothing/suit/toggle/labcoat/Initialize(mapload)
. = ..()
allowed += list(
/obj/item/handheld_soulcatcher,
)
modular_skyrat/master_files/code/modules/loadout/categories/suit.dm
+68 -16
View File
@@ -590,32 +590,84 @@
item_path = /obj/item/clothing/suit/jacket/hos/blue
restricted_roles = list(JOB_HEAD_OF_SECURITY)
/datum/loadout_item/suit/offdep_jacket
name = "Off-Department Jacket"
item_path = /obj/item/clothing/suit/toggle/jacket/assistant
/datum/loadout_item/suit/cargo_jacket
name = "Cargo Technical Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/cargo
restricted_roles = list (JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_CUSTOMS_AGENT, JOB_QUARTERMASTER)
/datum/loadout_item/suit/cargo_guard_jacket
name = "Cargo Dept. Guard Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/cargo/guard
restricted_roles = list (JOB_CUSTOMS_AGENT)
/datum/loadout_item/suit/engi_jacket
name = "Engineering Jacket"
item_path = /obj/item/clothing/suit/toggle/jacket/engi
name = "Engineering Technical Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/engineer
restricted_roles = list (JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEERING_GUARD, JOB_CHIEF_ENGINEER)
/datum/loadout_item/suit/sci_jacket
name = "Science Jacket"
item_path = /obj/item/clothing/suit/toggle/jacket/sci
/datum/loadout_item/suit/engi_guard_jacket
name = "Engineering Dept. Guard Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/engineer/guard
restricted_roles = list (JOB_ENGINEERING_GUARD)
/datum/loadout_item/suit/med_jacket_light
name = "Medical Jacket (Light)"
item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/medical
name = "Medical Technical Jacket (Light)"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/medical
restricted_roles = list (JOB_MEDICAL_DOCTOR, JOB_SECURITY_MEDIC, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CHIEF_MEDICAL_OFFICER)
/datum/loadout_item/suit/med_jacket_black
name = "Medical Technical Jacket (Black)"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/medical/black
restricted_roles = list (JOB_MEDICAL_DOCTOR, JOB_SECURITY_MEDIC, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CHIEF_MEDICAL_OFFICER)
/datum/loadout_item/suit/med_jacket_dark
name = "Medical Jacket (Dark)"
item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/medical/dark
name = "Medical Technical Jacket (Dark)"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/medical/dark
restricted_roles = list (JOB_MEDICAL_DOCTOR, JOB_SECURITY_MEDIC, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CHIEF_MEDICAL_OFFICER)
/datum/loadout_item/suit/med_jacket_orderly
name = "Medical Jacket (Orderly/SecMed)"
item_path = /obj/item/clothing/suit/toggle/jacket/sec/medical
restricted_roles = list (JOB_ORDERLY, JOB_SECURITY_MEDIC, JOB_CHIEF_MEDICAL_OFFICER)
/datum/loadout_item/suit/med_guard_jacket_light
name = "Medical Dept. Guard Jacket (Light)"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/medical/guard
restricted_roles = list (JOB_ORDERLY)
/datum/loadout_item/suit/med_guard_jacket_black
name = "Medical Dept. Guard Jacket (Black)"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/medical/black/guard
restricted_roles = list (JOB_ORDERLY)
/datum/loadout_item/suit/med_guard_jacket_dark
name = "Medical Dept. Guard Jacket (Dark)"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/medical/dark/guard
restricted_roles = list (JOB_ORDERLY)
/datum/loadout_item/suit/sci_jacket
name = "Science Technical Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/science
restricted_roles = list (JOB_SCIENTIST, JOB_GENETICIST, JOB_ROBOTICIST, JOB_SCIENCE_GUARD, JOB_RESEARCH_DIRECTOR)
/datum/loadout_item/suit/sci_guard_jacket
name = "Science Dept. Guard Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/science/guard
restricted_roles = list (JOB_SCIENCE_GUARD)
/datum/loadout_item/suit/sec_jacket
name = "Security Praetorian Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/sec
restricted_roles = list (JOB_SECURITY_OFFICER, JOB_SECURITY_MEDIC, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY)
/datum/loadout_item/suit/service_jacket
name = "Service Technical Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/service
restricted_roles = list (JOB_JANITOR, JOB_BOTANIST, JOB_COOK, JOB_CHEF, JOB_BARBER, JOB_BARTENDER, JOB_CHAPLAIN, JOB_CURATOR, JOB_LAWYER, JOB_PSYCHOLOGIST, JOB_BOUNCER, JOB_HEAD_OF_PERSONNEL)
/datum/loadout_item/suit/service_guard_jacket
name = "Service Dept. Guard Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/service/guard
restricted_roles = list (JOB_BOUNCER)
/datum/loadout_item/suit/tcomm_jacket
name = "Telecomms Technical Jacket"
item_path = /obj/item/clothing/suit/toggle/labcoat/technical/engineer/tcomm
/datum/loadout_item/suit/labcoat/doctor_tailcoat
name = "Brig Physician's tailcoat"
modular_skyrat/master_files/icons/mob/clothing/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 273 KiB

After

Width:  |  Height:  |  Size: 265 KiB

modular_skyrat/master_files/icons/obj/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 113 KiB

modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm
-67
View File
@@ -13,84 +13,17 @@
toggle_noun = "zipper"
//Job Jackets
/obj/item/clothing/suit/toggle/jacket/engi
name = "engineering jacket"
desc = "A comfortable jacket in engineering yellow."
icon_state = "engi_dep_jacket"
armor_type = /datum/armor/jacket_engi
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
/obj/item/clothing/suit/toggle/jacket/tcomm
name = "telecomms jacket"
desc = "A comfortable jacket in engineering yellow with blue telecomms trim."
icon_state = "tcomm_dep_jacket"
armor_type = /datum/armor/jacket_engi
allowed = list(
/obj/item/flashlight,
/obj/item/tank/internals,
/obj/item/t_scanner,
/obj/item/construction/rcd,
/obj/item/pipe_dispenser,
/obj/item/toy,
/obj/item/storage/fancy/cigarettes,
/obj/item/lighter,
)
// do not have the new sprites for these
/obj/item/clothing/suit/toggle/jacket/det_trench
icon = 'icons/obj/clothing/suits/jacket.dmi'
worn_icon = 'icons/mob/clothing/suits/jacket.dmi'
/datum/armor/jacket_engi
fire = 30
acid = 45
/obj/item/clothing/suit/toggle/jacket/sci
name = "science jacket"
desc = "A comfortable jacket in science purple."
icon_state = "sci_dep_jacket"
armor_type = /datum/armor/jacket_sci
/datum/armor/jacket_sci
bomb = 10
/obj/item/clothing/suit/toggle/jacket/supply
name = "cargo jacket"
desc = "A comfortable jacket in supply brown."
icon_state = "supply_dep_jacket"
/obj/item/clothing/suit/toggle/jacket/assistant
name = "non-departmental jacket"
desc = "A comfortable jacket in a neutral black"
icon_state = "off_dep_jacket"
/obj/item/clothing/suit/toggle/jacket/supply/head
name = "quartermaster's jacket"
desc = "Even if people refuse to recognize you as a head, they can recognize you as a badass."
icon_state = "qmjacket"
/obj/item/clothing/suit/toggle/jacket/sec
name = "security jacket"
desc = "A comfortable jacket in security red. Probably against uniform regulations."
icon_state = "sec_dep_jacket_old"
armor_type = /datum/armor/sec_dep_jacket
/obj/item/clothing/suit/toggle/jacket/sec/Initialize(mapload)
. = ..()
allowed = GLOB.security_vest_allowed
/datum/armor/sec_dep_jacket
melee = 30
bullet = 20
laser = 30
energy = 40
bomb = 25
fire = 30
acid = 45
/obj/item/clothing/suit/toggle/jacket/sec/old //Oldsec (Red)
icon_state = "sec_dep_jacket_old"
//Flannels
/obj/item/clothing/suit/toggle/jacket/flannel
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
modular_skyrat/modules/goofsec/code/department_guards.dm
+15 -7
View File
@@ -848,6 +848,7 @@
/obj/item/clothing/head/helmet/blueshirt/skyrat = 2,
/obj/item/clothing/head/beret/sec/science = 2,
/obj/item/clothing/suit/armor/vest/blueshirt/skyrat = 2,
/obj/item/clothing/suit/toggle/labcoat/technical/science/guard = 1,
/obj/item/clothing/glasses/hud/security = 2,
), src)
@@ -857,13 +858,18 @@
/obj/item/storage/bag/garment/orderly/PopulateContents()
generate_items_inside(list(
/obj/item/radio/headset/headset_med = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/orderly = 2,
/obj/item/clothing/head/helmet/blueshirt/skyrat/guard = 2,
/obj/item/clothing/head/beret/sec/medical = 2,
/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly = 2,
/obj/item/clothing/glasses/hud/security = 2,
/obj/item/radio/headset/headset_med = 1,
/obj/item/clothing/shoes/sneakers/white = 1,
/obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/orderly = 1,
/obj/item/clothing/head/helmet/blueshirt/skyrat/guard = 1,
/obj/item/clothing/head/beret/sec/medical = 1,
/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly = 1,
/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic = 1,
/obj/item/clothing/suit/toggle/labcoat/technical/medical/guard = 1,
/obj/item/clothing/suit/toggle/labcoat/technical/medical/dark/guard = 1,
/obj/item/clothing/suit/toggle/labcoat/technical/medical/black/guard = 1,
/obj/item/clothing/under/rank/security/peacekeeper/miniskirt = 1,
/obj/item/clothing/glasses/hud/medsechud = 1,
), src)
/obj/item/storage/bag/garment/engineering_guard
@@ -878,6 +884,7 @@
/obj/item/clothing/head/helmet/blueshirt/skyrat/guard = 2,
/obj/item/clothing/head/beret/sec/engineering = 2,
/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/engineering_guard = 2,
/obj/item/clothing/suit/toggle/labcoat/technical/engineer/guard = 1,
/obj/item/clothing/glasses/hud/security = 2,
), src)
@@ -893,6 +900,7 @@
/obj/item/clothing/head/helmet/blueshirt/skyrat/guard = 2,
/obj/item/clothing/head/beret/sec/cargo = 2,
/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/customs_agent = 2,
/obj/item/clothing/suit/toggle/labcoat/technical/cargo/guard = 1,
/obj/item/clothing/glasses/hud/security = 2,
/obj/item/clothing/glasses/hud/gun_permit = 2,
), src)
modular_skyrat/modules/telecomms_specialist/telecomms_specialist.dm
+1 -1
View File
@@ -54,7 +54,7 @@
id_trim = /datum/id_trim/job/telecomms_specialist
uniform = /obj/item/clothing/under/rank/engineering/engineer/skyrat/utility/telecomm
suit = /obj/item/clothing/suit/toggle/jacket/tcomm
suit = /obj/item/clothing/suit/toggle/labcoat/technical/engineer/tcomm
neck = /obj/item/clothing/neck/link_scryer
belt = /obj/item/storage/belt/utility/full/engi
ears = /obj/item/radio/headset/headset_eng
modular_zubbers/code/modules/clothing/suits/jacket.dm
-20
View File
@@ -715,27 +715,7 @@
//BUNNY STUFF END, SPRITES BY DimWhat OF MONKE STATION
// Medical Jackets
/obj/item/clothing/suit/toggle/labcoat/skyrat/medical
name = "medical department jacket"
desc = "This stylish jacket is perfect for those impromptu fashion shows on the scene of an emergency. Now, you can be the brightest beacon of style while administering medical treatment! Because, after all, why save lives if you can't look fabulous while doing it?"
icon = 'modular_zubbers/icons/obj/clothing/suits/labcoat.dmi'
worn_icon = 'modular_zubbers/icons/mob/clothing/suits/labcoat.dmi'
icon_state = "labcoat_med_light"
body_parts_covered = CHEST|ARMS|GROIN
cold_protection = CHEST|ARMS|GROIN
toggle_noun = "zipper"
/obj/item/clothing/suit/toggle/labcoat/skyrat/medical/dark
name = "medical expedition jacket"
icon_state = "labcoat_med_dark"
/obj/item/clothing/suit/toggle/jacket/sec/medical
name = "medical praetorian jacket"
desc = "This stylish jacket is perfect for those impromptu fashion shows on the scene of an emergency. Now, you can be the brightest beacon of style while administering medical treatment! Because, after all, why save lives if you can't look fabulous while doing it?"
//Lore Jackets
//Galactic Federation SPRITES BY Tonadas of Bubberstation
/obj/item/clothing/suit/jacket/galfed
name = "Galactic Federation jacket"
modular_zubbers/code/modules/clothing/suits/labcoat.dm
+136
View File
@@ -37,3 +37,139 @@
/obj/item/clothing/suit/toggle/labcoat/medical
greyscale_config_worn_digi = /datum/greyscale_config/labcoat/worn/digi
/obj/item/clothing/suit/toggle/labcoat/technical
name = "coder technical jacket"
desc = "oh god how did this get here"
icon = 'modular_zubbers/icons/obj/clothing/suits/labcoat.dmi'
worn_icon = 'modular_zubbers/icons/mob/clothing/suits/labcoat.dmi'
icon_state = null //Keeps this from showing up under the chameleon hat
inhand_icon_state = "labcoat"
blood_overlay_type = "coat"
toggle_noun = "zipper"
allowed = list(
/obj/item/analyzer,
/obj/item/biopsy_tool,
/obj/item/defibrillator/compact,
/obj/item/dnainjector,
/obj/item/flashlight,
/obj/item/gun/energy,
/obj/item/gun/syringe,
/obj/item/healthanalyzer,
/obj/item/hypospray,
/obj/item/lighter,
/obj/item/paper,
/obj/item/reagent_containers/applicator,
/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/cup/tube,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/syringe,
/obj/item/sensor_device,
/obj/item/soap,
/obj/item/stack/medical,
/obj/item/storage/fancy/cigarettes,
/obj/item/storage/hypospraykit,
/obj/item/storage/medkit,
/obj/item/storage/pill_bottle,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
)
/datum/armor/dept_guard
melee = 30
bullet = 20
laser = 30
energy = 40
bomb = 25
fire = 30
acid = 45
/obj/item/clothing/suit/toggle/labcoat/technical/cargo
name = "cargo technical jacket"
desc = "A comfortable jacket in science purple."
icon_state = "technical_cargo"
/obj/item/clothing/suit/toggle/labcoat/technical/cargo/guard
name = "cargo praetorian jacket"
armor_type = /datum/armor/dept_guard
/obj/item/clothing/suit/toggle/labcoat/technical/engineer
name = "engineering technical jacket"
desc = "A comfortable jacket in engineering yellow."
icon_state = "technical_eng"
/obj/item/clothing/suit/toggle/labcoat/technical/engineer/Initialize(mapload)
. = ..()
allowed += list(
/obj/item/analyzer,
/obj/item/construction/rcd,
/obj/item/fireaxe/metal_h2_axe,
/obj/item/pipe_dispenser,
/obj/item/storage/bag/construction,
/obj/item/t_scanner,
/obj/item/construction/rld,
/obj/item/construction/rtd,
/obj/item/gun/ballistic/rifle/rebarxbow,
/obj/item/storage/bag/rebar_quiver,
)
/obj/item/clothing/suit/toggle/labcoat/technical/engineer/guard
name = "engineering praetorian jacket"
armor_type = /datum/armor/dept_guard
/obj/item/clothing/suit/toggle/labcoat/technical/engineer/tcomm
name = "telecomms technical jacket"
desc = "A comfortable jacket in engineering yellow with blue telecomms trim."
icon_state = "technical_tcomm"
/obj/item/clothing/suit/toggle/labcoat/technical/medical
name = "medical technical jacket"
icon_state = "technical_med_light"
desc = "This stylish jacket is perfect for those impromptu fashion shows on the scene of an emergency. Now, you can be the brightest beacon of style while administering medical treatment! Because, after all, why save lives if you can't look fabulous while doing it?"
/obj/item/clothing/suit/toggle/labcoat/technical/medical/guard
name = "medical praetorian jacket"
armor_type = /datum/armor/dept_guard
/obj/item/clothing/suit/toggle/labcoat/technical/medical/dark
icon_state = "technical_med_dark"
/obj/item/clothing/suit/toggle/labcoat/technical/medical/dark/guard
name = "medical praetorian jacket"
armor_type = /datum/armor/dept_guard
/obj/item/clothing/suit/toggle/labcoat/technical/medical/black
icon_state = "technical_med_black"
/obj/item/clothing/suit/toggle/labcoat/technical/medical/black/guard
name = "medical praetorian jacket"
armor_type = /datum/armor/dept_guard
/obj/item/clothing/suit/toggle/labcoat/technical/science
name = "science technical jacket"
desc = "A comfortable jacket in science purple."
icon_state = "technical_sci"
/obj/item/clothing/suit/toggle/labcoat/technical/science/guard
name = "science praetorian jacket"
armor_type = /datum/armor/dept_guard
/obj/item/clothing/suit/toggle/labcoat/technical/sec
name = "security praetorian jacket"
desc = "A comfortable jacket in security red. Probably against uniform regulations."
icon_state = "technical_sec"
armor_type = /datum/armor/dept_guard
/obj/item/clothing/suit/toggle/labcoat/technical/sec/Initialize(mapload)
. = ..()
allowed = GLOB.security_vest_allowed
/obj/item/clothing/suit/toggle/labcoat/technical/service
name = "service technical jacket"
desc = "A comfortable jacket in a neutral shade of grey."
icon_state = "technical_service"
/obj/item/clothing/suit/toggle/labcoat/technical/service/guard
name = "service praetorian jacket"
armor_type = /datum/armor/dept_guard
modular_zubbers/code/modules/goofsec/code/department_guards.dm
-13
View File
@@ -1,13 +0,0 @@
/obj/item/storage/bag/garment/orderly/PopulateContents()
generate_items_inside(list(
/obj/item/radio/headset/headset_med = 1,
/obj/item/clothing/shoes/sneakers/white = 1,
/obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/orderly = 1,
/obj/item/clothing/head/helmet/blueshirt/skyrat/guard = 1,
/obj/item/clothing/head/beret/sec/medical = 1,
/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly = 1,
/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic = 1,
/obj/item/clothing/suit/toggle/jacket/sec/medical = 1,
/obj/item/clothing/under/rank/security/peacekeeper/miniskirt = 1,
/obj/item/clothing/glasses/hud/medsechud = 1,
), src)
modular_zubbers/code/modules/vending/wardrobe.dm
+9 -5
View File
@@ -16,8 +16,9 @@
/obj/item/clothing/suit/toggle/labcoat/medical = 4,
/obj/item/clothing/suit/toggle/labcoat/paramedic/doctor_tailcoat = 3,
/obj/item/clothing/suit/toggle/labcoat/skyrat/highvis = 4,
/obj/item/clothing/suit/toggle/labcoat/skyrat/medical = 3,
/obj/item/clothing/suit/toggle/labcoat/skyrat/medical/dark = 3,
/obj/item/clothing/suit/toggle/labcoat/technical/medical = 3,
/obj/item/clothing/suit/toggle/labcoat/technical/medical/black = 3,
/obj/item/clothing/suit/toggle/labcoat/technical/medical/dark = 3,
/obj/item/clothing/suit/toggle/labcoat/virologist = 4,
/obj/item/clothing/under/rank/civilian/psychologist_bunnysuit = 3,
/obj/item/clothing/under/rank/engineering/engineer/skyrat/hazard_chem/emt = 2,
@@ -71,9 +72,9 @@
zubbers_products = list(
/obj/item/clothing/head/playbunnyears/scientist = 3,
/obj/item/clothing/neck/tie/bunnytie/scientist = 3,
/obj/item/clothing/suit/toggle/jacket/sci = 3,
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science = 3,
/obj/item/clothing/suit/toggle/labcoat/science/doctor_tailcoat = 3,
/obj/item/clothing/suit/toggle/labcoat/technical/science = 3,
/obj/item/clothing/under/rank/rnd/scientist/bunnysuit = 3,
/obj/item/clothing/under/rank/rnd/scientist/skyrat/hlscience = 3,
/obj/item/clothing/under/rank/rnd/scientist/skyrat/utility = 3,
@@ -193,6 +194,7 @@
/obj/item/clothing/suit/toggle/jacket/supply = 3,
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo = 3,
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo/smith = 3,
/obj/item/clothing/suit/toggle/labcoat/technical/cargo = 3,
/obj/item/clothing/under/jumpsuit/caligram_fatigues_tan = 3,
/obj/item/clothing/under/rank/cargo/bitrunner/bunnysuit = 3,
/obj/item/clothing/under/rank/cargo/cargo_bunnysuit = 3,
@@ -254,6 +256,7 @@
/obj/item/clothing/neck/tie/bunnytie/janitor = 3,
/obj/item/clothing/shoes/galoshes/heeled = 3,
/obj/item/clothing/suit/jacket/tailcoat/janitor = 3,
/obj/item/clothing/suit/toggle/labcoat/technical/service = 3,
/obj/item/clothing/under/costume/dragon_maid = 3,
/obj/item/clothing/under/rank/civilian/janitor/bunnysuit = 3,
)
@@ -264,6 +267,7 @@
/obj/item/clothing/neck/tie/bunnytie/bartender = 2,
/obj/item/clothing/suit/hooded/wintercoat/skyrat/bartender = 2,
/obj/item/clothing/suit/jacket/tailcoat/bartender = 2,
/obj/item/clothing/suit/toggle/labcoat/technical/service = 3,
/obj/item/clothing/under/rank/civilian/bartender_bunnysuit = 2,
)
@@ -354,9 +358,9 @@
/obj/item/clothing/shoes/workboots/heeled = 3,
/obj/item/clothing/shoes/workboots/toeless = 3,
/obj/item/clothing/suit/jacket/tailcoat/engineer = 3,
/obj/item/clothing/suit/toggle/jacket/engi = 3,
/obj/item/clothing/suit/toggle/jacket/tcomm = 3,
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/engi = 3,
/obj/item/clothing/suit/toggle/labcoat/technical/engineer = 3,
/obj/item/clothing/suit/toggle/labcoat/technical/engineer/tcomm = 3,
/obj/item/clothing/suit/toggle/labcoat/skyrat/highvis = 3,
/obj/item/clothing/under/misc/overalls = 3,
/obj/item/clothing/under/rank/engineering/engineer_bunnysuit = 3,
modular_zubbers/icons/mob/clothing/suits/labcoat.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

modular_zubbers/icons/obj/clothing/suits/labcoat.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

tgstation.dme
-1
View File
@@ -9598,7 +9598,6 @@
#include "modular_zubbers\code\modules\general_sprite_overrides\turfs\walls.dm"
#include "modular_zubbers\code\modules\ghost_wavedefence\wave_def.dm"
#include "modular_zubbers\code\modules\gladiator\code\game\objects\items\gladiator_items.dm"
#include "modular_zubbers\code\modules\goofsec\code\department_guards.dm"
#include "modular_zubbers\code\modules\hydroponics\gene_modder.dm"
#include "modular_zubbers\code\modules\hydroponics\plant_genes.dm"
#include "modular_zubbers\code\modules\hydroponics\grown\rocks.dm"