diff --git a/Content.Shared/DeltaV/CCVars/DCCVars.cs b/Content.Shared/DeltaV/CCVars/DCCVars.cs index 89a14275be..c9d0281845 100644 --- a/Content.Shared/DeltaV/CCVars/DCCVars.cs +++ b/Content.Shared/DeltaV/CCVars/DCCVars.cs @@ -14,5 +14,5 @@ public sealed class DCCVars /// Its not perfect, but gets the job done. /// public static readonly CVarDef RoundEndPacifist = - CVarDef.Create("game.round_end_pacifist", false, CVar.SERVERONLY); + CVarDef.Create("game.round_end_pacifist", true, CVar.SERVERONLY); } diff --git a/Resources/Locale/ru-RU/_LostParadise/rifles.ftl b/Resources/Locale/ru-RU/_LostParadise/rifles.ftl index 05851af5e8..e1d3ef3347 100644 --- a/Resources/Locale/ru-RU/_LostParadise/rifles.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/rifles.ftl @@ -3,6 +3,6 @@ ent-LPPWeaponRifleFNFAL = FN FAL ent-LPPWeaponRifleARG = винтовка ARG .desc = Дешевая винтовка, прошла через множество конфликтов. Использует винтовочные патроны .30 калибра. ent-LPPWeaponRifleBraton = брейтон - .desc = Автомат созданный по забытым технологиям из альтернативных реальностей. Использует патроны калибра .30 винтовочные. + .desc = Автомат созданный по забытым технологиям из альтернативных реальностей. Использует патроны калибра .20 винтовочные. ent-LPPWeaponRifleHM10 = HM-10 .desc = Автомат спецназа старого образца, сейчас не так сильно актуален, но все еще лучше стандартных современных аналогов. Использует патроны калибра .20 винтовочные. diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml index 1926992b69..2d6a1c8ee5 100644 --- a/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml +++ b/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml @@ -30,24 +30,6 @@ conditions: - !type:EntityAnchored {} steps: - - tag: NormalityCrystal - icon: - sprite: Nyanotrasen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Nyanotrasen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Nyanotrasen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - tag: NormalityCrystal icon: sprite: Nyanotrasen/Objects/Materials/materials.rsi diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index d826a85af1..fcd470898a 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -5,6 +5,9 @@ playTimeTracker: JobQuartermaster antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: + - !type:CharacterAgeRequirement + min: 25 + max: 80 # - !type:RoleTimeRequirement #DeltaV # role: JobCargoTechnician # time: 21600 #6 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index ae12bc635d..448ba195a6 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -4,6 +4,9 @@ description: job-description-ce playTimeTracker: JobChiefEngineer requirements: + - !type:CharacterAgeRequirement + min: 25 + max: 80 - !type:CharacterPlaytimeRequirement tracker: JobAtmosphericTechnician min: 36000 # DeltaV - 10 hours diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 1c03a009f6..db98d74736 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -7,6 +7,9 @@ playTimeTracker: JobChiefMedicalOfficer antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: + - !type:CharacterAgeRequirement + min: 25 + max: 80 - !type:CharacterPlaytimeRequirement tracker: JobChemist min: 14400 #DeltaV 4 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 96d9b3f35b..9d137b7062 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -5,6 +5,9 @@ playTimeTracker: JobResearchDirector antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: + - !type:CharacterAgeRequirement + min: 25 + max: 80 - !type:CharacterDepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science min: 54000 # DeltaV - 15 hours diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml index 410b5106b0..a325dd6984 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml @@ -4,6 +4,9 @@ description: job-description-adjutant playTimeTracker: JobLPPАdjutant requirements: + - !type:CharacterAgeRequirement + min: 25 + max: 80 - !type:CharacterDepartmentTimeRequirement department: Engineering min: 36000 diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/black.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/black.rsi/equipped-UNDERWEAR.png index 168e20c8d6..d6e1a558bf 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/black.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/black.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/blue.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/blue.rsi/equipped-UNDERWEAR.png index 7e2e4f297d..63d25a10bf 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/blue.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/blue.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/boxers.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/boxers.rsi/equipped-UNDERWEAR.png index c23b142e27..ad340b26e1 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/boxers.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/boxers.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/brown.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/brown.rsi/equipped-UNDERWEAR.png index 3f5537cf5d..e4fe509008 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/brown.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/brown.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/green.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/green.rsi/equipped-UNDERWEAR.png index 80c68abe50..3dde631ddb 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/green.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/green.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/grey.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/grey.rsi/equipped-UNDERWEAR.png index 6d6c56f73d..4841674d79 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/grey.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/grey.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/lightpurple.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/lightpurple.rsi/equipped-UNDERWEAR.png index 1107c1ffc9..1a67181852 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/lightpurple.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/lightpurple.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/maroon.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/maroon.rsi/equipped-UNDERWEAR.png index fb6b04e899..c8087ae271 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/maroon.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/maroon.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/orange.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/orange.rsi/equipped-UNDERWEAR.png index e546a47692..89ef6f05fd 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/orange.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/orange.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/red.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/red.rsi/equipped-UNDERWEAR.png index 03142bd4e5..822da7ebb8 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/red.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/red.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/teal.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/teal.rsi/equipped-UNDERWEAR.png index 68527431d2..c360b1e1f2 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/teal.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/teal.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/yellow.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/yellow.rsi/equipped-UNDERWEAR.png index e50616c777..70f1459789 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/yellow.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Boxers/yellow.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Command/ce.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Command/ce.rsi/equipped-UNDERWEAR.png index d3fa89d091..280ab9554b 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Command/ce.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Command/ce.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Command/hop.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Command/hop.rsi/equipped-UNDERWEAR.png index 0ccac97cac..a3983a6084 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Command/hop.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Command/hop.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Command/hos.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Command/hos.rsi/equipped-UNDERWEAR.png index d4ac42f7b7..66e454d7e2 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Command/hos.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Command/hos.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/Command/qm.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/Command/qm.rsi/equipped-UNDERWEAR.png index 20093aa2c0..c54c842595 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/Command/qm.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/Command/qm.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/bee_shorts.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/bee_shorts.rsi/equipped-UNDERWEAR.png index 7075e6b2d1..3c6e131813 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/bee_shorts.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/bee_shorts.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_commie.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_commie.rsi/equipped-UNDERWEAR.png index f540c2db22..d64fb3467f 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_commie.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_commie.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_heart.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_heart.rsi/equipped-UNDERWEAR.png index 021af68699..a8bf30b136 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_heart.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_heart.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_striped.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_striped.rsi/equipped-UNDERWEAR.png index 3716c9d1fe..7632ee3c4e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_striped.rsi/equipped-UNDERWEAR.png and b/Resources/Textures/_LostParadise/Clothing/Underwear/boxers_striped.rsi/equipped-UNDERWEAR.png differ