[WiP] Minor fauna update

Content.Shared/Prying/Components/PryingComponent.cs

@@ -1,5 +1,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Prying.Components;
 
@@ -36,6 +37,12 @@ public sealed partial class PryingComponent : Component
     /// </summary>
     [DataField]
     public bool Enabled = true;
+
+    [ViewVariables]
+    public EntityUid? ActionPryingEntity;
+
+    [DataField("actionPry")]
+    public EntProtoId ActionPrying = "ActionPrying";
 }
 
 /// <summary>
@@ -94,3 +101,4 @@ public GetPryTimeModifierEvent(EntityUid user)
     }
 }
 
+

Content.Shared/Prying/Systems/PryingSystem.cs

@@ -8,9 +8,9 @@
 using Content.Shared.Prying.Components;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.SS220.Prying; //ss220 fauna update
 using Robust.Shared.Serialization;
 using PryUnpoweredComponent = Content.Shared.Prying.Components.PryUnpoweredComponent;
-
 namespace Content.Shared.Prying.Systems;
 
 /// <summary>
@@ -31,8 +31,22 @@ public override void Initialize()
         SubscribeLocalEvent<DoorComponent, GetVerbsEvent<AlternativeVerb>>(OnDoorAltVerb);
         SubscribeLocalEvent<DoorComponent, DoorPryDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<DoorComponent, InteractUsingEvent>(TryPryDoor);
+
+        SubscribeLocalEvent<PryingComponent, ActionPryingEvent>(OnPryActionEvent); //ss220 fauna update
     }
 
