From f8aca2617c7ed11ccc2f0b26a49540b7d8ef4273 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Thu, 4 Jan 2024 04:10:23 +0900 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B5=D1=80=D1=80=D0=B8=20=D0=BF=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=20=D0=B2=D1=81=D1=8F=D0=BA=D0=BE=D0=B5=20?= =?UTF-8?q?(#598)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Mining tweaks (#18686) So we have pickaxe, drill, crusher, and PKA (projectiles). The tier list in terms of mining speed should go: - PKA - Crusher - Pickaxe - Drill As a result: - Nerfed PKA firerate to 0.5 and bumped damage (slight DPS nerf due to meta). - Crusher bumped to 1 hit per second as PKA is still more common and also to make it better at mining. - Pickaxe is 1 hit per second and also gets structural (fireaxe should still beat it by a little bit) so it's better to break stuff than crusher but worse in combat. - Drill is 1.5 hits per second but otherwise weak. * pickaxe inhand resprite + wielded sprites (#18735) * pickaxe inhand resprite * wtf piece of shit * make pickaxe cost 5x more (and make it bigger) (#19007) * Nerf pickaxe + drill slightly (#19056) I already nerfed its damage from before (at least non-structural) but this nerfs it slightly more. * Add mining drill inhand sprites (#22494) * move advanced laser gun into t3 lasers tech (#19875) * move advanced laser gun into t2 lasers tech * t3 and troll --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Microreactor power cell research (#21473) * buff microreactor cell and tweak a little * add portable fission research --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * add glaive to salv weapons (#22514) * refactor ops * add recipe --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Remove tasers from arsenal tech (#22361) * Reduce uplink combat medipen cost (#19556) * Stealth rebalance (#20314) * reduce c4 and c4 bundle price (#21102) c4 is reduced to 2 from 4 and the bundle to 12 from 20 * Increase expedition timer * No emp shock * Nerf licoxide * Reword eshield part 2 * No drill and pickaxe stamina cost * No flashable mobs * remove slowdown from parent (#21872) * Revert protection increase * Increase egun crate price * No unfun stuff in presents * ContentEye for SimpleMob --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: CrigCrag <137215465+CrigCrag@users.noreply.github.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Brayden H <35241666+hord-brayden@users.noreply.github.com> Co-authored-by: HerCoyote23 <131214189+HerCoyote23@users.noreply.github.com> Co-authored-by: ninruB <38016303+asperger-sind@users.noreply.github.com> --- Content.Server/Holiday/Christmas/RandomGiftSystem.cs | 8 ++++++-- Resources/Prototypes/Catalog/Cargo/cargo_armory.yml | 2 +- Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml | 1 + Resources/Prototypes/Entities/Objects/Shields/shields.yml | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs index eea37da177..1a71c890dc 100644 --- a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs +++ b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs @@ -1,4 +1,7 @@ -using Content.Server.Administration.Logs; +using System.Linq; +using System.Runtime.InteropServices.JavaScript; +using System.Text.RegularExpressions; +using Content.Server.Administration.Logs; using Content.Server.Hands.Systems; using Content.Server.White.Other; using Content.Shared.Database; @@ -104,7 +107,8 @@ public sealed class RandomGiftSystem : EntitySystem if (!proto.Components.ContainsKey(itemCompName) || proto.Components.ContainsKey(giftIgnoreCompName) || proto.Components.ContainsKey(unremovableCompName) || proto.SetSuffix != null && - (proto.SetSuffix.Contains("DEBUG") || proto.SetSuffix.Contains("Admeme"))) // WD EDIT + new[] {"Debug, Admeme, Admin"}.Any(x => + proto.SetSuffix.Contains(x, StringComparison.OrdinalIgnoreCase))) // WD EDIT continue; _possibleGiftsSafe.Add(proto.ID); diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 9f2a02aba5..3cf2fb19af 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -64,6 +64,6 @@ sprite: Objects/Weapons/Guns/Battery/egun.rsi state: base product: CrateArmoryEgun - cost: 2500 + cost: 5500 category: Armory group: market diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml index e1b80a2771..54cc48e097 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml @@ -30,6 +30,7 @@ - type: Tag tags: - DoorBumpOpener + - type: ContentEye - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index cd63946fa3..ac7f737c0d 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -436,6 +436,8 @@ - type: Damageable damageContainer: Shield - type: Rechargeable + maxCharge: 20 + rechargeDelay: 15 - type: StaticPrice price: 350