Merge pull request #1262 from Pinkbat5/detectivechalk

Detective Forensic Chalk + Smaller Evidence Marker Box

Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml

@@ -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
@@ -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
@@ -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

Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml

@@ -282,7 +282,7 @@
     outerClothing: ClothingOuterArmorBasicSlim
     pocket1: WeaponPistolMk58
     pocket2: MagazinePistol
-  inhand: 
+  inhand:
   - FlashlightSeclite
 
 - type: startingGear
@@ -302,6 +302,7 @@
     pocket2: ForensicPad
   inhand:
   - FlashlightSeclite
+  - CrayonChalk # imp edit
 
 - type: startingGear
   id: VisitorDetectiveAlt
@@ -320,6 +321,7 @@
     pocket2: ForensicPad
   inhand:
   - FlashlightSeclite
+  - CrayonChalk # imp edit
 
 - type: startingGear
   id: VisitorWarden
@@ -859,7 +861,7 @@
     eyes: ClothingEyesHudMedical
     pocket1: RegenerativeMesh
     pocket2: PillCanisterBicaridine
-  inhand: 
+  inhand:
   - ScalpelAdvanced
   - MedicatedSuture
 

Resources/Prototypes/Roles/Jobs/Security/detective.yml

@@ -34,3 +34,4 @@
     - Flash
     - ForensicPad
     - ForensicScanner
+    - CrayonChalk # imp edit

Resources/Prototypes/_Impstation/Entities/Objects/Fun/crayons.yml

@@ -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

Resources/Prototypes/_Impstation/tags.yml

@@ -88,3 +88,6 @@
 
 - type: Tag
   id: WeaponSurvivalRifleUpgradeSMGKit
+
+- type: Tag
+  id: EvidenceMarker

Resources/Textures/_Impstation/Objects/Storage/boxes.rsi/meta.json

@@ -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
@@ -33,6 +33,12 @@
         },
         {
             "name": "vegetarian"
+        },
+        {
+            "name": "box_security_tiny"
+        },
+        {
+            "name": "evidence_markers"
         }
     ]
 }