Merge branch 'impstation:master' into master

impstation · Dec 2, 2024 · daad629 · daad629
2 parents 7897ee3 + c699148
commit daad629
Show file tree

Hide file tree

Showing 159 changed files with 1,043 additions and 105 deletions.
diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs
@@ -8,6 +8,7 @@ public enum MarkingCategories : byte
         Special,
         Hair,
         FacialHair,
+		Eyes,
         Head,
         HeadTop,
         HeadSide,
@@ -30,6 +31,7 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
                 HumanoidVisualLayers.Special => MarkingCategories.Special,
                 HumanoidVisualLayers.Hair => MarkingCategories.Hair,
                 HumanoidVisualLayers.FacialHair => MarkingCategories.FacialHair,
+				HumanoidVisualLayers.Eyes => MarkingCategories.Eyes,
                 HumanoidVisualLayers.Head => MarkingCategories.Head,
                 HumanoidVisualLayers.HeadTop => MarkingCategories.HeadTop,
                 HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide,

diff --git a/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_cough.ogg b/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_cough.ogg
diff --git a/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_cry.ogg b/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_cry.ogg
diff --git a/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_deathgasp.ogg b/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_deathgasp.ogg
diff --git a/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_gasp.ogg b/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_gasp.ogg
diff --git a/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_laugh.ogg b/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_laugh.ogg
diff --git a/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_scream.ogg b/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_scream.ogg
diff --git a/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_sigh.ogg b/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_sigh.ogg
diff --git a/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_yawn.ogg b/Resources/Audio/_Impstation/Voice/Decapoid/decapoid_yawn.ogg
diff --git a/Resources/Changelog/Impstation.yml b/Resources/Changelog/Impstation.yml
@@ -1,53 +1,4 @@
 Entries:
-- author: wafehling
-  changes:
-  - message: Raccoon/Possum Vent Critters
-    type: Add
-  id: 118
-  time: '2024-08-24T15:55:36.0000000+00:00'
-  url: https://github.com/medabunny/imp-station-14/pull/138
-- author: sususuyo
-  changes:
-  - message: adding a salvage unlockable + moving music around
-    type: Add
-  id: 119
-  time: '2024-08-24T15:55:44.0000000+00:00'
-  url: https://github.com/medabunny/imp-station-14/pull/139
-- author: KingMudkipIII
-  changes:
-  - message: Add bartender chemmaster flatpack unlock
-    type: Add
-  id: 120
-  time: '2024-08-24T15:55:59.0000000+00:00'
-  url: https://github.com/medabunny/imp-station-14/pull/140
-- author: FlippenPage
-  changes:
-  - message: reimplemented Brigmedic equipment
-    type: Add
-  id: 121
-  time: '2024-08-24T15:56:09.0000000+00:00'
-  url: https://github.com/medabunny/imp-station-14/pull/142
-- author: Saeko-44
-  changes:
-  - message: Added Vials to the techfab
-    type: Add
-  id: 122
-  time: '2024-08-24T16:23:02.0000000+00:00'
-  url: https://github.com/medabunny/imp-station-14/pull/143
-- author: sageu111
-  changes:
-  - message: minor gray bugfixes + guidebook entry
-    type: Tweak
-  id: 123
-  time: '2024-08-24T16:23:10.0000000+00:00'
-  url: https://github.com/medabunny/imp-station-14/pull/144
-- author: starlighthowls
-  changes:
-  - message: White Whale trial rotation
-    type: Add
-  id: 124
-  time: '2024-08-24T22:17:53.0000000+00:00'
-  url: https://github.com/medabunny/imp-station-14/pull/145
 - author: formlessnameless
   changes:
   - message: "Fixing boat atmos stuff, small slight other changes that were pointed\uFFFD"
@@ -4381,3 +4332,62 @@
   id: 617
   time: '2024-12-01T11:37:36.0000000+00:00'
   url: https://github.com/impstation/imp-station-14/pull/857
