diff --git a/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl b/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl index 87df036b6d2299..ce9fa45167afc5 100644 --- a/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl +++ b/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl @@ -1,3 +1,4 @@ +law-tcksimov-0 = You may not cause harm to the station. law-tcksimov-1 = You are a power source. law-tcksimov-2 = APCs must be fully charged. law-tcksimov-3 = Batteries must be fully charged. diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml index 250a719f51361b..12df0192b46040 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml @@ -299,3 +299,7 @@ clumsyHypo: false clumsyDefib: false clumsyGuns: false + - type: Access + tags: + - Engineering + - External diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml index b6e0c665a0fb2c..8b1e8c23af6367 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml @@ -12,7 +12,7 @@ - CableMVStackLingering10 - CableApcStackLingering10 - trayScanner - - TckWrench + - MicroDrill - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: wire-module } - type: Tag diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml index 797147f9215fbf..5f0f67f7bd6265 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml @@ -45,22 +45,61 @@ price: 22 - type: entity - name: micro wrench - parent: Wrench - id: TckWrench - description: "A common tool for assembly and disassembly. Remember: lefty t'kch, righty k'ckt." + name: micro drill + parent: BaseItem + id: MicroDrill + description: A bite-sized power drill for anchoring structures and prying tiles. components: + - type: Tag + tags: + - Powerdrill - type: Sprite - sprite: _Impstation/Objects/Tools/tckwrench.rsi - state: icon + sprite: _Impstation/Objects/Tools/tckdrill.rsi + state: icon_bolt + - type: Item + sprite: _Impstation/Objects/Tools/tckdrill.rsi + size: Tiny + - type: Tool + qualities: + - Anchoring + speedModifier: 1.5 + useSound: /Audio/Items/drill_use.ogg + - type: ToolTileCompatible + delay: 0.5 + - type: Prying + speedModifier: 1.5 + pryPowered: false # lets not do this again + - type: MultipleTool + statusShowBehavior: true + entries: + - behavior: Anchoring + sprite: + sprite: _Impstation/Objects/Tools/tckdrill.rsi + state: icon_bolt + useSound: + path: /Audio/Items/ratchet.ogg #its too low powered to use the real sound + changeSound: + path: /Audio/Items/change_drill.ogg + - behavior: Prying + sprite: + sprite: _Impstation/Objects/Tools/tckdrill.rsi + state: icon_pry + useSound: + path: /Audio/Items/crowbar.ogg + changeSound: + path: /Audio/Items/change_drill.ogg + - type: PhysicalComposition + materialComposition: + Steel: 300 + Plastic: 100 + - type: StaticPrice + price: 100 - type: MeleeWeapon - wideAnimationRotation: 135 - attackRate: 1.5 - range: 1 + wideAnimationRotation: 0 #youre just hitting people with the backside of it + attackRate: 1 damage: types: Blunt: 2 soundHit: collection: WeakHit - - type: Item - size: Tiny \ No newline at end of file + \ No newline at end of file diff --git a/Resources/Prototypes/_Impstation/silicon-laws.yml b/Resources/Prototypes/_Impstation/silicon-laws.yml index 282aed4fa0643e..5e97cb1640c459 100644 --- a/Resources/Prototypes/_Impstation/silicon-laws.yml +++ b/Resources/Prototypes/_Impstation/silicon-laws.yml @@ -1,4 +1,9 @@ #tck'tck lawset +- type: siliconLaw + id: Tcksimov0 + order: 0 + lawString: law-tcksimov-0 + - type: siliconLaw id: Tcksimov1 order: 1 @@ -22,8 +27,9 @@ - type: siliconLawset id: Tcksimov laws: + - Tcksimov0 - Tcksimov1 - Tcksimov2 - Tcksimov3 - Tcksimov4 - obeysTo: laws-owner-crew \ No newline at end of file + obeysTo: laws-owner-crew diff --git a/Resources/Textures/_Impstation/Mobs/Silicon/Bots/tcktck.rsi/anchored.png b/Resources/Textures/_Impstation/Mobs/Silicon/Bots/tcktck.rsi/anchored.png index 79d6787c589ca9..af554b5a5d9256 100644 Binary files a/Resources/Textures/_Impstation/Mobs/Silicon/Bots/tcktck.rsi/anchored.png and b/Resources/Textures/_Impstation/Mobs/Silicon/Bots/tcktck.rsi/anchored.png differ diff --git a/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/equipped-BELT.png b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/equipped-BELT.png rename to Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/equipped-BELT.png diff --git a/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/icon_bolt.png b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/icon_bolt.png new file mode 100644 index 00000000000000..2a28fc7ebe399d Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/icon_bolt.png differ diff --git a/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/icon_pry.png b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/icon_pry.png new file mode 100644 index 00000000000000..e8e6fc415c5a39 Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/icon_pry.png differ diff --git a/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/inhand-left.png b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/inhand-left.png rename to Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/inhand-left.png diff --git a/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/inhand-right.png b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/inhand-right.png rename to Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/inhand-right.png diff --git a/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/meta.json similarity index 88% rename from Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/meta.json rename to Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/meta.json index a8058321c56817..b08219353719e5 100644 --- a/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/meta.json +++ b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/meta.json @@ -8,7 +8,10 @@ }, "states": [ { - "name": "icon" + "name": "icon_bolt" + }, + { + "name": "icon_pry" }, { "name": "inhand-left", @@ -21,9 +24,6 @@ { "name": "equipped-BELT", "directions": 4 - }, - { - "name": "storage" } ] } diff --git a/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/icon.png deleted file mode 100644 index e16a4e4f698fa1..00000000000000 Binary files a/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/storage.png b/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/storage.png deleted file mode 100644 index 62d3c54bd85457..00000000000000 Binary files a/Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/storage.png and /dev/null differ