diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 00782996f9f..c68d3010654 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -73,6 +73,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List acc "Security", "Service", "Theatre", + "Orders", // DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml }; [Serializable, NetSerializable] diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index cfe7e9b2523..14f5ef9c6fe 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -121,3 +121,39 @@ Entries: Officers. id: 19 time: '2023-09-27T22:51:15.0000000+00:00' +- author: FluffiestFloof + changes: + - type: Tweak + message: Give back all the jobs their proper time requirements. + id: 20 + time: '2023-09-28T14:49:00.0000000+00:00' +- author: FluffiestFloof + changes: + - type: Remove + message: The Senior Roles are no longer available at round start. + id: 21 + time: '2023-09-28T16:55:32.0000000+00:00' +- author: FluffiestFloof + changes: + - type: Remove + message: Remove Ian as a traitor objective. + id: 22 + time: '2023-09-28T17:01:47.0000000+00:00' +- author: leonardo-dabepis + changes: + - type: Tweak + message: Bees can now be put in inventory and ground up as a ingredient. + id: 23 + time: '2023-09-28T17:52:22.0000000+00:00' +- author: JJ + changes: + - type: Add + message: Added Grilled Cheese. + id: 24 + time: '2023-09-28T17:53:04.0000000+00:00' +- author: DebugOk + changes: + - type: Tweak + message: Approving cargo orders now requires the Orders access level + id: 25 + time: '2023-09-28T18:16:02.0000000+00:00' diff --git a/Resources/Locale/en-US/deltav/catalog/fills/armory-crates.ftl b/Resources/Locale/en-US/deltav/catalog/fills/armory-crates.ftl deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl new file mode 100644 index 00000000000..93e757d77a9 --- /dev/null +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -0,0 +1 @@ +id-card-access-level-orders = Orders diff --git a/Resources/Locale/en-US/deltav/catalog/cargo/cargo-armory.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-armory.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/catalog/cargo/cargo-armory.ftl rename to Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-armory.ftl diff --git a/Resources/Locale/en-US/deltav/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/catalog/cargo/cargo-vending.ftl rename to Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl diff --git a/Resources/Locale/en-US/deltav/catalog/armory-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/armory-crates.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/catalog/armory-crates.ftl rename to Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/armory-crates.ftl diff --git a/Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl rename to Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl index 5591e8dfa0d..32d9389d223 100644 --- a/Resources/Locale/en-US/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/job/job-supervisors.ftl @@ -7,9 +7,9 @@ job-supervisors-cmo = the chief medical officer job-supervisors-rd = the research director job-supervisors-qm = the head of logistics job-supervisors-service = chefs, botanists, the bartender, and the head of personnel -job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer -job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer -job-supervisors-security = security officers, the senior officer, the warden, and the head of security -job-supervisors-science = scientists, the senior researcher, and the research director +job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer +job-supervisors-medicine = medical doctors, chemists, and the chief medical officer +job-supervisors-security = security officers, the warden, and the head of security +job-supervisors-science = scientists, and the research director job-supervisors-hire = whoever hires you job-supervisors-everyone = absolutely everyone diff --git a/Resources/Locale/en-US/nyanotrasen/prototypes/access/accesses.ftl b/Resources/Locale/en-US/nyanotrasen/prototypes/access/accesses.ftl new file mode 100644 index 00000000000..f6e52207065 --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/prototypes/access/accesses.ftl @@ -0,0 +1 @@ +id-card-access-level-mail = Mail diff --git a/Resources/Prototypes/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml index 5854a963658..dfcfcd10f78 100644 --- a/Resources/Prototypes/Access/cargo.yml +++ b/Resources/Prototypes/Access/cargo.yml @@ -17,3 +17,4 @@ - Salvage - Cargo - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml + - Orders # Delta V - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 744364d19a4..39384f6f3b8 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -31,4 +31,5 @@ - Hydroponics - Atmospherics - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml + - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml - Paramedic # DeltaV - Add Paramedic access diff --git a/Resources/Prototypes/DeltaV/Access/cargo.yml b/Resources/Prototypes/DeltaV/Access/cargo.yml new file mode 100644 index 00000000000..72ba1da7850 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Access/cargo.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: Orders + name: id-card-access-level-orders # Custom access level that allows the approval of orders diff --git a/Resources/Prototypes/DeltaV/Entities/Consumable/Food/meals.yml b/Resources/Prototypes/DeltaV/Entities/Consumable/Food/meals.yml new file mode 100644 index 00000000000..66ea74189f8 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Consumable/Food/meals.yml @@ -0,0 +1,22 @@ +- type: entity + name: grilled cheese + parent: FoodMealBase + id: FoodMealGrilledCheese + description: Two slices of bread cooked in butter with a lofty wedge of cheese in the middle. + components: + - type: FlavorProfile + flavors: + - butter + - cheesy + - type: Sprite + sprite: DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi + state: grilledcheese + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml new file mode 100644 index 00000000000..a64617c0478 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml @@ -0,0 +1,9 @@ +- type: microwaveMealRecipe + id: RecipeGrilledCheese + name: grilled cheese + result: FoodMealGrilledCheese + time: 10 + solids: + FoodBreadPlainSlice: 2 + FoodCheeseSlice: 1 + FoodButter: 1 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index c91bb37bd0b..170d5e242ba 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -113,6 +113,16 @@ price: 50 - type: Puller needsHands: true + - type: Item # DeltaV - Allow grabbing and storing bees in inventory + size: 5 + - type: Extractable # DeltaV - Make it so bees can be ground up + grindableSolutionName: bee + - type: SolutionContainerManager + solutions: + bee: + reagents: + - ReagentId: GroundBee + Quantity: 5 - type: entity name: bee diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 7a80ba37d89..82edc2be554 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -713,7 +713,7 @@ energy: 1.6 color: "#b89f25" - type: AccessReader - access: [["Cargo"]] + access: [["Orders"]] # DeltaV - see Resources/Prototypes/DeltaV/Access/cargo.yml - type: DeviceNetwork deviceNetId: Wireless receiveFrequencyId: BasicDevice diff --git a/Resources/Prototypes/Maps/aspid.yml b/Resources/Prototypes/Maps/aspid.yml index a6370b35e1b..7e568625a6f 100644 --- a/Resources/Prototypes/Maps/aspid.yml +++ b/Resources/Prototypes/Maps/aspid.yml @@ -33,26 +33,26 @@ #engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 2 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] StationEngineer: [ 2, 3 ] TechnicalAssistant: [ 4, 4 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Paramedic: [ 1, 1 ] Chemist: [ 1, 2 ] MedicalDoctor: [ 3, 3 ] MedicalIntern: [ 4, 4 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 3, 4 ] ResearchAssistant: [ 4, 4 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] Detective: [ 1, 1 ] SecurityOfficer: [ 3, 4 ] SecurityCadet: [ 4, 4 ] @@ -65,4 +65,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index ac462937606..5e9f5b54983 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -31,27 +31,27 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 3, 3 ] TechnicalAssistant: [ 4, 4 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 3 ] MedicalDoctor: [ 2, 2 ] Paramedic: [ 1, 1 ] MedicalIntern: [ 4, 4 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 4, 4 ] - ResearchAssistant: [ 4, 4 ] + ResearchAssistant: [ 4, 4 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index ddf217580be..54dda06e70e 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -30,13 +30,13 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 4, 4 ] TechnicalAssistant: [ 4, 4 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 3 ] MedicalDoctor: [ 3, 3 ] Paramedic: [ 1, 1 ] @@ -44,14 +44,14 @@ Psychologist: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 4, 4 ] - ResearchAssistant: [ 4, 4 ] + ResearchAssistant: [ 4, 4 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] @@ -65,4 +65,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 73d90122e1b..3d17435af6c 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -32,26 +32,26 @@ ServiceWorker: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 2 ] StationEngineer: [ 2, 2 ] TechnicalAssistant: [ 2, 2 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 1, 1 ] MedicalDoctor: [ 1, 1 ] MedicalIntern: [ 2, 2 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1 , 1 ] + # SeniorResearcher: [ 1 , 1 ] Scientist: [ 2, 2 ] ResearchAssistant: [ 2, 2 ] Borg: [ 1, 1 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] Detective: [ 1, 1 ] SecurityOfficer: [ 2, 2 ] SecurityCadet: [ 2, 2 ] @@ -64,4 +64,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 7fe3976f926..b28f0977ade 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -34,19 +34,19 @@ StationEngineer: [ 4, 4 ] AtmosphericTechnician: [ 2, 2 ] TechnicalAssistant: [ 2, 3 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] #medical ChiefMedicalOfficer: [ 1, 1 ] MedicalDoctor: [ 3, 4 ] Chemist: [ 2, 3 ] MedicalIntern: [ 2, 3 ] Paramedic: [ 1, 2 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] Scientist: [ 3, 4 ] ResearchAssistant: [ 2, 2 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] #security HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] @@ -54,7 +54,7 @@ Lawyer: [ 2, 2 ] SecurityCadet: [ 2, 2 ] Detective: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] #supply CargoTechnician: [ 3, 3 ] Quartermaster: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index e4891b05096..c83b564f795 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -34,19 +34,19 @@ StationEngineer: [ 2, 2 ] AtmosphericTechnician: [ 2, 2 ] TechnicalAssistant: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] #medical ChiefMedicalOfficer: [ 1, 1 ] MedicalDoctor: [ 1, 2 ] Chemist: [ 1, 2 ] MedicalIntern: [ 1, 1 ] Paramedic: [ 1, 2 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] Scientist: [ 1, 2 ] ResearchAssistant: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] #security HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 2, 2 ] @@ -54,7 +54,7 @@ Lawyer: [ 1, 1 ] SecurityCadet: [ 3, 3 ] Detective: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] #supply CargoTechnician: [ 3, 3 ] Quartermaster: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 91e6db642d1..0e74988205e 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -30,27 +30,27 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 4, 4 ] TechnicalAssistant: [ 4, 4 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 3, 3 ] MedicalDoctor: [ 5, 5 ] Paramedic: [ 2, 2 ] MedicalIntern: [ 4, 4 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 4, 4 ] - ResearchAssistant: [ 6, 6 ] + ResearchAssistant: [ 6, 6 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 7, 7 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] diff --git a/Resources/Prototypes/Maps/kettle.yml b/Resources/Prototypes/Maps/kettle.yml index 3e8cba3a224..ebadfe0fdda 100644 --- a/Resources/Prototypes/Maps/kettle.yml +++ b/Resources/Prototypes/Maps/kettle.yml @@ -33,25 +33,25 @@ #engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] StationEngineer: [ 4, 6 ] TechnicalAssistant: [ 8, 8 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 3 ] Paramedic: [ 2, 2 ] MedicalDoctor: [ 3, 5 ] MedicalIntern: [ 8, 8 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 4, 6 ] ResearchAssistant: [ 8, 8 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] Detective: [ 1, 1 ] SecurityOfficer: [ 4, 6 ] SecurityCadet: [ 8, 8 ] @@ -64,4 +64,4 @@ Clown: [ 1, 2 ] Mime: [ 1, 2 ] Musician: [ 1, 2 ] - + diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 7ce93794602..774d1eca450 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -31,27 +31,27 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 3, 3 ] TechnicalAssistant: [ 3, 3 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 3, 3 ] MedicalDoctor: [ 3, 3 ] MedicalIntern: [ 3, 3 ] Psychologist: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 3, 3 ] - ResearchAssistant: [ 3, 3 ] + ResearchAssistant: [ 3, 3 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 2128d9adbb4..83692439c1c 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -30,27 +30,27 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 4, 6 ] TechnicalAssistant: [ 3, 6 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 3, 3 ] MedicalDoctor: [ 4, 4 ] MedicalIntern: [ 3, 6 ] Paramedic: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 4, 6 ] - ResearchAssistant: [ 3, 6 ] + ResearchAssistant: [ 3, 6 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 4, 6 ] Detective: [ 1, 1 ] SecurityCadet: [ 3, 6 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index eb023c0b1fe..edaa00043f2 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -29,25 +29,25 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 2 ] StationEngineer: [ 2, 2 ] TechnicalAssistant: [ 2, 2 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 2 ] MedicalDoctor: [ 2, 2 ] MedicalIntern: [ 2, 2 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 3, 3 ] - ResearchAssistant: [ 2, 2 ] + ResearchAssistant: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 2e38e56064b..fac1658cfd7 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -31,13 +31,13 @@ ServiceWorker: [ 3, 4 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 5, 5 ] TechnicalAssistant: [ 2, 3 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 3 ] Paramedic: [ 1, 1 ] MedicalDoctor: [ 5, 5 ] @@ -45,14 +45,14 @@ MedicalIntern: [ 1, 2 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 5, 5 ] ResearchAssistant: [ 4, 4 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] Detective: [ 1, 1 ] SecurityOfficer: [ 6, 6 ] SecurityCadet: [ 2, 4 ] @@ -67,4 +67,4 @@ Musician: [ 2, 2 ] Boxer: [ 1, 1 ] Reporter: [ 1, 1 ] - + diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index d93d1ec7dd7..8fa55765034 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -29,26 +29,26 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] + # SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 2 ] StationEngineer: [ 3, 3 ] TechnicalAssistant: [ 3, 3 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 2 ] MedicalDoctor: [ 2, 2 ] MedicalIntern: [ 2, 2 ] Paramedic: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + # SeniorResearcher: [ 1, 1 ] Scientist: [ 3, 3 ] - ResearchAssistant: [ 2, 2 ] + ResearchAssistant: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index b41286688db..f6083a65cc8 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -31,25 +31,25 @@ #engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 2 ] - SeniorEngineer: [1, 1 ] + # SeniorEngineer: [1, 1 ] StationEngineer: [ 3, 3 ] TechnicalAssistant: [ 4, 4 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] + # SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 2 ] MedicalDoctor: [ 2, 2 ] MedicalIntern: [ 4, 4 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [1, 1 ] + # SeniorResearcher: [1, 1 ] Scientist: [ 3, 3 ] ResearchAssistant: [ 2, 2 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] + # SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] SecurityCadet: [ 4, 4 ] #supply @@ -61,4 +61,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + diff --git a/Resources/Prototypes/Nyanotrasen/Access/cargo.yml b/Resources/Prototypes/Nyanotrasen/Access/cargo.yml index 6c334209159..63571bf6e3e 100644 --- a/Resources/Prototypes/Nyanotrasen/Access/cargo.yml +++ b/Resources/Prototypes/Nyanotrasen/Access/cargo.yml @@ -1,3 +1,3 @@ - type: accessLevel id: Mail - name: Mail + name: id-card-access-level-mail diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml index 9741a6a7fa2..cadea794f16 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadMailCarrier - name: mail carrier's hat + name: courier's hat # Delta V - Mail Carrier to Courier replacement description: Smells like a good pension. components: - type: Sprite diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index 2cd087dd960..7a3944e257f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -36,7 +36,7 @@ - type: entity parent: ClothingOuterWinterCoat id: ClothingOuterWinterCoatMail - name: mail carrier's winter coat + name: courier's winter coat # Delta V - Mail Carrier to Courier replacement description: It'll keep away the cold but not the dogs. components: - type: Sprite diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml index 30683cbe08f..37578193bb0 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformMailCarrier - name: mail carrier's uniform + name: courier's uniform # Delta V - Mail Carrier to Courier replacement description: Enemy of dogs everywhere. components: - type: Sprite @@ -14,7 +14,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformSkirtMailCarrier - name: mail carrier's jumpskirt + name: courier's jumpskirt # Delta V - Mail Carrier to Courier replacement description: Enemy of dogs everywhere. components: - type: Sprite diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 01f3dd41094..6598a04c597 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -15,7 +15,7 @@ RDHardsuitStealObjective: 1 NukeDiskStealObjective: 1 MagbootsStealObjective: 1 - CorgiMeatStealObjective: 1 + # CorgiMeatStealObjective: 1 # DeltaV - Disable the horrible murder of Ian as an objective CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index e199f168a2e..e6013d9ef86 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -3,6 +3,7 @@ name: job-name-cargotech description: job-description-cargotech playTimeTracker: JobCargoTechnician + antagAdvantage: 2 # DeltaV - Reduced TC: External Access startingGear: CargoTechGear icon: "JobIconCargoTechnician" supervisors: job-supervisors-qm @@ -12,6 +13,7 @@ - External extendedAccess: - Salvage + - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml - type: startingGear id: CargoTechGear diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index c1eef300abc..645c2156391 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -3,6 +3,7 @@ name: job-name-qm description: job-description-qm playTimeTracker: JobQuartermaster + antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - !type:RoleTimeRequirement role: JobCargoTechnician @@ -10,6 +11,9 @@ - !type:RoleTimeRequirement role: JobSalvageSpecialist time: 10800 #3 hrs + - !type:RoleTimeRequirement # DeltaV - Courrier role time requirement + role: JobMailCarrier + time: 7200 # 2 hours - !type:DepartmentTimeRequirement department: Cargo time: 36000 #10 hours @@ -19,7 +23,7 @@ startingGear: QuartermasterGear icon: "JobIconQuarterMaster" supervisors: job-supervisors-captain - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Cargo - Salvage @@ -28,6 +32,7 @@ - Maintenance - External - Command + - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml - type: startingGear id: QuartermasterGear diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 924357bf53b..59010954db1 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,6 +3,7 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist + antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Free hardsuit and weapons requirements: - !type:DepartmentTimeRequirement department: Cargo diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index 23c70d79cc5..de9ff94d644 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -3,6 +3,9 @@ name: job-name-clown description: job-description-clown playTimeTracker: JobClown + requirements: + - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement + time: 60 # 60 seconds startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 34a3ac74ac3..a45d6025989 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -3,9 +3,13 @@ name: job-name-lawyer description: job-description-lawyer playTimeTracker: JobLawyer + antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access requirements: - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs + - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement + department: Security + time: 14400 # 4 hours startingGear: LawyerGear icon: "JobIconLawyer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 862a7c25a80..4c288b65194 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -5,7 +5,7 @@ playTimeTracker: JobMime requirements: - !type:OverallPlaytimeRequirement - time: 14400 #4 hrs + time: 7200 # DeltaV - 2 hours startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index e2956aa3947..2b0d3d28739 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,16 +6,21 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 54000 # 15 hours + time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Medical - time: 54000 # 15 hours + time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Security - time: 54000 # 15 hours + time: 18000 # DeltaV - 5 hours + - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement + department: Science + time: 18000 # 5 hours - !type:DepartmentTimeRequirement department: Command - time: 54000 # 15 hours + time: 108000 # DeltaV - 30 hours + - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement + time: 108000 # 30 hours weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index eda1b25f927..fcf48344eb6 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -3,25 +3,34 @@ name: job-name-hop description: job-description-hop playTimeTracker: JobHeadOfPersonnel + antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 36000 # 10 hours + time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Medical - time: 36000 # 10 hours + time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Security - time: 36000 # 10 hrs - - !type:DepartmentTimeRequirement - department: Command - time: 36000 # 10 hours + time: 18000 # DeltaV - 5 hours + - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement + department: Science + time: 18000 # 5 hours +# - !type:DepartmentTimeRequirement +# department: Command +# time: 36000 # 10 hours + - !type:DepartmentTimeRequirement # DeltaV - Civilian dept time requirement + department: Civilian + time: 10800 # 3 hours + - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement + time: 72000 # 20 hours weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" requireAdminNotify: true supervisors: job-supervisors-captain - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Command - HeadOfPersonnel diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 5c3f42693a4..c044af0ede6 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -3,10 +3,11 @@ name: job-name-atmostech description: job-description-atmostech playTimeTracker: JobAtmosphericTechnician + antagAdvantage: 10 # DeltaV - Reduced TC: External Access + Fireaxe + Free Hardsuit requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 54000 # 15 hrs + time: 28800 # DeltaV - 8 hours startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 713117b10b4..8532fafd724 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,15 +6,15 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobStationEngineer - time: 21600 #6 hrs + time: 14400 # DeltaV - 4 hours +# - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement +# role: JobStationEngineer +# time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Engineering - time: 36000 #10 hrs + time: 28800 # DeltaV - 8 hours - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 72000 # DeltaV - 20 hours weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index ba7eb3a9e83..c2cd832c58f 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -3,6 +3,7 @@ name: job-name-senior-engineer description: job-description-senior-engineer playTimeTracker: JobSeniorEngineer + setPreference: false # DeltaV - Disable Senior Roles round start selection requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index c77f79ccfcd..40f0b4c0caf 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -3,6 +3,7 @@ name: job-name-engineer description: job-description-engineer playTimeTracker: JobStationEngineer + antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering requirements: - !type:DepartmentTimeRequirement department: Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 0127be9cca6..c6fbc4c8b06 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -3,15 +3,16 @@ name: job-name-technical-assistant description: job-description-technical-assistant playTimeTracker: JobTechnicalAssistant + antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at engineering! + # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit + # department: Engineering + # time: 54000 #15 hrs + # inverted: true # stop playing intern if you're good at engineering! startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" supervisors: job-supervisors-engineering - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Maintenance - Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index a8bd80cf6e3..72a5f47be7c 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 14400 #4 hrs + time: 21600 # DeltaV - 6 hours startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 58b9b14e375..efd13196689 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -5,24 +5,25 @@ name: job-name-cmo description: job-description-cmo playTimeTracker: JobChiefMedicalOfficer + antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - !type:RoleTimeRequirement role: JobChemist time: 10800 #3 hrs - - !type:RoleTimeRequirement - role: JobMedicalDoctor - time: 21600 #6 hrs +# - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement +# role: JobMedicalDoctor +# time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Medical - time: 36000 #10 hrs + time: 43200 # DeltaV - 12 hours - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 72000 # DeltaV - 20 hours weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" requireAdminNotify: true supervisors: job-supervisors-captain - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Medical - Command diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 1b4ef7523c8..19e1f5088cf 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -4,14 +4,14 @@ description: job-description-intern playTimeTracker: JobMedicalIntern requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 54000 # 15 hrs - inverted: true # stop playing intern if you're good at med! + # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit + # department: Medical + # time: 54000 # 15 hrs + # inverted: true # stop playing intern if you're good at med! startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Medical - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 988bfc3c6b6..800360e99ec 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -3,12 +3,16 @@ name: job-name-paramedic description: job-description-paramedic playTimeTracker: JobParamedic + antagAdvantage: 2 # DeltaV - Reduced TC: External Access requirements: - - !type:RoleTimeRequirement - role: JobMedicalDoctor - time: 14400 #4 hrs - - !type:OverallPlaytimeRequirement - time: 54000 # 15 hrs + # - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement + # role: JobMedicalDoctor + # time: 14400 #4 hrs + - !type:DepartmentTimeRequirement # DeltaV - Medical dept time requirement + department: Medical + time: 14400 # DeltaV - 4 hours + # - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement + # time: 54000 # 15 hrs startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index ac49923eafb..db4c7ef835b 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -3,6 +3,7 @@ name: job-name-senior-physician description: job-description-senior-physician playTimeTracker: JobSeniorPhysician + setPreference: false # DeltaV - Disable Senior Roles round start selection requirements: - !type:RoleTimeRequirement role: JobChemist diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 03ef192be0b..d569fe3b45a 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -4,14 +4,14 @@ description: job-description-research-assistant playTimeTracker: JobResearchAssistant requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at science! + # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit + # department: Science + # time: 54000 #15 hrs + # inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Research - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index b5ad3292e90..150a7848506 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -3,12 +3,13 @@ name: job-name-rd description: job-description-rd playTimeTracker: JobResearchDirector + antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - !type:DepartmentTimeRequirement department: Science - time: 36000 #10 hrs + time: 43200 # DeltaV - 12 hours - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 72000 # DeltaV - 20 hours weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index 13375e271b7..da90ca0b590 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -3,6 +3,7 @@ name: job-name-senior-researcher description: job-description-senior-researcher playTimeTracker: JobSeniorResearcher + setPreference: false # DeltaV - Disable Senior Roles round start selection requirements: - !type:DepartmentTimeRequirement department: Science diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 00c971c2c69..9b6f0eebde7 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 54000 # 15 hours + time: 36000 # DeltaV - 10 hours startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 7b70149d961..5d06a3e0705 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,15 +6,21 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 10800 #3 hrs - - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 36000 #10 hrs + time: 36000 # DeltaV - 10 hours +# - !type:RoleTimeRequirement # DeltaV - No Security Officer time requirement +# role: JobSecurityOfficer +# time: 36000 #10 hrs - !type:DepartmentTimeRequirement department: Security - time: 108000 # 30 hrs + time: 36000 # DeltaV - 10 hours + - !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement + department: Command + time: 36000 # 10 hours + - !type:RoleTimeRequirement # DeltaV - Lawyer role time requirement + role: JobLawyer + time: 14400 # 4 hours - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 54000 # DeltaV - 15 hours weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 480a6e0b091..b6dc7777782 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -5,11 +5,11 @@ playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs - - !type:DepartmentTimeRequirement - department: Security - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at security! + time: 18000 # DeltaV - 5 hours +# - !type:DepartmentTimeRequirement # DeltaV - Removes time limit +# department: Security +# time: 54000 #15 hrs +# inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index e38256b8a1c..34c5932c740 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -6,7 +6,9 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 36000 #10 hrs + time: 18000 # DeltaV - 5 hours + - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement + time: 18000 # 5 hours startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index 5da1347e147..3a93d9a321b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -3,6 +3,7 @@ name: job-name-senior-officer description: job-description-senior-officer playTimeTracker: JobSeniorOfficer + setPreference: false # DeltaV - Disable Senior Roles round start selection requirements: - !type:RoleTimeRequirement role: JobWarden diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 53ba868dcf9..e2ea1ba76c1 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -4,9 +4,15 @@ description: job-description-warden playTimeTracker: JobWarden requirements: - - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 36000 #10 hrs +# - !type:RoleTimeRequirement # DeltaV - No SecurityOfficer time requirement +# role: JobSecurityOfficer +# time: 36000 #10 hrs + - !type:DepartmentTimeRequirement # DeltaV - Security time requirement + department: Security + time: 36000 # 10 hours + - !type:RoleTimeRequirement # DeltaV - Prisoner time requirement + role: JobPrisoner + time: 3600 # 1 hour startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/grilledcheese.png b/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/grilledcheese.png new file mode 100644 index 00000000000..baadc530b99 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/grilledcheese.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/inhand-left.png new file mode 100644 index 00000000000..4a1759cd2cc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/inhand-right.png new file mode 100644 index 00000000000..e2b38fab5c1 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/meta.json new file mode 100644 index 00000000000..1229ba1f4c8 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "rosysyntax", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "grilledcheese" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + } + ] +}