Merge branch 'Elegance' of https://github.com/IAmNotGray/Delta-v into…

… Elegance
DeltaV-Station · Jan 17, 2025 · 14c829b · 14c829b
2 parents 1273233 + d27e99b
commit 14c829b
Show file tree

Hide file tree

Showing 94 changed files with 713 additions and 149 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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