diff --git a/Content.Server/Carrying/CarryingSystem.cs b/Content.Server/Carrying/CarryingSystem.cs index c098e1bed62..f6ad200abb7 100644 --- a/Content.Server/Carrying/CarryingSystem.cs +++ b/Content.Server/Carrying/CarryingSystem.cs @@ -237,7 +237,8 @@ private void OnDoAfter(EntityUid uid, CarriableComponent component, CarryDoAfter Carry(args.Args.User, uid); args.Handled = true; } - private void StartCarryDoAfter(EntityUid carrier, EntityUid carried, CarriableComponent component) + + public void StartCarryDoAfter(EntityUid carrier, EntityUid carried, CarriableComponent component) { if (!TryComp(carrier, out var carrierPhysics) || !TryComp(carried, out var carriedPhysics) diff --git a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs b/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs index 6df387e6ba8..09a0064790d 100644 --- a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs +++ b/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs @@ -61,9 +61,13 @@ private void AddInsertAltVerb(EntityUid uid, PseudoItemComponent component, GetV protected override void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component, GettingPickedUpAttemptEvent args) { + // Floof - changed this a bit to actually start a do-after // Try to pick the entity up instead first - if (args.User != args.Item && _carrying.TryCarry(args.User, uid)) + if (args.User != args.Item + && TryComp(uid, out var carrible) + && _carrying.CanCarry(args.User, uid, carrible)) { + _carrying.StartCarryDoAfter(args.User, uid, carrible); args.Cancel(); return; } diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 60be1ad6f1b..ade01b10603 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -16,6 +16,7 @@ using Content.Shared.Emag.Systems; using Content.Shared.Emp; using Content.Shared.Popups; +using Content.Shared.Repairable; using Content.Shared.Throwing; using Content.Shared.UserInterface; using Content.Shared.VendingMachines; @@ -46,6 +47,7 @@ public override void Initialize() SubscribeLocalEvent(OnComponentMapInit); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnBreak); + SubscribeLocalEvent(OnRepaired); // Floofstation SubscribeLocalEvent(OnEmagged); SubscribeLocalEvent(OnDamage); SubscribeLocalEvent(OnVendingPrice); @@ -88,7 +90,6 @@ private void OnVendingPrice(EntityUid uid, VendingMachineComponent component, re args.Price += price; } - protected override void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args) { base.OnComponentInit(uid, component, args); @@ -139,6 +140,17 @@ private void OnBreak(EntityUid uid, VendingMachineComponent vendComponent, Break TryUpdateVisualState(uid, vendComponent); } + // Floofstation + private void OnRepaired(EntityUid uid, VendingMachineComponent component, SharedRepairableSystem.RepairFinishedEvent args) + { + if (args.Cancelled) + return; + + // TODO it is not actually safe to assume that the repair repaired enough damage + component.Broken = false; + TryUpdateVisualState(uid, component); + } + private void OnEmagged(EntityUid uid, VendingMachineComponent component, ref GotEmaggedEvent args) { // only emag if there are emag-only items diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs index 5f4e6184346..f2de735200d 100644 --- a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs +++ b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs @@ -2,6 +2,7 @@ using Content.Shared.Bed.Sleep; using Content.Shared.DoAfter; using Content.Shared.Hands; +using Content.Shared.Hands.EntitySystems; using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Events; using Content.Shared.Item; @@ -24,6 +25,8 @@ public abstract partial class SharedPseudoItemSystem : EntitySystem [Dependency] private readonly TagSystem _tag = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private readonly SharedHandsSystem _hands = default!; [ValidatePrototypeId] private const string PreventTag = "PreventLabel"; @@ -117,17 +120,35 @@ private void OnEntRemoved(EntityUid uid, PseudoItemComponent component, EntGotRe protected virtual void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component, GettingPickedUpAttemptEvent args) { - if (args.User == args.Item) - return; - - Transform(uid).AttachToGridOrMap(); - args.Cancel(); + // Floof - this is a terrible idea. This triggers every time ANY system checks if a pseudo-item can be picked up. + // WHY DID YOU DO THAT, NYANOTRASEN??? + + // if (args.User == args.Item) + // return; + // + // Transform(uid).AttachToGridOrMap(); + // args.Cancel(); } private void OnDropAttempt(EntityUid uid, PseudoItemComponent component, DropAttemptEvent args) { - if (component.Active) - args.Cancel(); + if (!component.Active) + return; + + // Floof - we try to get the containing container and try to drop it into it + // If possible, we do it, since a bagged cat probably can put things back into the bag just like they can pick them up. + string? failReason = null; + if (_hands.GetActiveItem(uid) is { Valid: true, } droppedItem + && _container.TryGetContainingContainer(Transform(uid).ParentUid, uid, out var pseudoItemContainer) + && TryComp(pseudoItemContainer.Owner, out var targetStorage) + && _storage.CanInsert(pseudoItemContainer.Owner, droppedItem, out failReason, targetStorage, ignoreStacks: true) + ) + _storage.Insert(pseudoItemContainer.Owner, droppedItem, out _, uid, targetStorage, stackAutomatically: false); + + if (failReason != null) + _popupSystem.PopupEntity(Loc.GetString(failReason), uid, uid); + + args.Cancel(); } private void OnInsertAttempt(EntityUid uid, PseudoItemComponent component, @@ -137,13 +158,15 @@ private void OnInsertAttempt(EntityUid uid, PseudoItemComponent component, return; // This hopefully shouldn't trigger, but this is a failsafe just in case so we dont bluespace them cats args.Cancel(); + Transform(uid).AttachToGridOrMap(); // We do it here instead, so the item is only re-parented AFTER someone tries to insert it somewhere, e.g. a hand. } // Prevents moving within the bag :) private void OnInteractAttempt(EntityUid uid, PseudoItemComponent component, InteractionAttemptEvent args) { - if (args.Uid == args.Target && component.Active) - args.Cancel(); + // Floof - why the fuck. + // if (args.Uid == args.Target && component.Active) + // args.Cancel(); } private void OnDoAfter(EntityUid uid, PseudoItemComponent component, DoAfterEvent args) diff --git a/Content.Shared/Repairable/SharedRepairableSystem.cs b/Content.Shared/Repairable/SharedRepairableSystem.cs index 2b0cb670e6f..eb0d3fe0a1e 100644 --- a/Content.Shared/Repairable/SharedRepairableSystem.cs +++ b/Content.Shared/Repairable/SharedRepairableSystem.cs @@ -5,8 +5,9 @@ namespace Content.Shared.Repairable; public abstract partial class SharedRepairableSystem : EntitySystem { + // Floof - made public because WHY THE FUCK WAS THIS PRIVATE?! [Serializable, NetSerializable] - protected sealed partial class RepairFinishedEvent : SimpleDoAfterEvent + public sealed partial class RepairFinishedEvent : SimpleDoAfterEvent { } } diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 301f7e63821..39952276f46 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -377,6 +377,7 @@ itemIconStyle: NoItem useDelay: 1 # emote spam event: !type:ToggleActionEvent + checkCanInteract: false # obviously you can wag while cuffed, duh. - type: entity id: ActionFabricateLollipop diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml index 54f3e2b0b4f..5b5d2c6a07a 100644 --- a/Resources/Prototypes/DeltaV/GameRules/events.yml +++ b/Resources/Prototypes/DeltaV/GameRules/events.yml @@ -26,39 +26,39 @@ prob: 0.002 - id: MobXenoRavager prob: 0.002 - - id: MobXenochargercrusher + - id: MobXenoChargerCrusher prob: 0.002 - - id: MobXenodancerpraetorian + - id: MobXenoDancerPraetorian prob: 0.002 - - id: MobXenodefender + - id: MobXenoDefender prob: 0.002 - - id: MobXenosentinel + - id: MobXenoSentinel prob: 0.002 - - id: MobXenohivelord + - id: MobXenoHivelord prob: 0.001 - id: MobXenoCarrier prob: 0.002 - - id: MobXenobloodylarva + - id: MobXenoBloodyLarva prob: 0.003 - - id: MobXenoparasite + - id: MobXenoParasite prob: 0.003 - - id: MobXenolurker + - id: MobXenoLurker prob: 0.002 - - id: MobXenowarrior + - id: MobXenoWarrior prob: 0.002 - - id: MobXenoacidrunner + - id: MobXenoAcidRunner prob: 0.002 - - id: MobXenoacidrunnerprimed + - id: MobXenoAcidRunnerPrimed prob: 0.002 - - id: MobXenolarva + - id: MobXenoLarva prob: 0.003 - - id: MobXenoboiler + - id: MobXenoBoiler prob: 0.002 - - id: MobXenoboxerwarrior + - id: MobXenoBoxerWarrior prob: 0.002 - id: MobXenoCarrier prob: 0.002 - - id: MobXenocrusher + - id: MobXenoCrusher prob: 0.002 - id: MobXenoQueen prob: 0.001 @@ -94,39 +94,39 @@ prob: 0.001 - id: MobXenoRavager prob: 0.001 - - id: MobXenochargercrusher + - id: MobXenoChargerCrusher prob: 0.001 - - id: MobXenodancerpraetorian + - id: MobXenoDancerPraetorian prob: 0.001 - - id: MobXenodefender + - id: MobXenoDefender prob: 0.001 - - id: MobXenosentinel + - id: MobXenoSentinel prob: 0.001 - - id: MobXenohivelord + - id: MobXenoHivelord prob: 0.001 - id: MobXenoCarrier prob: 0.001 - - id: MobXenobloodylarva + - id: MobXenoBloodyLarva prob: 0.002 - - id: MobXenoparasite + - id: MobXenoParasite prob: 0.002 - - id: MobXenolurker + - id: MobXenoLurker prob: 0.001 - - id: MobXenowarrior + - id: MobXenoWarrior prob: 0.001 - - id: MobXenoacidrunner + - id: MobXenoAcidRunner prob: 0.001 - - id: MobXenoacidrunnerprimed + - id: MobXenoAcidRunnerPrimed prob: 0.001 - - id: MobXenolarva + - id: MobXenoLarva prob: 0.002 - - id: MobXenoboiler + - id: MobXenoBoiler prob: 0.001 - - id: MobXenoboxerwarrior + - id: MobXenoBoxerWarrior prob: 0.001 - id: MobXenoCarrier prob: 0.001 - - id: MobXenocrusher + - id: MobXenoCrusher prob: 0.001 - id: MobXenoQueen prob: 0.001 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index 93621bc3a28..a3c981925d1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -8,16 +8,12 @@ - type: Item sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi size: Normal - - type: GunWieldBonus - minAngle: -43 - maxAngle: -43 - - type: Wieldable - type: Gun fireRate: 0.5 selectedMode: SemiAuto - angleDecay: 45 - minAngle: 44 - maxAngle: 45 + angleDecay: 3 # If you wait ~7 seconds between shots, you can actually land more or less accurate shots (with a 10 degree innacuracy) + minAngle: 10 + maxAngle: 30 availableModes: - SemiAuto soundGunshot: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index 2071f7c4469..0e60c43db2c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -20,3 +20,6 @@ node: start #Frontier deconstructionTarget: null #Frontier - type: Wieldable # Frontier + - type: GunWieldBonus + minAngle: -9 + maxAngle: -28 # 1..2 degrees when wielded diff --git a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xenos.yml b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xenos.yml index 380c4fa2ff0..e5383614546 100644 --- a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xenos.yml +++ b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xenos.yml @@ -1,8 +1,7 @@ - type: entity name: Acid runner - id: MobXenoacidrunner + id: MobXenoAcidRunner parent: MobXeno - description: They mostly come at night. Mostly. components: - type: Sprite drawdepth: Mobs @@ -23,18 +22,16 @@ - type: entity name: Acid runner primed - id: MobXenoacidrunnerprimed - parent: MobXenoacidrunner - description: They mostly come at night. Mostly. + id: MobXenoAcidRunnerPrimed + parent: MobXenoAcidRunner components: - type: Sprite sprite: Mobs/Aliens/Xenos/acider_runner_primed.rsi - type: entity name: Larva - id: MobXenolarva + id: MobXenoLarva parent: MobXeno - description: They mostly come at night. Mostly. components: - type: Sprite drawdepth: Mobs @@ -53,8 +50,8 @@ fix1: shape: !type:PhysShapeCircle - radius: 0.45 - density: 15500 + radius: 0.25 + density: 20 # 5 kg mask: - SmallMobMask layer: @@ -67,12 +64,11 @@ types: Blunt: 1 Piercing: 1 - + - type: entity name: Boiler - id: MobXenoboiler + id: MobXenoBoiler parent: MobXenoSpitterNPC - description: They mostly come at night. Mostly. components: - type: Sprite drawdepth: Mobs @@ -101,12 +97,11 @@ availableModes: - FullAuto soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - + - type: entity name: Boxer Warrior - id: MobXenoboxerwarrior + id: MobXenoBoxerWarrior parent: MobXeno - description: They mostly come at night. Mostly. components: - type: Sprite drawdepth: Mobs @@ -132,7 +127,6 @@ name: Carrier id: MobXenoCarrier parent: MobXeno - description: They mostly come at night. Mostly. components: - type: Sprite drawdepth: Mobs @@ -153,12 +147,11 @@ types: Blunt: 3 Piercing: 2 - + - type: entity name: Crusher - id: MobXenocrusher + id: MobXenoCrusher parent: MobXeno - description: They mostly come at night. Mostly. components: - type: Sprite drawdepth: Mobs @@ -178,22 +171,20 @@ damage: types: Blunt: 8 - + - type: entity name: Charger Crusher - id: MobXenochargercrusher - parent: MobXenocrusher - description: They mostly come at night. Mostly. + id: MobXenoChargerCrusher + parent: MobXenoCrusher components: - type: Sprite drawdepth: Mobs sprite: Mobs/Aliens/Xenos/charger_crusher.rsi - + - type: entity name: Dancer Praetorian - id: MobXenodancerpraetorian + id: MobXenoDancerPraetorian parent: MobXenoPraetorianNPC - description: They mostly come at night. Mostly. components: - type: Sprite sprite: Mobs/Aliens/Xenos/dancer_praetorian.rsi @@ -213,9 +204,8 @@ - type: entity name: Defender - id: MobXenodefender + id: MobXenoDefender parent: MobXeno - description: They mostly come at night. Mostly. components: - type: Sprite sprite: Mobs/Aliens/Xenos/defender.rsi @@ -235,18 +225,16 @@ - type: entity name: Sentinel - id: MobXenosentinel + id: MobXenoSentinel parent: MobXenoSpitterNPC - description: They mostly come at night. Mostly. components: - type: Sprite sprite: Mobs/Aliens/Xenos/sentinel.rsi - type: entity name: Hive Lord - id: MobXenohivelord + id: MobXenoHivelord parent: MobXenoQueenNPC - description: They mostly come at night. Mostly. components: - type: Sprite sprite: Mobs/Aliens/Xenos/hivelord.rsi @@ -263,39 +251,35 @@ types: Blunt: 3 Piercing: 3 - + - type: entity name: Bloody Larva - id: MobXenobloodylarva - parent: MobXenolarva - description: They mostly come at night. Mostly. + id: MobXenoBloodyLarva + parent: MobXenoLarva components: - type: Sprite sprite: Mobs/Aliens/Xenos/bloody_larva.rsi - + - type: entity name: Parasite - id: MobXenoparasite - parent: MobXenolarva - description: They mostly come at night. Mostly. + id: MobXenoParasite + parent: MobXenoLarva components: - type: Sprite sprite: Mobs/Aliens/Xenos/parasite.rsi - type: entity name: Lurker - id: MobXenolurker + id: MobXenoLurker parent: MobXenoRavagerNPC - description: They mostly come at night. Mostly. components: - type: Sprite sprite: Mobs/Aliens/Xenos/lurker.rsi - + - type: entity name: Warrior - id: MobXenowarrior - parent: MobXenocrusher - description: They mostly come at night. Mostly. + id: MobXenoWarrior + parent: MobXenoCrusher components: - type: Sprite sprite: Mobs/Aliens/Xenos/warrior.rsi @@ -303,4 +287,4 @@ thresholds: 0: Alive 200: Critical - 300: Dead \ No newline at end of file + 300: Dead diff --git a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml index ec43dd4564d..b7c9adc9792 100644 --- a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml +++ b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml @@ -5,11 +5,12 @@ delay: 0.4 range: {max: 1} hideByRequirement: true + requiresHands: false # why are we inheriting from BaseHands again??? + requiresCanInteract: false requirement: !type:MobStateRequirement inverted: true action: - # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction effect: BeingKissed effectSuccess: @@ -20,15 +21,15 @@ id: Lick parent: [BaseGlobal, BaseHands] priority: -2 - #icon: /Textures/Interface/Actions/hug.png delay: 0.7 range: {max: 1} hideByRequirement: true + requiresHands: false + requiresCanInteract: false requirement: !type:MobStateRequirement inverted: true action: - # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction effect: BeingLicked effectSuccess: diff --git a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml index d96f6d12143..53e6ee26738 100644 --- a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml +++ b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml @@ -1,12 +1,12 @@ - type: moodEffect id: BeingKissed moodChange: 4 - timeout: 120 + timeout: 660 category: PositiveInteraction - type: moodEffect id: BeingLicked - moodChange: 4 + moodChange: 3 timeout: 120 category: PositiveInteraction diff --git a/Resources/Prototypes/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Mood/genericPositiveEffects.yml index 95286a21fdc..caef8a4ce8b 100644 --- a/Resources/Prototypes/Mood/genericPositiveEffects.yml +++ b/Resources/Prototypes/Mood/genericPositiveEffects.yml @@ -1,7 +1,7 @@ - type: moodEffect id: BeingHugged - moodChange: 3 - timeout: 120 + moodChange: 4 + timeout: 240 # Floof - was 120 category: PositiveInteraction - type: moodEffect diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml index 461f040609d..733cb614dd8 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml @@ -92,21 +92,21 @@ - type: RandomSpawner prototypes: - MobXeno - - MobXenoacidrunner - - MobXenoacidrunnerprimed - - MobXenolarva - - MobXenoboiler - - MobXenoboxerwarrior + - MobXenoAcidRunner + - MobXenoAcidRunnerPrimed + - MobXenoLarva + - MobXenoBoiler + - MobXenoBoxerWarrior - MobXenoCarrier - - MobXenocrusher - - MobXenochargercrusher - - MobXenodancerpraetorian - - MobXenodefender - - MobXenosentinel - - MobXenobloodylarva - - MobXenoparasite - - MobXenolurker - - MobXenowarrior + - MobXenoCrusher + - MobXenoChargerCrusher + - MobXenoDancerPraetorian + - MobXenoDefender + - MobXenoSentinel + - MobXenoBloodyLarva + - MobXenoParasite + - MobXenoLurker + - MobXenoWarrior - MobXenoPraetorianNPC - MobXenoDroneNPC - MobXenoRavagerNPC @@ -115,7 +115,7 @@ - MobXenoSpitterNPC rarePrototypes: - MobXenoQueenNPC - - MobXenohivelord + - MobXenoHivelord rareChance: 0.10 - type: entity diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 813a01877ab..a5ec8319a9b 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -14,17 +14,17 @@ key: PsionicallyInsulated component: PsionicInsulation type: Add - time: 900 + time: 4.5 # Floof - 20u render you insulated for 15 minutes - !type:GenericStatusEffect key: Stutter component: ScrambledAccent type: Add - time: 900 + time: 4.5 # Floof - 20u render you insulated for 15 minutes - !type:GenericStatusEffect key: PsionicsDisabled component: PsionicsDisabled type: Add - time: 900 + time: 4.5 # Floof - 20u render you insulated for 15 minutes - !type:Drunk slurSpeech: false boozePower: 20 @@ -172,7 +172,7 @@ - !type:ReagentThreshold min: 15 - !type:Drunk - + - type: reagent id: Cryoxadone name: reagent-name-cryoxadone @@ -181,7 +181,7 @@ physicalDesc: reagent-physical-desc-fizzy flavor: medicine color: "#0091ff" - worksOnTheDead: true # Floof + worksOnTheDead: true # Floof plantMetabolism: - !type:PlantAdjustToxins amount: -5 @@ -243,7 +243,7 @@ damage: types: Heat: -2 - Shock: -2 + Shock: -2 Cold: -2 # Was 1.5, Buffed due to limb damage changes - !type:HealthChange conditions: @@ -1201,7 +1201,7 @@ types: Heat: -3.0 Shock: -3.0 - Cold: -3.0 # Floof + Cold: -3.0 # Floof Caustic: -1.0 - type: reagent diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml index 73aa98d16c3..d944a79884f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml @@ -2,7 +2,7 @@ id: WeaponProtoKineticAcceleratorSawn parent: WeaponProtoKineticAcceleratorBase name: sawn-off proto-kinetic accelerator - description: boundaries and rules are ment to be broken otherwise there will be no progress, but this thing here is a good argumant against that statement. + description: Boundaries and rules are meant to be broken, otherwise there will be no progress. But this thing here is a good argument against that statement. components: - type: Sprite sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi @@ -17,8 +17,6 @@ selectedMode: FullAuto availableModes: - FullAuto - minAngle: 41 - maxAngle: 55 - type: Clothing sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi - type: Construction