From 75721ff9b30757f8b1a8e15f7efc8b21162a33f0 Mon Sep 17 00:00:00 2001 From: Unchi-unchi-un-chi-chi <86578193+Unchi-unchi-un-chi-chi@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:18:48 +0500 Subject: [PATCH] Medbay professions and a window (#2390) --- maps/sierra/icons/assignment_hud.dmi | Bin 2119 -> 4094 bytes maps/sierra/job/jobs_medical.dm | 8 ++++++-- maps/sierra/z1-z5_sierra.dmm | 11 +---------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/maps/sierra/icons/assignment_hud.dmi b/maps/sierra/icons/assignment_hud.dmi index 1fd4dff14a7cf1a3386ec0bda49e376dfd0ee6ee..a89b9c349b959f2ae3b5b3ce509c40216cb468da 100644 GIT binary patch literal 4094 zcmb_fdpHzow;z{WLn;Y-lAIz6mB?k75+(Ob?ir<$dxbF=hH@#lk!y*WicoBWHa6yh zkxNtVa-Yd%OoJgaVTLjD)$^Qvo_+SS&-tG3eCLn%pZ8sBJ@2!A>$lc#J+`;KBqgCJ z0RRA`EH7Vl1ONmM|2P0Kksmkvv@06`0718CXSeW+x59ky``-=s4-EkTU`2VZHet_o z_JAe{?KxB1v5dC&iYW>yu)Em}UG;8Y@ypJ8Rd}1%=I(_852;D^#k7!ChVV1cb+h21 zp!z1eg3#rM_n_;s>kMK!^@fgl6?JB*fcomT)5scg&k^(dxlf<&I~-J=XGb-ugX-Z1 ze4*jkfl1dTku>nx$%<=f;EasrlV_dt|HJKVV(PaF7+v+c8zbtD_*-nro-vnY*&0pK zE2LV5@Zu4Ls;K%I#{ixD+S3*nNJ#_3mn|*&UL`cH*srosvj8^#?$)Ml^0|OASy2IVgKVFwu_Xf&&OWS(718F@*6DOqn3IQz=RqhDGZvL8 zKMfW--y0j$ZL8h0tYUS4oi%40JleBr3ClLIyRkAH9riRcoZt@JK<51J1spcCTRD~> znrB-6xUgfo(x$K~GUwcSAR(rE6iGJ|nYTqTzu#*{XymL4yk_c7+KR?btVZ&sqFNls zZ*%L|l3s(&R=yW3T7J~tb<2zAonb|cX~-jI8nAOMY&q+|I}eGMWxorEn>RWR)JVnv zYs?*koV;o$E=UE7CtZlSUL}7(;@XFRYC+s(e{g7kghk;IsmXBvZ`JLoPvWoPBr^15 zFKCDR@~5n6kyDWy#iM7cGf)FpUd98u!2w9@)PZKKh69zufZ3%TgVd&;jw9-UsB-TQ6-XR{~De$lj) z;y!3|O;F>TH^&I*{| z9YKj%qK>(WyMTHmSBLrSP(p_)hTXJo7dsscoB%sS2aJf_=?;vbey@=N2|L+mK6qdc zARGC38Kx2m=UhQs5+!?9&1!xb$x8>uJtLK0O3oi5o(>ldx0AX4o0A$ye*QR_F1PE2 zMsZegekN^etXmbt?eW*$OGa!Ji7E*MF9Ac6SSAU;2T|$qS1N&8L|UwZS1|^^yEq1a zP25VmZ8CPqwbiWzP9b1^35h{B_44L&)`y%-?WE}Y7xAq+nF^t+-x|3RSco$N)ro-(#8wPnJlNb zT%Ai$tyR;Hl7}e9EE{9(C|fk*8`;w+O$~*r4B0p*UwmD;E?Bt04!J)^3KLK5Qi62r zd2?Kv{W&fiT*iIWm)OI$G z$=GRBG2Q=SQ_RQH8GBDbohj7Eu;c7>-B;uY7l#Y)MGF3~EI0CYbIAZ~nI;soh8(hH zce+$%S7m*$Ky{1wRN1>9r3vY8A6>wgCxn6N@>#@F=QxqHN$3{?L4{5uQxiTlk8;cf zPNup}bcMPK4q9bF`BO{EO>m+49CTP*Z@~br1KL?%#6#UxV$ho#Lmr;Rd=$ z%|ex+F3l^e_+-j?_yEpS8mY}7OzB)bndt9M{AHlTd>}YlO^id&t!a=><-+2E`rsvO zZt&csZu84%F6)}|R1-QDPOn#*F4J#6$6pzRvxwW6Lz^Z-@3$Kx>|=SUtAu@rI(GRW zL27ShqSmDEATKrI7aF9S()79PTEDo6)gmQYW!+qaeU+6Lc8%HQTBsaqP{+I+X z8B_+4gC4r(fyZWMBiOTFkBvrr#dHnYsPLvhqbl$XV*YbyIs555U17qx2T+@0yCXYx zeL(>kY!?#>hY2~l^io$xLJrx9{f>E%RP1fACC+JjvyH_O9>TttXuNFwpjH6X>8^!a z`%z72RY9VquiR3yUc>nx%xan=9Byi)x$Zox%!TgQ#40?6YY}tMesS*4cLSu^Hh2D? z`1Ds`oX?aj7@tz)%vZAH5gusM`$6lp0tzFR{oF#|S&}}CUG;7mU>Ep6cs;9;+fH*E zw5}D93Hu7Y5Y3F{&#+t<%7^w&(q?veS0^D`JP@n07!hQ3>i*rCUS>}%RbIYY*IQ7< zv}XM)=Al`frc4`__SL0Nvig8LqW%QixZSVc>>u%qYm zLsw0kk29AJ(aIo+3J8&7>D`5&?^$vZAL$#LD|Duy$xRU{KICB|+*Zm9NA;o!vo;Z_ z{q~+FTs^L^1nmX(jNIU$REf^!rnbhHtnqvX#nX7=3GjgeRVCgLA-X>^E_ZPDF`9J# z8mEFx$V(WVvHQ>hxAq^U3>T>M{OmDR+QiXgLh%n>ypu(~{rjAF`{r2~>fk5t z%7|+qi%^d+<;?4cG*?h~$O9&mgwq7La=WRisq-fflE0Bp6RT8&+gWN-a8KO5sjri4fqF%+6 zOD>S=YJRPu@2%mM;H*h$^wGAK~HrBZ9^wa+x4MwU;34;UeLUo8xqY!d!(mk&whwqC(VQ7b#ex*_VI7FRAntOWi2 z-jGM6+=(KD<1HHOtK66cMjah4e0sU5taNp9JM0mqa?wb~#TZ5P^>76rqaCTq8JI~7 z*Bai{f4~4w8|+kEB=tAZXmEvmE|z803j^5uQ&kSe8~@)R8A^3Ob$ED$r#i;>WNBw4n+0 zzp(&&6IRdcHW!+I{AZ2z+oHxnCTp;aFtv%EZszc8<-GCHe1bW@9nrb6-8Vb)M_Py~ zZVQ8mq}Jyf+JgJvBPfup1wPA(pS?hcVI=FKW&d8-|B*y0o6QFCXFukzg2o66-12v! zWY)S2ARo%5B=Ed0hZ>r7ppJ$JopFP1)cc- literal 2119 zcmYk72{hE}8^?bb#bgVUBry^hlz(I{6XPfT5n~2(k!_^Ewd~9wW9mn!uI1)t8!?e< z8H}uF5}I^nPxxD+khL&n-?`j-y5~OUyytn&yL`UibKdtk?|p*B6=C=ZH~;{`rY1&K z0Kg-^KL7!~{Tamthv@xePcSDM?*Ty6e!ag<17~e*okcj(OcvVP+iL>=O-)S+(~#KM z*p<8!GAbS?4QferfL0@w+k;-B0881*`T6;?v$OUowQK!1)7{%+%^UY=5r8KNu=GJ6 z9&;`|zR%?ewz9AW45kL$0f5&goM;zp884n&`i6uHN}!;Md3B3oVScJvqRsx{<&X# z1@jxzPflN5s;F~@!m7Q$w!@G zX=R!THC;H?WKf`^nSl~)nUSv4_Q&gA{!Y_fv|?sN^XZ&TS2R|i?UYe7JDq!ULH8!x z@NAZY63dLITtoyu*YvAB{TRZM8E<0!J?Suo%<&Z4>Fj$F&vfJwH_B<+7`j;IZC8FS zRNVUpDwfUp!%`qY{g|m+XVy#3iSnFX=xcfgeD3+u&#l^g!kD!Oqt4AI2zN6g#&~DD zADEOGi4}1~x@TR(d5WtKT68zX+zE ze026_ESB3#mfgvUzOt~SI0crV^S#WrI=%)+WWLG!`mE1uSwrwr;j&Ibuc9wYJD~Ct z?sG3|oSRfCH-4FSJt3=mJwTU+`Zb#;uluJ#3mK~JDazi(um-CZ_w|zXBTg=C5tx}O z1_1bVOpQQdXy*KryS^uMB#n{LVdky^_Y`ZHA9waf9EXy9bFbD@qA~a4f^tya=VKPq zJ@5!@6%(=lQeV}TmsT#tUd4>V{DxyT6M*WO*ZBO_BwJyIFNMfJbOY=yb zE`Uuq3bY19f|?`lm_f_hXeCe%L0s8(1aprO;RZ)gF`FxHuW#O4yN9(z(jB=&cnR95x>@msgTF-``U^NL8nYFox)nB)14=jFc+ z@U?zVfTNCd+00Dd9{2^0ii2N}wb>Q10rhUjZA3WSZR3K~2OjGZ!+y9v$aiWPYc3^d zTH&xScgtgVj3ynq@t)hZa6I6WHcMlg|MB!}&v?gH+q*U19CM9hl9FzRTzMxq-99P% ze|0_zW!~`xHxIq+l_^#tIDf~%D-nvY_5wy;Y8v8Ms)6(_4%Y>TJ3WoOpS~(azX@6k zlIq{Q7A#|vASx8DS{#&Iy7X=6SuJcK4XyKUTd$n_=cCwpOV*Q%!*V-)jX{Id>j`8W zmoB>ezCu4k|H7brhDzV7LFzA0j{jpMhPf$eiDTUM5C_ zn-h;GhNT|-L;u7uf8F7m=j2c%^m&i|r!VBl+?ndik;XqA;o zne_a?<;)K;#f&bG{wf`V2~F4vyo~*lr%)?S1^m61Gu2>7u#(UUD>@D;;PYV3;HkY3;cx#*dN(GQqNG0+Gh%YHENz) zQDZdy9pr&ZOD;z+@OCdLMyj!DM_vH@A?}3hTIX!xBlhSs-B`&QtX6~ekEMOaUu7lW z7t3Ey+c)fFEMjQF{i}Zq|8*#s1?}>&iT9*!rnij_ZpGBt K!l=~H1^N>$?#S!_ diff --git a/maps/sierra/job/jobs_medical.dm b/maps/sierra/job/jobs_medical.dm index f6a4988e719e4..321a4f8c27fb8 100644 --- a/maps/sierra/job/jobs_medical.dm +++ b/maps/sierra/job/jobs_medical.dm @@ -55,7 +55,7 @@ вкупе с предоперационным лечением пострадавших, спектр активности хирурга является несколько более широким, начиная от обычного лечения медикаментами в случае необходимости и заканчивая проведением сложных хирургических операций." /datum/job/doctor - title = "Doctor" + title = "Physician" supervisors = "Главному Врачу" department = "Медицинский" department_flag = MED @@ -68,7 +68,8 @@ skill_points = 22 alt_titles = list( - "Paramedic" = /singleton/hierarchy/outfit/job/sierra/crew/medical/doctor/paramedic + "Paramedic" = /singleton/hierarchy/outfit/job/sierra/crew/medical/doctor/paramedic, + "Medical Doctor" = /singleton/hierarchy/outfit/job/sierra/crew/medical/doctor ) outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/medical/doctor allowed_branches = list( @@ -165,6 +166,9 @@ total_positions = 1 spawn_positions = 1 selection_color = "#013d3b" + alt_titles = list( + "Pharmacist" = /singleton/hierarchy/outfit/job/sierra/crew/medical/doctor/chemist + ) outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/medical/doctor/chemist allowed_branches = list(/datum/mil_branch/employee, /datum/mil_branch/contractor) allowed_ranks = list(/datum/mil_rank/civ/nt, /datum/mil_rank/civ/contractor) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 4624f77dd2e9c..814512e01681b 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -46728,15 +46728,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/office) -"gRj" = ( -/obj/wallframe_spawn/reinforced/polarized/no_grille{ - id = "sierra_surgery1" - }, -/obj/machinery/door/firedoor{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/medical/surgery/second) "gRn" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/tiled/techfloor, @@ -306826,7 +306817,7 @@ nNj qYS eFv xtX -gRj +vbi eFv eFv obe