Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@xtray85
xtray85 committed Oct 21, 2023
1 parent b105590 commit d80ef97
Show file tree
Hide file tree
Showing 50 changed files with 88 additions and 101 deletions.
1 change: 0 additions & 1 deletion Content.Server/ADT/Lizard/LizardBloodSystem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public sealed class LizardBloodSystem : EntitySystem
[Dependency] private readonly SleepingSystem _sleepingSystem = default!;
[Dependency] private readonly ChemistrySystem _chemistry = default!;
[Dependency] private readonly BloodstreamSystem _bloodstream = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
[Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
[Dependency] private readonly ReactiveSystem _reactive = default!;

Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_kasha.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- type: SolutionContainerManager
solutions:
food:
maxvol: 12
maxVol: 12
reagents:
- ReagentId: Nutriment
Quantity: 8
Expand All @@ -40,7 +40,7 @@
- type: SolutionContainerManager
solutions:
food:
maxvol: 12
maxVol: 12
reagents:
- ReagentId: Nutriment
Quantity: 8
Expand All @@ -67,7 +67,7 @@
- type: SolutionContainerManager
solutions:
food:
maxvol: 40
maxVol: 40
reagents:
- ReagentId: Nutriment
Quantity: 18
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/ADT/Lixon/PilotSB.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
belt: ClothingBeltSecurityFilled
Hands: ClothingHandsGlovesFingerless
pocket2: ClothingOuterWinterSec
innerclothingskirt: ClothingUniformJumpskirtSec
innerClothingSkirt: ClothingUniformJumpskirtSec
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/ADT/Roles/Jobs/Civilian/bartender.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ADTClothingUniformNewBarmanSkirt
innerClothingSkirt: ADTClothingUniformNewBarmanSkirt
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/ADT/Roles/Jobs/Civilian/service_worker.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ADTClothingUniformNewServiceSuit
innerClothingSkirt: ADTClothingUniformNewServiceSuit
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/ADT/Roles/Jobs/Magistrate/Magistrate.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
neck: ClothingNeckLawyerbadge
pocket1: RubberStampMagistrat
pocket2: ADTtelescopicBaton
innerclothingskirt: ClothingUniformJumpsuitLawyerBlack
innerClothingSkirt: ClothingUniformJumpsuitLawyerBlack
satchel: ClothingBackpackSatchel
duffelbag: ClothingBackpackDuffel

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/ADT/Roles/Jobs/Medical/virusolog.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
ears: ClothingHeadsetMedical
belt: ClothingBeltMedical
# the purple glasses?
innerclothingskirt: ClothingUniformJumpskirtColorWhite
innerClothingSkirt: ClothingUniformJumpskirtColorWhite
satchel: ClothingBackpackSatchelMedicalFilled
duffelbag: ClothingBackpackDuffelMedicalFilled

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/ADT/Roles/Jobs/SecInvestigator/investigator.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ADTClothingUniformInvestigatorSuit
innerClothingSkirt: ADTClothingUniformInvestigatorSuit
satchel: ADTClothingBackpackSatchelInvestigatorFilled
duffelbag: ADTClothingBackpackDuffelInvestigatorFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- type: SolutionContainerManager
solutions:
food:
maxvol: 30
maxVol: 30
reagents:
- ReagentId: Nutriment
Quantity: 10
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
eyes: ClothingEyesGlassesSunglasses
ears: ClothingHeadsetIAA
neck: ClothingNeckLawyerbadge
innerclothingskirt: ClothingUniformJumpskirtLawyerBlack
innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack
satchel: ClothingBackpackSatchelIAAFilled
duffelbag: ClothingBackpackDuffelIAAFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtCargo
innerClothingSkirt: ClothingUniformJumpskirtCargo
satchel: ClothingBackpackSatchelCargoFilled
duffelbag: ClothingBackpackDuffelCargoFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@
underwearb: ClothingUnderwearBottomBoxersQM # Sirena-Underwear
underweart: ClothingUnderwearTopBraQM # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesQM # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtQM
innerClothingSkirt: ClothingUniformJumpskirtQM
satchel: ClothingBackpackSatchelQuartermasterFilled
duffelbag: ClothingBackpackDuffelQuartermasterFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtColorGrey
innerClothingSkirt: ClothingUniformJumpskirtColorGrey
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtBartender
innerClothingSkirt: ClothingUniformJumpskirtBartender
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtHydroponics
innerClothingSkirt: ClothingUniformJumpskirtHydroponics
satchel: ClothingBackpackSatchelHydroponicsFilled
duffelbag: ClothingBackpackDuffelHydroponicsFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtChaplain
innerClothingSkirt: ClothingUniformJumpskirtChaplain
satchel: ClothingBackpackSatchelChaplainFilled
duffelbag: ClothingBackpackDuffelChaplainFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtChef
innerClothingSkirt: ClothingUniformJumpskirtChef
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtJanitor
innerClothingSkirt: ClothingUniformJumpskirtJanitor
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

Expand All @@ -43,6 +43,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtJanimaid
innerClothingSkirt: ClothingUniformJumpskirtJanimaid
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
inhand:
right hand: BriefcaseBrownFilled
innerclothingskirt: ClothingUniformJumpskirtLibrarian # Corvax-Resprite
- BriefcaseBrownFilled
innerClothingSkirt: ClothingUniformJumpskirtLibrarian # Corvax-Resprite
satchel: ClothingBackpackSatchelLibrarianFilled
duffelbag: ClothingBackpackDuffelLibrarianFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtMime
innerClothingSkirt: ClothingUniformJumpskirtMime
satchel: ClothingBackpackSatchelMimeFilled
duffelbag: ClothingBackpackDuffelMimeFilled

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtBartender
innerClothingSkirt: ClothingUniformJumpskirtBartender
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Command/captain.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
underwearb: ClothingUnderwearBottomBoxersCap # Sirena-Underwear
underweart: ClothingUnderwearTopBraCap # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesCap # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtCaptain
innerClothingSkirt: ClothingUniformJumpskirtCaptain
satchel: ClothingBackpackSatchelCaptainFilled
duffelbag: ClothingBackpackDuffelCaptainFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@
underwearb: ClothingUnderwearBottomBoxersHOP # Sirena-Underwear
underweart: ClothingUnderwearTopBraHOP # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesHOP # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtHoP
innerClothingSkirt: ClothingUniformJumpskirtHoP
satchel: ClothingBackpackSatchelHOPFilled
duffelbag: ClothingBackpackDuffelHOPFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtAtmos
innerClothingSkirt: ClothingUniformJumpskirtAtmos
satchel: ClothingBackpackSatchelAtmosphericsFilled
duffelbag: ClothingBackpackDuffelAtmosphericsFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@
eyes: ClothingEyesGlassesMeson
ears: ClothingHeadsetCE
belt: ClothingBeltChiefEngineerFilled
innerclothingskirt: ClothingUniformJumpskirtChiefEngineer
innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer
satchel: ClothingBackpackSatchelChiefEngineerFilled
duffelbag: ClothingBackpackDuffelChiefEngineerFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtEngineering
innerClothingSkirt: ClothingUniformJumpskirtEngineering
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtColorYellow
innerClothingSkirt: ClothingUniformJumpskirtColorYellow
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtColorBlack
innerClothingSkirt: ClothingUniformJumpskirtColorBlack
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

Expand All @@ -30,6 +30,6 @@
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
innerclothingskirt: ClothingUniformJumpskirtColorBlack
innerClothingSkirt: ClothingUniformJumpskirtColorBlack
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
Loading

0 comments on commit d80ef97

Please sign in to comment.