This SHOULD be all of it, I think

Simple-Station · Sep 22, 2024 · 9c6df29 · 9c6df29
1 parent 1d91890
commit 9c6df29
Show file tree

Hide file tree

Showing 19 changed files with 339 additions and 158 deletions.
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
@@ -70,7 +70,7 @@ public partial struct SeedChemQuantity
     /// When chemicals are added to produce, the potency of the seed is divided with this value. Final chemical amount is the result plus the `Min` value.
     /// Example: PotencyDivisor of 20 with seed potency of 55 results in 2.75, 55/20 = 2.75. If minimum is 1 then final result will be 3.75 of that chemical, 55/20+1 = 3.75.
     /// </summary>
-    [DataField("PotencyDivisor")] public int PotencyDivisor;
+    [DataField] public int PotencyDivisor;
 
     /// <summary>
     /// Inherent chemical is one that is NOT result of mutation or crossbreeding. These chemicals are removed if species mutation is executed.

diff --git a/Resources/Locale/en-US/damage/damage-types.ftl b/Resources/Locale/en-US/damage/damage-types.ftl
@@ -11,3 +11,4 @@ damage-type-radiation = Radiation
 damage-type-shock = Shock
 damage-type-slash = Slash
 damage-type-structural = Structural
+damage-type-holy = Holy
diff --git a/Resources/Locale/en-US/metabolism/metabolizer-types.ftl b/Resources/Locale/en-US/metabolism/metabolizer-types.ftl
@@ -9,3 +9,5 @@ metabolizer-type-plant = Plant
 metabolizer-type-dwarf = Dwarf
 metabolizer-type-moth = Moth
 metabolizer-type-arachnid = Arachnid
+metabolizer-type-vampiric = Vampiric
+metabolizer-type-liquorlifeline = Liquor Lifeline
diff --git a/Resources/Prototypes/Chemistry/metabolizer_types.yml b/Resources/Prototypes/Chemistry/metabolizer_types.yml
@@ -47,8 +47,8 @@
 
 - type: metabolizerType
   id: Vampiric
-  name: vampiric
+  name: metabolizer-type-vampiric
 
 - type: metabolizerType
   id: LiquorLifeline
-  name: liquorlifeline
+  name: metabolizer-type-liquorlifeline
diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml
@@ -3,7 +3,7 @@
   id: ClothingEyesPrescriptionMedHud
   graph: PrescriptionMedHud
   startNode: start
-  targetNode: prescmedhud 
+  targetNode: prescmedhud
   category: construction-category-clothing
   description: Prescription medhud, merged glasses and medhud together by sheer luck and cables with glue.
   icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi, state: icon }
@@ -14,8 +14,72 @@
   id: ClothingEyesPrescriptionHudSecurity
   graph: PrescriptionSecHud
   startNode: start
-  targetNode: prescsechud 
+  targetNode: prescsechud
   category: construction-category-clothing
   description: Prescription sechud, merged glasses and sechud together by sheer luck and cables with glue.
   icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi, state: icon }
   objectType: Item
+
+- type: constructionGraph
+  id: PrescriptionMedHud
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: prescmedhud
+          steps:
+            - tag: HudMedical
+              name: medical hud
+              icon:
+                sprite: Clothing/Eyes/Hud/med.rsi
+                state: icon
+              doAfter: 5
+            - tag: GlassesNearsight
+              name: glasses
+              icon:
+                sprite: Clothing/Eyes/Glasses/glasses.rsi
+                state: icon
+              doAfter: 5
+            - material: Cable
+              amount: 5
+              doAfter: 5
+            - tag: DrinkSpaceGlue
+              name: space glue
+              icon:
+                sprite: Objects/Consumable/Drinks/glue-tube.rsi
+                state: icon
+              doAfter: 5
+    - node: prescmedhud
+      entity: ClothingEyesPrescriptionMedHud
+
+- type: constructionGraph
+  id: PrescriptionSecHud
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: prescsechud
+          steps:
+            - tag: HudSecurity
+              name: security hud
+              icon:
+                sprite: Clothing/Eyes/Hud/med.rsi
+                state: icon
+              doAfter: 5
+            - tag: GlassesNearsight
+              name: glasses
+              icon:
+                sprite: Clothing/Eyes/Glasses/glasses.rsi
+                state: icon
+              doAfter: 5
+            - material: Cable
+              amount: 5
+              doAfter: 5
+            - tag: DrinkSpaceGlue
+              name: space glue
+              icon:
+                sprite: Objects/Consumable/Drinks/glue-tube.rsi
+                state: icon
+              doAfter: 5
+    - node: prescsechud
+      entity: ClothingEyesPrescriptionHudSecurity
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -132,8 +132,6 @@
     name: ghost-role-information-slimes-name
     description: ghost-role-information-slimes-description
     rules: deltav-ghost-role-information-softantag-rules
