diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs index 7511e60cde..123be99126 100644 --- a/Content.Server/Pinpointer/NavMapSystem.cs +++ b/Content.Server/Pinpointer/NavMapSystem.cs @@ -171,7 +171,10 @@ public sealed partial class NavMapSystem : SharedNavMapSystem private void OnNavMapBeaconMapInit(EntityUid uid, NavMapBeaconComponent component, MapInitEvent args) { if (component.DefaultText == null || component.Text != null) + { + UpdateNavMapBeaconData(uid, component); // Sunrise-edit return; + } component.Text = Loc.GetString(component.DefaultText); Dirty(uid, component); diff --git a/Content.Server/_Sunrise/Antags/Abductor/EntitySystems/AbductorSystem.Actions.cs b/Content.Server/_Sunrise/Antags/Abductor/EntitySystems/AbductorSystem.Actions.cs index 0a6991b21d..451f191dfa 100644 --- a/Content.Server/_Sunrise/Antags/Abductor/EntitySystems/AbductorSystem.Actions.cs +++ b/Content.Server/_Sunrise/Antags/Abductor/EntitySystems/AbductorSystem.Actions.cs @@ -14,6 +14,8 @@ using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Spawners; using Robust.Shared.Physics.Events; +using Content.Shared._Sunrise.Carrying; +using Content.Shared.Popups; namespace Content.Server._Sunrise.Antags.Abductor; @@ -100,6 +102,12 @@ public sealed partial class AbductorSystem : SharedAbductorSystem if (!TryComp(ev.Performer, out var scientistComp) && !TryComp(ev.Performer, out agentComp)) EnsureComp(ev.Performer, out scientistComp); + if (HasComp(ev.Performer)) + { + _popupSystem.PopupEntity(Loc.GetString("need-stop-carry"), ev.Performer, ev.Performer, PopupType.MediumCaution); + return; + } + EntityCoordinates? spawnPosition = null; if (scientistComp != null && scientistComp.SpawnPosition.HasValue) diff --git a/Content.Server/_Sunrise/Antags/Abductor/EntitySystems/AbductorSystem.Console.cs b/Content.Server/_Sunrise/Antags/Abductor/EntitySystems/AbductorSystem.Console.cs index 739503aad3..c74ded59a8 100644 --- a/Content.Server/_Sunrise/Antags/Abductor/EntitySystems/AbductorSystem.Console.cs +++ b/Content.Server/_Sunrise/Antags/Abductor/EntitySystems/AbductorSystem.Console.cs @@ -17,6 +17,8 @@ using Robust.Shared.Prototypes; using System.Linq; using Content.Server.VendingMachines; using Content.Shared.VendingMachines; +using Content.Shared._Sunrise.Carrying; +using Content.Shared.Popups; namespace Content.Server._Sunrise.Antags.Abductor; @@ -133,6 +135,13 @@ public sealed partial class AbductorSystem : SharedAbductorSystem { if (ent.Comp.Target == null || ent.Comp.AlienPod == null || ent.Comp.Dispencer == null) return; var target = GetEntity(ent.Comp.Target.Value); + + if (HasComp(target)) + { + _popupSystem.PopupCursor(Loc.GetString("need-stop-carry"), args.Actor, PopupType.MediumCaution); + return; + } + EnsureComp(target, out var xform); var effectEnt = SpawnAttachedTo(_teleportationEffectEntity, xform.Coordinates); _xformSys.SetParent(effectEnt, target); diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/abductors/abductor.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/abductors/abductor.ftl index 9f81e54e65..9c051a9a1f 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/abductors/abductor.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/abductors/abductor.ftl @@ -19,3 +19,4 @@ no-gizmo-in-pockets = В карманах отсутствует гизмо! gizmo-is-successfully-filled = Гизмо успешно заполнен gizmo-is-not-in-pockets = В карманах нету гизмо! owo-organ-transformation = ВЫ КОШКОФИЦИРОВАЛИСЬ!! +need-stop-carry = Нельзя переместиться пока кто-то на руках! diff --git a/Resources/Maps/_Sunrise/Shuttles/abductor_shuttle.yml b/Resources/Maps/_Sunrise/Shuttles/abductor_shuttle.yml index 4c3183da3c..57833d5b39 100644 --- a/Resources/Maps/_Sunrise/Shuttles/abductor_shuttle.yml +++ b/Resources/Maps/_Sunrise/Shuttles/abductor_shuttle.yml @@ -4,8 +4,8 @@ meta: engineVersion: 262.0.0 forkId: "" forkVersion: "" - time: 06/29/2025 12:03:08 - entityCount: 301 + time: 07/29/2025 19:59:42 + entityCount: 295 maps: [] grids: - 1 @@ -239,6 +239,11 @@ entities: - type: DeviceList devices: - 295 + - 102 + - 278 + - 292 + - 6 + - 225 - proto: APCBasic entities: - uid: 147 @@ -813,11 +818,6 @@ entities: parent: 1 - proto: GasPassiveVent entities: - - uid: 6 - components: - - type: Transform - pos: 0.5,4.5 - parent: 1 - uid: 100 components: - type: Transform @@ -830,35 +830,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-5.5 parent: 1 - - uid: 278 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,0.5 - parent: 1 - - uid: 292 - components: - - type: Transform - pos: 4.5,4.5 - parent: 1 - - uid: 293 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-3.5 - parent: 1 - - uid: 294 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-3.5 - parent: 1 - - uid: 301 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,0.5 - parent: 1 - proto: GasPipeBend entities: - uid: 94 @@ -866,22 +837,22 @@ entities: - type: Transform pos: -0.5,4.5 parent: 1 + - uid: 283 + components: + - type: Transform + pos: 4.5,-1.5 + parent: 1 - uid: 286 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-1.5 parent: 1 - - uid: 296 - components: - - type: Transform - pos: 5.5,2.5 - parent: 1 - - uid: 297 + - uid: 288 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,-1.5 + pos: 4.5,2.5 parent: 1 - proto: GasPipeStraight entities: @@ -896,12 +867,6 @@ entities: - type: Transform pos: 0.5,3.5 parent: 1 - - uid: 102 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,4.5 - parent: 1 - uid: 163 components: - type: Transform @@ -920,11 +885,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-4.5 parent: 1 - - uid: 274 - components: - - type: Transform - pos: -0.5,3.5 - parent: 1 - uid: 276 components: - type: Transform @@ -978,17 +938,11 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-2.5 parent: 1 - - uid: 298 + - uid: 294 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,1.5 - parent: 1 - - uid: 299 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-0.5 + rot: -1.5707963267948966 rad + pos: -1.5,4.5 parent: 1 - proto: GasPipeTJunction entities: @@ -1010,28 +964,76 @@ entities: rot: 3.141592653589793 rad pos: 0.5,2.5 parent: 1 - - uid: 283 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,2.5 - parent: 1 - uid: 287 components: - type: Transform pos: 0.5,-1.5 parent: 1 - - uid: 288 +- proto: GasPressurePump + entities: + - uid: 274 components: - type: Transform - pos: 4.5,-1.5 + pos: -0.5,3.5 parent: 1 - - uid: 300 + - type: GasPressurePump + targetPressure: 130 + enabled: True +- proto: GasVentPump + entities: + - uid: 6 + components: + - type: Transform + pos: 4.5,4.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 17 + - uid: 102 components: - type: Transform rot: 1.5707963267948966 rad - pos: 5.5,0.5 + pos: -1.5,0.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 17 + - uid: 225 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 17 + - uid: 278 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-3.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 17 + - uid: 292 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-3.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 17 - proto: GasVentScrubber entities: - uid: 295 diff --git a/Resources/Maps/_Sunrise/Station/fland.yml b/Resources/Maps/_Sunrise/Station/fland.yml index 5d68e27ff2..b082f77390 100644 --- a/Resources/Maps/_Sunrise/Station/fland.yml +++ b/Resources/Maps/_Sunrise/Station/fland.yml @@ -98768,16 +98768,22 @@ entities: - type: Transform pos: -5.5,11.5 parent: 2 + - type: NavMapBeacon + text: Arcade - uid: 15229 components: - type: Transform pos: 70.5,9.5 parent: 2 + - type: NavMapBeacon + text: Swimming Pool - uid: 15230 components: - type: Transform pos: -34.5,55.5 parent: 2 + - type: NavMapBeacon + text: The Garden - proto: DefaultStationBeaconAI entities: - uid: 15231 @@ -98785,11 +98791,15 @@ entities: - type: Transform pos: 105.5,43.5 parent: 2 + - type: NavMapBeacon + text: AI Emergency Power - uid: 15232 components: - type: Transform pos: 103.5,49.5 parent: 2 + - type: NavMapBeacon + text: AI Upload - proto: DefaultStationBeaconAICore entities: - uid: 15233 @@ -98844,11 +98854,15 @@ entities: - type: Transform pos: 60.5,-37.5 parent: 2 + - type: NavMapBeacon + text: Gas Storage - uid: 15241 components: - type: Transform pos: 79.5,-34.5 parent: 2 + - type: NavMapBeacon + text: Atmospherics - uid: 15242 components: - type: Transform @@ -98945,11 +98959,15 @@ entities: - type: Transform pos: 91.5,64.5 parent: 2 + - type: NavMapBeacon + text: Lifepods - uid: 15256 components: - type: Transform pos: 62.5,57.5 parent: 2 + - type: NavMapBeacon + text: Conference - uid: 15257 components: - type: Transform @@ -98960,6 +98978,8 @@ entities: - type: Transform pos: 48.5,-6.5 parent: 2 + - type: NavMapBeacon + text: Command Lounge - proto: DefaultStationBeaconCourtroom entities: - uid: 15259 @@ -99014,46 +99034,64 @@ entities: - type: Transform pos: 104.5,5.5 parent: 2 + - type: NavMapBeacon + text: Access Corridor - uid: 15267 components: - type: Transform pos: -35.5,-64.5 parent: 2 + - type: NavMapBeacon + text: Bay 02 - uid: 15268 components: - type: Transform pos: -37.5,-53.5 parent: 2 + - type: NavMapBeacon + text: Bay 01 - uid: 15269 components: - type: Transform pos: -35.5,-42.5 parent: 2 + - type: NavMapBeacon + text: Shuttle Workshop - uid: 15270 components: - type: Transform pos: 108.5,-1.5 parent: 2 + - type: NavMapBeacon + text: Engine - uid: 15271 components: - type: Transform pos: 86.5,-20.5 parent: 2 + - type: NavMapBeacon + text: Thermal Control - uid: 15272 components: - type: Transform pos: 93.5,-16.5 parent: 2 + - type: NavMapBeacon + text: Containment Storage - uid: 15273 components: - type: Transform pos: 108.5,-9.5 parent: 2 + - type: NavMapBeacon + text: Containment - uid: 15274 components: - type: Transform pos: 80.5,-1.5 parent: 2 + - type: NavMapBeacon + text: Engi Gear - proto: DefaultStationBeaconEvac entities: - uid: 15275 @@ -99131,11 +99169,15 @@ entities: - type: Transform pos: 34.5,47.5 parent: 2 + - type: NavMapBeacon + text: Isolation - uid: 15286 components: - type: Transform pos: 30.5,44.5 parent: 2 + - type: NavMapBeacon + text: Virology - uid: 15287 components: - type: Transform @@ -99146,6 +99188,8 @@ entities: - type: Transform pos: 12.5,49.5 parent: 2 + - type: NavMapBeacon + text: Cloning - uid: 15289 components: - type: Transform @@ -99161,11 +99205,15 @@ entities: - type: Transform pos: 15.5,67.5 parent: 2 + - type: NavMapBeacon + text: Breakroom - uid: 15292 components: - type: Transform pos: 6.5,68.5 parent: 2 + - type: NavMapBeacon + text: Storage - proto: DefaultStationBeaconMorgue entities: - uid: 15293 @@ -99180,6 +99228,8 @@ entities: - type: Transform pos: 47.5,25.5 parent: 2 + - type: NavMapBeacon + text: Prison Yard - uid: 15295 components: - type: Transform @@ -99234,21 +99284,29 @@ entities: - type: Transform pos: 31.5,-37.5 parent: 2 + - type: NavMapBeacon + text: Breakroom - uid: 15303 components: - type: Transform pos: 31.5,-34.5 parent: 2 + - type: NavMapBeacon + text: Testing Range - uid: 15304 components: - type: Transform pos: 29.5,-48.5 parent: 2 + - type: NavMapBeacon + text: Science Lounge - uid: 15305 components: - type: Transform pos: 26.5,-58.5 parent: 2 + - type: NavMapBeacon + text: Science Dock - uid: 15306 components: - type: Transform @@ -99259,6 +99317,8 @@ entities: - type: Transform pos: 38.5,-50.5 parent: 2 + - type: NavMapBeacon + text: Lab - proto: DefaultStationBeaconSecurity entities: - uid: 15308 @@ -99266,6 +99326,8 @@ entities: - type: Transform pos: 19.5,18.5 parent: 2 + - type: NavMapBeacon + text: Evidence - uid: 15309 components: - type: Transform @@ -99276,6 +99338,8 @@ entities: - type: Transform pos: 44.5,2.5 parent: 2 + - type: NavMapBeacon + text: Infirmary - uid: 15311 components: - type: Transform @@ -99286,26 +99350,36 @@ entities: - type: Transform pos: 36.5,12.5 parent: 2 + - type: NavMapBeacon + text: Sec Gear - uid: 15313 components: - type: Transform pos: 30.5,21.5 parent: 2 + - type: NavMapBeacon + text: Squad - uid: 15314 components: - type: Transform pos: 18.5,22.5 parent: 2 + - type: NavMapBeacon + text: Interrogation - uid: 15315 components: - type: Transform pos: 20.5,26.5 parent: 2 + - type: NavMapBeacon + text: Breakroom - uid: 15316 components: - type: Transform pos: 36.5,29.5 parent: 2 + - type: NavMapBeacon + text: Firing Range - uid: 15317 components: - type: Transform @@ -99357,11 +99431,15 @@ entities: - type: Transform pos: -15.5,34.5 parent: 2 + - type: NavMapBeacon + text: Storage - uid: 15326 components: - type: Transform pos: -5.5,28.5 parent: 2 + - type: NavMapBeacon + text: Freezer - proto: DefaultStationBeaconSingularity entities: - uid: 15327 @@ -99398,11 +99476,15 @@ entities: - type: Transform pos: -1.5,-11.5 parent: 2 + - type: NavMapBeacon + text: Storage - uid: 15333 components: - type: Transform pos: 18.5,-12.5 parent: 2 + - type: NavMapBeacon + text: Mail - proto: DefaultStationBeaconSurgery entities: - uid: 15334 diff --git a/Resources/Maps/_Sunrise/Station/plasma.yml b/Resources/Maps/_Sunrise/Station/plasma.yml index ffd7943f65..04fcf00389 100644 --- a/Resources/Maps/_Sunrise/Station/plasma.yml +++ b/Resources/Maps/_Sunrise/Station/plasma.yml @@ -71611,6 +71611,9 @@ entities: - type: Transform pos: -138.5,-5.5 parent: 2 + - type: NavMapBeacon + color: '#EFB34193' + text: TEG Control Room - type: WarpPoint location: Комната контроля ТЭГа - proto: DefaultStationBeaconAIPower @@ -71742,6 +71745,8 @@ entities: - type: Transform pos: -36.5,6.5 parent: 2 + - type: NavMapBeacon + text: Ангар пода СБ - type: WarpPoint location: Ангар пода СБ - proto: DefaultStationBeaconCaptainsQuarters @@ -71868,6 +71873,8 @@ entities: - type: Transform pos: -95.5,-2.5 parent: 2 + - type: NavMapBeacon + text: 'Plasma Pit #045' - type: WarpPoint location: 'Озеро плазмы #045' - type: Label @@ -71879,6 +71886,8 @@ entities: - type: Transform pos: -129.5,33.5 parent: 2 + - type: NavMapBeacon + text: Кристалл супер материи - type: WarpPoint location: Кристалл суперматерии - uid: 11007 @@ -72022,6 +72031,8 @@ entities: - type: Transform pos: -22.5,-51.5 parent: 2 + - type: NavMapBeacon + text: Virology - type: WarpPoint location: Вирусология - uid: 11024 @@ -72029,6 +72040,8 @@ entities: - type: Transform pos: -19.5,-19.5 parent: 2 + - type: NavMapBeacon + text: Psychology - type: WarpPoint location: Кабинет Психолога - proto: DefaultStationBeaconMorgue diff --git a/Resources/Maps/_Sunrise/Station/relic.yml b/Resources/Maps/_Sunrise/Station/relic.yml index aa55697c98..c4e2c3af6c 100644 --- a/Resources/Maps/_Sunrise/Station/relic.yml +++ b/Resources/Maps/_Sunrise/Station/relic.yml @@ -15462,11 +15462,15 @@ entities: - type: Transform pos: 33.5,60.5 parent: 2 + - type: NavMapBeacon + text: Air Tunnel - uid: 7740 components: - type: Transform pos: 21.5,51.5 parent: 2 + - type: NavMapBeacon + text: AI Foyer - proto: DefaultStationBeaconAICore entities: - uid: 7738 @@ -15530,6 +15534,8 @@ entities: - type: Transform pos: 25.5,-4.5 parent: 2 + - type: NavMapBeacon + text: Nightclub - proto: DefaultStationBeaconBotany entities: - uid: 7750 @@ -15731,11 +15737,15 @@ entities: - type: Transform pos: 58.5,67.5 parent: 2 + - type: NavMapBeacon + text: Solars North - uid: 7742 components: - type: Transform pos: -3.5,-10.5 parent: 2 + - type: NavMapBeacon + text: Solars South - proto: DefaultStationBeaconTechVault entities: - uid: 7777 diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 5df1ba74bc..7bdf74d3ef 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -41,7 +41,7 @@ - id: ZombieOutbreak - id: LoneOpsSpawn - id: DerelictCyborgSpawn - #- id: AbductorsSpawn # Starlight-Abductors, убрал на время теста геймрула + - id: AbductorsSpawn - id: WizardSpawn - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml index ea4b716fe9..5b99dafa4d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml @@ -216,6 +216,7 @@ tags: - WhitelistChameleon - SecurityHelmet + - type: EyeProtection #Dogi Helmet - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/wonderprod.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/wonderprod.yml index bd04f208a1..4f311a6703 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/wonderprod.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/wonderprod.yml @@ -45,7 +45,7 @@ angle: 60 animation: WeaponArcThrust - type: StaminaDamageOnHit - damage: 55 + damage: 60 sound: /Audio/Weapons/egloves.ogg soundStateActivate: collection: sparks diff --git a/Resources/Prototypes/_Sunrise/GameRules/events.yml b/Resources/Prototypes/_Sunrise/GameRules/events.yml index ce641df6af..5b56e121ef 100644 --- a/Resources/Prototypes/_Sunrise/GameRules/events.yml +++ b/Resources/Prototypes/_Sunrise/GameRules/events.yml @@ -107,6 +107,8 @@ - Abductor - AbductorScientist - CanPilot + - DoorBumpOpener + - FootstepSound - type: NpcFactionMember factions: - SimpleHostile