From 649ded64d6ce4df62be5be37321726e58b811c07 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Wed, 26 Jun 2024 11:56:29 +0000 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=BD=D0=BE=D0=B5=20(#385)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * - add: Meatspike changes. * - fix: Fix socks. * - remove: No light status. * - tweak: Raptor tweak. * - fix: Fix exception. * - remove: Remove unsexed. * - tweak: Crossbow tweak. * - add: More meatspike. * - tweak: Nerf buff rune. * - tweak: No throwing during incorporeal. * - add: Incorporeal magic cooldown. --- Content.Client/Popups/PopupSystem.cs | 9 +++-- .../_White/Animations/FlipOnHitSystem.cs | 3 ++ .../EntitySystems/KitchenSpikeSystem.cs | 32 ++++++++++++++---- .../Light/Components/PoweredLightComponent.cs | 3 -- .../Light/EntitySystems/PoweredLightSystem.cs | 9 ----- .../Systems/CultSystem.ConstructsAbilities.cs | 10 ++++++ .../IncorporealSystem/IncorporealSystem.cs | 22 +++++++++++- .../Wizard/Magic/Amaterasu/AmaterasuSystem.cs | 2 +- .../Components/KitchenSpikeComponent.cs | 2 +- .../Projectiles/SharedProjectileSystem.cs | 1 + .../Cult/Components/CultBuffComponent.cs | 6 ++-- .../components/kitchen-spike-component.ftl | 1 + .../Prototypes/DeviceLinking/source_ports.yml | 6 ---- .../Entities/Mobs/NPCs/miscellaneous.yml | 4 +-- .../Prototypes/Entities/Mobs/Species/base.yml | 2 +- .../Prototypes/Entities/Mobs/Species/moth.yml | 20 +++++------ .../Structures/Lighting/base_lighting.yml | 10 ++---- .../Structures/Lighting/ground_lighting.yml | 3 -- .../Graphs/furniture/meatspike.yml | 8 ++--- Resources/Prototypes/Species/arachnid.yml | 2 -- .../Species/Arachnid/parts.rsi/torso_f.png | Bin 761 -> 512 bytes 21 files changed, 91 insertions(+), 64 deletions(-) diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs index d24e2aff72..0ae91d64b3 100644 --- a/Content.Client/Popups/PopupSystem.cs +++ b/Content.Client/Popups/PopupSystem.cs @@ -93,11 +93,14 @@ namespace Content.Client.Popups _aliveWorldLabels.Add(label); - // START WhiteDream + // START WhiteDream if (!_isLogging) return; - if (!_examine.InRangeUnOccluded(_playerManager.LocalEntity!.Value, coordinates, 10)) + if (_playerManager.LocalEntity == null) + return; + + if (!_examine.InRangeUnOccluded(_playerManager.LocalEntity.Value, coordinates, 10)) return; var fontSizeDict = new Dictionary @@ -117,7 +120,7 @@ namespace Content.Client.Popups var chatMsg = new ChatMessage(ChatChannel.Emotes, message, wrappedMEssage, GetNetEntity(EntityUid.Invalid), null); _uiManager.GetUIController().ProcessChatMessage(chatMsg); - + // END WhiteDream } diff --git a/Content.Client/_White/Animations/FlipOnHitSystem.cs b/Content.Client/_White/Animations/FlipOnHitSystem.cs index 5b02152b24..8eba1f8be6 100644 --- a/Content.Client/_White/Animations/FlipOnHitSystem.cs +++ b/Content.Client/_White/Animations/FlipOnHitSystem.cs @@ -32,6 +32,9 @@ public sealed class FlipOnHitSystem : SharedFlipOnHitSystem if (!_timing.IsFirstTimePredicted) return; + if (TerminatingOrDeleted(user)) + return; + if (_animationSystem.HasRunningAnimation(user, EmoteAnimationSystem.AnimationKey)) { EnsureComp(user); diff --git a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs index b145bec014..0521dd526c 100644 --- a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs @@ -1,10 +1,13 @@ +using System.Linq; using Content.Server.Administration.Logs; using Content.Server.Body.Systems; using Content.Server.Kitchen.Components; using Content.Server.Popups; +using Content.Shared.Body.Components; using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.DragDrop; +using Content.Shared.Examine; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; @@ -50,9 +53,21 @@ namespace Content.Server.Kitchen.EntitySystems SubscribeLocalEvent(OnSuicide); + SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent(OnButcherableCanDrop); } + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + var (uid, comp) = ent; + + if (comp.Victim is not "?" or "") + { + args.PushMarkup(Loc.GetString("comp-kitchen-spike-examine", ("this", uid), ("victim", comp.Victim))); + } + } + private void OnButcherableCanDrop(EntityUid uid, ButcherableComponent component, ref CanDropDraggedEvent args) { args.Handled = true; @@ -152,7 +167,8 @@ namespace Content.Server.Kitchen.EntitySystems // THE WHAT? // TODO: Need to be able to leave them on the spike to do DoT, see ss13. var gibs = _bodySystem.GibBody(victimUid); - foreach (var gib in gibs) { + foreach (var gib in gibs.Where(HasComp)) // WD EDIT + { QueueDel(gib); } @@ -236,21 +252,23 @@ namespace Content.Server.Kitchen.EntitySystems // THE WHAT? (again) // Prevent dead from being spiked TODO: Maybe remove when rounds can be played and DOT is implemented - if (Resolve(victimUid, ref mobState, false) && + /*if (Resolve(victimUid, ref mobState, false) && _mobStateSystem.IsAlive(victimUid, mobState)) { _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-deny-not-dead", ("victim", Identity.Entity(victimUid, EntityManager))), victimUid, userUid); return true; - } + }*/ + // WD EDIT if (userUid != victimUid) - { _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-begin-hook-victim", ("user", Identity.Entity(userUid, EntityManager)), ("this", uid)), victimUid, victimUid, PopupType.LargeCaution); - } // TODO: make it work when SuicideEvent is implemented - // else - // _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-begin-hook-self", ("this", uid)), victimUid, Filter.Pvs(uid)); // This is actually unreachable and should be in SuicideEvent + else + { + _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-begin-hook-self", ("this", uid)), victimUid, + victimUid); // This is actually unreachable and should be in SuicideEvent + } butcherable.BeingButchered = true; component.InUse = true; diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs index fd331f459c..489a49eec2 100644 --- a/Content.Server/Light/Components/PoweredLightComponent.cs +++ b/Content.Server/Light/Components/PoweredLightComponent.cs @@ -63,9 +63,6 @@ namespace Content.Server.Light.Components [DataField("togglePort", customTypeSerializer: typeof(PrototypeIdSerializer))] public string TogglePort = "Toggle"; - [DataField("statusPort", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string StatusPort = "LightStatus"; - /// /// How long it takes to eject a bulb from this /// diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index 821dffc8c3..2765ddff5c 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -76,7 +76,6 @@ namespace Content.Server.Light.EntitySystems { light.LightBulbContainer = _containerSystem.EnsureContainer(uid, LightBulbContainer); _signalSystem.EnsureSinkPorts(uid, light.OnPort, light.OffPort, light.TogglePort); - _signalSystem.EnsureSourcePorts(uid, light.StatusPort); // WD } private void OnMapInit(EntityUid uid, PoweredLightComponent light, MapInitEvent args) @@ -447,14 +446,6 @@ namespace Content.Server.Light.EntitySystems light.On = !light.On; - // WD START - var data = new NetworkPayload - { - {DeviceNetworkConstants.LogicState, light.On ? SignalState.High : SignalState.Low} - }; - _signalSystem.InvokePort(uid, light.StatusPort, data); - // WD END - UpdateLight(uid, light); } diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs index ec080f7f28..401e7fcba6 100644 --- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs +++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs @@ -12,6 +12,7 @@ using Content.Shared.Physics; using Content.Shared.StatusEffect; using Content.Shared._White.Cult; using Content.Shared._White.Cult.Components; +using Content.Shared.Throwing; namespace Content.Server._White.Cult.Runes.Systems; @@ -34,6 +35,7 @@ public partial class CultSystem SubscribeLocalEvent(OnWraithPhase); SubscribeLocalEvent(OnAttackAttempt); + SubscribeLocalEvent(OnThrowAttempt); SubscribeLocalEvent(OnJuggernautCreateWall); @@ -163,6 +165,14 @@ public partial class CultSystem } } + private void OnThrowAttempt(Entity ent, ref ThrowAttemptEvent args) + { + if (_statusEffectsSystem.HasStatusEffect(args.Uid, "Incorporeal")) + { + _statusEffectsSystem.TryRemoveStatusEffect(args.Uid, "Incorporeal"); + } + } + private void OnJuggernautCreateWall(JuggernautCreateWallActionEvent ev) { if (!TrySpawnWall(ev.Performer, ev.WallPrototypeId)) diff --git a/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs b/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs index 932aa8a15a..a3b658e2ca 100644 --- a/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs +++ b/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs @@ -1,20 +1,25 @@ using System.Linq; +using Content.Server.Actions; +using Content.Shared._White.Wizard.Magic; +using Content.Shared.Actions; using Content.Shared.Eye; using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Systems; using Content.Shared.Movement.Systems; -using Content.Shared.Physics; using Content.Shared.Stealth; using Content.Shared.Stealth.Components; using Robust.Server.GameObjects; using Robust.Shared.Physics; using Robust.Shared.Physics.Systems; +using Robust.Shared.Timing; namespace Content.Server._White.IncorporealSystem; public sealed class IncorporealSystem : EntitySystem { + [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; + [Dependency] private readonly ActionsSystem _actions = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly VisibilitySystem _visibilitySystem = default!; [Dependency] private readonly SharedStealthSystem _stealth = default!; @@ -78,6 +83,21 @@ public sealed class IncorporealSystem : EntitySystem _stealth.SetVisibility(uid, 1); RemComp(uid); _movement.RefreshMovementSpeedModifiers(uid); + if (!TryComp(uid, out ActionsContainerComponent? container)) + return; + + var cooldown = TimeSpan.FromSeconds(3); + + foreach (var action in container.Container.ContainedEntities.Where(HasComp)) + { + if (!_actions.TryGetActionData(action, out var comp, false)) + continue; + + if (comp.Cooldown.HasValue && comp.Cooldown.Value.End >= _timing.CurTime + cooldown) + continue; + + _actions.SetCooldown(action, cooldown); + } } private void OnRefresh(EntityUid uid, IncorporealComponent component, RefreshMovementSpeedModifiersEvent args) diff --git a/Content.Server/_White/Wizard/Magic/Amaterasu/AmaterasuSystem.cs b/Content.Server/_White/Wizard/Magic/Amaterasu/AmaterasuSystem.cs index 6c16a7f52f..633aada83d 100644 --- a/Content.Server/_White/Wizard/Magic/Amaterasu/AmaterasuSystem.cs +++ b/Content.Server/_White/Wizard/Magic/Amaterasu/AmaterasuSystem.cs @@ -24,7 +24,7 @@ public sealed class AmaterasuSystem : EntitySystem if (flammable.OnFire) { - _bodySystem.GibBody(uid); + _bodySystem.GibBody(uid, true); return; } diff --git a/Content.Shared/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Shared/Kitchen/Components/KitchenSpikeComponent.cs index 3057a75a4c..b0855e2f40 100644 --- a/Content.Shared/Kitchen/Components/KitchenSpikeComponent.cs +++ b/Content.Shared/Kitchen/Components/KitchenSpikeComponent.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Kitchen.Components; public sealed partial class KitchenSpikeComponent : Component { [DataField("delay")] - public float SpikeDelay = 7.0f; + public float SpikeDelay = 2.0f; [ViewVariables(VVAccess.ReadWrite)] [DataField("sound")] diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index 6fa1b3910f..ba54be37b7 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -285,6 +285,7 @@ public abstract partial class SharedProjectileSystem : EntitySystem new RemoveEmbeddedProjectileEvent(), eventTarget: uid, target: uid) { DistanceThreshold = SharedInteractionSystem.InteractionRange, + CancelDuplicate = false }, doAfter); return true; diff --git a/Content.Shared/_White/Cult/Components/CultBuffComponent.cs b/Content.Shared/_White/Cult/Components/CultBuffComponent.cs index 914721de99..1743427ea9 100644 --- a/Content.Shared/_White/Cult/Components/CultBuffComponent.cs +++ b/Content.Shared/_White/Cult/Components/CultBuffComponent.cs @@ -4,13 +4,13 @@ namespace Content.Shared._White.Cult.Components; public sealed partial class CultBuffComponent : Component { [ViewVariables(VVAccess.ReadOnly), DataField] - public TimeSpan BuffTime = TimeSpan.FromSeconds(60); + public TimeSpan BuffTime = TimeSpan.FromSeconds(20); [ViewVariables(VVAccess.ReadOnly), DataField] - public TimeSpan StartingBuffTime = TimeSpan.FromSeconds(60); + public TimeSpan StartingBuffTime = TimeSpan.FromSeconds(20); [ViewVariables(VVAccess.ReadOnly), DataField] - public TimeSpan BuffLimit = TimeSpan.FromSeconds(55); + public TimeSpan BuffLimit = TimeSpan.FromSeconds(10); public static float NearbyTilesBuffRadius = 1f; diff --git a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl index 9fbd3c0aed..4d0e1ec825 100644 --- a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl +++ b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl @@ -11,3 +11,4 @@ comp-kitchen-spike-knife-needed = Вам нужен нож для этого. comp-kitchen-spike-remove-meat = Вы срезаете немного мяса с { $victim }. comp-kitchen-spike-remove-meat-last = Вы срезаете последний кусок мяса с { $victim }! comp-kitchen-spike-meat-name = мясо { $victim } +comp-kitchen-spike-examine = На { CAPITALIZE($this) } висит туша { CAPITALIZE($victim) }. diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml index fee5dcd4cc..373484d5f9 100644 --- a/Resources/Prototypes/DeviceLinking/source_ports.yml +++ b/Resources/Prototypes/DeviceLinking/source_ports.yml @@ -156,12 +156,6 @@ description: Передатчик сигнала ХимМастера # WD -- type: sourcePort - id: LightStatus - name: Статус светильника - description: Этот порт вызывается всякий раз, когда меняется статус светильника - defaultLinks: [ Toggle ] - - type: sourcePort id: BodyScannerSender name: Сканер тела diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml index 9cb449e3d6..e1dfa88016 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml @@ -1,7 +1,7 @@ - type: entity name: laser raptor id: MobLaserRaptor - parent: SimpleMobBase + parent: SimpleSpaceMobBase description: From the Viking age. components: - type: NpcFactionMember @@ -36,7 +36,7 @@ - type: MobThresholds thresholds: 0: Alive - 100: Dead + 50: Dead - type: MovementSpeedModifier baseWalkSpeed: 2 baseSprintSpeed: 5 diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index eed469a20d..f18f3b8093 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -29,10 +29,10 @@ visible: false - map: [ "underwearb" ] #White - map: [ "underweart" ] #White - - map: ["jumpsuit"] - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] - map: [ "socks" ] #White + - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LHand"] - map: ["enum.HumanoidVisualLayers.RHand"] - map: [ "gloves" ] diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index be81839e43..bf7fb11a17 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -74,8 +74,6 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - map: [ "underwearb" ] #White - - map: [ "underweart" ] #White - shader: StencilClear sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. @@ -86,17 +84,14 @@ sprite: Mobs/Customization/masking_helpers.rsi state: unisex_full visible: false - - map: [ "jumpsuit" ] - - map: [ "enum.HumanoidVisualLayers.LHand" ] - - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "underwearb" ] #White + - map: [ "underweart" ] #White - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] - map: [ "socks" ] #White - - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false + - map: [ "jumpsuit" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "gloves" ] - map: [ "shoes" ] - map: [ "ears" ] @@ -115,6 +110,11 @@ - map: [ "head" ] - map: [ "pocket1" ] - map: [ "pocket2" ] + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false - map: [ "clownedon" ] # Dynamically generated sprite: "Effects/creampie.rsi" state: "creampie_moth" diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 25e9e4cda5..dae0b2956e 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -40,7 +40,7 @@ - type: RCDDeconstructable cost: 4 delay: 2 - fx: EffectRCDDeconstruct2 + fx: EffectRCDDeconstruct2 - type: Destructible thresholds: - trigger: @@ -72,7 +72,7 @@ mode: SnapgridCenter snap: - Wallmount - + - type: entity name: light description: "A light fixture. Draws power and produces light when equipped with a light tube." @@ -100,9 +100,6 @@ receiveFrequencyId: SmartLight - type: WirelessNetworkConnection range: 200 - - type: DeviceLinkSource - ports: - - LightStatus - type: DeviceLinkSink ports: - On @@ -294,9 +291,6 @@ receiveFrequencyId: SmartLight - type: WirelessNetworkConnection range: 200 - - type: DeviceLinkSource - ports: - - LightStatus - type: Appearance - type: PoweredLightVisuals - type: DeviceLinkSink diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 72f03a2e0f..c9a0eab15c 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -87,9 +87,6 @@ receiveFrequencyId: SmartLight - type: WirelessNetworkConnection range: 200 - - type: DeviceLinkSource - ports: - - LightStatus - type: DeviceLinkSink ports: - On diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml index 02e141826c..8519ce0685 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml @@ -12,8 +12,8 @@ southRotation: true steps: - material: Steel - amount: 15 - doAfter: 2 + amount: 5 + doAfter: 5 - node: MeatSpike entity: KitchenSpike edges: @@ -21,7 +21,7 @@ completed: - !type:SpawnPrototype prototype: SheetSteel1 - amount: 15 + amount: 5 steps: - tool: Screwing - doAfter: 1 + doAfter: 5 diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 090a334871..8f0e6245b9 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -13,8 +13,6 @@ femaleFirstNames: names_arachnid_first maleLastNames: names_arachnid_last femaleLastNames: names_arachnid_last - sexes: - - Unsexed - type: markingPoints id: MobArachnidMarkingLimits diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_f.png index 10f3a3b0e4c0922e4b8cf0630b8658f005980576..fdc9d235e643499e4dc710b3d13c0998b7279034 100644 GIT binary patch delta 497 zcmVzu*U?a&E8UlE=WDEUnT%@!+=5O6?RG_{r zb|b%fmQNq+zkhtGCMsC(;PG*(FM!feK}%i%{ZWDX0{C753fNV!3YdfnTESnj0l+V9 z2XNbM0TEP|Pv36bF?*Cp|EL2v0O|k^fcjqm!)MjYwPD&dI-@2{GPDJJc(bx#jOMI4 zF;d6}pyr=t!wG;fk`yCFKF=39;5mY103!eaI{*W41ZtYIVx-u0XvcIRoDW`K~#90?V2&p;xG_}AFGujMSo$rbVtgF zhMtr80673>qNhs;q*LEo*l$@+g&jaX|#5C|zHthK?&l8_dF5PZ^pl^s*e4uCNRLWrlRlL6;k zuNHh7V+_3a0Dm5Lp1j1Kj4>~_=oqsD&~+W!w(S)^in?d&qL$K!DW0A*Q12+>P>Aq2{@?5+DWu|5&s?Ogrj8bE0XJZHcfkk0TioU1=O z1BkLL;l1x=fcL(4XO@IAFec8xRI)OlEX!WyrJ$@qtbY?1z+C<001zacT6N!rGJu{o z-uqA#bG#&P0TKn!GqE;GDHvnk{^6Bev9;FsF;Qd8qW=Si`o z7=~dOhG7_nVHoDiNuCdAnr5T5z6&9sl!9{(*XtEUQLOe(PHTO?-EP=!x4pI)d0V7C z4j>5Bb$^ZBZU^A;ZayAXSZb1Ec<%jv9~vaP-41nKBlY5ej0~vjy4Q~f9xbxV<+93~ zS$Zp6Rn^nHfVDPxKqIR!V66?})QlL;3@iz0k#_7SmDvFpOKs}U=Ze3BwYJw9i@QQ8 z+i-ROhG{h%PFOPtarVW75>sAZk+lV;CN$RMQ)M2q0x%RFwyW3RQy#Kvz%c5+l>uX3 zfQ4(oSk%|v24mW>hsA3^Y~;6j*F$murbf}08jqXuFeG%