Merge branch 'Fansana:master' into overlay

Content.Server/Atmos/Rotting/RottingSystem.cs

@@ -13,6 +13,7 @@
 using Robust.Server.Containers;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
+using Content.Shared.Cuffs.Components;
 
 namespace Content.Server.Atmos.Rotting;
 
@@ -88,6 +89,18 @@ public bool IsRotProgressing(EntityUid uid, PerishableComponent? perishable)
             return false;
         }
 
+        if (TryComp<CuffableComponent>(uid, out var cuffed) && cuffed.CuffedHandCount > 0)
+        {
+            if (TryComp<HandcuffComponent>(cuffed.LastAddedCuffs, out var cuffcomp))
+            {
+                if (cuffcomp.NoRot)
+                {
+                    return false;
+                }
+            }
+        }
+
+
         var ev = new IsRottingEvent();
         RaiseLocalEvent(uid, ref ev);
 

Content.Server/Connection/ConnectionManager.cs

@@ -200,10 +200,7 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
 
                 var slots = _cfg.GetCVar(CCVars.WhitelistMinPlayers);
 
-                var noSlotsOpen = slots > 0 && slots < connectedPlayers - connectedWhitelist;
-
-                if (noSlotsOpen && await _db.GetWhitelistStatusAsync(userId) == false
-                                     && adminData is null)
+                if (await _db.GetWhitelistStatusAsync(userId) == false && adminData is null)
                 {
                     var msg = Loc.GetString(_cfg.GetCVar(CCVars.WhitelistReason));
 

Content.Server/Spider/SpiderSystem.cs

@@ -4,12 +4,15 @@
 using Content.Shared.Maps;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.Components;
 
 namespace Content.Server.Spider;
 
 public sealed class SpiderSystem : SharedSpiderSystem
 {
     [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly HungerSystem _hungerSystem = default!;
 
     public override void Initialize()
     {
@@ -22,6 +25,13 @@ private void OnSpawnNet(EntityUid uid, SpiderComponent component, SpiderWebActio
         if (args.Handled)
             return;
 
+        if (TryComp<HungerComponent>(uid, out var hungerComp)
+        && _hungerSystem.IsHungerBelowState(uid, HungerThreshold.Okay, hungerComp.CurrentHunger - 5, hungerComp))
+        {
+            _popup.PopupEntity(Loc.GetString("sericulture-failure-hunger"), args.Performer, args.Performer);
+            return;
+        }
+
         var transform = Transform(uid);
 
         if (transform.GridUid == null)
@@ -42,22 +52,10 @@ private void OnSpawnNet(EntityUid uid, SpiderComponent component, SpiderWebActio
             result = true;
         }
 
-        // Spawn web in other directions
-        for (var i = 0; i < 4; i++)
-        {
-            var direction = (DirectionFlag) (1 << i);
-            coords = transform.Coordinates.Offset(direction.AsDir().ToVec());
-
-            if (!IsTileBlockedByWeb(coords))
-            {
-                Spawn(component.WebPrototype, coords);
-                result = true;
-            }
-        }
-
         if (result)
         {
             _popup.PopupEntity(Loc.GetString("spider-web-action-success"), args.Performer, args.Performer);
+            _hungerSystem.ModifyHunger(uid, -5);
             args.Handled = true;
         }
         else
@@ -74,4 +72,3 @@ private bool IsTileBlockedByWeb(EntityCoordinates coords)
         return false;
     }
 }
-

Content.Shared/Cuffs/Components/HandcuffComponent.cs

@@ -9,6 +9,12 @@ namespace Content.Shared.Cuffs.Components;
 [Access(typeof(SharedCuffableSystem))]
 public sealed partial class HandcuffComponent : Component
 {
+    /// <summary>
+    /// Whether or not the entity can rot when cuffed (for spooder cocoon)
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool NoRot = false;
+
     /// <summary>
     ///     The time it takes to cuff an entity.
     /// </summary>

Resources/Prototypes/Actions/spider.yml

@@ -7,7 +7,7 @@
   - type: InstantAction
     icon: Interface/Actions/web.png
     event: !type:SpiderWebActionEvent
-    useDelay: 25
+    useDelay: 30
 
 - type: entity
   id: ActionSericulture

Resources/Prototypes/Entities/Mobs/Species/arachnid.yml

@@ -19,6 +19,8 @@
     productionLength: 2
     entityProduced: MaterialWebSilk1
     hungerCost: 4 # Should total to 25 total silk on full hunger
+  - type: Spider
+  - type: IgnoreSpiderWeb
   - type: Tag
     tags:
     - CanPilot

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

@@ -157,3 +157,32 @@
   - type: Sprite
     sprite: Clothing/OuterClothing/Misc/straight_jacket.rsi
     state: icon
+
+- type: entity
+  name: web cocoon
+  description: Strong web cocoon used to restrain criminal or preys, its also prevent rotting.
+  id: WebCocoon
+  parent: ClothingOuterStraightjacket
+  components:
+  - type: Handcuff
+    noRot: true
+    cuffedRSI: Clothing/OuterClothing/Misc/webcocoon.rsi
+    bodyIconState: body-overlay
+    breakOnRemove: true
+    brokenPrototype: MaterialWebSilk1
+    startCuffSound:
+      path: /Audio/Items/Handcuffs/rope_start.ogg
+    endCuffSound:
+      path: /Audio/Items/Handcuffs/rope_end.ogg
+    startUncuffSound:
+      path: /Audio/Items/Handcuffs/rope_start.ogg
+    endUncuffSound:
+      path: /Audio/Items/Handcuffs/rope_breakout.ogg
+    startBreakoutSound:
+      path: /Audio/Items/Handcuffs/rope_takeoff.ogg
+  - type: Construction
+    graph: WebObjects
+    node: cocoon
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/webcocoon.rsi
+    state: cocoon

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

@@ -7,6 +7,9 @@
     snap:
       - Wall
   components:
+    - type: Construction
+      graph: WebStructures
+      node: spiderweb
     - type: MeleeSound
       soundGroups:
         Brute:

Resources/Prototypes/Entities/Structures/Furniture/beds.yml

@@ -179,3 +179,15 @@
           MaterialWoodPlank:
             min: 2
             max: 2
+
+- type: entity
+  parent: WebBed
+  id: WebNest
+  name: web nest
+  components:
+  - type: Sprite
+    sprite: Structures/Web/nest.rsi
+    state: icon
+  - type: Construction
+    graph: WebStructures
+    node: nest

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml

@@ -10,10 +10,6 @@
   supervisors: job-supervisors-security
   setPreference: true
 #  whitelistRequired: true
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 21600
   special:
   - !type:AddComponentSpecial
     components:

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml

@@ -3,9 +3,6 @@
   name: job-name-martialartist
   description: job-description-martialartist
   playTimeTracker: JobMartialArtist
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 7200 #2 hours
   startingGear: MartialArtistGear
   icon: "JobIconMartialArtist"
   supervisors: job-supervisors-hop

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml

@@ -9,11 +9,6 @@
 #  whitelistRequired: true
   icon: "JobIconPrisoner"
   supervisors: job-supervisors-security
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 21600
-
 - type: startingGear
   id: PrisonerGear
   equipment:

Resources/Prototypes/Objectives/objectiveGroups.yml

@@ -80,7 +80,6 @@
     TechnologyDiskStealCollectionObjective: 1        #rnd
     FigurineStealCollectionObjective: 0.3          #service
     IDCardsStealCollectionObjective: 1
-    CannabisStealCollectionObjective: 1
     LAMPStealCollectionObjective: 2 #only for moth
 
 - type: weightedRandom

Resources/Prototypes/Recipes/Construction/Graphs/web.yml

@@ -60,6 +60,14 @@
         amount: 8
         doAfter: 6
 
+    - to: nest
+      completed:
+      - !type:SnapToGrid
+        southRotation: true
+      steps:
+      - material: WebSilk
+        amount: 6
+        doAfter: 3
 
   # Deconstruction is down here
   - node: wall
@@ -133,3 +141,15 @@
       steps:
       - tool: Cutting
         doAfter: 3
+
+  - node: nest
+    entity: WebNest
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: MaterialWebSilk1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 2

Resources/Prototypes/Recipes/Construction/web.yml

@@ -117,3 +117,21 @@
     - SpiderCraft
   conditions:
     - !type:TileNotBlocked
+
+- type: construction
+  name: web nest
+  id: WebNest
+  graph: WebStructures
+  startNode: start
+  targetNode: nest
+  category: construction-category-furniture
+  description: Fun fact, you eating spiders in your sleep is false.
+  icon:
+    sprite: Structures/Web/nest.rsi
+    state: icon
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked

Resources/Prototypes/Recipes/Crafting/Graphs/web.yml

@@ -41,13 +41,20 @@
       - material: WebSilk
         amount: 12
         doAfter: 6
-        
+
     - to: boots
       steps:
       - material: WebSilk
         amount: 2
         doAfter: 4
-
+
+    - to: cocoon
+      steps:
+      - material: WebSilk
+        amount: 8
+        doAfter: 6
+
+
   # Deconstruction
   - node: tile
     entity: FloorTileItemWeb
@@ -69,3 +76,6 @@
 
   - node: boots
     entity: ClothingShoesBootsWinterWeb
+
+  - node: cocoon
+    entity: WebCocoon

Resources/Prototypes/Recipes/Crafting/web.yml

@@ -109,3 +109,16 @@
     sprite: Clothing/Shoes/Boots/winterbootsweb.rsi
     state: icon
   objectType: Item
+
+- type: construction
+  name: web cocoon
+  id: WebCocoon
+  graph: WebObjects
+  startNode: start
+  targetNode: cocoon
+  category: construction-category-clothing
+  description: "Strong web cocoon used to restrain criminal or preys, its also prevent rotting."
+  icon:
+    sprite: Clothing/OuterClothing/Misc/webcocoon.rsi
+    state: cocoon
+  objectType: Item

Resources/Textures/Clothing/OuterClothing/Misc/webcocoon.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Heroman3003",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "cocoon"
+    },
+	{
+      "name": "body-overlay-2",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Structures/Web/nest.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Heroman3003",
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}