WhKbW|9`gRv{HQrFQ%vX^DxHkKe7la%@3kC
ze(t<_0uNRn@pc?U3Q(E7B6{iYZmG(*c5QtvcKZjszWWfK-h0g3v>4_;B*2?P&*AOj
zOWqQv&tB$6oLsm#Qp+nkk|gj!26tfA{_%g*9}ZRyuhi!5!@1TaIImxY`qwr5H)z3j
zYf}^N^A_IE_DC(AyYkF399g)vvi`odrwHVK{!|sp({ucJ9R5RtX;$K46+ezi`_IYA
k$;rvd$;rvd*$)8x2IFLFgF%;V^#A|>07*qoM6N<$f`!hKWdHyG
From 0aa46f6a2a22ae2e37b66b8fd82432b47e5c1c27 Mon Sep 17 00:00:00 2001
From: Alzore <140123969+Blackern5000@users.noreply.github.com>
Date: Wed, 30 Oct 2024 02:38:19 -0500
Subject: [PATCH 37/44] Give proto-kinetic crushers, glaives, and daggers
better inhands. Update the crusher and glaive icons. (#32212)
* inhands
* better inhands
* indent
---
.../Entities/Objects/Weapons/Melee/mining.yml | 4 +++
.../Melee/crusher-inhands.rsi/inhand-left.png | Bin 0 -> 596 bytes
.../crusher-inhands.rsi/inhand-right.png | Bin 0 -> 598 bytes
.../Melee/crusher-inhands.rsi/meta.json | 27 ++++++++++++++++++
.../wielded-inhand-left.png | Bin 0 -> 599 bytes
.../wielded-inhand-right.png | Bin 0 -> 601 bytes
.../Weapons/Melee/crusher.rsi/icon.png | Bin 716 -> 431 bytes
.../Weapons/Melee/crusher.rsi/inhand-left.png | Bin 655 -> 0 bytes
.../Melee/crusher.rsi/inhand-right.png | Bin 637 -> 0 bytes
.../Weapons/Melee/crusher.rsi/meta.json | 20 ++-----------
.../Melee/crusher.rsi/wielded-inhand-left.png | Bin 823 -> 0 bytes
.../crusher.rsi/wielded-inhand-right.png | Bin 851 -> 0 bytes
.../Melee/crusher_dagger.rsi/inhand-left.png | Bin 503 -> 362 bytes
.../Melee/crusher_dagger.rsi/inhand-right.png | Bin 495 -> 361 bytes
.../Melee/crusher_dagger.rsi/meta.json | 4 +--
.../inhand-left.png | Bin 0 -> 611 bytes
.../inhand-right.png | Bin 0 -> 620 bytes
.../crusher_glaive-inhands.rsi/meta.json | 27 ++++++++++++++++++
.../wielded-inhand-left.png | Bin 0 -> 536 bytes
.../wielded-inhand-right.png | Bin 0 -> 535 bytes
.../Weapons/Melee/crusher_glaive.rsi/icon.png | Bin 618 -> 405 bytes
.../Melee/crusher_glaive.rsi/inhand-left.png | Bin 576 -> 0 bytes
.../Melee/crusher_glaive.rsi/inhand-right.png | Bin 568 -> 0 bytes
.../Melee/crusher_glaive.rsi/meta.json | 20 ++-----------
.../wielded-inhand-left.png | Bin 567 -> 0 bytes
.../wielded-inhand-right.png | Bin 520 -> 0 bytes
26 files changed, 64 insertions(+), 38 deletions(-)
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png
delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png
delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png
delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png
delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png
delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png
delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png
delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png
delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 337c7f07f7b9..5b565127a2d9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -149,6 +149,7 @@
- type: GunRequiresWield
- type: Item
size: Ginormous
+ sprite: Objects/Weapons/Melee/crusher-inhands.rsi
- type: DisarmMalus
- type: Prying
@@ -191,3 +192,6 @@
- type: Tag
tags:
- Pickaxe
+ - type: Item
+ size: Ginormous
+ sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c1093a702e40a1a8086be972805dcb8ac611d63
GIT binary patch
literal 596
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl|-3h)VWRaI5Bx3@1XWe5!oHINawdGltj=zqrl_jTDAW*Qr>U%!4wziol9
zDp0xZ6VVJH#a9yK7yKU?Ft{GLa{?&CS>O>_3{-Fggc+x5^GO38Fw@h;F{C2y?X81F
zhYWaF0yGUDO!)P`emmFIgYCznmQLV1{BG&Dgg4?sJ4%-RE#^>YU|@m~4cnPIwwe8`
z(Eqk;nV#0hh>~lXQTmhDdc{utDyFrMv&fm+d#QgHEkxSR0e?TEY>axjp-%wX0Rt8R2L?tc@!@5|
bwSA0zXH3)Ixu}-|V~)Yo)z4*}Q$iB}1E=jS
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..75934554bfae3c552bf228829cc2f6e6018c4ef8
GIT binary patch
literal 598
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl|-3h)VWEiGlRx3^bSRSgXdy?OJdfs6p-|NFV3|JScyKhxM)myMyoS9M3f
zEl_!McA5u};wuUA3;vG`7+eqBIRTX6Ebxdd1}ZoL!i-b3`J{mknC@@dvo=`7-K!|`<3H+
zAXe{S@=5ReI{Z6X%B44OR#>_!gjUx76H;JWw8dQi@1!iRx1au4JM8gz^yt6yf~S$Y
z&hTw$JsG<|bPe+*=fjZ;rUo-id|p#fX3~(o?^;bjCu79Z{fAYzNcEdBAK2V~VBg#|
z-UsZyFN}Sr`n^FE;bctKgLsBjwe`xIw(oy^J#fdp@8(7(%@tz4{
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json
new file mode 100644
index 000000000000..c634ba82a375
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "by alzore_ (discord) based on the proto-kinetic crusher",
+ "size": {
+ "x": 64,
+ "y": 64
+ },
+ "states": [
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "wielded-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "wielded-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8e9a267ff2eb9b55ab0083fedda98514671c026
GIT binary patch
literal 599
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl`{3-AeXwYRrdQ&S5K4OLZDHINY~D`O}vWnlb&KUeg>E*ry4W8tQ$9O
ztY5$W=FOWs`fUq*Re@U7EZ4sUQbHv`e!>6I0mGyH`-OnAoCO|{#S9F5M?jcysy3fA
z&_O+(E{-7;ac^&(oYt%$;u@%QM9nPp-~aPsGtwtB=xIcrd~!!n(dI^zap33aAdjE`
z4u&hfQcH`uZP(skuC;V&q}i==I%l1o7?PJnnjKrh@UAp>*0mD7s@^~4nsaAwTlfA`
zad-NqTU&Z7Z>y^DGWKreW)MDNyaQ)msJG=smIc6;3ej<$=-
zzWnk_c)VV|id{`QbDB@eErti18ByGf#(BU}aCTahto-s-bNaWw_grVk7_-Z5LX0fy
zmD0=W$~l&3D_3tVaS^`Hc-QQ-EK_;?1NE;i+jFkIJ04m3XaB#Qou~Q!r0wV5wyXNu
ztvR9d-yHZ@UH|Ua%d3G0mQ20$|6j-4I9c|d@I1jK;m7+Ec9nE1?6l&WvHq@-$67na
g8Z{)h)JPhfuNRXtcKKl&6ao_WboFyt=akR{0DdU&umAu6
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ef9c388d62a58017b13116d133dc50fddcd07b8
GIT binary patch
literal 601
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl`{3-AeXRZ~;5x3^bSRSgXdHINa|Wn;({{m=OSerYK~SsBAjW8teZD)
zu3x|Y#*G_0`fUq*Re@SBJviJAq=ZU>{DS|Z1BOTY_X`1KISV`@iy0XBj({-ZRBb+K
zpo986T^vIy;@;jmTXe{Phb3W+MyDd@mG}QQ-8eR7%h6A}cn+t2cS>6Far*q|5)OGj
zMiv1F1{C4~v&D|0gyW^LA?_P@FbW>g(rovzVpyf%uvJEBBSX>o8H+BjxhH?Reyhx0
z|JG#7+~<}KpO)^LlPGa4xaZttuiwwQmK+MUtX}dhW**a{%jfL3?^rX@wbW5AZ|R0_
zX(8_p?AtNt1k>Ai?KO98KB&f+7q0T#RvfwFX^no&X(w$31eRO`$)!e&{
z?9%gOZ?L{;i#rrLXL29^CHv&^Bp{Tp{V9{BBq
f9F+2GEd{Ln(nh=Ut=>%nMi+yptDnm{r-UW|*iG%|
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png
index d9b6ca8157b74b5484b09fb1baecec7238373cd2..1df2bf438850dfc03a279ea0ce8dc98c3f672207 100644
GIT binary patch
delta 396
zcmX@Zx}JH0WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hHfKQ04
zs;a8Jy?uJRNoZ(jX(>ZiR@Tj%Hw|P2az+2|=(kKKNMNS1
zae=QYQ1@vY88#p#ToU9L{2v)`fjJDDYVUANR1~jgc;M;c7-Hc+chXzFCIcSVX!R)z
z!*2ezU$b4dTVC7v^RB>r}xHnqnbOpT%4Y2-v$iL~h=KUjbXc
zbGJ8rt^c5Zu>7~7@0|QS!h7VkeP3_+%-^_2{`2RMe|iZgj`2pOJg!Y3}>%
z$FaBMmTr9TKk!I-ho%L0Rf=xw`Tc!U|J&yLpwo5&Z8A*DZ64??VQg;@l&f99
i%Jcubf^&qIrhm_UE4e`K>l1;&!QkoY=d#Wzp$Pz#hOkQj
delta 703
zcmV;w0zmz*1Iz`G8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00MqVL_t(|
zoW+;FOB-Pr$Dcr|OpdWg37%T$jy;A;B;$8+FA2>AHr8NGWu;R@Ka
zw{=9NlXETn&40}M-UTenir_Gy3urswFJBOCt?baZjamAU|AV(VEFr^@Kso>kd@uh?T$t2?<24oZ)DHCX)$f1^_RWN&=2;EICNDs+{4=
zALhCfkgHeW2rs$2;1KOtzz}c
zg$zb?aDU$de&HNQ;76?)qFy
z0d?9Tp$?r+f;x;=fNv)G9?uWF+h_%*;^bb}hiSdo*bWP>7065*4&Z~vGqSP;aV`%F
z-XtKyuWzM7h2IiT;kcT0GgMs(;D^ND0Sw$}UpV2O0B5~8OxFHE-{4IGSZ?BMc4GF6
leF
zuUPAy97`kTtg-ka8sz`M%R{yP%-)Fw=lETGOzym&E}ehK(mkP%gQ3`kVTLl(0U1Gt
zXB`X%?ko+KN(^TN8Ljw&bj0S)HZu6blym!>qO*#SfdtPSx5W?H>|*Pfp9)o(8M!`^
zypXkZ&dr>*XUApMr)P7XxWaOwm@{G;>*~9%OFwhpQ3_TO3s`^s?)Q%sJw{C`i#WxM
zsMW^%wfA^#xyQ*iccHIF_=Oiw??~>|zgWGw*uUKM`L9aVRiB
zbl$eydv~opx9a)^)r;K_{UmTu^pgP#N@!pP)bS36%YT`y`tw~Fc>8{_wrT8~Um9BK
z^F>)g(4jfI?p$GErPEg@cBzYZ`x9IomKOK7m(7!6_mPRqwr>(-yrP~E`7`%qjC$f<
zjzUAFhI11-Kg2ct5)4}{y6Bszgx~}I^{Y2zE|OQA#t^!nKdS1FYSG=$*tvf>Tv8bC
z{i?mvcu2tNm!QZ(rbXA@|84eeuKgwW=RUV+!HZwDLS)z4*}Q$iB}St=AX
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png
deleted file mode 100644
index dcf606531ba187e61220fa6fa327c4490e1d29fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 637
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S%3
zr;B4q#hkaZ_GcXm5IJUlP`zNnq}YjG2UkXCYjU)1b3SI*7@}G7<{Ep!ipdw27icso
zOxaadB0YY8H!<`6Cg{cKsEk9*)uRpzT62FwmOrJ2bZ|(QLn;-aD^DZuHYt(`kRmLq7%}?w<
zbJ2QVRek*7)!LIM9lTpUx5b|E-o)#z;f80w=vGf@w>$j8ul>*8(v$lv><`4|%SqYk
z9&G;h*?jtMFA2N3Hx6HC-K8I<=O6xsrS`lZym}Cp|ZET;-V~XTo_vpMh2K
z3^)TKM_1wHyv8N3^K}(g&STulch!Aq&$`wdH=`UT*)p#UJ3Y^DdB(o8A8OusIQ-dv
z52)(pJjP${yKcR+_*}yr{_%Rh%7gvYY!eH1GyQjZ<5a+
zP%CEr%Fxn#k;|j_e8W0+g`NY!3uZr>*QoJZ59*&k3=L8i5*n{>UI(Tp22WQ%mvv4F
FO#mFS8wLOX
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json
index 2d91fb460be4..8a70dbd998c8 100644
--- a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi",
+ "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)",
"size": {
"x": 32,
"y": 32
@@ -21,22 +21,6 @@
0.3
]
]
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png
deleted file mode 100644
index 6b55e43f72e5bc32ecda58186c6fc39ada252bcc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 823
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V1b
zPZ!6KiaBp*9qbkglsUfNDWK$Ln1_p%M7Ln)8qwX`gT#7TGY&RS`OUs%EvuyW1>J9A
z5>Grc^jYUxRjydesyK?8%WK+zHjlq
zpNG>;_3K_Rc+1(J=V
zY|b#}-s<#Ms0Bx$B8T{aUjAMer8jQ^6aGGapEpUoL+Wtc
znU#3%&)enie!E<+6v^S1_;#j2&YJgP-~;PlX{9gr6n?VW$N8hRU`dl)?~&%696Nuq
zyJRlea3Rj7BH)B#KwuN2XI_)XVpXNc7CEn|Ac2ohT#waCr&-U=n|-$|ywh0z#+yGk
z=9<5^HlCe&zeUl~i@~E$h+)!VmWC%9j0)&nGe)6wzfC)D2B+=%PZ@hjGW}&*8@n
ziZ-sfnRCl!wQg+UQFZCxQ|x)9HqPGJy<^XZPdAu9
zq}E9B=LM`{&Jxy^*G%qA;BuI`aph+n(?ElKso7fJ-`~r+CH1;&_qNT!cNMmlTPqau
zO0To_4c=O~p3OeuzvSEb{%06fyAf5e#%^RAvrpIa%dzNK})dqMc&bZtBPw+&g{*GCU&2t6kUvMlE*&R21
z?rT*8ofbI}$J<~3sQp;)^uqCG==wtwWKNS%G}%0G|-o
z^mLP(H*cz{s)mM!W@TmV=(jEKRkgRb2g)n2bz2FfI7@>3g8xGSL$H5^&_qS?dWOTE
zE{-7)?r*1^=4(~panaoO>wmn?RV9vKp`^Sbaa-xE6EX!yS^jl!$0+Q0u)XO($yyVe
zqxZNA0}l$dAD3A2XH`>a%7!wpe`YUkBy+C%lX_w0ae}0f
zJ&=CzC-;J3Gi#c>Lf2X2epcp3>zbKZ|2~fMs9wL{p(${mHrM6-7alQ*8yL@DrBFMs
UYqR46pf?#jUHx3vIVCg!0Ey3o(*OVf
delta 488
zcmaFG^qqNvWIY=L1H-D!!h1l9v%n*=n1O-s2naJy)#j6CU|?M7>EaktG3V_qdoSid
zf#V;kwT0MT#u!3m)?SwPSM%V37Ow|KfdK@9V2py?VP@fy>FDVcWx`gqSD
zbqZjAVPqrD>?pe6{D&A}MVBlFe*ewCo@aO2oVVsbZ^*RQH)}cDhPd2@m&?9?i1}Rh
z`KYh$?D)rTQ+4bA=_~R%l$U+|XT4DVWO4Zdu1;nT{&l5l&*j?^Y}gw<$}k)&W{^0~
zh|b~oc|2+Tq1#-$q@PUvG2wRBLDsvxe7>KpS=6^mzbTq#a_Hn+w%eCtX02lMu=_Mc
ztck1P%ZE8^O%@Eft^4htv_D@Wc!V*db7!KCU1;0$SsW~OY1wNw$<)^EmHxWzx~kib
z`aQCxeW$V;j>+v`tNZ1}*^iO+VmI2Ky;u8U`FIWEH|b9~J2V;;;o%4h)W3{x_r1F(
U@P}zHFftiDUHx3vIVCg!0EK1OLI3~&
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png
index cce061bab2933eef43d0399aa85e5c6a4a3fe57d..ae6e01f4a50fd3ab86113959a90076dd0f11a240 100644
GIT binary patch
delta 325
zcmaFQ{E}&cWFj*I1H;_yjcNS%G}%0G|-o
zn>TN!r<;U^hN`NnW@TmV=(jEKRkgRb2g+~UdUPF-;w%aB3;quU48i^tLK79m>lqGt
zx;TbJxWAotTB=2X!_9E_hkyPyD}Gq6m~u-e?chz9Q}t^^nf4uFQRA5Lz?{k9xPI}D
ziYkGex}y*NOk@4s)%eMp`x?)j{-z9$^O6?xSvVf_NAxgjo@Dy9XmYpWKEKmV-7+zD
z&dUSqmAErfodQ0&Zs_9l5in@vWK#PP>=-%gx6og{i{C!onf{`@W10E++Ri%W71h6g
zN;}_O^JHy`=KLT!h*-T9r|oTjDj*k_w7_kQ(NF9~jao_Q=!7jN#Kyi9AO
z)|2+or`D&QZ`b=0QIYsXBgab6#cluI5S2eNYWG>M3B=8?_S?&Y=}sg^H?#`w5_{--
zpuV|9?|QZ1h4uSye-U(QDrRi|`h91M-dRi058;YMT8gR`!Vk3eC{AHfXNqYzZ<&yw
zdmy~RIligiYwJ`7$qWCE##b~?EGR90wVM%xNb!1@J
z*w6hZkrl|-4e$wZy?OIyX(>ZiR+hcJy{f9JfsDZV_3Lv*|1UP)GBJwBn_&*9@xN>L4LZB39fk$L90|Va?5N4dJ%_j|X#1c;z$B>G+
zx3|vb9aa!vNsykV@=x>q{~brQ+TSXk?g?GqWmL==#!z3jBX!xY^MVcxj4T2WqM@9{
zCcfxd<_*(gUq*$k?@vx>uzV^oL0J0%L-8iY0}+hO8_NDq%42*m%}Y39e~S~tnkhg2
z#a>wU)mz2lz^T86JO1}SC`@PJS@70o$A3kOInx=YZJm;7Q#;Ema(W#j3!BdCCcEid
zch*|)ac$TWA`vkCPW$5qhSN7W8vdFd*p|~aUnfoP2b)=qyU_>5C7bKNI?Aw2_-?l#
zsO*ITLqpA{zuTKHy9Y8b6fUY`kE*yU$)Mc8z{H_|oyccD@Jx7jP{RhB2hJj#5)LtP
z9~8S-SP}xjv_V1ynATv>;Q#T!m8rmeh0OzIan1yWAh{2Y-7F90B~%_@*AYsXE%cO8
zeu)PITUo4
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6949718a597117c697fe0311b2475cd2fa75e5f9
GIT binary patch
literal 620
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl|-4e$wZy?OIyR#sMNDTBSey{f9}`t|D#WCR%h-_I5OKhxM)myIDbG_=51
zbw|G~P)A$j^7lZBza+>n_&*9@xN>L4LZB39fk$L90|Va?5N4dJ%_j|X#9B`m$B>G+
zx3^9g9ai9B4M-N5bi?%j|D6+q&G;rYu-z%Cdha!}@W{txb>ENEL9T~``K%W1#Wqhl
z3JU$6t~hgXCd2z=CMJP#>HNLUHFX8z%pY_)5_=Nz=gj@jRKc}w
zyCM_U_UyWU+6}C~OOqLD(r^BhRPYPt_^$f*#muL2ho;C*XSUeFBT(S~ac5V3TN55b3?N`pb^-D|H7Ya={|99(_cM4ZZ
zMW6kPiYgb#+SOHDue;WoLp1j3&i%8F$+i?lr@mXiJePeTo5H!jy(VuJrbufS*K6xq
za~wT)>(2fOuVh<<8n*1LSG;P?!Fr&0;)8UCf7z?f-e8E@YxZ3~^}eIW(wT>ZE3$hR
z9@mzT=YG(;w>i&{;qG;hBN7dMubEqGzL*zyAv^WKe&(ba24AI;*2fFyDu84>UHx3v
IIVCg!00hGL3IG5A
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json
new file mode 100644
index 000000000000..c6fb3d12d8eb
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "by alzore_ (discord) based on the proto-kinetic crusher glaive",
+ "size": {
+ "x": 64,
+ "y": 64
+ },
+ "states": [
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "wielded-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "wielded-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..330b936fb254e39bad9b220d6dd9c291e9aecaca
GIT binary patch
literal 536
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl|-3h)VWRaI3jEoCr}5n%j(KUeg>E*rzmn>W|5UvF=3KhxMaG&FQaziol9
zDp2{&g6ai8imxQdFZe$)U~oNf=LArOv%n*=7^vU~2s2LA=930GAlB2xF{C2y?X9zA
z%?bi-4+VLZ)_$+wotkhdOUfeXt*6-g?VdkoKJ3(MUZc+kGz0}aux0!tzsBqG-!~JK
z&&BFrShjSpZ-ktmP_MLlx%WxtUfp?Jv)#V0xmot+xuu2gt=&4Ob&p9Dl^A|8P?`Q_
z(S9%CXE$$$oLjfnpT+mqbT=U|LWJSHn(-I
z-ER9Ha%uM
zE?-DeeYbOhvF*=w+X_v$^449;W;s1+y}%mz{qLDgHm|&v=p7jQxvE#8_L=$zN$dGe
zEBDzqUc1`-Yts4a965V0KCI*mH@Eiwe{ib&=s#s3bzDt3<%K(=|0#D;b8_p?l2
Tq-;pM2a@n~^>bP0l+XkK8o$z0
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d1a481266dd20b91a96205758635bf8bde856e9
GIT binary patch
literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl|-3h)VWRaI3rkP#>?Wzc0~$QAw1`2W7Wy?tnC=uBhd_3PK)ym@m+ziol9
zDp2`B(*+qoimxQdFZe$)U~oNf=LArOv%n*=7^vU~2s2LA=930GAjZ?hF{C2y?X8PN
zO$Gw34}Du%GAjRH&n@d*>gTy>h3xT}|6^8k?mn#^Clnbk12hE%9FS&w67Thwfz#1W
zC-t#LbmO#Xy>(Gji_WU5^CWL@{rSlvOz@cElv4ZSpH*IEZ&@-$@3P6u5Z^h^k7oT#
zoB2G$^k&qyZ%4ZR6htR&+OB)ir1D)(WY+cbO+FW%+}gBRJ(OkY-TSvw6;F#rUkS?M
zTXyZ=?o;1#x7-ZZeRJX-R0`bOnj@#7F6XdnDk>MyTGoyya&p<9P1CSN@w?ri@!Ae
zZsVVgH}CFc{=lvituRc8-OqSsx|s=!
Rxzl-&jHj!g%Q~loCIDCo)Z_pF
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png
index 980af14aa86c025fc1be958d55d6902884cca2ab..e22b636f3da9e25706672b73b822daca1573690b 100644
GIT binary patch
delta 370
zcmaFGGL?CPWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hHfKQ0)
z&6_vV(@pH{?bokgUs}qbs;Zimm1Q6!5E>eqEBb#&zb(VOt&IQgAKwz8%f>KKNMNS1
zae=QYQ1_BG9ic!0&^HP)!yNls3=~~aLm)iF~q{Zc7nH9vjPu;=xntG
z%clO8-}W%rF?mL>{<($|BJ3)eY{fl!g4wK}x$iAjsFYy2xmZ>tzm{picPj>`H+#5_
z{BAh=n&I!Rw`c8H5~FK>Hui8al=q*08G7K&lL^7qwcIo8c>>zcm?r!)ivMHk@!Ikh
zwoa#KLi+Rb)^D);+bu?uAJa-
z5orN}MY@#I<14%_AhMAkfPP-|4gN@gUN`!4
qflJLV{)0f{wDVO!(=^{&-kATOhZR63qbJA!0000O*Na%yE`C^QR2~SwcEO%BNIOqM^1B{ct9&bqU~?)#)yjc
zjSqLPYnIr+RiJk0?~@7-rhR!!kIr&gJclPy!p7}Ke#Gs1yR-_GTQ?s_WZ4T{%m1GC
z_b0D~kszSo5;iszrfRoV4GY_9^-p+H6j
z8BqpIYK{ieieDTSzXWfvCS09SRXZg#BaHFN!@FODJQIW)rXMVfylxtKcEVzj^GXc$
zcZznZ@a8XE=d_vQ0at#Z>Khi8wcV}^=@s2mH_Ya4x^`GeA#6Uw(eE!B1vs8RVtF8^
zalZIN?wT2@2d=#j&S?0Qd*XxGgKO{4OGdYSf9qwb@!-nW-^o8#izmL?%g#DyS6#hM
x@LrDKid-g5*7A=(?}~31pV1ABoDT61%&+gsBy#kg{Rd1E44$rjF6*2UngEgz_AdYc
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png
deleted file mode 100644
index e2d24c9ee8af39cd2379d386af1a2122da0879fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 568
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnL
zPZ!6KiaBp*`DZmdh#cGRAa2_z@_mwCaifw*i_=S2Ce^*3kJI!n`G&FPKQP;|?u(e2
zztO>EStjQ^((nCle8NAo^M1aJddfZC8OlrtWCR(WbubvXvou&LF`N-(47R@U{`=LU
zoiPUj)i@*8Ul)~mp2cX_qP|XO!Qp%}=^Zscg%`8B1U~VtNSeaHHD9IE{9)%orWzi9
z9wtN0ib?D#2|8RDISk%#5%bax^
z^2+@C%PT^cmOnH-?(=o(hU)qiW%KVZkgm~vP_cady!Za+_qM29NO=9>%e_plA2NGR
zR{H&PW&wICp^t;1*o6VjzsFc-tP-EG`rUyQ440#yU6~(rY86W|Q_fZH8`Bb88hUk$
zU$rlDoVBd<|F(ZC=jj}Hwr=CJf|^X%Ln(~gwx5|Tlu>@mWHRfSK>Y=(H*UOBl%(#
zl-kb&mX&SsV(jUMX3?q`=_m>gTe~DWM4f
Dl|1t*
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json
index 2d91fb460be4..8a70dbd998c8 100644
--- a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi",
+ "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)",
"size": {
"x": 32,
"y": 32
@@ -21,22 +21,6 @@
0.3
]
]
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png
deleted file mode 100644
index ce6c530f30cbc37d39d8a17ab069a3a9c60f73a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 567
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vnr
zPZ!6KiaBp*?e{wrAacxJnB6=!MImolqJr92MxH*sJ{xu^aruKsHMp7AA9!&n#l)_`
zmxnpgHR;tO=@?5D@!M6=JEz$nF0bQ$yZ1uz`SsJwEYhW)tYDb1n8~4!i@{Qh0gclT
z%AR2&b<8ww{q>7kTLV^K-L}DT4%4A#+v4KVmd&T9UwM>cG}SA$Oz!x{nsa?$tM*>W
zSGlOvc6edt_S+IXY%4#WOli895fbJ1|J{+8`}-87>Mhql6)C9N)Bo@B@%4p~Q~s_A
zTmAX-lL!HpV|p=tPxYQFmdCT4C=8ntqhG!DKgUEHmH8_fp6>}h@VD7IposBu@^zax
zNpHU|_Y~7J&{XtXetD+)yxzCYaeC9H+A!CMM}LutICg&lM=f`Qj3`4<2*Zg$Mg@0P
zJe)aOrybvY_g&QKhuufwW;LX3&Ri0cxBAGm{ihzEcHvsNZ=*N2!0AiU0C?=X7Mh$H&4g%w5-3G@sqDCQ*Qq9UqAnbZBMYZcUkl{
zcgGLCZ`BW6G?}OyuYXDS!Ra--lmE=Iet)@t!cp%7@n_j)FY@7U+{fmK2!Ch&2hyK+
W9#3a}tRDhQ2@IaDelF{r5}E*3Z1E!i
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png
deleted file mode 100644
index 84abf8014872d68e3dda5c27c3762dd628caffae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 520
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnO
zPZ!6KiaBp*?e#hwAklW;N$zN=eHG@SM@tXy0keB`Kif#BOq(wXgkP9NErE-hp+
z*9;PO-=4hRDQnjJ$xB`+y#MXsd2agW&re?}p8m-+L77p(oynn(r9p<1!BU8!NQL2v
z2g8Yp3?K>h2)*ffCQ^wTBc8~ed;U3Wm#qX(%su&i@W5{
zuP&5-_;TXz-Ij;1el31$m>O};^<&-s{)YuWHZ$u?NZlH>)1q&?XUXo^?V0Ky7wv21
zJTvcJVP#zoQAt7!d*SuhsBPR`a(%}iPxDRsesam|>~-;hIu8ql
z%>Rk=OHMwOs{j0D$*WVpZtZ42*_-e5$M}-v?|Wx2xCTX5U-3~h|LUzWmisSDv|bCo$=Lhu)>7*QZ(?ktjT1N{mCAfKl>PbD
z==^cb-rrL%Zds?Gejr>wAtjrwW-Fub%FSh0WqiwHAM&lR3jTk3R^zIz_0qL0j)+iw
c!CJ#?%5Yd}k#M&xFlre*UHx3vIVCg!0Kwwl6#xJL
From d4db338ec6dd33d45b23abc022362cf6f8a5796e Mon Sep 17 00:00:00 2001
From: PJBot
Date: Wed, 30 Oct 2024 07:39:27 +0000
Subject: [PATCH 38/44] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6131e0e6f437..7089711f43f8 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
Entries:
-- author: Plykiya
- changes:
- - message: You can drop food or drinks from your hands to interrupt eating it, again.
- type: Fix
- - message: Barber scissors are now interrupted if the item is dropped or if the
- user changes hands.
- type: Tweak
- id: 7061
- time: '2024-08-08T11:39:47.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/30361
- author: TheShuEd
changes:
- message: Add "thieving beacon" to Thief antag - a device that counts objects within
@@ -3955,3 +3945,11 @@
id: 7560
time: '2024-10-29T05:07:57.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33046
+- author: Blackern5000
+ changes:
+ - message: Proto-kitentic crushers, glaives, and daggers now have more accurate
+ inhand sprites.
+ type: Tweak
+ id: 7561
+ time: '2024-10-30T07:38:19.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32212
From 010638d0e98856b371359422d25dc31b726be87e Mon Sep 17 00:00:00 2001
From: Alzore <140123969+Blackern5000@users.noreply.github.com>
Date: Wed, 30 Oct 2024 02:40:33 -0500
Subject: [PATCH 39/44] Make the security belt contain more useful items by
default (#32291)
* replace tear gas and flashbang with holobarrier and sec radio
* holobarrier-belt-fix
---
Resources/Prototypes/Catalog/Fills/Items/belt.yml | 4 ++--
Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 1 -
.../Prototypes/Entities/Objects/Devices/holoprojectors.yml | 1 +
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index d905350cded0..4a798b1a13a3 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -46,10 +46,10 @@
table: !type:AllSelector
children:
- id: Stunbaton
- - id: GrenadeFlashBang
- - id: TearGasGrenade
- id: Handcuffs
- id: Handcuffs
+ - id: HoloprojectorSecurity
+ - id: RadioHandheldSecurity
- type: entity
id: ClothingBeltSecurityFilled
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 845944302f7b..c1631537022c 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -487,7 +487,6 @@
- CartridgeAmmo
- DoorRemote
- Whistle
- - HolosignProjector
- BalloonPopper
- type: ItemMapper
mapLayers:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
index 0c8b539c5903..0df74d80d6ab 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -121,6 +121,7 @@
- type: Tag
tags:
- HolofanProjector
+ - SecBeltEquip
- type: StaticPrice
price: 50
From 0f1e11c356cb62dc727501b318e773b26b3c05f7 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Wed, 30 Oct 2024 07:41:40 +0000
Subject: [PATCH 40/44] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7089711f43f8..c594f6fc4fbd 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,17 +1,4 @@
Entries:
-- author: TheShuEd
- changes:
- - message: Add "thieving beacon" to Thief antag - a device that counts objects within
- a radius of itself as stolen.
- type: Add
- - message: Return thief structures stealing objectives.
- type: Add
- - message: Animal theft objectives can no longer appear if the animals are not on
- the station.
- type: Fix
- id: 7062
- time: '2024-08-08T13:17:50.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/29997
- author: lzk228
changes:
- message: RD labcoat added in RD's dresser.
@@ -3953,3 +3940,11 @@
id: 7561
time: '2024-10-30T07:38:19.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32212
+- author: Blackern5000
+ changes:
+ - message: Security belts now contain a holobarrier projector and a handheld security
+ radio by default rather than tear gas and a flashbang.
+ type: Tweak
+ id: 7562
+ time: '2024-10-30T07:40:33.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32291
From 6834bc1fbdb2a71050ba7e21b77af11afa2b9265 Mon Sep 17 00:00:00 2001
From: Alzore <140123969+Blackern5000@users.noreply.github.com>
Date: Wed, 30 Oct 2024 02:41:51 -0500
Subject: [PATCH 41/44] Add 3 bottle boxes to nanomed plus (#33018)
three bottle boxes in nanomed plus
---
.../Prototypes/Catalog/VendingMachines/Inventories/medical.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
index 466749120bd9..72b6b7617a04 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -7,6 +7,7 @@
Bloodpack: 5
EpinephrineChemistryBottle: 3
Syringe: 5
+ BoxBottle: 3
ClothingEyesHudMedical: 2
ClothingEyesEyepatchHudMedical: 2
From 827d00eb18e040fa5c43403738491dbc744b3957 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Wed, 30 Oct 2024 07:42:56 +0000
Subject: [PATCH 42/44] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c594f6fc4fbd..60e14a48facc 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
Entries:
-- author: lzk228
- changes:
- - message: RD labcoat added in RD's dresser.
- type: Add
- id: 7063
- time: '2024-08-08T22:50:57.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/30671
- author: SlamBamActionman
changes:
- message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner.
@@ -3948,3 +3941,11 @@
id: 7562
time: '2024-10-30T07:40:33.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32291
+- author: Blackern5000
+ changes:
+ - message: Added three bottle boxes to the nanomed plus inventory for doctors to
+ carry small amounts of chemicals on their person
+ type: Add
+ id: 7563
+ time: '2024-10-30T07:41:51.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33018
From 4b467685b2929833ac1460940f14ae10e6be49dc Mon Sep 17 00:00:00 2001
From: Alzore <140123969+Blackern5000@users.noreply.github.com>
Date: Wed, 30 Oct 2024 04:15:30 -0500
Subject: [PATCH 43/44] Nukie med bundle now costs 24 tc and contains a unique
defibrillator (#32720)
* a-few-injectors
* comment
* defib-ops-when
---
.../Locale/en-US/store/uplink-catalog.ftl | 4 +-
.../Catalog/Fills/Backpacks/duffelbag.yml | 16 ++-
.../Prototypes/Catalog/uplink_catalog.yml | 4 +-
.../Objects/Specific/Medical/defib.yml | 66 ++++++++++++
.../Objects/Specific/Medical/hypospray.yml | 97 +++++++++++++++++-
.../Specific/Medical/defibsmall.rsi/icon.png | Bin 0 -> 300 bytes
.../Medical/defibsmall.rsi/inhand-left.png | Bin 0 -> 294 bytes
.../Medical/defibsmall.rsi/inhand-right.png | Bin 0 -> 300 bytes
.../Specific/Medical/defibsmall.rsi/meta.json | 28 +++++
.../Specific/Medical/defibsmall.rsi/ready.png | Bin 0 -> 178 bytes
.../Medical/defibsmall.rsi/screen.png | Bin 0 -> 198 bytes
.../Specific/Medical/defibsyndi.rsi/icon.png | Bin 0 -> 300 bytes
.../Medical/defibsyndi.rsi/inhand-left.png | Bin 0 -> 290 bytes
.../Medical/defibsyndi.rsi/inhand-right.png | Bin 0 -> 295 bytes
.../Specific/Medical/defibsyndi.rsi/meta.json | 28 +++++
.../Specific/Medical/defibsyndi.rsi/ready.png | Bin 0 -> 158 bytes
.../Medical/defibsyndi.rsi/screen.png | Bin 0 -> 191 bytes
.../Specific/Medical/medipen.rsi/dexpen.png | Bin 0 -> 286 bytes
.../Medical/medipen.rsi/dexpen_empty.png | Bin 0 -> 311 bytes
.../Specific/Medical/medipen.rsi/meta.json | 18 ++++
.../Specific/Medical/medipen.rsi/punctpen.png | Bin 0 -> 286 bytes
.../Medical/medipen.rsi/punctpen_empty.png | Bin 0 -> 311 bytes
.../Specific/Medical/medipen.rsi/pyrapen.png | Bin 0 -> 286 bytes
.../Medical/medipen.rsi/pyrapen_empty.png | Bin 0 -> 311 bytes
24 files changed, 251 insertions(+), 10 deletions(-)
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/meta.json
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index b3ea4b725129..a78f39d5696f 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -216,8 +216,8 @@ uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes tox
uplink-knives-kit-name = Throwing Knives Kit
uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
-uplink-meds-bundle-name = Medical Bundle
-uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens.
+uplink-meds-bundle-name = Interdyne Medical Bundle
+uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon.
uplink-ammo-bundle-name = Ammo Bundle
uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW.
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index c059f095e1db..75b3a290659c 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -302,13 +302,19 @@
components:
- type: StorageFill
contents:
+ - id: DefibrillatorSyndicate
- id: MedkitCombatFilled
- - id: Defibrillator
+ amount: 4
+ - id: Tourniquet
+ amount: 4
- id: CombatMedipen
- amount: 3
- - id: ClothingHandsGlovesNitrile
- - id: SyringeTranexamicAcid
- - id: SyringeHyronalin
+ amount: 4
+ - id: PunctAutoInjector
+ amount: 4
+ - id: PyraAutoInjector
+ amount: 4
+ - id: AirlossAutoInjector
+ amount: 4
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 748a65b761a2..f31d85414d47 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -699,9 +699,9 @@
productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled
discountCategory: rareDiscounts
discountDownTo:
- Telecrystal: 12
+ Telecrystal: 16
cost:
- Telecrystal: 20
+ Telecrystal: 24
categories:
- UplinkChemicals
conditions:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
index 69c106efab13..fb0f3d52c681 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -71,3 +71,69 @@
id: DefibrillatorOneHandedUnpowered
parent: BaseDefibrillator
suffix: One-Handed, Unpowered
+
+- type: entity
+ id: DefibrillatorCompact # This should be a research item at some point
+ parent: [ BaseDefibrillator, PowerCellSlotMediumItem ]
+ name: compact defibrillator
+ description: Now in fun size!
+ components:
+ - type: Sprite
+ sprite: Objects/Specific/Medical/defibsmall.rsi
+ layers:
+ - state: icon
+ - state: screen
+ map: [ "enum.ToggleVisuals.Layer" ]
+ visible: false
+ shader: unshaded
+ - state: ready
+ map: ["enum.PowerDeviceVisualLayers.Powered"]
+ shader: unshaded
+ - type: Item
+ size: Normal
+ - type: ToggleCellDraw
+ - type: PowerCellDraw
+ useRate: 100
+ - type: Defibrillator
+ zapHeal:
+ types:
+ Asphyxiation: -40
+ doAfterDuration: 6
+ - type: DoAfter
+ - type: UseDelay
+
+- type: entity
+ id: DefibrillatorSyndicate
+ parent: DefibrillatorCompact
+ name: interdyne defibrillator
+ description: Doubles as a self-defense weapon against war-crime inclined tiders.
+ components:
+ - type: Sprite
+ sprite: Objects/Specific/Medical/defibsyndi.rsi
+ layers:
+ - state: icon
+ - state: screen
+ map: [ "enum.ToggleVisuals.Layer" ]
+ visible: false
+ shader: unshaded
+ - state: ready
+ map: ["enum.PowerDeviceVisualLayers.Powered"]
+ shader: unshaded
+ - type: MeleeWeapon
+ damage:
+ types:
+ Blunt: 8
+ - type: ItemToggleMeleeWeapon
+ activatedSoundOnHit:
+ path: /Audio/Items/Defib/defib_zap.ogg
+ params:
+ variation: 0.250
+ activatedSoundOnHitNoDamage:
+ path: /Audio/Items/Defib/defib_zap.ogg
+ params:
+ variation: 0.250
+ volume: -10
+ activatedDamage:
+ types:
+ Blunt: 8
+ Shock: 16
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index c81af6e12801..93eeef2073c6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -271,7 +271,6 @@
transferAmount: 20
onlyAffectsMobs: false
injectOnly: true
-
- type: SolutionContainerManager
solutions:
pen:
@@ -284,6 +283,102 @@
- type: Tag
tags: []
+- type: entity
+ name: puncturase auto-injector
+ parent: ChemicalMedipen
+ id: PunctAutoInjector
+ description: A rapid dose of puncturase and tranexamic acid, intended for combat applications.
+ components:
+ - type: Sprite
+ sprite: Objects/Specific/Medical/medipen.rsi
+ layers:
+ - state: punctpen
+ map: ["enum.SolutionContainerLayers.Fill"]
+ - type: SolutionContainerVisuals
+ maxFillLevels: 1
+ changeColor: false
+ emptySpriteName: punctpen_empty
+ - type: Hypospray
+ solutionName: pen
+ transferAmount: 15
+ onlyAffectsMobs: false
+ injectOnly: true
+ - type: SolutionContainerManager
+ solutions:
+ pen:
+ maxVol: 15
+ reagents:
+ - ReagentId: Puncturase
+ Quantity: 10
+ - ReagentId: TranexamicAcid
+ Quantity: 5
+ - type: Tag
+ tags: []
+
+- type: entity
+ name: pyrazine auto-injector
+ parent: ChemicalMedipen
+ id: PyraAutoInjector
+ description: A rapid dose of pyrazine and dermaline, intended for combat applications.
+ components:
+ - type: Sprite
+ sprite: Objects/Specific/Medical/medipen.rsi
+ layers:
+ - state: pyrapen
+ map: ["enum.SolutionContainerLayers.Fill"]
+ - type: SolutionContainerVisuals
+ maxFillLevels: 1
+ changeColor: false
+ emptySpriteName: pyrapen_empty
+ - type: Hypospray
+ solutionName: pen
+ transferAmount: 20
+ onlyAffectsMobs: false
+ injectOnly: true
+ - type: SolutionContainerManager
+ solutions:
+ pen:
+ maxVol: 20
+ reagents:
+ - ReagentId: Pyrazine
+ Quantity: 10
+ - ReagentId: Dermaline
+ Quantity: 10
+ - type: Tag
+ tags: []
+
+- type: entity
+ name: airloss auto-injector
+ parent: ChemicalMedipen
+ id: AirlossAutoInjector
+ description: A rapid dose of saline and dexalin plus, intended to get someone up quickly.
+ components:
+ - type: Sprite
+ sprite: Objects/Specific/Medical/medipen.rsi
+ layers:
+ - state: dexpen
+ map: ["enum.SolutionContainerLayers.Fill"]
+ - type: SolutionContainerVisuals
+ maxFillLevels: 1
+ changeColor: false
+ emptySpriteName: dexpen_empty
+ - type: Hypospray
+ solutionName: pen
+ transferAmount: 40
+ onlyAffectsMobs: false
+ injectOnly: true
+ - type: SolutionContainerManager
+ solutions:
+ pen:
+ maxVol: 40
+ reagents:
+ - ReagentId: Saline
+ Quantity: 20
+ - ReagentId: DexalinPlus
+ Quantity: 20
+ - type: Tag
+ tags: []
+
- type: entity
name: space medipen
parent: ChemicalMedipen
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..99a15087e7bca64d9ed9048f179bc3c73bae4282
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCiji0(?ST<>loa931-l`;Qzs^5Vsd;^N|{X}f`vPL&ejK#HRz$S?Rm1Tfrd
z-Wv%N<1FxqEM{QfI|Ravq8eTeK*3H=7sn6_|ECuZ^0g@NxCYAQzWo3Hqs;~lwN#%w
zzRxyYIN*6T;?Kf*=2YkBX6so^yY^mWQVV(I0=1*kOVc2*)ui<~wM?vX=sZ8>p
j`;(S$Z`dQx@J@bTnZ&`w+k0eyj$-h1^>bP0l+XkKXb*57
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..42d319843d99564a585539451cff12800025cf70
GIT binary patch
literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%x9yxO4#fulk#l_PXZ^*Cj2MQNeOKbpAY$ZW{!T&*kVe|ea`+*{y
z1s;*b3=DjSK$uZf!>a)(*zM`!7!u+B_L?JKg94As#chZFuFsjZ%zK)>jWPdTrno`*JZ|Rep$&$73=)fGe>69!
z7GPvDVq!^Q;W%M%VRI^b|E)Lc*yFhV=;Xg+53HZSQBo_!@#43Fz=jv$jSZpu-+U6_
fS9-vHV2-(;f#2(u9ZM2{&SLO%^>bP0l+XkK5Uy%&
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2317f7facec9ebb7460963a2fae389595bfbf02
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%x9yxO4#fulk#l_PXZ^*Cj2MQNeOKbpAY$ZW{!T&*kVe|ea`+*{y
z1s;*b3=DjSK$uZf!>a)(IMLI^F(ktM?KN+{0}3200SObM~ZKLOQ
zMg|9Fh6XkUhO!lvI6;>1s;*b3=DjSL74G){)!Z!pu4AwV@QO1vIOhm1d*PmKm#tfgAUAY8oojw
zW_|ej|8n$u$t71=Bon@DW6IlfCaLL?3S-G>$1fTP^=%pn2@DLuPlPtbiW}?z8p+`4
L>gTe~DWM4f3t%-Y
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a2ac1cdec93e592dcf259277ebf800e1bcc406f
GIT binary patch
literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikh0(?ST#hiWh;xij|9svqmD75+tQdbh>7ySSKe+CDwm0y5-&H|6fVg?4j
z!ywFfJby(BP|(=Z#WBRfKRH2-!A;cRzzQag1>2d}I2t}FFti>&!NSxNAjdLcSwo{B
j%ZG?Y-X0FtGiMlT`?*hL74ez^wKI6S`njxgN@xNAS7bM8
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..69c4e441de03015ad7ab1cd7fda81e35e63e1fa6
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCiji0(?ST1q1|ygoM=9)wQ&=jE#*I6&33l8G({Z-)qFT3xUThWz(_XSP
z8PDB(gLg$^cm7VsRexpfAJAc6s~A>o=_uk}o$z?h{E19D3>%Nk44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`212l#}zYH4X18ygD=2`MTn0>zlCg=&EmYe|q_@P8m+_`QuU7%0G5;1OBO
zz`%D9gc)~C%zg_L?DlkV42f`md(Dxr#em28qQ#eg>2j_~)8#Xc=B2FH+FIveW^(Pg
zgh7B|!h%B%Z+2G%&D=G8y`zHir?`D-(icAX?RN065ocS%7IU4E!8wGbo_RAnP-)Tu
zhocRRT+GI|%RXeRd0Dj}>_K|w4*8V-j!Fh!Jrxq(H9H(|-p|cq^YykK|3?M3e+&_?
Z*@bu6>)e|8%oXS?22WQ%mvv4FO#nAuVsroi
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c30877c534e5fb585fd2ac7319483ebd6d4297bd
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`212l#}zYH4X18ygD=2`MTn0>zlCg=&EmYe|q_@P8m+_`QuU7%0G5;1OBO
zz`%D9gc)~C%zg_LoZ#u=7!u+B_L?`>0Rs+}faA~prRzCm&FW{o96K|zb7lX8-l?Aq
zSvVp%1U6VGv|ll13%z1AojpKsZK_^6!>!zY2F5=}Wf+7Gl=?cn5>$L7zq>?=iA4vZ
z!N);oo&T|QQ!)-G>iYPyL`U7WdSk?Nu||W(!A73bcEfD*g<|h{_Wt!h_Nt_HnbQMy
b2TgPSpY}S3`(ri$-NxYQ>gTe~DWM4fD1Bat
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json
new file mode 100644
index 000000000000..441fd4f5feb0
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+ "version": 1,
+ "license": "CC0-1.0",
+ "copyright": "Created by EmoGarbage404 (github) for Space Staiton 14 and modified by alzore_(Discord)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "ready"
+ },
+ {
+ "name": "screen"
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5a8065eadc06d555fc09d7e309e6b57a08342e0
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(Xzc0Y7!u+B_Uvv>1_cr318??EPLBND7~a9m
yaY(jBL{o_2fw!$>?$bB3?(H~Vew~HkkJ`)+eL{tDJOv^^?F^o-elF{r5}E+i0WDep
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c7a26a2a5eda1c3b5cd730138d9d6fdcc07eef0
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(7~<*T7!u*0EWx@sL8PZC(16SBpoRpivYdfa
z=AuS@=ELn-)2+opNLIZ?x;Ff{&p
zEl{QY9K$W?giABqW)yI4nrD=7QU8>HcP!IM-?g=OexX#nb2rPSjFr1(pM{DS|Z0ER1fW-J6saTa()7Bet#3xY6XeMwPPjwzXhKo6MDkV9f(>wLuyM>xy}Kvd8^NxEKhqD%m;J>gQu&X%Q~loCIFxseuDr2
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
index 8e9f54f1d068..8872f25f52c6 100644
--- a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
@@ -96,6 +96,24 @@
},
{
"name": "medipen-inhand-right"
+ },
+ {
+ "name": "punctpen"
+ },
+ {
+ "name": "punctpen_empty"
+ },
+ {
+ "name": "pyrapen"
+ },
+ {
+ "name": "pyrapen_empty"
+ },
+ {
+ "name": "dexpen"
+ },
+ {
+ "name": "dexpen_empty"
}
]
}
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa529e8d189535e042a31cca590cddc3ada837e8
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikd1AIbUkME0JvSi7wUAvaewfgX40uX%o@ZsLIDy82tSLzimU%uQ>p|)ek
zj>g7DppNtTZ+-$P{*oZS;QuIq;mVyE3xQIc1s;*b3=G_YAk0{w5%bXG_!3+0q3T9MhO@7PYHO(GM)5YTYKkM8q4{zgnj%jdfOdM_AnS!S^%wL
N@O1TaS?83{1OUM_a?1b!
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bd9cd4858379faae8933ea2fd38884f95a7428a
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikd1AIbUkME29@M6NUxmHV-EZMPR$F5zwCQO*{;lqb}*Q&g|z5gpJUcP*}
zv9YnCLJg>+bM;MLAjMx2Gh-o8inG8YvY3H^TM&d9>r>(<0tG8PT^vI!
z{NMJS7CIon!@xPU;>iE{Jl{RHoR2L%{_fz6tsN`b|1J0&na~qCZkkfe9T3Tr)0oPFt{BqG+}$e-NLwz%A}iM-_f5Rh@T;;VO<6dz8-LVzVvZ
q?ZB;{ToIP_JS#u2&vg!X&0BrmWO>@NU_PK57(8A5T-G@yGywnxT!1A2
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png
new file mode 100644
index 0000000000000000000000000000000000000000..fee075cc3bef3ea8eea9fc2f5fd7e1d7f39c7e2a
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikd1AIbUk1vT`vSi7wUAvYwS$()L0SG>P_;7D;mC|pSEAFVdQ&MBb@0F)$g8vpKsU_yrh*Nh9D(-!QOD4K1`AH-)ZaEtrXQH7sMRp%XIxQe629;Gw5*lf#p
pJ8
Date: Wed, 30 Oct 2024 09:16:36 +0000
Subject: [PATCH 44/44] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 60e14a48facc..b9b8422096b7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,20 +1,4 @@
Entries:
-- author: SlamBamActionman
- changes:
- - message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner.
- type: Tweak
- - message: Forensic Scanner can now scan fluid containers for DNA in reagents.
- type: Tweak
- - message: Fluids keep their DNA data when moved.
- type: Fix
- - message: Fluids now stain containers they're in with DNA. Make sure to scrub your
- blood bucket after use!
- type: Add
- - message: Vomit now includes DNA!
- type: Add
- id: 7064
- time: '2024-08-08T23:27:28.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/26699
- author: themias
changes:
- message: Butter can be sliced, cookie and toast recipes now use butter slices.
@@ -3949,3 +3933,15 @@
id: 7563
time: '2024-10-30T07:41:51.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33018
+- author: Blackern5000
+ changes:
+ - message: Added the interdyne defibrillator, a black-and-red defibrillator that
+ can be used as a melee weapon.
+ type: Add
+ - message: The syndicate medical bundle now contains an interdyne defibrillator,
+ a collection of various instant injectors, tourniquets, and several combat kits.
+ The price has been raised to 24 tc.
+ type: Tweak
+ id: 7564
+ time: '2024-10-30T09:15:30.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32720