+    //ss220 fauna update start 
+    private void OnPryActionEvent(Entity<PryingComponent> entity, ref ActionPryingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!TryComp(args.Target, out DoorComponent? comp))
+            return;
+
+        args.Handled = TryPry(args.Target, args.Performer, out _, args.Performer);
+    }
+    //ss220 fauna update end
     private void TryPryDoor(EntityUid uid, DoorComponent comp, InteractUsingEvent args)
     {
         if (args.Handled)

Content.Shared/SS220/Prying/PryingAction.cs

@@ -0,0 +1,7 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared.SS220.Prying;
+
+public sealed partial class ActionPryingEvent : EntityTargetActionEvent
+{
+}

Resources/Locale/ru-RU/ss220/ghost/roles/ghost-role-component.ftl

@@ -20,6 +20,16 @@ ghost-role-information-traveling-chef-description = Вы - шеф-повар н
 ghost-role-information-traveling-chef-rules = Действуют обычные правила для экипажа станции.
 # Lost souls roles end
 
+#Fauna update start here!!!
 ghost-role-information-giant-fly-name = Веспия
 ghost-role-information-giant-fly-description = Вы гигантская боевая оса. Ваша задача - уничтожить всех кроме представителей вашего вида.
-ghost-role-information-giant-fly-rules = Вы [color=red][bold]Командный антагонист[/bold][/color], в команде с другими гигантскими осами.
+ghost-role-information-giant-fly-rules = Вы [color=red][bold]Командный антагонист[/bold][/color], в команде с другими гигантскими осами.
+
+ghost-role-information-space-adder-name = Космическая гадюка
+ghost-role-information-space-adder-description = Обитатели этой станции выглядят очень аппетитно, как раз вам на зубок.
+ghost-role-information-small-space-adder-name = Маленькая космическая гадюка
+
+ghost-role-information-cobra-space-name = Космическая кобра
+ghost-role-information-cobra-space-description = Когда вас заметят - будет слишком поздно. Выползайте на охоту!
+ghost-role-information-snake-overall-rules = Вы [color=red][bold]Командный антагонист[/bold][/color], в команде с другими змеями из далёкого космоса.
+#Fauna update end here!!!

Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/npcs/space.ftl

@@ -0,0 +1,3 @@
+ent-MobCobraSpaceGhostRole = { ent-MobCobraSpace }
+    .suffix = Роль призрака
+    .desc = { ent-MobCobraSpace.desc }

Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/npcs/xeno.ftl

@@ -0,0 +1,6 @@
+ent-MobPurpleSnakeGhostRole = { ent-MobPurpleSnake }
+    .desc = { ent-MobPurpleSnake.desc }
+    .suffix = Роль призрака
+ent-MobSmallPurpleSnakeGhostRole = { ent-MobSmallPurpleSnake }
+    .desc = { ent-MobSmallPurpleSnake.desc }
+    .suffix = { ent-MobSmallPurpleSnake.suffix }, Роль призрака

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -2352,6 +2352,15 @@
   - type: Spider
   - type: IgnoreSpiderWeb
   - type: Bloodstream
+  #SS220 Fauna update start
+  - type: ThermalVision
+    state: Half
+    visionRadius: 14
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: SpiderMob
+  - type: Magboots
+  #SS220 Fauna update end
     bloodMaxVolume: 150
     bloodReagent: CopperBlood
   - type: Speech
@@ -2372,7 +2381,7 @@
   - type: Prying # Open door from xeno.yml.
     pryPowered: true
     force: true
-    speedModifier: 1.5
+    speedModifier: 3 #SS220 Fauna update 1.5 -> 3. B A L A N S  Z O N E S A
     useSound:
       path: /Audio/Items/crowbar.ogg
   - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute from base.yml.
@@ -2448,6 +2457,14 @@
     damage:
       types:
         Piercing: 6
+    #SS220 Fauna update start
+  - type: ActionGrant
+    actions:
+    - ActionSpawnSpiderWallWebTarantula
+    - ActionPryingTarantula
+    - ActionSpawnSpiderEggTarantula
+    - ActionSpawnSingleSpiderWebTarantula
+    #SS220 Fauna update end
 
 - type: entity
   parent:
@@ -2502,6 +2519,14 @@
     - type: Bloodstream
       bloodMaxVolume: 150
       bloodReagent: Laughter
+    #SS220 Fauna update start
+    - type: ActionGrant
+      actions:
+      - ActionPryingClownSpider
+      - ActionSpawnSpiderWallWebClownSpider
+      - ActionSpawnSpiderEggClownSpider
+      - ActionSpawnSingleSpiderWebClownSpider
+    #SS220 Fauna update end
 
 - type: entity
   name: wizard spider

Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml

@@ -5,6 +5,7 @@
   abstract: true
   description: It looks so much like jelly. I wonder what it tastes like?
   components:
+  - type: NoSlip #SS220 Fauna update
   - type: Sprite
     drawdepth: Mobs
     sprite: Mobs/Aliens/slimes.rsi
@@ -53,7 +54,7 @@
     maxSaturation: 15
   - type: Damageable
     damageContainer: Biological
-    damageModifierSet: Slime
+    damageModifierSet: SlimeMob #SS220 FaunaUpdate
   - type: Bloodstream
     bloodReagent: Slime
     bloodlossDamage:

Resources/Prototypes/Entities/Mobs/NPCs/space.yml

@@ -284,8 +284,14 @@
   parent: MobSpaceBasic
   description: Long fangs and a glowing hood, and the alluring look begs to come closer.
   components:
+    #SS220 Fauna update start
+    - type: NoSlip
+    - type: Damageable
+      damageContainer: Biological
+      damageModifierSet: SnakeMob
+    #SS220 Fauna update end
     - type: Sprite
-      drawdepth: Mobs
+      drawdepth: SmallMobs #SS220 Fauna update
       sprite: Mobs/Animals/spacecobra.rsi
       layers:
         - map: [ "enum.DamageStateVisualLayers.Base" ]
@@ -329,9 +335,9 @@
             radius: 0.40
           density: 120
           mask:
-          - MobMask
+          - SmallMobMask #SS220 Fauna update
           layer:
-          - MobLayer
+          - SmallMobLayer #SS220 Fauna update
     - type: MeleeWeapon
       hidden: true
       soundHit:
@@ -367,6 +373,12 @@
     - type: StealthOnMove
       passiveVisibilityRate: -0.25
       movementVisibilityRate: 0.25
+      #SS220 Fauna Update start
+    - type: Tag
+      tags:
+      - CannotSuicide
+      - FootstepSound
+      #SS220 Fauna Update end
 
 - type: entity
   id: MobCobraSpaceSalvage

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -364,8 +364,14 @@
   id: MobPurpleSnake
   description: A menacing purple snake from Kepler-283c.
   components:
+  #SS220 Fauna update start
+  - type: NoSlip
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: SnakeMob
+  #SS220 Fauna update end
   - type: Sprite
-    drawdepth: Mobs
+    drawdepth: SmallMobs #SS220 Fauna update
     sprite: Mobs/Aliens/Xenos/purple_snake.rsi
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
@@ -416,15 +422,15 @@
           radius: 0.35
         density: 25
         mask:
-        - MobMask
+        - SmallMobMask #SS220 Fauna update
         layer:
-        - MobLayer
+        - SmallMobLayer #SS220 Fauna update
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepSnake
   - type: Tag
     tags:
-    - DoorBumpOpener
+    # - DoorBumpOpener #Muted tag cause of SS220 fauna update
     - FootstepSound
 
 - type: entity
@@ -435,7 +441,7 @@
   description: A smaller version of the menacing purple snake from Kepler-283c.
   components:
   - type: Sprite
-    drawdepth: Mobs
+    drawdepth: SmallMobs #SS220 Fauna update
     sprite: Mobs/Aliens/Xenos/purple_snake.rsi
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]

