From 5f9e0185438ddfc3011a22fa237d714e9bcf367b Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Fri, 1 Sep 2023 18:48:09 -0600 Subject: [PATCH] [IT'S READY NOW!] [MODULAR] Razor Claws Augment (#23050) * initial * god i hate byond * there we go * oh right * Apply suggestions from code review Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * wew * Manual map merge * wew * Apply suggestions from code review Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --------- Co-authored-by: Snakebittenn <12636964+Snakebittenn@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> --- .../game/objects/items/scratchingstone.dm | 7 + .../middleware/limbs_and_markings.dm | 4 +- .../master_files/icons/hud/actions.dmi | Bin 0 -> 367 bytes .../master_files/icons/obj/kitchen.dmi | Bin 0 -> 482 bytes modular_skyrat/modules/cargo/code/goodies.dm | 7 + .../modules/client/augment/implants.dm | 10 ++ .../modules/implants/code/augments_arms.dm | 124 ++++++++++++++++++ .../modules/implants/code/medical_designs.dm | 17 +++ .../modules/implants/code/medical_nodes.dm | 15 ++- .../modules/implants/icons/razorclaws.dmi | Bin 0 -> 452 bytes .../implants/icons/razorclaws_lefthand.dmi | Bin 0 -> 354 bytes .../implants/icons/razorclaws_righthand.dmi | Bin 0 -> 356 bytes tgstation.dme | 1 + 13 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 modular_skyrat/master_files/code/game/objects/items/scratchingstone.dm create mode 100644 modular_skyrat/master_files/icons/hud/actions.dmi create mode 100644 modular_skyrat/master_files/icons/obj/kitchen.dmi create mode 100644 modular_skyrat/modules/implants/icons/razorclaws.dmi create mode 100644 modular_skyrat/modules/implants/icons/razorclaws_lefthand.dmi create mode 100644 modular_skyrat/modules/implants/icons/razorclaws_righthand.dmi diff --git a/modular_skyrat/master_files/code/game/objects/items/scratchingstone.dm b/modular_skyrat/master_files/code/game/objects/items/scratchingstone.dm new file mode 100644 index 00000000000..ac1fd624429 --- /dev/null +++ b/modular_skyrat/master_files/code/game/objects/items/scratchingstone.dm @@ -0,0 +1,7 @@ +/obj/item/scratching_stone + name = "scratching stone" + icon = 'modular_skyrat/master_files/icons/obj/kitchen.dmi' + icon_state = "scratchingstone" + desc = "A specialized kind of whetstone, made of unknown alloys to hone a cyborg mercenary's claws to the best they can be. This one looks like a shitty second-hand sold by razorkids. It's got like, what, maybe one use left?" + force = 5 + throwforce = 10 //Hey, you can at least use it as a brick. diff --git a/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm index 479265f0cfb..09a174b1ff3 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm @@ -31,7 +31,9 @@ "stomach" = "Stomach", "eyes" = "Eyes", "tongue" = "Tongue", - "Mouth implant" = "Mouth implant" + "Mouth implant" = "Mouth implant", + "Left Arm implant" = "Left Arm implant", + "Right Arm implant" = "Right Arm implant", ) var/list/aug_support = list( diff --git a/modular_skyrat/master_files/icons/hud/actions.dmi b/modular_skyrat/master_files/icons/hud/actions.dmi new file mode 100644 index 0000000000000000000000000000000000000000..32da90c1cf85692e1f69c60107f0bf4a80135f0b GIT binary patch literal 367 zcmV-#0g(QQP)YXv5Ulo%ST600001bW%=J06^y0W&i*HYi>Z2dE`8FI9<)GbOXA7$|1Q#hF%=n41b=D=WDAxqyuZ0Kxwo=H6HR zn*aa+jY&j7R49?f&@l?bFboCIPn5W;m7YLuvkR01WXkNJ2gnk-_Wn}?g~)c-Lbd7f zC6IvsRBVAcw!r)aRq6vpC?%0f(jjfCV;<{8%qfi~9udBo8KjsoHB%{Ou4JU0gGAB; z?k7xV=-0C=1w$1x6rFboCIIX=Y~>=l%*S*jqE0qziiOFR&y*n;bKV0*8{cbwva zFh{z$s+!TA)YAo&W#=C`m*?R9J=Wm9b94Fc5~n0E6EnTZ59N>edHIvH=qCL@iQb zL4}34sFVR%;xyU(9+4Qrf+JI;#BM6F_@6Gy<-Y&yI|aPFyuAKd!IY10udlkH_YaRx zqxCPQz;EvE2XmTAcDwh_K@(?F;6ez55GbWkO7+hGoAt`7ma_p3S4vUWH2_f*0Z`X9 zZQHV0ub9Qj;Po73z=WGnZ6XXqC%BUV^Vl``u=AoQdhpx!IY{%2V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sXRXis3kKmRf&r;C9|j)C}zmTnO2mTn+jpW zRTdPbCTD`ojwh%`S;5uM1?(IEh2kuVirP4G0002TNklR ziS8v1ps9lpy@S|w*DGK(E0XG>Yc{i!DHkAfC_|!urltqr+x=eOOOpZq=bUD@f#I~l zz{JPEYcN{DY`pZ$M!)0vjvH-E#vG#{a@RXL*#HY8-TfOb@l^br( z89?rn2`A!!vWz7`e!&b5&u*jvITckQ5hX6E#mPmP1tppJc|egl!C?hOrQg2<7kvEs zM9W)O>)e_1!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTT7rHwuN3RPqM z(9UjS)y*p;mQ3t6UaMhfE_%ewWrdE0m+v{2nX>)?{hOLr&*#2j$?pPt+{;ev^I>wjy{hpH7Py*Urq=UjAn zIsbQ%L!X#!b7Pf0Ytiq{qYlvqE{qIwMZTKspT1~*o1k0#laQ-DmGK?39?ki0_x|ae x|J{BJ4GN3(=Qxx!UlhN`Rr*hM&j0*shUB-b⁣-uL51c;OXk;vd$@?2>@u8khuT= literal 0 HcmV?d00001 diff --git a/modular_skyrat/modules/implants/icons/razorclaws_righthand.dmi b/modular_skyrat/modules/implants/icons/razorclaws_righthand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..9098ad1ceec8c45c75d7721a21c73c0c338fd687 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3p#Yx{*8>L*#HY8-TfOb@l^br( z89?rn2`A!!vWz7`e!&b5&u*jvITckQ5hX6E#mPmP1tppJc|egl!C?hOrQg2<7kvEs zM9W)O>)e_1!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTT7rHwuN3RPqM z(9UjS)y*p;mQ3t6UaMhfE_%ewWrdE0m+v{2nX>)?{hOLr&*#2j$*P z_>yH7;kY32&!!b-s#h&Gh?Po(aU9v(kb84aL!R>Pa7ULf=^ytPs6Autc;2db_4d{4 z_2oxuq?MF*O})!q{Uq_gAO56&9Fh-;|7ZJE>#!DNM6CD^bO(c{tDnm{r-UW|D2kDI literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 7d03d8c790f..f53f2663d45 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5741,6 +5741,7 @@ #include "modular_skyrat\master_files\code\game\objects\items\oxygen_candle.dm" #include "modular_skyrat\master_files\code\game\objects\items\RCD.dm" #include "modular_skyrat\master_files\code\game\objects\items\religion.dm" +#include "modular_skyrat\master_files\code\game\objects\items\scratchingstone.dm" #include "modular_skyrat\master_files\code\game\objects\items\devices\anomaly_neutralizer.dm" #include "modular_skyrat\master_files\code\game\objects\items\stacks\sheets\sheet_types.dm" #include "modular_skyrat\master_files\code\game\objects\items\storage\backpack.dm"