Разное (#385)

* - add: Meatspike changes.

* - fix: Fix socks.

* - remove: No light status.

* - tweak: Raptor tweak.

* - fix: Fix exception.

* - remove: Remove unsexed.

* - tweak: Crossbow tweak.

* - add: More meatspike.

* - tweak: Nerf buff rune.

* - tweak: No throwing during incorporeal.

* - add: Incorporeal magic cooldown.

Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl

@@ -11,3 +11,4 @@ comp-kitchen-spike-knife-needed = Вам нужен нож для этого.
 comp-kitchen-spike-remove-meat = Вы срезаете немного мяса с { $victim }.
 comp-kitchen-spike-remove-meat-last = Вы срезаете последний кусок мяса с { $victim }!
 comp-kitchen-spike-meat-name = мясо { $victim }
+comp-kitchen-spike-examine = На { CAPITALIZE($this) } висит туша { CAPITALIZE($victim) }.

Resources/Prototypes/DeviceLinking/source_ports.yml

@@ -156,12 +156,6 @@
   description: Передатчик сигнала ХимМастера
 
 # WD
-- type: sourcePort
-  id: LightStatus
-  name: Статус светильника
-  description: Этот порт вызывается всякий раз, когда меняется статус светильника
-  defaultLinks: [ Toggle ]
-
 - type: sourcePort
   id: BodyScannerSender
   name: Сканер тела

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

@@ -1,7 +1,7 @@
 - type: entity
   name: laser raptor
   id: MobLaserRaptor
-  parent: SimpleMobBase
+  parent: SimpleSpaceMobBase
   description: From the Viking age.
   components:
     - type: NpcFactionMember
@@ -36,7 +36,7 @@
     - type: MobThresholds
       thresholds:
         0: Alive
-        100: Dead
+        50: Dead
     - type: MovementSpeedModifier
       baseWalkSpeed: 2
       baseSprintSpeed: 5

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

@@ -29,10 +29,10 @@
       visible: false
     - map: [ "underwearb" ] #White
     - map: [ "underweart" ] #White
-    - map: ["jumpsuit"]
     - map: [ "enum.HumanoidVisualLayers.LFoot" ]
     - map: [ "enum.HumanoidVisualLayers.RFoot" ]
     - map: [ "socks" ] #White
+    - map: ["jumpsuit"]
     - map: ["enum.HumanoidVisualLayers.LHand"]
     - map: ["enum.HumanoidVisualLayers.RHand"]
     - map: [ "gloves" ]

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

@@ -74,8 +74,6 @@
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-      - map: [ "underwearb" ] #White
-      - map: [ "underweart" ] #White
       - shader: StencilClear
         sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115
         # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear.
@@ -86,17 +84,14 @@
         sprite: Mobs/Customization/masking_helpers.rsi
         state: unisex_full
         visible: false
-      - map: [ "jumpsuit" ]
-      - map: [ "enum.HumanoidVisualLayers.LHand" ]
-      - map: [ "enum.HumanoidVisualLayers.RHand" ]
+      - map: [ "underwearb" ] #White
+      - map: [ "underweart" ] #White
       - map: [ "enum.HumanoidVisualLayers.LFoot" ]
       - map: [ "enum.HumanoidVisualLayers.RFoot" ]
       - map: [ "socks" ] #White
-      - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-        color: "#ffffff"
-        sprite: Objects/Misc/handcuffs.rsi
-        state: body-overlay-2
-        visible: false
+      - map: [ "jumpsuit" ]
+      - map: [ "enum.HumanoidVisualLayers.LHand" ]
+      - map: [ "enum.HumanoidVisualLayers.RHand" ]
       - map: [ "gloves" ]
       - map: [ "shoes" ]
       - map: [ "ears" ]
@@ -115,6 +110,11 @@
       - map: [ "head" ]
       - map: [ "pocket1" ]
       - map: [ "pocket2" ]
+      - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+        color: "#ffffff"
+        sprite: Objects/Misc/handcuffs.rsi
+        state: body-overlay-2
+        visible: false
       - map: [ "clownedon" ] # Dynamically generated
         sprite: "Effects/creampie.rsi"
         state: "creampie_moth"

Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml

@@ -40,7 +40,7 @@
   - type: RCDDeconstructable
     cost: 4
     delay: 2
-    fx: EffectRCDDeconstruct2  
+    fx: EffectRCDDeconstruct2
   - type: Destructible
     thresholds:
     - trigger:
@@ -72,7 +72,7 @@
     mode: SnapgridCenter
     snap:
     - Wallmount
-    
+
 - type: entity
   name: light
   description: "A light fixture. Draws power and produces light when equipped with a light tube."
@@ -100,9 +100,6 @@
     receiveFrequencyId: SmartLight
   - type: WirelessNetworkConnection
     range: 200
-  - type: DeviceLinkSource
-    ports:
-    - LightStatus
   - type: DeviceLinkSink
     ports:
       - On
@@ -294,9 +291,6 @@
     receiveFrequencyId: SmartLight
   - type: WirelessNetworkConnection
     range: 200
-  - type: DeviceLinkSource
-    ports:
-    - LightStatus
   - type: Appearance
   - type: PoweredLightVisuals
   - type: DeviceLinkSink

Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml

@@ -87,9 +87,6 @@
     receiveFrequencyId: SmartLight
   - type: WirelessNetworkConnection
     range: 200
-  - type: DeviceLinkSource
-    ports:
-    - LightStatus
   - type: DeviceLinkSink
     ports:
       - On

Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml

@@ -12,8 +12,8 @@
               southRotation: true
           steps:
             - material: Steel
-              amount: 15
-              doAfter: 2
+              amount: 5
+              doAfter: 5
     - node: MeatSpike
       entity: KitchenSpike
       edges:
@@ -21,7 +21,7 @@
           completed:
             - !type:SpawnPrototype
               prototype: SheetSteel1
-              amount: 15
+              amount: 5
           steps:
             - tool: Screwing
-              doAfter: 1
+              doAfter: 5

Resources/Prototypes/Species/arachnid.yml

@@ -13,8 +13,6 @@
   femaleFirstNames: names_arachnid_first
   maleLastNames: names_arachnid_last
   femaleLastNames: names_arachnid_last
-  sexes:
-  - Unsexed
 
 - type: markingPoints
   id: MobArachnidMarkingLimits