From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 12 Nov 2023 23:41:45 +0000 (+0300) Subject: Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c99e265435c8a0ebb98c822afe27df8d0ed479ce;p=space-station-14.git Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551) * 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 --- diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index d9ff3ef3aa..8c358923f2 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -74,6 +74,7 @@ - id: ClothingMaskMime - id: ClothingShoesClown - id: ClothingUniformJumpskirtJanimaid + - id: ClothingNeckCloakVoid - id: RevolverCapGun - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml index 87a0961569..3837c0ab60 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml @@ -21,3 +21,12 @@ 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 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index e893c4b841..361ef65734 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -159,3 +159,14 @@ 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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 1d61ca9c7d..a2d8f4b381 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -17,6 +17,7 @@ - ClothingNeckCloakTrans - ClothingNeckCloakAdmin - ClothingNeckCloakMoth + - ClothingNeckCloakVoid - ClothingNeckCloakGoliathCloak - ToySkeleton - Basketball diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index f00f3f3394..484a979e5d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -132,5 +132,6 @@ - ToyFigurineRatServant - ToyFigurineMouse - ToyFigurineHamlet + - ToyFigurineThief chance: 0.90 offset: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index df9954eb15..a47d9c8d61 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -243,4 +243,3 @@ layers: - state: crypt_rusted - state: pirate_label - diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index 207a2c28ba..243d8eaea3 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -455,3 +455,12 @@ 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml index 6fdb04cb3a..5827e832c8 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml @@ -38,4 +38,29 @@ - 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 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 072a8b2b71..16792b0be3 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -558,3 +558,14 @@ 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 index 0000000000..cde2c669b6 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 index 0000000000..7e959dd99e 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 index 0000000000..41206fd4c1 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 index 0000000000..b7e93991a3 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 index 0000000000..83ecc370af --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json index f6e93b64fc..ebbb50e796 100644 --- a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json @@ -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 @@ -157,6 +157,9 @@ { "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 index 0000000000..d0d3f559b8 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 index 0000000000..5c71b3ef75 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 index 0000000000..9567849b28 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 index 0000000000..a8b1f97047 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 index 0000000000..718fde7d58 --- /dev/null +++ b/Resources/Textures/Objects/Tools/spy_device.rsi/meta.json @@ -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 + } + ] +}