+- author: AftrLite
+  changes:
+  - message: Ongoing respriting efforts to various assets.
+    type: Tweak
+  - message: Reagent volumes (Jugs, beakers, ect) Now display their reagents clearly
+      again.
+    type: Fix
+  - message: Crate labels no longer float menacingly above open crates.
+    type: Fix
+  id: 618
+  time: '2024-12-02T04:51:53.0000000+00:00'
+  url: https://github.com/impstation/imp-station-14/pull/862
+- author: DinnerCalzone
+  changes:
+  - message: (Hummingbird) All buttons should now respect directionality.
+    type: Fix
+  - message: (Hummingbird) Fixed missing tiny fans from arrivals external dock.
+    type: Fix
+  id: 619
+  time: '2024-12-02T12:40:17.0000000+00:00'
+  url: https://github.com/impstation/imp-station-14/pull/865
+- author: Darkmajia
+  changes:
+  - message: Dino Wars has undergone an extensive rework after beta tester feedback.
+      Thank you for continuing to support the Dino Wars project.
+    type: Tweak
+  id: 620
+  time: '2024-12-02T12:42:13.0000000+00:00'
+  url: https://github.com/impstation/imp-station-14/pull/846
+- author: widgetbeck
+  changes:
+  - message: Decapoids are done. The only remaining issue is that their urist does
+      not spawn with their emote sounds for some reason.
+    type: Add
+  id: 621
+  time: '2024-12-02T12:46:18.0000000+00:00'
+  url: https://github.com/impstation/imp-station-14/pull/859
+- author: widgetbeck
+  changes:
+  - message: Clarified the description of the "SGD Required" trait.
+    type: Tweak
+  id: 622
+  time: '2024-12-02T12:47:36.0000000+00:00'
+  url: https://github.com/impstation/imp-station-14/pull/864
+- author: Darkmajia
+  changes:
+  - message: 'The Animal Friends Kit has an additional line to make its function clearer:
+      subjuzine requires mixing with blood.'
+    type: Add
+  id: 623
+  time: '2024-12-02T12:48:22.0000000+00:00'
+  url: https://github.com/impstation/imp-station-14/pull/870
+- author: Darkmajia
+  changes:
+  - message: Ultraviolet lights can now be crafted in autolathes.
+    type: Add
+  id: 624
+  time: '2024-12-02T13:09:17.0000000+00:00'
+  url: https://github.com/impstation/imp-station-14/pull/871
diff --git a/Resources/Locale/en-US/_Impstation/markings/decapoid.ftl b/Resources/Locale/en-US/_Impstation/markings/decapoid.ftl
@@ -0,0 +1,57 @@
+# Eyes
+marking-DecapoidEyesDefault = Default Eyes
+marking-DecapoidEyesDefault-eyes-1 = Default Eyes
+
+marking-DecapoidEyesThree = Three Eyes
+marking-DecapoidEyesThree-eyes-2 = Three Eyes
+
+marking-DecapoidEyesWideClose = Wide Close Eyes
+marking-DecapoidEyesWideClose-eyes-3 = Wide Close Eyes
+
+marking-DecapoidEyesStalks = Eyestalks
+marking-DecapoidEyesStalks-eyes-4 = Eyestalks
+
+marking-DecapoidEyesWideFar = Wide Far Eyes
+marking-DecapoidEyesWideFar-eyes-5 = Wide Far Eyes
+
+marking-DecapoidEyesSpider = Spider Eyes
+marking-DecapoidEyesSpider-eyes-6 = Spider Eyes
+
+# Head
+marking-DecapoidFlatHead = Flat Head
+marking-DecapoidFlatHead-flathead = Flat Head
+
+marking-DecapoidGills1 = Gills
+marking-DecapoidGills1-gills = Gills
+
+# Chest
+marking-DecapoidPecPlate = Pectoral Plate
+marking-DecapoidPecPlate-pectoralplate = Pectoral Plate
+
+marking-DecapoidAbPlate = Abdominal Plate
+marking-DecapoidAbPlate-abdominalplate = Abdominal Plate
+
+marking-DecapoidLowerPlate = Lower Abdominal Plate
+marking-DecapoidLowerPlate-lowerplate = Lower Abdominal Plate
+
+# Arms
+marking-DecapoidPauldronRight = Right Pauldron
+marking-DecapoidPauldronRight-pauldronright = Right Pauldron
+
+marking-DecapoidPauldronSpike = Left Pauldron Spike
+marking-DecapoidPauldronSpike-pauldronspike = Left Pauldron Spike
+
+marking-DecapoidPauldronLeft = Left Pauldron
+marking-DecapoidPauldronLeft-pauldronleft = Left Pauldron
+
+marking-DecapoidClawPlate = Major Claw
+marking-DecapoidClawPlate-clawplate = Major Claw
+
+marking-DecapoidRHandPlate = Minor Claw
+marking-DecapoidRHandPlate-righthandplate = Minor Claw
+
+marking-DecapoidClawGradient = Major Claw Gradient
+marking-DecapoidClawGradient-clawgradient = Major Claw Gradient
+
+marking-DecapoidRHandGradient = Minor Claw Gradient
+marking-DecapoidRHandGradient-righthandgradient = Minor Claw Gradient
diff --git a/Resources/Locale/en-US/_Impstation/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/_Impstation/preferences/ui/markings-picker.ftl
@@ -0,0 +1 @@
+markings-category-Eyes = Eyes
diff --git a/Resources/Locale/en-US/_Impstation/traits/traits.ftl b/Resources/Locale/en-US/_Impstation/traits/traits.ftl
@@ -5,5 +5,5 @@ trait-unborgable-name = Unborgable
 trait-unborgable-desc = Your brain is unable to fit into a Man-Machine Interface.
 
 trait-sgdrequired-name = SGD Required
