From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Sat, 17 Feb 2024 20:49:16 +0000 (-0800) Subject: Added Evidence Markers for the Detective! (#25255) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=07b796d6d20b190916182e9ab4bcf32b85fe1b92;p=space-station-14.git Added Evidence Markers for the Detective! (#25255) * added evidence markers * box tweak * fixed a spelling mistake * new sprites, tweaked yml too --- diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 5e7d7e1efc..623371ad09 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -126,6 +126,7 @@ - id: DrinkDetFlask - id: ClothingHandsGlovesForensic - id: HoloprojectorSecurity + - id: BoxEvidenceMarkers - type: entity id: ClosetBombFilled diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml new file mode 100644 index 0000000000..35b99573d0 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml @@ -0,0 +1,110 @@ +- type: entity + abstract: true + parent: BaseItem + id: EvidenceMarker + name: evidence marker + description: A numbered yellow marker, useful for labeling evidence on a crime scene. + components: + - type: Sprite + sprite: Objects/Specific/Detective/evidence_marker.rsi + - type: Item + sprite: Objects/Specific/Detective/evidence_marker.rsi + size: Tiny + +- type: entity + parent: EvidenceMarker + id: EvidenceMarkerOne + name: evidence marker + components: + - type: Sprite + state: one + +- type: entity + parent: EvidenceMarker + id: EvidenceMarkerTwo + name: evidence marker + components: + - type: Sprite + state: two + +- type: entity + parent: EvidenceMarker + id: EvidenceMarkerThree + name: evidence marker + components: + - type: Sprite + state: three + +- type: entity + parent: EvidenceMarker + id: EvidenceMarkerFour + name: evidence marker + components: + - type: Sprite + state: four + +- type: entity + parent: EvidenceMarker + id: EvidenceMarkerFive + name: evidence marker + components: + - type: Sprite + state: five + +- type: entity + parent: EvidenceMarker + id: EvidenceMarkerSix + name: evidence marker + components: + - type: Sprite + state: six + +- type: entity + parent: EvidenceMarker + id: EvidenceMarkerSeven + name: evidence marker + components: + - type: Sprite + state: seven + +- type: entity + parent: EvidenceMarker + id: EvidenceMarkerEight + name: evidence marker + components: + - type: Sprite + state: eight + +- type: entity + parent: EvidenceMarker + id: EvidenceMarkerNine + name: evidence marker + components: + - type: Sprite + state: nine + +- type: entity + name: evidence marker box + parent: BoxCardboard + id: BoxEvidenceMarkers + description: A pack of numbered yellow markers, useful for labeling evidence on a crime scene. + components: + - type: Item + shape: + - 0,0,1,1 + - type: StorageFill + contents: + - id: EvidenceMarkerOne + - id: EvidenceMarkerTwo + - id: EvidenceMarkerThree + - id: EvidenceMarkerFour + - id: EvidenceMarkerFive + - id: EvidenceMarkerSix + - id: EvidenceMarkerSeven + - id: EvidenceMarkerEight + - id: EvidenceMarkerNine + - type: Sprite + layers: + - state: box_security + - state: evidence_markers + \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/eight.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/eight.png new file mode 100644 index 0000000000..71c38d8d78 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/eight.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/five.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/five.png new file mode 100644 index 0000000000..a657600930 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/five.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/four.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/four.png new file mode 100644 index 0000000000..b8d7147896 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/four.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-left.png new file mode 100644 index 0000000000..c093a11b0c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-right.png new file mode 100644 index 0000000000..f0bc709489 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/meta.json b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/meta.json new file mode 100644 index 0000000000..4beec91793 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified sprites made originally by tgstation @ https://github.com/tgstation/tgstation/commit/da42afcbaeaa04e5ba288ade027c011efb3ef0ab, Skarlet and Psychosyo. Modified by moomoobeef.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "one" + }, + { + "name": "two" + }, + { + "name": "three" + }, + { + "name": "four" + }, + { + "name": "five" + }, + { + "name": "six" + }, + { + "name": "seven" + }, + { + "name": "eight" + }, + { + "name": "nine" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/nine.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/nine.png new file mode 100644 index 0000000000..a81db9fae7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/nine.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/one.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/one.png new file mode 100644 index 0000000000..22967c91b8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/one.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/seven.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/seven.png new file mode 100644 index 0000000000..eefe30609e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/seven.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/six.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/six.png new file mode 100644 index 0000000000..7596aca737 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/six.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/three.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/three.png new file mode 100644 index 0000000000..f827e378a6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/three.png differ diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/two.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/two.png new file mode 100644 index 0000000000..7309c2ff9b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/two.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png new file mode 100644 index 0000000000..5146156969 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 47c69de027..23868a906f 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef.", "size": { "x": 32, "y": 32 @@ -73,6 +73,9 @@ { "name": "disk" }, + { + "name": "evidence_markers" + }, { "name": "flashbang" },