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

Detective Forensic Chalk + Smaller Evidence Marker Box #1262

Merged
merged 2 commits into from
Jan 8, 2025
Merged
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 @@ -10,6 +10,9 @@
- type: Item
sprite: Objects/Specific/Detective/evidence_marker.rsi
size: Tiny
- type: Tag
tags:
- EvidenceMarker # Imp edit

- type: entity
parent: EvidenceMarker
Expand Down Expand Up @@ -76,13 +79,10 @@

- type: entity
name: evidence marker box
parent: BoxCardboard
parent: BoxBase # imp edit. entity is heavily edited
id: BoxEvidenceMarkers
description: A pack of numbered yellow markers, useful for labeling evidence on a crime scene.
description: A small pack of numbered yellow markers, useful for labeling evidence on a crime scene. # Imp edit
components:
- type: Item
shape:
- 0,0,1,1
- type: StorageFill
contents:
- id: EvidenceMarkerOne
Expand All @@ -94,7 +94,19 @@
- id: EvidenceMarkerSeven
- id: EvidenceMarkerEight
- id: EvidenceMarkerNine
- type: Storage # Imp edit
maxItemSize: Small
grid:
- 0,0,2,2
whitelist:
tags:
- EvidenceMarker
- type: Item # Imp edit
size: Tiny
shape:
- 0,0,0,1
- type: Sprite
sprite: _Impstation/Objects/Storage/boxes.rsi # Imp edit
layers:
- state: box_security
- state: box_security_tiny # Imp edit
- state: evidence_markers
6 changes: 4 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
outerClothing: ClothingOuterArmorBasicSlim
pocket1: WeaponPistolMk58
pocket2: MagazinePistol
inhand:
inhand:
- FlashlightSeclite

- type: startingGear
Expand All @@ -302,6 +302,7 @@
pocket2: ForensicPad
inhand:
- FlashlightSeclite
- CrayonChalk # imp edit

- type: startingGear
id: VisitorDetectiveAlt
Expand All @@ -320,6 +321,7 @@
pocket2: ForensicPad
inhand:
- FlashlightSeclite
- CrayonChalk # imp edit

- type: startingGear
id: VisitorWarden
Expand Down Expand Up @@ -859,7 +861,7 @@
eyes: ClothingEyesHudMedical
pocket1: RegenerativeMesh
pocket2: PillCanisterBicaridine
inhand:
inhand:
- ScalpelAdvanced
- MedicatedSuture

Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/Security/detective.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@
- Flash
- ForensicPad
- ForensicScanner
- CrayonChalk # imp edit
24 changes: 24 additions & 0 deletions Resources/Prototypes/_Impstation/Entities/Objects/Fun/crayons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,27 @@
color: Red
selectableColor: true
infinite: true

- type: entity
parent: Crayon
id: CrayonChalk
name: forensic chalk
description: White, forensic-grade chalk, perfect for marking up a crime scene.
components:
- type: Sprite
state: white
- type: Item
heldPrefix: white
- type: Crayon
color: white
capacity: 200
- type: Tag
tags:
- Write
- Crayon
- CrayonWhite
- Recyclable
- Trash
- type: FlavorProfile
flavors:
- chalky
3 changes: 3 additions & 0 deletions Resources/Prototypes/_Impstation/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,6 @@

- type: Tag
id: WeaponSurvivalRifleUpgradeSMGKit

- type: Tag
id: EvidenceMarker
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Chef boxes modified from tgstation, overlay sprites by Darkmajia",
"copyright": "Chef boxes modified from tgstation, overlay sprites by Darkmajia, tiny security box edited from tgstation.",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -33,6 +33,12 @@
},
{
"name": "vegetarian"
},
{
"name": "box_security_tiny"
},
{
"name": "evidence_markers"
}
]
}
Loading