From 6d135ae3f600f1fbdcfee44ec1ba28e2fd180204 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 21:45:14 +0200 Subject: [PATCH 1/3] funny bill for hol --- .../Prototypes/Catalog/Fills/Lockers/heads.yml | 1 + .../DeltaV/Entities/Objects/Misc/first_bill.yml | 12 ++++++++++++ .../Prototypes/DeltaV/Objectives/traitor.yml | 10 ++++++++++ .../Prototypes/Objectives/objectiveGroups.yml | 1 + .../ServerInfo/Guidebook/Antagonist/Traitors.xml | 5 ++--- .../DeltaV/Objects/Misc/first_bill.rsi/icon.png | Bin 0 -> 382 bytes .../DeltaV/Objects/Misc/first_bill.rsi/meta.json | 14 ++++++++++++++ 7 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml create mode 100644 Resources/Prototypes/DeltaV/Objectives/traitor.yml create mode 100644 Resources/Textures/DeltaV/Objects/Misc/first_bill.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/first_bill.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index bf1ca09eadb..c6303b02f16 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -21,6 +21,7 @@ - id: RubberStampQm - id: ClothingHeadsetAltCargo - id: BoxEncryptionKeyCargo + - id: SpaceCashFirstBill # DeltaV - HoL steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml - type: entity id: LockerCaptainFilledHardsuit diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml new file mode 100644 index 00000000000..19c5e2bfd1e --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml @@ -0,0 +1,12 @@ +- type: entity + parent: BaseItem + id: SpaceCashFirstBill + name: head of logistics' first bill + description: The first bill earned by the Head of Logistics for selling something. A small chip is embedded in it. + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/first_bill.rsi + state: icon + - type: Tag + tags: + - HighRiskItem diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml new file mode 100644 index 00000000000..ea733c1dba0 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -0,0 +1,10 @@ +- type: entity # Head of Logistics steal objective. + noSpawn: true + parent: BaseTraitorStealObjective + id: FirstBillStealObjective + components: + - type: NotJobRequirement + job: Quartermaster + - type: StealCondition + prototype: SpaceCashFirstBill + # owner: job-name-qm diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 6598a04c597..55b64e36921 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -20,6 +20,7 @@ CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 SecretDocumentsStealObjective: 0.5 + FirstBillStealObjective: 0.5 # DeltaV - HoL steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 002ee56d115..ce447ab0d8e 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -78,10 +78,9 @@ - - Steal [color=#a4885c]Corgi Meat[/color]. + - Steal the Head of Logistics's [color=#a4885c]first bill[/color]. - - + diff --git a/Resources/Textures/DeltaV/Objects/Misc/first_bill.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Misc/first_bill.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ec04fa12c3e6f37aca9ca37cfc2f86bb83edcf97 GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq~J$ z)5S5QVoq|RM1sMqhCucntAs0zi}@r<4?HMk2xmC{UtVedhEs3N^il;v=ATU1^hP-D z@c*+vk9%xmc5sLbnU}csb#>c!^UIP!a%+9oH2A>r z+2BrX(R9a1H%Xsn29LWty{}7lFjmMiY_h4?t}tOM*Pi6$He zWSllKJ4{oSIe6fM`vc=<3xPun9r_1!IJe0>lMs-9GNFCFe9*fF%c4Yw)8PkY8Mzv# z-;ZY!<_IyK@Za%)qa$|Kxw@*emnoNL1f-#`|V}4$N%bBe_dr1uI*=qX|4 Date: Fri, 29 Sep 2023 12:25:22 +0200 Subject: [PATCH 2/3] change name and desc Didn't like the first one --- .../Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml | 4 ++-- Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml index 19c5e2bfd1e..6e81dbc706e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml @@ -1,8 +1,8 @@ - type: entity parent: BaseItem id: SpaceCashFirstBill - name: head of logistics' first bill - description: The first bill earned by the Head of Logistics for selling something. A small chip is embedded in it. + name: head of logistics' lucky bill + description: The first bill ever earned by the Head of Logistics from trading. A small chip is embedded in it. components: - type: Sprite sprite: DeltaV/Objects/Misc/first_bill.rsi diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index ce447ab0d8e..b8a94b5dd52 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -78,7 +78,7 @@ - - Steal the Head of Logistics's [color=#a4885c]first bill[/color]. + - Steal the Head of Logistics's [color=#a4885c]lucky bill[/color]. From dbb8bc1900d3396382b4227ec70d7fb7cdd9adb7 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 29 Sep 2023 12:28:43 +0200 Subject: [PATCH 3/3] Change IDs for stuff --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 +- .../Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml | 2 +- Resources/Prototypes/DeltaV/Objectives/traitor.yml | 4 ++-- Resources/Prototypes/Objectives/objectiveGroups.yml | 2 +- Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index c6303b02f16..b904825de6f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -21,7 +21,7 @@ - id: RubberStampQm - id: ClothingHeadsetAltCargo - id: BoxEncryptionKeyCargo - - id: SpaceCashFirstBill # DeltaV - HoL steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml + - id: SpaceCashLuckyBill # DeltaV - HoL steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml - type: entity id: LockerCaptainFilledHardsuit diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml index 6e81dbc706e..429e64e40c5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml @@ -1,6 +1,6 @@ - type: entity parent: BaseItem - id: SpaceCashFirstBill + id: SpaceCashLuckyBill name: head of logistics' lucky bill description: The first bill ever earned by the Head of Logistics from trading. A small chip is embedded in it. components: diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index ea733c1dba0..fbfba136b2c 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -1,10 +1,10 @@ - type: entity # Head of Logistics steal objective. noSpawn: true parent: BaseTraitorStealObjective - id: FirstBillStealObjective + id: HoLLuckyBillStealObjective components: - type: NotJobRequirement job: Quartermaster - type: StealCondition - prototype: SpaceCashFirstBill + prototype: SpaceCashLuckyBill # owner: job-name-qm diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 55b64e36921..cf77e37da4f 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -20,7 +20,7 @@ CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 SecretDocumentsStealObjective: 0.5 - FirstBillStealObjective: 0.5 # DeltaV - HoL steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml + HoLLuckyBillStealObjective: 0.5 # DeltaV - HoL steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index b8a94b5dd52..6a14c44fafc 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -80,7 +80,7 @@ - Steal the Head of Logistics's [color=#a4885c]lucky bill[/color]. - +