Fixes & more (#548)

* - fix: Narsie not spawning, items not dropping on paralyze, cult tweaks. * - fix: Diagonal grilles layer. * - add: Cockroaches don't drop organs. * - add: Magic hands now work on interact & disable context menu interaction. * - fix: Shackles speech after doafter. * - tweak: Reduce flashbang knockdown, check for CanLieDown. * - tweak: Hspear limit. * - tweak: Remove knockdown tile friction. * - tweak: Engi belt in sus box. * - fix: Constructs can hear cult chat. * - fix: Desword audio. * - fix: Context menu. * - fix: Actually drop items on paralyze. * - tweak: Revert range reduction. * - add: Update thermal visibility. * - add: NPCs can miss. * - tweak: Update desc. * - fix: Actually fix desword audio. * - tweak: Secret weights & game presets. * - fix: Cult stun.
2024-08-03 15:23:46 +00:00
parent 7f7cb34c0c
commit d4525a91e6
33 changed files with 152 additions and 125 deletions
--- a/Resources/Locale/ru-RU/_white/cult/entities.ftl
+++ b/Resources/Locale/ru-RU/_white/cult/entities.ftl
@@ -6,10 +6,10 @@ ent-SoulShardGhost = камень душ
    .suffix = Роль призраков

 ent-StunHand = оглушающая аура
-    .desc = Оглушит и обезмолвит жертву при ударе.
+    .desc = Оглушит и обезмолвит жертву при контакте.

 ent-RitesHand = аура кровавых обрядов
-    .desc = Впитывает кровь из всего, к чему прикасается. При ударе по культистам и конструктам может исцелить их. Используйте в руке, чтобы провести продвинутый обряд.
+    .desc = Впитывает кровь из всего, к чему прикасается. При контакте с культистами или конструктами может исцелить их. Используйте в руке, чтобы провести продвинутый обряд.

 ent-ShadowShackles = теневые оковы
    .desc = Оковы, сковывающие запястья с помощью зловещей магии.
--- a/Resources/Locale/ru-RU/_white/white-shit.ftl
+++ b/Resources/Locale/ru-RU/_white/white-shit.ftl
@@ -22,3 +22,5 @@ melee-block-event-blocked = заблокировал!
 alerts-blocked-name = Атака заблокирована
 alerts-blocked-desc = Невозможно блокировать некоторое время.
 melee-block-component-delay = Может блокировать атаку ближнего боя каждые {$delay} секунд.
+
+context-menu-cant-interact = Невозможно взаимодействовать через контекстное меню!
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -112,12 +112,7 @@
  components:
  - type: StorageFill
    contents:
-    - id: Crowbar
-    - id: Wrench
-    - id: Screwdriver
-    - id: Wirecutter
-    - id: Welder
-    - id: Multitool
+    - id: ClothingBeltUtilityEngineering
    - id: ClothingHandsGlovesCombat
    - id: ClothingMaskGasSyndicate

--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -375,7 +375,8 @@
        damageType: Blunt
        damage: 10
      behaviors:
-      - !type:GibBehavior { }
+      - !type:GibBehavior
+        recursive: false
  - type: NonSpreaderZombie

 - type: entity
@@ -529,7 +530,8 @@
        damageType: Blunt
        damage: 60
      behaviors:
-      - !type:GibBehavior { }
+      - !type:GibBehavior
+        recursive: false
  - type: FireVisuals
    sprite: Mobs/Effects/onfire.rsi
    normalState: Mouse_burning
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -757,7 +757,7 @@
  - type: FlashOnTrigger
    range: 7
    stunTime: 2 # WD
-    knockdownTime: 20 # WD
+    knockdownTime: 10 # WD
  - type: SpawnOnTrigger
    proto: GrenadeFlashEffect
  - type: ActiveTimerTrigger
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -42,7 +42,7 @@
    animation: WeaponArcThrust
    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
-    range: 1.8 # Spears are long
+    range: 2 # Spears are long
  - type: DamageOtherOnHit
    damage:
      types:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -68,7 +68,7 @@
  - type: FlashOnTrigger
    range: 7
    stunTime: 2 # WD
-    knockdownTime: 20 # WD
+    knockdownTime: 10 # WD
  - type: SoundOnTrigger
    sound:
      path: "/Audio/Effects/flash_bang.ogg"
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -12,7 +12,7 @@
    - type: RCDDeconstructable
      cost: 6
      delay: 4
-      fx: EffectRCDDeconstruct4  
+      fx: EffectRCDDeconstruct4
    - type: Tag
      tags:
        - DeleteWithWindows
@@ -200,7 +200,7 @@
          mask:
          - FullTileMask
          layer:
-          - WallLayer
+          - GlassLayer
    - type: Construction
      graph: GrilleDiagonal
      node: grilleDiagonal
@@ -235,8 +235,8 @@
          mask:
          - FullTileMask
          layer:
-          - WallLayer
+          - GlassLayer
    - type: Construction
      graph: GrilleDiagonal
      node: clockworkGrilleDiagonal
-      
+
--- a/Resources/Prototypes/_White/Catalog/uplink.yml
+++ b/Resources/Prototypes/_White/Catalog/uplink.yml
@@ -101,6 +101,7 @@
    blacklist:
      tags:
      - NukeOpsUplink
+  saleLimit: 1

 # Night Vision
 - type: listing
--- a/Resources/Prototypes/_White/Construction/Cult/graphs.yml
+++ b/Resources/Prototypes/_White/Construction/Cult/graphs.yml
@@ -87,6 +87,7 @@
          completed:
            - !type:SnapToGrid
              southRotation: true
+            - !type:CheckForStructure
          steps:
            - material: RunicMetalSheets
              amount: 4
--- a/Resources/Prototypes/_White/Entities/Cult/Items/hands.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Items/hands.yml
@@ -8,15 +8,6 @@
  components:
  - type: Item
    size: Ginormous
-  - type: MeleeWeapon
-    canBeBlocked: false
-    canHeavyAttack: false
-    canMiss: false
-    attackRate: 2
-    wideAnimationRotation: 180
-    damage:
-      types:
-        Heat: 0
  - type: DeleteOnDropAttempt
    message: cult-hand-component-extra-message
  - type: Unremoveable
@@ -35,15 +26,6 @@
    state: icon
  - type: Item
    sprite: White/Cult/Entities/stun.rsi
-  - type: MeleeWeapon
-    canAttackSelf: false
-    attackWhitelist:
-      components:
-      - StatusEffects
-    attackBlacklist:
-      components:
-      - Cultist
-      - Construct
  - type: CultStunHand
    speech: "Fuu ma'jin!"

@@ -58,11 +40,6 @@
    state: icon
  - type: Item
    sprite: White/Cult/Entities/rites.rsi
-  - type: MeleeWeapon
-    attackWhitelist:
-      components:
-      - Cultist
-      - Construct
  - type: CultRitesHand
    speech: "Fel'th Dol Ab'orod!"
  - type: ActivatableUI
--- a/Resources/Prototypes/_White/Entities/Cult/Weapons/blood_spear.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Weapons/blood_spear.yml
@@ -35,7 +35,7 @@
    animation: WeaponArcThrust
    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
-    range: 1.8
+    range: 2
  - type: DamageOtherOnHit
    damage:
      types:
--- a/Resources/Prototypes/_White/Entities/Cult/constructs.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/constructs.yml
@@ -84,6 +84,7 @@
      group: Construct
    - type: GlobalAntagonist
      antagonistPrototype: globalAntagonistCult
+    - type: ThermalBlocker

 - type: entity
  id: JuggernautConstruct
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml
@@ -41,7 +41,7 @@
  - type: FlashOnTrigger
    range: 5
    stunTime: 2 # WD
-    knockdownTime: 20 # WD
+    knockdownTime: 10 # WD
  - type: SpawnOnTrigger
    proto: GrenadeFlashEffect
  - type: DeleteOnTrigger
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
@@ -265,7 +265,7 @@
  - type: MeleeWeapon
    soundHit:
      path: /Audio/White/Items/hit/chainhit.ogg
-    range: 2.2
+    range: 2.5
    damage:
      types:
        Blunt: 18
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -3,7 +3,7 @@
  alias:
    - survival
  name: survival-title
-  showInVote: false # secret
+  showInVote: true
  description: survival-description
  rules:
    - RampingStationEventScheduler
@@ -98,7 +98,7 @@
    - traitor
  name: traitor-title
  description: traitor-description
-  showInVote: false
+  showInVote: true
  rules:
    - Traitor
    - SubGamemodesRule
@@ -114,7 +114,7 @@
  name: death-match-title
  description: death-match-description
  maxPlayers: 15
-  showInVote: true
+  showInVote: false
  supportedMaps: DeathMatchMapPool
  rules:
    - DeathMatch31
@@ -141,7 +141,7 @@
    - revolutionaries
  name: rev-title
  description: rev-description
-  showInVote: false
+  showInVote: true
  rules:
    - Revolutionary
    - SubGamemodesRule
@@ -172,7 +172,7 @@
    - pirates
  name: pirates-title
  description: pirates-description
-  showInVote: true
+  showInVote: false
  rules:
    - Pirates
    - BasicStationEventScheduler
--- a/Resources/Prototypes/secret_weights.yml
+++ b/Resources/Prototypes/secret_weights.yml
@@ -5,7 +5,7 @@
    Changeling: 0.14
    Nukeops: 0.14
    Cult: 0.15
-    Wizard: 0.15
-    Revolutionary: 0.04
+    Wizard: 0.09
+    Revolutionary: 0.1
    Zombie: 0.04
    Survival: 0.04