Resources/Prototypes/Entities/Objects/Misc/spider_web.yml

@@ -132,12 +132,27 @@
       damageModifierSet: Wood
     - type: Destructible
       thresholds:
+      #SS220 fauna update start
+      - trigger:
+          !type:DamageTrigger
+          damage: 50
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+      #SS220 fauna update end
       - trigger:
           !type:DamageTrigger
           damage: 10
         behaviors:
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
+          #SS220 fauna update start
+        - !type:SpawnEntitiesBehavior
+          spawn:
+            MaterialWebSugarSilk:
+              min: 1
+              max: 1
+          #SS220 fauna update end
     - type: Temperature
       heatDamage:
         types:

Resources/Prototypes/GameRules/events.yml

@@ -24,6 +24,9 @@
     - id: SpiderClownSpawn
     - id: SpiderSpawn
     - id: VentClog
+    #SS220 Fauna update start
+    - id: SpaceCobraSpawn
+    #SS220 Fauna update end
 
 - type: entityTable
   id: BasicAntagEventsTable
@@ -398,12 +401,20 @@
     duration: 60
   - type: VentCrittersRule
     entries:
+  #SS220 fauna update start. Each prob was 0.02 on wizden. Amount and max amout for SS220
     - id: MobAdultSlimesBlueAngry
-      prob: 0.02
+      prob: 0.01
+      amount: 3
+      maxAmount: 3
     - id: MobAdultSlimesGreenAngry
-      prob: 0.02
+      prob: 0.01
+      amount: 3
+      maxAmount: 3
     - id: MobAdultSlimesYellowAngry
-      prob: 0.02
+      prob: 0.01
+      amount: 3
+      maxAmount: 3
+  #SS220 Fauna update end
 
 - type: entity
   id: SnakeSpawn
@@ -423,12 +434,34 @@
     duration: 60
   - type: VentCrittersRule
     entries:
-    - id: MobPurpleSnake
-      prob: 0.02
-    - id: MobSmallPurpleSnake
-      prob: 0.02
+    - id: MobPurpleSnakeGhostRole #SS220 Fauna update
+      prob: 0.03
+    - id: MobSmallPurpleSnakeGhostRole #SS220 Fauna update
+      prob: 0.03
+    #SS220 Fauna update. Making this event just snakes.
+    #- id: MobCobraSpace
+      #prob: 0.02
+
+#SS220 Fauna update start
+- type: entity
+  id: SpaceCobraSpawn
+  parent: BaseStationEventShortDelay
+  components:
+  - type: StationEvent
+    startAnnouncement: station-event-vent-creatures-start-announcement
+    startAudio:
+      path: /Audio/SS220/Announcements/lifesigns.ogg
+      params:
+        volume: -4
+    earliestStart: 20
+    minimumPlayers: 15
+    weight: 5
+    duration: 60
+  - type: VentCrittersRule
+    entries:
     - id: MobCobraSpace
-      prob: 0.02
+      prob: 0.06
+#SS220 Fauna update end
 
 - type: entity
   id: SpiderSpawn
@@ -449,7 +482,11 @@
   - type: VentCrittersRule
     entries:
     - id: MobGiantSpiderAngry
-      prob: 0.05
+  #SS220 Fauna update start. Offs prob is 0.05
+      prob: 0.025
+      amount: 3
+      maxAmount: 4
+  #SS220 Fauna update end.
 
 - type: entity
   id: SpiderClownSpawn
@@ -470,7 +507,11 @@
   - type: VentCrittersRule
     entries:
     - id: MobClownSpider
-      prob: 0.05
+  #SS220 Fauna update start. Offs prob is 0.05
+      prob: 0.03
+      amount: 2
+      maxAmount: 2
+  #SS220 Fauna update end
 
 - type: entity
   id: ZombieOutbreak