From 426b2295907d838e104c65823a93ecfd784ed9b5 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:36:39 -0500 Subject: [PATCH 1/6] surgery and shitmed tweaks (#2721) * surgery 2 * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update medical_doctor.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update paramedic.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update surgeon.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update surgery_steps.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update belts.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * limbs * comment ops * Update Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml Co-authored-by: Radezolid Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml Co-authored-by: Radezolid Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update surgeon.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * maybe ops Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * whitespace Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * ples Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update base.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update vox.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update vulpkanin.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update rodentia.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: Radezolid --- Resources/Prototypes/Body/Parts/base.yml | 6 ++--- Resources/Prototypes/Body/Parts/vox.yml | 6 ++--- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 14 +++++----- .../Jobs/Medical/chief_medical_officer.yml | 2 +- .../Roles/Jobs/Medical/medical_doctor.yml | 16 +++++++----- .../Roles/Jobs/Medical/medical_intern.yml | 10 +++---- .../Roles/Jobs/Medical/paramedic.yml | 10 +++---- Resources/Prototypes/_DV/Body/Parts/harpy.yml | 8 +++--- .../Prototypes/_DV/Body/Parts/rodentia.yml | 6 ++--- .../Prototypes/_DV/Body/Parts/vulpkanin.yml | 6 ++--- .../_DV/Catalog/Fills/Items/Belts/belts.yml | 2 +- .../_DV/Roles/Jobs/Medical/surgeon.yml | 2 +- .../Entities/Surgery/surgery_steps.yml | 26 +++++++++++++------ 13 files changed, 63 insertions(+), 51 deletions(-) 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/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/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 From e02f6f98b65976e4106b8d60f8604c38bb727491 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:36:58 +0100 Subject: [PATCH 2/6] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 3a5dde9e3e3..6ca24331812 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +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 @@ -3862,3 +3855,15 @@ 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 From 51f9a885e22015ad2706ea1b8dc91967d8320311 Mon Sep 17 00:00:00 2001 From: boogiebogus <53976699+boogiebogus@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:47:04 -0500 Subject: [PATCH 3/6] Add new wall lockers + other storage bonuses (#2636) * add new wall lockers * add new tall lockers * file off the serial numbers on science crate * correct whitespace & meta.json * nuke appearance for real --------- Signed-off-by: boogiebogus <53976699+boogiebogus@users.noreply.github.com> --- .../Storage/Closets/Lockers/lockers.yml | 8 +- .../Structures/Storage/Crates/crates.yml | 4 +- .../Storage/Closets/Lockers/lockers.yml | 36 +++ .../Storage/Closets/Lockers/wall_lockers.yml | 218 ++++++++++++++++++ .../Storage/Crates/epistemics.rsi/base.png | Bin 0 -> 507 bytes .../Storage/Crates/epistemics.rsi/closed.png | Bin 0 -> 227 bytes .../Storage/Crates/epistemics.rsi/icon.png | Bin 0 -> 527 bytes .../Storage/Crates/epistemics.rsi/meta.json | 39 ++++ .../Storage/Crates/epistemics.rsi/open.png | Bin 0 -> 252 bytes .../Crates/epistemics.rsi/sparking.png | Bin 0 -> 206 bytes .../Storage/Crates/epistemics.rsi/welded.png | Bin 0 -> 294 bytes .../Structures/Storage/closet.rsi/chef.png | Bin 0 -> 519 bytes .../Storage/closet.rsi/chef_door.png | Bin 0 -> 539 bytes .../Storage/closet.rsi/chef_open.png | Bin 0 -> 503 bytes .../_DV/Structures/Storage/closet.rsi/epi.png | Bin 0 -> 238 bytes .../Storage/closet.rsi/epi_door.png | Bin 0 -> 541 bytes .../Storage/closet.rsi/epi_open.png | Bin 0 -> 211 bytes .../Structures/Storage/closet.rsi/jani.png | Bin 0 -> 519 bytes .../Storage/closet.rsi/jani_door.png | Bin 0 -> 556 bytes .../Storage/closet.rsi/jani_open.png | Bin 0 -> 503 bytes .../Structures/Storage/closet.rsi/meta.json | 29 ++- .../Storage/wall_locker.rsi/atmos.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/atmos_door.png | Bin 0 -> 554 bytes .../Storage/wall_locker.rsi/atmos_open.png | Bin 0 -> 522 bytes .../Storage/wall_locker.rsi/bio.png | Bin 0 -> 454 bytes .../Storage/wall_locker.rsi/bio_door.png | Bin 0 -> 571 bytes .../Storage/wall_locker.rsi/bio_jani.png | Bin 0 -> 475 bytes .../Storage/wall_locker.rsi/bio_jani_door.png | Bin 0 -> 583 bytes .../Storage/wall_locker.rsi/bio_jani_open.png | Bin 0 -> 497 bytes .../Storage/wall_locker.rsi/bio_open.png | Bin 0 -> 469 bytes .../Storage/wall_locker.rsi/bio_sec.png | Bin 0 -> 475 bytes .../Storage/wall_locker.rsi/bio_sec_door.png | Bin 0 -> 589 bytes .../Storage/wall_locker.rsi/bio_sec_open.png | Bin 0 -> 497 bytes .../Storage/wall_locker.rsi/bio_viro.png | Bin 0 -> 475 bytes .../Storage/wall_locker.rsi/bio_viro_door.png | Bin 0 -> 589 bytes .../Storage/wall_locker.rsi/bio_viro_open.png | Bin 0 -> 497 bytes .../Storage/wall_locker.rsi/botany.png | Bin 0 -> 482 bytes .../Storage/wall_locker.rsi/botany_door.png | Bin 0 -> 559 bytes .../Storage/wall_locker.rsi/botany_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/chef.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/chef_door.png | Bin 0 -> 549 bytes .../Storage/wall_locker.rsi/chef_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/engi.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/engi_door.png | Bin 0 -> 555 bytes .../wall_locker.rsi/engi_electrical_door.png | Bin 0 -> 568 bytes .../Storage/wall_locker.rsi/engi_generic.png | Bin 0 -> 454 bytes .../wall_locker.rsi/engi_generic_open.png | Bin 0 -> 491 bytes .../Storage/wall_locker.rsi/engi_open.png | Bin 0 -> 522 bytes .../Storage/wall_locker.rsi/engi_rad_door.png | Bin 0 -> 565 bytes .../wall_locker.rsi/engi_tools_door.png | Bin 0 -> 553 bytes .../wall_locker.rsi/engi_welding_door.png | Bin 0 -> 573 bytes .../Storage/wall_locker.rsi/epi.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/epi_door.png | Bin 0 -> 550 bytes .../Storage/wall_locker.rsi/epi_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/generic.png | Bin 0 -> 219 bytes .../Storage/wall_locker.rsi/generic_door.png | Bin 0 -> 372 bytes .../Storage/wall_locker.rsi/generic_icon.png | Bin 0 -> 321 bytes .../Storage/wall_locker.rsi/generic_open.png | Bin 0 -> 339 bytes .../Storage/wall_locker.rsi/jani.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/jani_door.png | Bin 0 -> 571 bytes .../Storage/wall_locker.rsi/jani_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/justice.png | Bin 0 -> 470 bytes .../Storage/wall_locker.rsi/justice_door.png | Bin 0 -> 545 bytes .../Storage/wall_locker.rsi/justice_open.png | Bin 0 -> 528 bytes .../Storage/wall_locker.rsi/locked.png | Bin 0 -> 138 bytes .../Storage/wall_locker.rsi/logi.png | Bin 0 -> 467 bytes .../Storage/wall_locker.rsi/logi_door.png | Bin 0 -> 548 bytes .../Storage/wall_locker.rsi/logi_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/meta.json | 177 ++++++++++++++ .../Storage/wall_locker.rsi/salv.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/salv_door.png | Bin 0 -> 558 bytes .../Storage/wall_locker.rsi/salv_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/sec.png | Bin 0 -> 470 bytes .../Storage/wall_locker.rsi/sec_door.png | Bin 0 -> 545 bytes .../Storage/wall_locker.rsi/sec_open.png | Bin 0 -> 528 bytes .../Storage/wall_locker.rsi/unlocked.png | Bin 0 -> 144 bytes .../Storage/wall_locker.rsi/welded.png | Bin 0 -> 218 bytes 77 files changed, 505 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/base.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/closed.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/icon.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/sparking.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/welded.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/chef.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/epi.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/jani.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_electrical_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_rad_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_tools_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_welding_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_icon.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/locked.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/unlocked.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/welded.png 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/_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/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 0000000000000000000000000000000000000000..bc2127c171dcfc78603f16c57cff44df11fced41 GIT binary patch literal 507 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST{r&yt@IE|#{CHYgT2xfjD%p4U@86$3eR>DyQJ|7)7k&>Q#Z?mI z7yKUv7&e{JIS&-&EbxddW?QV0J5OE3=IrGvM;ZGvp97trwYi-@^o50Y{w^=r> zIC$+Jqm#uxhm!&&XB6H$734jbRs5e#b&eyajQfLXsU=&O@489!|Bh(U0lC1_)z4*} HQ$iB}_M3_} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d6ff085b18131ec0d36e93e5610592e2e3fa40df GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b3I)gLn2z= zPT9zNM1jY(-fug@)awbtZV5VBZVQrmcAa_9B{=Dn;FBglr(KIbuAXpT{Fl(7hD92u zlFTeEp7$+x@XD0_8F~Fzxpj|Wnc{m}Ck}RoCv&XrUmxL)ZH#*D9-OWFWYO;VrMl}E z{uGXK;Evhf(2>ydQbjQFN&4Np@vJi>fA1@IOmowGdhxu~OwQBuAH3H3C%UOi)HQI* a(>YzcbMnvRhRp{$l)=;0&t;ucLK6T63|oQ# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0651f345bd98b45ab7d2031edc12c8f9aabdeb6f GIT binary patch literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST{r&wveE2YZ`tUuN)DXx+r zzu^Bcz_96z&Uv6HXMsm#F#`kNVGw3Kp1&dmC@4|l8c`CQpH@$cc0dZzK3s^i0$OeG~AO`7&(P)-30K;PfI|B<)g@KW=0pkLQsURJ!3m_&<0kT1W z31|)zSY?o<1&{^RWoTdkl6`sgo5iVHIaNSrou`Xqh=u>#{)1eH4S1Yok9$u4|No(9 zU$w{KJx>13wk%!`LvvGV9_srjbO`Silh$+yxtTpxKuf^*Th!O~mSfzeK*rLutjv3U zhKbGpkgTTSvrvA4(xMvQzyD9{{P604fZy>Qi)R-+Tx>AE%3rL&?VY}WtC^EWf#UO( a2FIlB?8Ov!N!c$4xysYk&t;ucLK6TG_>uhp literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ec1f8c5956ecb8065ad6ca33148a9312030acf11 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+dN$yLn2z= zPT9zNM1jY3?&YaGhnZ#`thF**aE4<_iRR^t#?9g%++wC`u)Le%?3npS>p}DnPY!0A zGaGc5WqNIG5;*ihH~(zkPrZhYlhyM@BeOUEHOxP|&E{AH*O|{TllRI#zoYlTuKf&; z%ax@cE&3L0J$H_aQHg13h&ZE?7E4^L)!#;rjsuUGZkng01$Z?YF7w`88rwK?y{K|h z)HGGaq|#~kOOKydx8Uy;d$+?`fW=XOWudlwZM4UM_(^b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^2|(QXSZ^$5X5FCBsLJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..311739a2701db289577b99dbe6910bad2a1f9010 GIT binary patch literal 294 zcmV+>0oneEP)Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99 zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAtl)`= zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708 sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a8bc5964de1d19e93e0a3eb7d93d73f6aa7950fd GIT binary patch literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STBO@bwdV0>CJEx|mcH_p4r%#`Thlg8OSgc;X8mPpw^PMt~;wlO9 z3;quS44cmAoCk_>7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U z3Z{C7dPcwZFmD5@*_ImNnda%K#lQjNurf$7vNA9NSzbUa4P}FTqru1w7H0yo4H=mj z1b}oD5NEctfW@VE}H;YrZa;kvLGEW!B5DWjOlf1bODDbd;z8Lks{-GOh zW{ZephWXsyPco161H>&DWu!R2i%jU4Y4svWcE4cIx#JV9HH8BB&fDlQu6P)-(BhCT zmsGu=$Kgne-gd5CT2p?kEDenazaiqb*`$m$S1fV6lTnL*v8$=6MMg&Q@bCZ?PFgOp z8%Xh#1o;L3M*s$)`{&L9#W@Q+B8wRq_zr_G*AN9$JwrXC-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*LB7&pWCn{f z0ojI(Obh}*Itqw0+gZTkSwJ=jBmgl;Ka57RlmQqn6WAG8fGP}(j13qUKuiVcU|j$) zX$p`H0!%=2n7}H7EG>X6s4hbT1CZ>?tKTe6-O8x~GMhYI978PppH6V(Yf#`}S-YX@ z)BpdwbbFmbY_c8|G~~4T-cq#xV4o-;>2CPyO1_ff5ec4;9aq+IMhUEw?qawk8kfI8 zP_*Ae*=1gn`x2o57M~dp1v6WZoR6?-GJW6}Ap(@r*w((gt(M>RAvf=_UWO%0SdS`UUZM)?*bKt_ldePAeVW%`njxgN@xNA*Mg4S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3d96d8e1dab2018e0265528108e8a396c7cb9497 GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STBO@c9K7D%b+_|2fo}!{6pm5m6nq@$Wtt7}V_&*3RY~H_QKTw3T zz$3Dlfr0NZ2s0kfUy%Y7lqhkHC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGy1)Uc^gp8 zw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!K@4Mt|LI1`X<$jHPX0HmXUIJ2DvES?2q zgFpfhgY?5_G)ozP{-40kzyefZU}S8-xBy}*NC)czh)Gj`Y!F}qn!^NE8DwbzWI=Tq z8W@0NUtaxYaq3o16_8ox>Eak-;eU6MH&=rLk8}3&z5l1aRnOCMb1Zn++^AT|GEs2< zL;oh0Qp?FxPlzeZC|SA6rK7Cy;F%o?pYj~59R+=YR|B^$7jR~I; z7!NraWGeCrzj8NR7-kn?z#^=pvrXX1X*YwDuQrvG-)EfeEa><|j{7&rHJ+}1F6*2U FngEoLf$jhR literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3a10fee58ecda965af524a9bb589b64f172d7d1c GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy#sNMdu0UE(R^Qgv&fVQTARr*j zJR&6}H76&x%(1$@p>aA0%-pM7tG-B>_!@p zlj-T=7-Dhy>E*jz4GKIBfpd3mDf;!#KiWe_Uv09(t{1z%KH&FBKGv*OXe(Ihzm-M4 zF~*By=`_`b>rdD2jc>ffx6ae%(Aqok44n!^c^4h7F!(T8e;2a}zRxIqosr#~SHrpc f?en7_?dzFDCvf|?o5d&qEoJa@^>bP0l+XkKi6mI^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..378b6b7e8d11492f527f1fc8334eeedf2a326b26 GIT binary patch literal 541 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?STSFc`o_3F(s$LgaePKTLCboKNCWsHoBY;ElvHJzjcq=4K@CmLS> zDV~xbzu^A}z#w%0+&Q2)XMsm#F#`kNVGw3Kp1&dmC@4|l8c`CQpH@$cc0dZzK3s^i0$OeG~AO`7&(P)-30K;VhI|B<)g@KW=0pkLQsURJ!3m_&< z0kT1W31|)zSY?o<1&{^RWoTdkl6`sgo5iVHIaNSri>HfYh=u>t366Y+40u>xTP@r2 z^M8G0e)t0pQyIr3z0PfmC(c@0|KNYi(VW=c9clqA#rbDDGnuwJG&b&f#j;!=L91r( zfp{O2M#l_|IT=i@9M7NcI4U;lfW{I-(TI*n##6QzS=baGTE~dadv73Ix6nbarK9#d m!v&TuhCb)%;)_4Hz32ZLq9XbJe)egQ+dN(UT-G@yGywpabCl8m literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..039b747226fa2ecb492cbe8f50ce11a3b1de66e3 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)S0HU`YZnq4T2)=!)zf?Q z#AzTncka@Q7jM1Q4M6%BOM?7@862M7NCR@xJY5_^G|nd{NN60;&}cX#Dl+9ohJ)CI z7a6>+q8z+lKqAORm_tNqfs@RNMGUSCE0{tR0z`ZjOr|t6a0DnY9Mylpq;!KtCV;i+ z0!ss*vnYerTpm%j6&q9iy!t)x7$D3u`~F*C13&(AeP z!Bo#s&*=9a=50VV+fpMu(>y)37&w3&Rt70XRtAtQUO+4jWrKX9!N?32X9BVf8JQRa zfOHfPXSTC|#j}8H5J&)GkbW4AW+?+R1H%M%1{RSYP${-eX%g!S%qM6F?cx0*}aIpn}67%y>M1MG8<*qQo_#Bsf2@9X z7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0trA2(hsB2EM)+O&jfY`7N80PBVz-`1rSp~ zI#?G#Oqv2@g8&oI944^JAWI7%3#!Y|zyKus^6EE>Q@3)efXr@B7sn6_|ECj9^Bq>; zVRE&^4( z`F}z9-@=1C1wx+R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5f70aabc886b9cf8a510cdf10fd376548ed31f19 GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STJv=oSd8t6tSYP${|{Z?I`FIw1QRb$wH^*gij79_?H|qY)tr+ zz<9{XAXAY~_?5fi!Z5oC0~TQ&ooxb7PP-YLe6^{h{66D!XF 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 0000000000000000000000000000000000000000..16614ee5bb00c5261f36182d34c5e79ff53c82af GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU3*rPiOGFs*CNo4=T3K1y*w{EaI=Z;H0Oe1rdNcqj&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!V$jK}j=qyPmaN?apKg7ec#$`gxH83GbB^GfvmTtgI0^$hil ze(z!422`^xHNrE^(^HFq1IS@zkYZ$IU<9(ffLI#J2KhvTkr^z`1Y{dBGBF4M=_nx1 zY-a(BX93wDkO0IW{V*EMQU+jHOkihV0je-CGB#jb05KJ$gLMJKq$xl)2rvQ7VFIfR zva|rQpt=kV3_!9kuYR*Qbt|U|$n^4baSXBWe|pKA3mDk0fp1^`3!me3VfGXO7nk$} z3gsG|kJmOtv?g5cslI<`Nz#_g9rF!69z0iQc6MZ}c4XbowDp(9clGpl>`J`OC6doC Se7h6~vcc2U&t;ucLK6UPIB;$N literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1e2a76a98e79d5af798fbb91c2d6a1417595669c GIT binary patch literal 554 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STx6Dy_buoxx>Hib!bQzk~y|~`O5M9ZTH+fOFY-fpxnTD027JFo5 zBvASNb9e6mDZY{*zu^DKfWh^^ofAMA&H|6fVxWS&q9iy!t)x7$ zD3u`~F*C13&(AeP!Bo#s&*=9a=50VV+fpMu(>y)37&w3&Rt70XRt82O%L|C5p=^-v zG#Ht|;!HrcAtMum0FaIX;>>myuy_`b4FU;34AKvy(JW;EhR+0c1{RSYP${g-G%%IPd?*l!VxAYyjSGS&@Mz8FFfv~$8M4Ru4I}5qlj*WGZYnn>bg^vJ@8QuZEPAmeP`4sh;xWs5 WPx+N=S3QphImpx1&t;ucLK6Tv&5XqW literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8b416035e4c2aba1f4406188837aef73e35f956b GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUJ;fNZ6&b9otZZy-93359TwH)M$5v)608;EFL4Lvi!GJ-^o7oL0 z#981GSIesvJDxT7zBWH6cA^&vw+33 zfNT)>RL02g0_af~jbT>? z%MA?;M~@x_YN}m+bsCToC<*cl{*MY69w^630_8XhJR*x382Ao>Fr%o3R|8N`qQo_# zBsf2+QC7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0-wql8D0Pb14g4+$^ev_z|Oz| zRB2#jY{0kxVk*c+)&&rgrU2O>zyvgx39K^6(gMhW>M}Gi0Lk`Q9}K@NzQ+&9oaE`^ z7-Hdncfv)!!wMX(qG{K|CjS3_Tk+tP+(+}S3okzT^~oivAMEAAPBIcn)-#oPT)6K` zF?>)gzws^7S^P@`=MAkGM{O~tq}zY;cg)~C`HrQMgWEl^x@_Bq^HP1Aix2RLSt%Et z6RYEN6?fS5Ay~sl literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f8959dc0b659aa20af298be2ba45a9d81d4d46dd GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU{kgpJ_%f}mtZZy-TFM2JBY7Mh9bH^pfbvrd&nE#X&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrXC z-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|ax7WCn{f0ojI(Obh}*Itqw0 z+gZTkSwJ=jd@5sPcmebsD5qauH!WnHiIGyj90|5(LmimH4+pj&vxw!+xH ZW5w}plIIPVb!C8T@pScbS?83{1OTukaWnt` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4dd27606658495f7dec30b6ff420ca62a9ff679d GIT binary patch literal 583 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilg0(?ST7mCc@68B?P2Y6`$g8w z7P@@-azjJI(W6IO$_0U1TN$_704br8Aiv=M=z!tT{{2EgSQV0J5OE3=IrGvVGPE!!L{P z@dGladAc};Soq(a5Xi@*$iv!rYM1s>o$veCw2G|t`WUUwGU@n}sSjR>|MM+~TbN{- z{nhcIYE32wqh1Yr?tD|8h4R{rQLUO^x>^}7nEmGUPji}L-DdCPq?>d7;InU$hYO`; z68VL)6dyKAEN+o^ddF?(`9m*7@896UujuZtoO-u0lC)G)z4*}Q$iB}^Si9C literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1bdf3d3439ec783355d25a9ebccd2c5a3d97b23d GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?ST^Y}9NSZ!Mb$b#xJG%x_k_E{eczbwAT56H~$ba4!^@V`2Fw@`xu4@>{`kN@j+Ixi~mEj(Cw zM{m1z$pZZ!p$(BMtsAC%sWF;!W6JZ!8;$}Ub>bP0l+XkK^ZtKG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..13fe146c216dc6adf351678275d64875aacbb273 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUvlSV(*)a6zG1O=Rg&3YK*ewX8SWANZg8u^n!|!c;!9W4d0*}aI z1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGy1)Uc^gp8w$upE zG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!K*4Mt|LI1`X<$jHPX0HmXUIJ2DvES?2qgTSXU zMurza55j0POBsMt6WAG8fGQ1)j13qUKuiVM$hrVx(i9*Y1ek#4GJ#bFSy}*DP+f)w z1|Zo!>x1E!#rOCDnGv2Yjv*HQS0_309Z=w4Ir#K{{<<}DGLAT}?kp}&*Hi1z-Jvxh z@?@+_$j_R~bE9)VAIM$K5%Zqcfa%DDpN1KRDSa#t`D;E$Gc4d@m>0?;x$D&yZTD^L ZY5beS`9g%8b3yUM;OXk;vd$@?2>``yZjS%} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1bd3cf6c8ba20190c5f295b5f6594345991875ae GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUJ;fNZ6&b9otZZy-lGzxXm>C=$9bH^pfbvTk%4Py7&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrXC z-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|ax7WCn{f0ojI(Obh}*Itqw0 z+gZTkSwJ=jd@5sPcmebsD5qauH!WnHiIGyj90|5(LmimH4+pj&vxw!+xH ZW5w}plIIPVb!C8T@pScbS?83{1OV}$Z)^Yn literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e3d76c2ff9f2aab2836ada8a632c08dc8750ba2c GIT binary patch literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijq1AIbUx7je9k5li_V|f4c$*KT@8cl{{$Bu1ZHs4T-y*@XkB{`&qi=l^$ zAzP8*^5x474Gl++9!+KgYGx=6J5~>*giC__g8yRxhE271IDpce1s;*b3=DjSK$uZf z!>a)(C{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=RXY_jy^ERNGZK)BSX`Y^13?Nfj z8Kf9l85n^qFCdnNvOzx9U}Of1GXdF#j7$syKspMDGuv6f;#oj82z)AIWOxA#7#NLa zDFaYy0y_f>P^E#9u>s=(h^ZhOSr{&803_RIeK7p8 z_#QtXbB3pjV~BU>ap_lx-+NzU?p$}f~HrX2e8LMKhu zH0S)eXJN+|iZJczFf96^ykr{#Q~P}^l&jGvoX|wOk{A@-q8Z2I7)*2g8xGR!@cIc zkw7ud0*}aI1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGy1)U zc^gp8w$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!Jp4Mt|LI1`X<$jHPX0HmXUIJ2Dv zES?2qgTSXUMurza&%$UlOBsMt6WAG8fGQ1)j13qUKuiVM$hrVx(i9*Y1ek#4GJ#bF zSy}*DP+f)w1|Zo!>x1E!#rOCDnHiogjv*HQS10clYEa-|>A(K*f4xrUMJ2w42Mh1$ zZMQC2p#LMZA#$a4!;~*IMssdVdER)#QJ|yFTq8Xo=R*$9Cf<44E3UHjvxROr*z9)I xF=3ur#XIqRd>(F$H(8`@I+kpBAMX>%vR6Lonxy@P8;^ z2==cK0tps)L>4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9?UWuNcYlwoWo}r%6 z?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIS3GK0mLfNVoXCI$f@9RMK9w;tya0L_Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$@WXRJV=3EfV zG*{Z^oA61M?HZTMqY44Z22Z~&z_3p^r=85sBufiR<} zhF1enP@=>&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s&*=9a=50VV+fpMu(>y)37(k}5 zGDtD9GB5&JUO+4jWrKXI!N?32X9BVf8JQRafOHfPXSTC|#j}8H5cpKa$nXLfFfba; zQU;*Z1a<}%ph^QHV*|zo5K}=mvMzv_GzG{80VbfiOkkBkmKH!3RF|QF0Z6vb`e68F z@jZS(<_u34#}EtuyA$5>9a7+N{dr-h=fa-v^*2O=wrHj9zsuS9q^QW-;AzWh&SP9I zXVNvVaq6_o^Pc-DefQ_CeyLp-`er`JZq?e-)%l?I?icetlAPuHlwT-YOgZ%Fg-)8R zY0mj`&%%x`6k*!aVOaD-dC4{gruO?zOh?i*oKEo?i6|;R;hFJO&_kAUx$+7(>5c3M h&n*-Y`RAbVlp%Ac%?g(IuNOh?^>p=fS?83{1OQ1;vVZ^p literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a1a26e7c4ebe48e5f4b39b4573bfc1960aa4f64a GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STvlSV(*)a6zG1O=>Ft#x;WHT_-0Oc5-oLa~Oq&P}~{DS{O0K>iJ zy^%mM&H|6fVg?4jLmAC&ooa@Ed~xChm}E!k(GfF$npYWX($`y3k^nQus9QtZOF*PAONJJfH|e(b;Fb|HAZu8OnKgT!%?84&RiosAm>94&nDh^+AFTI^|OU;IN0oV y)iGh7S;af?eS98nj5k@NZ90~0cpvW*$+A~I>6)bcSE+Olko}&nelF{r5}E-2FMLG+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e5044e7a0e65fd804f6a1c71c83ff9f166ccdf2b GIT binary patch literal 482 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbURcuxCe06z?4LOoEtgNhTY-}7I9bH^pfbyRgt7`)(&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrXC z-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|ax7WCn{f0ojI(Obh}*Itqw0 z+gZTkSwJ=jd@5sPcmebgnPbV&VVv(oL?001nr{cDDcjyREwl_+3~W zV-|f~pzu4eQ~Exa%R!xVsqgm|GQG2${B34)>mSRAlimm2=CNAO6m5vyD?F$9m*@8? g4~g&hraxmBWOp`_d|p-_4+?h%Pgg&ebxsLQ0FYR8*#H0l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a7a4a7c96a5e61731d64bc717a0dd8d3fd54ac8d GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUW2)TqCWeZh4NGnD6I|_{H8ZqkMG{A{25+&Ue};{oudbPfm7x}U zWMm{z$Ijo^8h{jkNswRge-yxQ<<5+SKq<}wkH}&M2EM}}%y>M1MG8<*qQo_#Bsf2< zq&%@Gl_4N8Gp|I?&oxBBRL@Y)==UDxZ9p~KQX@RmJUz7-IDi~h1}R2X21X#u3y7tm zY>*E%7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0trA2(hsB2EM)+O(FAq|7N80PBVz-` z1rSp~I#?G#Oqv2@g8&oI944^JAWI7%3#!Y|zyKus^6EE>Q@3)efXpsW7sn6_|GSeM z`I-%QST^!%&Tjhu|IV!|T^d~v4|MVcHHA$M-5~L$sa}{(DQVl$n@2aUp48E^SeMWB z$K?de&n8oo^!Kuf#~C+NDc#A>P+_{Q95jbx_aV2IYQ{Qu@ejwEIQkD=YxwHrpjETd zuf=^KuU2+O^Qo5Kyl?AYa9-s*fA7JUeM%1*n_jWA%+NEIWfRB%xzN+q&t;ucLK6TA CC7p2q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8b9bcc3dd9a50d42d1d1d63ff97ceff50e650a91 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST^?Y^nCWdk(YoxaLiJlD;TFr%o3R|8N`qQo_#Bsf2;m>7@5K1OhC3FBNKxF zkd6Z4%yt&AcovWi0-wql8D0QA4WrR4WdKS|U}sjH>LQ-Ev` zU;>)U1XdYjX#r$Gbr~8MfMolu4~AbB-{S{lmV3H5hFJJto#e>ZV8FpLeNo2$|B0Gk zLN32OnDOWim#~-F0=*wo8)izDGAMoA^Vn8I@ZwH|O)H&Q?w;LIz!0NRb7-dU8gaK- z0ka)(C{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=R zXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42t>#!sj?$m_0?n z#U*`#Lb*ogn999M?Mpgz!Aj=DgrJ-z)&omgB z!QxCnwjm=Eg8-0@0^-be7O;30kPQN#$`~1500RIb$b#xJG%x_k_E{eczbwAT56JBBba4!^@V`6hAYY3D zkBjaDqaA<$zu&r;H_-Wdv-?SbFh)&l9rQWoe{9Joi)CqLUbG37Hh_Z8!mUWhcC1b xxpF~XOK6_?m;VMrvt-xhC@hX<+2arp%Xsss`sKCL4dOuV^K|udS?83{1OVh!J(4Mt|LI1`X<$jHPX z0HmXUIJ2DvES?2qgTSXUMurzaPs3<5OBsMt6WAG8fGQ1)j13qUKuiVM$hrVx(i9*Y z1ek#4GJ#bFSy}*DP+f)w1|Zo!>x1E!#rOCDndP1?jv*HQS0_30H5hQPOkb4o|9_(9 zmypYE4`w{N!zJuxwm|R4)P|Xor3^|R_dK>05xlrlVbe-ymb+(n6fneS)Et^Ayhhw@ zR=}-EJ~wtIXlCg5)F@@Botzf)Bw^;0&78UJQd54)yBPdG^s;rLg=N{THR5~pu2eBD WoGiasF_RDE1O`u6KbLh*2~7ZUB90RP literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..55eb4bdfd9fb9d08c3303b210d5cfe87a6694d20 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU3*rPiOGFBlH3B7NtgNhTY-}7I9bH^pfbyP8)hvM&XGxG>@P8;^ z2==cK0tps)L>4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9?UWuNcYlwoWo}r%6 z?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIS3GK0mLfNVoXCI$f@9RMK9w;tya0L_Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$@W&2WUO{%-OjZ2m&SMX^mpt^yv`+( U&o6wt6bQ1x)78&qol`;+0Lm(Sb!=FjEoH!7eGt} z>0n&|F=+~r4FXI+bC|#?gDfq8ET}F+0|Suk%d6ikPTk6>0y4WiT^vI!{O?Zk=4&wE zU|lNj9r~_5c45+D-;1u{R^7Aq@aQ*MT;#47R%0mWlYc1mdOF9R?}{Ik8``$BotxV& zc;t;~hk?4w8U8~R&PN5DZZ3MWGErORaZ_73<9Xu;P1;#ExKbs|qcueLbg0UtI35mL y(Y{IQ)k2-bJq!Qw+bVu8n8dbld+R}VmPN8`4q7J{zlvN6a-pZIpUXO@geCybu$bup literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6a86b3121ffad1296d0ec8df7be4675d1a64c834 GIT binary patch literal 568 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUx6Dy_bus9~I^8fY-u4oSIc-uWjvqd}Z}FmTSu+hQLoN2E+SJa5 zkjTi$&JvLq*IR)4-ZlJB0#bq{L4Lvi(Ex+$+L<6p&H|6fVg?4j!ywFfJby(BP*9@8 zHKHUqKdq!Zu_%=xATcwqM9n999M?Mpgz! zAj=DgrJ-z)Pc;~s!QxCnwjm=Eg8-0@0^-be7O;30kPQL}Kn&6kqtPs70EX2Bb_N!p z3Iii!1I7gqQ$add7eGv!0%U^#6VMzcu*x7y3m^-s%h138B>VE}H;YrZa;kvLZci7- z5DWji6Hg1ZDDbfKo{*B~{`r5s=;4fqdKa73-!_N%&T{N>)2o<$A;3{ES#)7o;V;#e zcDA`Y{H8}WbKOflFSN(|hp?jWC&_IWp3dLWYI40=>5sUXz_dfl*=;_Y;P6hI#aREE zY4M)aeFBHL4#hWWxJAhy&Ei-&?{H_q{>0^KFW&Xu(&dp;=+My)HQu)OnEFMK6Fpu1 KT-G@yGywpBNv3iD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..adc73f8860f13b16f49b46976872e13b21e4c164 GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbU3*rPiOGK=!tZZy-93359TwH)Mx5f9*0aENGL4Lvi!GJ-^o7oL0 z#981GSIesvJDxT7zBWH6cA^&vw+33 zfNT)>RL02g0_af~jb3l||jMK;cHK>mak(N`m}?|APR-=KV|d14TFs zJR*x382Ao>Fr%o3R|8N`qQo_#Bsf2V7NJjy2W;+X5JPXJM zflpx>8!#?_m$Nv;eZ8 zx(p2rK(c+-2g5Im@9_gNvpiiKLoEESPIBZspuoW*e)NC+PVS;bg8XZJt<1~SPcZiI z?ibo%WXrDb=)CotHB+~Vtx;`F_!_y;f1&$?O6LojTR4p7bG(@{$!)?$&a5!i2R~VE wZxq_0a@=LY!UcbtTqb;6XZ3bfaUXYb%o=OKO)i-^&p!J(4Mt|LI1`X<$jHPX z0HmXUIJ2DvES?2qgTSXUMurzaPs3<5OBsMt6WAG8fGQ1)j13qUKuiVM$hrVx(i9*Y z1ek#4GJ#bFSy}*DP+f)w1|Zo!>x1E!#rOCDnU$U{jv*HQS0_30H5hQPEY#Tc|NjOD z%fwxBJ!Xoijy>O~$PRESLl}EF#%!s_k^jVEfASL|hA;*^1HtR1p7p4ak zF8n#cFVdQ&MBb@0A9t7>;M1& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6d1a65f86f081512adc4b070e0da28067c706efd GIT binary patch literal 565 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STx6Dy_bus9~I$c98_AoErigeKv#}6Ogx45Y`wX-2)QMYVoiO7rV zEkNaqj3mwgDZY{*zu^DKfWh^^ofAMA&H|6fVxWS&q9iy!t)x7$ zD3u`~F*C13&(AeP!Bo#s&*=9a=50VV+fpMu(>y)37&w3&Rt70XRt82O%L|C5p=^-v zG#Ht|;!HrcAtMum0FaIX;>>myuy_`b4FU;34AKvy(JW;EhR+0c1{RSYP${-N$wk_Kg`!?zKqTElPIXANYJg}d$p;P2|G|Nc_w%Za9*EVyva^L9t zpedk}dQnY~k44@{Y|8h9{VQfNl*foB^M6qjYHwy)~MBeB>7q`=G zM(eA?bFW3U2sdV2WBh1yvF?;lMrdaI+X6$OKPBlUXF2T^I`%MZHqc6o5_Fmla;vAS KpUXO@geCwX?4|Gk literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d4ee63cc67cb918639c03cc6d3c013c117bc1262 GIT binary patch literal 553 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STx6Dy_bus9~I^8fY-imb56UPr9-nZCLi@m8fwX-2)QMYVoiO7rV zEkNbm0u29v6kkb@U+{lqz~Fk|&IzClXMsm#F;Kx_5N14{zaj-FC{f}XQ4*Y=R#Ki= zl*$m0n3-3i=jR%tV5(=RXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42tkOkFcXkY-6eR=hp#i?64RX}Ekr;B5Vh5y}&-h2%T zJgk`q<+py{zpi!5GPRI!y%I66xOVXiNBIBvdORrDxNjz-wdQv9jEc+`#czsbOlM5k zaEDX%xzg$YjmT}>6B9lMZ1{OsQTmgj$(KVW(!zQx7K&dx8}T~G^o!Hgy2cI@9+o33 y7!&R<{5!>Cf!2l9yz0se-+`suC_j$VdxvX15$z|L4Lvi(Ex+$+L=i}NzMX~$YKTtzQZ8Qcszea3Q$m@ z#5JNMI6tkVJh3R1As{g`uSCz!HAKNw&rr|k_a5eLKsDP^BRtbQJ+&A(fE-o^DMnTX zMj*=zh^3)ykWV!jnZe>rK(-+x6N3PdjsoJ$b{4RB7LW}B2|x_e52Mj6WdMfN1a<}% zpb7&cV*|zo5K}=qSQkJ{ngV2l029z0Ca}sNOA8{&803`eJ>Nks1w{oh0%n6<@ zjv*HQcPF0aJFLLNl6!p1yY3(V_iszc)tbd*`Q^$v)-62UIw$ylm^bcN*tv1n<`A*2 zR>6IyM|SEdevxwWSe2mdKI;Vst0DCp5G5`Po literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..91caa035d334e71f3ab84af4e1303d9ccb5a8a39 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUEi5b|BO@I(oebm*tgNhTY-}7I9bH^pfbxa*+x`P7&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrXC z-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|ax7WCn{f0ojI(Obh}*Itqw0 z+gZTkSwJ=jd@5sPcmeb}%WV&VVvk~bGHuw4V+zWx_J$LYfCDFQAo z=?fIfH98-!ZHQ=1xZG2H|Im`8Etxy!8+tr=uF&l4$XM;jx}9n3FOBc&>F?N;c%4fm UpI`WPDG+3Xr>mdKI;Vst0N)^SJ^%m! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..65e30e1b193a1bd0f3bdc3c5896450ef6a700f19 GIT binary patch literal 550 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUSFc`o_3F(s$LgaePKTLCoIH8PK+eEX)2XYcH!?EPOvB1hiyf#| zb@d55AjMk}IesvJDxT7zBWH6cA^&vw+33fNT&*0Ai4S7>#Br12AkRursg#RTvl<8!#?_m*;vvR&oDALCccp7xTovImwFa*l<_OVGO@>;ZWR#M4f#LME7*4hjb+*>Thwb wmdKI;Vst0IPDFs{jB1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4845c6ec1b716f1e66d56adaaeea19bd17cc21b1 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STBO@cPUcG4`XK?hy=`zRaF!PA6o?b^yr`4<10hNgTo2(6_xJrWj zg8#z+!=^Jj=YgV}1s;*b3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%t zV5(=RXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42t9sZq*MJ2@@pNy5x0n>lmcrKbFpcQN>X=w<6f3(K-wYsB~HU8!PR WI9YzNVkRHR2@IaDelF{r5}E)xmX3u0 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6806e85f43fadb5b83a167cac777e435526048fa GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1)eUBArbCxrx|h`P~c&Be2MR^ zie6LxhTZ><@2zcqpyc=Vg5KLpJB2t|yyh&n)K_$2{2X}Zrz67=hszEe5AD9~T^+u> zvQ6S~dY{^XM}KSM!o?3*@NCGF=54qp#TuB+$|%5`^dO$C$8d#ZfY-vg%uESuU8gEM z_lagIV|Xre%E7DiS_8udX$R8-(mqCAH_H#ro1gs7WO~qeUpyZ<@oj-cmn)U!Vf07C-bk$~ek{KqukT9|8+faiJW1yO-;{dHX)$MIVL zmSw@gbg!2iWg+JkN8AFC=MN=@?@W1Od8bs6Z6k zZZ=$-OvnIH6v2EpgX8Ih)<*?R0KzbY?xL-0A(Fo2cVeNHLVR{6Labr(iTvQHPH61tRzs5v%n*=n1O-sFbFdq&tH)O6s+@faSXBW zzdGqISAznN+voV`XTSI7Do@k2WWVe3-0ddc{0|RnO-Siiqpnb;x_+>@wuf|GNmYDgTX_FI95T!oZdN&=e{-Y7F>ba(hioL0TEs6jC6 t>Kq02n9yRURE-iF){p*0HTqME7~Hk=bPF$bgaTc{;OXk;vd$@?2>=haZx#Rm literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6122db13f86d11bf7422d0543ca8fc952baafeec GIT binary patch literal 339 zcmV-Z0j&OsP)KgW8 z$PYl3lISoS!~n2bT-Ua>`z{FVE((C+UDtt93XV}E4{)w3@O@w2fjExg)-=}szV9sn zIk4GoA1Nhk{7O2Yf&0cBar%m7XzR!j@$Ld*dYHO5TBko8VDzLIfY lLdVsy_4eOiz6D@*2R@{evLSOiQw{(C002ovPDHLkV1lbziLd|w literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..afd1633cf14b92e8196da8d9990485f00e7de3c2 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU4GauCJUl$rvu&l~tgNhTY-}7I9bH^pfbzbJ_N)a`oFzei!T+Iv zA=tk{2qakG5n0T@z;_6Q8AUa`8i0ZlC9V-A!TD(=<%vb93;~Imc_n&&t|1DhdWL#N zzxOb21FG4U8sVAd>8ZuQ0pzeUNHMZ9FalX#Kr9VqgM6aF$P5-|0#Br15j!LI|B<)rGb&L0pkLQsURC!7eGv!0%U^#6VO~H zu*x7y3m^-s%h138B->|wF#NLk9zP({%hSa%#KQmSC2uZZV7mssef=+dj?;zNQv_UG z(ibR{Yji$d+Yr&3aJi@Y{-GsFTQYadH}rV$T%p<7k+Is5bvx76UmD-l)8DZx@j91C UKELqoQXt3%Pgg&ebxsLQ0Q4tuOaK4? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c8df1f283e779403c45daccda236b87e1eb387cf GIT binary patch literal 571 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijK0(?STi;Iibu3bCD<4AjZd!F@z`Sa)7O2v7qXIofUczAd;x~xi0PBzo9 zGSp&^jEn?oI_)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb z5KBYZAYW=QGK0mLfNVoXCI$f@9RM5`Y+_A4a2D%D~LPFoB(c1*pQn z$k>2!0mM|04%P(_lcoUKAixAPhY74Q$kGDHg6c9fFaXKEy!y@J)UBKGF^9BqgTe~DWM4fp7Nr+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..17b121990aba23432882da7f2b70fd7eb1e3fe60 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STJv=lmp7ny{*AN9$ zJwrXC-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*LB7#oWCn{f0ojI(Obh}* zItqw0+gZTkSwJ=jd@5sPcmeb@j7GDR0Vp+roq+|Y(!j{rfN=rDRFI9V3m_&<0kT1W z31}`8SY?o<1&{^RWoTdklI^oT7=BrNj~|d(?&;zfV&Q*vk|SS(0SC+UMH&D9Cu)8P zx%~EE#-lr2!d_+z^nOfjm?>Gxp!9LiV_Olyi#ruIt#oF&dv-?wLyShvp_#&K#NB2E z+?wQbV`qY9hJH_tQij^eX)#X{Wnd>e!<)^%h!T&=qTPIprmfcz-zDMs$730Fm V@{1KS`9Mx!@O1TaS?83{1OVw3jE(>R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0332a5e1dbedd99970e9fcdf1dda0660c7633fe2 GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUg#{$#q%^FVc#N62t*oqUY-}7I9bH^pfbs?f+OvQZXGxG>@P8;^ z2==cK0tps)L>4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9?UWuNcYlwoWo}r%6 z?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIS3GK0mLfNVoXCI$f@9RMK9w;tya0L_Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$@WB9|4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9? zUWuNcYlwoWo}r%6?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIV4GK0mL zfNVoXCI$f@9RMK9w;tyZ{COj7GDR0Vp+roq+|Y(!j{rfN=rDRFI9V z3m_&<0kT1W31}`8SY?o<1&{^RWoTdklI^oT7=BrNj~|fP;_2cTV&Q*xf;V4-0f&og z*N=z)o=<&rWJPZ2L$7$}Sw8VJHm#T3vh-N&Tt!}%F#q<=&ZJw@vF6*2UngE#{juHR> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1ca247d7339e521edde08c156104d07e02aa0334 GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbU<)k!{BFl}LxILXBlh~y^m<9da6SPz;tj#>FnRtMzemE_d4y3qC zg8YL2!vTYrKjSB$FlT{BWHAE+-yslY6xHx*018T!xJHx&=ckpFCl;kL1SDqWmFW4o zhA5co8R{AR-ov~NsAgMgglC$krxpVTki*I##mLIQ2xNHyu{4wo@{tB3GgzDn$TnnT zVh{k*Q9zv8&H@(C0{a%Rmjjixs@1g@ft=*&>gTe~DWM4f7Y&4< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..53f33d7893e8009fc9f05eddd2de8d3197c17ba1 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ08bakkO=p;*EVu87;v~;G_JPX zTYXeVK)`Xs&rDIGXf}hVtDnm{r-UX30IljQMgRZ+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fc3aba7b332f78b47aa8799dcbe82ce75994b4b5 GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STZFNM#>}4Gt9ZgJ3tgNhTY;0UyT!51Ibb4k0DUOmLzu^B6z;Lg5 zZzNERv%n*=n1O-s5C}7hYIrpO1tm&cBT9nv(@M${i&7Z^5;OBk^!!{y6ioFD^^AV+ zVcrH*vn@5kGtJXei-7~kVP%kFWMyCkvb=y;8p;OwLW7YREY1XE8!|F62mt9QAkJ)O z0gGn=*&y(#jFI65(6cZa%~A%S)C6`07NAN4BVz-`1rSp~HnJ{&m^1~*1_36ZxlCY{ zL6#Ok7F3s^fdNRi&-!5aW$`_JK&F?ci(`m||IK4cyxQ`+gypV}6j6fZ*K5 zraKFlG;U`~Qhs!~xBC96l%P*9cg#0D@!BCwA!lW;PIEts_y)Md5k?PxpS`apaDk+sTe*>hrN`m}? z|HA;orZYO{fufuR9+AZi419+`m{C;2s{tq|QQ{g=5}cn_Ql40p$`Fv4nOCCc=Nh75 zs%NNY^m`BUHlUhqsS%!Oo}O9^96$~$gA^kx10#^-1;o-&Hpn*`jLcwhCLr68k%>V7 zNJjy2W;+X5JPXJMflpx>8!#?_m$Nv;eZ8x(p2rK(c+-2g5Im@9_gN%ROBjLoEESPIBaHFyLUBz9{4W|3u9% zA(!7C%y@K%OW4b7f!>d)4KpQ68I(Tmd2A~pcyXt~rj^btchBx9V2IJEIW$vvjkw#a zfLoJ%ZtP6Z%+T+tQOZy|IW6W%!ptX|Idk2mru>w5G5CMzW$Q!>%d%T*#P{f3sbX9> VS$?r%CLhQN44$rjF6*2UngGu|ioyT@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d1ee3ae6b0b42b802fb360165c0d53f57de34ad2 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUZFNM#>}9=;eH=BNtgNhTY-}7I9bH^pfbz}T%{qV-XGxG>@P8;^ z2==cK0tps)L>4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9?UWuNcYlwoWo}r%6 z?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIS3GK0mLfNVoXCI$f@9RMK9w;tya0L_Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$@W&2WUO{%-OjZ2m&SMX^mpt^yv`+( U&o6wt6bQ1x)78&qol`;+0O?wAnE(I) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..83bf7fa378eb6e0cccd00073f47474739f2c5ef1 GIT binary patch literal 558 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STJJX~#x7n0AR!=K1im{GcQ03^T>EvzfQynWFW-n`|VP&Yr9vK-4 zRQ|Jg?@S=YR}$nG{2v)GxE{E30w}{-;1O92RB#xC8IR|$NC65;l(KW=8{ocd84X9>YYJ_K+r>7PJ2av3CK2NWMU8i(osO1+0FtM&jPYRAOVO$`e8Jhr3}FEnZVA#0#spOWNg5=0Aeag z2kQceNmGDq5MTnD!vt0tWN86pL3J4#7=UD7Uj1fq>Q+t_klE|$;uvD#e|M5MUxNaV zORl3%*8BR{=ru?9ueNH-PMYK+C){@7WAi_@5{3p1=dGJ_)7u1`dW=F6o+&!k9NEXN z8qLYIq_N`@?+3eur&X1&%Y8tO^mO%eS?83{1ON~P Bn_U0^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..624cef88371f274b1bc5730d7552149adaddb2d9 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST!|Y`@x7j#qI!!AuDs!xkv5u>b756sw=}eOXDp@zLxB^IVl?3?( z|AzsFO=on@14TItJR*x382Ao>Fr%o3R|8N`qQo_#Bsf2;m>7@5K1OhC3FBNKxF zkd6Z4%yt&AcovWi0-wql8D0QA4WrR4WdKS|U}sjH>LQ-Ev` zU;>)U1XdYjX#r$Gbr~8MfMolu4~AbB-{S{lmV3H5hFJJto#e>ZV8FpLeNo2$|B0Gk zLN32OnDOWim#~-F0=*wo8)izDGAMoA^Vn8I@ZwH|O)H&Q?w;LIz!0NRb7-dU8gaK- z0knAmtPE0&tPG4mmKP99L)jpoXfQH^#hHL?Lq;YB0U#X( z#F_0ZVDT&<8w5U;F*3XWdKgBdS;_#En!wJ$0#s>WWNg5=0Aec0M%D!olcoUKAixAP zmkF#g$kGDHg6c9fFaXK+Ssx6)EWXDN$n^AdaSXBWPkx}l&^C>U%}pVJNid;7p#73e z50AqE9;E{ff?7Rm8dy1dQdrk`G`Mlyn7~lUbz|ZI2Tca18qKbRSw~pe;uzW48H{rz U?`Ow|gn=yZboFyt=akR{0MEN+&j0`b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..17c5403536ff6f5ff77b14f8c76979194d55dada GIT binary patch literal 545 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUdsJ2TIT}2zSD&w;aVASNT~_w0t!;yf3Q%5-k;_$Bcy**8kiEe9 z-bo~+8J>l^3srHX5=->C=g>$)O{nrlw&=U-75V% o`3$;=fmieAE!gVX&d!mh{iQ}d`1GNV7eQ|GboFyt=akR{0E%IdCIA2c literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e53cae42630963eefaa064ce46fc31635732f955 GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUU4@1BIU39k;GeId@w8t3OqOVms%pBdY=er*>PSJLs*8Hlw*V>b zk|4j}|8T(I<8ZuQ0pzeUNHMZ9FalX#Kr9VqgM6gH$P5-|0#Br15j!LI|B<)rGb&L0pkLQsURC!7eGv! z0%U^#6VO~Hu*x7y3m^-s%h138B->|wF#NLk9zP(n+SA1`#KQmTq=S471{}_gciMjc z=NG%-XMCmk;*oo7`n=g*f8F*oX(%WAxt#g9=TzAi!_7|^KI^G5cueGyU1DI$WAY-P zz4_e1RSdIaIT`=E^1Wb4;R~x}>R_D4Y$NnMp+WuUg@bu54XczK_}7Qt@?0;o%IsEa c9D9{LK|k3OgEnm9a&p!?*4V<6=bvDJB^4 cK#_sr&U Date: Fri, 17 Jan 2025 00:47:23 +0100 Subject: [PATCH 4/6] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 6ca24331812..c4826597218 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- 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 @@ -3867,3 +3860,12 @@ 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 From 90c7953ab1167d69f6c4ef0cb9cd957af9738960 Mon Sep 17 00:00:00 2001 From: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:48:43 -0500 Subject: [PATCH 5/6] Surgeon scrubops (#2756) * vulcan sprites * fixs surgeon loadout + adds DeltaV scrubs * Revert "vulcan sprites" Ignore this IDK how this fucking got here * Typos fix --- .../_DV/Loadouts/Jobs/Medical/surgeon.yml | 108 +++++++++--------- .../_DV/Loadouts/loadout_groups.yml | 46 ++++++++ .../Prototypes/_DV/Loadouts/role_loadouts.yml | 19 +++ 3 files changed, 117 insertions(+), 56 deletions(-) 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 From a535c921c41c803205361c8c440de6c7b3ae93fa Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:49:02 +0100 Subject: [PATCH 6/6] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 29 ++++++------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index c4826597218..47083e5cc5f 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,26 +1,4 @@ Entries: -- 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. @@ -3869,3 +3847,10 @@ 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