Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Space Law Reborn #49

Merged
merged 16 commits into from
Jan 17, 2025
Merged
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
2 changes: 1 addition & 1 deletion Content.Client/Guidebook/Controls/GuidebookWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:fancyTree="clr-namespace:Content.Client.UserInterface.Controls.FancyTree"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
SetSize="750 700"
SetSize="900 700"
MinSize="100 200"
Resizable="True"
Title="{Loc 'guidebook-window-title'}">
Expand Down
44 changes: 44 additions & 0 deletions Resources/Locale/en-US/_Goobstation/guidebook/spacelaw.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Goob Space Law
# - Main Folder
guide-entry-spacelaw-folder = Space Law
# - Subdirectories/Subfolders
guide-entry-spacelaw-contraband = Contraband
guide-entry-spacelaw-trials = Trial Procedures
guide-entry-spacelaw-procedures = Procedures
guide-entry-spacelaw-courtrulings = Court Rulings
guide-entry-spacelaw-crimechart = Crime Chart
guide-entry-spacelaw-categories = Categories
# - Standalones
guide-entry-spacelaw-modifiers = Modifiers
# - Contraband
guide-entry-spacelaw-contraband-substances = Substances
guide-entry-spacelaw-contraband-gear = Gear
guide-entry-spacelaw-contraband-weapons = Weapons
# - Trials
guide-entry-spacelaw-trials-escalationpolicy = Escalation
guide-entry-spacelaw-trials-trialpolicy = Trial Policy
guide-entry-spacelaw-trials-prisonerrequest = Prisoner Request
# - Procedures
guide-entry-spacelaw-procedures-sentencing = Sentencing
guide-entry-spacelaw-procedures-treatment = Treatment
guide-entry-spacelaw-procedures-implantation = Implantation
guide-entry-spacelaw-procedures-implantremoval = Implant Removal
guide-entry-spacelaw-procedures-searching = Searching/Seizure
# - Court Rulings
guide-entry-spacelaw-courtrulings-ipcbattery = IPC Prisoner
guide-entry-spacelaw-courtrulings-cults = Cultists
guide-entry-spacelaw-courtrulings-sacrifices = Sacrifices
# - Categories
guide-entry-spacelaw-groups-animal = Animal (A)
guide-entry-spacelaw-groups-assault = Assault (V)
guide-entry-spacelaw-groups-contraband = Contraband (C)
guide-entry-spacelaw-groups-disruption = Disruption (X)
guide-entry-spacelaw-groups-drugs = Drugs (D)
guide-entry-spacelaw-groups-hostileagent = Hostiles (H)
guide-entry-spacelaw-groups-negligence = Negligence (N)
guide-entry-spacelaw-groups-psionics = Psionics (E)
guide-entry-spacelaw-groups-rioting = Rioting (R)
guide-entry-spacelaw-groups-sabotage = Sabotage (S)
guide-entry-spacelaw-groups-thievery = Thievery (F)
guide-entry-spacelaw-groups-trespassing = Trespassing (T)
guide-entry-spacelaw-groups-ungrouped = Ungrouped
20 changes: 10 additions & 10 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge
# - CrimeAssistCartridge # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge
- NanoChatCartridge

Expand Down Expand Up @@ -525,7 +525,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge
# - CrimeAssistCartridge # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge
- NanoChatCartridge

Expand Down Expand Up @@ -889,7 +889,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge # DeltaV
# - CrimeAssistCartridge # DeltaV # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge # DeltaV: SecWatch replaces WantedList
- LogProbeCartridge
- NanoChatCartridge # DeltaV
Expand All @@ -913,7 +913,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge
# - CrimeAssistCartridge # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge
- NanoChatCartridge

Expand All @@ -936,7 +936,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge
# - CrimeAssistCartridge # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge
- NanoChatCartridge

Expand All @@ -958,7 +958,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge
# - CrimeAssistCartridge # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge
- NanoChatCartridge

Expand Down Expand Up @@ -1178,7 +1178,7 @@
- NotekeeperCartridge
- NewsReaderCartridge
- MedTekCartridge
- CrimeAssistCartridge
# - CrimeAssistCartridge # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge

- type: entity
Expand Down Expand Up @@ -1299,7 +1299,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge # DeltaV
# - CrimeAssistCartridge # DeltaV # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge # DeltaV: SecWatch replaces WantedList
- LogProbeCartridge
- NanoChatCartridge # DeltaV
Expand Down Expand Up @@ -1330,7 +1330,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge # DeltaV
# - CrimeAssistCartridge # DeltaV # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge # DeltaV: SecWatch replaces WantedList
- NanoChatCartridge # DeltaV

Expand Down Expand Up @@ -1429,7 +1429,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge
# - CrimeAssistCartridge # Goobstation removing in favor of GS14 Space Law
- SecWatchCartridge
- NanoChatCartridge

Expand Down
69 changes: 35 additions & 34 deletions Resources/Prototypes/Guidebook/rules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -424,37 +424,38 @@
priority: 10
text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml"

- type: guideEntry
id: SpaceLaw
name: guide-entry-rules-space-law
priority: 60
text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml"
children:
- SpaceLawControlledSubstances
- SpaceLawRestrictedGear
- SpaceLawRestrictedWeapons
- SpaceLawCrimeList

- type: guideEntry
id: SpaceLawControlledSubstances
name: guide-entry-rules-sl-controlled-substances
priority: 20
text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml"

- type: guideEntry
id: SpaceLawRestrictedGear
name: guide-entry-rules-sl-restricted-gear
priority: 30
text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml"

- type: guideEntry
id: SpaceLawRestrictedWeapons
name: guide-entry-rules-sl-restricted-weapons
priority: 40
text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml"

- type: guideEntry
id: SpaceLawCrimeList
name: guide-entry-rules-sl-crime-list
priority: 50
text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml"
### ! Commented out and removed in favor of using new GS14 Space Law
# - type: guideEntry
# id: SpaceLaw
# name: guide-entry-rules-space-law
# priority: 60
# text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml"
# children:
# - SpaceLawControlledSubstances
# - SpaceLawRestrictedGear
# - SpaceLawRestrictedWeapons
# - SpaceLawCrimeList

# - type: guideEntry
# id: SpaceLawControlledSubstances
# name: guide-entry-rules-sl-controlled-substances
# priority: 20
# text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml"

# - type: guideEntry
# id: SpaceLawRestrictedGear
# name: guide-entry-rules-sl-restricted-gear
# priority: 30
# text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml"

# - type: guideEntry
# id: SpaceLawRestrictedWeapons
# name: guide-entry-rules-sl-restricted-weapons
# priority: 40
# text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml"

# - type: guideEntry
# id: SpaceLawCrimeList
# name: guide-entry-rules-sl-crime-list
# priority: 50
# text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml"
2 changes: 1 addition & 1 deletion Resources/Prototypes/Guidebook/ss14.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: guide-entry-ss14
text: "/ServerInfo/Guidebook/SpaceStation14.xml"
children:
- SpaceLaw
# - SpaceLaw # Goobstation - Removing in favor of GS14 Space Law
- Controls
- Jobs
- Survival
Expand Down
Loading
Loading