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.

Sign up for GitHub

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

Fix roundstart janitor access, no maid smite #2392

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Fix roundstart janitor access, no maid smite #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c998528
Fix roundstart janitor access, no maid smite
whatston3 Nov 11, 2024
cca00ec
revert maid PDA change
whatston3 Nov 11, 2024
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
3 changes: 3 additions & 0 deletions Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,8 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
};
args.Verbs.Add(cluwne);

// Frontier: remove maid smite due to weird ID perms
/*
Verb maiden = new()
{
Text = "admin-smite-remove-gravity-name",
Expand All @@ -581,6 +583,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
Message = Loc.GetString("admin-smite-maid-description")
};
args.Verbs.Add(maiden);
*/
}

Verb angerPointingArrows = new()
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Objects/Devices/pda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@
id: JanitorPDA
name: janitor PDA
description: Smells like bleach.
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Pda
id: JanitorIDCard
Expand Down Expand Up @@ -1180,4 +1181,4 @@
insertSound: /Audio/Machines/id_insert.ogg
whitelist:
components:
- Cartridge
- Cartridge
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
parent: IDCardStandard
id: JanitorIDCard
name: janitor ID card
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Sprite
layers:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
gloves: ClothingHandsGlovesJanitor
head: ClothingHeadHatCatEars
ears: ClothingHeadsetService
belt: ClothingBeltJanitorFilled
belt: ClothingBeltJanitorFilled
7 changes: 7 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,13 @@
- state: default
- state: idvalet

- type: entity
parent: JanitorIDCard
id: NFJanitorIDCard
components:
- type: PresetIdCard
job: NFJanitor

- type: entity
parent: PassengerIDCard
id: ContractorIDCard
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,3 +498,11 @@
- type: Pda
id: ContractorIDCard
state: pda-clear

- type: entity
parent: JanitorPDA
id: NFJanitorPDA
components:
- type: Pda
id: NFJanitorIDCard
state: pda-janitor
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Roles/Jobs/Civilian/janitor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
id: NFJanitorGear
equipment:
shoes: ClothingShoesGaloshes
id: JanitorPDA
id: NFJanitorPDA
belt: ClothingBeltJanitorFilled
storage:
back:
Expand Down
Loading