From a94c55c69b6324d336ce95b439d7c0ce4056895d Mon Sep 17 00:00:00 2001 From: Orion-416 Date: Sun, 1 Mar 2026 10:42:39 +0000 Subject: [PATCH] port cane --- .../_Omu/NTR/Catalog/ntr_catalog.yml | 15 +++ .../Prototypes/_Omu/NTR/Catalog/pods.yml | 8 ++ .../Objects/Weapons/Melee/cane_nt.yml | 74 +++++++++++++++ .../Melee/cane_nt.rsi/cane-nt-active.png | Bin 0 -> 814 bytes .../Weapons/Melee/cane_nt.rsi/cane-nt.png | Bin 0 -> 369 bytes .../Weapons/Melee/cane_nt.rsi/icon.png | Bin 0 -> 369 bytes .../Weapons/Melee/cane_nt.rsi/meta.json | 88 ++++++++++++++++++ .../Melee/cane_nt.rsi/off-inhand-left.png | Bin 0 -> 257 bytes .../Melee/cane_nt.rsi/off-inhand-right.png | Bin 0 -> 262 bytes .../Melee/cane_nt.rsi/on-inhand-left.png | Bin 0 -> 514 bytes .../Melee/cane_nt.rsi/on-inhand-right.png | Bin 0 -> 576 bytes 11 files changed, 185 insertions(+) create mode 100644 Resources/Prototypes/_Omu/NTR/Catalog/pods.yml create mode 100644 Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/cane_nt.yml create mode 100644 Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/cane-nt-active.png create mode 100644 Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/cane-nt.png create mode 100644 Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/icon.png create mode 100644 Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/meta.json create mode 100644 Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/off-inhand-left.png create mode 100644 Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/off-inhand-right.png create mode 100644 Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/on-inhand-left.png create mode 100644 Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/on-inhand-right.png diff --git a/Resources/Prototypes/_Omu/NTR/Catalog/ntr_catalog.yml b/Resources/Prototypes/_Omu/NTR/Catalog/ntr_catalog.yml index 0bd49e58a87..809525a1782 100644 --- a/Resources/Prototypes/_Omu/NTR/Catalog/ntr_catalog.yml +++ b/Resources/Prototypes/_Omu/NTR/Catalog/ntr_catalog.yml @@ -11,3 +11,18 @@ resetRestockOnPurchase: true restockAfterPurchase: 300 #5 minutes so NTR can't spam them (Please dont make me add a stock limit, that would just be boring) +- type: listing + id: NTRCane + name: Nanotrasen Energy cane + description: A cane which acts as similiar to a stunbaton when powered. + productEntity: SpawnPodNTRCane + icon: + sprite: _Starlight/Objects/Weapons/Melee/cane_nt.rsi + state: icon + cost: + NTLoyaltyPoint: 10 + categories: + - NTRpersonal + restockTime: 0 + resetRestockOnPurchase: true + restockAfterPurchase: 1200 # 20min diff --git a/Resources/Prototypes/_Omu/NTR/Catalog/pods.yml b/Resources/Prototypes/_Omu/NTR/Catalog/pods.yml new file mode 100644 index 00000000000..55537edcf21 --- /dev/null +++ b/Resources/Prototypes/_Omu/NTR/Catalog/pods.yml @@ -0,0 +1,8 @@ +- type: entity + id: SpawnPodNTRCane + categories: [ HideSpawnMenu ] + name: SpawnEnergyCane + parent: SpawnSupplyEmpty + components: + - type: SpawnOnDespawn + prototype: CaneNT diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/cane_nt.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/cane_nt.yml new file mode 100644 index 00000000000..830f06ce7e2 --- /dev/null +++ b/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/cane_nt.yml @@ -0,0 +1,74 @@ +- type: entity + name: fancy cane + parent: [ BaseItem, BaseCentcommContraband ] # Omu, replace command with Centcomm contra + id: CaneNT + description: A cane with special engraving on it. It seems well suited for fending off assailants... + components: + - type: Sprite + sprite: _Starlight/Objects/Weapons/Melee/cane_nt.rsi + layers: + - state: cane-nt + map: [ "enum.ToggleableVisuals.Layer" ] + - type: Stunbaton + energyPerUse: 25 + - type: ItemToggle + predictable: false + soundActivate: + collection: sparks + params: + variation: 0.250 + soundDeactivate: + collection: sparks + params: + variation: 0.250 + soundFailToActivate: + path: /Audio/Machines/button.ogg + params: + variation: 0.250 + - type: ItemToggleMeleeWeapon + activatedDamage: + types: + Blunt: 0 + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 10 + bluntStaminaDamageFactor: 2.0 + angle: 60 + animation: WeaponArcSlash + - type: StaminaDamageOnHit + damage: 40 + sound: /Audio/Weapons/egloves.ogg + - type: StaminaDamageOnCollide + damage: 40 + sound: /Audio/Weapons/egloves.ogg + - type: LandAtCursor + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: UseDelay + - type: Item + heldPrefix: off + size: Normal + - type: DisarmMalus + malus: 0.300 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleableVisuals.Enabled: + enum.ToggleableVisuals.Layer: + True: {state: cane-nt-active} + False: {state: cane-nt} + - type: Riggable + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery +# - type: MobilityAid + - type: Prying + speedModifier: 0.25 diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/cane-nt-active.png b/Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/cane-nt-active.png new file mode 100644 index 0000000000000000000000000000000000000000..3f0bd231f16a4984c6e7f4435b6678cb8ddce324 GIT binary patch literal 814 zcmV+}1JV46P)Px%=t)FDRCt{2T0M``KolG!s+`h9TiVHQ;G7bPo+^E=#i#rsB%loRfeLCU?eG`S zB@IfK)1@5>`}x+!NSB=V?V;>6`EZokdHeNt-v9vtXN{=uKiscol=s8&1)|GOy>s-* z|GaPV;rIdo@bSYB007r>Y6ZbJKe(RP(ciCTTrMVDE+(|Ue`@?rBeP%4`1#vU0KnCo zmtLlWPyQO(BjFhSXPOPUy}5(0ApDEp`H(Qi@NhU_G#X*^e3; zmtObEAH)aoXDFWQxmWS0@b|VFay{qm&7GJ0|1tb0p9RvK%_zSBhPYA}pRsJmv;gw4 z62C28<{U{%W3-TwG{!K^$vBQlP5v}z1JWQZ{)}XrQ&)Ue^|FY!7aSkrh5s?)A3R?& zlJBD^0?OV`)4zWs&s{-;UITb%eIGgIZS<}&hOBzPDQOELUgmsXBkrivAW80aJ0wZc z2lr9DQ4~eS7*4+K@O!4nFOhD~dCd{P)@rY^-q-@OYNhuf9w-AK;-x)({dZ>~l;&hH zjUo|R6aZ3SyWM(8a;~e-uQwY2pzFo9?qNxC>^)bj_w6J{J;_RQmUn0twD{(#^QC=vVt6@ot?_ycqis>DHj5bqZ48=AB72gnUg{raE!15PJw-PL8Jmqe#g zu+`+ZOX68oG|?`Yc=ZQJulp*OdGQATRcXA#A7DRs-G)B>0Y^c^bybQqsz!E^#)eDI z8n*a$bH?u7?`KtTWa123H%sTED+pa1{>07*qoM6N<$f~r)7z5oCK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/cane-nt.png b/Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/cane-nt.png new file mode 100644 index 0000000000000000000000000000000000000000..dbdd22d24e49831eb13849954d12fe9295ad6a6a GIT binary patch literal 369 zcmV-%0gnEOP)Px$D@jB_R9J=Om$43lFc60S8n*^w*ySDc1sENT3C4xQiQPBRy^{%xZvlz34}mXW zAh6a6LL?y7J2mkpk{*0txogvkIF9kn7=4xg3j$;656*7~T|HZ_M3RN#V*>NrL0hf_ z07U8x00=_pJ_*tiR5MPpP%Ia-TEw%J?s|t*pgGgaWH(5HwFxhiotSQpqEF(Zs~}H{ zmIV1Kcnsh7by=2h90x%tTjQ((O?VVVBFWl0Y$bSvcjd7N4281@n83*eJX;yT0m3Hq zY^C$GKyh9@-T%o2s^4x32M9{gthp)tZ2{AUBNd>4zbrrne@TE6ZY)3zHxl504;J8p z4-(*nKNaAH_X=E3TfJXPR(Pj?XDeNwXc^(10(n}%awV!0EoX?oza8HJj#Px$D@jB_R9J=Om$43lFc60S8n*^w*ySDc1sENT3C4xQiQPBRy^{%xZvlz34}mXW zAh6a6LL?y7J2mkpk{*0txogvkIF9kn7=4xg3j$;656*7~T|HZ_M3RN#V*>NrL0hf_ z07U8x00=_pJ_*tiR5MPpP%Ia-TEw%J?s|t*pgGgaWH(5HwFxhiotSQpqEF(Zs~}H{ zmIV1Kcnsh7by=2h90x%tTjQ((O?VVVBFWl0Y$bSvcjd7N4281@n83*eJX;yT0m3Hq zY^C$GKyh9@-T%o2s^4x32M9{gthp)tZ2{AUBNd>4zbrrne@TE6ZY)3zHxl504;J8p z4-(*nKNaAH_X=E3TfJXPR(Pj?XDeNwXc^(10(n}%awV!0EoX?oza8HJj#{BE(&MPc)3vT0ncd%XBL5TbHml=iYZ&F9~dJWu|DkRkv2X&1dgW_Y^#xvXMB=j4!g?&}RyrbRjMQ>C{{PDv7(!$q3Jq!uKWox-L zUYhY;e*DX%r}F)+?|;AiT=#X>y6Jml!1-ybp^)(qFAk{#dSl_+nI={p{Zd7lbja=C!I~ zuyWp+RoWAFd!`XgTe~ HDWM4fEB|Ur literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/on-inhand-left.png b/Resources/Textures/_Starlight/Objects/Weapons/Melee/cane_nt.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3122c1acddb2762eb9ad34e1854d0fcfa076472c GIT binary patch literal 514 zcmV+d0{#7oP)Px$yh%hsRCt{2-LY}oKoAAcgHw&%0ab+92y^CAO;qljjfh2{1Y!`c1L|zafrLQ3 zg?aB4zz^&WG2qPdwiEyW006j>IPF9JUq4!gZx0dEIHwiiDRT28Gk<%Ch=_QKNGpE5 zhK&4r@7qH{zTzvs;x`X3ofrRn+(n%BX~nPkS;epUUlspqZ$bADcV!yq@-hs=wKA6E z56Stj&pG+Dc0TT+lu|aEP1;w!=ll;BA%D4Ve?Fa$ySRV2yL|ZLujbFc-tz$f00000 z09dKD&Cd6b|7S8TPWza~xunc7zRORW<9y4{8l^0yT!vXAYnZfLhI#8XWaQU-*91+_ z1WnL{w=#`gZuyV{{b(a1gHug|&pL-PHzHg)zr>yglVen}6% z!Td$@>-8u4G|uJc?$~_hz4v?o00000008(@kF)=czwt&i{^IlFxrWT zSG5;@shQlqKd~Pp$lp|Em1!?eFfsmAqW5wl1~)|I~T> z2gPHAHCH{B&OGb9R&U=Mt9gzS z<_&fYNmVp9r2e;+++mW;9A9;TK+L60IR)ssg w{HexYfA~*mwGTA#V!z#8e(5tK(E2^o^Y1ZFJZmg>uM*@KPgg&ebxsLQ041gjo&W#< literal 0 HcmV?d00001