Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Research Digi-Board #2507

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/research/rd-clipboard.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rd-clipboard-computer-verb-text = Toggle Research
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@
- !type:NestedSelector # DeltaV
tableId: LockerFillResearchDirectorDeltaV
- id: Intellicard
- id: BoxFolderRdClipboard
- id: BoxEncryptionKeyScience
- id: CircuitImprinterMachineCircuitboard
- id: ClothingBeltUtilityFilled
Expand Down
71 changes: 71 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/paper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Objectives/objectiveGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Objectives/stealTargetGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Objectives/traitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,16 @@
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

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Resources/Textures/Objects/Misc/rd_clipboard.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading