Merge branch 'master' into Chitinid

DeltaV-Station · Jan 12, 2025 · 44c1786 · 44c1786
2 parents 1a599ed + 869a08a
commit 44c1786
Show file tree

Hide file tree

Showing 34 changed files with 643 additions and 571 deletions.
diff --git a/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs b/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs
@@ -35,7 +35,7 @@ public sealed partial class TeslaEnergyBallComponent : Component
     /// The amount of energy to which the tesla must reach in order to be destroyed.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float EnergyToDespawn = -100f;
+    public float EnergyToDespawn = -540f; // DeltaV, make the Tesla take as long to fail as the singulo.
 
     /// <summary>
     /// Played when energy reaches the lower limit (and entity destroyed)

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Bellwether
-  changes:
-  - message: The Chief Justice's apparel is now available in the uniform printer
-    type: Tweak
-  id: 402
-  time: '2024-06-17T16:37:43.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1395
 - author: deltanedas
   changes:
   - message: Added Carpy the Legal Carp, coming to justice departments near you.
@@ -3851,3 +3844,10 @@
   id: 901
   time: '2025-01-12T15:48:39.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2658
+- author: Dirius77
+  changes:
+  - message: Made the Tesla much slower to fade after power loss.
+    type: Tweak
+  id: 902
+  time: '2025-01-12T23:16:01.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2710
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -24,11 +24,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitQMFormal
 
-- type: loadout #DeltaV
-  id: QuartermasterFormalDress
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtQMFormal
-
 # Head
 - type: loadout
   id: QuartermasterHead
@@ -40,11 +35,6 @@
   equipment:
     head: ClothingHeadHatBeretQM
 
-- type: loadout # DeltaV
-  id: LogiOfficerBeret
-  equipment:
-    head: ClothingHeadHatBeretLogi
-
 # Neck
 - type: loadout
   id: QuartermasterCloak
@@ -61,9 +51,3 @@
   id: QuartermasterWintercoat
   equipment:
     outerClothing: ClothingOuterWinterQM
-
-# Shoes - DeltaV
-- type: loadout
-  id: QuartermasterWinterBoots
-  equipment:
-    shoes: ClothingShoesBootsWinterLogisticsOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
@@ -25,14 +25,3 @@
   id: SalvageBoots
   equipment:
     shoes: ClothingShoesBootsSalvage
-
-- type: loadout # DeltaV
-  id: SalvageWinterBoots
-  equipment:
-    shoes: ClothingShoesBootsWinterMiner
-
-# Neck - DeltaV
-- type: loadout # DeltaV
-  id: SalvageCloak
-  equipment:
-    neck: ClothingNeckSalvager
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
@@ -40,9 +40,3 @@
   id: BartenderWintercoat
   equipment:
     outerClothing: ClothingOuterWinterBar
-
-# Glasses - DeltaV
-- type: loadout
-  id: BartenderGlasses
-  equipment:
-    eyes: ClothingEyesHudBeer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
@@ -48,52 +48,6 @@
   equipment:
     jumpsuit: ClothingUniformColorRainbow
 
-# Rose Hoodie w/ Skirt - DeltaV
-- type: loadout
-  id: MioSkirt
-  equipment:
-    jumpsuit: ClothingCostumeMioSkirt
-
-# Turqoise Hoodie w/ Shorts - DeltaV
-- type: loadout
-  id: NaotaHoodie
-  equipment:
-    jumpsuit: ClothingCostumeNaota
-
-# Casual Blue - DeltaV
-- type: loadout
-  id: CasualRedSkirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtCasualRed
-
-- type: loadout
-  id: CasualRedSuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitCasualRed
-
-
-# Casual Blue - DeltaV
-- type: loadout
-  id: CasualBlueSkirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtCasualBlue
-
-- type: loadout
-  id: CasualBlueSuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitCasualBlue
-
-# Casual Purple - DeltaV
-- type: loadout
-  id: CasualPurpleSkirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtCasualPurple
-
-- type: loadout
-  id: CasualPurpleSuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitCasualPurple
-
 # Ancient
 - type: loadout
   id: AncientJumpsuit

diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
@@ -30,22 +30,12 @@
   equipment:
     head: ClothingHeadHatCapcap
 
-- type: loadout # DeltaV
-  id: CaptainBeret
-  equipment:
-    head: ClothingHeadHatBeretCap
-
 # Neck
 - type: loadout
   id: CaptainCloak
   equipment:
     neck: ClothingNeckCloakCap
 
-- type: loadout # DeltaV
-  id: CaptainCloakFormal
-  equipment:
-    neck: ClothingNeckCloakCapFormal
-
 - type: loadout
   id: CaptainMantle
   equipment:
@@ -77,20 +67,3 @@
   id: CaptainWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCap
