From 41569eb0fecb7bbb4a0b20df764ec0c674878dc2 Mon Sep 17 00:00:00 2001 From: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> Date: Sat, 21 Dec 2024 21:18:39 -0700 Subject: [PATCH 1/7] Added Research Digi Board --- .../Locale/en-US/research/rd-clipboard.ftl | 1 + .../Catalog/Fills/Lockers/heads.yml | 1 + .../Entities/Objects/Misc/paper.yml | 71 ++++++++++++++++++ .../Prototypes/Objectives/objectiveGroups.yml | 1 + Resources/Prototypes/Objectives/traitor.yml | 10 +++ .../Misc/rd_clipboard.rsi/equipped-BELT.png | Bin 0 -> 5477 bytes .../Misc/rd_clipboard.rsi/inhand-left.png | Bin 0 -> 6196 bytes .../Misc/rd_clipboard.rsi/inhand-right.png | Bin 0 -> 6119 bytes .../Objects/Misc/rd_clipboard.rsi/meta.json | 35 +++++++++ .../Misc/rd_clipboard.rsi/rd_clipboard.png | Bin 0 -> 5370 bytes .../rd_clipboard.rsi/rd_clipboard_over.png | Bin 0 -> 4883 bytes .../rd_clipboard.rsi/rd_clipboard_paper.png | Bin 0 -> 5374 bytes .../rd_clipboard.rsi/rd_clipboard_pen.png | Bin 0 -> 4830 bytes 13 files changed, 119 insertions(+) create mode 100644 Resources/Locale/en-US/research/rd-clipboard.ftl create mode 100644 Resources/Textures/Objects/Misc/rd_clipboard.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/rd_clipboard.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/rd_clipboard.rsi/rd_clipboard.png create mode 100644 Resources/Textures/Objects/Misc/rd_clipboard.rsi/rd_clipboard_over.png create mode 100644 Resources/Textures/Objects/Misc/rd_clipboard.rsi/rd_clipboard_paper.png create mode 100644 Resources/Textures/Objects/Misc/rd_clipboard.rsi/rd_clipboard_pen.png diff --git a/Resources/Locale/en-US/research/rd-clipboard.ftl b/Resources/Locale/en-US/research/rd-clipboard.ftl new file mode 100644 index 00000000000..f7bad65bdb8 --- /dev/null +++ b/Resources/Locale/en-US/research/rd-clipboard.ftl @@ -0,0 +1 @@ +rd-clipboard-computer-verb-text = Toggle Research diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index ac41dfb2c82..634f613a369 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -274,6 +274,7 @@ - !type:NestedSelector # DeltaV tableId: LockerFillResearchDirectorDeltaV - id: Intellicard + - id: BoxFolderRdClipboard - id: BoxEncryptionKeyScience - id: CircuitImprinterMachineCircuitboard - id: ClothingBeltUtilityFilled diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index e0862b88425..e96d7376870 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -603,6 +603,77 @@ - HighRiskItem - type: StealTarget stealGroup: BoxFolderQmClipboard + +- type: entity + id: BoxFolderRdClipboard + parent: [BoxFolderClipboard, BaseGrandTheftContraband] + name: research digi-board + description: A bulky electric clipboard, filled with research notes and artifact sketches. With so many compromising documents, you ought to keep this safe. + components: + - type: Sprite + sprite: Objects/Misc/rd_clipboard.rsi + layers: + - state: rd_clipboard + - state: rd_clipboard_paper + map: ["rd_clipboard_paper"] + visible: false + - state: rd_clipboard_pen + map: ["rd_clipboard_pen"] + visible: false + - state: rd_clipboard_over + - type: ItemSlots + slots: + pen_slot: + name: clipboard-slot-component-slot-name-pen + whitelist: + tags: + - Write + insertOnInteract: true + - type: Item + sprite: Objects/Misc/rd_clipboard.rsi + size: Normal + - type: Clothing + sprite: Objects/Misc/rd_clipboard.rsi + - type: Storage + grid: + - 0,0,4,3 + quickInsert: true + - type: StorageFill + contents: [] #to override base clipboard fill + - type: ItemMapper + mapLayers: + rd_clipboard_paper: + whitelist: + tags: + - Document + rd_clipboard_pen: + whitelist: + tags: + - Write + - type: ResearchClient + - type: ResearchConsole + - type: TechnologyDatabase + - type: ActivatableUI + verbText: rd-clipboard-computer-verb-text + key: enum.ResearchConsoleUiKey.Key + - type: UserInterface + interfaces: + enum.ResearchConsoleUiKey.Key: + type: ResearchConsoleBoundUserInterface + enum.ResearchClientUiKey.Key: + type: ResearchClientBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface + - type: MeleeWeapon + damage: + types: + Blunt: 10 + - type: Tag + tags: + - Folder + - HighRiskItem + - type: StealTarget + stealGroup: BoxFolderRdClipboard - type: entity parent: [Paper, BaseSyndicateContraband] # eat or burn your damn piece of paper damn thieves diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 5d7a0947c54..3923d12055b 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -18,6 +18,7 @@ # CorgiMeatStealObjective: 1 # DeltaV - Disable the horrible murder of Ian as an objective MantisKnifeStealObjective: 1 # Nyanotrasen - ForensicMantis steal objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml ClipboardStealObjective: 1 + RdClipboardStealObjective: 1 CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 3acfb04d244..861753f901d 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -195,6 +195,16 @@ components: - type: StealCondition stealGroup: HandTeleporter + +- type: entity + parent: BaseTraitorStealObjective + id: RdClipboardStealObjective + components: + - type: NotJobRequirement + job: ResearchDirector + - type: StealCondition + stealGroup: BoxFolderRdClipboard + owner: job-name-rd ## hos diff --git a/Resources/Textures/Objects/Misc/rd_clipboard.rsi/equipped-BELT.png b/Resources/Textures/Objects/Misc/rd_clipboard.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..7f3b48dbf96e11fb4032d2b4c9164d236d9b107d GIT binary patch literal 5477 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 SyGg0c2ZQcpclo;=G5-NpC321c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2f8a1813322305539bde3d50e5bc31984c40260a GIT binary patch literal 6196 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 Rp(1(frPw;#lx^IS_&-4H+<5>1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ba9bb9671dfd2fc3c696722f5257ff48b24e3629 GIT binary patch literal 6119 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/rd_clipboard.rsi/rd_clipboard_paper.png b/Resources/Textures/Objects/Misc/rd_clipboard.rsi/rd_clipboard_paper.png new file mode 100644 index 0000000000000000000000000000000000000000..073471721a39b03e50dc101d9f0c5cfe6d7c4fdd GIT binary patch literal 5374 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 literal 0 HcmV?d00001 From 996bc584beaa815c296a8028db7e19a499762795 Mon Sep 17 00:00:00 2001 From: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> Date: Sat, 21 Dec 2024 22:15:13 -0700 Subject: [PATCH 2/7] Fixed Steal Target Groups --- .../en-US/objectives/conditions/steal-target-groups.ftl | 1 + Resources/Prototypes/Objectives/stealTargetGroups.yml | 7 +++++++ Resources/Prototypes/Objectives/traitor.yml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl index ba0545fb59e..0c28b43158d 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl @@ -5,6 +5,7 @@ steal-target-groups-clothing-outer-hardsuit-rd = experimental research hardsuit steal-target-groups-hand-teleporter = hand teleporter steal-target-groups-clothing-shoes-boots-mag-adv = advanced magboots steal-target-groups-box-folder-qm-clipboard = requisition digi-board +steal-target-groups-box-folder-rd-clipboard = research digi-board steal-target-groups-food-meat-corgi = prime-cut corgi meat steal-target-groups-captain-id-card = captain ID card steal-target-groups-jetpack-captain-filled = captain's jetpack diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index dd01afea0e4..78381f43f8e 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -41,6 +41,13 @@ sprite: sprite: Objects/Misc/qm_clipboard.rsi state: qm_clipboard + +- type: stealTargetGroup + id: BoxFolderRdClipboard + name: steal-target-groups-box-folder-rd-clipboard + sprite: + sprite: Objects/Misc/rd_clipboard.rsi + state: rd_clipboard - type: stealTargetGroup id: FoodMeatCorgi diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 861753f901d..12f6250dc18 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -197,7 +197,7 @@ stealGroup: HandTeleporter - type: entity - parent: BaseTraitorStealObjective + parent: BaseRDStealObjective id: RdClipboardStealObjective components: - type: NotJobRequirement From 888ca3f8c4043eb1f5c04e3b3c30827fd3b6eb23 Mon Sep 17 00:00:00 2001 From: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> Date: Sun, 22 Dec 2024 02:59:24 -0700 Subject: [PATCH 3/7] Moved New Files To DeltaV Folder Files were moved to Delta V, except objectiveGroups. And updated sprites --- .../conditions/steal-target-groups.ftl | 1 + .../{ => deltav}/research/rd-clipboard.ftl | 0 .../conditions/steal-target-groups.ftl | 1 - .../Catalog/Fills/Lockers/heads.yml | 1 - .../DeltaV/Catalog/Fills/Lockers/heads.yml | 1 + .../DeltaV/Entities/Objects/Misc/paper.yml | 73 ++++++++++++++++++ .../DeltaV/Objectives/stealTargetGroups.yml | 7 ++ .../Prototypes/DeltaV/Objectives/traitor.yml | 11 +++ .../Entities/Objects/Misc/paper.yml | 71 ----------------- .../Prototypes/Objectives/objectiveGroups.yml | 2 +- .../Objectives/stealTargetGroups.yml | 7 -- Resources/Prototypes/Objectives/traitor.yml | 10 --- .../Misc/rd_clipboard.rsi/equipped-BELT.png | Bin 5477 -> 5455 bytes .../Misc/rd_clipboard.rsi/inhand-left.png | Bin 6196 -> 6160 bytes .../Misc/rd_clipboard.rsi/inhand-right.png | Bin 6119 -> 6105 bytes .../Objects/Misc/rd_clipboard.rsi/meta.json | 0 .../Misc/rd_clipboard.rsi/rd_clipboard.png | Bin 5370 -> 5374 bytes .../rd_clipboard.rsi/rd_clipboard_over.png | Bin .../rd_clipboard.rsi/rd_clipboard_paper.png | Bin .../rd_clipboard.rsi/rd_clipboard_pen.png | Bin 20 files changed, 94 insertions(+), 91 deletions(-) rename Resources/Locale/en-US/{ => deltav}/research/rd-clipboard.ftl (100%) rename Resources/Textures/{ => DeltaV}/Objects/Misc/rd_clipboard.rsi/equipped-BELT.png (92%) rename Resources/Textures/{ => DeltaV}/Objects/Misc/rd_clipboard.rsi/inhand-left.png (91%) rename Resources/Textures/{ => DeltaV}/Objects/Misc/rd_clipboard.rsi/inhand-right.png (91%) rename Resources/Textures/{ => DeltaV}/Objects/Misc/rd_clipboard.rsi/meta.json (100%) rename Resources/Textures/{ => DeltaV}/Objects/Misc/rd_clipboard.rsi/rd_clipboard.png (93%) rename Resources/Textures/{ => DeltaV}/Objects/Misc/rd_clipboard.rsi/rd_clipboard_over.png (100%) rename Resources/Textures/{ => DeltaV}/Objects/Misc/rd_clipboard.rsi/rd_clipboard_paper.png (100%) rename Resources/Textures/{ => DeltaV}/Objects/Misc/rd_clipboard.rsi/rd_clipboard_pen.png (100%) diff --git a/Resources/Locale/en-US/deltav/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/deltav/objectives/conditions/steal-target-groups.ftl index abd8f3d4a38..c2e63cee3f5 100644 --- a/Resources/Locale/en-US/deltav/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/deltav/objectives/conditions/steal-target-groups.ftl @@ -4,6 +4,7 @@ steal-target-groups-ian-dossier = head of personnel's photobook steal-target-groups-x01 = x-01 multiphase energy gun steal-target-groups-notary-stamp = notary stamp steal-target-groups-silvia = silvia +steal-target-groups-box-folder-rd-clipboard = research digi-board steal-target-groups-recruiter-pen = recruiter's pen steal-target-groups-captains-cloak = captain's cloak diff --git a/Resources/Locale/en-US/research/rd-clipboard.ftl b/Resources/Locale/en-US/deltav/research/rd-clipboard.ftl similarity index 100% rename from Resources/Locale/en-US/research/rd-clipboard.ftl rename to Resources/Locale/en-US/deltav/research/rd-clipboard.ftl diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl index 0c28b43158d..ba0545fb59e 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl @@ -5,7 +5,6 @@ steal-target-groups-clothing-outer-hardsuit-rd = experimental research hardsuit steal-target-groups-hand-teleporter = hand teleporter steal-target-groups-clothing-shoes-boots-mag-adv = advanced magboots steal-target-groups-box-folder-qm-clipboard = requisition digi-board -steal-target-groups-box-folder-rd-clipboard = research digi-board steal-target-groups-food-meat-corgi = prime-cut corgi meat steal-target-groups-captain-id-card = captain ID card steal-target-groups-jetpack-captain-filled = captain's jetpack diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 634f613a369..ac41dfb2c82 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -274,7 +274,6 @@ - !type:NestedSelector # DeltaV tableId: LockerFillResearchDirectorDeltaV - id: Intellicard - - id: BoxFolderRdClipboard - id: BoxEncryptionKeyScience - id: CircuitImprinterMachineCircuitboard - id: ClothingBeltUtilityFilled diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml index eb6472121d4..a1cdbe36602 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml @@ -72,6 +72,7 @@ children: - id: BoxPDAScience - id: RDIDCard + - id: BoxFolderRdClipboard - id: ClothingShoesBootsWinterMystagogue - id: LunchboxCommandFilledRandom prob: 0.3 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index 2682f83ab88..d856a5849cd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -24,6 +24,79 @@ backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0 contentMargin: 32.0, 16.0, 32.0, 0.0 +#Research digi-board +- type: entity + id: BoxFolderRdClipboard + parent: [BoxFolderClipboard, BaseGrandTheftContraband] + name: research digi-board + description: A bulky electric clipboard, filled with research notes and artifact sketches. With so many compromising documents, you ought to keep this safe. + components: + - type: Sprite + sprite: /Textures/DeltaV/Objects/Misc/rd_clipboard.rsi + layers: + - state: rd_clipboard + - state: rd_clipboard_paper + map: ["rd_clipboard_paper"] + visible: false + - state: rd_clipboard_pen + map: ["rd_clipboard_pen"] + visible: false + - state: rd_clipboard_over + - type: ItemSlots + slots: + pen_slot: + name: clipboard-slot-component-slot-name-pen + whitelist: + tags: + - Write + insertOnInteract: true + - type: Item + sprite: /Textures/DeltaV/Objects/Misc/rd_clipboard.rsi + size: Normal + - type: Clothing + sprite: /Textures/DeltaV/Objects/Misc/rd_clipboard.rsi + - type: Storage + grid: + - 0,0,4,3 + quickInsert: true + - type: StorageFill + contents: [] #to override base clipboard fill + - type: ItemMapper + mapLayers: + rd_clipboard_paper: + whitelist: + tags: + - Document + rd_clipboard_pen: + whitelist: + tags: + - Write + - type: ResearchClient + - type: ResearchConsole + - type: TechnologyDatabase + - type: ActivatableUI + verbText: rd-clipboard-computer-verb-text + key: enum.ResearchConsoleUiKey.Key + - type: UserInterface + interfaces: + enum.ResearchConsoleUiKey.Key: + type: ResearchConsoleBoundUserInterface + enum.ResearchClientUiKey.Key: + type: ResearchClientBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface + - type: MeleeWeapon + damage: + types: + Blunt: 10 + - type: Tag + tags: + - Folder + - HighRiskItem + - type: StealTarget + stealGroup: BoxFolderRdClipboard + + # contents set by FugitiveRule or a creative admeme - type: entity parent: PaperStationWarrant diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml index 9599ba6e3fc..3b3aa70309f 100644 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml @@ -18,6 +18,13 @@ sprite: sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi state: base + +- type: stealTargetGroup + id: BoxFolderRdClipboard + name: steal-target-groups-box-folder-rd-clipboard + sprite: + sprite: DeltaV/Objects/Misc/rd_clipboard.rsi + state: rd_clipboard - type: stealTargetGroup id: RubberStampNotary diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index 1a45300a8f7..1776729bfe6 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -50,6 +50,17 @@ - type: StealCondition stealGroup: AnimalSilvia owner: job-name-cmo + +# Mystagogue steal objective +- type: entity + parent: BaseTraitorStealObjective + id: RdClipboardStealObjective + components: + - type: NotJobRequirement + job: ResearchDirector + - type: StealCondition + stealGroup: BoxFolderRdClipboard + owner: job-name-rd # teach lesson - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index e96d7376870..d0c6cfebce7 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -604,77 +604,6 @@ - type: StealTarget stealGroup: BoxFolderQmClipboard -- type: entity - id: BoxFolderRdClipboard - parent: [BoxFolderClipboard, BaseGrandTheftContraband] - name: research digi-board - description: A bulky electric clipboard, filled with research notes and artifact sketches. With so many compromising documents, you ought to keep this safe. - components: - - type: Sprite - sprite: Objects/Misc/rd_clipboard.rsi - layers: - - state: rd_clipboard - - state: rd_clipboard_paper - map: ["rd_clipboard_paper"] - visible: false - - state: rd_clipboard_pen - map: ["rd_clipboard_pen"] - visible: false - - state: rd_clipboard_over - - type: ItemSlots - slots: - pen_slot: - name: clipboard-slot-component-slot-name-pen - whitelist: - tags: - - Write - insertOnInteract: true - - type: Item - sprite: Objects/Misc/rd_clipboard.rsi - size: Normal - - type: Clothing - sprite: Objects/Misc/rd_clipboard.rsi - - type: Storage - grid: - - 0,0,4,3 - quickInsert: true - - type: StorageFill - contents: [] #to override base clipboard fill - - type: ItemMapper - mapLayers: - rd_clipboard_paper: - whitelist: - tags: - - Document - rd_clipboard_pen: - whitelist: - tags: - - Write - - type: ResearchClient - - type: ResearchConsole - - type: TechnologyDatabase - - type: ActivatableUI - verbText: rd-clipboard-computer-verb-text - key: enum.ResearchConsoleUiKey.Key - - type: UserInterface - interfaces: - enum.ResearchConsoleUiKey.Key: - type: ResearchConsoleBoundUserInterface - enum.ResearchClientUiKey.Key: - type: ResearchClientBoundUserInterface - enum.WiresUiKey.Key: - type: WiresBoundUserInterface - - type: MeleeWeapon - damage: - types: - Blunt: 10 - - type: Tag - tags: - - Folder - - HighRiskItem - - type: StealTarget - stealGroup: BoxFolderRdClipboard - - type: entity parent: [Paper, BaseSyndicateContraband] # eat or burn your damn piece of paper damn thieves id: TraitorCodePaper diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 3923d12055b..bddea2e7b85 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -18,7 +18,7 @@ # CorgiMeatStealObjective: 1 # DeltaV - Disable the horrible murder of Ian as an objective MantisKnifeStealObjective: 1 # Nyanotrasen - ForensicMantis steal objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml ClipboardStealObjective: 1 - RdClipboardStealObjective: 1 + RdClipboardStealObjective: 1 #DeltaV - Mysta steal Objective see Resources/Prototypes/DeltaV/Objectives/traitor.yml CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 78381f43f8e..dd01afea0e4 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -41,13 +41,6 @@ sprite: sprite: Objects/Misc/qm_clipboard.rsi state: qm_clipboard - -- type: stealTargetGroup - id: BoxFolderRdClipboard - name: steal-target-groups-box-folder-rd-clipboard - sprite: - sprite: Objects/Misc/rd_clipboard.rsi - state: rd_clipboard - type: stealTargetGroup id: FoodMeatCorgi diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 12f6250dc18..3acfb04d244 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -195,16 +195,6 @@ components: - type: StealCondition stealGroup: HandTeleporter - -- type: entity - parent: BaseRDStealObjective - id: RdClipboardStealObjective - components: - - type: NotJobRequirement - job: ResearchDirector - - type: StealCondition - stealGroup: BoxFolderRdClipboard - owner: job-name-rd ## hos diff --git a/Resources/Textures/Objects/Misc/rd_clipboard.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/equipped-BELT.png similarity index 92% rename from Resources/Textures/Objects/Misc/rd_clipboard.rsi/equipped-BELT.png rename to Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/equipped-BELT.png index 7f3b48dbf96e11fb4032d2b4c9164d236d9b107d..d6870433ca323318df29c4efda53cee4ad1ed0e5 100644 GIT binary patch delta 293 zcmV+=0owlMD$gpgya5Wp000ia0czHX3A4rleiDBG^+`lQRCr$P+A(UwKoEuDCzlJl zfNo)9w+Xs{E|Y*wT-zj&94cxP;@h~LR4zQkg_zaaivO^Bh`3=;CYe9qGe&A6i3}*4UI~4Zyd_N|-MnLifxXKq9SJ^L0Au~Z raY?R@bg>ENRMELrIeIX(xTe?-Tz*=0g^N?*P54WUmk?;L*?`)IO*a+ z1poj500000z=*Y(NDuBCzE7lIUzVXYga%)NPoxi38CpXt(b$l++5jJu_2K4r8aigH z4d{zcq$7+XO N002ovPDHLkV1mpijz$0g diff --git a/Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/inhand-left.png similarity index 91% rename from Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-left.png rename to Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/inhand-left.png index 2f8a1813322305539bde3d50e5bc31984c40260a..48be49eb855433e01cac2322fd226363b2b0f0b8 100644 GIT binary patch delta 455 zcmV;&0XY7&Fpw~?y8#No000ia0czHX3A4okpA>(WNklq97md( z5&h6s=zS|SuitiZtt39 zdc1$XBgb(Hja`;PJD^P0mj@!dsxkr8-I`glLL>l*?LWQfSs#-m0tg;_k%daJ9zfL; z4q*RtkCamJ)mm+dJglT%t%UwX^Co^{82UgO*E%6p$ zW|kNi000000000000000{tJ<#rs%j#>L`CpKaMl!NV}J0;urE51`S?XKmXAJ^3a>J z%!Um8c)tD8p16k8n^}FmH~H3oqo>hMTst{#TAd?m#~Tc;;#w5K#+J)UDWdSiy3hUJ z31Dqyo+Nibr{}RAfG%qQR{8@-Yh$asHM+Q2rtayPNav{SF;mmYVi+`-i0JwCLwqj> xjBC)Ouw^Gw>NB9MMhO}-R}!iD0RZ5y_y!_qqX&nbDfs{Z002ovPDHLkV1keK%(Vaj delta 491 zcmV()NklUQUt|C(4}*s2o4T{df=is>*TpK zp`6#oHg{t5`@vCofxGL=B^llWh=_=Yh=^!7+q)In{TnAEYG4pT2nhhyT0Mvr3wZ#5 z>$-oD=Kd*>HYtRV+1#oc#_7pnY!Z-A1HaYz@v@c2D>ezpcu6&6gp~x?IR0ZZ72|Wl zMgrQcrj?D_VmtwH6FC7Jtp*&&3C2F2t-P%KPp)Z^6QE;yvqA{DS1qeyBa9?qt$7d( zTP7yQ)sPX9Us$@kZR0B-gpfAoB_bjsA|ihxA|fIpBBKAoN~y^&m)R<1b(iDRHTqrC zF;W~=eZ20dA>*>SRp=VDF5S^!=<1fL&wLhrVYu>|;SY#A?!ql;5n zRBLrBouj7b{F2RKJ+#*)0NmWZV18~IiK)%d<2S5c4Vvh*?D)R(2=u);2;B=OZ1G{~ h*3z-HJ`oZ96`v-fk}t54WDo!V002ovPDHLkV1nYQ;qm|g diff --git a/Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/inhand-right.png similarity index 91% rename from Resources/Textures/Objects/Misc/rd_clipboard.rsi/inhand-right.png rename to Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/inhand-right.png index ba9bb9671dfd2fc3c696722f5257ff48b24e3629..0e467002e4a88ea4c56094ba2a0132e9f5ed7812 100644 GIT binary patch delta 454 zcmV;%0XhEXFWE1!y8#No000ia0czHX3A4okX%v5!Nkl5<4h=_=Yh=?fLa1@FD+XORaAdUQh_V9YF&O9@aMnq(7W77=d>ERxp z=UIQ{s4A-yP$xH6eWz2|xB~RLZ8Ma~ssMF5=Cg~D(_XC#005K6u~Xu@ur5GTSr=fi zG7#VQp+*pInSZGS*H5!m0bG+#(`tX$X}?wlP!`5>$*8LNR?7@!vVO6pRkey=2N97f z?u&?sh=_=Yh=_=Yh=``m>IzA}7BjD%vgUt^qSh!Yel>FaQ9Y93SQ8bfNbo9`1bte`tfrlA9>40BOQ7DE#3S z5s{DQ1H8O`q1SEWZv2Mro$Er@a_SGrQ$`2ra1_bu**Pw6m(8g{^6h=_=Yh=}5~+8q`CoCH&5A&Q770J!M(f?9KP9RN@+m#uo_ zmDPXdMMSNvZkc7=-(40yfN8T(bPv~SPJhpd3!q-Bn59@&0Tk&npPB18?bRv(02mJX zPK}GgI)F)K9l#krl;?TS$L`?9{7Nq9N471i09>1n)AHVt(|)Z2(6;;M!I4+9rIJ~S zWqo6dN;Qv92N6+u+!qlM5fKp)5fKp)5fOilo7F3%@M|&iwNu==wCFXm>K{u)RCTcy z9Oijlk9v2Q77AEa@tTOJ@2?X)zkH%ztKg~silvR)RMv8u4@i>51Zk_?Q5W4Ft{yxW z%u}gIO!2oNNmG_Xlllq>o3EaxvX)g7+Z$Y#0hqO{)*>RJ|KtZ=UZYH=W?y#z0000< KMNUMnLSTZZC)j=f diff --git a/Resources/Textures/Objects/Misc/rd_clipboard.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Misc/rd_clipboard.rsi/meta.json rename to Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json diff --git a/Resources/Textures/Objects/Misc/rd_clipboard.rsi/rd_clipboard.png b/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/rd_clipboard.png similarity index 93% rename from Resources/Textures/Objects/Misc/rd_clipboard.rsi/rd_clipboard.png rename to Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/rd_clipboard.png index 048bc4beef4eac80ee38db236d83e26043ee2a93..5902fc27ed1ce859831ade3958a31aeedc936ee0 100644 GIT binary patch delta 259 zcmV+e0sQ{@DgG(2ya5Uj000XR0j(pwb+g6+P7;6BNklh1iJ$l-R8VsF{wg3r1yn!Q2;y}moxwX002ov JPDHLkV1hj#YkB|x delta 255 zcmV`Wj&f!lr?EdV%fKKlU;cJBJNM+~vRy=nXM*8tEu7wr Date: Sun, 22 Dec 2024 03:28:02 -0700 Subject: [PATCH 4/7] Code formatting changes --- .../DeltaV/Entities/Objects/Misc/paper.yml | 7 +- .../Entities/Objects/Misc/paper.yml | 2 +- .../Prototypes/Objectives/objectiveGroups.yml | 2 +- .../Objects/Misc/rd_clipboard.rsi/meta.json | 66 +++++++++---------- 4 files changed, 38 insertions(+), 39 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index d856a5849cd..58e569da770 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -32,7 +32,7 @@ description: A bulky electric clipboard, filled with research notes and artifact sketches. With so many compromising documents, you ought to keep this safe. components: - type: Sprite - sprite: /Textures/DeltaV/Objects/Misc/rd_clipboard.rsi + sprite: DeltaV/Objects/Misc/rd_clipboard.rsi layers: - state: rd_clipboard - state: rd_clipboard_paper @@ -51,10 +51,10 @@ - Write insertOnInteract: true - type: Item - sprite: /Textures/DeltaV/Objects/Misc/rd_clipboard.rsi + sprite: DeltaV/Objects/Misc/rd_clipboard.rsi size: Normal - type: Clothing - sprite: /Textures/DeltaV/Objects/Misc/rd_clipboard.rsi + sprite: DeltaV/Objects/Misc/rd_clipboard.rsi - type: Storage grid: - 0,0,4,3 @@ -96,7 +96,6 @@ - type: StealTarget stealGroup: BoxFolderRdClipboard - # contents set by FugitiveRule or a creative admeme - type: entity parent: PaperStationWarrant diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index d0c6cfebce7..e0862b88425 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -603,7 +603,7 @@ - HighRiskItem - type: StealTarget stealGroup: BoxFolderQmClipboard - + - type: entity parent: [Paper, BaseSyndicateContraband] # eat or burn your damn piece of paper damn thieves id: TraitorCodePaper diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index bddea2e7b85..8d88273dace 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -18,7 +18,7 @@ # CorgiMeatStealObjective: 1 # DeltaV - Disable the horrible murder of Ian as an objective MantisKnifeStealObjective: 1 # Nyanotrasen - ForensicMantis steal objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml ClipboardStealObjective: 1 - RdClipboardStealObjective: 1 #DeltaV - Mysta steal Objective see Resources/Prototypes/DeltaV/Objectives/traitor.yml + RdClipboardStealObjective: 1 # DeltaV - Mysta steal Objective see Resources/Prototypes/DeltaV/Objectives/traitor.yml CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 diff --git a/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json index 9cc98d7f88f..3354c4ce1ee 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json @@ -1,35 +1,35 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Clipboard sprites are by Endecc (Github) for SS14 Wizard's Den, taken from https://github.com/space-wizards/space-station-14/pull/21023 modified version by SirSmith148, qm_clipboard_paper is a modified version of paper from bureaucracy.rsi.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "rd_clipboard" - }, - { - "name": "rd_clipboard_over" - }, - { - "name": "rd_clipboard_paper" - }, - { - "name": "rd_clipboard_pen" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Clipboard sprites are by Endecc (Github) for SS14 Wizard's Den, taken from https://github.com/space-wizards/space-station-14/pull/21023 modified version by SirSmith148, qm_clipboard_paper is a modified version of paper from bureaucracy.rsi.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rd_clipboard" + }, + { + "name": "rd_clipboard_over" + }, + { + "name": "rd_clipboard_paper" + }, + { + "name": "rd_clipboard_pen" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } From 97a8b03dff3614c4989e4a10d800830a2018e8c2 Mon Sep 17 00:00:00 2001 From: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> Date: Sun, 22 Dec 2024 09:57:16 -0700 Subject: [PATCH 5/7] Tabs with spaces --- .../Objects/Misc/rd_clipboard.rsi/meta.json | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json index 3354c4ce1ee..c87823506d0 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/rd_clipboard.rsi/meta.json @@ -1,35 +1,35 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Clipboard sprites are by Endecc (Github) for SS14 Wizard's Den, taken from https://github.com/space-wizards/space-station-14/pull/21023 modified version by SirSmith148, qm_clipboard_paper is a modified version of paper from bureaucracy.rsi.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "rd_clipboard" - }, - { - "name": "rd_clipboard_over" - }, - { - "name": "rd_clipboard_paper" - }, - { - "name": "rd_clipboard_pen" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Clipboard sprites are by Endecc (Github) for SS14 Wizard's Den, taken from https://github.com/space-wizards/space-station-14/pull/21023 modified version by SirSmith148, qm_clipboard_paper is a modified version of paper from bureaucracy.rsi.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rd_clipboard" + }, + { + "name": "rd_clipboard_over" + }, + { + "name": "rd_clipboard_paper" + }, + { + "name": "rd_clipboard_pen" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } From d50c0126ad1443d3f6b857ee3049172d16cb9b72 Mon Sep 17 00:00:00 2001 From: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> Date: Sun, 22 Dec 2024 12:13:00 -0700 Subject: [PATCH 6/7] Re Check From 609f31406e672af350231d07fb53a443043d7194 Mon Sep 17 00:00:00 2001 From: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:36:08 -0700 Subject: [PATCH 7/7] Changed blunt amount --- Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index f3cad8c24fb..df6c034b32f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -88,7 +88,7 @@ - type: MeleeWeapon damage: types: - Blunt: 10 + Blunt: 8 - type: Tag tags: - Folder