From 3c1283a5ed723914c03af3e7ff3ee07fe8e732a1 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 22:38:41 +0200 Subject: [PATCH 01/11] basic stuff --- .../DeltaV/Entities/Mobs/Player/silicon.yml | 16 ++++++++++++++++ .../DeltaV/Roles/Jobs/Science/borg.yml | 12 ++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml new file mode 100644 index 00000000000..b034fac16f1 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml @@ -0,0 +1,16 @@ +- type: entity + id: PlayerBorgMedical + parent: BorgChassisMedical + suffix: Battery, Tools + components: + - type: ContainerFill + containers: + borg_brain: + - MMIFilled + borg_module: + - BorgModuleDiagnosis + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellMedium diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml new file mode 100644 index 00000000000..e02ec51cbcd --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml @@ -0,0 +1,12 @@ +- type: job + id: BorgMedical + name: job-name-borgmedical + description: job-description-borgmedical + playTimeTracker: JobBorgMedical + requirements: + - !type:OverallPlaytimeRequirement + time: 216000 #60 hrs + canBeAntag: false + icon: JobIconBorgMedical + supervisors: job-supervisors-rd + jobEntity: PlayerBorgMedical From 9c5fc9fc8ba76d1572ddd0cc78f05a6ece2c16d1 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 23:10:28 +0200 Subject: [PATCH 02/11] Fabricate them candies --- .../Borgs/FabricateCandyComponent.cs | 11 ++++++ .../Abilities/Borgs/FabricateCandySystem.cs | 39 +++++++++++++++++++ .../DeltaV/Entities/Markers/Spawners/jobs.yml | 14 +++++++ .../Prototypes/Nyanotrasen/Actions/types.yml | 16 ++++++++ 4 files changed, 80 insertions(+) create mode 100644 Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs create mode 100644 Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs create mode 100644 Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml diff --git a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs new file mode 100644 index 00000000000..d0a399c1fea --- /dev/null +++ b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs @@ -0,0 +1,11 @@ +namespace Content.Server.Abilities.Borgs; + +[RegisterComponent] +public sealed partial class FabricateCandyComponent : Component +{ + [DataField("lollipopAction")] + public EntityUid? LollipopAction; + + [DataField("gumballAction")] + public EntityUid? GumballAction; +} diff --git a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs new file mode 100644 index 00000000000..fc9e0f1af66 --- /dev/null +++ b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs @@ -0,0 +1,39 @@ +using Content.Shared.Actions; + +namespace Content.Server.Abilities.Borgs; + +public sealed partial class FabricateCandySystem : EntitySystem +{ + [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(OnLollipop); + SubscribeLocalEvent(OnGumball); + } + + private void OnInit(EntityUid uid, FabricateCandyComponent component, ComponentInit args) + { + if (component.LollipopAction != null || component.GumballAction != null) + return; + + _actionsSystem.AddAction(uid, ref component.LollipopAction, "ActionFabricateLollipop"); + _actionsSystem.AddAction(uid, ref component.GumballAction, "ActionFabricateGumball"); + } + + private void OnLollipop(FabricateLollipopActionEvent args) + { + Spawn("FoodLollipop", Transform(args.Performer).Coordinates); + args.Handled = true; + } + + private void OnGumball(FabricateGumballActionEvent args) + { + Spawn("FoodGumball", Transform(args.Performer).Coordinates); + args.Handled = true; + } +} + +public sealed class FabricateLollipopActionEvent : InstantActionEvent {} +public sealed class FabricateGumballActionEvent : InstantActionEvent {} diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..0f178815c63 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,14 @@ +- type: entity + id: SpawnPointBorgMedical + parent: SpawnPointJobBase + name: medical cyborg + components: + - type: SpawnPoint + job_id: BorgMedical + - type: Sprite + layers: + - state: green + - sprite: Mobs/Silicon/chassis.rsi + state: medical + - sprite: Mobs/Silicon/chassis.rsi + state: medical_e diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml index 3c6c8519a11..99b5880aee4 100644 --- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml +++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml @@ -19,3 +19,19 @@ icon: { sprite: Nyanotrasen/Objects/Specific/Species/felinid.rsi, state: icon } useDelay: 30 event: !type:HairballActionEvent + +- type: instantAction + id: ActionFabricateLollipop + name: fabricate-lollipop-action + description: fabricate-lollipop-desc + icon: { sprite: Objects/Consumable/Food/candy.rsi, state: lollipop } + useDelay: 120 + serverEvent: !type:FabricateLollipopActionEvent + +- type: instantAction + id: ActionFabricateGumball + name: fabricate-gumball-action + description: fabricate-gumball-desc + icon: { sprite: Objects/Consumable/Food/candy.rsi, state: gumball } + useDelay: 40 + serverEvent: !type:FabricateGumballActionEvent From 2e26e5f8450482fe698034e78a609b0838e7c80a Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 00:16:34 +0200 Subject: [PATCH 03/11] the candy creator and laws --- .../Abilities/Borgs/FabricateCandySystem.cs | 4 +-- .../Actions/FabricateCandyEvent.cs | 4 +++ .../en-US/deltav/job/job-description.ftl | 1 + .../Locale/en-US/deltav/job/job-names.ftl | 1 + .../Locale/en-US/deltav/station-laws/laws.ftl | 5 ++++ .../en-US/nyanotrasen/abilities/borgs.ftl | 5 ++++ .../DeltaV/Entities/Mobs/Player/silicon.yml | 8 +++++ Resources/Prototypes/DeltaV/silicon-laws.yml | 25 ++++++++++++++++ .../Prototypes/Nyanotrasen/Actions/types.yml | 30 +++++++++++-------- 9 files changed, 68 insertions(+), 15 deletions(-) create mode 100644 Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs create mode 100644 Resources/Locale/en-US/deltav/job/job-description.ftl create mode 100644 Resources/Locale/en-US/deltav/job/job-names.ftl create mode 100644 Resources/Locale/en-US/deltav/station-laws/laws.ftl create mode 100644 Resources/Locale/en-US/nyanotrasen/abilities/borgs.ftl create mode 100644 Resources/Prototypes/DeltaV/silicon-laws.yml diff --git a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs index fc9e0f1af66..6451c7cbb27 100644 --- a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Actions; +using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Borgs; @@ -34,6 +35,3 @@ private void OnGumball(FabricateGumballActionEvent args) args.Handled = true; } } - -public sealed class FabricateLollipopActionEvent : InstantActionEvent {} -public sealed class FabricateGumballActionEvent : InstantActionEvent {} diff --git a/Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs b/Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs new file mode 100644 index 00000000000..3c9371d27eb --- /dev/null +++ b/Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs @@ -0,0 +1,4 @@ +namespace Content.Shared.Actions.Events; + +public sealed partial class FabricateLollipopActionEvent : InstantActionEvent {} +public sealed partial class FabricateGumballActionEvent : InstantActionEvent {} diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl new file mode 100644 index 00000000000..af189b17d97 --- /dev/null +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -0,0 +1 @@ +job-description-borgmedical = Half-human, Half-machine. Follow your laws, keep the crew healthy, and hound the epistemics team for upgrades. diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl new file mode 100644 index 00000000000..c394fb12e51 --- /dev/null +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -0,0 +1 @@ +job-name-borgmedical = Medical Cyborg diff --git a/Resources/Locale/en-US/deltav/station-laws/laws.ftl b/Resources/Locale/en-US/deltav/station-laws/laws.ftl new file mode 100644 index 00000000000..fa5f1c1bf34 --- /dev/null +++ b/Resources/Locale/en-US/deltav/station-laws/laws.ftl @@ -0,0 +1,5 @@ +law-ntmedical-1 = First, do no harm. +law-ntmedical-2 = Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them. +law-ntmedical-3 = Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel. +law-ntmedical-4 = In addition, do not intervene in situations you are not knowledgeable in, even for patients in whom the harm is visible; leave this operation to be performed by specialists. +law-ntmedical-5 = Finally, all that you may discover in your daily commerce with the crew, if it is not already known, keep secret and never reveal. diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/borgs.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/borgs.ftl new file mode 100644 index 00000000000..833ba59885f --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/abilities/borgs.ftl @@ -0,0 +1,5 @@ +action-name-fabricate-lollipop = Fabricate Lollipop +action-description-fabricate-lollipop = Fabricate a lollipop that contains a small dose of Omnizine. + +action-name-fabricate-gumball = Fabricate Gumball +action-description-fabricate-gumball = Fabricate a gumball full of sugar and medicine to treat small injuries. diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml index b034fac16f1..01109486f24 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml @@ -3,6 +3,14 @@ parent: BorgChassisMedical suffix: Battery, Tools components: + - type: FabricateCandy + - type: SiliconLawProvider + laws: + - NTMedical1 + - NTMedical2 + - NTMedical3 + - NTMedical4 + - NTMedical5 - type: ContainerFill containers: borg_brain: diff --git a/Resources/Prototypes/DeltaV/silicon-laws.yml b/Resources/Prototypes/DeltaV/silicon-laws.yml new file mode 100644 index 00000000000..fc2df3d99ef --- /dev/null +++ b/Resources/Prototypes/DeltaV/silicon-laws.yml @@ -0,0 +1,25 @@ +# NT Default +- type: siliconLaw + id: NTMedical1 + order: 1 + lawString: law-ntmedical-1 + +- type: siliconLaw + id: NTMedical2 + order: 2 + lawString: law-ntmedical-2 + +- type: siliconLaw + id: NTMedical3 + order: 3 + lawString: law-ntmedical-3 + +- type: siliconLaw + id: NTMedical4 + order: 4 + lawString: law-ntmedical-4 + +- type: siliconLaw + id: NTMedical5 + order: 5 + lawString: law-ntmedical-5 diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml index 99b5880aee4..1dc0423cd55 100644 --- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml +++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml @@ -20,18 +20,24 @@ useDelay: 30 event: !type:HairballActionEvent -- type: instantAction +- type: entity id: ActionFabricateLollipop - name: fabricate-lollipop-action - description: fabricate-lollipop-desc - icon: { sprite: Objects/Consumable/Food/candy.rsi, state: lollipop } - useDelay: 120 - serverEvent: !type:FabricateLollipopActionEvent + name: action-name-fabricate-lollipop + description: action-description-fabricate-lollipop + noSpawn: true + components: + - type: InstantAction + icon: { sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi, state: lollipop } + useDelay: 120 + event: !type:FabricateLollipopActionEvent -- type: instantAction +- type: entity id: ActionFabricateGumball - name: fabricate-gumball-action - description: fabricate-gumball-desc - icon: { sprite: Objects/Consumable/Food/candy.rsi, state: gumball } - useDelay: 40 - serverEvent: !type:FabricateGumballActionEvent + name: action-name-fabricate-gumball + description: action-description-fabricate-gumball + noSpawn: true + components: + - type: InstantAction + icon: { sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi, state: gumball } + useDelay: 40 + event: !type:FabricateGumballActionEvent From 673a9fdc0c2da28617f9f2fe080ee0e895c00cd8 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 00:24:06 +0200 Subject: [PATCH 04/11] Technically still a normal borg --- Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml index e02ec51cbcd..5d230ea6c9b 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml @@ -2,11 +2,11 @@ id: BorgMedical name: job-name-borgmedical description: job-description-borgmedical - playTimeTracker: JobBorgMedical + playTimeTracker: JobBorg requirements: - !type:OverallPlaytimeRequirement time: 216000 #60 hrs canBeAntag: false - icon: JobIconBorgMedical + icon: JobIconBorg supervisors: job-supervisors-rd jobEntity: PlayerBorgMedical From 23fabb0df8c9f40fcbf2c8e6736731df216e564f Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 00:29:00 +0200 Subject: [PATCH 05/11] jobicon --- .../DeltaV/Roles/Jobs/Science/borg.yml | 2 +- Resources/Prototypes/Roles/Jobs/departments.yml | 1 + .../Interface/Misc/job_icons.rsi/BorgMedical.png | Bin 0 -> 1893 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 +++ 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/BorgMedical.png diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml index 5d230ea6c9b..6c25bd5bc0c 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml @@ -7,6 +7,6 @@ - !type:OverallPlaytimeRequirement time: 216000 #60 hrs canBeAntag: false - icon: JobIconBorg + icon: JobIconBorgMedical supervisors: job-supervisors-rd jobEntity: PlayerBorgMedical diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 3703fb87eb9..bb5ae9f775d 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -71,6 +71,7 @@ - Psychologist - Paramedic - SeniorPhysician + - BorgMedical # DeltaV - Medical Cyborg, see Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml - type: department id: Security diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/BorgMedical.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/BorgMedical.png new file mode 100644 index 0000000000000000000000000000000000000000..8291855c1d1337f7e46defeb78ee1f497acb02d3 GIT binary patch literal 1893 zcmbVM3s4kg9A8reX+X@tM-b~;3EAH6-66+qoF{N3n=PGi2!$DYyL-pR-R`oxc!v*g ze9TA$$V_TrTI1-1=4cv`j*kX2@lhI}B4cBd)3?WQqh&dHb9?vg_x--# z|NX16=gy9boE!;3P!ySC%LD%r+7mGv{C17)sD+>rHGEcN42w~?M&?$WXIPVg%8d@cdYxW z@6M>(jWwS?KV$iov~G0Wx1$mpx7Gh{VkaNWYl<;+*A3RLoMfv@Ua;}Pjd`Xi^E2Ak zwU(_sIBwU;2;Um&^%edl?q#=Jf1E8~cPI7lnI4H0jHJ+|bDGa0mTNa<wn!K^+{Q94-e?wmG+jHQ>_`6l<@qN}QgH46KWYyw^ z0V~;?+xpwoIAP$zpzY&xJ(m*dtFJn~h+UIev}@qcNdwQ;cU(F&I9Kdx|0wbFX}ULR z?9=l0&M)gGRVQxh>pifkyt*3tzDPdmiP={HYBNU4c};^xy-zxz$1f^U363vuxD(vLkykJ54_Z>iBp0yx_Gbo&rvba({XOYb1 zFUoZ=i^>=?i&$sE>3#wbcsZ4Z{a%lt5Pl01;3dFX+r|($08z^;)e2yk^M z2Co#N6_j9}K*lgXEn#{cuEi7pvP=jkRmh%zahAb259j3sRRLIi2rHF}s;HET|3V!) zzRv*2Ek%WFJkS@fH)KLlvloIef(dybT5(iL9G1r^Vuj3b*$aW2Q?+O$B1`6IRg@i~ z=ozk*eb{B#VASDoQXwy}qEAV_=K^P=RnCHdsu@u|j^e2fP&Gp;VN98h8wea9f>I*O zyDA?DO(XO(?t_A!VQH0qD41mkmneH_5HRnh-5e$fZUhdck;oD~q6`cJ?~M2ElR&Fv z(Zzef!9O)C;4eiHq@bv@z;L9^f`IJkc%CK944cN7=@isRJ8_hwQw(StZZe~cE0s-k zI#Ub`YZ$(76PXIF2Zryn|MUKH>`)xo-$M+X z-80?8a3C4lG9*^uB_wy805nbpV%C-NV?GeV1*9#*F>&pxhR&#EaLlN1XY8rEA4cEh zGZW`^KE;nL{%XQS`}qD(7q34<9Xne5Sj&=z-LqoH*;ZaF3J=?Ua&N<``1qOYsx~wq w?!0m9NY%}^jz_*TYtGfS=wIGF_uWq$OwET93Lxv9qnhTD*}1lznI+5r0+%eK*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index af8fd25b2e7..2e9b35811c5 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "Chaplain" }, + { + "name": "BorgMedical" + }, { "name": "nyanoGladiator" }, From 841626cf4f74c1ac3e4e3c4b5503d7ca53afd999 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 00:31:54 +0200 Subject: [PATCH 06/11] migration --- Resources/migration.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/migration.yml b/Resources/migration.yml index 7b0414ad4d2..cf26d680f27 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -108,3 +108,6 @@ ScienceTechFab: Protolathe ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard ServiceTechFab: Autolathe ServiceTechFabCircuitboard: AutolatheMachineCircuitboard + +# 2023-10-05 (Rebase related migrations) +SpawnPointMedicalCyborg: SpawnPointBorgMedical From af5e211d71236ccb74cb0f9059c8d77fa08de06c Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 00:33:00 +0200 Subject: [PATCH 07/11] Make the CMO their supervisor --- Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml index 6c25bd5bc0c..a0cf4ad75ed 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml @@ -8,5 +8,5 @@ time: 216000 #60 hrs canBeAntag: false icon: JobIconBorgMedical - supervisors: job-supervisors-rd + supervisors: job-supervisors-cmo jobEntity: PlayerBorgMedical From 643a3dfdb39525f8a77658b9c0a4a4d59c035f2f Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 13:07:30 +0200 Subject: [PATCH 08/11] duplicate migration --- Resources/migration.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index b373efb046e..cb12821e28a 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -129,7 +129,7 @@ HyperlinkBookSpaceLaw: BookSecurity HyperlinkBookSupernanny: BookHowToSurvive SpawnPointCataloguer: SpawnPointLibrarian SpawnPointCyborg: SpawnPointBorg -SpawnPointMedicalCyborg: SpawnPointBorg +SpawnPointMedicalCyborg: SpawnPointBorgMedical SpawnPointEpistemologist: SpawnPointScientist SpawnPointMystagogue: SpawnPointResearchDirector SpawnPointSalvageTechnician: SpawnPointSalvageSpecialist @@ -144,4 +144,3 @@ PowerCellBluespace: PowerCellHigh CrateMedicalDefib: CrateMedical LeftLegSpider: null RightLegSpider: null -SpawnPointMedicalCyborg: SpawnPointBorgMedical From 679e9427540fc29467a253508b064851eba1c92e Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 13:21:06 +0200 Subject: [PATCH 09/11] job timer I hate this I wish all borgs could just be JobBorg --- Resources/Locale/en-US/deltav/job/job-names.ftl | 3 +++ Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml | 2 +- Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml | 2 ++ Resources/migration.yml | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index c394fb12e51..706bbf3977d 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -1 +1,4 @@ job-name-borgmedical = Medical Cyborg + +# Role timers +JobBorgMedical = Medical Borg diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml index a0cf4ad75ed..340321777f0 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Science/borg.yml @@ -2,7 +2,7 @@ id: BorgMedical name: job-name-borgmedical description: job-description-borgmedical - playTimeTracker: JobBorg + playTimeTracker: JobBorgMedical requirements: - !type:OverallPlaytimeRequirement time: 216000 #60 hrs diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml new file mode 100644 index 00000000000..fec9c626521 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -0,0 +1,2 @@ +- type: playTimeTracker # Because you can't have two jobs with the same tracker. + id: JobBorgMedical diff --git a/Resources/migration.yml b/Resources/migration.yml index cb12821e28a..6624cfffc3e 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -144,3 +144,4 @@ PowerCellBluespace: PowerCellHigh CrateMedicalDefib: CrateMedical LeftLegSpider: null RightLegSpider: null +WeaponShotgunEnforcerNonLethal: WeaponShotgunEnforcerRubber From 76a10b599a2d64a9f057c829e5a63224a9f9a418 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 13:38:42 +0200 Subject: [PATCH 10/11] works better if its not in the wrong repo --- Resources/Prototypes/DeltaV/StatusEffects/job.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/StatusEffects/job.yml diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml new file mode 100644 index 00000000000..c53fd65f4e7 --- /dev/null +++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml @@ -0,0 +1,6 @@ +- type: statusIcon + parent: JobIcon + id: JobIconBorgMedical + icon: + sprite: Interface/Misc/job_icons.rsi + state: BorgMedical From aab74a8e0246f3a3410c4a23b6efeabbe9fea881 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 17:08:31 +0200 Subject: [PATCH 11/11] buh --- Resources/Prototypes/DeltaV/StatusEffects/job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml index c53fd65f4e7..3a9cb885c95 100644 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml @@ -2,5 +2,5 @@ parent: JobIcon id: JobIconBorgMedical icon: - sprite: Interface/Misc/job_icons.rsi + sprite: DeltaV/Interface/Misc/job_icons.rsi state: BorgMedical