-
Notifications
You must be signed in to change notification settings - Fork 369
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* basic stuff * Fabricate them candies * the candy creator and laws * Technically still a normal borg * jobicon * migration * Make the CMO their supervisor * duplicate migration * job timer I hate this I wish all borgs could just be JobBorg * works better if its not in the wrong repo * buh --------- Signed-off-by: Colin-Tel <[email protected]> Co-authored-by: Colin-Tel <[email protected]>
- Loading branch information
1 parent
71482bc
commit 0f68868
Showing
18 changed files
with
178 additions
and
1 deletion.
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} |
37 changes: 37 additions & 0 deletions
37
Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
using Content.Shared.Actions; | ||
using Content.Shared.Actions.Events; | ||
|
||
namespace Content.Server.Abilities.Borgs; | ||
|
||
public sealed partial class FabricateCandySystem : EntitySystem | ||
{ | ||
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!; | ||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
SubscribeLocalEvent<FabricateCandyComponent, ComponentInit>(OnInit); | ||
SubscribeLocalEvent<FabricateLollipopActionEvent>(OnLollipop); | ||
SubscribeLocalEvent<FabricateGumballActionEvent>(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; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
namespace Content.Shared.Actions.Events; | ||
|
||
public sealed partial class FabricateLollipopActionEvent : InstantActionEvent {} | ||
public sealed partial class FabricateGumballActionEvent : InstantActionEvent {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
job-description-borgmedical = Half-human, Half-machine. Follow your laws, keep the crew healthy, and hound the epistemics team for upgrades. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
job-name-borgmedical = Medical Cyborg | ||
# Role timers | ||
JobBorgMedical = Medical Borg |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
14 changes: 14 additions & 0 deletions
14
Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
24 changes: 24 additions & 0 deletions
24
Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
- type: entity | ||
id: PlayerBorgMedical | ||
parent: BorgChassisMedical | ||
suffix: Battery, Tools | ||
components: | ||
- type: FabricateCandy | ||
- type: SiliconLawProvider | ||
laws: | ||
- NTMedical1 | ||
- NTMedical2 | ||
- NTMedical3 | ||
- NTMedical4 | ||
- NTMedical5 | ||
- type: ContainerFill | ||
containers: | ||
borg_brain: | ||
- MMIFilled | ||
borg_module: | ||
- BorgModuleDiagnosis | ||
- type: ItemSlots | ||
slots: | ||
cell_slot: | ||
name: power-cell-slot-component-slot-name-default | ||
startingItem: PowerCellMedium |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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-cmo | ||
jobEntity: PlayerBorgMedical |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
- type: playTimeTracker # Because you can't have two jobs with the same tracker. | ||
id: JobBorgMedical |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- type: statusIcon | ||
parent: JobIcon | ||
id: JobIconBorgMedical | ||
icon: | ||
sprite: DeltaV/Interface/Misc/job_icons.rsi | ||
state: BorgMedical |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+1.85 KB
Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/BorgMedical.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,9 @@ | |
{ | ||
"name": "Chaplain" | ||
}, | ||
{ | ||
"name": "BorgMedical" | ||
}, | ||
{ | ||
"name": "nyanoGladiator" | ||
}, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters