=8
zh)qSiTk{4XfZ>U+bsx{4|Mgygkles%)BBAXCxOF>@t+xXdmGbN0Qbp;(Hl+WCF^Qz
zpjXUEIUFd)CX|1mu)&TXaDu`%a?wOm4Gx00g;;V~VUj}`u;
zuL0kMJHhPePUFxPK)lipiN$lHkXVE_2#QkqMwasPoJ6FX+p%>@Fxtzj@(P;vdFcAa
z(%{Erx?wJ>T_g&;`lJ=C}X5y>xZetuvYFV;n7L|~M
zyEtEGfQ=Xiy5!459@gV}mFH#O?@O|sexvGdh>Z4uj4EJcYp8hlB~hxZ(UovvvC~0r
zP7J%no~&QXX+vxpyRqDMb;{*=Fy`yP#wonxhAWKV3<(Yohgy4VKlg9z?&kZ#ZaryL
zKh!%UB)32`X*p$_K8M9^)%_8HJ2Qoomuh;ENNKE9tOkzwEo{tRFSUl5;
zJTFJU5zFqFU)R}n_D@n0a@e^8uXEBL;&X*G?I|NC(|K0y!d}0AedfrgMxsa5eRnK#gp$pO%Ne-ctbh~ElPgGE)^e(BkWM_Q@Pm&-vfRl
zJADubYqq&2>_XeshWYf;ps7~;^SaFLeXKa^okdA!Iy+!~_DIIFewzRepIh(cm0(*s3k4!lwnslf?jHas>^@1bwqioZiCY$AVO
zWBr6yFKsr{j4OuDBY9Kaw{E2OOMVTP0TKqAXl_u*IOJyyIw05UN>%Fg>wtM3ymdC50KOhroM3GK9L-AGb3gtvrmoeKo(^04=Isaa
zvs^jc3h0?S1SCbRP};ob1Ft-u?<4Lj9yyR#-*1gD35T(~i*ejkwxuOSePY#MZ#(2d
zKOF%H;z`)-p{cSl10rINGs(VOF%TXt1))=z1-pZa6MO-l@!yX}`DuYKm~CO63jY*g
zI@kj_jxC{U5sHkOgXYHqMdW)ued#hT2k>YyK@@$S^Mg+?WS{he?JyIsR%A|O6>v~X
zDyyc?V{A_!j@CvElXMHJEg7(Ncl}G~zkO}Si?vl%-^&o_n4TUy26JRzgmLH8ux-T`
zd34~&DyQ~#2g6cm81Z!DJ8~;&TPh33T(y7z*TCQUy?;9ZnJW}I!WtO{_O%J#TFR4e
zH6(jFD=VviK+CI>{%RooZM13dD__?H<_RDEkltY5PNXgb@C1?H+M1Qtb|IP5;8C)H
zg+0E!TnY5)_Z{1Hx=*rFaPF@dDHQ@9+*62b2f&C}*1u9C#LlswZ(aT9djr&SA~8m%
zd-nJ=afAm2JkDNe6H)cCG5gk{FzE32k*9mgevSM1wlY&N2UF?h&Nx!FB$kqVXbIxd
zCJ!V2em;7s8ovWC2LRrSEiliN4ahl9pKmm=n7z1xkTRKPKniZID`?n*T`Qh(o1y3VikG%hg~0
zxg&aml+e3#``*308YH2#y*4=-EMk1b$Ci(jJfBCFx5;^iqeE_ziGEo$fIb@ln7^Ij
zH#9%=-zq(f{<^$LQ97S(H4Tbdu74)=sJNiTMU=Y5+rI#7t~7dT_J(DVxbqItRIR~t
z7I~hpmu<2WJ}>)X2wre>S*Q~)L))`InT9ZBW}JL$RS-HgT{Pry7SZrYo8uWogsMBg
zuB3G?p&pe9<4rpArGtY~nZ0tfT+xMf-gY($NH}@cyvpu<9d3cubUV>#_&VQBd;6@<
zPCRm7TOH{V{IM9nhDh8JQ6&}sT&NXs_3Rws!+35Np6~nm<;WO_-fm;<2TtB3WxMf_
zWvWUbe#T`R|7;nk!*ESL5!MeseEN|NAC!y8DnSkBFgPh!4hs=J>M=#ScF-%8%3bx^
zP?ImT`h~5B*S99MN@CT0gE|F%Uk%9PrEqg|Tf$Lvn=K+yXPbapQ!hcbyT?f}X!B%C
z+g)-%iqG8nC$+29+r&LYWl-?Re^3*SBkSTThPwbM`1yb@OmFvqsH>0
z_IlW?>SyClqdJ;sX=!OcT5a@RneVIidBy$wn`0PM7UIF;nEsPiZ@3~cM2ahp?ZgMp
zibzvxG|B%o-Afkeap74!Stc)Er^~izpfL!F@)Cn{wQAPD5g2dFZZC2G;o
z#fSHS9-xyLx8pl9GZfHbzkE%hmj(f$C@eS1Pyy2<|Ib+09=97fRbVx{#3@~x2IdZX;HXEUO!z>Yckk_>foh1-JzFkhru@y(T^kaZs9o@;`EY_Dayrv$;cRo*(aM+WD>N#&@YQ
zOdA?{evF0h6mILZ0=Lyz`o=OrTM^^}ns@7UpV+TF8}yT&^F5g &ktSrF-;Rt!k
zXdKR}sWClG>nh%J?qkmUMf&o1J=LcjkvPQ12~0-V%?{AVf?#@4y1_LZOf9q@+YZ5O
z!h8I=+xAzaoNufcd!zgoj-iZU94C($?tbHx9T+!HbE6%Bh+ePlm~2cIPmi{z?zs0d
zj5n-pl}cZ&2dv}6&`)b)v%Y+>a4$X};{G!!Z_d?U8kZ>8Q)mARnwm$x(!?!%mJyrQ
z@RQir6#=AK&9il-42vl96NgZazvTjhe0+SWT}~X9;b*9>H;Cph{g~h1Js?I!MMc{R
z&;E|Q!7zI%8`OF4@2RM^Z&WU5-`p)Gsg3!%m*Kjou%0t@$
zy!qi$MCKAzos+#d%81!;jdfbr{USbVyrjl<1JEy
zv2)!l`*#n}L0_QegMUKIS3raPvO_~EB2;4@oS9vplZz>ptre`#)jkWwg+Rts^9iu#
zFCDT1!s4DS>77`2myx5w)DMcjkEshmJSf_9`HPIsFtCmjlwIhltOr*+bG=3={tHn4
zCrxSXHoLSz;`#b7WDRMvdqT^2hh8W^6JW0FW;*h2tanoW5eeDe@<2y2rY^yY{@Kz-k+kX1Z$Jo{4
z@xmI^C#%LCiYfV
zcLB9J^+7!BcO6ngHiu_wvBd*QSqvPm!swuG-zsZSPdtzL
z$?MUjy#25h$mT=5-3-{AjS$~+IIexlkr8n?P;h)agNOayPSs*}LMv25c^KnBS5n#<
zQ+@XL=JL#^9V{ey;#^UqJ?T+nI2q~k=q0@SxLWkUPnMv9&75&vUviZLJ>1*uHgR2^
zD0y4BnN1gQxs;p08S|CaMG#ATO@e12J2Aa;B|k#XQQt!Z;x=LYH?y8?k7POhs0+&7
zc5WFelUVIOa-K2d!YL*zYl6(V7bFk7u@wWF_Iek}DjEDTtkJ1aiN&lEh(`lwtDU=r
ze104^TVyS^sx_8HQFrbQ4h|-D-##pWqPLl^P+@=^?e0MX_?ubzxj;y2;Kr0
z_?!g-bd;e<(x|^lR!@58V;|0ZkK#xauBfJ`jb2#vg4U@@w1Z4u`&Tfybcg{!*dEI(
zd_jSpGvg-(!UU;FK5y}W{P#~&AaSDJS2r9@OskW2X(D##tXw+}oJ1+IH)u_`>M%l_
zvF@k2(0`72qKb`t6Klt#z%`8h%%D@Rxv)0<#ZxENmmT`^jrvCs>Xm{1GfgykXph;a
zb=BYzv16~8&3j|tA)vvcHSJg?D4;q2V(m5To6+m@M^%Cl`{Vc)Qa9@FhZ#yNg6?-8
z@hEbJVv_Xt)e577c3&P<#bVeJ>&^lUYqZo;$qS-#n8MOn$Nl3Z-|Ketnr&aimYy
zLYjNL5=3}nUCu;Bj`5CMKbVoHdyi1|>>lyP+G{;1B!w~AjWR~9zF1nGv%(akF~sjb
z-{WmAP5>Jx#twgEx$I-v&FLqM>?dEQ7vgP8C{gQ_#f8`l
zlPFv75E}->u*YeBr4B7svG&kIGkw{$6W&CF>@>`*lk7ml?T6lqTj;4kdT(PMg
zj<+sB)x}P>Qks2FNEMoe@Ds6{-*o&Lq&kb`Y+{Q}Xwxo}nc1&5!b6y&_bVg-KSgY&
z8VmIUwk)P`^qw=roRPc8=l^>4HW(+Y=yngT#G5Hs?=HCNV2D&_@khNOK4Y}<7ToSV
zVRR^%oB2Kl>Q+K*mb05p^z@^7{!mOp42D<$o`HzW%u-Vl{j-ksmI}6i1wQFnZ!`P(
zm;@2?d~UN+zv
zIGFT0$OUT@*dF2-Z)IgU3d@e`NW}==V%X5r4+B3I-VgiV2e|gKyFp+1C(WLYXG}4R
zUxwNRkqts2w%cS|6_=QhD?{}$4S8ZMK%Zv*F!=2i&H#?g66}Aa$T07p&DPXi{VxmkMx)mvz4SQ0@`|`1`UcVwlS1m~<
z7UpARNLZHG;#16abCMUDDJEBLfWHM(^o&9=BUjPU2$1`<#hYxuFL_!-v;{C`GY$Or
zC)Nkd@#oS(GXVkmU&o`LfvE+v5i-f|sJA&IN-UW3z=?Ha|8qXm8$X_&3TqPshmV27
zXhY}OW0w=oeWLT~GaUy~3V9B0(RWb3t6m^4eE|8lIQ52Ddvz(*xz@Xn*M!YdcUF0q
z(yB_}EKV1s2ZuAC8&po(?%hmv87(wHEwh;rb}tC0AkTVd7f18SnkGsZ^^Jp(G-)EN
z@c#D77-l-Ol-))$DWsK!dUXXx!T8F4M~>#y;D~b@
z<#xWCLyfMFo4X;;TRTFGgglBL?P@s8!lb`1aJ3GqzyGMa=F8y=OU<;89c$6Z^%DcT
zP>kKH4f*8`Bjy*=&968)IS0XR=3|hVovo!UFrhxRWzN|Ymo|gk-?QgVLkxkzfk!hk
zvc!FnIVDCO?usfSn|(|S4Gu%Q{!IZb_<`M!6G6GS+J^a)P31xZ$*HW4op9?59Z52G
zycT{9w)*}Z5fLflR8{JE>+A7_0GjLGoNtKcpc$@(v1bJn{)>ss`v
zSeuwTS@x-XE`ar`pcw5T>UX;uWx0dYV_36jI5vQ*;shVxN-^A8-Ta`rCVS4dkkOFL
z*s0LDCehe}-**>k_xtcnwnveF_rry73UTD;n
z4HnMe3RY2^g0`OeTezR$|gJX|ovAfF&5x8)WcS*+?yq=9^|tLf^IJQctgi
z<#L*J5$x*!b$y|lObyV-WxHg+-gb;1=nGRJI)hoQBNG?k8m0+SFntfMsf&xnsk4mP
z6p&06{7VXgtf|ShC;t58d^CYwBvS>_!^H^2+M&OymZJJk_YyY9p`xyb`H=3*58wVpLj=`LqszS
z(!{LjqZMf&2Yk0nGG_PW{&yW$0|ym5A>C#5j--w*vAK~(8Tf#+MvZrJPNelTsw!3J
zRnasD4>DT9k6YxSPK@TA8jfOb&cG&nA
zk!PLvnF~SFoUYl+mXm+}=HSC!i{6NxgNlV_^_O7!c!hIYe&0^TXYCp}7e41J+aO&{
zAQ8}1cc1Ql+vCF+pB?`}&mK2n$-U+8!;|251FJg`N6BQn|*;QgFzEH{-Cib(MPjhPrQ*z?giOx{Um<5=;OehM}<-sE}R&QAj1SN^$_*VO4b7a
z4eYF8x4Kkzn}+|MOsVnq^O!9`fwvSB)L`w4-c}`*;mL6I(&w&!M>>@mV{jBdPT5Ab
z*8z@1-v+~8V(Vo)8GYRqEF9r>EDUZ?H}g_@yRM?*HfecK8Yj!DfJs3NDQ~<(gv5^~
z3$U0<`a<*)ia5>(w^d}iR@mwDDpMx6ZrEUQkQMYl?i{Z+-<9&Qu((z|GaOEj5IbFn
zSyFZd)!SZ%k*0M?(cWiq9Hvb?x!|Ke>271rxPv;`+z>PN9dkSO0z($XHQqiQhLELgYODb*+d#TFR*TvNb23HADQ>KaNycAD)M`
zglR4B5NJcYTLC0{nz`E|;VD_q`q}vrWy%5SXc<{I>cBo{_t}%(+k6hSN-*qR>VdXD
zQ;w_!Im_L!r#_{-U>%{nj>%u5j_Npkq_Rn{H&cfv8>=?;Q;`)oUyheJJ-(iwBV%{3
zu)K(0r8UAw(zn8{$W-a}nDRs8PRV9`M)@Z9R~l{`E#+4ioK^UK?>9~K>$3yhVV
z2b89rH@d?lcTv~RskyQW>~k?eX!iE^_hkBuw+>JD?PrOMG@F=4ZWSXHA0WD!p1|7u(+zP
zW<|~?Kp#0yvE{(*c07FWx~fSy?)e6r{XgokmC-66Z1?}@LwFb;KE6Lf2GG*8%p^Mt
z{cDQwd2H%|n(KphAu6Z%0g*qivNoM1{{o>~`ha9&ED>LIpZ4$w~jZV3>zb|oez<-j%1Lm**NPxvYx~(I
zdA|~Vx{ul#E7ZFp?)Buz7by4GqR*t0rGQYxpeq^`{kxt&
zv?F=1(z;}62+|ALK+QoU?M0p6_leDJy3@AW@{1+gP0}e1hAf^O`vyDOgYetPw83KN
zWaA`TOUB*3Nv4f=-QvEaD0pjmp^8ytXT9HxGCpAoO!q4j(k9Mpb&20PJD
zsB*pYZL{M-y>VxXavR4C+NW{?ps(NJSKXM6d^eU(%&_mY=ML2wbqDNW_k7wYu1;r`dhr?|gE
z1xU7TTtK)3Zw`V^C;q6ulWGg!RgrhyI=x^K%~>=W
z?I&rjcZg2+S*B$0xeyWFi*a!Fqn+n7Vq6!ccVFc+uUiFwP1jOwi&KLEEi{bEO`3)NnR!VIEH9NKx*9F
zw)d~uw*B%X@XtEds<>0h&zp>KB_^N8{D>FjXw7SfAIm5B8Sd}By|CQ6oapj+iU?*N
z*Rmz4ep*&ugN3DZ=TAnU
zFuOtGn)*R1vjb8YeHHW&<{-<{AWB~7Po;DN8Wl|M5T2>OhA>bd;a(3ds>8eLU?xY_
zi=d8qU&8oLpcAJty&x^P=g)rBJNMub{^2$8P4R2KR7Ij>YMA4`GawxNEp{nA{mcyo
z)}@0RF@fx6MnQQQb5`)M!Q-P^>>Pj~iv;MSZ#Hte%$(MVpJb*K*x3Hf+fA#z*oqjh
z&Cx&TR*xCyNrmeb>ik(l%cU>=k7w=W_T4iO1{BcX4VzEAFOw@ph7S|1)HNB4y*Wks
z`PZ#cq(Red$geCgEj8T^y@{4BT}1jnMA0$?gizbJNCVQ{WPXuRc8-`ToorS(BJs$dQbn^y0Wy|0}DdT6nC~rHA{(PwR
z`*vbk?HjOlz;}OJF*0S0#1byy_z(5&M)jN*E+d!O;%x+Ygu;cs@ag?*g{vchZ`byk
zCDG@zk#ch?nVcF-ph~)f)<+?Gl%QwxU=xn}uKoE@gNU4U6f}3caY7yRlKs{EHtZTp
z|JfEoJr@VeQiVS)5yK!^GqEQXub-zXQ+kv&TT|dd8s|_!5rj9k3e4L{1Yv9RVw$jB
z`-Q^T$4JAGH`dESeg}&>=XhrKhc6cQ?%lKKmH676YN62v73MbNnMZPIyc2!{*95H)
zOF|XhgZmZvMnZ7073Ev?CpzAI{~T2HhM4ZZ3<+1Pz9DL
zgOa_FM5t_QIloA(k;x?r=|2Gx*JUj!S1`03uIjUz$$E7Ml)6%QH*J
z*P|LVX~ABxPg3*HhgSw3WCq`EKXcBo!6h=DH-c%DxNgYl2m*`5cgQ4a4X4+;Avjp|
z(exf_;2w893etuBtO(VJTxmLp7n^aIqX#)K+rJE74Fl17w4NZ2`wfq-2G0hgzFREu
oKXG(Wi~kSP_5b(C9D~_XPlo?|M3W`>UmAeEjt<8
literal 5849
zcmZ{o2{hE--^XW+8N%2lhDNKU7!gU9u~XLUB}-&WDEk=ZOC;rID^b}gvX*@xTNK5R
zU77KdFhkZcwlUB2fBw(^JkL45=bU@b`P}v&$;pDrUq~hQ4SCY1UE9&
zy$%9_0p@gOhcI_yZ#nWX7oO(ER(kF2?fLonadB}D4i1)1iDuowcgwuMRaL%k&RRd_Q@xeZp>ORa0qlRe$Vi{F5_d<#@%bn=bJ~>{vlZ`jf#^chAY{T}?zKTj=RO
zZ@0LsvCruo3w7RSnc%UvgZRjtajpwxp$D8K;YFS4nqw(nQX2G^Ew0%jB#@s|xsKy^BkQTR-R|4K4u=Up)#DKR#BLD>U7jdPHv=W
z$$KEah3iI8mvTZ$+YJ<6_L5n;ex|#_F{cjny%AY+S2ZrTGT$tg4c&SUDd$-Ho=yWa
zq0AH_x?jz>pSN_2(HegHXbe%Ve3nCIu;{)n3=
zYI_wNX%XQ{1A+MEjC8fELNiygp57Gb73~r5uB-m)I~V*B!+Z7dBO4jfcS0!H&=Mh(
zkWg)HxfPT<)A4$ESUZmK#n}9E(wF^v9#zKrZAi7cBtQ3%?Qq%)YS!e{Ggc)!I;$-K
z?QId|Hc#_C{i#|-dlfxXQLhNc&XLM`wdsOhjN`d$+bYiWhj}4!r{!S9w|Ipf562cu
z`og-s20;NRS`X-)*EB%8H!j2Z-H_+WLv*F2c{+8ln@wL`h|E@-^v!{?Y90Jzbj0a*
z3Rszf>m33NM~1}&?Z`&3AZuJT*dn_GNpKuxya6}k+*i5Y+cE0EaX#ZRgK}&hGbcFA5l?%s1_5y3L-N#wovKX
z=*E<#Y8tMRlkZZjyy{vCuYl}{1oh`l9JCYkV#WD&Hm-%n258%AvdhOH2U
zFUEVJceRIKDUjpU;zk9kQ}&1&;rp*Rsw+}!tMnzmuEc)Fk#k!$
zKnW|OyG5#(y++QZRA|bhFV6j{kw-|}5Gc1S2HB^&844FAMX?OQ9+y3wD#b?nj+JWv
zF0gh(tAFMnaUAm-{_bdv<45F@lM(^NuS<$wMO@je>5?~cM1oGZ|CDA~EE=_LFGDhP
zABfeY&gr_nt&5Q}zz-^B>FY^#Hap3@FT)oZCWOD{;UZAkR)XkJ;O>njY_nRFn_|yi|M5gKlL+@^B8f6eHZlrZk$*~l>HET$Y_N5zQ8g|8ayMwTO{J!IN&oh^|e5Sg@^
z)Pik}YR6G38%%d-Qc3|qSX%0VFK3RP%1yuoJ*axJu{l=)Jd@9<40PR3>|0IuLd)Qi
z!S6;MxB+U6_R!!}!P~|QL71jiaH}P&0;xORNDwuyssKWQF>HF!(?Rymxt3OD{JWv{
z>YV_)sKh*bW^@VWfaN0kxC8+(x(Leu)~qi9*$@*-9zG}i!pLEBJ!@crKfHArt5JK{
z(Ho-CwoElsx{lw)aS(TRs>U_benGM|X<13AaC%#P(m&MoPqE#3^JehqB~?umHXzUV
zBChmZ?erR*b7Wtnu9WkdVWPPN*W>l!_=AIN7g}l_3#^!iKtn|3i4}0radT*bYbS`>
zi$3OjW^_s<^PuG{g}9UvWDQ)5gIydJ6Nh-oXoBEYegJ6YzfZ_-d@PTqWO2)*{jP}3
zYQ=0
z7v&d~HwypU_~8J75Otk8o-;{XZTg;ef{)Xx<3w0g$dJ+pbBZ%0Sm!7&LV{HpASn3&
zFI!bvxLfV##c756698lw&@o&U;;9k7FsuZB2(CPI*F;FroPB`T6)D7@As3wEAWT_b
z6r>@tVvjP|Vn1)oz3c(mPE7weGk-x0@m}~nID6JI*<
zD7P#603OSSMyX4PKf!HjVS~yMS$G00~oAoNPt$l0jnI~pHxUzL9DnPsY18)z*K))ypb=CJk-^Udf2tp!
zdcq|lKhy~u5%2`E5mTRmOnHD{&2TU8%%jvr3_*K>_##$iLVa5QUj
zHYCVoK>f_m%ia@ejkL=rXsabEej{@#1DhrG>HC%ENnwxR@WpbZNb;}7j4H;-H$7~iMjlxEsa!y-AtFC+F@yT+<*zM~O+J4k
zS=^KZ=~^ol0vTS}Xwi|YLhhq5US;NBdg-S;
zdhpJT%e+7JynpwNR^r<*cPegAGwe(%iP6xOI)D=^j^Hf?)R+VY$*76`eeabTsKTKY
zqlaV(rsvpJQ|h~;?VXAx$AQDqAgE{M1#%y7dRkec1tk-JGSdpEqo>1)cd1(7$}^KJ
zgn~tkpdL4Dag*5_Hsfvs@CLO@A@(O3H7kr3&v!J0gCgbjtmxRNH2dP_hJw%7na{yk
zbzR6WQ({9HW$Y`WXki&n$YrrqbpiP@aP*oKwSdj7zx>)7@9(*PY+`I~a&nHNBl^ai
z1PZ}Leh~rJ4znvJXgHUA=m6n*rKBCB4}0X$fYl37WA!DDu>q~%a!Y@L@rp(ewB9mKd>y0DL3^
zOjy;x?yTL+CGP(oqG{%G`v_o{yA>L08VcpF_%F0|E~BrT9Y0HQ`P8}^iQRJLV~gf-
zwAZH{NA>n=%4#Z;L&&se`ywi=RWIFOTyrh7#i0U8v-4c+au`n$$A~@S^^syr13(S>
zHP@2Rx{AZz4q{~$Zma#vPcvd$pcwaNgB1BI5WX|JFUj~R%IkaZ9RtbMh~S{I@tD)k
zrTO9YsOj7X=7ooTe}S(s&KB#aY#p-U_&8e`9mJm483qaeDQ1R&&Vja`WhU_8JeuYX
zoSm8VLod>KHgZmf@M9Pci2z|A>305(haRLSQSHX@hKE0XpOmbxJQ{U;@o+Tx_~=g-z*IJ8#6TZ_
zMA&JJSch7Pn#(5R>YKklgW5nHAmUb=ILIx07i6iHT`p(Xpb(0-Jsi&;4)j6?ZFIY(
z95nwB&a!S~D_|+(SOJZ^VKYp6yd9&FKcIz9I#~m0B&UVhGj6ZnZLZu41bgd7oeE_w
zm)XzUvIv7k!^YSjW^MJgRN%s3Tfr`ydu(U}YI>7G@^FXV3vVYiqVK*nF6bV-9Pbu!
zCcr00kT8$bZ`CWu%e!dYwfE|J9oQ5hUO%q7L+Fc{-V5P<3oaF}|KX?9wNlHiQG+Sb
zY{s3jg2+@%o7Fm<(io}Vi$m_SXOSM7#Kx6JS~zKT+^FS#3INd
zhbMo%L?iWD)c=iISm@cEosdQ5>WBsosfuNyd0|!Lk#rPza4@~X@;raFb`u%8v6;O|
zFL+atbNjy6yD0Zqhwgx*sj4sik}hg&?#tl0HtC=8#_83~@dT>VjXj>>@w~PnPoIn+
zRibHOI_F~d4oC)%a>ioy5{kh`p?e-72zuz{uj%ROjJsoqzj{VIpUX{yc5;h`XSO
z#HcpCKKyyU`@D}@__iWpd_1qhRLi{;-6p<3u^q4RbpT3d@ay0ggH_p`dwzqj$+?t+
zrh~47BPWR!Zd+j6R=+tmALN^Z^U@aMyFux^`!~i0%vm!>o?*0g+xNQwjsD@?pd#KY
zA0SsK^xJ5-#O8`0{GoSyTa>F(_N?FrPX9
zmYF}TODOi?zc_lF*e(w-n%oVs%_5~cMbfGDM3}AQ{jc@kFs@y1)H_i5H&=t3@uJiU
z82SG4*zu*)PgM^SH&*_7L&Wtq9mMYL!ZRz0j`$yX*8`iWh0{W4+{{PJ_m#J3h7QZr
zHCoeP4kzWQTAGvXUJj0b{q9I)!HG$!{k0PBoqa>aKY}!wojI*m
z`=0mpO*`S&i7W9`*9gncs7%KpQd*j60evIAAIDb(
zu8Ks}wIA%iE@?**4i0ak+LtHKwWtb$WTwn+VL5-2!Tr6GX-Aq!=(L#gB>nX+kuJyqe5y&k<;cT
lPsxBhSJ(eDEV&tw=4V}|anE}&%zsmmk)Ek;g|>6_e*tgvadiLy
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index e8ad897e37ce..9ed79ccc6d67 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -1948,9 +1948,9 @@
name = "\improper Brig Lockdown Shutter"
},
/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{
+ closeOtherId = "brigmaint_s";
dir = 1;
- name = "\improper Brig Maintenance";
- closeOtherId = "brigmaint_s"
+ name = "\improper Brig Maintenance"
},
/obj/structure/machinery/door/poddoor/almayer/open{
id = "perma_lockdown_2";
@@ -3245,8 +3245,8 @@
dir = 1
},
/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{
- name = "\improper Brig Lobby";
- closeOtherId = "brignorth"
+ closeOtherId = "brignorth";
+ name = "\improper Brig Lobby"
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -4251,7 +4251,7 @@
},
/area/almayer/living/pilotbunks)
"awY" = (
-/obj/effect/landmark/start/pilot,
+/obj/effect/landmark/start/pilot/cas_pilot,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/pilotbunks)
"awZ" = (
@@ -4638,8 +4638,8 @@
name = "\improper Combat Information Center Blast Door"
},
/obj/structure/machinery/door/airlock/almayer/command/reinforced{
- name = "\improper Combat Information Center";
- closeOtherId = "ciclobby_n"
+ closeOtherId = "ciclobby_n";
+ name = "\improper Combat Information Center"
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -5086,9 +5086,9 @@
dir = 4
},
/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+ closeOtherId = "ciclobby_n";
id_tag = "cic_exterior";
- name = "\improper Combat Information Center";
- closeOtherId = "ciclobby_n"
+ name = "\improper Combat Information Center"
},
/obj/structure/machinery/door/poddoor/almayer/open{
dir = 4;
@@ -15105,11 +15105,11 @@
dir = 4
},
/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{
+ closeOtherId = "brignorth";
dir = 2;
name = "\improper Brig Armoury";
req_access = null;
- req_one_access_txt = "1;3";
- closeOtherId = "brignorth"
+ req_one_access_txt = "1;3"
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -15299,8 +15299,8 @@
pixel_y = 2
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 4
+ dir = 4;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"bLw" = (
@@ -17672,9 +17672,9 @@
pixel_x = -1
},
/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+ closeOtherId = "containment_n";
dir = 8;
- name = "\improper Containment Airlock";
- closeOtherId = "containment_n"
+ name = "\improper Containment Airlock"
},
/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
dir = 4
@@ -18927,10 +18927,10 @@
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/machinery/door/airlock/almayer/security/reinforced{
access_modified = 1;
+ closeOtherId = "astroladder_n";
name = "\improper Astronavigational Deck";
req_access = null;
- req_one_access_txt = "3;19";
- closeOtherId = "astroladder_n"
+ req_one_access_txt = "3;19"
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -18940,10 +18940,10 @@
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/machinery/door/airlock/almayer/security/reinforced{
access_modified = 1;
+ closeOtherId = "astroladder_s";
name = "\improper Astronavigational Deck";
req_access = null;
- req_one_access_txt = "3;19";
- closeOtherId = "astroladder_s"
+ req_one_access_txt = "3;19"
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -22269,9 +22269,9 @@
dir = 4
},
/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+ closeOtherId = "ciclobby_s";
id_tag = "cic_exterior";
- name = "\improper Combat Information Center";
- closeOtherId = "ciclobby_s"
+ name = "\improper Combat Information Center"
},
/obj/structure/machinery/door/poddoor/almayer/open{
dir = 4;
@@ -26206,9 +26206,9 @@
/area/almayer/maint/upper/u_m_s)
"eKa" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{
+ closeOtherId = "briglobby";
dir = 2;
- name = "\improper Brig Lobby";
- closeOtherId = "briglobby"
+ name = "\improper Brig Lobby"
},
/obj/structure/machinery/door/firedoor/border_only/almayer,
/turf/open/floor/almayer{
@@ -27271,8 +27271,8 @@
dir = 1
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 8
+ dir = 8;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"fdf" = (
@@ -28920,8 +28920,8 @@
dir = 4
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_arrow";
- dir = 8
+ dir = 8;
+ icon_state = "ai_arrow"
},
/area/almayer/command/airoom)
"fKe" = (
@@ -29097,8 +29097,8 @@
req_one_access_txt = "90;91;92"
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 4
+ dir = 4;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"fMt" = (
@@ -31960,8 +31960,8 @@
unslashable = 0
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 4
+ dir = 4;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"gOC" = (
@@ -32271,8 +32271,8 @@
dir = 4
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_arrow";
- dir = 4
+ dir = 4;
+ icon_state = "ai_arrow"
},
/area/almayer/command/airoom)
"gUS" = (
@@ -33003,8 +33003,8 @@
dir = 4
},
/obj/item/tool/stamp/approved{
- pixel_y = -11;
- pixel_x = -3
+ pixel_x = -3;
+ pixel_y = -11
},
/turf/open/floor/almayer,
/area/almayer/squads/req)
@@ -34188,8 +34188,8 @@
dir = 4
},
/obj/structure/machinery/door/airlock/almayer/command/reinforced{
- name = "\improper Combat Information Center";
- closeOtherId = "ciclobby_s"
+ closeOtherId = "ciclobby_s";
+ name = "\improper Combat Information Center"
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -35117,9 +35117,9 @@
/area/almayer/maint/hull/lower/l_f_p)
"hSj" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{
+ closeOtherId = "brigmaint_n";
dir = 1;
- name = "\improper Brig";
- closeOtherId = "brigmaint_n"
+ name = "\improper Brig"
},
/obj/structure/machinery/door/poddoor/almayer/open{
id = "Brig Lockdown Shutters";
@@ -36017,9 +36017,9 @@
dir = 1
},
/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{
+ closeOtherId = "brigcells";
dir = 1;
- name = "\improper Brig Prison Yard And Offices";
- closeOtherId = "brigcells"
+ name = "\improper Brig Prison Yard And Offices"
},
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 2
@@ -36551,8 +36551,8 @@
unslashable = 0
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 8
+ dir = 8;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"ito" = (
@@ -37244,9 +37244,9 @@
pixel_x = 3
},
/obj/structure/largecrate/random/mini/med{
+ density = 1;
pixel_x = 3;
- pixel_y = 11;
- density = 1
+ pixel_y = 11
},
/turf/open/floor/almayer{
dir = 1;
@@ -40527,9 +40527,9 @@
/area/almayer/shipboard/brig/execution)
"jOc" = (
/obj/structure/closet/secure_closet/personal/cabinet{
- req_access = null;
+ pixel_x = 1;
pixel_y = 17;
- pixel_x = 1
+ req_access = null
},
/turf/open/floor/almayer,
/area/almayer/living/numbertwobunks)
@@ -42684,8 +42684,8 @@
req_one_access_txt = "90;91;92"
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 8
+ dir = 8;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"kAh" = (
@@ -42717,45 +42717,45 @@
},
/obj/structure/machinery/light/small{
dir = 4;
- status = 3;
- icon_state = "bulb-burned"
+ icon_state = "bulb-burned";
+ status = 3
},
/obj/effect/decal/cleanable/blood,
/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
icon = 'icons/obj/items/bloodpack.dmi';
icon_state = "bloodpack";
- name = "blood bag";
- desc = "A blood bag with a hole in it. The rats must have gotten to it first."
+ name = "blood bag"
},
/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
icon = 'icons/obj/items/bloodpack.dmi';
icon_state = "bloodpack";
- name = "blood bag";
- desc = "A blood bag with a hole in it. The rats must have gotten to it first."
+ name = "blood bag"
},
/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
icon = 'icons/obj/items/bloodpack.dmi';
icon_state = "bloodpack";
- name = "blood bag";
- desc = "A blood bag with a hole in it. The rats must have gotten to it first."
+ name = "blood bag"
},
/obj/item/prop{
+ desc = "The words \"Cloning Pod\" are scrawled onto it. It appears to be heavily damaged.";
icon = 'icons/obj/items/circuitboards.dmi';
icon_state = "id_mod";
- name = "circuit board";
- desc = "The words \"Cloning Pod\" are scrawled onto it. It appears to be heavily damaged.";
layer = 2.78;
- pixel_y = 10;
- pixel_x = 8
+ name = "circuit board";
+ pixel_x = 8;
+ pixel_y = 10
},
/obj/item/prop{
+ desc = "The words \"Cloning Scanner\" are scrawled onto it. It appears to be heavily damaged.";
icon = 'icons/obj/items/circuitboards.dmi';
icon_state = "id_mod";
- name = "circuit board";
- desc = "The words \"Cloning Scanner\" are scrawled onto it. It appears to be heavily damaged.";
layer = 2.79;
- pixel_y = 7;
- pixel_x = 8
+ name = "circuit board";
+ pixel_x = 8;
+ pixel_y = 7
},
/turf/open/floor/almayer{
icon_state = "sterile_green_corner"
@@ -44000,8 +44000,8 @@
/area/almayer/command/computerlab)
"kXj" = (
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 4
+ dir = 4;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"kXm" = (
@@ -46002,8 +46002,8 @@
/area/almayer/engineering/upper_engineering/port)
"lFJ" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{
- name = "\improper Brig Prisoner Yard";
- closeOtherId = "brigcells"
+ closeOtherId = "brigcells";
+ name = "\improper Brig Prisoner Yard"
},
/obj/structure/disposalpipe/segment{
dir = 8
@@ -46611,8 +46611,8 @@
/area/almayer/living/chapel)
"lUm" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{
- name = "\improper Brig Cells";
- closeOtherId = "briglobby"
+ closeOtherId = "briglobby";
+ name = "\improper Brig Cells"
},
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 1
@@ -48149,8 +48149,8 @@
},
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{
- name = "\improper Brig";
- closeOtherId = "brigmaint_n"
+ closeOtherId = "brigmaint_n";
+ name = "\improper Brig"
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -48291,10 +48291,10 @@
},
/obj/structure/machinery/door/airlock/almayer/security/reinforced{
access_modified = 1;
+ closeOtherId = "astroladder_n";
name = "\improper Astronavigational Deck";
req_access = null;
- req_one_access_txt = "3;19";
- closeOtherId = "astroladder_n"
+ req_one_access_txt = "3;19"
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -48607,8 +48607,8 @@
/area/almayer/medical/hydroponics)
"mHE" = (
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 8
+ dir = 8;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"mHF" = (
@@ -49103,8 +49103,8 @@
dir = 4
},
/obj/structure/sign/safety/storage{
- pixel_y = 7;
- pixel_x = -17
+ pixel_x = -17;
+ pixel_y = 7
},
/obj/structure/sign/safety/commline_connection{
pixel_x = -17;
@@ -53702,8 +53702,8 @@
/obj/effect/step_trigger/clone_cleaner,
/obj/structure/platform_decoration,
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 4
+ dir = 4;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"osz" = (
@@ -54702,9 +54702,9 @@
pixel_y = 1
},
/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+ closeOtherId = "containment_n";
dir = 8;
- name = "\improper Containment Airlock";
- closeOtherId = "containment_n"
+ name = "\improper Containment Airlock"
},
/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
dir = 4
@@ -54851,8 +54851,8 @@
},
/obj/effect/step_trigger/clone_cleaner,
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 8
+ dir = 8;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"oLF" = (
@@ -58244,8 +58244,8 @@
dir = 8
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 4
+ dir = 4;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"pYo" = (
@@ -59580,8 +59580,8 @@
req_one_access_txt = "90;91;92"
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 8
+ dir = 8;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"qwY" = (
@@ -60997,8 +60997,8 @@
pixel_y = 6
},
/obj/item/device/toner{
- pixel_y = -11;
- pixel_x = -2
+ pixel_x = -2;
+ pixel_y = -11
},
/turf/open/floor/almayer{
icon_state = "plate"
@@ -61137,17 +61137,17 @@
pixel_x = 9
},
/obj/item/tool/surgery/bonegel/empty{
- pixel_y = 15;
- pixel_x = 4
+ pixel_x = 4;
+ pixel_y = 15
},
/obj/item/tool/surgery/bonegel/empty{
- pixel_y = 13;
- pixel_x = -8
+ pixel_x = -8;
+ pixel_y = 13
},
/obj/item/tool/surgery/bonegel/empty{
- pixel_y = 19;
+ layer = 3.01;
pixel_x = -5;
- layer = 3.01
+ pixel_y = 19
},
/obj/item/storage/box/gloves{
layer = 3.2;
@@ -71444,11 +71444,11 @@
/area/almayer/engineering/ce_room)
"uzH" = (
/obj/structure/machinery/door/airlock/almayer/medical/glass{
+ closeOtherId = "brigmed";
name = "\improper Brig Medbay";
req_access = null;
req_one_access = null;
- req_one_access_txt = "20;3";
- closeOtherId = "brigmed"
+ req_one_access_txt = "20;3"
},
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -71560,6 +71560,10 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/lower/starboard_midship_hallway)
+"uBs" = (
+/obj/effect/landmark/start/pilot/dropship_pilot,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/pilotbunks)
"uBx" = (
/obj/structure/prop/invuln/overhead_pipe{
dir = 4;
@@ -74359,9 +74363,9 @@
},
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{
+ closeOtherId = "brigwarden";
dir = 1;
- name = "\improper Warden's Office";
- closeOtherId = "brigwarden"
+ name = "\improper Warden's Office"
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -74651,8 +74655,8 @@
dir = 4
},
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 8
+ dir = 8;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"vBp" = (
@@ -76422,9 +76426,9 @@
/area/almayer/shipboard/brig/cic_hallway)
"wdo" = (
/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+ closeOtherId = "containment_s";
dir = 8;
- name = "\improper Containment Airlock";
- closeOtherId = "containment_s"
+ name = "\improper Containment Airlock"
},
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -80461,8 +80465,8 @@
},
/obj/effect/step_trigger/clone_cleaner,
/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_silver";
- dir = 4
+ dir = 4;
+ icon_state = "ai_silver"
},
/area/almayer/command/airoom)
"xvO" = (
@@ -81864,8 +81868,8 @@
/area/almayer/shipboard/brig/processing)
"xTL" = (
/obj/structure/machinery/cm_vending/gear/executive_officer{
- pixel_y = 30;
- density = 0
+ density = 0;
+ pixel_y = 30
},
/obj/structure/machinery/power/apc/almayer{
dir = 4
@@ -82641,8 +82645,8 @@
/area/almayer/maint/upper/u_m_p)
"yfO" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{
- name = "\improper Warden's Office";
- closeOtherId = "brigwarden"
+ closeOtherId = "brigwarden";
+ name = "\improper Warden's Office"
},
/obj/structure/machinery/door/poddoor/shutters/almayer/open{
dir = 4;
@@ -82949,9 +82953,9 @@
pixel_x = -1
},
/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+ closeOtherId = "containment_s";
dir = 8;
- name = "\improper Containment Airlock";
- closeOtherId = "containment_s"
+ name = "\improper Containment Airlock"
},
/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
dir = 4
@@ -105975,7 +105979,7 @@ wbO
avU
avU
awY
-awY
+uBs
kOB
awZ
aiX
diff --git a/maps/map_files/USS_Runtime/USS_Runtime.dmm b/maps/map_files/USS_Runtime/USS_Runtime.dmm
index aec89c5882dd..3ffdaf8a1814 100644
--- a/maps/map_files/USS_Runtime/USS_Runtime.dmm
+++ b/maps/map_files/USS_Runtime/USS_Runtime.dmm
@@ -92,7 +92,7 @@
},
/area/event)
"z" = (
-/obj/effect/landmark/start/pilot,
+/obj/effect/landmark/start/pilot/dropship_pilot,
/turf/open/floor/almayer{
icon_state = "plating"
},
@@ -145,6 +145,12 @@
icon_state = "plating"
},
/area/event)
+"M" = (
+/obj/effect/landmark/start/pilot/cas_pilot,
+/turf/open/floor/almayer{
+ icon_state = "plating"
+ },
+/area/event)
"N" = (
/obj/effect/landmark/start/nurse,
/turf/open/floor/almayer{
@@ -289,7 +295,7 @@ a
A
l
L
-b
+M
b
b
b
From a4abec8abbdd6eb0d9f7ae64c04932f6774aa984 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:20:05 +0000
Subject: [PATCH 11/32] Automatic changelog for PR #5958 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5958.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5958.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5958.yml b/html/changelogs/AutoChangeLog-pr-5958.yml
new file mode 100644
index 000000000000..3ed1801e9011
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5958.yml
@@ -0,0 +1,4 @@
+author: "567Turtle"
+delete-after: True
+changes:
+ - rscadd: "PO has been split into two roles, the gunship pilot and the dropship pilot, no more arguing over who gets CAS."
\ No newline at end of file
From 3dfe21e08ded1213f4226f48ce9d94bc58fb49c5 Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Mon, 18 Mar 2024 18:21:15 +0100
Subject: [PATCH 12/32] Fixes synthetics being in a weird limbo state when they
have their head reattached. (#5916)
# About the pull request
Did some digging.
Turns out, when the Queen gibs someone the flag 'undefibbable' gets set.
Then, next time the Life() proc is called we get removed from the
'processable_humans_list' on SSHuman. (Makes sense, no reason to process
someone unrevivable, which non-synth gibbed people are)
This means when the synth has their head reattached and they get revived
they no longer process Life() ticks. This means their blindness +
critical state will never get cleared.
I fixed this by not making synths 'undefibbable'. You already can't
revive someone without a head, so you won't be able to revive a headless
corpse.
In addition I checked the usages of 'undefibbable' and didn't find
anything that would break from this not being set.
# Explain why it's good for the game
# Testing Photographs and Procedure
Screenshots & Videos
Tested the following:
Not able to revive headless corpse
Not able to revive before head is fully attached
Revived synth can speak normally + see
Revived synth can walk and do normal actions when limbs are reattached.
# Changelog
:cl:
fix: Synths can now have their heads reattached without being sent to
limbo-crit-hell.
/:cl:
---------
Co-authored-by: harryob
---
code/modules/mob/living/carbon/human/death.dm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index af0da452d13e..c97e4344cabf 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -10,13 +10,16 @@
// Override the current limb status
E.droplimb(0, 0, cause)
- undefibbable = TRUE
+
GLOB.data_core.manifest_modify(real_name, WEAKREF(src), null, null, "*Deceased*")
if(is_a_synth)
spawn_gibs()
return
+
+ undefibbable = TRUE
+
..()
/mob/living/carbon/human/gib_animation()
From 3c4e53356be6b52ec5391db0babd407d172b18e6 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Mon, 18 Mar 2024 17:26:37 +0000
Subject: [PATCH 13/32] Automatic changelog for PR #5916 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5916.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5916.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5916.yml b/html/changelogs/AutoChangeLog-pr-5916.yml
new file mode 100644
index 000000000000..5e60f46ae6ba
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5916.yml
@@ -0,0 +1,4 @@
+author: "TheGamerdk"
+delete-after: True
+changes:
+ - bugfix: "Synths can now have their heads reattached without being sent to limbo-crit-hell."
\ No newline at end of file
From 45dcc7eaff6042b5c07b7e5b7cc3aa48b924d178 Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Tue, 19 Mar 2024 01:07:39 +0000
Subject: [PATCH 14/32] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-5916.yml | 4 ----
html/changelogs/AutoChangeLog-pr-5934.yml | 4 ----
html/changelogs/AutoChangeLog-pr-5936.yml | 4 ----
html/changelogs/AutoChangeLog-pr-5939.yml | 4 ----
html/changelogs/AutoChangeLog-pr-5947.yml | 7 -------
html/changelogs/AutoChangeLog-pr-5958.yml | 4 ----
html/changelogs/archive/2024-03.yml | 19 +++++++++++++++++++
7 files changed, 19 insertions(+), 27 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-5916.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5934.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5936.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5939.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5947.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5958.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5916.yml b/html/changelogs/AutoChangeLog-pr-5916.yml
deleted file mode 100644
index 5e60f46ae6ba..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5916.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TheGamerdk"
-delete-after: True
-changes:
- - bugfix: "Synths can now have their heads reattached without being sent to limbo-crit-hell."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5934.yml b/html/changelogs/AutoChangeLog-pr-5934.yml
deleted file mode 100644
index c9ead4071bfe..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5934.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SabreML"
-delete-after: True
-changes:
- - admin: "Made the 'Join as Xeno' button disable the user's larva protection when clicked by a moderator."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5936.yml b/html/changelogs/AutoChangeLog-pr-5936.yml
deleted file mode 100644
index 533d1d5dedad..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5936.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TotalEpicness5"
-delete-after: True
-changes:
- - bugfix: "Stamina damage can now be ahealed."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5939.yml b/html/changelogs/AutoChangeLog-pr-5939.yml
deleted file mode 100644
index e951ce27ff77..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5939.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Waseemq1235"
-delete-after: True
-changes:
- - rscdel: "Removes HEAP from all UPP vendor gear presets"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5947.yml b/html/changelogs/AutoChangeLog-pr-5947.yml
deleted file mode 100644
index 5e4375364bc7..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5947.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Drathek"
-delete-after: True
-changes:
- - bugfix: "Overdose death messages will now mention last mob that contributed to the OD"
- - admin: "Many additions to attack, say, interact, and niche logging"
- - admin: "Temporary muted messages/actions are now niche logged instead of say logged"
- - ui: "Added niche log filtering to TGChat (still requires admin niche logs preference)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5958.yml b/html/changelogs/AutoChangeLog-pr-5958.yml
deleted file mode 100644
index 3ed1801e9011..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5958.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "567Turtle"
-delete-after: True
-changes:
- - rscadd: "PO has been split into two roles, the gunship pilot and the dropship pilot, no more arguing over who gets CAS."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml
index 221eaa5ab3c4..531c6e4e236d 100644
--- a/html/changelogs/archive/2024-03.yml
+++ b/html/changelogs/archive/2024-03.yml
@@ -211,3 +211,22 @@
- maptweak: Placed APC's on ert stations and minor tweaks+fixes.
Segrain:
- bugfix: Professor Dummy in CMO's office now works properly.
+2024-03-19:
+ 567Turtle:
+ - rscadd: PO has been split into two roles, the gunship pilot and the dropship pilot,
+ no more arguing over who gets CAS.
+ Drathek:
+ - bugfix: Overdose death messages will now mention last mob that contributed to
+ the OD
+ - admin: Many additions to attack, say, interact, and niche logging
+ - admin: Temporary muted messages/actions are now niche logged instead of say logged
+ - ui: Added niche log filtering to TGChat (still requires admin niche logs preference)
+ SabreML:
+ - admin: Made the 'Join as Xeno' button disable the user's larva protection when
+ clicked by a moderator.
+ TheGamerdk:
+ - bugfix: Synths can now have their heads reattached without being sent to limbo-crit-hell.
+ TotalEpicness5:
+ - bugfix: Stamina damage can now be ahealed.
+ Waseemq1235:
+ - rscdel: Removes HEAP from all UPP vendor gear presets
From 750601f626b6f7c0dee77ae5ebb243b2f12183d9 Mon Sep 17 00:00:00 2001
From: Julian56 <117036822+Huffie56@users.noreply.github.com>
Date: Tue, 19 Mar 2024 07:02:38 +0100
Subject: [PATCH 15/32] fixes map ugliness and added some access restriction to
some area. (#5965)
# About the pull request
Fixes ugliness:
1-
![image](https://github.com/cmss13-devs/cmss13/assets/117036822/3e399331-6782-455a-a786-77dc8b1910e8)
2-
![image](https://github.com/cmss13-devs/cmss13/assets/117036822/aaa1e3ef-22a9-4737-abf4-714afdfa92bd)
3-
![image](https://github.com/cmss13-devs/cmss13/assets/117036822/4d18b799-f9ee-4c79-9127-de60300745dd)
4-
![image](https://github.com/cmss13-devs/cmss13/assets/117036822/946c7512-6070-4bc1-abba-36b37a0ea9ec)
5-
![image](https://github.com/cmss13-devs/cmss13/assets/117036822/490580ee-6f73-4935-b09c-6b10104beea3)
# Explain why it's good for the game
# Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the
screenshots and the `` tags.
# Changelog
:cl:
maptweak: Fix ugliness at 5 different areas.
maptweak: added access restriction for doors that lack them(OT workshop,
engi dormitory, Upper engi back storage door.)
/:cl:
Co-authored-by: Julien
---
maps/map_files/USS_Almayer/USS_Almayer.dmm | 116 ++++++++++++---------
1 file changed, 68 insertions(+), 48 deletions(-)
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 9ed79ccc6d67..7353a09b3541 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -18982,17 +18982,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/upper/u_a_p)
-"cna" = (
-/obj/effect/step_trigger/clone_cleaner,
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/obj/structure/machinery/alarm/almayer{
- dir = 1
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/upper/port)
"cnd" = (
/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
dir = 2;
@@ -26215,6 +26204,15 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/processing)
+"eKm" = (
+/obj/structure/machinery/suit_storage_unit/compression_suit/uscm,
+/obj/structure/machinery/alarm/almayer{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hallways/lower/starboard_umbilical)
"eKy" = (
/obj/structure/pipes/standard/simple/visible{
dir = 6
@@ -26336,7 +26334,9 @@
/area/almayer/shipboard/brig/mp_bunks)
"eMh" = (
/obj/structure/machinery/door/airlock/almayer/generic{
- name = "\improper Laundry Room"
+ name = "\improper Laundry Room";
+ req_one_access = list(19,7);
+ req_access = list()
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -26604,6 +26604,15 @@
icon_state = "cargo_arrow"
},
/area/almayer/engineering/lower/workshop/hangar)
+"eSc" = (
+/obj/structure/machinery/power/apc/almayer{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/lower)
"eSk" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -43772,6 +43781,18 @@
},
/turf/open/floor/wood/ship,
/area/almayer/living/commandbunks)
+"kSL" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/obj/structure/machinery/alarm/almayer{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "red"
+ },
+/area/almayer/hallways/upper/port)
"kSU" = (
/obj/structure/transmitter/no_dnd{
name = "Requisition Telephone";
@@ -46480,6 +46501,16 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_f_p)
+"lQl" = (
+/obj/structure/sign/safety/rewire{
+ pixel_x = 32
+ },
+/obj/structure/machinery/power/apc/almayer,
+/turf/open/floor/almayer{
+ dir = 4;
+ icon_state = "orange"
+ },
+/area/almayer/hallways/lower/port_aft_hallway)
"lQz" = (
/obj/structure/machinery/vending/coffee,
/turf/open/floor/almayer{
@@ -49566,18 +49597,6 @@
/obj/item/tool/wrench,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/maint/hull/lower/p_bow)
-"mXy" = (
-/obj/structure/machinery/power/apc/almayer{
- dir = 1
- },
-/obj/structure/sign/safety/rewire{
- pixel_x = 32
- },
-/turf/open/floor/almayer{
- dir = 4;
- icon_state = "orange"
- },
-/area/almayer/hallways/lower/port_aft_hallway)
"mYd" = (
/obj/structure/sign/safety/escapepod{
pixel_y = 32
@@ -55900,7 +55919,9 @@
/obj/structure/machinery/door_control{
id = "OTStore";
name = "Shutters";
- pixel_y = 24
+ pixel_y = 24;
+ access_modified = 1;
+ req_one_access_txt = "35"
},
/obj/effect/decal/warning_stripes{
icon_state = "NE-out";
@@ -72827,9 +72848,6 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/lower/starboard_fore_hallway)
"vaM" = (
-/obj/structure/machinery/power/apc/almayer{
- dir = 1
- },
/obj/structure/sign/safety/hazard{
pixel_y = 32
},
@@ -72841,6 +72859,9 @@
icon_state = "NW-out";
pixel_y = 1
},
+/obj/structure/machinery/power/apc/almayer{
+ dir = 4
+ },
/turf/open/floor/almayer{
icon_state = "plate"
},
@@ -73408,9 +73429,6 @@
/obj/structure/machinery/camera/autoname/almayer{
name = "ship-grade camera"
},
-/obj/structure/machinery/alarm/almayer{
- dir = 1
- },
/obj/structure/machinery/suit_storage_unit/compression_suit/uscm,
/obj/structure/sign/safety/hazard{
pixel_y = 32
@@ -75791,7 +75809,9 @@
/obj/structure/machinery/door_control{
id = "OTStore";
name = "Shutters";
- pixel_y = -24
+ pixel_y = -24;
+ access_modified = 1;
+ req_one_access_txt = "35"
},
/obj/structure/surface/rack,
/obj/item/reagent_container/glass/bucket/janibucket,
@@ -76201,9 +76221,6 @@
/area/almayer/medical/containment/cell/cl)
"vZU" = (
/obj/structure/surface/table/almayer,
-/obj/structure/machinery/power/apc/almayer{
- dir = 4
- },
/obj/structure/machinery/cell_charger,
/obj/structure/sign/safety/high_rad{
pixel_x = 32;
@@ -80016,13 +80033,16 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/req)
"xnR" = (
-/obj/structure/machinery/door/airlock/almayer/maint{
- dir = 1;
- name = "\improper Engineering Storage"
- },
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 1
},
+/obj/structure/machinery/door/airlock/almayer/maint{
+ access_modified = 1;
+ dir = 1;
+ name = "\improper Engineering Storage";
+ req_one_access = null;
+ req_one_access_txt = "2;7"
+ },
/turf/open/floor/almayer{
icon_state = "test_floor4"
},
@@ -98356,7 +98376,7 @@ lxd
dPk
nBV
dyq
-lxd
+eKm
uaG
lYN
byr
@@ -112493,7 +112513,7 @@ bVE
ash
wwi
mnC
-vUO
+fCP
qRx
fCP
fCP
@@ -112900,14 +112920,14 @@ bNI
qNe
uIa
qxK
+rYG
qxK
qxK
qxK
-rYG
-qxK
qxK
qxK
qxK
+rYG
qxK
ash
ftZ
@@ -119409,7 +119429,7 @@ ayo
nIN
nIN
nIN
-cna
+vmJ
nzD
xDV
qXS
@@ -120418,7 +120438,7 @@ xzh
xzh
jHX
nIN
-aDS
+kSL
sfT
hGV
nIN
@@ -132073,12 +132093,12 @@ oJk
lNR
lNR
oJk
-mXy
+cNm
oGh
far
vDo
nnr
-cNm
+lQl
ljv
ljv
sUi
@@ -132873,7 +132893,7 @@ lKM
sqg
nSq
oBr
-fcS
+eSc
gdJ
cjt
pRZ
From a36624ee1ac9fe9636200db81362fb85581aa4b5 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Tue, 19 Mar 2024 06:08:50 +0000
Subject: [PATCH 16/32] Automatic changelog for PR #5965 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5965.yml | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5965.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5965.yml b/html/changelogs/AutoChangeLog-pr-5965.yml
new file mode 100644
index 000000000000..fa1ce48f9869
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5965.yml
@@ -0,0 +1,5 @@
+author: "Huffie56"
+delete-after: True
+changes:
+ - maptweak: "Fix ugliness at 5 different areas."
+ - maptweak: "added access restriction for doors that lack them(OT workshop, engi dormitory, Upper engi back storage door.)"
\ No newline at end of file
From f300896cd8b4c5cd374682c8c909e821ed3b39af Mon Sep 17 00:00:00 2001
From: Katskan
Date: Tue, 19 Mar 2024 02:21:07 -0400
Subject: [PATCH 17/32] Synthetic Vendor Items Update (#5954)
# About the pull request
Updates and adds a few things to account for both recent game changes as
well as some new cosmetics.
# Explain why it's good for the game
More cosmetics, some flavor options, also it's nice to not drain
medbay's entire stock in order to reach functionality.
# Changelog
:cl:
add: Added some new uniforms and hats
add: Added blood packs to vendor for 5 points, equal to a pill bottle
add: Added tactical prybar to vendor for 5 points
add: Added some surgical tools, very expensive costs essentially your
entire point budget to buy
/:cl:
---
.../machinery/vending/vendor_types/crew/synthetic.dm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
index c3fa77be3798..686df942c8c5 100644
--- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm
+++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
@@ -21,6 +21,7 @@
list("Plastic Explosive", 3, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR),
list("ES-11 Mobile Fuel Canister", 4, /obj/item/tool/weldpack/minitank, null, VENDOR_ITEM_REGULAR),
list("Engineer Kit", 1, /obj/item/storage/toolkit/empty, null, VENDOR_ITEM_REGULAR),
+ list("Tactical Prybar", 5, /obj/item/tool/crowbar/tactical, null, VENDOR_ITEM_REGULAR),
list("FIRSTAID KITS", 0, null, null, null),
list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR),
@@ -38,6 +39,9 @@
list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR),
list("Stasis Bag", 6, /obj/item/bodybag/cryobag, null, VENDOR_ITEM_REGULAR),
list("MS-11 Smart Refill Tank", 6, /obj/item/reagent_container/glass/minitank, null, VENDOR_ITEM_REGULAR),
+ list("Blood", 5, /obj/item/reagent_container/blood/OMinus, null, VENDOR_ITEM_REGULAR),
+ list("Surgical Bed", 10, /obj/structure/bed/portable_surgery, null, VENDOR_ITEM_REGULAR),
+ list("Surgical Kit", 30, /obj/item/storage/surgical_tray, null, VENDOR_ITEM_REGULAR),
list("Pillbottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED),
list("Pillbottle (Dexalin)", 5, /obj/item/storage/pill_bottle/dexalin, null, VENDOR_ITEM_REGULAR),
@@ -136,6 +140,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
list("Smartpack, White", 0, /obj/item/storage/backpack/marine/smartpack/white, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Smartpack, Black", 0, /obj/item/storage/backpack/marine/smartpack/black, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Logistics IMP Backpack", 0, /obj/item/storage/backpack/marine/satchel/big, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
+ list("Expedition Chestrig", 0, /obj/item/storage/backpack/marine/satchel/intel/chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("BELT (CHOOSE 1)", 0, null, null, null),
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
@@ -187,7 +192,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR),
- list("USCM Service Uniform", 12, /obj/item/clothing/under/marine/officer/bridge, null, VENDOR_ITEM_REGULAR),
+ list("USCM Service Uniform, Tan", 12, /obj/item/clothing/under/marine/officer/bridge, null, VENDOR_ITEM_REGULAR),
+ list("USCM Service Uniform, White", 12, /obj/item/clothing/under/marine/dress, null, VENDOR_ITEM_REGULAR),
list("USCM Flightsuit", 12, /obj/item/clothing/under/rank/synthetic/flight, null, VENDOR_ITEM_REGULAR),
list("USCM Engineers Uniform", 12, /obj/item/clothing/under/marine/engineer/standard, null, VENDOR_ITEM_REGULAR),
list("USCM Engineers Uniform (Darker)", 12, /obj/item/clothing/under/marine/engineer/darker, null, VENDOR_ITEM_REGULAR),
@@ -238,6 +244,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("Beret, Red", 12, /obj/item/clothing/head/beret/cm/red, null, VENDOR_ITEM_REGULAR),
list("Beret, Standard", 12, /obj/item/clothing/head/beret/cm, null, VENDOR_ITEM_REGULAR),
list("Beret, Tan", 12, /obj/item/clothing/head/beret/cm/tan, null, VENDOR_ITEM_REGULAR),
+ list("Beret, Green", 12, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
list("Beret, Black", 12, /obj/item/clothing/head/beret/cm/black, null, VENDOR_ITEM_REGULAR),
list("Beret, White", 12, /obj/item/clothing/head/beret/cm/white, null, VENDOR_ITEM_REGULAR),
list("Surgical Cap, Blue", 12, /obj/item/clothing/head/surgery/blue, null, VENDOR_ITEM_REGULAR),
From ed531301d09c8c2653a7947333dfc5f8fe7e251f Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Tue, 19 Mar 2024 06:26:55 +0000
Subject: [PATCH 18/32] Automatic changelog for PR #5954 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5954.yml | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5954.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5954.yml b/html/changelogs/AutoChangeLog-pr-5954.yml
new file mode 100644
index 000000000000..616e46a7be64
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5954.yml
@@ -0,0 +1,7 @@
+author: "Katskan"
+delete-after: True
+changes:
+ - rscadd: "Added some new uniforms and hats"
+ - rscadd: "Added blood packs to vendor for 5 points, equal to a pill bottle"
+ - rscadd: "Added tactical prybar to vendor for 5 points"
+ - rscadd: "Added some surgical tools, very expensive costs essentially your entire point budget to buy"
\ No newline at end of file
From bf44add4648ed0033e4b7265b5083a49dd5ba70f Mon Sep 17 00:00:00 2001
From: forest2001 <41653574+realforest2001@users.noreply.github.com>
Date: Tue, 19 Mar 2024 06:23:07 +0000
Subject: [PATCH 19/32] Dress Blues (#5845)
# About the pull request
Changes all marine presets to use the dress blues rather than current
dress equipment.
I have not changed Whiskey Outpost presets, they'll be done later or in
another PR.
# Explain why it's good for the game
Makes things consistent as the blues are full marine dress uniforms
rather than the mismatched stuff we have currently.
# Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the
screenshots and the `` tags.
# Changelog
:cl:
add: Changed all marine presets to use Dress Blues as their dress
equipment.
del: Excluding Whiskey Outpost, removed all previous dress equipment
from vendors.
/:cl:
---
.../survivors/lv_522/forcon_survivors.dm | 14 ++++++
code/modules/gear_presets/uscm.dm | 38 ++++++++++++--
code/modules/gear_presets/uscm_event.dm | 30 +++++++++--
code/modules/gear_presets/uscm_medical.dm | 12 +++--
code/modules/gear_presets/uscm_ship.dm | 50 +++++++++++++------
5 files changed, 121 insertions(+), 23 deletions(-)
diff --git a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm
index c4e08af9dcfa..3af7df42e3a7 100644
--- a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm
+++ b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm
@@ -13,6 +13,12 @@
ACCESS_CIVILIAN_LOGISTICS,
)
+ dress_shoes = list(/obj/item/clothing/shoes/dress)
+ dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
+
/datum/equipment_preset/survivor/forecon/load_gear(mob/living/carbon/human/new_human)
var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
@@ -210,6 +216,10 @@
skills = /datum/skills/military/survivor/forecon_squad_leader
paygrade = PAY_SHORT_MO1
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
+
/datum/equipment_preset/survivor/forecon/squad_leader/load_gear(mob/living/carbon/human/new_human)
var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
@@ -238,6 +248,10 @@
idtype = /obj/item/card/id/gold
role_comm_title = "FORECON CO"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
+
/datum/equipment_preset/survivor/forecon/major/load_gear(mob/living/carbon/human/new_human)
var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm
index 5402a5ed7305..eec3b6157877 100644
--- a/code/modules/gear_presets/uscm.dm
+++ b/code/modules/gear_presets/uscm.dm
@@ -16,9 +16,9 @@
service_hat = list(/obj/item/clothing/head/cmcap)
service_shoes = list(/obj/item/clothing/shoes/dress)
- dress_under = list(/obj/item/clothing/under/marine/dress)
- dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress)
- dress_hat = list(/obj/item/clothing/head/marine/peaked)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
dress_shoes = list(/obj/item/clothing/shoes/dress)
var/auto_squad_name
@@ -72,6 +72,8 @@
skills = /datum/skills/pfc
minimap_icon = "private"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/pfc/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
@@ -108,6 +110,8 @@
skills = /datum/skills/smartgunner
minimap_icon = "smartgunner"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/sg/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
@@ -227,6 +231,9 @@
utility_under = list(/obj/item/clothing/under/marine/officer/intel)
minimap_icon = "io"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
/datum/equipment_preset/uscm/intel/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
@@ -279,6 +286,8 @@
skills = /datum/skills/specialist
minimap_icon = "spec"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/spec/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
@@ -338,6 +347,8 @@
minimap_icon = "medic"
utility_under = list(/obj/item/clothing/under/marine/medic)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/medic/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/medic
@@ -400,6 +411,8 @@
minimap_icon = "engi"
utility_under = list(/obj/item/clothing/under/marine/engineer)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/engineer/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
@@ -463,6 +476,8 @@
skills = /datum/skills/pfc/crafty
minimap_icon = "private"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/private_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
@@ -553,6 +568,8 @@
skills = /datum/skills/smartgunner
minimap_icon = "smartgunner"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/smartgunner_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
@@ -592,6 +609,8 @@
minimap_icon = "engi"
utility_under = list(/obj/item/clothing/under/marine/engineer)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/engineer_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
@@ -638,6 +657,8 @@
minimap_icon = "medic"
utility_under = list(/obj/item/clothing/under/marine/medic)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/medic_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
@@ -690,6 +711,8 @@
skills = /datum/skills/specialist
minimap_icon = "spec"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
/datum/equipment_preset/uscm/specialist_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
@@ -873,6 +896,9 @@
skills = /datum/skills/commando/deathsquad/leader
minimap_icon = "leader"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
/datum/equipment_preset/uscm/marsoc/sl/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
@@ -898,6 +924,9 @@
role_comm_title = "CMD."
paygrade = PAY_SHORT_MO3
skills = /datum/skills/commando/deathsquad/officer
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
/datum/equipment_preset/uscm/marsoc/cmd/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
@@ -956,6 +985,9 @@
skills = /datum/skills/commando/deathsquad/leader
minimap_icon = "leader"
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
/datum/equipment_preset/uscm/marsoc/sl/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm
index ce36f1fd807f..dc6eb34161ee 100644
--- a/code/modules/gear_presets/uscm_event.dm
+++ b/code/modules/gear_presets/uscm_event.dm
@@ -31,11 +31,11 @@
service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber)
service_hat = list(/obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/marine/commander/dress, /obj/item/clothing/head/beret/marine/commander/black)
- dress_under = list(/obj/item/clothing/under/marine/dress, /obj/item/clothing/under/marine/officer/formal/servicedress)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/general)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
dress_extra = list(/obj/item/storage/large_holster/ceremonial_sword/full)
- dress_hat = list(/obj/item/clothing/head/marine/peaked/captain/white, /obj/item/clothing/head/marine/peaked/captain/black)
dress_shoes = list(/obj/item/clothing/shoes/dress/commander)
- dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/white, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/black, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/suit)
/datum/equipment_preset/uscm_event/colonel/New()
. = ..()
@@ -72,6 +72,10 @@
service_gloves = list(/obj/item/clothing/gloves/black, /obj/item/clothing/gloves/marine/dress)
service_hat = list(/obj/item/clothing/head/general, /obj/item/clothing/head/beret/marine/commander/black)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/general)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
+
/datum/equipment_preset/uscm_event/general/New()
. = ..()
access = get_access(ACCESS_LIST_GLOBAL)
@@ -149,6 +153,10 @@
role_comm_title = "OT"
skills = /datum/skills/spy
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
+
/datum/equipment_preset/uscm_event/upp_spy/load_gear(mob/living/carbon/human/new_human)
//TODO: add backpacks and satchels
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
@@ -200,6 +208,10 @@
role_comm_title = "PvE"
flags = EQUIPMENT_PRESET_EXTRA
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
+
/datum/equipment_preset/uscm_event/provost/enforcer/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel/sec
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
@@ -242,6 +254,10 @@
role_comm_title = "PvTML"
flags = EQUIPMENT_PRESET_EXTRA
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
+
/datum/equipment_preset/uscm_event/provost/tml/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel/sec
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
@@ -284,6 +300,10 @@
role_comm_title = "PvI"
flags = EQUIPMENT_PRESET_EXTRA
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
+
/datum/equipment_preset/uscm_event/provost/inspector/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel/sec
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
@@ -331,6 +351,10 @@
role_comm_title = PAY_SHORT_PVM
flags = EQUIPMENT_PRESET_EXTRA
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/general)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
+
/datum/equipment_preset/uscm_event/provost/marshal/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel/sec
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm
index 8fbfd72c5276..14db97b35229 100644
--- a/code/modules/gear_presets/uscm_medical.dm
+++ b/code/modules/gear_presets/uscm_medical.dm
@@ -14,9 +14,9 @@
service_hat = list(/obj/item/clothing/head/cmcap)
service_shoes = list(/obj/item/clothing/shoes/dress)
- dress_under = list(/obj/item/clothing/under/marine/dress)
- dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress)
- dress_hat = list(/obj/item/clothing/head/marine/peaked)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
dress_shoes = list(/obj/item/clothing/shoes/dress)
@@ -101,6 +101,12 @@
minimap_icon = list("medic")
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
+ dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
+ dress_shoes = list(/obj/item/clothing/shoes/dress)
+
/datum/equipment_preset/uscm_ship/uscm_medical/nurse/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm
index bdeb11b89d28..f817d7d421fa 100644
--- a/code/modules/gear_presets/uscm_ship.dm
+++ b/code/modules/gear_presets/uscm_ship.dm
@@ -16,9 +16,9 @@
service_hat = list(/obj/item/clothing/head/cmcap)
service_shoes = list(/obj/item/clothing/shoes/dress)
- dress_under = list(/obj/item/clothing/under/marine/dress)
- dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress)
- dress_hat = list(/obj/item/clothing/head/marine/peaked)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
dress_shoes = list(/obj/item/clothing/shoes/dress)
@@ -128,6 +128,10 @@
minimap_icon = "correspondent"
minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN
+ dress_under = list()
+ dress_over = list()
+ dress_hat = list()
+
/datum/equipment_preset/uscm_ship/reporter/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/reporter(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/reporter(new_human), WEAR_BODY)
@@ -159,6 +163,9 @@
minimap_icon = "correspondent"
minimap_background = MINIMAP_ICON_BACKGROUND_CIC
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
+
/datum/equipment_preset/uscm_ship/reporter_uscm/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
@@ -242,6 +249,9 @@
minimap_icon = "engi"
utility_under = list(/obj/item/clothing/under/marine/officer/engi)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
/datum/equipment_preset/uscm_ship/maint/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
@@ -280,6 +290,9 @@
minimap_icon = "ot"
utility_under = list(/obj/item/clothing/under/marine/officer/engi)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
/datum/equipment_preset/uscm_ship/ordn/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
@@ -323,6 +336,8 @@
minimap_icon = list("ct" = MINIMAP_ICON_COLOR_HEAD)
utility_under = list(/obj/item/clothing/under/rank/qm_suit)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
/datum/equipment_preset/uscm_ship/qm/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
@@ -354,6 +369,9 @@
minimap_icon = "ct"
utility_under = list(/obj/item/clothing/under/rank/cargotech)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
/datum/equipment_preset/uscm_ship/cargo/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
@@ -401,11 +419,11 @@
service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber)
service_hat = list(/obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/marine/commander/dress, /obj/item/clothing/head/beret/marine/commander/black, /obj/item/clothing/head/marine/peaked/service)
- dress_under = list(/obj/item/clothing/under/marine/dress, /obj/item/clothing/under/marine/officer/formal/servicedress)
- dress_extra = list(/obj/item/storage/large_holster/ceremonial_sword/full)
- dress_hat = list(/obj/item/clothing/head/marine/peaked/captain/white, /obj/item/clothing/head/marine/peaked/captain/black, /obj/item/clothing/head/marine/peaked)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
dress_shoes = list(/obj/item/clothing/shoes/dress/commander)
- dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/white, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/black, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/suit, /obj/item/clothing/suit/storage/jacket/marine/dress)
+ dress_extra = list(/obj/item/storage/large_holster/ceremonial_sword/full)
/datum/equipment_preset/uscm_ship/commander/New()
. = ..()
@@ -462,12 +480,9 @@
minimum_age = 35
dress_over = list(
- /obj/item/clothing/suit/storage/jacket/marine/dress/officer/white,
- /obj/item/clothing/suit/storage/jacket/marine/dress/officer/black,
- /obj/item/clothing/suit/storage/jacket/marine/dress/officer/suit,
+ /obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer,
/obj/item/clothing/suit/storage/jacket/marine/dress/officer/falcon,
)
-
/datum/equipment_preset/uscm_ship/commander/council/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/council(new_human), WEAR_HEAD)
@@ -477,6 +492,7 @@
name = "USCM Commanding Officer (CO++)"
idtype = /obj/item/card/id/general
paygrade = PAY_SHORT_MO6
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior, /obj/item/clothing/under/marine/dress/blues/general)
/datum/equipment_preset/uscm_ship/commander/council/plus/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/councilchief(new_human), WEAR_HEAD)
@@ -571,6 +587,8 @@
minimap_icon = "sea"
service_hat = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/drillhat)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
/datum/equipment_preset/uscm_ship/sea/New()
. = ..()
@@ -772,6 +790,9 @@
minimap_icon = "dcc"
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
+
/datum/equipment_preset/uscm_ship/dcc/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel
if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
@@ -828,9 +849,7 @@
service_hat = list(/obj/item/clothing/head/beret/cm)
service_shoes = list(/obj/item/clothing/shoes/dress/commander)
- dress_extra = list(/obj/item/clothing/head/beret/marine/commander/dress, /obj/item/storage/large_holster/ceremonial_sword/full)
- dress_hat = list(/obj/item/clothing/head/marine/peaked/captain)
- dress_shoes = list(/obj/item/clothing/shoes/dress/commander)
+ dress_extra = list(/obj/item/storage/large_holster/ceremonial_sword/full)
/datum/equipment_preset/uscm_ship/officer/New()
. = ..()
@@ -863,6 +882,9 @@
minimap_icon = "mst"
utility_under = list(/obj/item/clothing/under/marine/chef)
+ dress_under = list(/obj/item/clothing/under/marine/dress/blues)
+ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
+ dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
/datum/equipment_preset/uscm_ship/chef/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
From 63f1d67216271cb4cdbe1a9767de0fb73adadada Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Tue, 19 Mar 2024 06:35:04 +0000
Subject: [PATCH 20/32] Automatic changelog for PR #5845 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5845.yml | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5845.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5845.yml b/html/changelogs/AutoChangeLog-pr-5845.yml
new file mode 100644
index 000000000000..473f902ad46f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5845.yml
@@ -0,0 +1,5 @@
+author: "realforest2001"
+delete-after: True
+changes:
+ - rscadd: "Changed all marine presets to use Dress Blues as their dress equipment."
+ - rscdel: "Excluding Whiskey Outpost, removed all previous dress equipment from vendors."
\ No newline at end of file
From b96afacceaec9efae9bd39949bacaa65cd4f9c9d Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Wed, 20 Mar 2024 01:06:45 +0000
Subject: [PATCH 21/32] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-5845.yml | 5 -----
html/changelogs/AutoChangeLog-pr-5954.yml | 7 -------
html/changelogs/AutoChangeLog-pr-5965.yml | 5 -----
html/changelogs/archive/2024-03.yml | 14 ++++++++++++++
4 files changed, 14 insertions(+), 17 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-5845.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5954.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5965.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5845.yml b/html/changelogs/AutoChangeLog-pr-5845.yml
deleted file mode 100644
index 473f902ad46f..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5845.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
- - rscadd: "Changed all marine presets to use Dress Blues as their dress equipment."
- - rscdel: "Excluding Whiskey Outpost, removed all previous dress equipment from vendors."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5954.yml b/html/changelogs/AutoChangeLog-pr-5954.yml
deleted file mode 100644
index 616e46a7be64..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5954.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Katskan"
-delete-after: True
-changes:
- - rscadd: "Added some new uniforms and hats"
- - rscadd: "Added blood packs to vendor for 5 points, equal to a pill bottle"
- - rscadd: "Added tactical prybar to vendor for 5 points"
- - rscadd: "Added some surgical tools, very expensive costs essentially your entire point budget to buy"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5965.yml b/html/changelogs/AutoChangeLog-pr-5965.yml
deleted file mode 100644
index fa1ce48f9869..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5965.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Huffie56"
-delete-after: True
-changes:
- - maptweak: "Fix ugliness at 5 different areas."
- - maptweak: "added access restriction for doors that lack them(OT workshop, engi dormitory, Upper engi back storage door.)"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml
index 531c6e4e236d..c084a5b3369a 100644
--- a/html/changelogs/archive/2024-03.yml
+++ b/html/changelogs/archive/2024-03.yml
@@ -230,3 +230,17 @@
- bugfix: Stamina damage can now be ahealed.
Waseemq1235:
- rscdel: Removes HEAP from all UPP vendor gear presets
+2024-03-20:
+ Huffie56:
+ - maptweak: Fix ugliness at 5 different areas.
+ - maptweak: added access restriction for doors that lack them(OT workshop, engi
+ dormitory, Upper engi back storage door.)
+ Katskan:
+ - rscadd: Added some new uniforms and hats
+ - rscadd: Added blood packs to vendor for 5 points, equal to a pill bottle
+ - rscadd: Added tactical prybar to vendor for 5 points
+ - rscadd: Added some surgical tools, very expensive costs essentially your entire
+ point budget to buy
+ realforest2001:
+ - rscadd: Changed all marine presets to use Dress Blues as their dress equipment.
+ - rscdel: Excluding Whiskey Outpost, removed all previous dress equipment from vendors.
From df999ac929e7f5d23a98a25bfd41889bbf297088 Mon Sep 17 00:00:00 2001
From: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com>
Date: Wed, 20 Mar 2024 07:50:37 +0200
Subject: [PATCH 22/32] The Corpsening (#5805)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
# About the pull request
Heavily updates corpses and their clothes and items,
# Explain why it's good for the game
Corpse code is REALLY REALLY Old, it was honestly kind of painful fixing
it. (Two map_cold variants) 💀
# Changelog
:cl:
add: Heavily Updated Corpse Code.
/:cl:
---------
Co-authored-by: Jeff Watchson
---
.../effects/landmarks/corpsespawner.dm | 67 +-
code/modules/gear_presets/corpses.dm | 615 +++++++++---------
2 files changed, 333 insertions(+), 349 deletions(-)
diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm
index 27a717f58ba8..cbcd8f906ec8 100644
--- a/code/game/objects/effects/landmarks/corpsespawner.dm
+++ b/code/game/objects/effects/landmarks/corpsespawner.dm
@@ -16,20 +16,6 @@
GLOB.corpse_spawns -= src
return ..()
-/obj/effect/landmark/corpsespawner/realpirate
- name = "Pirate"
- equip_path = /datum/equipment_preset/corpse/realpirate
-
-/obj/effect/landmark/corpsespawner/realpirate/ranged
- name = "Pirate Gunner"
- equip_path = /datum/equipment_preset/corpse/realpirate/ranged
-
-/obj/effect/landmark/corpsespawner/russian
- name = "Russian"
- equip_path = /datum/equipment_preset/corpse/russian
-
-/obj/effect/landmark/corpsespawner/russian/ranged
-
///////////Civilians//////////////////////
/obj/effect/landmark/corpsespawner/prisoner
@@ -57,43 +43,50 @@
equip_path = /datum/equipment_preset/corpse/miner
/obj/effect/landmark/corpsespawner/security
- name = "Security"
+ name = "Security Officer"
equip_path = /datum/equipment_preset/corpse/security
/obj/effect/landmark/corpsespawner/security/marshal
- name = "Colonial Marshal"
- equip_path = /datum/equipment_preset/corpse/security/marshal
+ name = "Colonial Marshal Deputy"
+ equip_path = /datum/equipment_preset/corpse/security/cmb
/obj/effect/landmark/corpsespawner/security/liaison
name = "Corporate Liaison"
- equip_path = /datum/equipment_preset/corpse/security/liaison
+ equip_path = /datum/equipment_preset/corpse/liaison
/obj/effect/landmark/corpsespawner/prison_security
name = "Prison Guard"
- equip_path = /datum/equipment_preset/corpse/prison_security
+ equip_path = /datum/equipment_preset/corpse/prison_guard
/////////////////Officers//////////////////////
/obj/effect/landmark/corpsespawner/bridgeofficer
- name = "Staff Officer"
- equip_path = /datum/equipment_preset/corpse/bridgeofficer
+ name = "Colony Division Manager"
+ equip_path = /datum/equipment_preset/corpse/manager
-/obj/effect/landmark/corpsespawner/bridgeofficer/johnson
- name = "Mr. Johnson Telovin"
- equip_path = /datum/equipment_preset/corpse/bridgeofficer/johnson
+/obj/effect/landmark/corpsespawner/administrator
+ name = "Colony Administrator"
+ equip_path = /datum/equipment_preset/corpse/administrator
-/obj/effect/landmark/corpsespawner/commander
- name = "Commanding Officer"
- equip_path = /datum/equipment_preset/corpse/commander
+/obj/effect/landmark/corpsespawner/administrator/burst
+ name = "Burst Colony Administrator"
+ equip_path = /datum/equipment_preset/corpse/administrator/burst
/obj/effect/landmark/corpsespawner/wysec
name = "Weyland-Yutani Corporate Security Guard"
equip_path = /datum/equipment_preset/corpse/wysec
/obj/effect/landmark/corpsespawner/wygoon
- name = "Weyland-Yutani Corporate Security Goon"
+ name = "Weyland-Yutani Corporate Security Officer"
equip_path = /datum/equipment_preset/corpse/pmc/goon
+/obj/effect/landmark/corpsespawner/wygoon/lead
+ name = "Weyland-Yutani Corporate Security Lead"
+ equip_path = /datum/equipment_preset/corpse/pmc/goon/lead
+
+/obj/effect/landmark/corpsespawner/wygoon/lead/burst
+ name = "Burst Weyland-Yutani Corporate Security Lead"
+ equip_path = /datum/equipment_preset/corpse/pmc/goon/lead/burst
///CM specific jobs///
@@ -165,15 +158,29 @@
equip_path = /datum/equipment_preset/corpse/pmc/burst
/obj/effect/landmark/corpsespawner/freelancer
- name = "Freelancer Mercenary"
+ name = "Freelancer"
equip_path = /datum/equipment_preset/corpse/freelancer
/obj/effect/landmark/corpsespawner/freelancer/burst
- name = "Burst Freelancer Mercenary"
+ name = "Burst Freelancer"
equip_path = /datum/equipment_preset/corpse/freelancer/burst
// Fun Faction Corpse
+/obj/effect/landmark/corpsespawner/realpirate
+ name = "Pirate"
+ equip_path = /datum/equipment_preset/corpse/realpirate
+
+/obj/effect/landmark/corpsespawner/realpirate/ranged
+ name = "Pirate Gunner"
+ equip_path = /datum/equipment_preset/corpse/realpirate/ranged
+
+/obj/effect/landmark/corpsespawner/russian
+ name = "Russian"
+ equip_path = /datum/equipment_preset/corpse/russian
+
+/obj/effect/landmark/corpsespawner/russian/ranged
+
/obj/effect/landmark/corpsespawner/dutchrifle
name = "Dutch Dozen Rifleman"
equip_path = /datum/equipment_preset/corpse/dutchrifle
diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm
index cbe8bc0abce4..0fad0e6d2fa3 100644
--- a/code/modules/gear_presets/corpses.dm
+++ b/code/modules/gear_presets/corpses.dm
@@ -48,76 +48,12 @@
/datum/equipment_preset/corpse/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
add_random_survivor_equipment(new_human)
- add_survivor_weapon_civilian(new_human)
add_survivor_weapon_pistol(new_human)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/corpse/realpirate
- name = "Corpse - Pirate"
- access = list(
- ACCESS_CIVILIAN_PUBLIC,
- ACCESS_CIVILIAN_LOGISTICS,
- ACCESS_CIVILIAN_ENGINEERING,
- ACCESS_CIVILIAN_RESEARCH,
- ACCESS_CIVILIAN_BRIG,
- ACCESS_CIVILIAN_MEDBAY,
- ACCESS_CIVILIAN_COMMAND,
- ACCESS_ILLEGAL_PIRATE,
- )
-
-/datum/equipment_preset/corpse/realpirate/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(new_human), WEAR_HEAD)
//*****************************************************************************************************/
-/datum/equipment_preset/corpse/realpirate/ranged
- name = "Corpse - Pirate Gunner"
-
-/datum/equipment_preset/corpse/realpirate/ranged/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate(new_human), WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/head/pirate(new_human), WEAR_HEAD)
- . = ..()
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/corpse/russian
- name = "Corpse - Russian"
- access = list(
- ACCESS_CIVILIAN_PUBLIC,
- ACCESS_CIVILIAN_LOGISTICS,
- ACCESS_CIVILIAN_ENGINEERING,
- ACCESS_CIVILIAN_RESEARCH,
- ACCESS_CIVILIAN_BRIG,
- ACCESS_CIVILIAN_MEDBAY,
- ACCESS_CIVILIAN_COMMAND,
- )
-
-/datum/equipment_preset/corpse/russian
-
-/datum/equipment_preset/corpse/russian/load_gear(mob/living/carbon/human/new_human)
-
- new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine(new_human), WEAR_WAIST)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife(new_human), WEAR_FEET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
- if(prob(25))
- new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bearpelt(new_human), WEAR_HEAD)
- else
- new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
//*****************************************************************************************************/
// Civilians
@@ -127,16 +63,12 @@
assignment = "Prisoner"
/datum/equipment_preset/corpse/prisoner/load_gear(mob/living/carbon/human/new_human)
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET)
//*****************************************************************************************************/
@@ -146,105 +78,82 @@
access = list(ACCESS_CIVILIAN_PUBLIC)
/datum/equipment_preset/corpse/chef/load_gear(mob/living/carbon/human/new_human)
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(new_human), WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
//*****************************************************************************************************/
/datum/equipment_preset/corpse/doctor
name = "Corpse - Doctor"
- assignment = "Medical Doctor"
+ assignment = "Doctor"
+ idtype = /obj/item/card/id/silver/clearance_badge
xenovictim = TRUE
access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY)
/datum/equipment_preset/corpse/doctor/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE)
- new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic/medical(new_human), WEAR_JACKET)
add_random_survivor_medical_gear(new_human)
//*****************************************************************************************************/
/datum/equipment_preset/corpse/engineer
name = "Corpse - Engineer"
- assignment = "Station Engineer"
+ assignment = "Engineer"
xenovictim = TRUE
access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING)
/datum/equipment_preset/corpse/engineer/load_gear(mob/living/carbon/human/new_human)
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS)
- new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
-
-
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
- new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
//*****************************************************************************************************/
/datum/equipment_preset/corpse/scientist
name = "Corpse - Scientist"
assignment = "Scientist"
+ idtype = /obj/item/card/id/silver/clearance_badge/scientist
xenovictim = TRUE
- access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY)
+ access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY)
/datum/equipment_preset/corpse/scientist/load_gear(mob/living/carbon/human/new_human)
-
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(new_human), WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(new_human), WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human), WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET)
//*****************************************************************************************************/
@@ -255,34 +164,32 @@
access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING)
/datum/equipment_preset/corpse/miner/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
+ add_ice_colony_survivor_equipment(new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/industrial(new_human), WEAR_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
//*****************************************************************************************************/
/datum/equipment_preset/corpse/security
name = "Corpse - Security"
- assignment = "Deputy"
+ assignment = "Security Officer"
xenovictim = TRUE
access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND)
/datum/equipment_preset/corpse/security/load_gear(mob/living/carbon/human/new_human)
-
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
@@ -293,12 +200,13 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
-
//*****************************************************************************************************/
-/datum/equipment_preset/corpse/security/marshal
- name = "Corpse - Colonial Marshal"
- assignment = "Colonial Marshal"
+/datum/equipment_preset/corpse/security/cmb
+ name = "Corpse - Colonial Marshal Deputy"
+ rank = JOB_CMB
+ paygrade = PAY_SHORT_CMBD
+ idtype = /obj/item/card/id/deputy
xenovictim = TRUE
access = list(
ACCESS_CIVILIAN_PUBLIC,
@@ -310,14 +218,10 @@
ACCESS_CIVILIAN_COMMAND,
)
-/datum/equipment_preset/corpse/security/marshal/load_gear(mob/living/carbon/human/new_human)
-
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
+/datum/equipment_preset/corpse/security/cmb/load_gear(mob/living/carbon/human/new_human)
+ add_ice_colony_survivor_equipment(new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/heavy(new_human), WEAR_WAIST)
@@ -327,19 +231,21 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
- new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
-
. = ..()
//*****************************************************************************************************/
-/datum/equipment_preset/corpse/security/liaison
+/datum/equipment_preset/corpse/liaison
name = "Corpse - Corporate Liaison"
- assignment = "Corporate Liaison"
+ assignment = JOB_EXECUTIVE
+ rank = JOB_EXECUTIVE
+ faction_group = FACTION_LIST_WY
+ paygrade = PAY_SHORT_WYC3
+ idtype = /obj/item/card/id/silver/clearance_badge/cl
xenovictim = TRUE
- paygrade = PAY_SHORT_WYC2
access = list(
+ ACCESS_WY_COLONIAL,
+ ACCESS_WY_EXEC,
ACCESS_CIVILIAN_PUBLIC,
ACCESS_CIVILIAN_LOGISTICS,
ACCESS_CIVILIAN_ENGINEERING,
@@ -349,29 +255,36 @@
ACCESS_CIVILIAN_COMMAND,
)
-/datum/equipment_preset/corpse/security/liaison/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
+/datum/equipment_preset/corpse/liaison/load_gear(mob/living/carbon/human/new_human)
+ var/random = rand(1,4)
+ add_ice_colony_survivor_equipment(new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
add_random_cl_survivor_loot(new_human)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(new_human), WEAR_FEET)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
+
+ switch(random)
+ if(1)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
+ if(2)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
+ if(3)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
+ if(4)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
+
. = ..()
//*****************************************************************************************************/
-/datum/equipment_preset/corpse/prison_security
+/datum/equipment_preset/corpse/prison_guard
name = "Corpse - Prison Guard"
assignment = "Prison Guard"
access = list(
@@ -384,14 +297,12 @@
ACCESS_CIVILIAN_COMMAND,
)
-/datum/equipment_preset/corpse/prison_security/load_gear(mob/living/carbon/human/new_human)
-
+/datum/equipment_preset/corpse/prison_guard/load_gear(mob/living/carbon/human/new_human)
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
@@ -400,11 +311,21 @@
//*****************************************************************************************************/
/////////////////Officers//////////////////////
-/datum/equipment_preset/corpse/bridgeofficer
- name = "Corpse - Staff Officer"
- idtype = /obj/item/card/id/general
- assignment = "Staff Officer"
+/datum/equipment_preset/corpse/manager
+ name = "Corpse - Colony Division Manager"
+ assignment = "Colonial Division Manager"
+ rank = JOB_DIVISION_MANAGER
+ faction_group = FACTION_LIST_WY
+ paygrade = PAY_SHORT_WYC8
access = list(
+ ACCESS_WY_GENERAL,
+ ACCESS_WY_COLONIAL,
+ ACCESS_WY_MEDICAL,
+ ACCESS_WY_SECURITY,
+ ACCESS_WY_ENGINEERING,
+ ACCESS_WY_FLIGHT,
+ ACCESS_WY_RESEARCH,
+ ACCESS_WY_EXEC,
ACCESS_CIVILIAN_PUBLIC,
ACCESS_CIVILIAN_LOGISTICS,
ACCESS_CIVILIAN_ENGINEERING,
@@ -414,23 +335,25 @@
ACCESS_CIVILIAN_COMMAND,
)
-/datum/equipment_preset/corpse/bridgeofficer/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+/datum/equipment_preset/corpse/manager/load_gear(mob/living/carbon/human/new_human)
+ add_ice_colony_survivor_equipment(new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bulletproof(new_human), WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES)
//*****************************************************************************************************/
-/datum/equipment_preset/corpse/bridgeofficer/johnson
- name = "Corpse - Mr. Johnson Telovin"
- idtype = /obj/item/card/id/general
- assignment = "Bridge Officer"
- uses_special_name = TRUE
- paygrade = PAY_SHORT_WYC2
+
+/datum/equipment_preset/corpse/administrator
+ name = "Corpse - Colony Administrator"
+ assignment = "Colonial Administrator"
+ rank = JOB_DIRECTOR
+ faction_group = FACTION_LIST_WY
+ paygrade = PAY_SHORT_WYC10
+ idtype = /obj/item/card/id/silver/cl
access = list(
ACCESS_CIVILIAN_PUBLIC,
ACCESS_CIVILIAN_LOGISTICS,
@@ -439,52 +362,40 @@
ACCESS_CIVILIAN_BRIG,
ACCESS_CIVILIAN_MEDBAY,
ACCESS_CIVILIAN_COMMAND,
+ ACCESS_WY_GENERAL,
+ ACCESS_WY_COLONIAL,
ACCESS_WY_MEDICAL,
- ACCESS_WY_ENGINEERING,
ACCESS_WY_SECURITY,
+ ACCESS_WY_ENGINEERING,
+ ACCESS_WY_FLIGHT,
+ ACCESS_WY_RESEARCH,
+ ACCESS_WY_EXEC,
+ ACCESS_WY_PMC,
+ ACCESS_WY_PMC_TL,
+ ACCESS_WY_ARMORY,
+ ACCESS_WY_SECRETS,
ACCESS_WY_LEADERSHIP,
- ACCESS_WY_COLONIAL,
- ACCESS_WY_GENERAL,
- )
-
-/datum/equipment_preset/corpse/bridgeofficer/johnson/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/under/waiter(new_human), WEAR_BODY)
- . = ..()
-
-/datum/equipment_preset/corpse/bridgeofficer/johnson/load_name(mob/living/carbon/human/new_human, randomise)
- new_human.change_real_name(new_human, "Johnson Telovin")
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/corpse/commander
- name = "Corpse - Commanding Officer"
- idtype = /obj/item/card/id/general
- assignment = "Commanding Officer"
- access = list(
- ACCESS_CIVILIAN_PUBLIC,
- ACCESS_CIVILIAN_LOGISTICS,
- ACCESS_CIVILIAN_ENGINEERING,
- ACCESS_CIVILIAN_RESEARCH,
- ACCESS_CIVILIAN_BRIG,
- ACCESS_CIVILIAN_MEDBAY,
- ACCESS_CIVILIAN_COMMAND,
+ ACCESS_WY_SENIOR_LEAD,
)
-/datum/equipment_preset/corpse/commander/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_commander(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+/datum/equipment_preset/corpse/administrator/load_gear(mob/living/carbon/human/new_human)
+ add_ice_colony_survivor_equipment(new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bulletproof(new_human), WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(new_human), WEAR_FACE)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(new_human), WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(new_human), WEAR_HANDS)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(new_human), WEAR_FEET)
- new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo/executive(new_human), WEAR_R_STORE)
add_random_cl_survivor_loot(new_human)
+/datum/equipment_preset/corpse/administrator/burst
+ name = "Corpse - Burst Colony Administrator"
+ xenovictim = TRUE
+
//*****************************************************************************************************/
/datum/equipment_preset/corpse/wysec
@@ -505,52 +416,37 @@
)
/datum/equipment_preset/corpse/wysec/load_gear(mob/living/carbon/human/new_human)
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/formal/servicedress(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+//*****************************************************************************************************/
-/////Actually specific colonists
+//Colonists
/datum/equipment_preset/corpse/colonist
name = "Corpse - Colonist"
- assignment = JOB_COLONIST
- xenovictim = FALSE
- rank = JOB_COLONIST
- faction = FACTION_COLONIST
- access = list(ACCESS_CIVILIAN_PUBLIC)
- idtype = /obj/item/card/id/lanyard
/datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/new_human)
-
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
/datum/equipment_preset/corpse/colonist/burst
name = "Corpse - Burst Colonist"
xenovictim = TRUE
+//*****************************************************************************************************/
+
/datum/equipment_preset/corpse/colonist/random
name = "Corpse - Colonist Random"
- assignment = JOB_COLONIST
- xenovictim = FALSE
- rank = JOB_COLONIST
- faction = FACTION_COLONIST
- access = list(ACCESS_CIVILIAN_PUBLIC)
- idtype = /obj/item/card/id/lanyard
/datum/equipment_preset/corpse/colonist/random/load_gear(mob/living/carbon/human/new_human)
var/random_surv_type = pick(SSmapping.configs[GROUND_MAP].survivor_types)
@@ -561,14 +457,10 @@
name = "Corpse - Burst Colonist Random"
xenovictim = TRUE
+//*****************************************************************************************************/
+
/datum/equipment_preset/corpse/colonist/kutjevo
name = "Corpse - Colonist Kutjevo"
- assignment = JOB_COLONIST
- xenovictim = FALSE
- rank = JOB_COLONIST
- faction = FACTION_COLONIST
- access = list(ACCESS_CIVILIAN_PUBLIC)
- idtype = /obj/item/card/id/lanyard
/datum/equipment_preset/corpse/colonist/kutjevo/load_gear(mob/living/carbon/human/new_human)
@@ -578,18 +470,20 @@
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
/datum/equipment_preset/corpse/colonist/kutjevo/burst
name = "Corpse - Burst Colonist Kutjevo"
xenovictim = TRUE
-//UA riot control dudes
+//*****************************************************************************************************/
+
+//UA Riot Control Officer
+
/datum/equipment_preset/corpse/ua_riot
name = "Corpse - UA Officer"
assignment = "United Americas Riot Officer"
idtype = /obj/item/card/id/silver
- xenovictim = FALSE
access = list(
ACCESS_CIVILIAN_PUBLIC,
ACCESS_CIVILIAN_LOGISTICS,
@@ -602,24 +496,23 @@
/datum/equipment_preset/corpse/ua_riot/load_gear(mob/living/carbon/human/new_human)
var/random = rand(1,5)
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton(new_human), WEAR_WAIST)
switch(random)
if(1)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security, WEAR_EYES)
- if(2)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES)
+ if(2)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(new_human), WEAR_EYES)
if(3)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES)
if(4)
@@ -632,18 +525,18 @@
name = "Corpse - Burst UA Officer"
xenovictim = TRUE
-//Colonial Supervisor Corpse
+//*****************************************************************************************************/
+
+//Colonial Supervisor
/datum/equipment_preset/corpse/wy/manager
name = "Corpse - Corporate Supervisor"
+ assignment = "Colony Supervisor"
flags = EQUIPMENT_PRESET_EXTRA
paygrade = PAY_SHORT_WYC6
- assignment = "Colony Supervisor"
- role_comm_title = "Supervisor"
rank = FACTION_WY
idtype = /obj/item/card/id/silver/clearance_badge/manager
faction_group = FACTION_LIST_WY
- languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
access = list(
ACCESS_WY_GENERAL,
ACCESS_WY_COLONIAL,
@@ -657,35 +550,33 @@
)
/datum/equipment_preset/corpse/wy/manager/load_gear(mob/living/carbon/human/new_human)
-
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(new_human), WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/manager(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST)
- new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE)
add_random_cl_survivor_loot(new_human)
-
/datum/equipment_preset/corpse/wy/manager/burst
name = "Corpse - Burst Corporate Supervisor"
xenovictim = TRUE
+//*****************************************************************************************************/
+
//Faction Specific Corpses
+//CLF
+
/datum/equipment_preset/corpse/clf
name = "Corpse - Colonial Liberation Front Soldier"
- assignment = "Colonial Liberation Front Soldier"
- idtype = /obj/item/card/id/silver
- xenovictim = FALSE
+ assignment = JOB_CLF
+ idtype = /obj/item/card/id/data
+ rank = JOB_CLF
faction = FACTION_CLF
/datum/equipment_preset/corpse/clf/New()
@@ -715,12 +606,16 @@
name = "Corpse - Burst Colonial Liberation Front Soldier"
xenovictim = TRUE
-// UPP
+//*****************************************************************************************************/
+
+//UPP
+
/datum/equipment_preset/corpse/upp
name = "Corpse - Union of Progressive Peoples Soldier"
- assignment = "Union of Progressive Peoples Soldier"
- idtype = /obj/item/card/id/silver
- xenovictim = FALSE
+ assignment = JOB_UPP
+ idtype = /obj/item/card/id/dogtag
+ paygrade = PAY_SHORT_UE2
+ rank = JOB_UPP
faction = FACTION_UPP
/datum/equipment_preset/corpse/upp/New()
@@ -728,18 +623,14 @@
access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL)
/datum/equipment_preset/corpse/upp/load_gear(mob/living/carbon/human/new_human)
-
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
- //head
- new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
- //body
var/obj/item/clothing/under/marine/veteran/UPP/UPP = new()
new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET)
- //limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp, WEAR_HANDS)
add_random_survivor_equipment(new_human)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
@@ -749,7 +640,9 @@
name = "Corpse - Burst Union of Progressive Peoples Soldier"
xenovictim = TRUE
-// PMC
+//*****************************************************************************************************/
+
+//PMC
/datum/equipment_preset/corpse/pmc
name = "Corpse - Weyland-Yutani PMC (Standard)"
@@ -760,8 +653,6 @@
rank = JOB_PMC_STANDARD
paygrade = PAY_SHORT_PMC_OP
idtype = /obj/item/card/id/pmc
- skills = /datum/skills/civilian/survivor/pmc
- languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
access = list(
ACCESS_CIVILIAN_PUBLIC,
ACCESS_CIVILIAN_LOGISTICS,
@@ -795,16 +686,19 @@
name = "Corpse - Burst Weyland-Yutani PMC (Standard)"
xenovictim = TRUE
+//*****************************************************************************************************/
+
+//Goon
+
/datum/equipment_preset/corpse/pmc/goon
name = "Corpse - Weyland-Yutani Corporate (Goon)"
languages = list(LANGUAGE_ENGLISH)
assignment = JOB_WY_GOON
rank = JOB_WY_GOON
paygrade = PAY_SHORT_CPO
- skills = /datum/skills/MP
/datum/equipment_preset/corpse/pmc/goon/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
@@ -817,6 +711,10 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE)
+//*****************************************************************************************************/
+
+//Lead Goon
+
/datum/equipment_preset/corpse/pmc/goon/lead
name = "Corpse - Weyland-Yutani Corporate Security Lead (Goon Lead)"
flags = EQUIPMENT_PRESET_EXTRA
@@ -825,7 +723,7 @@
paygrade = PAY_SHORT_CSPO
/datum/equipment_preset/corpse/pmc/goon/lead/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/lead, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
@@ -838,20 +736,26 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE)
-// Freelancer
+/datum/equipment_preset/corpse/pmc/goon/lead/burst
+ name = "Corpse - Burst Weyland-Yutani Corporate Security Lead (Goon Lead)"
+ xenovictim = TRUE
+
+//*****************************************************************************************************/
+
+//Freelancer
/datum/equipment_preset/corpse/freelancer
- name = "Corpse - Freelancer Mercenary"
- assignment = "Freelancer Mercenary"
- idtype = /obj/item/card/id/silver
- xenovictim = FALSE
+ name = "Corpse - Freelancer"
+ paygrade = PAY_SHORT_FL_S
+ rank = FACTION_FREELANCER
+ idtype = /obj/item/card/id/data
+ faction = FACTION_FREELANCER
/datum/equipment_preset/corpse/freelancer/New()
. = ..()
access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL)
/datum/equipment_preset/corpse/freelancer/load_gear(mob/living/carbon/human/new_human)
-
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET)
@@ -865,12 +769,83 @@
spawn_merc_helmet(new_human)
/datum/equipment_preset/corpse/freelancer/burst
- name = "Corpse - Burst Freelancer Mercenary"
+ name = "Corpse - Burst Freelancer"
xenovictim = TRUE
-// Fun Faction Corpse
+//*****************************************************************************************************/
+
+//Fun Faction Corpses
+
+//Pirates
+
+/datum/equipment_preset/corpse/realpirate
+ name = "Corpse - Pirate"
+ access = list(
+ ACCESS_CIVILIAN_PUBLIC,
+ ACCESS_CIVILIAN_LOGISTICS,
+ ACCESS_CIVILIAN_ENGINEERING,
+ ACCESS_CIVILIAN_RESEARCH,
+ ACCESS_CIVILIAN_BRIG,
+ ACCESS_CIVILIAN_MEDBAY,
+ ACCESS_CIVILIAN_COMMAND,
+ ACCESS_ILLEGAL_PIRATE,
+ )
+
+/datum/equipment_preset/corpse/realpirate/load_gear(mob/living/carbon/human/new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(new_human), WEAR_BODY)
+ if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
+ add_ice_colony_survivor_equipment(new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(new_human), WEAR_HEAD)
+
+//*****************************************************************************************************/
+
+/datum/equipment_preset/corpse/realpirate/ranged
+ name = "Corpse - Pirate Gunner"
+
+/datum/equipment_preset/corpse/realpirate/ranged/load_gear(mob/living/carbon/human/new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/pirate(new_human), WEAR_HEAD)
+ . = ..()
+
+//*****************************************************************************************************/
+
+//Russian(?)
+
+/datum/equipment_preset/corpse/russian
+ name = "Corpse - Russian"
+ access = list(
+ ACCESS_CIVILIAN_PUBLIC,
+ ACCESS_CIVILIAN_LOGISTICS,
+ ACCESS_CIVILIAN_ENGINEERING,
+ ACCESS_CIVILIAN_RESEARCH,
+ ACCESS_CIVILIAN_BRIG,
+ ACCESS_CIVILIAN_MEDBAY,
+ ACCESS_CIVILIAN_COMMAND,
+ )
+
+/datum/equipment_preset/corpse/russian
-// Dutch Dozen
+/datum/equipment_preset/corpse/russian/load_gear(mob/living/carbon/human/new_human)
+
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine(new_human), WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
+ if(prob(25))
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bearpelt(new_human), WEAR_HEAD)
+ else
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
+
+//*****************************************************************************************************/
+
+//Dutch Dozen
/datum/equipment_preset/corpse/dutchrifle
name = "Corpse - Dutch Dozen Rifleman"
@@ -901,7 +876,9 @@
name = "Corpse - Burst Dutch Dozen Rifleman"
xenovictim = TRUE
-// Pizza Planet
+//*****************************************************************************************************/
+
+//Pizza Planet
/datum/equipment_preset/corpse/pizza
name = "Corpse - Pizza Deliverer"
@@ -915,12 +892,9 @@
access = get_access(ACCESS_LIST_DELIVERY)
/datum/equipment_preset/corpse/pizza/load_gear(mob/living/carbon/human/new_human)
-
+ add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pizza, WEAR_BODY)
- if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
- add_ice_colony_survivor_equipment(new_human)
- else
- new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK)
@@ -940,7 +914,9 @@
name = "Corpse - Burst Pizza Deliverer"
xenovictim = TRUE
-// Gladiator
+//*****************************************************************************************************/
+
+//Gladiator
/datum/equipment_preset/corpse/gladiator
name = "Corpse - Gladiator"
@@ -978,6 +954,7 @@
name = "Corpse - Burst Gladiator"
xenovictim = TRUE
+//*****************************************************************************************************/
//FORECON
From 33b7a8b9193ee5488d3c3c37b18a62715edb49d8 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 20 Mar 2024 05:57:25 +0000
Subject: [PATCH 23/32] Automatic changelog for PR #5805 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5805.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5805.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5805.yml b/html/changelogs/AutoChangeLog-pr-5805.yml
new file mode 100644
index 000000000000..958e503c4580
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5805.yml
@@ -0,0 +1,4 @@
+author: "BadAtThisGame302"
+delete-after: True
+changes:
+ - rscadd: "Heavily Updated Corpse Code."
\ No newline at end of file
From 5790cf2cad3022c310ae492d82621fd28fad69fa Mon Sep 17 00:00:00 2001
From: Steelpoint <6595389+Steelpoint@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:08:08 +0800
Subject: [PATCH 24/32] Adds Cardboard Boxes To Squad Rooms (#5930)
# About the pull request
Adds some cardboard boxes to the squad prep rooms.
# Explain why it's good for the game
Small quality of life boon for proactive Marines wishing to make ammo
boxes for the FOB, frontline or personal use.
Adds four stacks of boxes inside the squad prep areas. Each stack
contains 10 units, though the Bravo one has 30.
No balance implications as boxes are free to make from empty shotgun
shell boxes.
# Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the
screenshots and the `` tags.
# Changelog
:cl:
maptweak: Adds several cardboard box spawns in to squad prep rooms.
/:cl:
---------
Co-authored-by: Steelpoint
---
maps/map_files/USS_Almayer/USS_Almayer.dmm | 32 +++++++++++++++++++---
1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 7353a09b3541..868add3005da 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -24000,7 +24000,13 @@
/obj/structure/surface/table/reinforced/prison,
/obj/item/device/camera_film{
pixel_x = 4;
- pixel_y = -2
+ pixel_y = 1;
+ layer = 3.03
+ },
+/obj/item/stack/sheet/cardboard/small_stack{
+ pixel_x = -5;
+ pixel_y = 3;
+ layer = 3.02
},
/turf/open/floor/almayer,
/area/almayer/squads/charlie_delta_shared)
@@ -26074,7 +26080,15 @@
pixel_x = -1;
pixel_y = 10
},
-/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil{
+ pixel_y = 1;
+ pixel_x = 8
+ },
+/obj/item/stack/sheet/cardboard/small_stack{
+ pixel_y = 2;
+ pixel_x = -3;
+ layer = 3.01
+ },
/turf/open/floor/almayer,
/area/almayer/squads/alpha_bravo_shared)
"eGq" = (
@@ -67388,7 +67402,11 @@
"teu" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/weapon/gun/shotgun/pump{
- starting_attachment_types = list(/obj/item/attachable/stock/shotgun)
+ starting_attachment_types = list(/obj/item/attachable/stock/shotgun);
+ pixel_y = 9
+ },
+/obj/item/stack/sheet/cardboard/small_stack{
+ layer = 3.01
},
/turf/open/floor/almayer,
/area/almayer/squads/charlie_delta_shared)
@@ -71990,7 +72008,13 @@
desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas.";
icon_state = "multitool_big";
name = "\improper Oversized Security Access Tuner";
- pixel_y = 8
+ pixel_y = 11;
+ pixel_x = 4
+ },
+/obj/item/stack/sheet/cardboard/medium_stack{
+ pixel_y = -6;
+ pixel_x = -7;
+ layer = 3.01
},
/turf/open/floor/almayer,
/area/almayer/squads/alpha_bravo_shared)
From 74b39d7d794b9ccb01d86c83cd2e5d9398d8824a Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 20 Mar 2024 11:13:36 +0000
Subject: [PATCH 25/32] Automatic changelog for PR #5930 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5930.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5930.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5930.yml b/html/changelogs/AutoChangeLog-pr-5930.yml
new file mode 100644
index 000000000000..3250bcc7ff0c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5930.yml
@@ -0,0 +1,4 @@
+author: "Steelpoint"
+delete-after: True
+changes:
+ - maptweak: "Adds several cardboard box spawns in to squad prep rooms."
\ No newline at end of file
From 737213d41903249f20cc078a9276725c7df21275 Mon Sep 17 00:00:00 2001
From: Julian56 <117036822+Huffie56@users.noreply.github.com>
Date: Wed, 20 Mar 2024 22:03:03 +0100
Subject: [PATCH 26/32] refactor : poddoor file and shutters file. (#5886)
# About the pull request
1-added a folder for poddoor and shutters.
2-move those files inside their folders.
3-extracting almayer and two tile children of poddoor and give them
their own files.
# Explain why it's good for the game
# Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the
screenshots and the `` tags.
# Changelog
:cl:
refactor: refactored poddoor file and shutters file.
/:cl:
---------
Co-authored-by: Julien
---
code/game/machinery/doors/poddoor.dm | 341 ------------------
code/game/machinery/doors/poddoor/almayer.dm | 65 ++++
code/game/machinery/doors/poddoor/poddoor.dm | 117 ++++++
.../doors/{ => poddoor/shutters}/shutters.dm | 0
code/game/machinery/doors/poddoor/two_tile.dm | 156 ++++++++
colonialmarines.dme | 6 +-
6 files changed, 342 insertions(+), 343 deletions(-)
delete mode 100644 code/game/machinery/doors/poddoor.dm
create mode 100644 code/game/machinery/doors/poddoor/almayer.dm
create mode 100644 code/game/machinery/doors/poddoor/poddoor.dm
rename code/game/machinery/doors/{ => poddoor/shutters}/shutters.dm (100%)
create mode 100644 code/game/machinery/doors/poddoor/two_tile.dm
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
deleted file mode 100644
index df6be1a44b14..000000000000
--- a/code/game/machinery/doors/poddoor.dm
+++ /dev/null
@@ -1,341 +0,0 @@
-
-/obj/structure/machinery/door/poddoor
- name = "\improper Podlock"
- desc = "That looks like it doesn't open easily."
- icon = 'icons/obj/structures/doors/rapid_pdoor.dmi'
- icon_state = "pdoor1"
- var/base_icon_state = "pdoor"
- id = 1
- dir = NORTH
- unslashable = TRUE
- health = 0
- layer = PODDOOR_CLOSED_LAYER
- open_layer = PODDOOR_OPEN_LAYER
- closed_layer = PODDOOR_CLOSED_LAYER
-
-/obj/structure/machinery/door/poddoor/Initialize()
- . = ..()
- if(density)
- set_opacity(1)
- else
- set_opacity(0)
- update_icon()
-
-/obj/structure/machinery/door/poddoor/update_icon()
- if(density)
- icon_state = "[base_icon_state]1"
- else
- icon_state = "[base_icon_state]0"
-
-/obj/structure/machinery/door/poddoor/Collided(atom/movable/AM)
- if(!density)
- return ..()
- else
- return 0
-
-/obj/structure/machinery/door/poddoor/attackby(obj/item/W, mob/user)
- add_fingerprint(user)
- if(!W.pry_capable)
- return
- if(density && (stat & NOPOWER) && !operating && !unacidable)
- spawn(0)
- operating = 1
- flick("[base_icon_state]c0", src)
- icon_state = "[base_icon_state]0"
- set_opacity(0)
- sleep(15)
- density = FALSE
- operating = 0
-
-/obj/structure/machinery/door/poddoor/attack_alien(mob/living/carbon/xenomorph/X)
- if((stat & NOPOWER) && density && !operating && !unacidable)
- INVOKE_ASYNC(src, PROC_REF(pry_open), X)
- return XENO_ATTACK_ACTION
-
-/obj/structure/machinery/door/poddoor/proc/pry_open(mob/living/carbon/xenomorph/X, time = 4 SECONDS)
- X.visible_message(SPAN_DANGER("[X] begins prying [src] open."),\
- SPAN_XENONOTICE("You start prying [src] open."), max_distance = 3)
-
- playsound(loc, 'sound/effects/metal_creaking.ogg', 25, TRUE)
-
- if(!do_after(X, time, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL))
- to_chat(X, "You stop prying [src] open.")
- return
-
- X.visible_message(SPAN_DANGER("[X] pries open [src]."), \
- SPAN_XENONOTICE("You pry open [src]."), max_distance = 3)
-
- open()
- return TRUE
-
-
-/obj/structure/machinery/door/poddoor/try_to_activate_door(mob/user)
- return
-
-/obj/structure/machinery/door/poddoor/open()
- if(operating) //doors can still open when emag-disabled
- return
-
- if(!opacity)
- return TRUE
-
- operating = TRUE
-
- playsound(loc, 'sound/machines/blastdoor.ogg', 20, 0)
- flick("[base_icon_state]c0", src)
- icon_state = "[base_icon_state]0"
- set_opacity(0)
-
- addtimer(CALLBACK(src, PROC_REF(finish_open)), openspeed)
- return TRUE
-
-/obj/structure/machinery/door/poddoor/close()
- if(operating)
- return
- if(opacity == initial(opacity))
- return
-
- operating = TRUE
- playsound(loc, 'sound/machines/blastdoor.ogg', 20, 0)
-
- layer = closed_layer
- flick("[base_icon_state]c1", src)
- icon_state = "[base_icon_state]1"
- density = TRUE
- set_opacity(initial(opacity))
-
- addtimer(CALLBACK(src, PROC_REF(finish_close)), openspeed)
- return
-
-/obj/structure/machinery/door/poddoor/finish_close()
- operating = FALSE
-
-/obj/structure/machinery/door/poddoor/two_tile/open()
- if(operating) //doors can still open when emag-disabled
- return
-
- operating = TRUE
- start_opening()
-
- addtimer(CALLBACK(src, PROC_REF(open_fully)), openspeed)
- return TRUE
-
-/obj/structure/machinery/door/poddoor/two_tile/proc/start_opening()
- flick("[base_icon_state]c0", src)
- icon_state = "[base_icon_state]0"
- set_opacity(0)
- f1.set_opacity(0)
- f2.set_opacity(0)
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/start_opening()
- f3.set_opacity(0)
- f4.set_opacity(0)
- ..()
-
-/obj/structure/machinery/door/poddoor/two_tile/proc/open_fully()
- density = FALSE
- f1.density = FALSE
- f2.density = FALSE
-
- if(operating == 1) //emag again
- operating = 0
- if(autoclose)
- addtimer(CALLBACK(src, PROC_REF(autoclose)), 15 SECONDS)
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/open_fully()
- f3.density = FALSE
- f4.density = FALSE
- ..()
-
-/obj/structure/machinery/door/poddoor/two_tile/close()
- if(operating)
- return
- start_closing()
- addtimer(CALLBACK(src, PROC_REF(close_fully)), openspeed)
- return
-
-/obj/structure/machinery/door/poddoor/two_tile/proc/start_closing()
- operating = 1
- flick("[base_icon_state]c1", src)
- icon_state = "[base_icon_state]1"
-
- density = TRUE
- f1.density = TRUE
- f2.density = TRUE
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/start_closing()
- f3.density = TRUE
- f4.density = TRUE
- ..()
-
-/obj/structure/machinery/door/poddoor/two_tile/proc/close_fully()
- set_opacity(initial(opacity))
- f1.set_opacity(initial(opacity))
- f2.set_opacity(initial(opacity))
- operating = 0
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/close_fully()
- f3.set_opacity(initial(opacity))
- f4.set_opacity(initial(opacity))
- ..()
-
-/obj/structure/machinery/door/poddoor/two_tile
- dir = EAST
- icon = 'icons/obj/structures/doors/1x2blast_hor.dmi'
- var/obj/structure/machinery/door/poddoor/filler_object/f1
- var/obj/structure/machinery/door/poddoor/filler_object/f2
-
-/obj/structure/machinery/door/poddoor/two_tile/opened
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/two_tile/Initialize()
- . = ..()
- f1 = new/obj/structure/machinery/door/poddoor/filler_object (loc)
- f2 = new/obj/structure/machinery/door/poddoor/filler_object (get_step(src,dir))
- f1.density = density
- f2.density = density
- f1.set_opacity(opacity)
- f2.set_opacity(opacity)
-
-/obj/structure/machinery/door/poddoor/two_tile/Destroy()
- QDEL_NULL(f1)
- QDEL_NULL(f2)
- return ..()
-
-/obj/structure/machinery/door/poddoor/two_tile/vertical
- dir = NORTH
- icon = 'icons/obj/structures/doors/1x2blast_vert.dmi'
-
-/obj/structure/machinery/door/poddoor/two_tile/vertical/open
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile
- icon = 'icons/obj/structures/doors/1x4blast_hor.dmi'
- var/obj/structure/machinery/door/poddoor/filler_object/f3
- var/obj/structure/machinery/door/poddoor/filler_object/f4
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/open
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/Initialize()
- . = ..()
- f3 = new/obj/structure/machinery/door/poddoor/filler_object (get_step(f2,dir))
- f4 = new/obj/structure/machinery/door/poddoor/filler_object (get_step(f3,dir))
- f3.density = density
- f4.density = density
- f3.set_opacity(opacity)
- f4.set_opacity(opacity)
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/Destroy()
- QDEL_NULL(f3)
- QDEL_NULL(f4)
- return ..()
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical
- dir = NORTH
- icon = 'icons/obj/structures/doors/1x4blast_vert.dmi'
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/opened
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/filler_object
- name = ""
- icon = null
- icon_state = ""
- unslashable = TRUE
- unacidable = TRUE
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/secure
- icon = 'icons/obj/structures/doors/1x4blast_hor_secure.dmi'
- openspeed = 17
- unslashable = TRUE
- unacidable = TRUE
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/secure/opened
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/secure
- icon = 'icons/obj/structures/doors/1x4blast_vert_secure.dmi'
- openspeed = 17
- unslashable = TRUE
- unacidable = TRUE
-
-/obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/secure/open
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/two_tile/secure
- icon = 'icons/obj/structures/doors/1x2blast_hor.dmi'
- openspeed = 17
- unslashable = TRUE
- unacidable = TRUE
-
-/obj/structure/machinery/door/poddoor/two_tile/vertical/secure
- icon = 'icons/obj/structures/doors/1x2blast_vert.dmi'
- openspeed = 17
- unacidable = TRUE
-
-/obj/structure/machinery/door/poddoor/almayer
- icon = 'icons/obj/structures/doors/blastdoors_shutters.dmi'
- openspeed = 4 //shorter open animation.
- var/vehicle_resistant = FALSE
- tiles_with = list(
- /obj/structure/window/framed/almayer,
- /obj/structure/machinery/door/airlock,
- )
-
-/obj/structure/machinery/door/poddoor/almayer/Initialize()
- . = ..()
- return INITIALIZE_HINT_LATELOAD
-
-/obj/structure/machinery/door/poddoor/almayer/LateInitialize()
- . = ..()
- relativewall_neighbours()
-
-/obj/structure/machinery/door/poddoor/almayer/open
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/almayer/blended
- icon_state = "almayer_pdoor1"
- base_icon_state = "almayer_pdoor"
-
-/obj/structure/machinery/door/poddoor/almayer/blended/open
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/almayer/blended/white
- icon_state = "w_almayer_pdoor1"
- base_icon_state = "w_almayer_pdoor"
-
-/obj/structure/machinery/door/poddoor/almayer/blended/white/open
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/almayer/blended/aicore
- icon_state = "aidoor1"
- base_icon_state = "aidoor"
-
-/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/almayer/blended/white_aicore
- icon_state = "w_aidoor1"
- base_icon_state = "w_aidoor"
-
-/obj/structure/machinery/door/poddoor/almayer/blended/white_aicore/open
- density = FALSE
-
-/obj/structure/machinery/door/poddoor/almayer/locked
- unslashable = TRUE
- unacidable = TRUE
-
-/obj/structure/machinery/door/poddoor/almayer/locked/attackby(obj/item/C as obj, mob/user as mob)
- if(HAS_TRAIT(C, TRAIT_TOOL_CROWBAR))
- return
- ..()
-
-/obj/structure/machinery/door/poddoor/almayer/closed
- density = TRUE
- opacity = TRUE
-
-/obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor
- density = TRUE
- opacity = TRUE
- vehicle_resistant = TRUE
diff --git a/code/game/machinery/doors/poddoor/almayer.dm b/code/game/machinery/doors/poddoor/almayer.dm
new file mode 100644
index 000000000000..2b296412df7d
--- /dev/null
+++ b/code/game/machinery/doors/poddoor/almayer.dm
@@ -0,0 +1,65 @@
+/obj/structure/machinery/door/poddoor/almayer
+ icon = 'icons/obj/structures/doors/blastdoors_shutters.dmi'
+ openspeed = 4 //shorter open animation.
+ var/vehicle_resistant = FALSE
+ tiles_with = list(
+ /obj/structure/window/framed/almayer,
+ /obj/structure/machinery/door/airlock,
+ )
+
+/obj/structure/machinery/door/poddoor/almayer/Initialize()
+ . = ..()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/structure/machinery/door/poddoor/almayer/LateInitialize()
+ . = ..()
+ relativewall_neighbours()
+
+/obj/structure/machinery/door/poddoor/almayer/open
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/almayer/blended
+ icon_state = "almayer_pdoor1"
+ base_icon_state = "almayer_pdoor"
+
+/obj/structure/machinery/door/poddoor/almayer/blended/open
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/almayer/blended/white
+ icon_state = "w_almayer_pdoor1"
+ base_icon_state = "w_almayer_pdoor"
+
+/obj/structure/machinery/door/poddoor/almayer/blended/white/open
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/almayer/blended/aicore
+ icon_state = "aidoor1"
+ base_icon_state = "aidoor"
+
+/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/almayer/blended/white_aicore
+ icon_state = "w_aidoor1"
+ base_icon_state = "w_aidoor"
+
+/obj/structure/machinery/door/poddoor/almayer/blended/white_aicore/open
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/almayer/locked
+ unslashable = TRUE
+ unacidable = TRUE
+
+/obj/structure/machinery/door/poddoor/almayer/locked/attackby(obj/item/C as obj, mob/user as mob)
+ if(HAS_TRAIT(C, TRAIT_TOOL_CROWBAR))
+ return
+ ..()
+
+/obj/structure/machinery/door/poddoor/almayer/closed
+ density = TRUE
+ opacity = TRUE
+
+/obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor
+ density = TRUE
+ opacity = TRUE
+ vehicle_resistant = TRUE
diff --git a/code/game/machinery/doors/poddoor/poddoor.dm b/code/game/machinery/doors/poddoor/poddoor.dm
new file mode 100644
index 000000000000..84bc8d91cd69
--- /dev/null
+++ b/code/game/machinery/doors/poddoor/poddoor.dm
@@ -0,0 +1,117 @@
+/obj/structure/machinery/door/poddoor
+ name = "\improper Podlock"
+ desc = "That looks like it doesn't open easily."
+ icon = 'icons/obj/structures/doors/rapid_pdoor.dmi'
+ icon_state = "pdoor1"
+ var/base_icon_state = "pdoor"
+ id = 1
+ dir = NORTH
+ unslashable = TRUE
+ health = 0
+ layer = PODDOOR_CLOSED_LAYER
+ open_layer = PODDOOR_OPEN_LAYER
+ closed_layer = PODDOOR_CLOSED_LAYER
+
+/obj/structure/machinery/door/poddoor/Initialize()
+ . = ..()
+ if(density)
+ set_opacity(1)
+ else
+ set_opacity(0)
+ update_icon()
+
+/obj/structure/machinery/door/poddoor/update_icon()
+ if(density)
+ icon_state = "[base_icon_state]1"
+ else
+ icon_state = "[base_icon_state]0"
+
+/obj/structure/machinery/door/poddoor/Collided(atom/movable/AM)
+ if(!density)
+ return ..()
+ else
+ return 0
+
+/obj/structure/machinery/door/poddoor/attackby(obj/item/W, mob/user)
+ add_fingerprint(user)
+ if(!W.pry_capable)
+ return
+ if(density && (stat & NOPOWER) && !operating && !unacidable)
+ spawn(0)
+ operating = 1
+ flick("[base_icon_state]c0", src)
+ icon_state = "[base_icon_state]0"
+ set_opacity(0)
+ sleep(15)
+ density = FALSE
+ operating = 0
+
+/obj/structure/machinery/door/poddoor/attack_alien(mob/living/carbon/xenomorph/X)
+ if((stat & NOPOWER) && density && !operating && !unacidable)
+ INVOKE_ASYNC(src, PROC_REF(pry_open), X)
+ return XENO_ATTACK_ACTION
+
+/obj/structure/machinery/door/poddoor/proc/pry_open(mob/living/carbon/xenomorph/X, time = 4 SECONDS)
+ X.visible_message(SPAN_DANGER("[X] begins prying [src] open."),\
+ SPAN_XENONOTICE("You start prying [src] open."), max_distance = 3)
+
+ playsound(loc, 'sound/effects/metal_creaking.ogg', 25, TRUE)
+
+ if(!do_after(X, time, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL))
+ to_chat(X, "You stop prying [src] open.")
+ return
+
+ X.visible_message(SPAN_DANGER("[X] pries open [src]."), \
+ SPAN_XENONOTICE("You pry open [src]."), max_distance = 3)
+
+ open()
+ return TRUE
+
+
+/obj/structure/machinery/door/poddoor/try_to_activate_door(mob/user)
+ return
+
+/obj/structure/machinery/door/poddoor/open()
+ if(operating) //doors can still open when emag-disabled
+ return
+
+ if(!opacity)
+ return TRUE
+
+ operating = TRUE
+
+ playsound(loc, 'sound/machines/blastdoor.ogg', 20, 0)
+ flick("[base_icon_state]c0", src)
+ icon_state = "[base_icon_state]0"
+ set_opacity(0)
+
+ addtimer(CALLBACK(src, PROC_REF(finish_open)), openspeed)
+ return TRUE
+
+/obj/structure/machinery/door/poddoor/close()
+ if(operating)
+ return
+ if(opacity == initial(opacity))
+ return
+
+ operating = TRUE
+ playsound(loc, 'sound/machines/blastdoor.ogg', 20, 0)
+
+ layer = closed_layer
+ flick("[base_icon_state]c1", src)
+ icon_state = "[base_icon_state]1"
+ density = TRUE
+ set_opacity(initial(opacity))
+
+ addtimer(CALLBACK(src, PROC_REF(finish_close)), openspeed)
+ return
+
+/obj/structure/machinery/door/poddoor/finish_close()
+ operating = FALSE
+
+/obj/structure/machinery/door/poddoor/filler_object
+ name = ""
+ icon = null
+ icon_state = ""
+ unslashable = TRUE
+ unacidable = TRUE
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/poddoor/shutters/shutters.dm
similarity index 100%
rename from code/game/machinery/doors/shutters.dm
rename to code/game/machinery/doors/poddoor/shutters/shutters.dm
diff --git a/code/game/machinery/doors/poddoor/two_tile.dm b/code/game/machinery/doors/poddoor/two_tile.dm
new file mode 100644
index 000000000000..f04435bbe2ae
--- /dev/null
+++ b/code/game/machinery/doors/poddoor/two_tile.dm
@@ -0,0 +1,156 @@
+/obj/structure/machinery/door/poddoor/two_tile
+ dir = EAST
+ icon = 'icons/obj/structures/doors/1x2blast_hor.dmi'
+ var/obj/structure/machinery/door/poddoor/filler_object/f1
+ var/obj/structure/machinery/door/poddoor/filler_object/f2
+
+/obj/structure/machinery/door/poddoor/two_tile/opened
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/two_tile/Initialize()
+ . = ..()
+ f1 = new/obj/structure/machinery/door/poddoor/filler_object (loc)
+ f2 = new/obj/structure/machinery/door/poddoor/filler_object (get_step(src,dir))
+ f1.density = density
+ f2.density = density
+ f1.set_opacity(opacity)
+ f2.set_opacity(opacity)
+
+/obj/structure/machinery/door/poddoor/two_tile/Destroy()
+ QDEL_NULL(f1)
+ QDEL_NULL(f2)
+ return ..()
+
+/obj/structure/machinery/door/poddoor/two_tile/open()
+ if(operating) //doors can still open when emag-disabled
+ return
+
+ operating = TRUE
+ start_opening()
+
+ addtimer(CALLBACK(src, PROC_REF(open_fully)), openspeed)
+ return TRUE
+
+/obj/structure/machinery/door/poddoor/two_tile/proc/start_opening()
+ flick("[base_icon_state]c0", src)
+ icon_state = "[base_icon_state]0"
+ set_opacity(0)
+ f1.set_opacity(0)
+ f2.set_opacity(0)
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/start_opening()
+ f3.set_opacity(0)
+ f4.set_opacity(0)
+ ..()
+
+/obj/structure/machinery/door/poddoor/two_tile/proc/open_fully()
+ density = FALSE
+ f1.density = FALSE
+ f2.density = FALSE
+
+ if(operating == 1) //emag again
+ operating = 0
+ if(autoclose)
+ addtimer(CALLBACK(src, PROC_REF(autoclose)), 15 SECONDS)
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/open_fully()
+ f3.density = FALSE
+ f4.density = FALSE
+ ..()
+
+/obj/structure/machinery/door/poddoor/two_tile/close()
+ if(operating)
+ return
+ start_closing()
+ addtimer(CALLBACK(src, PROC_REF(close_fully)), openspeed)
+ return
+
+/obj/structure/machinery/door/poddoor/two_tile/proc/start_closing()
+ operating = 1
+ flick("[base_icon_state]c1", src)
+ icon_state = "[base_icon_state]1"
+
+ density = TRUE
+ f1.density = TRUE
+ f2.density = TRUE
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/start_closing()
+ f3.density = TRUE
+ f4.density = TRUE
+ ..()
+
+/obj/structure/machinery/door/poddoor/two_tile/proc/close_fully()
+ set_opacity(initial(opacity))
+ f1.set_opacity(initial(opacity))
+ f2.set_opacity(initial(opacity))
+ operating = 0
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/close_fully()
+ f3.set_opacity(initial(opacity))
+ f4.set_opacity(initial(opacity))
+ ..()
+
+/obj/structure/machinery/door/poddoor/two_tile/vertical
+ dir = NORTH
+ icon = 'icons/obj/structures/doors/1x2blast_vert.dmi'
+
+/obj/structure/machinery/door/poddoor/two_tile/vertical/open
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile
+ icon = 'icons/obj/structures/doors/1x4blast_hor.dmi'
+ var/obj/structure/machinery/door/poddoor/filler_object/f3
+ var/obj/structure/machinery/door/poddoor/filler_object/f4
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/open
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/Initialize()
+ . = ..()
+ f3 = new/obj/structure/machinery/door/poddoor/filler_object (get_step(f2,dir))
+ f4 = new/obj/structure/machinery/door/poddoor/filler_object (get_step(f3,dir))
+ f3.density = density
+ f4.density = density
+ f3.set_opacity(opacity)
+ f4.set_opacity(opacity)
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/Destroy()
+ QDEL_NULL(f3)
+ QDEL_NULL(f4)
+ return ..()
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical
+ dir = NORTH
+ icon = 'icons/obj/structures/doors/1x4blast_vert.dmi'
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/opened
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/secure
+ icon = 'icons/obj/structures/doors/1x4blast_hor_secure.dmi'
+ openspeed = 17
+ unslashable = TRUE
+ unacidable = TRUE
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/secure/opened
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/secure
+ icon = 'icons/obj/structures/doors/1x4blast_vert_secure.dmi'
+ openspeed = 17
+ unslashable = TRUE
+ unacidable = TRUE
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/secure/open
+ density = FALSE
+
+/obj/structure/machinery/door/poddoor/two_tile/secure
+ icon = 'icons/obj/structures/doors/1x2blast_hor.dmi'
+ openspeed = 17
+ unslashable = TRUE
+ unacidable = TRUE
+
+/obj/structure/machinery/door/poddoor/two_tile/vertical/secure
+ icon = 'icons/obj/structures/doors/1x2blast_vert.dmi'
+ openspeed = 17
+ unacidable = TRUE
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 5cb2684eb34d..a5c7f5e04fef 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -930,12 +930,14 @@
#include "code\game\machinery\doors\door.dm"
#include "code\game\machinery\doors\firedoor.dm"
#include "code\game\machinery\doors\multi_tile.dm"
-#include "code\game\machinery\doors\poddoor.dm"
#include "code\game\machinery\doors\railing.dm"
#include "code\game\machinery\doors\runed_sandstone.dm"
-#include "code\game\machinery\doors\shutters.dm"
#include "code\game\machinery\doors\unpowered.dm"
#include "code\game\machinery\doors\windowdoor.dm"
+#include "code\game\machinery\doors\poddoor\almayer.dm"
+#include "code\game\machinery\doors\poddoor\poddoor.dm"
+#include "code\game\machinery\doors\poddoor\two_tile.dm"
+#include "code\game\machinery\doors\poddoor\shutters\shutters.dm"
#include "code\game\machinery\embedded_controller\docking_program.dm"
#include "code\game\machinery\embedded_controller\embedded_controller_base.dm"
#include "code\game\machinery\embedded_controller\embedded_program_base.dm"
From 69aa04fbcf4eb83bc7fb13cf374689c47ce71f8d Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 20 Mar 2024 21:08:30 +0000
Subject: [PATCH 27/32] Automatic changelog for PR #5886 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5886.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5886.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5886.yml b/html/changelogs/AutoChangeLog-pr-5886.yml
new file mode 100644
index 000000000000..6b6c16f075c5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5886.yml
@@ -0,0 +1,4 @@
+author: "Huffie56"
+delete-after: True
+changes:
+ - refactor: "refactored poddoor file and shutters file."
\ No newline at end of file
From 761d2b4279cda62fdced7a28c1f3d05e0c125c1b Mon Sep 17 00:00:00 2001
From: Julian56 <117036822+Huffie56@users.noreply.github.com>
Date: Wed, 20 Mar 2024 22:03:21 +0100
Subject: [PATCH 28/32] add some balloons for CPR : one is for when it's a
success and the other is when it's a failure. (#5918)
# About the pull request
adding balloons to show when you are successful with your CPR or if your
not.
I am not sure about the text.
# Explain why it's good for the game
Give feedback without needing to look at chat box
# Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the
screenshots and the `` tags.
# Changelog
:cl:
qol: add some balloons for CPR : one is for when it's a success and the
other is when it's a failure.
/:cl:
---------
Co-authored-by: Julien
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
---
code/modules/mob/living/carbon/human/human_attackhand.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 1d56b7db2728..206fda0c9762 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -60,9 +60,11 @@
revive_grace_period += 7 SECONDS
attacking_mob.visible_message(SPAN_NOTICE("[attacking_mob] performs CPR on [src]."),
SPAN_HELPFUL("You perform CPR on [src]."))
+ balloon_alert(attacking_mob, "you perform cpr")
else
attacking_mob.visible_message(SPAN_NOTICE("[attacking_mob] fails to perform CPR on [src]."),
SPAN_HELPFUL("You fail to perform CPR on [src]. Incorrect rhythm. Do it slower."))
+ balloon_alert(attacking_mob, "incorrect rhythm. do it slower")
cpr_cooldown = world.time + 7 SECONDS
cpr_attempt_timer = 0
return 1
From 7576a254e29337fe7a1498cab9d5da5764494e62 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 20 Mar 2024 21:16:51 +0000
Subject: [PATCH 29/32] Automatic changelog for PR #5918 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5918.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5918.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5918.yml b/html/changelogs/AutoChangeLog-pr-5918.yml
new file mode 100644
index 000000000000..e8ca5978c0e6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5918.yml
@@ -0,0 +1,4 @@
+author: "Huffie56"
+delete-after: True
+changes:
+ - qol: "add some balloons for CPR : one is for when it's a success and the other is when it's a failure."
\ No newline at end of file
From b04eaeab64928393d822a0a274c2ee9c8a57f71b Mon Sep 17 00:00:00 2001
From: Birdtalon
Date: Wed, 20 Mar 2024 22:44:17 +0000
Subject: [PATCH 30/32] Xeno eggs now take finger prints (#5975)
# About the pull request
Eggs haven't taken fingerprints for 5 years.
# Explain why it's good for the game
# Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the
screenshots and the `` tags.
# Changelog
:cl:
admin: Xeno eggs now take fingerprints.
/:cl:
---
code/modules/mob/living/carbon/xenomorph/egg_item.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm
index f349b8acfb8d..a9d00519b691 100644
--- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm
+++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm
@@ -5,7 +5,7 @@
icon = 'icons/mob/xenos/effects.dmi'
icon_state = "egg_item"
w_class = SIZE_MASSIVE
- flags_atom = OPENCONTAINER
+ flags_atom = FPRINT|OPENCONTAINER
flags_item = NOBLUDGEON
throw_range = 1
layer = MOB_LAYER
From 8bb971c121c86a8ac477c0eed3c93a50d3877456 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 20 Mar 2024 22:49:28 +0000
Subject: [PATCH 31/32] Automatic changelog for PR #5975 [ci skip]
---
html/changelogs/AutoChangeLog-pr-5975.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-5975.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5975.yml b/html/changelogs/AutoChangeLog-pr-5975.yml
new file mode 100644
index 000000000000..f90094b020a6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5975.yml
@@ -0,0 +1,4 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+ - admin: "Xeno eggs now take fingerprints."
\ No newline at end of file
From 3b6470cab55861f45cc5161b2ec4a260b64d855e Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Thu, 21 Mar 2024 01:08:36 +0000
Subject: [PATCH 32/32] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-5805.yml | 4 ----
html/changelogs/AutoChangeLog-pr-5886.yml | 4 ----
html/changelogs/AutoChangeLog-pr-5918.yml | 4 ----
html/changelogs/AutoChangeLog-pr-5930.yml | 4 ----
html/changelogs/AutoChangeLog-pr-5975.yml | 4 ----
html/changelogs/archive/2024-03.yml | 11 +++++++++++
6 files changed, 11 insertions(+), 20 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-5805.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5886.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5918.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5930.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-5975.yml
diff --git a/html/changelogs/AutoChangeLog-pr-5805.yml b/html/changelogs/AutoChangeLog-pr-5805.yml
deleted file mode 100644
index 958e503c4580..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5805.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BadAtThisGame302"
-delete-after: True
-changes:
- - rscadd: "Heavily Updated Corpse Code."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5886.yml b/html/changelogs/AutoChangeLog-pr-5886.yml
deleted file mode 100644
index 6b6c16f075c5..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5886.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Huffie56"
-delete-after: True
-changes:
- - refactor: "refactored poddoor file and shutters file."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5918.yml b/html/changelogs/AutoChangeLog-pr-5918.yml
deleted file mode 100644
index e8ca5978c0e6..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5918.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Huffie56"
-delete-after: True
-changes:
- - qol: "add some balloons for CPR : one is for when it's a success and the other is when it's a failure."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5930.yml b/html/changelogs/AutoChangeLog-pr-5930.yml
deleted file mode 100644
index 3250bcc7ff0c..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5930.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Steelpoint"
-delete-after: True
-changes:
- - maptweak: "Adds several cardboard box spawns in to squad prep rooms."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5975.yml b/html/changelogs/AutoChangeLog-pr-5975.yml
deleted file mode 100644
index f90094b020a6..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5975.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Birdtalon"
-delete-after: True
-changes:
- - admin: "Xeno eggs now take fingerprints."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml
index c084a5b3369a..26d47c662c12 100644
--- a/html/changelogs/archive/2024-03.yml
+++ b/html/changelogs/archive/2024-03.yml
@@ -244,3 +244,14 @@
realforest2001:
- rscadd: Changed all marine presets to use Dress Blues as their dress equipment.
- rscdel: Excluding Whiskey Outpost, removed all previous dress equipment from vendors.
+2024-03-21:
+ BadAtThisGame302:
+ - rscadd: Heavily Updated Corpse Code.
+ Birdtalon:
+ - admin: Xeno eggs now take fingerprints.
+ Huffie56:
+ - qol: 'add some balloons for CPR : one is for when it''s a success and the other
+ is when it''s a failure.'
+ - refactor: refactored poddoor file and shutters file.
+ Steelpoint:
+ - maptweak: Adds several cardboard box spawns in to squad prep rooms.