From 45abdce5648a448f5844d0c0834d0838cde7cd4c Mon Sep 17 00:00:00 2001 From: Kip Date: Tue, 24 Dec 2024 14:04:03 +1100 Subject: [PATCH 1/5] laq updates, engi access and sprite tweak --- .../en-US/_Impstation/station-laws/laws.ftl | 1 + .../_Impstation/Entities/Mobs/NPCs/tcktck.yml | 3 +++ .../Prototypes/_Impstation/silicon-laws.yml | 8 +++++++- .../Mobs/Silicon/Bots/tcktck.rsi/anchored.png | Bin 708 -> 342 bytes 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl b/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl index 87df036b6d2299..a76346775e767e 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 = Do not sabotage the station. Maintain honour. 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..d98a55b7256289 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml @@ -299,3 +299,6 @@ clumsyHypo: false clumsyDefib: false clumsyGuns: false + - type: Access + tags: + - Engineering \ 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 79d6787c589ca938c12221a87b620c4f64ef458d..af554b5a5d9256b0bbacbcb865add7bccd387cc6 100644 GIT binary patch delta 326 zcmX@YdW~s*ZzQH-)8oc^Xg!S4ogxFvEWssOuC71Bzboba4!cXni~FpwM9j4wvLZ zS%3e_uk%Z?4t1ClV-$SP@Sy024ZCye`ySi$UEdqzw250K>D+VC#v9rU6T?_0ShJ?+ zyj^hZzeDqqa|#D)0vFzxF5I>^gV*5bXR(e851!5CQh0Xk!hh8btG^%5XTGyx;Tl(A zj?|p5O}Z`B|7DLC{+q5U|0H2<;!5U|9KoBGvYb5L_ozyZHE_X?$({`=>b5z0>n%2_ zW;obKC2o!1xV>t_Qs#Ya=NJ_BedzPIN_g*X$K0@kDTcA}N7u~%)Bim9`C#WBMuRCV VFTVc@*8%#D!PC{xWt~$(696+PjZFXm delta 695 zcmV;o0!aPV0>lN78Gi-<0063Kaozv`00DDSM?wIu&K&6g00MqVL_t(|obB4dYuZp8 z2k@^W!z^rCWHC+&ks3-tC_Rkc8t|}7VW&d&KMr~t^sOgUR_cwste2YsZ}_ z`VEI`^T3J?*xRYF*2VW&Uxvk+#^ih&qxOVr3SGzJ-hVt0(txsFV!SVtbtvm4CaHf* zRK7_N{QyEQR@O@l05Y#+;Wy{;-1jGh5JCtcgb+dqA%tuOA@TSo%T=>5Z6kU-zUfBo z30I^SIT^AJKg=)OXnsxH-_?pLgD299Gy#VP?^*BN1%7|JL04)$YR0CC{1xyMqohXX zuH$j7i+|LB=Gl3w@>7R5oI%c~(Un?JF0(eKZLsZQ9sP#$w0Jy7^XxojmXi^k`%K$l zuH((mH3^T${ZnH;-Z2v;>}SnC%_ck^_cy*MqmLsw-rK1#cmF={xSoG5KxjM;JaoNa zsTg;r3p4svZy1HUe?K4VMK4`{5~I`+dOiTad@%EGf4oMk9$!RV)=TV{`LOwQ-Ji|} d5JJfR><>`^6;C{75NrSd002ovPDHLkV1m;`P=){i From 42f0cb4d295bc9b68a1f24f6b982caf388711600 Mon Sep 17 00:00:00 2001 From: Kip Date: Tue, 24 Dec 2024 18:44:31 +1100 Subject: [PATCH 2/5] Update laws.ftl --- Resources/Locale/en-US/_Impstation/station-laws/laws.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl b/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl index a76346775e767e..ce9fa45167afc5 100644 --- a/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl +++ b/Resources/Locale/en-US/_Impstation/station-laws/laws.ftl @@ -1,4 +1,4 @@ -law-tcksimov-0 = Do not sabotage the station. Maintain honour. +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. From 92996d902d6fe2b1159f0ee82e0e6d79117316ed Mon Sep 17 00:00:00 2001 From: Kip Date: Tue, 24 Dec 2024 20:36:56 +1100 Subject: [PATCH 3/5] funny drill --- .../_Impstation/Entities/Mobs/NPCs/tcktck.yml | 3 +- .../Specific/Robotics/Borg/borg_modules.yml | 2 +- .../Entities/Objects/Tools/tools.yml | 62 ++++++++++++++---- .../equipped-BELT.png | Bin .../Objects/Tools/tckdrill.rsi/icon_bolt.png | Bin 0 -> 263 bytes .../Objects/Tools/tckdrill.rsi/icon_pry.png | Bin 0 -> 260 bytes .../inhand-left.png | Bin .../inhand-right.png | Bin .../{tckwrench.rsi => tckdrill.rsi}/meta.json | 5 +- .../Objects/Tools/tckwrench.rsi/icon.png | Bin 228 -> 0 bytes .../Objects/Tools/tckwrench.rsi/storage.png | Bin 237 -> 0 bytes 11 files changed, 57 insertions(+), 15 deletions(-) rename Resources/Textures/_Impstation/Objects/Tools/{tckwrench.rsi => tckdrill.rsi}/equipped-BELT.png (100%) create mode 100644 Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/icon_bolt.png create mode 100644 Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/icon_pry.png rename Resources/Textures/_Impstation/Objects/Tools/{tckwrench.rsi => tckdrill.rsi}/inhand-left.png (100%) rename Resources/Textures/_Impstation/Objects/Tools/{tckwrench.rsi => tckdrill.rsi}/inhand-right.png (100%) rename Resources/Textures/_Impstation/Objects/Tools/{tckwrench.rsi => tckdrill.rsi}/meta.json (86%) delete mode 100644 Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/icon.png delete mode 100644 Resources/Textures/_Impstation/Objects/Tools/tckwrench.rsi/storage.png diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml index d98a55b7256289..3e07d721657115 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml @@ -301,4 +301,5 @@ clumsyGuns: false - type: Access tags: - - Engineering \ No newline at end of file + - Engineering + - External \ No newline at end of file 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 d93f31763dc917..6b7c1914a8b088 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..ef37605e2f571b 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml @@ -45,22 +45,60 @@ 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 + collection: WeakHit \ No newline at end of file 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 0000000000000000000000000000000000000000..2a28fc7ebe399d5ba63f39b3a6353ddd3a01ef9c GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~%K)DcS0JsY zrfh3wVrT1W>0aUMjL_AQv)w`=vX^T&3G zi;3o3n+MV?ToU9L%0aUMjL_AQv)w`=vX^T&3G zi;3o3n+MV?ToU9L%0aUMjL_AQv)w`=vX^T&2{ zn%%Pm>J%yo@(X78j}GDvw%Gw??L1u^LnNjqCmdjtkd(a0Qt|VG>x8KcH+yof8MN5^%D25oq4i Date: Tue, 24 Dec 2024 20:46:51 +1100 Subject: [PATCH 4/5] rsi fix --- .../Textures/_Impstation/Objects/Tools/tckdrill.rsi/meta.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/meta.json index 24a56fbf33d734..b08219353719e5 100644 --- a/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/meta.json +++ b/Resources/Textures/_Impstation/Objects/Tools/tckdrill.rsi/meta.json @@ -24,9 +24,6 @@ { "name": "equipped-BELT", "directions": 4 - }, - { - "name": "storage" } ] } From a6936636e14545119d6992f91aea412c3f68df8e Mon Sep 17 00:00:00 2001 From: Dark Date: Tue, 24 Dec 2024 10:00:38 +0000 Subject: [PATCH 5/5] whitespaceeee --- Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml | 2 +- .../Entities/Objects/Specific/Robotics/Borg/borg_modules.yml | 2 +- .../Prototypes/_Impstation/Entities/Objects/Tools/tools.yml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml index 3e07d721657115..12df0192b46040 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml @@ -302,4 +302,4 @@ - type: Access tags: - Engineering - - External \ No newline at end of file + - 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 6b7c1914a8b088..2abd5eebc33519 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 @@ -55,4 +55,4 @@ icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module } - type: Tag tags: - - BorgModuleTckTck \ No newline at end of file + - BorgModuleTckTck diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml index ef37605e2f571b..5f0f67f7bd6265 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Tools/tools.yml @@ -101,4 +101,5 @@ types: Blunt: 2 soundHit: - collection: WeakHit \ No newline at end of file + collection: WeakHit + \ No newline at end of file