]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Sun, 12 Nov 2023 23:41:45 +0000 (02:41 +0300)
committerGitHub <noreply@github.com>
Sun, 12 Nov 2023 23:41:45 +0000 (16:41 -0700)
* add some stuff

* finish pack

* Update encryption_keys.yml

* revert secret channels

* revert spy key

* add spy crew monitor

* add invisible crate

* add void cloak

20 files changed:
Resources/Prototypes/Catalog/Fills/Crates/service.yml
Resources/Prototypes/Entities/Clothing/Hands/specific.yml
Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
Resources/Prototypes/Entities/Objects/Fun/figurines.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
Resources/Textures/Clothing/Neck/Cloaks/void.rsi/equipped-NECK.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Cloaks/void.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Cloaks/void.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Cloaks/void.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Cloaks/void.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Fun/figurines.rsi/meta.json
Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/spy_device.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/spy_device.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/spy_device.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/spy_device.rsi/meta.json [new file with mode: 0644]

index d9ff3ef3aa8dbbd2e93fefc15aa83abca696f997..8c358923f20ece7a283feb02c2788bec30b2eb32 100644 (file)
@@ -74,6 +74,7 @@
     - id: ClothingMaskMime
     - id: ClothingShoesClown
     - id: ClothingUniformJumpskirtJanimaid
+    - id: ClothingNeckCloakVoid
     - id: RevolverCapGun
 
 - type: entity
index 87a0961569ecc2ec5280b8cac2ef549180678fe9..3837c0ab60f611cd920945eccad7a5a54393129b 100644 (file)
       interfaces:
         - key: enum.ChameleonUiKey.Key
           type: ChameleonBoundUserInterface
+- type: entity
+  parent: ClothingHandsChameleon
+  id: ClothingHandsChameleonThief
+  suffix: Chameleon, Thieving
+  components:
+  - type: Thieving
+    stripTimeReduction: 2
+    stealthy: true
\ No newline at end of file
index e893c4b84184bf48f5a8619f676cbfa65e813352..361ef6573428b00a0335dd87fd67e903b78ad07e 100644 (file)
       toggleable-clothing: !type:ContainerSlot {}
   - type: TypingIndicatorClothing
     proto: moth
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakVoid
+  name: void cloak
+  description: A cloak of darkness. For those who have gone to the dark side of the force.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Cloaks/void.rsi
+  - type: TypingIndicatorClothing
+    proto: alien
\ No newline at end of file
index 1d61ca9c7d94d162fed9c7e76004e810f689477b..a2d8f4b38190ce57960433de381fd4e6c2e8f923 100644 (file)
@@ -17,6 +17,7 @@
         - ClothingNeckCloakTrans
         - ClothingNeckCloakAdmin
         - ClothingNeckCloakMoth
+        - ClothingNeckCloakVoid
         - ClothingNeckCloakGoliathCloak
         - ToySkeleton
         - Basketball
index f00f3f33940ca3d24a1edc0963c974321a0cf81b..484a979e5d2d45721d964edbb76bba12d5b316a7 100644 (file)
       - ToyFigurineRatServant
       - ToyFigurineMouse
       - ToyFigurineHamlet
+      - ToyFigurineThief
       chance: 0.90
       offset: 0.2
index df9954eb1543d5b2abc3c89b31a714c7b002a890..a47d9c8d610a584ecf63e397dfaa25dd68b25a0f 100644 (file)
       layers:
         - state: crypt_rusted
         - state: pirate_label
-
index 207a2c28ba72ed8ca30123fbc9e0529047ba449a..243d8eaea3d64a7d00bb6d11703b94bf47c3f811 100644 (file)
   components:
   - type: Sprite
     state: skeletonprize
+
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineThief
+  name: thief character figure
+  description: Hiding in the shadows...
+  components:
+  - type: Sprite
+    state: thiefcharacter
index 6fdb04cb3a2459363cecf713d88d7bbbf3d5dc5f..5827e832c82594986cea6d8369fe279a271102ed 100644 (file)
   - type: ItemSlots
     slots:
       cell_slot:
-        name: power-cell-slot-component-slot-name-default 
\ No newline at end of file
+        name: power-cell-slot-component-slot-name-default 
+
+- type: entity
+  id: SpyCrewMonitor
+  name: Spy Monitor
+  description: A spy device capable of connecting to crew monitoring servers.
+  parent: HandheldCrewMonitor
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/spy_device.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Tools/spy_device.rsi
+  - type: PowerCellDraw
+    useRate: 40 #Should be weaker than the original
+
+- type: entity
+  id: SpyCrewMonitorEmpty
+  parent: SpyCrewMonitor
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default 
+  
\ No newline at end of file
index 072a8b2b7176c054deac126f26c66a4ea83419ca..16792b0be3dec9e1d348d094980d1657ed36fc02 100644 (file)
     sprite: Structures/Storage/Crates/trashcart_jani.rsi
   - type: AccessReader
     access: [["Janitor"]]
+
+- type: entity
+  parent: CrateBaseWeldable
+  id: InvisibleCrate
+  suffix: Stealth
+  components:
+  - type: Stealth
+    hadOutline: true
+  - type: StealthOnMove
+    passiveVisibilityRate: -0.10
+    movementVisibilityRate: 0.10
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/equipped-NECK.png
new file mode 100644 (file)
index 0000000..cde2c66
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/icon.png
new file mode 100644 (file)
index 0000000..7e959dd
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..41206fd
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..b7e9399
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/meta.json
new file mode 100644 (file)
index 0000000..83ecc37
--- /dev/null
@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/8b1ffd1e49a2d30a0aab63264106a3ec0e07f415",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.5
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.5
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.5
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.5
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
index f6e93b64fccc069b57454ac37b7d184cbbbbd778..ebbb50e7961832ec6c1324b4421508c4e3a1c12c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller and holoclown done by brainfood1183.",
+  "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, thiefcharacter and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller and holoclown done by brainfood1183.",
   "size": {
     "x": 32,
     "y": 32
         {
             "name": "fig_box_unfolded"
         },
+        {
+            "name": "thiefcharacter"
+        },
         {
             "name": "figurine_spawner"
         }
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png b/Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png
new file mode 100644 (file)
index 0000000..d0d3f55
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png differ
diff --git a/Resources/Textures/Objects/Tools/spy_device.rsi/icon.png b/Resources/Textures/Objects/Tools/spy_device.rsi/icon.png
new file mode 100644 (file)
index 0000000..5c71b3e
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spy_device.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/spy_device.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/spy_device.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..9567849
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spy_device.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/spy_device.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/spy_device.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..a8b1f97
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spy_device.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/spy_device.rsi/meta.json b/Resources/Textures/Objects/Tools/spy_device.rsi/meta.json
new file mode 100644 (file)
index 0000000..718fde7
--- /dev/null
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-3.0",
+  "copyright": "Created by TheShuEd(Github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}