diff --git a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs index 8d72b00c0c..bc188fee2d 100644 --- a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs +++ b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs @@ -90,7 +90,7 @@ public sealed partial class NukeopsRuleComponent : Component /// This amount of TC will be given to each nukie /// [DataField] - public int WarTCAmountPerNukie = 20; + public int WarTCAmountPerNukie = 30; /// /// Time allowed for declaration of war diff --git a/Content.Server/_White/Other/RandomDamageSystem/RandomDamageSystem.cs b/Content.Server/_White/Other/RandomDamageSystem/RandomDamageSystem.cs index fc00fc8fa0..0a127622d7 100644 --- a/Content.Server/_White/Other/RandomDamageSystem/RandomDamageSystem.cs +++ b/Content.Server/_White/Other/RandomDamageSystem/RandomDamageSystem.cs @@ -21,6 +21,8 @@ public sealed class RandomDamageSystem : EntitySystem private void HandleHit(Entity ent, ref MeleeHitEvent args) { var damage = _random.NextFloat() * ent.Comp.Max; + if (args.Direction != null) // Heavy attack + damage *= 0.7f; args.BonusDamage = new DamageSpecifier(_prototypeManager.Index("Slash"), damage); } } diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml index da7e30fd76..4b261ced7f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml @@ -1,8 +1,8 @@ - type: vendingMachineInventory id: VendomatInventory startingInventory: - RemoteSignaller: 1 - Igniter: 2 + RemoteSignaller: 4 + Igniter: 5 Wirecutter: 1 CableApcStack: 2 FlashlightLantern: 2 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 3448a8cf5d..8e990e3846 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -578,7 +578,7 @@ description: uplink-radio-jammer-desc productEntity: RadioJammer cost: - Telecrystal: 4 + Telecrystal: 2 categories: - UplinkUtility diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index e49f22ceec..ac2545d165 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -83,12 +83,12 @@ suffix: Rigged components: - type: StaminaDamageOnHit - damage: 25 + damage: 30 - type: MeleeWeapon - attackRate: 1.4 + attackRate: 1.5 damage: types: - Blunt: 8 + Blunt: 10 bluntStaminaDamageFactor: 0.0 # so blunt doesn't deal stamina damage at all - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 0df8fae943..7ca1a8da6a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -14,8 +14,8 @@ coefficients: Blunt: 0.6 #ballistic plates = better protection Slash: 0.6 - Piercing: 0.3 - Heat: 0.9 + Piercing: 0.4 + Heat: 0.8 - type: ExplosionResistance damageCoefficient: 0.9 diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml index 0579a0d642..4db618761e 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml @@ -127,10 +127,6 @@ - ItemMask restitution: 0.3 friction: 0.2 - - type: Construction - deconstructionTarget: null - graph: StunprodGraph - node: rod - type: entity parent: PartRodMetal diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index 636032cd3c..a37a682e2e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -50,8 +50,9 @@ startBreakoutSound: path: /Audio/Items/Handcuffs/rope_takeoff.ogg - type: Construction - graph: makeshifthandcuffs - node: cuffscable + deconstructionTarget: cuffs + graph: StunprodGraph + node: cuffs - type: Item inhandVisuals: left: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml index d1df6e1912..cf3bf84414 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml @@ -36,10 +36,10 @@ angle: 0 animation: WeaponArcThrust - type: StaminaDamageOnHit - damage: 30 + damage: 40 sound: /Audio/Weapons/egloves.ogg - type: StaminaDamageOnCollide - damage: 30 + damage: 40 sound: /Audio/Weapons/egloves.ogg - type: UseDelay - type: Item @@ -72,6 +72,6 @@ containers: cell_slot: !type:ContainerSlot {} - type: Construction - deconstructionTarget: rod + deconstructionTarget: cuffs graph: StunprodGraph node: stunprod diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml index 4b3e9cfbbc..0510657bc9 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml @@ -28,4 +28,29 @@ # doAfter: 20 # - node: msstunprod # entity: Stunprod -# + +- type: constructionGraph + id: makeshiftstunprod + start: start + graph: + - node: start + edges: + - to: msstunprod + steps: + - material: MetalRod + amount: 1 + - material: Cable + amount: 15 + - tag: Igniter + name: Igniter + icon: + sprite: Objects/Devices/igniter.rsi + state: icon + - tag: CapacitorStockPart + name: Capacitor Stock Part + icon: + sprite: Objects/Misc/stock_parts.rsi + state: capacitor + doAfter: 20 + - node: msstunprod + entity: Stunprod diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 0e6e04341c..44dbc53868 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -35,16 +35,16 @@ icon: { sprite: Objects/Misc/cablecuffs.rsi, state: cuff } objectType: Item -#- type: construction -# name: makeshift stunprod -# id: makeshiftstunprod -# graph: makeshiftstunprod -# startNode: start -# targetNode: msstunprod -# category: construction-category-weapons -# description: "Homemade stunprod." -# icon: { sprite: Objects/Weapons/Melee/stunprod.rsi, state: stunprod_off } -# objectType: Item +- type: construction + name: makeshift stunprod + id: makeshiftstunprod + graph: makeshiftstunprod + startNode: start + targetNode: msstunprod + category: construction-category-weapons + description: "Homemade stunprod." + icon: { sprite: Objects/Weapons/Melee/stunprod.rsi, state: stunprod_off } + objectType: Item - type: construction name: muzzle diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml index f4571b4081..5eed41f0ea 100644 --- a/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml +++ b/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml @@ -177,7 +177,7 @@ ignoreResistances: true damage: types: - Slash: 27 + Slash: 24 - type: Clothing sprite: White/Objects/Weapons/Chaplain/scythe.rsi slots: @@ -335,7 +335,7 @@ - type: IncreaseDamageOnWield damage: types: - Blunt: 10 + Blunt: 8 - type: UseDelay - type: DisarmMalus - type: MeleeBlock @@ -393,7 +393,7 @@ - type: IncreaseDamageOnWield damage: types: - Piercing: 10 + Piercing: 9 - type: UseDelay - type: DisarmMalus @@ -433,13 +433,12 @@ state: icon - type: MeleeWeapon wideAnimationRotation: -135 - attackRate: 0.75 canHeavyAttack: false damage: types: Blunt: 0 - type: StaminaDamageOnHit - damage: 60 + damage: 40 - type: Item size: Normal sprite: White/Objects/Weapons/Chaplain/hypertool.rsi diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml index d46c3040fb..4d634c31eb 100644 --- a/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml +++ b/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml @@ -35,10 +35,10 @@ angle: 0 animation: WeaponArcThrust - type: StaminaDamageOnHit - damage: 30 + damage: 40 sound: /Audio/Weapons/egloves.ogg - type: StaminaDamageOnCollide - damage: 30 + damage: 40 sound: /Audio/Weapons/egloves.ogg - type: UseDelay - type: Item @@ -72,7 +72,7 @@ - type: Stunprod hasHeldPrefix: false - type: Construction - deconstructionTarget: rod + deconstructionTarget: cuffs graph: StunprodGraph node: snatcherprod @@ -88,6 +88,6 @@ - type: Item size: Normal - type: Construction - deconstructionTarget: rod + deconstructionTarget: cuffs graph: StunprodGraph node: unfinished diff --git a/Resources/Prototypes/White/Recipes/hidden_crafts.yml b/Resources/Prototypes/White/Recipes/hidden_crafts.yml index 709c9ce972..86512ef60f 100644 --- a/Resources/Prototypes/White/Recipes/hidden_crafts.yml +++ b/Resources/Prototypes/White/Recipes/hidden_crafts.yml @@ -68,15 +68,14 @@ - type: constructionGraph id: StunprodGraph - start: rod + start: cuffs graph: - - node: rod - entity: PartRodMetal1 + - node: cuffs edges: - to: unfinished steps: - - material: Cable - amount: 15 + - material: MetalRod + amount: 1 doAfter: 1 - node: unfinished entity: ProdUnfinished @@ -84,10 +83,14 @@ - to: Igniter steps: - tag: Igniter - - to: rod + - to: cuffs steps: - tool: Cutting doAfter: 5 + completed: + - !type:SpawnPrototype + prototype: PartRodMetal1 + - !type:DeleteEntity - node: Igniter edges: - to: snatcherprod @@ -95,38 +98,49 @@ - material: Telecrystal - to: stunprod steps: - - tag: PowerCell - - to: rod + - tag: CapacitorStockPart + - to: cuffs steps: - tool: Cutting doAfter: 5 completed: + - !type:SpawnPrototype + prototype: PartRodMetal1 - !type:SpawnPrototype prototype: Igniter + - !type:DeleteEntity - node: snatcherprod entity: Snatcherprod edges: - - to: rod + - to: cuffs steps: - tool: Cutting doAfter: 5 completed: - !type:SpawnPrototype prototype: Telecrystal1 + - !type:SpawnPrototype + prototype: PartRodMetal1 - !type:SpawnPrototype prototype: Igniter - !type:EmptyAllContainers + - !type:DeleteEntity - node: stunprod entity: Stunprod edges: - - to: rod + - to: cuffs steps: - tool: Cutting doAfter: 5 completed: + - !type:SpawnPrototype + prototype: CapacitorStockPart + - !type:SpawnPrototype + prototype: PartRodMetal1 - !type:SpawnPrototype prototype: Igniter - !type:EmptyAllContainers + - !type:DeleteEntity - type: constructionGraph id: ChainsawGraph