-
-# Gloves - DeltaV
-- type: loadout # DeltaV
-  id: CaptainGloves
-  equipment:
-    gloves: ClothingHandsGlovesCaptain
-
-- type: loadout # DeltaV
-  id: InspectionGloves
-  equipment:
-    gloves: ClothingHandsGlovesInspection
-
-# Shoes - DeltaV
-- type: loadout # DeltaV
-  id: CaptainWinterBoots
-  equipment:
-    shoes: ClothingShoesBootsWinterCap
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -101,11 +101,6 @@
   equipment:
     outerClothing: ClothingOuterVestHazard
 
-- type: loadout # DeltaV
-  id: StationEngineerWintercoat
-  equipment:
-    outerClothing: ClothingOuterWinterEngi
-
 # Shoes
 - type: loadout
   id: WorkBoots

diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
@@ -1,9 +1,3 @@
-# Neck - DeltaV
-- type: loadout # DeltaV
-  id: ChemistTie
-  equipment:
-    neck: ClothingNeckTieChem
-
 # Jumpsuit
 - type: loadout
   id: ChemistJumpsuit
@@ -15,11 +9,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtChemistry
 
-- type: loadout # DeltaV
-  id: ChemistFormalSuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitChemShirt
-
 # Back
 - type: loadout
   id: ChemistBackpack
@@ -46,27 +35,3 @@
   id: ChemistWintercoat
   equipment:
     outerClothing: ClothingOuterWinterChem
-
-## Start DeltaV Changes
-- type: loadout
-  id: ChemistApron
-  equipment:
-    outerClothing: ClothingOuterApronChemist
-
-# Gloves - DeltaV
-- type: loadout
-  id: ChemistGloves
-  equipment:
-    gloves: ClothingHandsGlovesChemist
-
-# Shoes - DeltaV
-- type: loadout
-  id: ChemistWinterBoots
-  equipment:
-    shoes: ClothingShoesBootsWinterChem
-
-- type: loadout
-  id: ChemistShoes
-  equipment:
-    shoes: ClothingShoesEnclosedChem
-## End DeltaV Changes
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -51,9 +51,3 @@
   id: ChiefMedicalOfficerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCMO
-
-# Shoes - DeltaV
-- type: loadout
-  id: ChiefMedicalOfficerWinterBoots
-  equipment:
-    shoes: ClothingShoesBootsWinterChiefMedicalOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -72,12 +72,6 @@
   equipment:
     head: ClothingHeadNurseHat
 
-# Neck - DeltaV
-- type: loadout # DeltaV
-  id: Stethoscope
-  equipment:
-    neck: ClothingNeckStethoscope
-
 # Jumpsuit
 - type: loadout
   id: MedicalDoctorJumpsuit

diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
@@ -31,8 +31,3 @@
   id: BlueShoes
   equipment:
     shoes: ClothingShoesColorBlue
-
-- type: loadout # DeltaV
-  id: ParamedicWinterBoots
-  equipment:
-    shoes: ClothingShoesBootsWinterParamedic
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
@@ -4,11 +4,6 @@
   id: ResearchDirectorBeret
   startingGear: ScientificBeret
 
-- type: loadout # DeltaV
-  id: ResearchDirectorHood
-  equipment:
-    head: ClothingHeadHoodMysta
-
 # Neck
 
 - type: loadout
@@ -38,18 +33,7 @@
   equipment:
     outerClothing: ClothingOuterCoatRD
 
-- type: loadout # DeltaV
-  id: MystaLabCoat
-  equipment:
-    outerClothing: ClothingOuterCoatRndMysta
-
 - type: loadout
   id: ResearchDirectorWintercoat
   equipment:
     outerClothing: ClothingOuterWinterRD
-
-# Shoes - DeltaV
-- type: loadout # DeltaV
-  id: ResearchDirectorWinterBoots
-  equipment:
-    shoes: ClothingShoesBootsWinterMystagogue
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
@@ -9,11 +9,6 @@
   equipment:
     head: ClothingHeadHatFedoraGrey
 
-- type: loadout # DeltaV
-  id: DetBeret
-  equipment:
-    head: ClothingHeadHatBeretDet
-
 # Neck
 - type: loadout
   id: DetectiveTie
@@ -41,26 +36,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtDetectiveGrey
 
-- type: loadout # DeltaV
-  id: ForensicSpecJumpsuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitForensicSpec
-
-- type: loadout # DeltaV
-  id: ForensicSpecJumpskirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtForensicSpec
-
-- type: loadout # DeltaV
-  id: ForensicSpecTurtlesuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitDetTurtle
-
-- type: loadout # DeltaV
-  id: ForensicSpecTurtleskirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtDetTurtle
-
 # OuterClothing
 - type: loadout
   id: DetectiveArmorVest
@@ -71,8 +46,3 @@
   id: DetectiveCoat
   equipment:
     outerClothing: ClothingOuterCoatDetectiveLoadout
-
-- type: loadout # DeltaV
-  id: StasecWinterCoatDet
-  equipment:
-    outerClothing: ClothingOuterCoatStasecDet