-    raffle:
-      settings: short
   - type: Speech
     speechVerb: Slime
     speechSounds: Slime
@@ -238,8 +236,6 @@
         - SimpleHostile
 #    - type: GhostRole #DeltaV - all slimes neutral when ghost role
 #      description: ghost-role-information-angry-slimes-description
-      raffle:
-        settings: short
 
 - type: entity
   name: yellow slime
@@ -275,5 +271,3 @@
         - SimpleHostile
 #    - type: GhostRole #DeltaV - all slimes neutral when ghost role
 #      description: ghost-role-information-angry-slimes-description
-      raffle:
-        settings: short
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -631,7 +631,7 @@
         settings: short
     - type: GhostTakeoverAvailable
     - type: Loadout
-      roleLoadout: [ JobCargoTechnician ]
+      prototypes: [ JobCargoTechnician ]
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -686,7 +686,7 @@
         settings: short
     - type: GhostTakeoverAvailable
     - type: Loadout
-      roleLoadout: [ JobClown ]
+      prototypes: [ JobClown ]
     - type: RandomMetadata
       nameSegments:
       - names_clown
@@ -744,7 +744,7 @@
         settings: short
     - type: GhostTakeoverAvailable
     - type: Loadout
-      roleLoadout: [ JobChef ]
+      prototypes: [ JobChef ]
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -807,7 +807,7 @@
         settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
-      roleLoadout: [ JobResearchDirector ]
+      prototypes: [ JobResearchDirector ]
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -825,7 +825,7 @@
         settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
-      roleLoadout: [ JobChiefMedicalOfficer ]
+      prototypes: [ JobChiefMedicalOfficer ]
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -843,7 +843,7 @@
         settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
-      roleLoadout: [ JobCaptain ]
+      prototypes: [ JobCaptain ]
     - type: RandomMetadata
       nameSegments:
       - names_first

diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -109,7 +109,7 @@
   - type: WeldingHealing # Same as Brutepack - Estacao Pirata IPCs
     damageContainers:
       - Silicon
-    fuelcost: 5
+    FuelCost: 5
     damage:
       types:
         Blunt: -15

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -53,7 +53,7 @@
     delay: 0.5 # line of fire as well as if it hits something
   - type: ExplodeOnTrigger
   - type: Explosive
-    explosionType: FireBomb
+    explosionType: Default
     totalIntensity: 5 # low intensity, the point is to burn attackers not to break open walls, dragons can just eat them
     intensitySlope: 1
     maxIntensity: 3

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/shower.yml b/Resources/Prototypes/Entities/Structures/Furniture/shower.yml
@@ -24,11 +24,11 @@
       canCollide: false
     - type: InteractionOutline
     - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
     - type: Construction
       graph: Shower
       node: shower
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
     - type: Destructible
       thresholds:
       - trigger:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
@@ -43,7 +43,7 @@
       map: ["enum.SolutionHeaterVisuals.IsOn"]
       shader: unshaded
   - type: SolutionHeater
-    heatPerSecond: 160
+    baseHeatPerSecond: 160
   - type: ItemPlacer
     whitelist:
       components:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1367,7 +1367,6 @@
   - type: LitOnPowered
   - type: ApcPowerReceiver
     powerLoad: 200
-    priority: Low
   # - type: Advertise
   #   pack: CuddlyCritterAds # TODO Change this
   - type: PointLight