Merge branch 'master' into logitechdrip

Resources/Changelog/DeltaVChangelog.yml

@@ -1,43 +1,4 @@
 Entries:
-- author: DangerRevolution
-  changes:
-  - message: Added a Pax-injector to the Security Cyborg De-Escalation module.
-    type: Add
-  - message: Added an Escalation Module for the Security Cyborg; locked behind Research.
-    type: Add
-  id: 453
-  time: '2024-07-28T09:08:50.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1524
-- author: Colin-Tel
-  changes:
-  - message: Lowered the frequency of Revenants appearing outside of high glimmer
-      events.
-    type: Tweak
-  id: 454
-  time: '2024-07-29T08:49:05.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1553
-- author: Lyndomen
-  changes:
-  - message: Clarifies that Borg focused speciesism is against our rules!
-    type: Tweak
-  id: 455
-  time: '2024-07-29T16:26:44.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1544
-- author: Fox
-  changes:
-  - message: New large salvage wreck "Solar Farm"
-    type: Add
-  id: 456
-  time: '2024-07-30T16:03:30.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1512
-- author: Colin-Tel
-  changes:
-  - message: Chibi station is now available for play with a soft population cap of
-      10!
-    type: Add
-  id: 457
-  time: '2024-07-30T16:06:49.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1495
 - author: Velcroboy
   changes:
   - message: Added Silvia the snake, a pet with healing venom as CMO's new pet
@@ -3868,3 +3829,41 @@
   id: 952
   time: '2025-01-27T18:28:17.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2804
+- author: SolStar
+  changes:
+  - message: Mindshield implants will now make people immune to becoming sleeper agents.
+    type: Tweak
+  id: 953
+  time: '2025-01-28T08:47:53.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2803
+- author: rosieposieeee
+  changes:
+  - message: Added some meat decorations.
+    type: Add
+  id: 954
+  time: '2025-01-28T12:32:57.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2427
+- author: sowelipililimute
+  changes:
+  - message: Prescription departamental glasses and HUDs no longer require glue to
+      obtain
+    type: Tweak
+  id: 955
+  time: '2025-01-28T12:36:13.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2629
+- author: hivehum, crocodilecarousel
+  changes:
+  - message: "From Impstation: government regulatory agencies don\u2019t want you\
+      \ to know this but you can cook a bunch of cigarettes into a soup to get some\
+      \ extra bang for your buck"
+    type: Add
+  id: 956
+  time: '2025-01-28T15:26:16.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2757
+- author: leonardo-dabepis
+  changes:
+  - message: Meth will now fuck you up (this is immersive)
+    type: Tweak
+  id: 957
+  time: '2025-01-28T15:36:12.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2736

Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl

@@ -0,0 +1 @@
+flavor-complex-cigarettes = like cigarettes

Resources/Prototypes/GameRules/events.yml

@@ -557,6 +557,7 @@
       playerRatio: 10
       blacklist:
         components:
+        - MindShield # DeltaV - Mind Shielded people are immune to becoming syndicate
         - AntagImmune
       mindRoles:
       - MindRoleTraitorSleeper

Resources/Prototypes/Reagents/narcotics.yml

@@ -15,6 +15,7 @@
         damage:
           types:
             Poison: 0.75
+            Cellular: 1 # DeltaV - meth rots you just like in real life :D
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
@@ -228,6 +229,16 @@
   plantMetabolism:
   - !type:PlantAdjustHealth
     amount: -5
+  metabolisms: # DeltaV - nicotine gives you the smallest amount of cell damage just like real life :D
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Cellular: 0.01
+    Food:
+      effects:
+      - !type:SatiateHunger
 
 # TODO: Replace these nonstandardized effects with generic brain damage
 - type: reagent

Resources/Prototypes/_DV/Entities/Objects/Decoration/meat.yml

