Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Content.Shared/CCVar/CCVars.Server.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ public sealed partial class CCVars
/// Guide Entry Prototype ID to be displayed as the server rules.
/// </summary>
public static readonly CVarDef<string> RulesFile =
CVarDef.Create("server.rules_file", "DefaultRuleset", CVar.REPLICATED | CVar.SERVER);
CVarDef.Create("server.rules_file", "FunkyRuleset", CVar.REPLICATED | CVar.SERVER);

/// <summary>
/// Guide entry that is displayed by default when a guide is opened.
/// </summary>
public static readonly CVarDef<string> DefaultGuide =
CVarDef.Create("server.default_guide", "NewPlayer", CVar.REPLICATED | CVar.SERVER);
CVarDef.Create("server.default_guide", "FunkyNewPlayer", CVar.REPLICATED | CVar.SERVER);

/// <summary>
/// If greater than 0, automatically restart the server after this many minutes of uptime.
Expand Down
10 changes: 0 additions & 10 deletions Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
21 changes: 0 additions & 21 deletions Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions Resources/Prototypes/Guidebook/funky_newplayer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: guideEntry
id: FunkyNewPlayer
name: guide-entry-newplayer
priority: 0
text: "/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml"
children:
- Controls
- CharacterCreation
6 changes: 6 additions & 0 deletions Resources/Prototypes/Guidebook/funky_rules.yml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Resources/Prototypes/Guidebook/species.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- Reptilian
- SlimePerson
- Vox
- Vulpkanin
# - Vulpkanin

- type: guideEntry
id: Arachnid
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Magic/event_spells.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@
orGroup: Guns
- id: WeaponDisabler
orGroup: Guns
- id: WeaponDisablerSMG
orGroup: Guns
- id: WeaponTaser
orGroup: Guns
- id: WeaponAntiqueLaser
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Recipes/Lathes/Packs/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,3 @@
id: SecurityDisablers
recipes:
- WeaponDisabler
- WeaponDisablerSMG
1 change: 0 additions & 1 deletion Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
- Truncheon
- TelescopicShield
- HoloprojectorSecurity
- WeaponDisablerSMG

- type: technology
id: ExplosiveTechnology
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltMilitaryWebbingERT
pocket2: CombatKnife
suitstorage: WeaponDisablerSMG
storage:
back:
- Binoculars
Expand Down Expand Up @@ -338,7 +337,6 @@
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltMilitaryWebbingERT
pocket2: CombatKnife
suitstorage: WeaponDisablerSMG
storage:
back:
- BoxZiptie
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Species/vulpkanin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
# SPDX-FileCopyrightText: 2026 pathetic meowmeow <uhhadd@gmail.com>
# 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"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/secret_weights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading