From 15b970b8d4f7822e74583c47691076e32e47324a Mon Sep 17 00:00:00 2001 From: Alexis Date: Wed, 10 Apr 2024 11:32:22 -0400 Subject: [PATCH 1/6] Switches up some family heirlooms --- code/datums/traits/negative.dm | 22 +++++----------------- icons/fallout/mobs/monsters/deathclaw.dmi | Bin 14202 -> 14191 bytes 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index ec8bfc2335..6b8db8f1b2 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -51,11 +51,11 @@ GLOBAL_LIST_EMPTY(family_heirlooms) heirloom_type = /obj/item/gun/ballistic/automatic/toy/pistol if("BoS Off-Duty") heirloom_type = /obj/item/toy/figure/borg - if("Sheriff") + if("Militia Commander") heirloom_type = /obj/item/clothing/accessory/medal/silver - if("Deputy") + if("Militian") heirloom_type = /obj/item/clothing/accessory/medal/bronze_heart - if("Shopkeeper") + if("Merchant") heirloom_type = /obj/item/coin/plasma if("Followers Doctor") heirloom_type = pick(/obj/item/clothing/neck/stethoscope,/obj/item/toy/tragicthegarnering) @@ -71,18 +71,8 @@ GLOBAL_LIST_EMPTY(family_heirlooms) heirloom_type = /obj/item/card/id/dogtag/MDfakepermit if("Farmer") heirloom_type = pick(/obj/item/hatchet, /obj/item/shovel/spade, /obj/item/toy/plush/beeplushie) - if("Janitor") - heirloom_type = /obj/item/mop - if("Security Officer") - heirloom_type = /obj/item/clothing/accessory/medal/silver/valor - if("Scientist") - heirloom_type = /obj/item/toy/plush/slimeplushie - if("Assistant") - heirloom_type = /obj/item/clothing/gloves/cut/family - if("Chaplain") - heirloom_type = /obj/item/camera/spooky/family - if("Captain") - heirloom_type = /obj/item/clothing/accessory/medal/gold/captain/family + if("Tribal") + heirloom_type = /obj/item/clothing/accessory/skullcodpiece/fake if(!heirloom_type) heirloom_type = pick( /obj/item/toy/cards/deck, @@ -90,8 +80,6 @@ GLOBAL_LIST_EMPTY(family_heirlooms) /obj/item/card/id/rusted, /obj/item/card/id/rusted/fadedvaultid, /obj/item/clothing/gloves/ring/silver, - /obj/item/toy/figure/detective, - /obj/item/toy/tragicthegarnering, ) heirloom = new heirloom_type(get_turf(quirk_holder)) GLOB.family_heirlooms += heirloom diff --git a/icons/fallout/mobs/monsters/deathclaw.dmi b/icons/fallout/mobs/monsters/deathclaw.dmi index 7044f204b4170092978dd2ea6834db17a7efd702..526f957290dfa25696c2e21524a8f8114df1770e 100644 GIT binary patch delta 14017 zcmYjXbyQSew1#2m?(UWjX&5?00VxTAp}T9SxeSdUAqc26A_meWIdr$QzyQJ^AuSD$ z-&^ag_3nRX-@CtccHF)1x%<2FI`B&4VpcVHYOH}oA|>dkA_JApA)E~O_{Fsmkr){F z7#Qj5kHGxn8zJd_^S~n#@CQ8~`3Uao`_<;pT)r2e#uJ`?q89Hr0l|X?G;H7sDW`Aq zqrsL#zJ!n}vu~pfwJ+{6V@+Bt;~sh6f3fqN^B3~CS=j$N=Svt{KT@$Q9y7c}1Sifm z9?W-VA4StHy8Hi9brr5{anxRY>J5-1tPYq~odoWK#$p-oGlAGUenO2u)1njJ^lyg$ zxn67+w4gfez7xiN?F^PM{$M@7i5LX6^jH&WJO{bQtvjCGRjWPZI4R7+pJIT?R>2rbfECo-wsmAl~uq|cEqh>P8v&Ip<({&HyszI;h>KIWo1 z?D;=XovLq%Ab_gS^5EH8hu+=F8X{^t774G6b%(G!6}l7p>N%!r+dgjroyK~pbzJNS*h95@hdMH7Ir zw_)?0hR9TSD6*?Js}x?HP;_T^eY`O_#CoDaSYX@1xn3^Ac4;Vpuq)c`3KLAg`ig!| z`VdC53XTsOU6IxAkg zm?mbWS_C*U6BGn?{C{QKyeJ_K5m)(jl75c05s>QCIXX?K3>34o{Mt&*9s&wsP! zFnN0pSbYm|YcC;RXh!3YG#@H~u=M33bZv|+nDl#w`JQ$Pi}B6phxN3p7`SZoj*{S% zcKB^#MUND;&uX&)i%wSaf2$+;)h`;dv?xE&5qVdjw%?~ihV4nOIY#y!CO!qSrvaXl ziyUyg#-ar9BFOb!^ebVHU^CH%xxwz8O;0GyyM!`?@QAJ@zVqrNmtFC zbgX$>=RGFpqj@FflZySPQ7V?**U*zgRBwr&$S}i`$j>yM=ActGVGG7HP+WEv(px1!IeXjW?|Vh!iG~kjf}QFEC@9Gvpc$i|qTfDts7_faF7uRi9A^&@n2ttXRBlaYJ8^jJfjsk?`z{EM%pBjlU7 zIL&rf0_OLRFo!wWCwkWM|TYuExl~1{h#U(Feo5i31T z=P_ovGI!*(4inw5OjB)G1pdjuaIT6goOeN{qMGPa3tlon)4WWR>_K??esb8VYOAxC zDY=4I<&lD07OMd%=K3i}%ww>tnS3`-!)irbgmxh1ex3 z4nzF?S+jJxy`pm9K7)WSG6Yh3;c=1l4xm8mPhNX<^J77OAH$%~gTODO^6xN1Wl
u;GWy&|w;rh|7b6LM7agmV=^km0lB@NJ} zks`tSgyu*tkNT`=<)Qa)@;e-wlvkVZ*GDezh4GbX!?V3pqM4*=Vv|#glmH*f98?YSHU>iR9NsP!*IW_fVb$ zW3=)&eeE9i-?y?vhzrJ-gG9xY1+DXz%b&Iks#D95y~t;5iVw z67>*x=P7?`MxTWTX||$s<3{%@=j@L2XO=I4E{=*xM|pKR&`~;VijDlPAsMRz$-B`2 z3yp^Ixr>cyreBHNSmXS;PXwtGp`aO65qtLHoJ(aTOqz|%Er(b3v7x%APpJ+TByqJq z$hB|r)YbT6ZU&I6+)Vzm-7u{${|d9S{tQxerjzky?dwQJox6dLnN10Ix($U|&VD0+ zW=$O}`c7B4-{#`x2ZAwI6RmMyy_SY@>J4o=B;G&kK#p|#vWo0@NETj?W=fppaW44* z>0wwPs2BUl+~cbz;jJbs4S}=q*=5r9pKrGqf8{Rg_R)2E%yh#NW08>(&W=-f-5gPG zvtb5^>_=@GtF-vPquIoD2aP%U|61Y$Tzr-&6*hAh`K5FtlZLq=u3A4&nBkqT;<^~8 zkci$aew!Sd&4tGN29$fOSu*y}UY*eSsmnW65~JUFGHQ++Elc}OuYQ8Upfy#|NJ&<- z2!pka2z}zgQ@Y$qIiW)ZixS&;(G!qvA~eX>1&$>y2ul1IhF)%%N4SS!7Dlf0mNvpy%J zbkY1|E$U`^%lmIN^s$3mBbiX3?u{pxiReoaHX0Wp!e+dKp-EgDhiJu`#*GAT5BTpq z&pqCWgxCx-zEzJeudD))`{pj}28}_9v&Eu_l zgK-d>cXrE4d%s5$PG1i{xMLSlztzCn0JW>-9d$`S7{1r{KMWO+5^-6dEVo;S#i^jy z5nqqbAr75?I8^a}<`e;&BxdzR;2pnDrr5N+skc_aZi&BmrC3So#us_bP-d!{&qJyo zgT(2-iW;}=_;arQO!#$udhT|2*ii$`9a+bAn4^31sQbC{Zf|TWFMXy;$;eC zP`?mH7qD(*24?YQl9I~|xtMkJ&?2H`wUpe|fRn7gY>0P0YD;smD zGLC1j;7`ZSl>)w#Z~JX`zJxYOH?33cLAUYawyu=6|Arvpgw`3FQg^>fFOTOo>_KWo zf@PX_YjZ?Q#$-23M_ZqxP>>rj?9L8mz)a=PyZ=K8LDcz z{UGfC9iU;WUjYDSta2EPYFlqZMF`wgMWGImVZC8pVXK!;H!9ejHc_PD(5}$VYttLs z|5msN%meI$4`-xjP-#d}jg89T2h^=?EAEPfQh@DhoCw2Vauh1KGYkM9P#+-9Q9m0g zVA?8&*Qnd+3zTP+^PMO*ZtJ-ac!x7o{}CRX16TpbS9l-v1=P ztjMr?t`!MedTabsVy)IqL_!%gnD+1vV+Hd1Tz}p5cT2&Z4wL_N4bb_IC6a?oktIeD$o>iyG7?jxH__jP4|SO?a@+)+EW_nGKN{99n< zgujjX3h-~eCxJcOd2!U9k{$o*w;uwY$^76Y%>N{ql_a?WcyGwRDEB6o!R{%K;M51- zq9fgGd=+L6Ov!Rlx2ZkXf#HEvb-2`EUf8`X44^tVN8RGI%aN9`Vc-M_;AQ=&==Nw4NA@a26m%6tcybN zZnWKRz(g)kA+pxi6B?++m@NI3^+9-^b$`l7WGMJj*? zmu_86qyo`rEdSOO^IgOniM*X{3+4-Y_CSn=v=qTg*qAg}v8N7WuAtOxk1H@YdLR!j9{ z2^%uFRA2yeMPdaFW6kn=21|phs~n!ABI3$g;SzUgQ7DnFYtR8BHC5^(ygQawk)!tK zDn}XZWO%^;ml6M$xDQ&0^Y5?$&xvvL11RN+^M9%8;y9m)eo~Auz3s4xJtzM!3;%-> zelT~n2rx57;Xh<(EPAi*EbNrD1i|}Y0sBJ+l#MHVxj%2*(8W4loTk1YJUSNhSHC~- z?kC(Xj6&I@K!C6J=h+*nJNLIU7bRB!Ag{Clv%WtN>1Um}zg{{baDi>IwwLbVM^Nx> zhVON`cd!%yi(}TVD*Y0CQnynTtmo55KVqFvPYyj&@=!;H8&6R28-#@8+i1rf-<_tG z(+#*>dllPKXv?9FVhVNUcB$f(FNC?k5{easJ}U_Ya?wVHnYkWwsl$g`yz7L79?$}~ zwQ;Hh%pjA*Jm=wIeD4wc9%q_RZYZra<&VDUZt6DqHF83Gi?a=me3mo$$n!QaB%}A@ zkuUjEnD?iPcK)*WrzZx8!-I;e^O|U7n1biG9_dS;9;`db{D~q$x-MM(n%6jT?ZHw= zVm+WKFmLd%LE_V0k9$P{Ed%tH40WdWn{hgP_;s!^XfON5nOZ+;WoHEH@^E zkFm(SYL&X^Q_Cbb;(Sb^%72cZaOKq)K}6=YVF%lV^oO4`AbN|+FrAI1winYL{SEW}td*!)XDd?NDi1Tbz7ODV&9b9na8*%KAtQ$BupbJ$NJIi^8F z^9bi6U`onY>40mb} ztn{|8Xpa!K{PZ!@9w3U^6ch1w13#h6|2dvS^z>+EXM9Q72jz>4BA^EGx+p{0EIv~v zptw7UXCgn@N9c{cV9CySqVTN%C_7|I<&7|4z*oOPVdCZ!RgomFmbVwT6%y+$;$m&X z6!JY$KXxa)32@P(Py=lHucVA_-1#%(NuC3T)|stt`_3{EWS-beuxL!CZ3aYMoyEk@ zV`!w%KyEVu?QZ*YlEmgqtV%z=$0R@S704k)1-wK7U4@5b!N{dW=F<^?wVAL}@iD8N zu&Apv{wdQ{$OZXC+zd%;0EZj$2_u_apXL>w7Hvb_qsNEP8*}rKhalMhm3d>UkbZDR z;<4LbL~ebgu71E=)rswcyBA8GgPHGsSbMS^kkS_sQzTlY39Wo1<{}WTOzqHW%>Gn= z%UGVx-vC1T-QaFAJ=_Z@T!ouGVR()rW)$_q9r=oh&8T8zm4;n7(9~UX@$)-j)e&X2 zq79SM9`OeMw<4U8IBfRA95_oO$MJzINGBM&r0fA+L{3*|-Aw#po@X;azS6YiRi|>A zN4gQ`y0JWGSpS&%>EtIRagGq7pN7FsmQ0e60!cTJR-;FKS6v{Ac+OYVi zi-^cp_>}0)>Y&p%JVMS!Ir48XYrRyKe6%6sLz6+JkTLue+>K|qG6D##*|>aX?7m@U zGco1uH<-uDVo0FBw*_90>*RuxP37w}$|m}Gb*OUNYD~=gHZ7MA$KJb<_D#Y(Vbi;H zX(9&~%1O6KQkt~rO1!E~7d6uUJkhK4leod9&zNHElf*Sr3PlCdvFF7syp2fjoqoqf ze=tNv0vkqow2MPfCrY;D-4hiM{{uncSw+K+L;ij`<|n`?1%>6fxpYfhg%~vr^z~2= zSe#K>@aQWr_e{Bd>ZxSlo9v3D6Lmw}nKKRe*RkhOQubj)>rAromwcnTy6-dgF@Sgz zyf~8)!O2~HA1}yjNF_YwnhPSk(cI^C!NQq0$TgfR)nf`9uNM(Cm|lzi<*r*Rr~1Jf>qYhaE5?eSoYrJ` z_L1RxIi`T=$z1Ut`uv+f>wX&QK3$gcO8 z8umb@t|BdMskekOb(+=uCsZNa`Zw!0t??vTb29PTw=p@^%s!~ssC2q7+vEI;278nA z))Sgo>C2vV|H9zJ_f9ll31C`hCk_~ezPQpA=z-CsWrp@tpAuMiQAS0-bggW%6w3}G zZp}?OcHflvbCQp|p=uvpHMAKAyS3yhWD>xXAFjo#InK2UFlnuk?DfwYf9}0lRp_Gb zMny>R3##HFKTgv;BW7%fVb-xGi5EXLLSX)x9_9B?ABUGtO--X#{=G@}t^XEgn)Wy< z+mmch55rsP98BeDw;!^J64R)PJ;Ry!$oV23%Q6TGC#7j3cuXtzsesorK?q5VGzJX5 zz;zJok133A{#Cq3XK1X6i`jG7N;;xTadur4-~C1*fB#d|=a?s=!J^|65QeEkNIeg$ zv5Vn-_-+=dFX+{=utoOh7mRm^@qSemx>qalD01=k%95DPy8yXiveZ0;WUX8{M3$c^ zE?VI%>z5`?{&1--G?U&dz~%zS{+NjA4? zkXq~W^%a=U>K#-1HQ>=m`G;Cwg`8DRv%$7IQ%IyP_HYb}X9C+B1hDg?0YU++$!Kct z2B~wQ6cHIFPGiW~oA>dUE88z?p_kh#Ye?6!9={kOLTb=$Gu(Q3l4$+eS|}Dr`x7=j zRqm$HD%AC;C33-Mz$q_4|Cx6on)?wk$bBE3fmh)JWg&Sc4)ust(JL{GJ0A|0yjlEl9;ZW zMvCQK^*p}y%=pRMGEcz+n_~R;X7#f0>BwSY3FsSKEbohngZJ3OyHari{8zWM4xP1# zxBswK-jXoIlSwHzmPsrWoorfo?4U2@5Hc*I6%MB=1u?5lLFzy>V$6YM1SWUAe``UF z#2Chj(y^}<%OQeEL9=!-nwa{Dndg41CCnnXx6n9+u?Heef+KUTb;Qv0w zks0k;;)e?m0IwUz`QEd7BM*Bz76J*gNG4FOI6L2e9bM7&@jU3`)+#nyOMBZ>*~yU7 z3zd88u}+V7*V5&j)i4^Yzo^VBvSQl)A|>;M7bj+xTCy9zk``V0?gN8aO(cx38J-9}U%EU*f~}ra&Ni%c4zY_237h zx4iw3)s4IqcN3=&J8I!82zf*>zJpGTZwVMG>G590)Tm{BwBjBn<<5GLHVwdtKELq}FzhD4Re8czrtH`OlsO1SH$BwkwC}RAU`j`Cbe7ytG7#YUxxpN9N7^ z)nNeyXlb+m&E{l1ayU?fq~iZ7EhwXsA=(N%l0}%FySAA)SF9q`3%iJe0@@NeyJndU zn%*+=FcN=cdHyH*h+rr3SJbB~XVyWyU(t=?+s|96>G3Wiz;f0~nxMf*Z(h-Fq2h-` zh{-tja=dF}gbW59#6;Ll+<=4NR$=vNhjOym?KDhb zXQ@nhKCGh~!^;|n7AtU{o$-&zgqv+DjC|iZ^D1Q8(hy<9ymtcQ(xXHSOf`I)qc;MO zmn36tZp>azQAx(JrdV5_@AA791-+1Ztsf01yIhGyU8tKH{y4aQm$kufk5HgJ*Ysv6ZJ5Ao&94?PN3Vjg;ywR-yc9-s>;^WGsG~j*;V9<%^pd&v z+u}y5-&~MI=leb*2=%0}h~pw#+WkPigOL6z_2+PMnLzr+lc}OHi1?>%Q+~WOS;Fx@ zsocu$s*+tk0MRKyw-*b^owEts&a2;e6K)+UU^MYQw#9i1$;k*&Gw^28{Q(Y z3)N#2HI}QBm0Y$PX+Xpwaoz(_am(3d6sYd1z%5gNh!s8YM~#UB9zB_kQy2~&O^@-7<1z@VYjQCBh6H$}-hW{porS+y$}LCpm8KG_5?2dTWf z|5Hj3yOHqE=1cc-oV&|i!bylN-gOg+wA&ChQL+Ho?yJU!KPBji{dnMn+l(IMk7ccB zA7$Q|^j7{YAs`dZaB~0d3QLnSKLK5(sz{nETW~XK=+i|I+ULQ)jgKIakQ<}5msCin zj7#`y?5j#-%5GL0O*jKr`1^23jNjg%=zAPLCsy}engu(bLcxb9;@totBpUbl8{g7f z)OZX*YCt0hK%WO&Oao%EDKBj?O}?Vnlta1FESHN5(Z3C<#Ru%Bcol-5j_XYndu+r! zBIp`jBExIN-5OIo3htO9WUSFQ3ZIJ?W*ykjqvI*ut>R~VEQVR1i$uM?J-DUt;x@XV z=_~H#b1Kf)64AI+AaS;!I%Ud)FJL>;1l|exy8M8;UmNnQOOcJEU3-?mlCY3rolq`T6%caH6^? zDjt7bM3Up_S`JWK$G}eDg5O;d^zz6pBZ{Skk;33n>jv!hyAF4EnZoQf#W?C=^mUNh z-$KQJRq3;X1LDWsLLoR6d}4541z7IVDc>CBR-P_*{|vHXhScJ0?u78AO}HCQ_$yXA z<*4K!;)FOpOoWMnpSU#Dbo5ff=)x*kx20Zo2`a3t8v!C8M$w%EBYnz$Sct*L9MGXv z`#tHc0_?Nay=5*;v*#1h4oNVUe(@f*z@@4?-&4pS#jt~-geVc6!ZNgLIps93TTtOW zW@EosMGqD0)|4orzcQuSM{_f;1F45{N(mJG62ogxwcHc=g6=J52yhYUml0raIBXCm z=W{2Y0|MVTWmk+!oPmJUs(IFg`Q3rH`e5rX*YUvzjJpXj(wx218~wMw_k~``?Js(} zHTizrPoAx=VgZ&|+clxq;Thb&jbkUv1-7fh5;q1Vr;a{)+@mj&DTDVm{q4H1uQ%XD zI4e%zmF?SMMWQ4|u%?27Xz~>+8kIo%4=Kk2DC_+u-2q;%L}Pgk31{tuQ0RWvXoCrpole2<6pF8SV9Iqa!3b$V>)dNq{EdPqaNLayI%O%EVK)*KMryh~Kg7 z@P(ls{h1Rpd3}7U1#Gzz9o;v?*ow49U!FpVKGzUsbGg#+Gp(r2K*)q*=mcZMY;7HZ zXJ#XlAF`i;IP+%(gY$b?gDpDhP_f8sMKbLqw^N&mc=CX0EW$H|+FbwF1ffpcX^EUn ztlIUaeqBt{xfjy!BC}h3*ia0!&_-ocT8M!e^#_#UTALgqnY7zB2+IZKjx@q=QyO7# zR*!T}xkI(lG0sI-8Y+qyVd(5V=Gz8-(Dj_xV7oZ#bln7A9Y3LEQBlrO9(g_cd_eQL z(j&ny9xx$6y~N0~dXG3(7FP;Vb%i(@1xEY=IE3_#9N}Ny%BlG(saXA=ClroO5Tv&6Bl03M>%t@aUK9gr1pCs zt++$pmMhHuYBU(1rmcnl`drw*VVyOZZDsu7Zc(93u{{IpIaLI6)P3xu4S=;1_fM&^ zG8CGDjN#4sbQ)d6qriAsSQYyz9aH-GOUDnL59U#i4kX~%JW~;&;F~(<9W8abYYH?C z4JW-*Q#|J+T3_SMDms@ie7^>8?+nkSJ_Av*fc^LgK$eG3s9R8Hef3-LVTlP%sxLbs zM+bYWn%HgI?o&2mr>=4qnmtPL>|&KyY6^TYc9@DB_$Ao05rP_j)sb@KF#_}KNqRdGpQ!Q(QFCHq<&)GYtV^kSFP1$n z@!;@g)?y;@*e7NI&jLGpze0rBBHtJ^qCm86I(WNYSZ;a|N7XvexQ-NG8+vd9s+Zsg z3aj(ASRK82o^F4?=s~I3t8n=I%!V|`RpXHf52BB*@$U762XRL( z?I%y>?E{7XI55>wuvM_Upc8qDF&c&LJYtCp?0(lx%7LoUfdYue=I)7Pv|X503R$$R z>T|sDo^Rkj8!kpOJ?i(Bf5e|B70a}(%B?R5B5&jnd0N{uJ5R2hLx=_ZW>IHQa??e!}PN&F|fFR@aLTn%FEUp zj^e_`@|E5{0(JnBL69@B?JGEEL zJyO^C2Ez2Nb`*`zS`)*qeaS5bk5ZO%RmM(>`em}l`f7k@jp!Q2mkTovf5R%u_;77Y zvS?$4TKu@!a1`_?BK5n5!;<*kOPWX+t_#bhs{Gl;7*%oaHopqE})s_-5+-eh#R%j1Y%68)QZ&v|#Qyeg}(N_bc~#lMNW31igTN3je5X zQB7PGMEM;M_VN4=r_gxf1Lc4-In2n)F30+Ks(ROl!97VWCBhT$#z!;%{NV7~6UFzX zSxBEtLjfa7nqGcb`ERSN31^m{>(&_fhzEAbLS4);gnlQ<$;e3%8b^Kl3H*d~Yjij# z@;Q!CP@k7xmqOGuM!?%N>Yp1EjtNPZZJwZoB!Ft1r5pzLrhWy_WvRgmLJB`2Y7gx9 zdaax#SNo_Sn~Ld&>yIdFS5C#}NN2@E|HFXEh2F9VYhfT z@hFOUpl+Ks3l@;fe31<}S$PkYI`s}hSlfY*Si(Cb?)J%W? zL1+qA&K~wsu-Lbu6N1X9{eRP(@8D|}M~H5RxGZkglGiU*czmKrNvd#d%(|GwpRLT# zn3x!k4{x3%OTjEvyc3a`_#@UqyI+uI#O%n4#b@d=F3+pOHyKz`_5OA`XMH}`_m>Vj zONKis4x)8_ySovDnuVQWBgFkrk7R(-`HH;9sbKX>ay^#6+y1(Z+ZPZ&Y=UoHhtkRAe^VX@N?oV z@bcfY7RRbacwkwJ#)59BC_sCX-lsC_Z_^*b5`UA+?w8L!D=whS6=$Y2fO1q*G)q;l|MJ6s0SFG@+5a7 zyzN>hg|l?Y(>GkhNVu`th*599nQ))3--Td4>97A+he1Mx@ALNJdiuzhA@jMhwFhck zC=p%imhi_!vOlx}rjsGMFC+tewt>;&RlX{wqhT(mNPgweMmAdTvt~u`F_>B zfBF%=X4{G}pwAcJhTS9Zf%t`M_Jn0!JGxful#p~|M*FCi9K8O5T%P+hU%>Zr@^A-0 zym*-A$NsE5$~;jt*_vCB#bxRNNRDk5tek8II%>W_0a@om*6fy7_0s_NJ_Hm@J-Mta z09exMT)e2E=v~h21i*hEJ+~Hx{DKyztaKO(Oe`m9?Yw4hV+?JL3OsFZ4uTYJ+l##+ z2#bbJP)F&=c%H`(vl1>szJX_xbEkR(i0;PH+%7>l@vPE5F?4Cp#F%@tP=KJ_4zq^e{)#C;trNK22;wV+7xI+}_-#q$1~2_~i}g@yz1tK%-CD*O8qXU#;F*$OrxExg^wlnJAoYbk%~9)s<^bTBGyqmYRf8+=k5tSQiAH!Y2A-f;Wa64Ml zq%tBXul}YE%U`qQjc;*Ye2d0$yV zeW>^wws;#rzKHhp%kDk3n#Dj+Kl#qtTFT^f)QkK$;M(fHt)wYG`)OJ9k5uqapxcyE zbgWo8H;7)9Ez#V_saO;0qs-wGv)5@=w>RFcbld4|pv~+0v^bh<_F;e*p<5q+{xERX zA&o1SXeU#FR4bHX30x2 zTE?3jv`q@nR>fKwIQ3=6!PWcgjUDxo5xxO@$&9Ha2X|qOt3&7fWu}HPWLR-0<2!?q z`e(R;lua?HOpC_6-p)FN2q~0!;rdxWoFLaysHI%t<9x zmcTVt9XiFz^f4yH)d)Cjp&I5eFHEC89Vk^As}o*gn;_mkz)H14APIjBE_aUruS9+q zdcPSUc`6bf{aJxog;Ki$qCJ#BI#tVw6UcSjPPJ$)&83-ww-$xS6D8n5d=o68wP4Rx+Z|MKVVSOT-im~KQ1KHdymIT`xJdinD8^Q5ep<;EVd0`>^&yr~Y>(=z^76dg^ z#g;2=N_92tE|yAy@W*;8qMz~2!BUViZau4$L3r93&$j$fMYO{CkaOD~qG`fd1SL+t z?%o&9)Uq35jBYv`mh)Vy`}e9#~t4W`A08rm@yM#|dE~GS1WMOxITW z`|$)sB7$gnV6(b+qWIVWc_tyfRs)2I(Bi8*lr-N+fgD>z24ZNt4b5Pf0ZKm`6UTay zpTwUypBE=F&va@Fz$LGLTibLg92<(`k%FU37$w;QwDiKDq)f$1zZ&-k=Sio@MaeEu zF|+-b)oYQ0D}+C|oXEZ!W#W+Cp;95=S-OgsjpZ*%+8I~K9PUOS}l5c*?!I>VgxNVAyoO}hl;*@$ATOf4n;WZvjB+Q|DK zwCsnycBf(7_hGeSQ zhWU(VA=b&nOg$4X)NIwUiX^>T4LZ2DnyCD>f9e%E{z?m#_+y<{sgSW9{qkOsa{TQY z%U0V{!Gk*}$W=$0rpu5g;;1&9ni?|Rza|p#c)O59)=dGBAd48v`_PB@amQxd$ZkKj zXfp8VlRkXfyRSne(e0Q`U-s7vTo|k&a~+o1{?WUXF3AYpS~l&-Nb&sC zL535b@D7H9M+}6Nnh=l>aDHU`zC%x)J$8mG8~ngI9$IbG>wemM)JK@*XRjv^{5$b! zdN}&b2ks+$72ejzjeTbO%K3K-IbVC<3zKK>22ODSl|n)I=CxF;vYvf}4GFKj_Xd{D zb4jYYuT%Co{!_K_Cwcvl!}yu*1gOXe-3_${*RiR-l1y#KArX6hjpu=Y88wdDIl z&^)J(5nBweDB($g#NR*kd=d1-Yh_@vG6Q^L<(R2LYYuD5MmBiA8=BfQuJ58T+DbMEMYO<#9dC<^WSyUrx z)&&lAlQzA{#tSC7aP~82UDuvzIe^tdxPkg*N`^Kb^B!kOKalfPbT_wSQSd{_^;Ic+ zakY5SG*AD1nj-^b_klJ>Xip^Q-;FQg5m6@PwNL8JG9QD-4C~FYoijt}#;tf+prM(= z*zrzG77O2dOb@z$Wyc|hkV`#I65Dm7@YP_j`e1-VeN2dtp1V2I{@WIq%Z>(@3&0r` zSe=cJC>d+bNvIv4d1$oFf=o<|{n!>sU0}H^qkgu^F>&ex3klIlR;J35zg3p&B6&Sm zeTiV<2f8S;0Iz2elRr+Uvg{zb_`Kew?dch=R)|;K>UYS+8Mm|O169<1g1!W_Rl585 z6>-G-|7r~XaIp?-hT|88N^LxV9<*C`aXO^@ufx0K8`IbAFx96E>amP_$ir*yP}y1A zQ8$(4>y~LPn(eY?6gZde<9|ruf&8UL8kAMln5rvAwWWHBy}IvXE}tvq5F}LT)rDKK z<1WgnoroSUcW2iZpWW?T0cU3gLLozc3BMir4?||ZZr@o?#A=&4tz HLZki%CZ5R= delta 14032 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 Date: Wed, 10 Apr 2024 14:04:28 -0400 Subject: [PATCH 2/6] Fixes the R84 spawner not spawning with proper ammo --- code/game/objects/effects/spawners/f13lootdrop.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm index cf79054e81..e40f25f951 100644 --- a/code/game/objects/effects/spawners/f13lootdrop.dm +++ b/code/game/objects/effects/spawners/f13lootdrop.dm @@ -1590,7 +1590,7 @@ name = "r84 spawner" items = list( /obj/item/gun/ballistic/automatic/r84, - /obj/item/ammo_box/magazine/m556/rifle/extended/ + /obj/item/ammo_box/magazine/lmg/small ) /obj/effect/spawner/bundle/f13/bozar From e4d97f43204df500271571284b5fc76af8f91e38 Mon Sep 17 00:00:00 2001 From: Alexis Date: Wed, 10 Apr 2024 14:09:20 -0400 Subject: [PATCH 3/6] Update f13lootdrop.dm --- code/game/objects/effects/spawners/f13lootdrop.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm index e40f25f951..dce603ad6c 100644 --- a/code/game/objects/effects/spawners/f13lootdrop.dm +++ b/code/game/objects/effects/spawners/f13lootdrop.dm @@ -1590,7 +1590,7 @@ name = "r84 spawner" items = list( /obj/item/gun/ballistic/automatic/r84, - /obj/item/ammo_box/magazine/lmg/small + /obj/item/ammo_box/magazine/lmg ) /obj/effect/spawner/bundle/f13/bozar From 47139494d7dcae39779404f4bd1eca7d3c9ed2f9 Mon Sep 17 00:00:00 2001 From: Alexis Date: Thu, 11 Apr 2024 10:25:04 -0400 Subject: [PATCH 4/6] Suffering --- code/datums/traits/negative.dm | 42 +++++++++++++++------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 6b8db8f1b2..8e3767a807 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -44,35 +44,31 @@ GLOBAL_LIST_EMPTY(family_heirlooms) /datum/quirk/family_heirloom/on_spawn() var/mob/living/carbon/human/H = quirk_holder var/obj/item/heirloom_type - switch(quirk_holder.mind.assigned_role) - if("Scribe") - heirloom_type = pick(/obj/item/trash/f13/electronic/toaster, /obj/item/screwdriver/crude, /obj/item/toy/tragicthegarnering) - if("Knight") - heirloom_type = /obj/item/gun/ballistic/automatic/toy/pistol - if("BoS Off-Duty") - heirloom_type = /obj/item/toy/figure/borg - if("Militia Commander") + if(quirk_holder.mind.assigned_role) + if(H.faction == FACTION_BROTHERHOOD || (quirk_holder.mind.assigned_role in list("Elder", "Head Paladin", "Paladin", "Head Knight", "Senior Knight", "Knight", "Head Scribe", "Scribe", "Lancer", "Initiate", "BoS Off-Duty"))) + heirloom_type = pick(/obj/item/card/id/rusted/brokenholodog, /obj/item/trash/f13/electronic/toaster) + if(H.faction == FACTION_ENCLAVE || (quirk_holder.mind.assigned_role in list("Enclave Lieutenant", "Enclave Gunnery Sergeant", "Enclave Pilot", "Enclave Sergeant", "Enclave Armored Infantry", "Enclave Specialist", "Enclave Scientist", "Enclave Private", "Enclave Bunker Duty"))) + heirloom_type = pick(/obj/item/card/id/rusted/brokenholodog/enclave, /obj/item/reagent_containers/glass/bottle/mutagen, /obj/item/lighter, /obj/item/toy/cards/deck) + if(H.faction == FACTION_CHURCH || (quirk_holder.mind.assigned_role in list("High Priest", "Servitor", "Acolyte", "Neophyte"))) + heirloom_type = pick(/obj/item/book/manual/thebook, /obj/item/book/manual/ritualbook) + if(H.faction == FACTION_NCR || (quirk_holder.mind.assigned_role in list("NCR Captain", "NCR Lieutenant", "NCR Staff Sergeant", "NCR Veteran Ranger", "NCR Representative", "NCR Ranger", "NCR Heavy Trooper", "NCR Military Police", "NCR Pilot", "NCR Sergeant", "NCR Corporal", "NCR Combat Medic", "NCR Combat Engineer", "NCR Trooper", "NCR Medical Officer", "NCR Off-Duty"))) + heirloom_type = pick(/obj/item/melee/onehanded/knife/bayonet, /obj/item/lighter, /obj/item/toy/cards/deck, /obj/item/card/id/rusted) + if(H.faction == FACTION_LEGION || (quirk_holder.mind.assigned_role in list("Legion Centurion", "Legion Frumentarius", "Legion Veteran Decanus", "Legion Prime Decanus", "Legion Recruit Decanus", "Legion Vexillarius", "Legion Explorer", "Veteran Legionary", "Prime Legionary", "Recruit Legionary"))) + heirloom_type = pick(/obj/item/melee/onehanded/machete, /obj/item/melee/onehanded/club/warclub, /obj/item/card/id/rusted/rustedmedallion, /obj/item/clothing/accessory/talisman,/obj/item/clothing/accessory/skullcodpiece/fake, /obj/item/warpaint_bowl) + if(quirk_holder.mind.assigned_role == "Militia Commander") heirloom_type = /obj/item/clothing/accessory/medal/silver - if("Militian") + if(quirk_holder.mind.assigned_role == "Militian") heirloom_type = /obj/item/clothing/accessory/medal/bronze_heart - if("Merchant") + if(quirk_holder.mind.assigned_role == "Merchant") heirloom_type = /obj/item/coin/plasma - if("Followers Doctor") - heirloom_type = pick(/obj/item/clothing/neck/stethoscope,/obj/item/toy/tragicthegarnering) - if("Followers Administrator") - heirloom_type = pick(/obj/item/toy/nuke, /obj/item/wrench/medical, /obj/item/clothing/neck/tie/horrible) - if("Prime Legionary") - heirloom_type = pick(/obj/item/melee/onehanded/machete, /obj/item/melee/onehanded/club/warclub, /obj/item/clothing/accessory/talisman, /obj/item/toy/plush/mr_buckety) - if("Recruit Legionary") - heirloom_type = pick(/obj/item/melee/onehanded/machete, /obj/item/melee/onehanded/club/warclub, /obj/item/clothing/accessory/talisman,/obj/item/clothing/accessory/skullcodpiece/fake) - if("Den Mob Boss") + if(quirk_holder.mind.assigned_role == "Den Mob Boss") heirloom_type = /obj/item/lighter/gold - if("Den Doctor") + if(quirk_holder.mind.assigned_role == "Den Doctor") heirloom_type = /obj/item/card/id/dogtag/MDfakepermit - if("Farmer") + if(quirk_holder.mind.assigned_role == "Farmer") heirloom_type = pick(/obj/item/hatchet, /obj/item/shovel/spade, /obj/item/toy/plush/beeplushie) - if("Tribal") - heirloom_type = /obj/item/clothing/accessory/skullcodpiece/fake + if(quirk_holder.mind.assigned_role == "Tribal") + heirloom_type = pick(/obj/item/clothing/accessory/skullcodpiece/fake, /obj/item/clothing/accessory/talisman, /obj/item/warpaint_bowl) if(!heirloom_type) heirloom_type = pick( /obj/item/toy/cards/deck, From 2de82c59550b7b8d50ef02ef8f79fdc82b0f9cfd Mon Sep 17 00:00:00 2001 From: Alexis Date: Thu, 11 Apr 2024 10:51:19 -0400 Subject: [PATCH 5/6] Update negative.dm --- code/datums/traits/negative.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 8e3767a807..481edaac04 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -45,15 +45,15 @@ GLOBAL_LIST_EMPTY(family_heirlooms) var/mob/living/carbon/human/H = quirk_holder var/obj/item/heirloom_type if(quirk_holder.mind.assigned_role) - if(H.faction == FACTION_BROTHERHOOD || (quirk_holder.mind.assigned_role in list("Elder", "Head Paladin", "Paladin", "Head Knight", "Senior Knight", "Knight", "Head Scribe", "Scribe", "Lancer", "Initiate", "BoS Off-Duty"))) + if(quirk_holder.mind.assigned_role in list("Elder", "Head Paladin", "Paladin", "Head Knight", "Senior Knight", "Knight", "Head Scribe", "Scribe", "Lancer", "Initiate", "BoS Off-Duty")) heirloom_type = pick(/obj/item/card/id/rusted/brokenholodog, /obj/item/trash/f13/electronic/toaster) - if(H.faction == FACTION_ENCLAVE || (quirk_holder.mind.assigned_role in list("Enclave Lieutenant", "Enclave Gunnery Sergeant", "Enclave Pilot", "Enclave Sergeant", "Enclave Armored Infantry", "Enclave Specialist", "Enclave Scientist", "Enclave Private", "Enclave Bunker Duty"))) + if(quirk_holder.mind.assigned_role in list("Enclave Lieutenant", "Enclave Gunnery Sergeant", "Enclave Pilot", "Enclave Sergeant", "Enclave Armored Infantry", "Enclave Specialist", "Enclave Scientist", "Enclave Private", "Enclave Bunker Duty")) heirloom_type = pick(/obj/item/card/id/rusted/brokenholodog/enclave, /obj/item/reagent_containers/glass/bottle/mutagen, /obj/item/lighter, /obj/item/toy/cards/deck) - if(H.faction == FACTION_CHURCH || (quirk_holder.mind.assigned_role in list("High Priest", "Servitor", "Acolyte", "Neophyte"))) + if(quirk_holder.mind.assigned_role in list("High Priest", "Servitor", "Acolyte", "Neophyte")) heirloom_type = pick(/obj/item/book/manual/thebook, /obj/item/book/manual/ritualbook) - if(H.faction == FACTION_NCR || (quirk_holder.mind.assigned_role in list("NCR Captain", "NCR Lieutenant", "NCR Staff Sergeant", "NCR Veteran Ranger", "NCR Representative", "NCR Ranger", "NCR Heavy Trooper", "NCR Military Police", "NCR Pilot", "NCR Sergeant", "NCR Corporal", "NCR Combat Medic", "NCR Combat Engineer", "NCR Trooper", "NCR Medical Officer", "NCR Off-Duty"))) + if(quirk_holder.mind.assigned_role in list("NCR Captain", "NCR Lieutenant", "NCR Staff Sergeant", "NCR Veteran Ranger", "NCR Representative", "NCR Ranger", "NCR Heavy Trooper", "NCR Military Police", "NCR Pilot", "NCR Sergeant", "NCR Corporal", "NCR Combat Medic", "NCR Combat Engineer", "NCR Trooper", "NCR Medical Officer", "NCR Off-Duty")) heirloom_type = pick(/obj/item/melee/onehanded/knife/bayonet, /obj/item/lighter, /obj/item/toy/cards/deck, /obj/item/card/id/rusted) - if(H.faction == FACTION_LEGION || (quirk_holder.mind.assigned_role in list("Legion Centurion", "Legion Frumentarius", "Legion Veteran Decanus", "Legion Prime Decanus", "Legion Recruit Decanus", "Legion Vexillarius", "Legion Explorer", "Veteran Legionary", "Prime Legionary", "Recruit Legionary"))) + if(quirk_holder.mind.assigned_role in list("Legion Centurion", "Legion Frumentarius", "Legion Veteran Decanus", "Legion Prime Decanus", "Legion Recruit Decanus", "Legion Vexillarius", "Legion Explorer", "Veteran Legionary", "Prime Legionary", "Recruit Legionary")) heirloom_type = pick(/obj/item/melee/onehanded/machete, /obj/item/melee/onehanded/club/warclub, /obj/item/card/id/rusted/rustedmedallion, /obj/item/clothing/accessory/talisman,/obj/item/clothing/accessory/skullcodpiece/fake, /obj/item/warpaint_bowl) if(quirk_holder.mind.assigned_role == "Militia Commander") heirloom_type = /obj/item/clothing/accessory/medal/silver From 3086ad0cf8c1fdaa8c5f0536f4ceee0604754c23 Mon Sep 17 00:00:00 2001 From: Alexis Date: Sat, 13 Apr 2024 11:45:59 -0400 Subject: [PATCH 6/6] Update negative.dm --- code/datums/traits/negative.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 481edaac04..7e90647c23 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -65,8 +65,6 @@ GLOBAL_LIST_EMPTY(family_heirlooms) heirloom_type = /obj/item/lighter/gold if(quirk_holder.mind.assigned_role == "Den Doctor") heirloom_type = /obj/item/card/id/dogtag/MDfakepermit - if(quirk_holder.mind.assigned_role == "Farmer") - heirloom_type = pick(/obj/item/hatchet, /obj/item/shovel/spade, /obj/item/toy/plush/beeplushie) if(quirk_holder.mind.assigned_role == "Tribal") heirloom_type = pick(/obj/item/clothing/accessory/skullcodpiece/fake, /obj/item/clothing/accessory/talisman, /obj/item/warpaint_bowl) if(!heirloom_type)