From a3a5b95809ced8606cbaaeb64623ac5fde8b6e44 Mon Sep 17 00:00:00 2001
From: SuperDrish <59139863+Microvolnovka19@users.noreply.github.com>
Date: Mon, 25 Nov 2024 03:23:58 +0000
Subject: [PATCH 1/2] Add Shorg (New dog subtype) (#4629)

* Add shorg

* Fix shorg rh sprite

* Add shorg to Pet Owner quirk
---
 modular_nova/modules/pet_owner/pet_owner.dm |   1 +
 modular_nova/modules/shorg/pets.dmi         | Bin 0 -> 2317 bytes
 modular_nova/modules/shorg/pets_held_lh.dmi | Bin 0 -> 438 bytes
 modular_nova/modules/shorg/pets_held_rh.dmi | Bin 0 -> 436 bytes
 modular_nova/modules/shorg/shorg.dm         |  28 ++++++++++++++++++++
 tgstation.dme                               |   1 +
 6 files changed, 30 insertions(+)
 create mode 100644 modular_nova/modules/shorg/pets.dmi
 create mode 100644 modular_nova/modules/shorg/pets_held_lh.dmi
 create mode 100644 modular_nova/modules/shorg/pets_held_rh.dmi
 create mode 100644 modular_nova/modules/shorg/shorg.dm

diff --git a/modular_nova/modules/pet_owner/pet_owner.dm b/modular_nova/modules/pet_owner/pet_owner.dm
index 0144dcbe023..5ceeea0393e 100644
--- a/modular_nova/modules/pet_owner/pet_owner.dm
+++ b/modular_nova/modules/pet_owner/pet_owner.dm
@@ -86,6 +86,7 @@ GLOBAL_LIST_INIT(possible_player_pet, list(
 	"Pig" = /mob/living/basic/pig,
 	"Pug" = /mob/living/basic/pet/dog/pug,
 	"Rabbit" = /mob/living/basic/rabbit,
+	"Shorg" = /mob/living/basic/pet/dog/shorg,
 	"Sloth" = /mob/living/basic/sloth,
 	"Snake" = /mob/living/basic/snake,
 	"Spider" = /mob/living/basic/spider/maintenance,
diff --git a/modular_nova/modules/shorg/pets.dmi b/modular_nova/modules/shorg/pets.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..57d4ec98dbd24bc704250ee2b1ca4b311bd5176d
GIT binary patch
literal 2317
zcmaKuX*kr27sr2NCMHbwlBjVjA(^sg8(T35VTiKaG#Xp>-ON~$wM&DP2ocjTj5S7$
z{Yti>EZJ$XT}zXF4A*^ipXdKP|NG*c&vRa!cc1ThPJ)G*A&gs$8vp<p%E-X-kk0=U
zl=HC9J_}YmgkPBTtpEdzzl)!nPk@{E0{{rgwzBc@3*1__^7*;(P1fX+Y;Sj;6%~EC
zUvYX?uFq7a6YxuZT&JdJsrX6J7@j>#Y$IC3t=_1eZIpIMNK!msMG`GMBt`m)sz{rP
zft5%uG3!~h$(zdPl3bpVBfz?j)a;uA0t5h{HYfvK>yYeahl>GYM#AVVIceTI^B9aW
zZ+B%2wMdSEarLN;a`mujr51HlJ;6M%)*<R;s;6x*xx`=VB<if&=eg`&EknbEbA92z
zR`xunRPnw9g44Z`nG+sd_@H|n$xn`6zAn`y`W$fi|3k8rbH$zg%$6r}@xp<GO|2#}
zsA;8rV*|@7fJXjgXCjbZh&pW~;!h&O7~o!!-3!_ZB`sr>cA`AG27Bf?`K|i+H{;3+
zP}?<2pyTujPscT}$360hq{f5Ys%`c}!)}&#rr=_nP0$t<$#f&JEwo$!!S#(WL{aGp
zFDF!`jxe4Oew)hN&Q;UYK3-K-wM)<*E*5lHW9Q*U@Z+mVRXguCe~&-hYj~N{>>8>B
zqDus6Yz5yAr9c>Pdv#e-hIgy=x$GX-_PyEJ4=K0>WZC1I)kV7_gM|0Bo^35TulsBA
zlj6-dK7#}WJe1BKU6(Y_lVwQ?u8)c;2?)IBPK43JYa@>J728WxoRC$!V~WXjp_K%u
zOrK?h+2mRjA#DwWA}fXv)jdZwa|NaOnnN_j7d^bRoa1rT-7)WueeY0F->~XS%)F17
z_~}|tLd8n~LJ~aexz;$Ej@B>r3xB3tuvqRR<8sHF?{|z|IGW@~x*hV%1j;M-$FDBc
z-p1vg8_O3WCuww=eA(Pw`&>`$=|``iK9>r_8!cqi))ziq2xgCcRlP5K9~kyM)A#x%
zm?5Z4g6_Y&6BCzL@+x0PtL)?HNPQGsCJategF+4lOKjWO6FI+xxF)IEnwoV?CHb6H
zaCSerp|nd9IMUz|H5bCy=YSS6<DMVQO<Q{x2L1-lfT5K*)n}L+EAMr`5c@9<bzvMj
z_@{f8_q)>WPxJ9JWfFnuSMIQ2jBRw3l;I;AIu9?Wtq%5P*K#erZw6b+W+(_ZBMo|G
z#9{M1K4|6iRP%m_PrI%laK2epMP!<5ndJ|}AZsI#7SR13cl2;(;Q5dVn8s^%{af`@
z8`n*n`KHu1Cle%XvbT!ERJ)n093~dqmt%3GuB(PSa7dk9`O=*8sU~*dRX(7Enf(yp
zJcD(23rIC9JQiJpTi&4o(`zF^jc>*$wel#8GM0<4@ut2Cksz9RMe8M7^=_ZUe@5Zo
zkX%JJi57fckWpeH6*+~Prkzxc^c80L*{|Q}#h8Z%O$~q5%t&Wn&CisNCuMYkW2TCh
zk~dm+FLqjQ7BIoIhxOza3j;$QYb?luFg-oD1yAK#&nVE?Sn~{8w{IFAIlFzuAU1NY
z%eWp+WzywbW$n15{M?WkazElD=~1?8J147bKk9fG3&f<jU^#j6vfv_*e%hxw2FST%
z95Kj3-nI?;<`SAeMwoa{)opTYTIp%Vb)-~D5zmQ%Mg0LIN1mGQ^t?lBm55xpd5@_c
z5L8fU>EYrjP!TA0AZphcyGSfI1xJL!^R_IPtXvcWb`xV9_?luErTTYau!b@V>!oAM
z4em1<ImdCh(mG{`&Apm2k#eWTAdv{xrWa^X;qwQzuY@}tY_uLmrOB}yBGAU+g2SGV
zn*>-D-WE$&febl2f2Mlx<`jjndJ+!GIAYDS>T;VxCY5tp{BVbWOhxo&+s~{{H8_9m
z9*1OasB^T<Akc`lst5d7r~Dgrp07SYo)n;Np@4wwKtd)2zU?Iz%BUIj<fgSNd~t~5
zjI~32Xwgj#<<yCGG@N7#%UH^r6#oShf27~crSzhh$6Py+#PP!(L970wW`CRkaWYR)
z=y&M2C#J9zt2_6cv4mH-!F_pYuGIbk*b5b1u^F=p9?|RfV~3MF`4+zU>d+{aUQe(7
z(AUVEbxW5z#neJ)dCnOMko|4h8u{v>KXk8b)4}?-I$6@%Nw)@ydd<(?6>4XVte$g5
z3p7m&dW!G{&Eu27UZg2eo94HZvdw&SI#P^=)+;v+{Vi5rn{)Te%}=h92l%~tsflN}
zla@O(-VQ#g7;h)mKLYM({Qe(z`(IiA*Xea*26fMUpk*aRr~C%1Xr#KVOX^?<!49+<
ztYztY?qdyLy7o6GYM&5=CyV9d$5bo_6gcI$Fl5;*l?ATVxCm{G_(r6~%2S*5%27SK
z+gD3?VTyS_7&=H%*{K*?jvg(v>b?=K!1WMsa)hX79e;`HHFo!%<68kv5;ciZ_pu)|
z8gpC-vuIW$d1m@zgiYwTXXDi}Kkq@KKhdjceF!6xr$d^QPa7{!wuxSX=oR92Y9l`E
zv&>BAxo(NJ3ah%0UFe`mNJcrUmG~fZ{Ik&BasqqCHC+>5bu#_5va(oaJ_#BZNlC4S
zm1gZdt#872eveZ87J<d_Vl%Xu2CsUb_MybfeZ}@<bs-o@T?kyj%Y9kuz#JBsD7b&r
z4Kc=V35^?gzAfHs8av?hgdr?*XNyoqzI07?Gc#wqRNl!vU-h%U4!b~EA*f}hs7(__
zj;4hSb|~to6%4wsfr^Y~UTTloxW3?nL=1<MZj%d}tx0ikO7elC*|pYl-MHVXMTQp0
zQKnrgAWE$%@`j4Flvhg}KPXGEByH^t<>4Z#Zk6x3<g;ywj-9{W&ej^=;;AVeaZ0xe
z_<qr2t-_(j73cr$M1Q(8-Z;(IJFuDv;)rAqw+eAQg3vpknnS#L2rudnbOB%4sK@Qn
mp<%-`JelunQKd`N0qE1hqJvSP-N@m81E8*%8I<WcNB<2vkXw-e

literal 0
HcmV?d00001

diff --git a/modular_nova/modules/shorg/pets_held_lh.dmi b/modular_nova/modules/shorg/pets_held_lh.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..b1818b9d6b432a48ce96db38cc06e4a17092b8a7
GIT binary patch
literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000UP)t-sz`(#L
zFff>?uxOBwNPvJRCnxy$_|VYM*Votb^74Dy&*cCB00DGTPE!Ct=GbNc003%wR9JLG
zWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB
zGg33tGfE(w;*!LYR3KBSI3vF(U5Se`C9|j)q=}0&ttc@!6~s2=QdV&Fa{(I*06KOW
zF@j`)4*&oF&`Cr=R7i>Kl)(zZFbswh3c6!!%k=6Sth5iX(c%m21r(&`f#6x+V2`ZD
zWz&(9H*x<Z<?q)tIV1p!eo;6bB@1lGmbhmVcsrbw4qOWD++Z8+EC;kL0hR@f^8<jv
zH4IS30|7RkxFQp|SSGelMJ}S^?iVfkN4*aVI~aZ<jQ_Y%ugAfWAzX+xphOyXS?6%s
z60p`6SAnR_IL%cKsUx7co-<%+OJJ;Kh23}Q2*T5rK-<Ag`FGKb8Du{PiW|VHr<};|
g#b+0sz359l0MKU@9?Oh6q5uE@07*qoM6N<$g0;Z88vp<R

literal 0
HcmV?d00001

diff --git a/modular_nova/modules/shorg/pets_held_rh.dmi b/modular_nova/modules/shorg/pets_held_rh.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..3ae7e53d00c5f8310341db8584b57eede1460b39
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000UP)t-sz`(#L
zFff>?uxOBwNPvJRCnxy$_|VYM*Votb^74Dy&*cCB00DGTPE!Ct=GbNc003%wR9JLG
zWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB
zGg33tGfE(w;*!LYR3KBSI3vF(U5Se`C9|j)q=}0&ttc@!6~s2=QdV&Fa{(I*06KOW
zF@j`)4*&oF&PhZ;R7i>KltB){AP_}o(#F~yNMqc31IW;H-9S8tO-$YD4eHGesbDQE
z-5B``LWalZLoxtl{g_y)h>Phl1?*Trgh^PSR@_gCR164Gy$9Mh35Wm~>SLfG?GMI_
z9b#Z_MM$<EQz6G8RFTK)0GuVCCoAipwCoK`0p{JGXg*euA%oItlD<NEwt1OiUrH#b
zQ#TLXJ2#f-J%w<<={k9!8r@ig?rw~P&G<O10vFZ;qLD7iI&~Esczp)gPHUhJdsw`C
ezD52YzNshY@e>iLM&vvI0000<MNUMnLSTYj?Y1HS

literal 0
HcmV?d00001

diff --git a/modular_nova/modules/shorg/shorg.dm b/modular_nova/modules/shorg/shorg.dm
new file mode 100644
index 00000000000..747784c37ef
--- /dev/null
+++ b/modular_nova/modules/shorg/shorg.dm
@@ -0,0 +1,28 @@
+/mob/living/basic/pet/dog/shorg // I had thought of a different names such as shitten(shark+kitten), but shorg sounds fine
+	name = "\improper shorg"
+	real_name = "shorg"
+	desc = "It's an adorable mix of dog and shark with not so adorable species name - shorg."
+	icon = 'modular_nova/modules/shorg/pets.dmi'
+	held_lh = 'modular_nova/modules/shorg/pets_held_lh.dmi'
+	held_rh = 'modular_nova/modules/shorg/pets_held_rh.dmi'
+	icon_state = "shorg"
+	icon_living = "shorg"
+	icon_dead = "shorg_dead"
+	collar_icon_state = "shorg"
+	held_state = "shorg"
+	butcher_results = list(/obj/item/food/fishmeat/quality = 3, /obj/item/food/meat/slab/corgi = 1)
+	gold_core_spawnable = FRIENDLY_SPAWN
+	collar_icon_state = "shorg"
+	held_state = "shorg"
+	faction = list(FACTION_NEUTRAL, FACTION_CARP) // Carps wont attack it
+	obj_damage = 5
+	melee_damage_lower = 8
+	melee_damage_upper = 16
+	wound_bonus = 15 // Shark(shorg?) bites
+
+/datum/supply_pack/critter/corgis/shorg
+	name = "Shorg Crate"
+	desc = "Contains a single shorg - a shark-corgi hybrid. Adorable."
+	cost = CARGO_CRATE_VALUE * 10
+	contains = list(/mob/living/basic/pet/dog/shorg)
+	crate_name = "shorg crate"
diff --git a/tgstation.dme b/tgstation.dme
index 61cab8f8cee..cdb08966fd8 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8536,6 +8536,7 @@
 #include "modular_nova\modules\SEVA_suit\code\suit_voucher.dm"
 #include "modular_nova\modules\shapeshifter_quirk\code\shapeshifter_action.dm"
 #include "modular_nova\modules\shapeshifter_quirk\code\shapeshifter_quirk.dm"
+#include "modular_nova\modules\shorg\shorg.dm"
 #include "modular_nova\modules\shotgunrebalance\code\ammobox.dm"
 #include "modular_nova\modules\shotgunrebalance\code\autolathe_design.dm"
 #include "modular_nova\modules\shotgunrebalance\code\shotgun.dm"

From cf3f20b3e5c5588260884d3fa3829a9013f3a76b Mon Sep 17 00:00:00 2001
From: StealsThePRs <StealsThe@Email.com>
Date: Mon, 25 Nov 2024 06:24:04 +0300
Subject: [PATCH 2/2] [MIRROR] Add Shorg (New dog subtype)