diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs index a7f5b4d438..db22c41520 100644 --- a/Content.Server/Administration/Systems/AdminSystem.cs +++ b/Content.Server/Administration/Systems/AdminSystem.cs @@ -79,7 +79,6 @@ public override void Initialize() Subs.CVar(_config, CCVars.PanicBunkerShowReason, OnPanicBunkerShowReasonChanged, true); Subs.CVar(_config, CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, true); Subs.CVar(_config, CCVars.PanicBunkerMinOverallMinutes, OnPanicBunkerMinOverallMinutesChanged, true); - Subs.CVar(_config, CCCVars.PanicBunkerDenyVPN, OnPanicBunkerDenyVpnChanged, true); // Corvax-VPNGuard /* * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future. @@ -328,14 +327,6 @@ private void OnBabyJailMaxOverallMinutesChanged(int minutes) SendBabyJailStatusAll(); } - // Corvax-VPNGuard-Start - private void OnPanicBunkerDenyVpnChanged(bool deny) - { - PanicBunker.DenyVpn = deny; - SendPanicBunkerStatusAll(); - } - // Corvax-VPNGuard-End - private void UpdatePanicBunker() { var admins = PanicBunker.CountDeadminnedAdmins diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 512e792562..741a0040d0 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -60,7 +60,6 @@ internal sealed partial class ChatManager : IChatManager public void Initialize() { - IoCManager.Instance!.TryResolveType(out _sponsorsManager); // Corvax-Sponsors _netManager.RegisterNetMessage(); _netManager.RegisterNetMessage(); diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl index d8c1dc30b8..de51d388f9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl @@ -50,8 +50,6 @@ ent-LoneOpsSpawn = { ent-BaseNukeopsRule } .desc = { ent-BaseNukeopsRule.desc } ent-SleeperAgents = { ent-BaseTraitorRule } .desc = { ent-BaseTraitorRule.desc } -ent-ImmovableRodSpawn = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } ent-IonStorm = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-MimicVendorRule = { ent-BaseGameRule } diff --git a/Resources/Prototypes/Exodus/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Exodus/Entities/Clothing/Hands/gloves.yml index c3efbc60c8..be32376981 100644 --- a/Resources/Prototypes/Exodus/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Exodus/Entities/Clothing/Hands/gloves.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingHandsGlovesColorBlack + parent: [ClothingHandsGlovesColorBlack, BaseCommandContraband] id: ClothingHandsGlovesBlueshield name: blueshield gloves description: These tactical gloves are fireproof and shock resistant. @@ -8,8 +8,6 @@ sprite: Exodus/Clothing/Hands/Gloves/blueshield.rsi - type: Clothing sprite: Exodus/Clothing/Hands/Gloves/blueshield.rsi - - type: GloveHeatResistance - heatResistance: 1400 - type: Insulated - type: Fiber fiberMaterial: fibers-insulative diff --git a/Resources/Prototypes/Exodus/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Exodus/Loadouts/Jobs/Security/brigmedic.yml index 87d57d42e3..fae7d7d689 100644 --- a/Resources/Prototypes/Exodus/Loadouts/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Exodus/Loadouts/Jobs/Security/brigmedic.yml @@ -1,109 +1,65 @@ # Brigmedic beret - type: loadout - id: BrigmedicBeret - equipment: BrigmedicBeret - -- type: startingGear id: BrigmedicBeret equipment: head: ClothingHeadHatBeretSecurityMedic # Medical Security Mask - type: loadout - id: MedicalSecurityMask - equipment: MedicalSecurityMask - -- type: startingGear id: MedicalSecurityMask equipment: mask: ClothingMaskBreathMedicalSecurity # AMG coat - type: loadout - id: AMGCoat - equipment: AMGCoat - -- type: startingGear id: AMGCoat equipment: outerClothing: ClothingOuterCoatAMG # Brigmedic coat - type: loadout - id: BrigmedicCoat - equipment: BrigmedicCoat - -- type: startingGear id: BrigmedicCoat equipment: outerClothing: ClothingOuterCoatLabSecurityMedic # Brigmedic vest - type: loadout - id: BrigmedicVest - equipment: BrigmedicVest - -- type: startingGear id: BrigmedicVest equipment: outerClothing: ClothingOuterVestSecurityMedic # Brigmedic jumpsuit - type: loadout - id: BrigmedicJumpsuit - equipment: BrigmedicJumpsuit - -- type: startingGear id: BrigmedicJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitBrigmedic # Brigmedic jumpskirt - type: loadout - id: BrigmedicJumpskirt - equipment: BrigmedicJumpskirt - -- type: startingGear id: BrigmedicJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtBrigmedic # Brigmedic backpack - type: loadout - id: BrigmedicBackpack - equipment: BrigmedicBackpack - -- type: startingGear id: BrigmedicBackpack equipment: back: ClothingBackpackBrigmedic # Brigmedic satchel - type: loadout - id: BrigmedicSatchel - equipment: BrigmedicSatchel - -- type: startingGear id: BrigmedicSatchel equipment: back: ClothingBackpackSatchelBrigmedic # Brigmedic duffel - type: loadout - id: BrigmedicDuffel - equipment: BrigmedicDuffel - -- type: startingGear id: BrigmedicDuffel equipment: back: ClothingBackpackDuffelBrigmedic # Red Shoes - type: loadout - id: RedShoes - equipment: RedShoes - -- type: startingGear id: RedShoes equipment: shoes: ClothingShoesColorRed diff --git a/Resources/Prototypes/Exodus/Maps/Pools/classic.yml b/Resources/Prototypes/Exodus/Maps/Pools/classic.yml index 6003cf8637..d3473fb28b 100644 --- a/Resources/Prototypes/Exodus/Maps/Pools/classic.yml +++ b/Resources/Prototypes/Exodus/Maps/Pools/classic.yml @@ -1,7 +1,6 @@ - type: gameMapPool id: ExodusClassicMapPool maps: - - Atlas - Bagel - Box - Core @@ -16,7 +15,6 @@ - Fland - Marathon - Meta - - Origin # Exodus Supported Maps - ExodusPacked - ExodusCluster diff --git a/Resources/Prototypes/Exodus/StatusIcon/job.yml b/Resources/Prototypes/Exodus/StatusIcon/job.yml index b904b165f2..bb9ccbe323 100644 --- a/Resources/Prototypes/Exodus/StatusIcon/job.yml +++ b/Resources/Prototypes/Exodus/StatusIcon/job.yml @@ -1,6 +1,7 @@ -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconBlueshieldOfficer icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: BlueshieldOfficer + jobName: job-name-blueshield diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 1a5e38845f..42b21ca423 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -7,12 +7,12 @@ - id: BluespaceLocker - id: BreakerFlip - id: BureaucraticError - - id: ClericalError + # - id: ClericalError # Exodus - id: CockroachMigration - id: GasLeak - id: IonStorm # its calm like 90% of the time smh - id: KudzuGrowth - - id: MassHallucinations + # - id: MassHallucinations # Exodus - id: MimicVendorRule - id: MouseMigration - id: PowerGridCheck @@ -129,16 +129,16 @@ duration: 1 - type: BureaucraticErrorRule -# - type: entity # Exodus -# id: ClericalError -# parent: BaseGameRule -# components: -# - type: StationEvent -# startAnnouncement: station-event-clerical-error-announcement -# minimumPlayers: 15 -# weight: 5 -# duration: 1 -# - type: ClericalErrorRule +- type: entity + id: ClericalError + parent: BaseGameRule + components: + - type: StationEvent + startAnnouncement: station-event-clerical-error-announcement + minimumPlayers: 15 + weight: 5 + duration: 1 + - type: ClericalErrorRule - type: entity parent: BaseGameRule @@ -566,21 +566,21 @@ - type: TraitorRole prototype: TraitorSleeper -# - type: entity # Exodus -# id: MassHallucinations -# parent: BaseGameRule -# components: -# - type: StationEvent -# weight: 7 -# duration: 150 -# maxDuration: 300 -# reoccurrenceDelay: 30 -# - type: MassHallucinationsRule -# minTimeBetweenIncidents: 0.1 -# maxTimeBetweenIncidents: 300 -# maxSoundDistance: 7 -# sounds: -# collection: Paracusia +- type: entity + id: MassHallucinations + parent: BaseGameRule + components: + - type: StationEvent + weight: 7 + duration: 150 + maxDuration: 300 + reoccurrenceDelay: 30 + - type: MassHallucinationsRule + minTimeBetweenIncidents: 0.1 + maxTimeBetweenIncidents: 300 + maxSoundDistance: 7 + sounds: + collection: Paracusia - type: entity parent: BaseGameRule diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index fa21102053..b7f1681fe3 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -7,13 +7,13 @@ - id: UnknownShuttleCargoLost - id: UnknownShuttleTravelingCuisine - id: UnknownShuttleDisasterEvacPod - - id: UnknownShuttleHonki + # - id: UnknownShuttleHonki # Exodus - type: entityTable id: UnknownShuttlesFreelanceTable table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp - children: - - id: UnknownShuttleSyndieEvacPod + children: [] + # - id: UnknownShuttleSyndieEvacPod # Exodus - type: entityTable id: UnknownShuttlesHostileTable @@ -59,20 +59,20 @@ - type: LoadMapRule preloadedGrid: DisasterEvacPod -# - type: entity # Exodus -# parent: BaseUnknownShuttleRule -# id: UnknownShuttleHonki -# components: -# - type: StationEvent -# weight: 2 -# - type: LoadMapRule -# preloadedGrid: Honki +- type: entity + parent: BaseUnknownShuttleRule + id: UnknownShuttleHonki + components: + - type: StationEvent + weight: 2 + - type: LoadMapRule + preloadedGrid: Honki -# - type: entity -# parent: BaseUnknownShuttleRule -# id: UnknownShuttleSyndieEvacPod -# components: -# - type: StationEvent -# weight: 2 -# - type: LoadMapRule -# preloadedGrid: SyndieEvacPod +- type: entity + parent: BaseUnknownShuttleRule + id: UnknownShuttleSyndieEvacPod + components: + - type: StationEvent + weight: 2 + - type: LoadMapRule + preloadedGrid: SyndieEvacPod