diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 3a5dde9e3e3..47083e5cc5f 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,40 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: There are now reports of a syndicate recruitment drive in NT sectors. - type: Add - id: 427 - time: '2024-07-09T10:48:04.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1345 -- author: Velcroboy - changes: - - message: Added clipboards to the Law Drobe - type: Add - id: 428 - time: '2024-07-10T15:55:58.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1479 -- author: TadJohnson00 - changes: - - message: New security outer clothing for all security roles, as well as proper - senior security officers' and cadets' jumpsuits. - type: Add - - message: Jetpacks are now available in all security suit storage. Thank goodness - for increased funding. - type: Add - - message: Revamped security's clothing and equipment options; all gear is now up - to code, and no further outdated equipment will be issued. This includes, most - notably, the detective's uniform, which has received a whole makeover. - type: Tweak - - message: Fixed security hardsuits not allowing you to turn on internals without - a mask. - type: Fix - - message: Head of security's winter coat, warden's winter coat, security winter - coat, security departmental winter boots, WizDen-pattern body armour, and some - other minor changes necessary for respriting. - type: Remove - id: 429 - time: '2024-07-15T06:45:41.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1273 - author: Bellwether changes: - message: Prosecutors can now lock and unlock Security evidence lockers. @@ -3862,3 +3826,31 @@ id: 926 time: '2025-01-16T20:21:13.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2743 +- author: Lyndomen + changes: + - message: Surgery now does a lil more damage! Keep your patients asleep! + type: Tweak + - message: Limbs have a lot more burn resist, and a lil less slash resist. Be careful! + type: Tweak + - message: Role based speed modifications have been removed, Medical is no longer + intrinsically faster at surgery. + type: Tweak + id: 927 + time: '2025-01-16T23:36:40.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2721 +- author: boogiebogus + changes: + - message: Added several new lockers and wall lockers for mapping usage + type: Add + - message: replaced sci/research markings on the epistemics crate and locker, respectively + type: Tweak + id: 928 + time: '2025-01-16T23:47:04.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2636 +- author: HTMLSystem + changes: + - message: Added the DeltaV scrubs to the surgeon loadout, hooray! + type: Add + id: 929 + time: '2025-01-16T23:48:44.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2756 diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml index f2a67e4c91e..81f16b1ede0 100644 --- a/Resources/Prototypes/Body/Parts/base.yml +++ b/Resources/Prototypes/Body/Parts/base.yml @@ -34,13 +34,13 @@ - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -85,7 +85,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true diff --git a/Resources/Prototypes/Body/Parts/vox.yml b/Resources/Prototypes/Body/Parts/vox.yml index 8a3d8d35a78..1610d67304b 100644 --- a/Resources/Prototypes/Body/Parts/vox.yml +++ b/Resources/Prototypes/Body/Parts/vox.yml @@ -43,13 +43,13 @@ - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -106,7 +106,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index e6c1e0a0b1b..2da75b35ef5 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -291,10 +291,12 @@ name: scientist's locker components: - type: Appearance + - type: Sprite # DeltaV - label locker with "E" for epi + sprite: _DV/Structures/Storage/closet.rsi - type: EntityStorageVisuals - stateBaseClosed: science - stateDoorOpen: science_open - stateDoorClosed: science_door + stateBaseClosed: epi # DeltaV + stateDoorOpen: epi_open # DeltaV + stateDoorClosed: epi_door # DeltaV - type: AccessReader access: [ [ "Research" ] ] diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index adfb26d9ffd..5a5cfa3dc48 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -115,9 +115,9 @@ name: epistemics crate # DeltaV - Epistemics Department replacing Science components: - type: Icon - sprite: Structures/Storage/Crates/science.rsi + sprite: _DV/Structures/Storage/Crates/epistemics.rsi # DeltaV - Epistemics Department replacing Science - type: Sprite - sprite: Structures/Storage/Crates/science.rsi + sprite: _DV/Structures/Storage/Crates/epistemics.rsi # DeltaV - Epistemics Department replacing Science - type: entity parent: CrateGenericSteel diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index e67345d0214..f06f988860b 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -3,7 +3,7 @@ name: job-name-chemist description: job-description-chemist playTimeTracker: JobChemist - antagAdvantage: 4 # DeltaV - Synthesize any chem you want with little oversight. + antagAdvantage: 4 # DeltaV - Synthesize any chem you want with little oversight. requirements: - !type:DepartmentTimeRequirement department: Medical @@ -15,12 +15,12 @@ - Medical - Chemistry - Maintenance - # Shitmed Change - special: - - !type:AddComponentSpecial - components: - - type: SurgerySpeedModifier - speedModifier: 1.75 + # Shitmed Change, DeltaV - role modifiers bad + # special: + # - !type:AddComponentSpecial + # components: + # - type: SurgerySpeedModifier + # speedModifier: 1.75 - type: startingGear id: ChemistGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index ba6040901bf..ef544491ce9 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -49,7 +49,7 @@ - !type:AddComponentSpecial components: - type: SurgerySpeedModifier - speedModifier: 2.5 + speedModifier: 1.5 # DeltaV - type: startingGear id: CMOGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 271eeaf82ae..a74812b3b60 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -15,13 +15,15 @@ - Maintenance extendedAccess: - Chemistry - - Paramedic # DeltaV - Add Paramedic access - - Surgery # DeltaV - Add Surgery access - special: # Shitmed change - - !type:AddComponentSpecial - components: - - type: SurgerySpeedModifier - speedModifier: 1.75 + # Begin DeltaV changes + - Paramedic # Add Paramedic access + - Surgery # Add Surgery access + #special: Shitmed change + #- !type:AddComponentSpecial + # components: + # - type: SurgerySpeedModifier + # speedModifier: 1.75 + # End DeltaV - type: startingGear id: DoctorGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 250d821b0ac..3ba703e9a4f 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -17,11 +17,11 @@ access: - Medical - Maintenance - special: # Shitmed change - - !type:AddComponentSpecial - components: - - type: SurgerySpeedModifier - speedModifier: 1.5 + #special: # Shitmed change. DeltaV - role modifiers bad + #- !type:AddComponentSpecial + # components: + # - type: SurgerySpeedModifier + # speedModifier: 1.5 - type: startingGear id: MedicalInternGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index a9cc7681743..88760fbe007 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -23,11 +23,11 @@ - Paramedic # DeltaV - Add Paramedic access extendedAccess: - Chemistry - special: # Shitmed change - - !type:AddComponentSpecial - components: - - type: SurgerySpeedModifier - speedModifier: 1.75 + # special: # DeltaV - role modifiers bad + # - !type:AddComponentSpecial + # components: + # - type: SurgerySpeedModifier + # speedModifier: 1.75 - type: startingGear id: ParamedicGear diff --git a/Resources/Prototypes/_DV/Body/Parts/harpy.yml b/Resources/Prototypes/_DV/Body/Parts/harpy.yml index 30a961dcfa4..df4452b904c 100644 --- a/Resources/Prototypes/_DV/Body/Parts/harpy.yml +++ b/Resources/Prototypes/_DV/Body/Parts/harpy.yml @@ -28,19 +28,19 @@ - trigger: !type:DamageTypeTrigger damageType: Blunt - damage: 110 + damage: 150 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -90,7 +90,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true diff --git a/Resources/Prototypes/_DV/Body/Parts/rodentia.yml b/Resources/Prototypes/_DV/Body/Parts/rodentia.yml index 98b13648acb..b8eec27314d 100644 --- a/Resources/Prototypes/_DV/Body/Parts/rodentia.yml +++ b/Resources/Prototypes/_DV/Body/Parts/rodentia.yml @@ -38,13 +38,13 @@ - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -92,7 +92,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true diff --git a/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml b/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml index ba066446bb4..a2fe99bfbf5 100644 --- a/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml @@ -36,13 +36,13 @@ - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -81,7 +81,7 @@ - trigger: !type:DamageTypeTrigger damageType: Blunt - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml index 452353a3e7d..96e2cd9a72e 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml @@ -63,7 +63,7 @@ - type: StorageFill contents: - id: Cautery - - id: Scalpel + - id: ScalpelAdvanced - id: Retractor - id: Hemostat - id: Bonesetter diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml index fd0c2a321bd..85e0a87890e 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -71,6 +71,42 @@ - type: AccessReader access: [["Command"]] +- type: entity + parent: LockerBaseSecureDeltaV + id: LockerKitchen + name: kitchen locker + components: + - type: EntityStorageVisuals + stateBaseClosed: chef + stateDoorOpen: chef_open + stateDoorClosed: chef_door + - type: AccessReader + access: [["Kitchen"]] + +- type: entity + parent: LockerBaseSecureDeltaV + id: LockerJanitor + name: janitor's locker + components: + - type: EntityStorageVisuals + stateBaseClosed: jani + stateDoorOpen: jani_open + stateDoorClosed: jani_door + - type: AccessReader + access: [["Janitor"]] + +- type: entity + parent: LockerBaseSecure + id: LockerLogistics # Wizden has sprites for this but doesn't have an entity that uses them? + name: logistics locker + components: + - type: EntityStorageVisuals + stateBaseClosed: cargo + stateDoorOpen: cargo_open + stateDoorClosed: cargo_door + - type: AccessReader + access: [["Cargo"]] + - type: entity parent: LockerBaseSecureDeltaV id: LockerArmoryStorage diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml new file mode 100644 index 00000000000..4a51cf0eabb --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml @@ -0,0 +1,218 @@ +- type: entity + parent: BaseWallCloset + id: BaseWallClosetDeltaV + components: + - type: Sprite + sprite: _DV/Structures/Storage/wall_locker.rsi + +- type: entity + parent: BaseWallLocker + id: BaseWallLockerDeltaV + components: + - type: Sprite + sprite: _DV/Structures/Storage/wall_locker.rsi + +- type: entity + parent: BaseWallClosetDeltaV + id: WallClosetTools + name: tool wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: engi_generic + stateDoorClosed: engi_tools_door + stateDoorOpen: engi_generic_open + +- type: entity + parent: BaseWallClosetDeltaV + id: WallClosetRadiationSuit + name: radiation suit wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: engi_generic + stateDoorClosed: engi_rad_door + stateDoorOpen: engi_generic_open + +- type: entity + parent: BaseWallClosetDeltaV + id: WallClosetL3 + name: level 3 biohazard wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: bio + stateDoorClosed: bio_door + stateDoorOpen: bio_open + +- type: entity + parent: WallClosetL3 + id: WallClosetL3Janitor + name: level 3 biohazard wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: bio_jani + stateDoorClosed: bio_jani_door + stateDoorOpen: bio_jani_open + +- type: entity + parent: WallClosetL3 + id: WallClosetL3Security + name: level 3 biohazard wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: bio_sec + stateDoorClosed: bio_sec_door + stateDoorOpen: bio_sec_open + +- type: entity + parent: WallClosetL3 + id: WallClosetL3Virology + name: level 3 biohazard wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: bio_viro + stateDoorClosed: bio_viro_door + stateDoorOpen: bio_viro_open + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerAtmos + name: atmospherics wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: atmos + stateDoorClosed: atmos_door + stateDoorOpen: atmos_open + - type: AccessReader + access: [["Atmospherics"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerEngi + name: engineering wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: engi + stateDoorClosed: engi_door + stateDoorOpen: engi_open + - type: AccessReader + access: [["Engineering"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerElectrical + name: electrical wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: engi_generic + stateDoorClosed: engi_electrical_door + stateDoorOpen: engi_generic_open + - type: AccessReader + access: [["Engineering"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerWelding + name: welding tools wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: engi_generic + stateDoorClosed: engi_welding_door + stateDoorOpen: engi_generic_open + - type: AccessReader + access: [["Engineering"]] + + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerBotany + name: botanist wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: botany + stateDoorClosed: botany_door + stateDoorOpen: botany_open + - type: AccessReader + access: [["Hydroponics"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerSalvage + name: salvage wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: salv + stateDoorClosed: salv_door + stateDoorOpen: salv_open + - type: AccessReader + access: [["Salvage"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerLogistics + name: logistics wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: logi + stateDoorClosed: logi_door + stateDoorOpen: logi_open + - type: AccessReader + access: [["Cargo"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerJanitor + name: janitor wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: jani + stateDoorClosed: jani_door + stateDoorOpen: jani_open + - type: AccessReader + access: [["Janitor"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerEpistemics + name: epistemics wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: epi + stateDoorClosed: epi_door + stateDoorOpen: epi_open + - type: AccessReader + access: [["Research"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerSecurity + name: security wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: sec + stateDoorClosed: sec_door + stateDoorOpen: sec_open + - type: AccessReader + access: [["Security"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerKitchen + name: kitchen wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: chef + stateDoorClosed: chef_door + stateDoorOpen: chef_open + - type: AccessReader + access: [["Kitchen"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerJustice + name: justice wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: justice + stateDoorClosed: justice_door + stateDoorOpen: justice_open + - type: AccessReader + access: [["Justice"]] diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml index 07195a21ff9..967f443c53d 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml @@ -5,59 +5,55 @@ equipment: id: SurgeonPDA -# Clothing - -- type: loadoutGroup - id: SurgeonHead - name: loadout-group-surgeon-head - loadouts: - - BlueSurgeryCap - - GreenSurgeryCap - - PurpleSurgeryCap - -- type: loadoutGroup - id: SurgeonScrubs - name: loadout-group-surgeon-scrubs - loadouts: - - MedicalBlueScrubs - - MedicalGreenScrubs - - MedicalPurpleScrubs - -- type: loadoutGroup - id: SurgeonPDA - name: loadout-group-surgeon-id - loadouts: - - SurgeonPDA - -- type: loadoutGroup - id: SurgeonGloves - name: loadout-group-surgeon-gloves - loadouts: - - LatexGloves - - NitrileGloves - -- type: loadoutGroup - id: SurgeonMask - name: loadout-group-surgeon-mask - loadouts: - - SterileMask - -# Loadout - -- type: roleLoadout - id: JobSurgeon - groups: - - GroupTankHarness - - SurgeonHead - - MedicalDoctorNeck - - SurgeonMask - - SurgeonScrubs - - SurgeonGloves - - MedicalBackpack - - MedicalDoctorOuterClothing - - MedicalShoes - - SurgeonPDA - - Glasses - - SurvivalMedical - - Trinkets - - GroupSpeciesBreathToolMedical +# Head +- type: loadout + id: BlackSurgeryCap + equipment: + head: ClothingHeadHatSurgcapBlack + +- type: loadout + id: CyanSurgeryCap + equipment: + head: ClothingHeadHatSurgcapCyan + +- type: loadout + id: PinkSurgeryCap + equipment: + head: ClothingHeadHatSurgcapPink + +- type: loadout + id: WhiteSurgeryCap + equipment: + head: ClothingHeadHatSurgcapWhite + +- type: loadout + id: RainbowSurgeryCap + equipment: + head: ClothingHeadHatSurgcapRainbow + +# Jumpsuit +- type: loadout + id: MedicalBlackScrubs + equipment: + jumpsuit: UniformScrubsColorBlack + +- type: loadout + id: MedicalCyanScrubs + equipment: + jumpsuit: UniformScrubsColorCyan + +- type: loadout + id: MedicalPinkScrubs + equipment: + jumpsuit: UniformScrubsColorPink + +- type: loadout + id: MedicalWhiteScrubs + equipment: + jumpsuit: UniformScrubsColorWhite + +- type: loadout + id: MedicalRainbowScrubs + equipment: + jumpsuit: UniformScrubsColorRainbow + diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 7df19865851..d873d4df00c 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -461,6 +461,52 @@ - ChemistWinterBoots - ChemistShoes +## Surgeon +- type: loadoutGroup + id: SurgeonHead + name: loadout-group-surgeon-head + loadouts: + - BlueSurgeryCap + - GreenSurgeryCap + - PurpleSurgeryCap + - BlackSurgeryCap + - CyanSurgeryCap + - PinkSurgeryCap + - WhiteSurgeryCap + - RainbowSurgeryCap + +- type: loadoutGroup + id: SurgeonScrubs + name: loadout-group-surgeon-scrubs + loadouts: + - MedicalBlueScrubs + - MedicalGreenScrubs + - MedicalPurpleScrubs + - MedicalBlackScrubs + - MedicalCyanScrubs + - MedicalPinkScrubs + - MedicalWhiteScrubs + - MedicalRainbowScrubs + +- type: loadoutGroup + id: SurgeonMask + name: loadout-group-surgeon-mask + loadouts: + - SterileMask + +- type: loadoutGroup + id: SurgeonGloves + name: loadout-group-surgeon-gloves + loadouts: + - LatexGloves + - NitrileGloves + +- type: loadoutGroup + id: SurgeonPDA + name: loadout-group-surgeon-id + loadouts: + - SurgeonPDA + # Justice ## Chief Justice - type: loadoutGroup diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index 488f4977ad9..3f96b614927 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -45,6 +45,25 @@ - SecurityFirearm - SecurityFirearmAmmo +# Medical +- type: roleLoadout + id: JobSurgeon + groups: + - GroupTankHarness + - SurgeonHead + - MedicalDoctorNeck + - SurgeonMask + - SurgeonScrubs + - SurgeonGloves + - MedicalBackpack + - MedicalDoctorOuterClothing + - MedicalShoes + - SurgeonPDA + - Glasses + - SurvivalMedical + - Trinkets + - GroupSpeciesBreathToolMedical + # Justice - type: roleLoadout id: JobChiefJustice diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml index f68bb8ef9c4..ec733d0cc1d 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml @@ -18,7 +18,7 @@ - !type:AddComponentSpecial components: - type: SurgerySpeedModifier - speedModifier: 2.0 + speedModifier: 1.25 - type: startingGear id: SurgeonGear diff --git a/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml b/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml index 4b3c52dccfd..8011e69cc0a 100644 --- a/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml +++ b/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml @@ -22,8 +22,8 @@ - type: SurgeryDamageChangeEffect damage: types: - Bloodloss: 10 - Slash: 3 # DeltaV + #Bloodloss: 10 # DeltaV + Slash: 12 # DeltaV sleepModifier: 0.5 - type: SurgeryStepEmoteEffect @@ -45,7 +45,7 @@ - type: SurgeryDamageChangeEffect damage: types: - Bloodloss: -5 + Bloodloss: -3 # DeltaV sleepModifier: 2 - type: entity @@ -66,7 +66,7 @@ - type: SurgeryDamageChangeEffect # DeltaV damage: types: - Slash: 2 + Slash: 4 - type: entity parent: SurgeryStepBase @@ -106,9 +106,10 @@ sprite: _Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi state: retractor - type: SurgeryDamageChangeEffect # DeltaV + sleepModifier: 0.25 # Highly invasive, large damage if the patient is wriggling around damage: types: - Blunt: 10 + Blunt: 15 #- type: entity # parent: SurgeryStepBase @@ -350,7 +351,7 @@ - type: SurgeryDamageChangeEffect # DeltaV damage: types: - Slash: 2 + Slash: 4 - type: entity parent: SurgeryStepBase @@ -368,7 +369,7 @@ - type: SurgeryTendWoundsEffect damage: groups: - Brute: -5 + Brute: -3 # DeltaV: was -5 - type: SurgeryRepeatableStep - type: entity @@ -389,6 +390,10 @@ damage: groups: Burn: -5 + - type: SurgeryDamageChangeEffect # DeltaV + damage: + types: + Slash: 2 - type: SurgeryRepeatableStep - type: entity @@ -468,7 +473,7 @@ - type: SurgeryRemoveOrganStep - type: SurgeryStepEmoteEffect - type: SurgeryDamageChangeEffect # DeltaV - sleepModifier: 0.1 # Maints organ transplants are BAD + sleepModifier: 0.15 # Maints organ transplants are BAD damage: types: Slash: 50 @@ -488,6 +493,11 @@ state: insertion - type: SurgeryAddOrganStep - type: SurgeryStepEmoteEffect + - type: SurgeryDamageChangeEffect # DeltaV + sleepModifier: 0.5 + damage: + types: + Blunt: 5 - type: entity parent: SurgeryStepInsertOrgan diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/base.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/base.png new file mode 100644 index 00000000000..bc2127c171d Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/base.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/closed.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/closed.png new file mode 100644 index 00000000000..d6ff085b181 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/closed.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/icon.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/icon.png new file mode 100644 index 00000000000..0651f345bd9 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/meta.json new file mode 100644 index 00000000000..aa8d0e1c182 --- /dev/null +++ b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original sprites by EmoGarbage404 (github) for Space Station 14. Modifications to icon done by bogus_0451 (discord).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/open.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/open.png new file mode 100644 index 00000000000..ec1f8c5956e Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/sparking.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/sparking.png new file mode 100644 index 00000000000..87b78b9b465 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/sparking.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/welded.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/welded.png new file mode 100644 index 00000000000..311739a2701 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/welded.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef.png new file mode 100644 index 00000000000..a8bc5964de1 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_door.png new file mode 100644 index 00000000000..8de5c291b11 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_open.png new file mode 100644 index 00000000000..3d96d8e1dab Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi.png new file mode 100644 index 00000000000..3a10fee58ec Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_door.png new file mode 100644 index 00000000000..378b6b7e8d1 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_open.png new file mode 100644 index 00000000000..039b747226f Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani.png new file mode 100644 index 00000000000..8f765062084 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_door.png new file mode 100644 index 00000000000..b5d3ecf378e Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_open.png new file mode 100644 index 00000000000..5f70aabc886 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json index b14ffba8cf7..863356c2642 100644 --- a/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord). Surgeon's locker by Janet Blackquill 2024. Security lockers modified by TJohnson.", + "copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord). Surgeon's locker by Janet Blackquill 2024. Security lockers modified by TJohnson. Chef, janitor, and epistemics door modified from tgstation sprites by bogus_0451 (Discord).", "license": "CC-BY-SA-3.0", "states": [ { @@ -73,6 +73,33 @@ { "name": "admin_assist_open" }, + { + "name": "epi" + }, + { + "name": "epi_door" + }, + { + "name": "epi_open" + }, + { + "name": "jani" + }, + { + "name": "jani_door" + }, + { + "name": "jani_open" + }, + { + "name": "chef" + }, + { + "name": "chef_door" + }, + { + "name": "chef_open" + }, { "name": "brigmedic_door" }, diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos.png new file mode 100644 index 00000000000..16614ee5bb0 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_door.png new file mode 100644 index 00000000000..1e2a76a98e7 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_open.png new file mode 100644 index 00000000000..5128b8d76cf Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio.png new file mode 100644 index 00000000000..8b416035e4c Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_door.png new file mode 100644 index 00000000000..4d508da2898 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani.png new file mode 100644 index 00000000000..f8959dc0b65 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_door.png new file mode 100644 index 00000000000..4dd27606658 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_open.png new file mode 100644 index 00000000000..1bdf3d3439e Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_open.png new file mode 100644 index 00000000000..13fe146c216 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec.png new file mode 100644 index 00000000000..1bd3cf6c8ba Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_door.png new file mode 100644 index 00000000000..e3d76c2ff9f Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_open.png new file mode 100644 index 00000000000..8c0d0698358 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro.png new file mode 100644 index 00000000000..e7b98a91962 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_door.png new file mode 100644 index 00000000000..fe3da01fcb4 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_open.png new file mode 100644 index 00000000000..a1a26e7c4eb Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany.png new file mode 100644 index 00000000000..e5044e7a0e6 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_door.png new file mode 100644 index 00000000000..a7a4a7c96a5 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_open.png new file mode 100644 index 00000000000..8b9bcc3dd9a Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef.png new file mode 100644 index 00000000000..35ed3109d4b Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_door.png new file mode 100644 index 00000000000..4f4fdaaa52d Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_open.png new file mode 100644 index 00000000000..f14218831fc Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi.png new file mode 100644 index 00000000000..55eb4bdfd9f Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_door.png new file mode 100644 index 00000000000..777e39f3cb2 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_electrical_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_electrical_door.png new file mode 100644 index 00000000000..6a86b3121ff Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_electrical_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic.png new file mode 100644 index 00000000000..adc73f8860f Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic_open.png new file mode 100644 index 00000000000..1e1d1adc943 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_open.png new file mode 100644 index 00000000000..95faf6882fd Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_rad_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_rad_door.png new file mode 100644 index 00000000000..6d1a65f86f0 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_rad_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_tools_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_tools_door.png new file mode 100644 index 00000000000..d4ee63cc67c Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_tools_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_welding_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_welding_door.png new file mode 100644 index 00000000000..3347c57d13f Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_welding_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi.png new file mode 100644 index 00000000000..91caa035d33 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_door.png new file mode 100644 index 00000000000..65e30e1b193 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_open.png new file mode 100644 index 00000000000..4845c6ec1b7 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic.png new file mode 100644 index 00000000000..6806e85f43f Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_door.png new file mode 100644 index 00000000000..07c4d1336d0 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_icon.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_icon.png new file mode 100644 index 00000000000..63e9dcb0fad Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_icon.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_open.png new file mode 100644 index 00000000000..6122db13f86 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani.png new file mode 100644 index 00000000000..afd1633cf14 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_door.png new file mode 100644 index 00000000000..c8df1f283e7 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_open.png new file mode 100644 index 00000000000..17b121990ab Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice.png new file mode 100644 index 00000000000..0332a5e1dbe Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_door.png new file mode 100644 index 00000000000..098f79b7785 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_open.png new file mode 100644 index 00000000000..1ca247d7339 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/locked.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/locked.png new file mode 100644 index 00000000000..53f33d7893e Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/locked.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi.png new file mode 100644 index 00000000000..fc3aba7b332 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_door.png new file mode 100644 index 00000000000..0793adfe6e2 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_open.png new file mode 100644 index 00000000000..f6b3206c8e7 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/meta.json new file mode 100644 index 00000000000..60453c0a998 --- /dev/null +++ b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/meta.json @@ -0,0 +1,177 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "All locker sprites based off of the generic wall locker; chef and janitor wall lockers using original colors, and all other sprites being based on the colors of tall lockers. Done by @bogus_0451 on discord. locked.png, unlocked.png, welded.png, & generic textures copied directly from the wizden wall locker rsi in order to things work properly.", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "atmos" + }, + { + "name": "atmos_door" + }, + { + "name": "atmos_open" + }, + { + "name": "engi" + }, + { + "name": "engi_door" + }, + { + "name": "engi_open" + }, + { + "name": "engi_generic" + }, + { + "name": "engi_generic_open" + }, + { + "name": "engi_electrical_door" + }, + { + "name": "engi_welding_door" + }, + { + "name": "engi_tools_door" + }, + { + "name": "engi_rad_door" + }, + { + "name": "botany" + }, + { + "name": "botany_door" + }, + { + "name": "botany_open" + }, + { + "name": "salv" + }, + { + "name": "salv_door" + }, + { + "name": "salv_open" + }, + { + "name": "logi" + }, + { + "name": "logi_door" + }, + { + "name": "logi_open" + }, + { + "name": "jani" + }, + { + "name": "jani_door" + }, + { + "name": "jani_open" + }, + { + "name": "epi" + }, + { + "name": "epi_door" + }, + { + "name": "epi_open" + }, + { + "name": "sec" + }, + { + "name": "sec_door" + }, + { + "name": "sec_open" + }, + { + "name": "chef" + }, + { + "name": "chef_door" + }, + { + "name": "chef_open" + }, + { + "name": "bio" + }, + { + "name": "bio_door" + }, + { + "name": "bio_open" + }, + { + "name": "bio_jani" + }, + { + "name": "bio_jani_door" + }, + { + "name": "bio_jani_open" + }, + { + "name": "bio_sec" + }, + { + "name": "bio_sec_door" + }, + { + "name": "bio_sec_open" + }, + { + "name": "bio_viro" + }, + { + "name": "bio_viro_door" + }, + { + "name": "bio_viro_open" + }, + { + "name": "justice" + }, + { + "name": "justice_door" + }, + { + "name": "justice_open" + }, + { + "name": "generic" + }, + { + "name": "generic_door" + }, + { + "name": "generic_open" + }, + { + "name": "generic_icon" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "welded" + } + ] +} + diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv.png new file mode 100644 index 00000000000..d1ee3ae6b0b Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_door.png new file mode 100644 index 00000000000..83bf7fa378e Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_open.png new file mode 100644 index 00000000000..624cef88371 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec.png new file mode 100644 index 00000000000..cf6a036cdae Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_door.png new file mode 100644 index 00000000000..17c5403536f Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_open.png new file mode 100644 index 00000000000..e53cae42630 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/unlocked.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/unlocked.png new file mode 100644 index 00000000000..8c761c05adb Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/unlocked.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/welded.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/welded.png new file mode 100644 index 00000000000..355d7fa0cb2 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/welded.png differ