@@ -0,0 +1,102 @@
+- type: entity
+  id: MeatDecorBase
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Decoration/Flesh/meat.rsi
+    noRot: false
+    state: teeth1
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Wood
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+        params:
+          variation: 0.05
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: gib
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          FoodMeat:
+            min: 1
+            max: 1
+
+- type: entity
+  id: FleshTeethBase
+  name: flesh teeth
+  description: Tooth-like protrusions.
+  parent: [MeatDecorBase, BaseRock]
+  abstract: true
+
+- type: entity
+  parent: FleshTeethBase
+  id: FleshTeeth1
+  components:
+  - type: Sprite
+    state: teeth1
+
+- type: entity
+  parent: FleshTeethBase
+  id: FleshTeeth2
+  components:
+  - type: Sprite
+    state: teeth2
+
+- type: entity
+  parent: FleshTeethBase
+  id: FleshTeeth3
+  components:
+  - type: Sprite
+    state: teeth3
+
+- type: entity
+  parent: [MeatDecorBase, BaseSign]
+  id: MeatWallMouth
+  name: wall mouth
+  description: It hungers.
+  components:
+  - type: Sprite
+    noRot: true
+    snapCardinals: false
+    state: wallmouth
+
+- type: entity
+  parent: [MeatDecorBase, BaseSign]
+  id: MeatWhisperers
+  name: whisperers
+  description: It whispers.
+  placement:
+    mode: SnapgridBorder
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: Overdoors
+    snapCardinals: false
+    sprite: _DV/Objects/Decoration/Flesh/bigmeat.rsi
+    state: whisperers
+
+- type: entity
+  parent: MeatDecorBase
+  id: MeatFloorMouth
+  name: floor mouth
+  description: "It's starving."
+  components:
+  - type: Clickable
+  - type: Tag
+    tags:
+    - Structure
+  - type: Sprite
+    drawdepth: FloorObjects
+    sprite: _DV/Objects/Decoration/Flesh/bigmeat.rsi
+    state: floormouth

Resources/Prototypes/_DV/Recipes/Construction/Graphs/clothing/prescription_departamental_glasses.yml

@@ -21,12 +21,6 @@
             - material: Cable
               amount: 5
               doAfter: 5
-            - tag: DrinkSpaceGlue
-              name: space glue
-              icon:
-                sprite: Objects/Consumable/Drinks/glue-tube.rsi
-                state: icon
-              doAfter: 5
     - node: prescsecglasses
       entity: ClothingEyesPrescriptionSecurityGlasses
 
@@ -53,11 +47,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: presccorpsglasses
       entity: ClothingEyesPrescriptionCorpsmanGlasses

Resources/Prototypes/_DV/Recipes/Construction/Graphs/clothing/prescription_huds.yml

@@ -21,12 +21,6 @@
             - 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
 
@@ -53,11 +47,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

Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Food/soup.yml

@@ -0,0 +1,23 @@
+- type: entity
+  parent: FoodBowlBase
+  id: FoodCamelSoup
+  name: one day blinding stew # DeltaV - name change
+  description: the hospital can't stop me. I will never go. not with the strength I've obtained.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - cigarettes
+  - type: Sprite
+    sprite: _Impstation/Objects/Consumable/Food/bowl.rsi
+    layers:
+    - state: bowl
+    - state: camelsouplit #initial design was to let this be lit up like an actual cigarette but i decided i did not want to deal with that. if someone else wants to make it work please do, there are assets for this in bowl.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 57
+        reagents:
+        - ReagentId: TearGas
+          Quantity: 40
+        - ReagentId: ChloralHydrate
+          Quantity: 17

Resources/Prototypes/_Impstation/Flavors/flavors.yml

@@ -0,0 +1,4 @@
+- type: flavor
+  id: cigarettes
+  flavorType: Complex
+  description: flavor-complex-cigarettes

Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml

@@ -0,0 +1,9 @@
+- type: microwaveMealRecipe
+  id: RecipeCamelSoup
+  name: one day blinding stew recipe # DeltaV - name change
+  result: FoodCamelSoup
+  time: 15
+  solids:
+    TearGasGrenade: 1
+    FoodBowlBig: 1
+    Cigarette: 8 #YUMMY!!!!!!!!!

Resources/Textures/_DV/Objects/Decoration/Flesh/bigmeat.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "rosieposieeee (Github)",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "whisperers",
+            "directions": 4
+        },
+        {
+            "name": "floormouth"
+        }
+	]
+}

Resources/Textures/_DV/Objects/Decoration/Flesh/meat.rsi/meta.json

@@ -0,0 +1,24 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "rosieposieeee (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "teeth1"
+        },
+		{
+            "name": "teeth2"
+        },
+        {
+            "name": "teeth3"
+        },
+		{
+            "name": "wallmouth",
+            "directions": 4
+        }
+	]
+}

Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "fills by Carousel. bowl is taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "camelsoup"
+        },
+        {
+            "name": "camelsouplit",
+            "delays": [
+            [
+                0.2,
+                0.2,
+                0.2,
+                0.2
+            ]
+            ]
+        },
+        {
+            "name": "bowl",
+            "directions": 1
+        }
+    ]
+  }