From 0a229ee339690a14479bde320b71c4c64b9f5644 Mon Sep 17 00:00:00 2001
From: Spookerton <spkrtn@pm.me>
Date: Fri, 7 Oct 2022 21:10:57 +0100
Subject: [PATCH] Morgan Trading prosthetic expansion

---
 code/modules/organs/robolimbs.dm              |  23 ++++++++++++++++++
 .../cyberlimbs/prosthesis/wooden_sif.dmi      | Bin 0 -> 1337 bytes
 .../prosthesis/wooden_sif_teshari.dmi         | Bin 0 -> 760 bytes
 .../cyberlimbs/prosthesis/wooden_teshari.dmi  | Bin 0 -> 763 bytes
 4 files changed, 23 insertions(+)
 create mode 100644 icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif.dmi
 create mode 100644 icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif_teshari.dmi
 create mode 100644 icons/mob/human_races/cyberlimbs/prosthesis/wooden_teshari.dmi

diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm
index 17c77c9863b..ed8cd232514 100644
--- a/code/modules/organs/robolimbs.dm
+++ b/code/modules/organs/robolimbs.dm
@@ -468,7 +468,30 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	parts = list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
 	modular_bodyparts = MODULAR_BODYPART_PROSTHETIC
 
+<<<<<<< HEAD
 /obj/item/weapon/disk/limb
+=======
+/datum/robolimb/wooden/teshari
+	company = "Morgan Trading Co - Teshari"
+	icon = 'icons/mob/human_races/cyberlimbs/prosthesis/wooden_teshari.dmi'
+	species_cannot_use = list(SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT)
+	species_alternates = list(SPECIES_HUMAN = "Morgan Trading Co")
+	suggested_species = SPECIES_TESHARI
+
+/datum/robolimb/wooden/sif
+	company = "Morgan Trading Co - Sif wood"
+	desc = "A simplistic, metal-banded, wood-panelled prosthetic. This one is covered in Sivian wood!"
+	icon = 'icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif.dmi'
+
+/datum/robolimb/wooden/sif/teshari
+	company = "Morgan Trading Co - Sif wood - Teshari"
+	icon = 'icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif_teshari.dmi'
+	species_cannot_use = list(SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT)
+	species_alternates = list(SPECIES_HUMAN = "Morgan Trading Co")
+	suggested_species = SPECIES_TESHARI
+
+/obj/item/disk/limb
+>>>>>>> df3ecd3a45f... Merge pull request #8713 from Greenjoe12345/woodlimb
 	name = "Limb Blueprints"
 	desc = "A disk containing the blueprints for prosthetics."
 	icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit
diff --git a/icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif.dmi b/icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..0382fefc634caef7ec8be920221d8a695741671e
GIT binary patch
literal 1337
zcmV-91;+Y`P)<h;3K|Lk000e1NJLTq00961009650{{R3u3WWM0000dP)t-sz`(#9
zC^jNKWgRn88Zk>sN=l}trd?fK#l^)RNrN3*vnNuHz`($94uI4E0004WQchC<K<3zH
z00027dQ@0+L}hbha%pgMX>V=-0C=2@(!C19AP~UuS)W3Zz4UACQW8pr<`qQn{D4Hu
zDaq?Mi9@I2ZFlgy{~)&F*}sNSbnk&LfXT-o9^!sFbGCY&-L~AWoH_8;<+7x#GHhdm
zQsLZirah+ph%<v~hJC*L)I?G!oeG)|BQcZ{SVD}VP?{JsAx2_3Vv4f<9>tlevlx9K
z^opzZ94Jl59jspaAS@o%f36k%*d1T*3$hHhXSG%HTL1tA14%?dRCt{2ozHI5KoG{)
zI40s&qljFKiNrO;={<2HaZRMg<p@G?dQ1>%c>z!#gEPDVPlugW_0H@c$6Xs&;`^zG
zjG6iTc}ZQ_-dPI)007`gaB}p<<3#F~dZ)Urugi~qGOkuB^YwZZe<VpxX1Ww<r$-qm
zbM$%^15>U1w5EYFU$1925X9Po_^iy>R4bPG20cc)EY0ZUgU@BgF(dGhZ_uO2BjC@q
zDc*TK0}uHIJtqUl3~EgSvZUeH_R%MTx`hA$000000002+67BW$%enq@QDMzD=+TV>
z=_Xu1-02GTL;dHRo;BZ~H#4gDg|=YV*MB}#*z!$!Ms=~%7sy++8K!)_9z}Z$00000
z000000O$_?RNeNbriPra)3X~GDVuu4fS*KU7KtC7({!4z>P>n5h{hvjlFF1BpaY^B
zm{J2=j~NgXni2e13P$>!BwUeD1h;&y5Xo2d(p$Ra1Ith+U(qefM52i@0%LO|_<*Wo
zRAoR+xB+Dkb^|^)z~Y$iU-&f*(0oPD*#J-QYZ~BNlzIRF000000002|_jG=PLhX+W
zK9VqH|NNZa2BZ0^9ur{l-5US^0I^=$<F@PNK4@Ls&)784>ut03VHlEWzg`%MI<ag0
zYLG0#r8yRZXhe3vV%PfM(;^zpH^x|a@AFtbfJO9n-dw#1R_koDT1x^&EDL<gwtHFN
zCcD}<SATFs9IlF38p5h0aIIGa{&frkPryL&t+mBB%D0%tj`dGq1ga7$&Sb9j!YfXl
zmRLF0v)HvhKXrxS#uDd$z4%`<61&z5u{`{kW2Ga5#jf=L000000002GC%>GY+2XeA
zMK7Wg@)dz+^m_iq@1Kp<3z5+L{Q900^b#iU=NDCQt>?>H@SDk%xYh#z002ik>EusF
z>pm&9)>q!oAMpGCNmT23KvlgMz8aE(VYcNlz5jomkw-4B_1%v^=LV`CspK(#1XJsg
zOjSJq000000002@>w8z6FD_kizP@**^AQ-VFHWp++XljPbz+N$*`ECuY@5BlckK^w
z#kD`cmB;l5G`OPB*<F9YgW}m;e?YkhZGS+62Bz<dBbMGzc<2wfkPNgt0zrH*AibZE
z#)g^GbsKri_?v^E^nOAb8w@lz0{;9UD7_w##;qIhlCThz-akO&`yEQZcMTiphx_7N
zFTH<&#`paIGeP6V_AmNkUmTJ2{s9`_AF(tYU75b`$nI{3J5${Hnb5sIz?I7W0RQ^S
zn8sflUE3{4m+9IPi{O&3FBn{^D;hd69rNY=*!qNgeZg2=)3H?pBIX9_uAx~$taQ)w
v?)%OSw7kAx=LR-P`#x{~Z@GQHI|F|K1P3|&paC8J00000NkvXXu0mjfYYluW

literal 0
HcmV?d00001

diff --git a/icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif_teshari.dmi b/icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif_teshari.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..1dacb0c81e82f1ede837d9f815cb54f97b64ec44
GIT binary patch
literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq006)M006)Q0{{R3pz?7v0000LP)t-s0000S
zC^jNKWp-0AN=ix^F-xYVrXcmOwg3PC0d!JMQvg8b*k%9#0FHW8Sad{Xb7OL8aCB*J
zZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#
zlEji!AX6zPKCviQiHkEOv#1!PiHkF>C^0t`#5P2zDk4f%PJBjUUJ4P05v43AJ|{Ju
z2*Zd`l@p(qpI<_RVfd6OE4cc(fCCu-O<87pBr7aY0005^Nkl<Zc%1E<&rSm&5XQkJ
zo~2sP+9z1EJ^+oW_a=I;iShj(!Br2Pe}&Rzo2cLKv;)Ho&~5Tfq0RvSz(3|{Y5<=P
z>F?^s>u?uxivFHji_!{&gZAg~M!HC?*gf{FyLZg)7T2sha&Ol?^^vy>{gO<=Z{>u#
zK}?YE=vMYSx0H*zP5bBYCf)PHEq@yCn+;vTODVxK8*ce;<O=dzB;PXbVEL;pqPyzF
zCse{4FI}AcRRRD2008)#%q^3YoNvv;J=g!u6Ikl9Z306dHzmB!oIuEVT{V{ATj1*h
zun4NS7`tC-+wz1R4>$Ygb<+KjwyjTiXF}LNCnG^3{lOUyQwawR00000005f86}zF|
zD@OkyiYlh~c`;xR<G>DeEWJ<bfv=d<4DtYD7zWm~5LL0I_XC&UO!6l!&nwU24AMcv
zNKpG39l`7gcpc17!J5Edx*1jg000000A^uS>y=lK3XJuHxFselfQcM&kFFMegUU$2
z&uq#YCaz@pRb7IW7_JkF5aA<HQ|o<R4+wW-1JyZNscaQ1kf%;FR3HEV00000fOAp$
z{a>`mGpa)U;M9MQ)Bsr%aa;TAmK`-NWv^=4WqXywIT9pl=yNjJlCr(Z0RR91004kv
q$;<x+<mG<@^6LCIB*@GE348)CIwdxHmVjXZ0000<MNUMnLSTaW^GW{z

literal 0
HcmV?d00001

diff --git a/icons/mob/human_races/cyberlimbs/prosthesis/wooden_teshari.dmi b/icons/mob/human_races/cyberlimbs/prosthesis/wooden_teshari.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..b3e408fc061aa6323ffe27b8ac8284eec1e7f74a
GIT binary patch
literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq006)M006)Q0{{R3pz?7v0000OP)t-sz`(#n
zB?69426j_0N=iy*HwC7qroh0!nFPUS00001bW%=J06^y0W&i*Hj(SvBbVOxyV{&P5
zbZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)Cl
zAe`co#FA7XQz<7tu_#xGi!&v&s2HS)i!-e#F*g;&Hbkf@B1%<Gd`4nk3K518r7R~t
zCpDc2!-!Fp6Q7o!UqXao_>?Itxca$(0~r8KS!R1AD=bj}00H+&L_t(|ob8*>P6Htj
z#=#|?rCQJ0Cs?yS0F9~lCVH=l@%<mcRS%tih0<l4sNe6j1H%l^ZSqZ_&H(_xKjvy`
z0G|)(@9M_ua2Ill{+?Qk(h7uw_UG|Nx=5|qJ@%}-cg*e<*Q`5oZ`VEbk+%%}l1##H
z<%GIHOpx#BR`xr$l#9Ae`{(c`-SfjOe;V(b4PC)YDZw)vZuxKI3i4Yd-!krC`Kv9W
zyXwU!RKgoCU7Y+?0ssI20Qj5CEt8a-Z_UF!*Z<8ESn9HE0z)4+CA`m^K*)JrHJ0F8
z;Ohgh2&%XkyI*PB@`N1^H~Z&x(*2RPtxtGoLfAhiBS9kl!5I!y2?q@T000000Gh%T
zyP@AJM*kp+DyH~(F<=nmzz%gRy-(|bub9*f@&IEP2G+C?Rk5Y_1DD`T@+U3NE6?E!
z(m}&WQ2QAj!R!fm9n4R`n!sPW8CC!Q00000W?@w8l~<4ojP-=LB_=C?i5zi{t`>fS
z%1FS^Y|0xZu4MUDU4oSut`mw7;UiH~>wR7i2zO%x)j3+JY!xezr%p3eAOHXW0001h
zb5Z*JU$n?GszUwX)PIlE09g}pTl?#l9W^dxuWH$4dzHgE5+rKqb28bIvc1Xy00000
t0Dxo3%l`)C<$nY6>ijn($jko;d;%{zB{qAOfMEat002ovPDHLkV1flUP38aq

literal 0
HcmV?d00001