diff --git a/Content.Shared/CCVar/CCVars.Server.cs b/Content.Shared/CCVar/CCVars.Server.cs index ac5a9b0b235..3ca23485c03 100644 --- a/Content.Shared/CCVar/CCVars.Server.cs +++ b/Content.Shared/CCVar/CCVars.Server.cs @@ -22,13 +22,13 @@ public sealed partial class CCVars /// Guide Entry Prototype ID to be displayed as the server rules. /// public static readonly CVarDef RulesFile = - CVarDef.Create("server.rules_file", "DefaultRuleset", CVar.REPLICATED | CVar.SERVER); + CVarDef.Create("server.rules_file", "FunkyRuleset", CVar.REPLICATED | CVar.SERVER); /// /// Guide entry that is displayed by default when a guide is opened. /// public static readonly CVarDef DefaultGuide = - CVarDef.Create("server.default_guide", "NewPlayer", CVar.REPLICATED | CVar.SERVER); + CVarDef.Create("server.default_guide", "FunkyNewPlayer", CVar.REPLICATED | CVar.SERVER); /// /// If greater than 0, automatically restart the server after this many minutes of uptime. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index dc0a3f743da..c3ef7b94a93 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -257,16 +257,6 @@ category: cargoproduct-category-name-fun group: market -- type: cargoProduct - id: HydratedScurret - icon: - sprite: Structures/Wallmounts/posters.rsi - state: poster55_legit - product: CrateFunScurret - cost: 25000 # You will surely not regret buying this - category: cargoproduct-category-name-fun - group: market - - type: cargoProduct id: FunCrateGambling icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 08d856f7d8a..0fc4d1a875d 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -512,24 +512,3 @@ amount: 2 - id: BoxDarts prob: 0.05 - -- type: entity - parent: CrateLivestock - id: CrateFunScurret - name: hydrated scurret - description: Wait, what? - components: - - type: EntityTableContainerFill - containers: - entity_storage: !type:AllSelector - children: - - id: MobEmotionalSupportScurret # How? Why? - - id: DrinkVodkaBottleFull - - id: DrinkWhiskeyBottleFull - - id: DrinkTequilaBottleFull # ...that explains it. - - id: DrinkShotGlass - amount: 2 - - id: Spear # self defence - - id: ClothingHeadHatHardhatYellow - - id: ClothingNeckMantleQM - - id: ClothingHeadsetCargo diff --git a/Resources/Prototypes/Guidebook/funky_newplayer.yml b/Resources/Prototypes/Guidebook/funky_newplayer.yml new file mode 100644 index 00000000000..71a892b506e --- /dev/null +++ b/Resources/Prototypes/Guidebook/funky_newplayer.yml @@ -0,0 +1,8 @@ +- type: guideEntry + id: FunkyNewPlayer + name: guide-entry-newplayer + priority: 0 + text: "/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml" + children: + - Controls + - CharacterCreation \ No newline at end of file diff --git a/Resources/Prototypes/Guidebook/funky_rules.yml b/Resources/Prototypes/Guidebook/funky_rules.yml new file mode 100644 index 00000000000..ab77e69dada --- /dev/null +++ b/Resources/Prototypes/Guidebook/funky_rules.yml @@ -0,0 +1,6 @@ +- type: guideEntry # Default for forks and stuff. Should not be listed anywhere if the server is using a custom ruleset. + id: FunkyRuleset + name: guide-entry-rules + ruleEntry: true + priority: 10 + text: "/ServerInfo/Guidebook/ServerRules/DefaultRules.xml" \ No newline at end of file diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml index bf28ff631d4..00208086df0 100644 --- a/Resources/Prototypes/Guidebook/species.yml +++ b/Resources/Prototypes/Guidebook/species.yml @@ -15,7 +15,7 @@ - Reptilian - SlimePerson - Vox - - Vulpkanin +# - Vulpkanin - type: guideEntry id: Arachnid diff --git a/Resources/Prototypes/Magic/event_spells.yml b/Resources/Prototypes/Magic/event_spells.yml index 93c391c717a..0bb0c34ae65 100644 --- a/Resources/Prototypes/Magic/event_spells.yml +++ b/Resources/Prototypes/Magic/event_spells.yml @@ -138,8 +138,6 @@ orGroup: Guns - id: WeaponDisabler orGroup: Guns - - id: WeaponDisablerSMG - orGroup: Guns - id: WeaponTaser orGroup: Guns - id: WeaponAntiqueLaser diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml index 90e9d0431fa..baf367db6d1 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml @@ -144,4 +144,3 @@ id: SecurityDisablers recipes: - WeaponDisabler - - WeaponDisablerSMG diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 441be291d05..99edf4f6521 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -120,7 +120,6 @@ - Truncheon - TelescopicShield - HoloprojectorSecurity - - WeaponDisablerSMG - type: technology id: ExplosiveTechnology diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index af8163023de..ef58aba4ae1 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -68,7 +68,6 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltMilitaryWebbingERT pocket2: CombatKnife - suitstorage: WeaponDisablerSMG storage: back: - Binoculars @@ -338,7 +337,6 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltMilitaryWebbingERT pocket2: CombatKnife - suitstorage: WeaponDisablerSMG storage: back: - BoxZiptie diff --git a/Resources/Prototypes/Species/vulpkanin.yml b/Resources/Prototypes/Species/vulpkanin.yml index aefc59565a6..0f8a4daf1e3 100644 --- a/Resources/Prototypes/Species/vulpkanin.yml +++ b/Resources/Prototypes/Species/vulpkanin.yml @@ -3,10 +3,11 @@ # SPDX-FileCopyrightText: 2026 pathetic meowmeow # SPDX-License-Identifier: MIT +## REPLACE WITH OWN VERSION OF VULP OR REPLACEMENT - type: species id: Vulpkanin name: species-name-vulpkanin - roundStart: true + roundStart: false prototype: MobVulpkanin sprites: MobVulpkaninSprites defaultSkinTone: "#5a3f2d" diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml index 468096c1497..e8bfe5d8a98 100644 --- a/Resources/Prototypes/secret_weights.yml +++ b/Resources/Prototypes/secret_weights.yml @@ -25,5 +25,5 @@ Traitor: 0.55 Zombie: 0.05 Survival: 0.10 - Revolutionary: 0.05 + #Revolutionary: 0.05 replacing with unions soon # Wizard: 0.05 # Disabled as roundstart gamemode until reworked