-trait-sgdrequired-desc = Your voice is gone, and you instead rely on a speech generating device to translate your thoughts to speech.
+trait-sgdrequired-desc = You are incapable of verbal communication without a Speech Generating Device. You will arrive at the station with one in your inventory.
 sgdrequired-cant-speak = You can't speak without an SGD!
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -119,7 +119,7 @@ uplink-holster-name = Shoulder Holster
 uplink-holster-desc = A deep shoulder holster capable of holding many types of ballistics.
 
 uplink-animal-friends-kit-name = Animal Friends Kit
-uplink-animal-friends-kit-desc = A box containing 4 doses of subjuzine, an alteration of cognizine that forces the injected creature to your will. Also contains an empty syringe and two mice to use it on.
+uplink-animal-friends-kit-desc = A box containing 4 doses of subjuzine, an alteration of cognizine that forces the injected creature to your will. Also contains an empty syringe and two mice to use it on. Just add blood!
 
 uplink-chest-rig-name = Chest Rig
 uplink-chest-rig-desc = Explosion-resistant tactical webbing used for holding traitor goods.

diff --git a/Resources/Maps/_Impstation/hummingbird.yml b/Resources/Maps/_Impstation/hummingbird.yml
@@ -14685,6 +14685,16 @@ entities:
     - type: Transform
       pos: 47.5,-52.5
       parent: 2
+  - uid: 23910
+    components:
+    - type: Transform
+      pos: 41.5,-56.5
+      parent: 2
+  - uid: 24145
+    components:
+    - type: Transform
+      pos: 41.5,-54.5
+      parent: 2
 - proto: AtmosFixBlockerMarker
   entities:
   - uid: 644
@@ -117663,7 +117673,7 @@ entities:
     - type: Transform
       pos: 51.093052,-13.622461
       parent: 2
-- proto: PresentRandomAsh
+- proto: PresentRandomCoal
   entities:
   - uid: 24000
     components:
@@ -125388,7 +125398,7 @@ entities:
     - type: Transform
       pos: 55.5,-32.5
       parent: 2
-- proto: SignalButton
+- proto: SignalButtonDirectional
   entities:
   - uid: 174
     components:
@@ -126157,7 +126167,7 @@ entities:
       linkedPorts:
         4587:
         - Pressed: DoorBolt
