Черри пики и всякое (#598)
* 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>
This commit is contained in:
@@ -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.Hands.Systems;
|
||||||
using Content.Server.White.Other;
|
using Content.Server.White.Other;
|
||||||
using Content.Shared.Database;
|
using Content.Shared.Database;
|
||||||
@@ -104,7 +107,8 @@ public sealed class RandomGiftSystem : EntitySystem
|
|||||||
|
|
||||||
if (!proto.Components.ContainsKey(itemCompName) || proto.Components.ContainsKey(giftIgnoreCompName) ||
|
if (!proto.Components.ContainsKey(itemCompName) || proto.Components.ContainsKey(giftIgnoreCompName) ||
|
||||||
proto.Components.ContainsKey(unremovableCompName) || proto.SetSuffix != null &&
|
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;
|
continue;
|
||||||
|
|
||||||
_possibleGiftsSafe.Add(proto.ID);
|
_possibleGiftsSafe.Add(proto.ID);
|
||||||
|
|||||||
@@ -64,6 +64,6 @@
|
|||||||
sprite: Objects/Weapons/Guns/Battery/egun.rsi
|
sprite: Objects/Weapons/Guns/Battery/egun.rsi
|
||||||
state: base
|
state: base
|
||||||
product: CrateArmoryEgun
|
product: CrateArmoryEgun
|
||||||
cost: 2500
|
cost: 5500
|
||||||
category: Armory
|
category: Armory
|
||||||
group: market
|
group: market
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
- type: Tag
|
- type: Tag
|
||||||
tags:
|
tags:
|
||||||
- DoorBumpOpener
|
- DoorBumpOpener
|
||||||
|
- type: ContentEye
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
abstract: true
|
abstract: true
|
||||||
|
|||||||
@@ -436,6 +436,8 @@
|
|||||||
- type: Damageable
|
- type: Damageable
|
||||||
damageContainer: Shield
|
damageContainer: Shield
|
||||||
- type: Rechargeable
|
- type: Rechargeable
|
||||||
|
maxCharge: 20
|
||||||
|
rechargeDelay: 15
|
||||||
- type: StaticPrice
|
- type: StaticPrice
|
||||||
price: 350
|
price: 350
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user