From 72b3debe1a82f44397e709c6d516a35d3aa7fa46 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Sun, 21 Dec 2025 12:35:41 -0600 Subject: [PATCH] Playtime format fixes. Other minor fixes. --- .../Body/Components/BrainComponent.cs | 3 - .../ghost/roles/ghost-role-component.ftl | 5 +- .../Entities/Markers/Spawners/ghost_roles.yml | 8 +- .../Mobs/Player/ShuttleRoles/settings.yml | 2 +- .../Entities/Mobs/NPCs/mutants.yml | 147 +----------------- .../Prototypes/_DV/CosmicCult/antagonists.yml | 2 +- .../Entities/Markers/Spawners/ghost_roles.yml | 36 ++--- .../reinforcement_teleporter.yml | 4 +- .../_DV/Roles/Antags/armsdealer.yml | 6 +- .../Prototypes/_DV/Roles/Antags/asakim.yml | 2 +- .../_DV/Roles/Antags/listening_post.yml | 8 +- .../_DV/Roles/Antags/menace_skeleton.yml | 2 +- .../Prototypes/_DV/Roles/Antags/recruiter.yml | 4 +- .../_DV/Roles/Antags/roboneuroticist.yml | 4 +- .../Prototypes/_DV/Roles/Antags/skia.yml | 2 +- .../_DV/Roles/Antags/synthesis_specialist.yml | 4 +- .../_DV/Roles/Jobs/Epistemics/roboticist.yml | 4 +- .../_DV/Roles/Jobs/Justice/chief_justice.yml | 8 +- .../_DV/Roles/Jobs/Justice/clerk.yml | 6 +- .../_DV/Roles/Jobs/Justice/prosecutor.yml | 4 +- .../_DV/Roles/Jobs/Medical/medical_borg.yml | 4 +- .../_DV/Roles/Jobs/Security/securityborg.yml | 4 +- .../_DV/Roles/Jobs/requirement_overrides.yml | 118 +++++++------- .../_Goobstation/Roles/Antags/devil.yml | 6 +- .../CorticalBorer/cortical_borer_species.yml | 4 +- .../Entities/Mobs/Ghostroles/Asakim/roles.yml | 2 +- 26 files changed, 124 insertions(+), 275 deletions(-) delete mode 100644 Content.Client/_Shitmed/Body/Components/BrainComponent.cs diff --git a/Content.Client/_Shitmed/Body/Components/BrainComponent.cs b/Content.Client/_Shitmed/Body/Components/BrainComponent.cs deleted file mode 100644 index 13c51a1a62..0000000000 --- a/Content.Client/_Shitmed/Body/Components/BrainComponent.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Content.Client._Shitmed.Body.Components; -[RegisterComponent] -public sealed partial class BrainComponent : Component { } diff --git a/Resources/Locale/en-US/nyanotrasen/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/nyanotrasen/ghost/roles/ghost-role-component.ftl index b999392b58..63b6396a0d 100644 --- a/Resources/Locale/en-US/nyanotrasen/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/nyanotrasen/ghost/roles/ghost-role-component.ftl @@ -1,5 +1,2 @@ ghost-role-information-giant-spider-vampire-name = Oneirophage -ghost-role-information-giant-spider-vampire-description = Nest. Lure. Ambush. Consume. - -ghost-role-information-cancer-mouse-name = Cancer Mouse -ghost-role-information-cancer-mouse-description = Make off color comments, but not so edgy that they break the rules of the server. +ghost-role-information-giant-spider-vampire-description = Nest. Lure. Ambush. Consume. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index 5191a2e213..c0ba233fcc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -117,10 +117,10 @@ - MindRoleLoneops requirements: # DeltaV - !type:OverallPlaytimeRequirement - time: 172800 # 48 hours overall + time: 48h - !type:DepartmentTimeRequirement department: Security - time: 36000 # 10 hours of sec + time: 10h - type: Sprite sprite: Markers/jobs.rsi layers: @@ -196,7 +196,7 @@ settings: default requirements: - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement - time: 259200 # DeltaV - 72 hours + time: 72h - type: Sprite sprite: Markers/jobs.rsi layers: @@ -322,7 +322,7 @@ settings: default requirements: - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement - time: 90000 # DeltaV - 25 hours + time: 25h - type: Sprite sprite: Markers/jobs.rsi layers: diff --git a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml index 6661cbee9e..4effcfd68d 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml @@ -17,7 +17,7 @@ settings: default requirements: # DeltaV - !type:OverallPlaytimeRequirement - time: 72000 # 20 hours + time: 20h - type: randomHumanoidSettings id: VisitorCaptain diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml index 83156b2026..6d4a16170a 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml @@ -134,149 +134,4 @@ # name: ghost-role-information-giant-spider-vampire-name # description: ghost-role-information-giant-spider-vampire-description # rules: No antagonist restrictions. Just don't talk in emote; you have telepathic chat. -# - type: GhostTakeoverAvailable - -- type: entity - parent: SimpleMobBase - id: MobMouseCancer - name: Cancer Mouse - description: Oh hey Civvie... - components: - - type: Sprite - drawdepth: SmallMobs - sprite: Mobs/Animals/mouse.rsi - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: mouse-0 - color: greenyellow - - type: DamageStateVisuals - states: - Alive: - Base: mouse-0 - Critical: - Base: dead-0 - Dead: - Base: splat-0 - - type: PointLight - color: greenyellow - - type: RadiationSource - intensity: 5 - slope: 0.5 - - type: Damageable - damageContainer: Biological - damageModifierSet: CancerMouse - - type: GhostRole - makeSentient: true - name: ghost-role-information-cancer-mouse-name - description: ghost-role-information-cancer-mouse-description - - type: GhostTakeoverAvailable - - type: CombatMode - - type: MovementSpeedModifier - baseWalkSpeed : 3.5 - baseSprintSpeed : 3.5 - - type: InputMover - - type: MobMover - - type: Reactive - groups: - Flammable: [Touch] - Extinguish: [Touch] - - type: Physics - bodyType: KinematicController - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.2 - density: 30 #Bulky by mouse standards... - mask: - - SmallMobMask - layer: - - SmallMobLayer - - type: MobState - - type: MobThresholds - thresholds: - 0: Alive - 40: Critical - 80: Dead - - type: Item - size: Normal - - type: Stamina - critThreshold: 80 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Weapons/bladeslice.ogg - angle: 0 - animation: WeaponArcClaw - damage: - types: - Slash: 5 - Piercing: 3 - - type: Body - prototype: Rat - requiredLegs: 1 # TODO: More than 1 leg - - type: Hunger # probably should be prototyped - thresholds: - Overfed: 200 - Okay: 150 - Peckish: 100 - Starving: 50 - Dead: 0 - baseDecayRate: 0.01666666666 - - type: Thirst - thresholds: - OverHydrated: 600 - Okay: 450 - Thirsty: 300 - Parched: 150 - Dead: 0 - baseDecayRate: 0.1 - - type: Appearance - - type: Puller - needsHands: false - - type: Vocal - sounds: - Male: Mouse - Female: Mouse - Unsexed: Mouse - wilhelmProbability: 0.001 - - type: Tag - tags: - - CannotSuicide - - DoorBumpOpener - - FootstepSound - - Recyclable - - type: NoSlip - - type: MobPrice - price: 100 # rat wealth - - type: FelinidFood - - type: CanEscapeInventory - - type: Extractable - grindableSolutionName: food - - type: Bloodstream - bloodReagent: Radium - bloodMaxVolume: 70 - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - ReagentId: Radium - Quantity: 70 - - type: Butcherable - spawned: - - id: FoodMeatRat - amount: 1 - - type: Grammar - attributes: - proper: true - gender: male - - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Common - - type: ActiveRadio - channels: - - Common +# - type: GhostTakeoverAvailable \ No newline at end of file diff --git a/Resources/Prototypes/_DV/CosmicCult/antagonists.yml b/Resources/Prototypes/_DV/CosmicCult/antagonists.yml index dec06ec408..20f3ea2495 100644 --- a/Resources/Prototypes/_DV/CosmicCult/antagonists.yml +++ b/Resources/Prototypes/_DV/CosmicCult/antagonists.yml @@ -6,7 +6,7 @@ objective: roles-antag-cosmiccult-description requirements: - !type:OverallPlaytimeRequirement - time: 86400 # 24h i really just want people to read the guidebook please please please + time: 24h # i really just want people to read the guidebook please please please guides: [ CosmicCult ] - type: antag diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml index cc84e41c58..497b92b09b 100644 --- a/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml @@ -52,16 +52,16 @@ - MindRoleListeningPost requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this. - !type:OverallPlaytimeRequirement - time: 259200 # 72 hours + time: 72h - !type:DepartmentTimeRequirement department: Security - time: 40000 # 11.1 hours + time: 11.1h - !type:DepartmentTimeRequirement department: Civilian - time: 40000 # 11.1 hours + time: 11.1h - !type:DepartmentTimeRequirement department: Command - time: 40000 # 11.1 hours + time: 11.1h - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -78,7 +78,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 3600 # 1 hour + time: 1h - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -93,10 +93,10 @@ - MindRoleRecruiter requirements: # keep in sync with the antag prototype - !type:OverallPlaytimeRequirement - time: 86400 # 24h so you probably know some general lore or something + time: 24h - !type:RoleTimeRequirement role: JobLawyer - time: 3600 # 1h as lawyer so you maybe know how to paperwork + time: 1h - type: Sprite layers: - state: green @@ -116,10 +116,10 @@ - MindRoleSynthesis requirements: # keep in sync with the antag prototype - !type:OverallPlaytimeRequirement - time: 86400 # 24h so you probably know some general lore or something + time: 24h - !type:RoleTimeRequirement role: JobChemist - time: 7200 # 2h chemist so you know how to make CH + time: 2h - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -134,10 +134,10 @@ - MindRoleRoboNeuroticist requirements: # keep in sync with the antag prototype - !type:OverallPlaytimeRequirement - time: 172800 # 48h evil big antag lots of playtime + time: 48h - !type:RoleTimeRequirement role: JobRoboticist - time: 7200 # 2h roboticist so you know how to make robot + time: 2h - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -153,7 +153,7 @@ - MindRoleMenaceSkeleton requirements: # keep in sync with the antag prototype - !type:OverallPlaytimeRequirement - time: 172800 # 48h + time: 48h - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -169,7 +169,7 @@ - MindRoleSkia requirements: # keep in sync with the antag prototype - !type:OverallPlaytimeRequirement - time: 172800 # 24h + time: 24h - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -182,13 +182,13 @@ rules: ghost-role-information-armsdealer-rules requirements: # keep in sync with the antag prototype - !type:OverallPlaytimeRequirement - time: 172800 # 48h overall (so you know some general lore and handling of the game) + time: 48h - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 43200 # 12h Securety Officer (so you know how to handle and use guns and such) + time: 12h - !type:DepartmentTimeRequirement department: Command - time: 43200 # 12h Command (so you know to handle the responsibility of an armsdealer) + time: 12h - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -201,7 +201,7 @@ rules: ghost-role-information-asakim-rules requirements: # keep in sync with the antag prototype - !type:OverallPlaytimeRequirement - time: 172800 # 48 hours, same reasoning as SRN + time: 48h - type: entity id: SpawnPointGhostIfrit @@ -218,7 +218,7 @@ department: Epistemics time: 14400 # 4 hours - !type:OverallPlaytimeRequirement - time: 172800 + time: 48h mindRoles: - MindRoleGhostRoleFamiliar raffle: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index 35f8e281ef..3b764b9e49 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -29,10 +29,10 @@ - type: GhostRole requirements: - !type:OverallPlaytimeRequirement - time: 86400 # 24 hours so you aren't a new player. + time: 24h - !type:DepartmentTimeRequirement department: Security - time: 21600 # 6 hours so you know how to use your kit. + time: 6h name: ghost-role-information-warden-nukeop-reinforcement-name description: ghost-role-information-warden-nukeop-reinforcement-description rules: ghost-role-information-warden-nukeop-reinforcement-rules diff --git a/Resources/Prototypes/_DV/Roles/Antags/armsdealer.yml b/Resources/Prototypes/_DV/Roles/Antags/armsdealer.yml index 8e18fb537b..5982090392 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/armsdealer.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/armsdealer.yml @@ -5,13 +5,13 @@ antagonist: true # Trading guns for your benefit and watch the chaos commence requirements: - !type:OverallPlaytimeRequirement - time: 172800 # 48h overall (so you know some general lore and handling of the game) + time: 48h - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 43200 # 12h Securety Officer (so you know how to handle and use guns and such) + time: 12h - !type:DepartmentTimeRequirement department: Command - time: 43200 # 12h Command (so you know to handle the responsibility of an armsdealer) + time: 12h - type: startingGear id: SyndicateArmsdealerGear diff --git a/Resources/Prototypes/_DV/Roles/Antags/asakim.yml b/Resources/Prototypes/_DV/Roles/Antags/asakim.yml index 3bb4a19578..2f277de60d 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/asakim.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/asakim.yml @@ -5,4 +5,4 @@ antagonist: true requirements: - !type:OverallPlaytimeRequirement - time: 172800 # 48 hours, same reasoning as SRN + time: 48h \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Roles/Antags/listening_post.yml b/Resources/Prototypes/_DV/Roles/Antags/listening_post.yml index d6b8adf194..03abd2abb6 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/listening_post.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/listening_post.yml @@ -6,13 +6,13 @@ # keep these in sync with the spawner requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this. - !type:OverallPlaytimeRequirement - time: 259200 # 72 hours + time: 72h - !type:DepartmentTimeRequirement department: Security - time: 40000 # 11.1 hours + time: 11.1h - !type:DepartmentTimeRequirement department: Civilian - time: 40000 # 11.1 hours + time: 11.1h - !type:DepartmentTimeRequirement department: Command - time: 40000 # 11.1 hours + time: 11.1h diff --git a/Resources/Prototypes/_DV/Roles/Antags/menace_skeleton.yml b/Resources/Prototypes/_DV/Roles/Antags/menace_skeleton.yml index 63794a8932..2e6c130532 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/menace_skeleton.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/menace_skeleton.yml @@ -5,7 +5,7 @@ antagonist: true requirements: - !type:OverallPlaytimeRequirement - time: 172800 # 48 hours overall + time: 48h - type: startingGear id: MenaceSkeletonGear diff --git a/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml b/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml index a2869b5798..add7760c8b 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml @@ -5,10 +5,10 @@ antagonist: false # you ask questions and write papers not kill people requirements: - !type:OverallPlaytimeRequirement - time: 86400 # 24h so you probably know some general lore or something + time: 24h - !type:RoleTimeRequirement role: JobLawyer - time: 3600 # 1h as lawyer so you maybe know how to paperwork + time: 1h - type: startingGear id: SyndicateRecruiterGear diff --git a/Resources/Prototypes/_DV/Roles/Antags/roboneuroticist.yml b/Resources/Prototypes/_DV/Roles/Antags/roboneuroticist.yml index 1b0296c002..6077cf5a0b 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/roboneuroticist.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/roboneuroticist.yml @@ -5,10 +5,10 @@ antagonist: true # making evil borgs requirements: - !type:OverallPlaytimeRequirement - time: 172800 # 48h evil big antag lots of playtime + time: 48h - !type:RoleTimeRequirement role: JobRoboticist - time: 7200 # 2h roboticist so you know how to make robot + time: 2h - type: startingGear id: RoboNeuroticistGear diff --git a/Resources/Prototypes/_DV/Roles/Antags/skia.yml b/Resources/Prototypes/_DV/Roles/Antags/skia.yml index c848d0b659..34574deb5d 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/skia.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/skia.yml @@ -5,4 +5,4 @@ antagonist: true requirements: - !type:OverallPlaytimeRequirement - time: 172800 # 48 hours overall + time: 48h \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml b/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml index 47907dcdac..0088163f48 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml @@ -5,10 +5,10 @@ antagonist: true # making poisions and shit on demand is evil requirements: - !type:OverallPlaytimeRequirement - time: 86400 # 24h so you probably know some general lore or something + time: 24h - !type:RoleTimeRequirement role: JobChemist - time: 7200 # 2h chemist so you know how to make CH + time: 2h - type: startingGear id: SyndicateSynthesisGear diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Epistemics/roboticist.yml b/Resources/Prototypes/_DV/Roles/Jobs/Epistemics/roboticist.yml index b68f40af32..4b5641f551 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Epistemics/roboticist.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Epistemics/roboticist.yml @@ -7,9 +7,9 @@ requirements: - !type:DepartmentTimeRequirement department: Epistemics - time: 14400 # 4 hours + time: 4h - !type:OverallPlaytimeRequirement - time: 43200 # 12 hours + time: 12h startingGear: RoboticistGear icon: JobIconRoboticist supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/_DV/Roles/Jobs/Justice/chief_justice.yml index 6ae60c389e..d8ca590424 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Justice/chief_justice.yml @@ -6,15 +6,15 @@ requirements: # - !type:RoleTimeRequirement # DeltaV - Comment out clerk time till more people have clerk time. Maybe a week or so. # role: JobClerk -# time: 36000 # DeltaV - 10 hours +# time: 10h - !type:RoleTimeRequirement role: JobLawyer - time: 36000 # 10 hours + time: 10h - !type:RoleTimeRequirement role: JobProsecutor - time: 36000 # 10 hours + time: 10h - !type:OverallPlaytimeRequirement - time: 90000 # 25 hours + time: 25h weight: 20 startingGear: CJGear icon: "JobIconChiefJustice" diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/_DV/Roles/Jobs/Justice/clerk.yml index 0ba9a4733b..28c9186039 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Justice/clerk.yml @@ -6,13 +6,13 @@ antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access requirements: - !type:OverallPlaytimeRequirement - time: 36000 # 10 hrs + time: 10h - !type:RoleTimeRequirement role: JobLawyer - time: 36000 # 10 hours + time: 10h - !type:RoleTimeRequirement role: JobProsecutor - time: 36000 # 10 hours + time: 10h startingGear: ClerkGear icon: "JobIconClerk" requireAdminNotify: true diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/_DV/Roles/Jobs/Justice/prosecutor.yml index 56509ac084..4177975725 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Justice/prosecutor.yml @@ -5,10 +5,10 @@ playTimeTracker: JobProsecutor requirements: - !type:OverallPlaytimeRequirement - time: 36000 # 10 hrs + time: 10h - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement department: Security - time: 21600 # 6 hours + time: 6h startingGear: ProsecutorGear icon: "JobIconProsecutor" supervisors: job-supervisors-cj diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Medical/medical_borg.yml b/Resources/Prototypes/_DV/Roles/Jobs/Medical/medical_borg.yml index 63ad8457dd..5dc9eeb73f 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Medical/medical_borg.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Medical/medical_borg.yml @@ -5,10 +5,10 @@ playTimeTracker: JobMedicalBorg requirements: - !type:OverallPlaytimeRequirement - time: 216000 #60 hrs + time: 60h - !type:DepartmentTimeRequirement department: Medical - time: 21600 #6 hrs + time: 6h canBeAntag: false icon: JobIconMedicalBorg supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Security/securityborg.yml b/Resources/Prototypes/_DV/Roles/Jobs/Security/securityborg.yml index 3fc0ceff14..ee957d3985 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Security/securityborg.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Security/securityborg.yml @@ -5,10 +5,10 @@ playTimeTracker: JobSecurityBorg requirements: - !type:OverallPlaytimeRequirement - time: 216000 #60 hrs + time: 60h - !type:DepartmentTimeRequirement department: Security - time: 72000 #20 hrs + time: 20h canBeAntag: false icon: JobIconSecurityBorg supervisors: job-supervisors-everyone diff --git a/Resources/Prototypes/_DV/Roles/Jobs/requirement_overrides.yml b/Resources/Prototypes/_DV/Roles/Jobs/requirement_overrides.yml index 981f954ea7..ccfc68d5eb 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/requirement_overrides.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/requirement_overrides.yml @@ -7,210 +7,210 @@ Bartender: - !type:DepartmentTimeRequirement department: Civilian - time: 3600 # 1 hour + time: 1h Boxer: - !type:OverallPlaytimeRequirement - time: 7200 # 2 hours + time: 2h Chef: - !type:DepartmentTimeRequirement department: Civilian - time: 3600 # 1 hour + time: 1h Clown: - !type:OverallPlaytimeRequirement - time: 7200 # 2 hours + time: 2h Librarian: - !type:OverallPlaytimeRequirement - time: 3600 # 1 hour + time: 1h Mime: - !type:OverallPlaytimeRequirement - time: 7200 # 2 hours + time: 2h Musician: - !type:OverallPlaytimeRequirement - time: 7200 # 2 hours + time: 2h Reporter: - !type:OverallPlaytimeRequirement - time: 7200 # 2 hours + time: 2h Zookeeper: - !type:OverallPlaytimeRequirement - time: 7200 # 2 hours + time: 2h # Command Captain: - !type:DepartmentTimeRequirement department: Logistics - time: 18000 # 5 hours + time: 5h - !type:DepartmentTimeRequirement department: Engineering - time: 18000 # 5 hours + time: 5h - !type:DepartmentTimeRequirement department: Medical - time: 18000 # 5 hours + time: 5h - !type:DepartmentTimeRequirement department: Security - time: 18000 # 5 hours + time: 5h - !type:DepartmentTimeRequirement department: Epistemics - time: 18000 # 5 hours + time: 5h - !type:DepartmentTimeRequirement department: Command - time: 108000 # 30 hours + time: 30h ChiefEngineer: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 72000 # 20 hours + time: 20h - !type:DepartmentTimeRequirement department: Engineering - time: 108000 # 30 hours + time: 30h ChiefMedicalOfficer: - !type:RoleTimeRequirement role: JobChemist - time: 21600 # 6 hours + time: 6h - !type:RoleTimeRequirement role: JobSurgeon - time: 10800 # 3 hrs + time: 3h - !type:RoleTimeRequirement role: JobMedicalDoctor - time: 43200 # 12 hours + time: 12h - !type:DepartmentTimeRequirement department: Medical - time: 126000 # 35 hours + time: 35h HeadOfPersonnel: - !type:RoleTimeRequirement role: JobChef - time: 14400 # 4 hours + time: 4h - !type:RoleTimeRequirement role: JobBartender - time: 14400 # 4 hours + time: 4h - !type:RoleTimeRequirement role: JobJanitor - time: 14400 # 4 hours + time: 4h - !type:DepartmentTimeRequirement department: Civilian - time: 72000 # 20 hours + time: 20h - !type:OverallPlaytimeRequirement - time: 90000 # 25 hours + time: 25h HeadOfSecurity: - !type:DepartmentTimeRequirement department: Security - time: 72000 # 20 hours + time: 20h - !type:RoleTimeRequirement role: JobWarden - time: 36000 # 10 hours + time: 10h - !type:DepartmentTimeRequirement department: Command - time: 36000 # 10 hours + time: 10h - !type:OverallPlaytimeRequirement - time: 90000 # 25 hours + time: 25h ResearchDirector: # (MG) - !type:RoleTimeRequirement role: JobForensicMantis - time: 7200 # 2 hours + time: 2h - !type:DepartmentTimeRequirement department: Epistemics - time: 90000 # 25 hours + time: 25h # Engineering AtmosphericTechnician: - !type:DepartmentTimeRequirement department: Engineering - time: 36000 # 10 hours + time: 10h TechnicalAssistant: - !type:OverallPlaytimeRequirement - time: 7200 # 2 hours + time: 2h # Epistemics Chaplain: - !type:DepartmentTimeRequirement department: Epistemics - time: 14400 # 4 hours + time: 4h ResearchAssistant: - !type:OverallPlaytimeRequirement - time: 3600 # 1 hour + time: 1h Scientist: - !type:DepartmentTimeRequirement department: Epistemics - time: 14400 # 4 hours + time: 4h # Justice Lawyer: # (Attorney) - !type:OverallPlaytimeRequirement - time: 36000 # 10 hours + time: 10h - !type:DepartmentTimeRequirement department: Security - time: 14400 # 4 hours + time: 4h # Logistics Quartermaster: # (LO) - !type:RoleTimeRequirement role: JobCargoTechnician - time: 21600 # 6 hours + time: 6h - !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 10800 # 3 hours + time: 3h - !type:RoleTimeRequirement role: JobCourier - time: 7200 # 2 hours + time: 2h - !type:DepartmentTimeRequirement department: Logistics - time: 90000 # 25 hours + time: 25h - !type:OverallPlaytimeRequirement - time: 144000 # 40 hours + time: 40h SalvageSpecialist: - !type:DepartmentTimeRequirement department: Logistics - time: 21600 # 6 hours + time: 6h CargoTechnician: - !type:DepartmentTimeRequirement department: Logistics - time: 21600 # 6 hours + time: 6h # Medical Chemist: - !type:DepartmentTimeRequirement department: Medical - time: 28800 # 8 hours + time: 8h MedicalIntern: - !type:OverallPlaytimeRequirement - time: 3600 # 1 hour + time: 1h Paramedic: - !type:DepartmentTimeRequirement department: Medical - time: 28800 # 8 hours + time: 8h Psychologist: - !type:OverallPlaytimeRequirement - time: 36000 # 10 hours + time: 10h - !type:DepartmentTimeRequirement department: Medical - time: 14400 # 4 hours + time: 4h MedicalDoctor: - !type:DepartmentTimeRequirement department: Medical - time: 25200 # 7 hours + time: 7h # Security Detective: - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 21600 # 6 hours + time: 6h SecurityCadet: - !type:OverallPlaytimeRequirement - time: 21600 # 6 hours + time: 6h SecurityOfficer: - !type:DepartmentTimeRequirement department: Security - time: 36000 # 10 hours + time: 10h Warden: - !type:RoleTimeRequirement # Make them experienced in proper officer work. role: JobSecurityOfficer - time: 36000 # 10 hours + time: 10h - !type:RoleTimeRequirement # Give them an understanding of basic forensics. role: JobDetective - time: 21600 # 6 hours + time: 6h antags: NukeopsMedic: - !type:RoleTimeRequirement # They should be able to make advanced brutes + pyra quickly role: JobChemist - time: 36000 # 10 hours + time: 10h - !type:RoleTimeRequirement # Give them a good understanding of how medical works role: JobMedicalDoctor - time: 7200 # 2 hours (+ the time it takes to unlock medical doctor) + time: 2h diff --git a/Resources/Prototypes/_Goobstation/Roles/Antags/devil.yml b/Resources/Prototypes/_Goobstation/Roles/Antags/devil.yml index 23961ac9f3..3ecb06bd46 100644 --- a/Resources/Prototypes/_Goobstation/Roles/Antags/devil.yml +++ b/Resources/Prototypes/_Goobstation/Roles/Antags/devil.yml @@ -13,13 +13,13 @@ guides: [ Devil ] requirements: - !type:OverallPlaytimeRequirement - time: 108000 # 30h + time: 30h - !type:DepartmentTimeRequirement department: Command - time: 18000 # 5 hours + time: 5h - !type:RoleTimeRequirement role: JobLawyer - time: 3600 # 1 Hour + time: 1h - type: startingGear id: DevilStartingGear diff --git a/Resources/Prototypes/_Mono/CorticalBorer/cortical_borer_species.yml b/Resources/Prototypes/_Mono/CorticalBorer/cortical_borer_species.yml index a3a3efd3e8..230a789a53 100644 --- a/Resources/Prototypes/_Mono/CorticalBorer/cortical_borer_species.yml +++ b/Resources/Prototypes/_Mono/CorticalBorer/cortical_borer_species.yml @@ -19,7 +19,7 @@ allowMovement: true requirements: - !type:OverallPlaytimeRequirement - time: 36000 # 10 hrs + time: 10h name: cortical-borer-ghostrole-name description: cortical-borer-ghostrole-desc rules: ghost-role-information-freeagent-rules @@ -126,7 +126,7 @@ rules: ghost-role-information-freeagent-rules requirements: - !type:OverallPlaytimeRequirement - time: 36000 # 10 hrs + time: 10h mindRoles: - MindRoleGhostRoleFreeAgent - type: GhostRoleMobSpawner diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Ghostroles/Asakim/roles.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Ghostroles/Asakim/roles.yml index 50d9e3be42..ea5e221383 100644 --- a/Resources/Prototypes/_Mono/Entities/Mobs/Ghostroles/Asakim/roles.yml +++ b/Resources/Prototypes/_Mono/Entities/Mobs/Ghostroles/Asakim/roles.yml @@ -25,7 +25,7 @@ settings: default requirements: - !type:OverallPlaytimeRequirement - time: 172800 # DeltaV - 48 hours, sync with antag + time: 48h mindRoles: # DeltaV - MindRoleAsakim - type: GhostTakeoverAvailable