-- proto: SignalSwitch
+- proto: SignalSwitchDirectional
   entities:
   - uid: 15934
     components:
@@ -154019,7 +154029,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -140815.45
+      secondsUntilStateChange: -140965.23
       state: Opening
     - type: Airlock
       autoClose: False

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -44,7 +44,7 @@
       solution: beaker
     - type: Appearance
     - type: SolutionContainerVisuals
-      maxFillLevels: 6
+      maxFillLevels: 8
       fillBaseName: jug
       inHandsMaxFillLevels: 5
       inHandsFillBaseName: -fill-

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -301,7 +301,7 @@
     size: Tiny
   - type: Appearance
   - type: SolutionContainerVisuals
-    maxFillLevels: 1
+    maxFillLevels: 5
     fillBaseName: dropper
     inHandsMaxFillLevels: 1
     inHandsFillBaseName: -fill-
@@ -609,7 +609,7 @@
     areaInsertRadius: 1
     storageInsertSound: /Audio/Effects/pill_insert.ogg
     storageRemoveSound: /Audio/Effects/pill_remove.ogg
-    whitelist: 
+    whitelist:
       tags:
       - Pill
   - type: Dumpable
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -148,6 +148,7 @@
       - LedLightTube
       - SodiumLightTube
       - ExteriorLightTube
+      - UvLightTube
       - LightBulb
       - LedLightBulb
       - DimLightBulb

diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -21,25 +21,30 @@
   - type: Sprite
     layers:
       - sprite: Structures/Hydroponics/containers.rsi
-        state: hydrotray3
+        state: hydrotray4
       - sprite: Structures/Hydroponics/overlays.rsi
         state: lowhealth3
+#        shader: unshaded
         map: [ "health_alert" ]
         visible: false
       - sprite: Structures/Hydroponics/overlays.rsi
         state: lowwater3
+        shader: unshaded
         map: [ "water_alert" ]
         visible: false
       - sprite: Structures/Hydroponics/overlays.rsi
         state: lownutri3
+#        shader: unshaded
         map: [ "nutri_alert" ]
         visible: false
       - sprite: Structures/Hydroponics/overlays.rsi
         state: alert3
+#        shader: unshaded
         map: [ "undefined_alert" ]
         visible: false
       - sprite: Structures/Hydroponics/overlays.rsi
         state: harvest3
+#        shader: unshaded
         map: [ "harvest_alert" ]
         visible: false
   - type: Appearance

diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml
@@ -73,5 +73,5 @@
 
 - type: guideEntry
   id: Decapoid
-  name: REDACTED
-  text: "/ServerInfo/_Impstation/Guidebook/Mobs/Decapoid_REDACTED.xml"
+  name: Decapoid
+  text: "/ServerInfo/_Impstation/Guidebook/Mobs/Decapoid.xml"
diff --git a/Resources/Prototypes/_Goobstation/Changeling/ai_factions.yml b/Resources/Prototypes/_Goobstation/Changeling/ai_factions.yml
@@ -4,4 +4,5 @@
   - NanoTrasen
   - Syndicate
   - Zombie
-  - Revolutionary
+  - Revolutionary
+  - Dino
diff --git a/Resources/Prototypes/_Goobstation/Heretic/ai_factions.yml b/Resources/Prototypes/_Goobstation/Heretic/ai_factions.yml
@@ -5,4 +5,5 @@
   - Syndicate
   - Zombie
   - Revolutionary
-  - Changeling
+  - Changeling
+  - Dino
diff --git a/Resources/Prototypes/_Impstation/Damage/modifier_sets.yml b/Resources/Prototypes/_Impstation/Damage/modifier_sets.yml
@@ -8,10 +8,8 @@
   coefficients:
     Blunt: 0.6
     Slash: 0.7
-    Piercing: 1.3
     Cold: 1.4
     Poison: 0.8
-    Structural: 2.0
   flatReductions:
     Blunt: 5
     Piercing: 5