From d724dbb4eb814536aa786d019f62188686a5d919 Mon Sep 17 00:00:00 2001 From: retlaw34 <58402542+retlaw34@users.noreply.github.com> Date: Mon, 13 Nov 2023 08:43:28 -0800 Subject: [PATCH 1/4] Adds a metric fuckton of pAI faces (#2391) ## About The Pull Request Adds around 32 pAI faces ## Why It's Good For The Game ![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/e2cc0a39-796c-4038-bf01-bdfe280124dd) ## Changelog :cl: add: Adds a lot of new pAI faces! pAIs rejoice! /:cl: --- .../mob/living/silicon/pai/software.dm | 52 ++++++++++++++---- icons/obj/aicards.dmi | Bin 3095 -> 3907 bytes 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index cbcf7c6f2129..a099c05488fa 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -5,20 +5,52 @@ // - Camera jack GLOBAL_LIST_INIT(pai_faces, list( + ":>", + "=_=", + "angry", + "ashamed", + "bookworm", + "boykisser", + "cat", + "clueless", + "concerned", + "dread", + "estatic", + "exclaim", + "eye", + "eyewall", + "face", + "fangs", + "flushed", + "foureyes", + "greenjary", + "happy", + "heart", + "laugh", + "lenny", + "loss", + "michevious", + "missingno", + "mistake", + "moth", + "moyai", + "neko", "null", - "what", - "sad", + "o.o", "off", - "laugh", - "happy", - "face", - "estatic", - "cat", - "angry", + "pleading", + "question", + "sadcat", + "smug", + "snek", + "spiral", "sunglasses", + "syndisnake", //EVILLL PAI + "twoeyes", + "T_T", + "what", + "wink", "woozy", - "bookworm", - "greenjary", )) diff --git a/icons/obj/aicards.dmi b/icons/obj/aicards.dmi index f6847dfe2d7a0cee4f4a103d7c419fe52199fc27..5698962eb9fb0eb935a3cc6dd7fbaa3f9818b16a 100644 GIT binary patch delta 3706 zcmZWsc{J4B{~sAbcGrz0jQe=o=OFOd3b=IA=Ix@6hXo3MW9g*sGbH&VnLBO5ai~@-hid@ zuz3MAIE2yZ!)$Wg@ABOlF9ra>mUMmgU|F`1>##o{roTpRLm-E^(e_RumOl5r?)f1@ z{DOlZkkITL2fN^LOtL#YcPhT$&MR~L#=+YzfWArf_t zrb_2gX}$^B$#M>14tfaWgmscRd+W(S_se=%6^T@N_3g|Qlsv&nOl}~7c6V&Sq>3ZO zLyV{rLNDyzka(ptpVcW!h*9VGD!t|XUE#gAYkqYm*EqE2hEj_pSB-JNg1<44=Z6@7 z8Vk$3Y8Ee^iZr|y_OaP`+N+}GQdUju262e9(OLt0em(frwA|P6TsOr-!~A3xG_RLW zpye3iq-Hoh8d>Eel5;4HSVf8z0P)|_4-}pnKRzgWxi*0 zZoj?!{bc1~&)1IXXh*RzqRN_s%RSk__~qL2mGS{dXM?T9+jiX<`6WMZpSSzRZV4!l ziV#K`1HA<%5>I>dY4jb>zJNTN5wVLF<2<*VB6H^3#BMt2eIOyLJeV3gC<5FcqP<{g z(aa4_b%rf)IS9(*i*#_wdnPxpd;9-6LLX=cj7P&C?!Oteo*%Aey!+IAe?zV={d{+p zU=2S6awOT-(#$?Io0iRlj}M8qPlh@_@o^t|=_f<<$G^&(k9-!=qdIx%(+Qu~Ek_$O zeLBY?qe2)UFq!s4H*nststjne8d%>Xtx;PG?yr3RXzf_VoOVeRH180dc_O$lx|ny5 z=0b1>M>pe)iUJmzW(wQ^*-Cblj8O*@5xcl4P~=-&(j1d4z$9(%web&bZd?nC4G+Cj z#kSzmkQKF;D8w>O)w0J)3B7L(RVs1+7`&~hZ`@Cf3_90D-k6oLGsC5Zv^sB|8@Xu3Z1NSmu@BCc%Ok9muO)aEKrDMo}lh)z@-yVW>Q zB8hY6&@~M&$fpCZN{P?<>M&~E!n11K#ka%7v=GtC&(SXA2K}gTH@*Ti{gpjZF;r@{ z+=5I`T)p!WUFsgL6L8fFDH9hT%v;9(9gEvPchWzmC}7SD=NpqeFPUFfFw6=6&WF#f zgmEc66*T8kc=H*r`)KfwgYArF)>sXf|JhtShkni=^8=23aMuuK0wVxhCbiv{?xwqp zBOIsew%BdaxtVpW43@uC`C&S}!4Is^XML2quwls>EyNj=j6UDcGt;GkHGA}Qd>@<9 zoyNQ1($BV%S%KQSbQOT8!w8*ajaHFp4y)g)de-yT00U0i`SL^V zmvTp7KZp6SoI$U3Dv$|pFx?cE9{hDON{ay(!meYzzB&e_^=~yFw}(-!u}BV)4~u|R zQ8quYZUFxR9bVM6-qFkcFug}oEJWG-%!msR7nZm|oE3Rqh|#!8fX0e8Ha4DiKvs`l zh7+5mh24l-<$EJ!yYRI|W8BxFO(%f|JC{j_{ZklamGfPozB}<7%kgQ~d{=2?nyV_A z`vSM62&7V@(UK+)`+NY~%f0zTv1z-x0^sc1zX1EWG1L{=s3PG|r1n9bL9zNeW(HuOzLlKg z_u^Zim;OR?^Q(mFg|;~&wL*{9W5~jJ1WpnRX{&PHF~uIa1a)se7RbuUmTg%1v9Vts z_vHw#-jQC-B=<%t+c{RDo$vO3Um{W&FC<;3}i_A%mO_Wn1};;*I+uR7Lp zG$)Cx?uM=UXtL5`<|_}B3H+Zv4@7EHLtgI_ep(3VY`AskC-jA3w8uF~zT+p^(5%sj zpc#Wmx~V{#w6fqr(W4&dBFwax~ZdI-0>JY)mmwGa$%+9ml5?2S6mHO=NLp1SkK`oH83%;Pz2fyZp|JktSjv&fJS0 z_25FrL+}Wx%&7{q@iL+!^b)U%d7!cAjMiQF#o;*O(TnIZZrIbn)ilM!R>IBfUp1;S zFwo;}Fb_T@r$6g0VnL7Q4Qdg<*P_j=({{F|!ZAvMr9|y>7V^z=Qx&T|*9AgFGO1SQ z$lOrriAZRjLLswU9^_v3^3f*J{c`i}9r-8R|3$CD%c6|!==SRODj}Yc+uGYx$T}B? zwhk*-STF1dN1_5f8in{PPS`=VG?XiPA=D$QKzqmXr5#3#>B`DWW8!Cb?h_soY7OjU z$rED+d4!`5Cv(~CAsu>($#6psl*qHkH>w`-_sL&GRsq)pXE#51BDe)r4Q(-=X#as7 z6yLxYcbU?hJC!FYU9gd}0Q9uEy`0L7*Q5B#Kbl)r5qj5(&7|~I=VNbTL5lH8*Hew?xnz)?atB49#<ZH=vzs44rOtKvJbr2nUeINP%QhYce#+~UY4uv&kH#E4Bx;*ygmjfdF*t{^D!hw* zi~JGvWW5C7@mwi#IF!=Xt=L~Soh|Zg@}qwD%OFhZ2HwCJku-Qw6DGgE*=<-pQ-7yg zS15k1r0zoZvO}ooAzHvxjM7Q@oE<24%tN87q?kAZp#QX4YaJ2EAscj1`GTs~NE-~^ zZ%mPYN!sSYhwH-wRxWssg(`le3oZi9sGV)AF?Aaff|b_PHZ?UhY)NjO({FPQnB28{ zgeo8iO&&ryTb~bj=psei@_*#DzFza`;rqTKMQL9e*1@%=g4{Ga!7SBRDCz_96$e=X zQYsU>H;wAX#?{_gJ?4~|DcY$`K-E6T?s@dOls0r{L2HhECQ-3BONGT}T|=f!1TxEN zB3|#EM&ov%<$A90!1FvN?mhi``kT%h#&m9q!_Sqa-X}G0)ggF|`(S}AFntv+dzfupewzPY{fF|x{ZP=|# zs9@$V#`#VGxPX{z469+QEpV@n*=+I9%|)f5jyKCDliIcYhQe z4E&Y>Nd~;UbBY0N-iEYfR4d0s7gVS9kB* zT`$!HKOk`Q3@usBpq*LiL#j8aU6R-)rROl^2+RFbV>y#x!hUs{FGv`sJ(ygsL_hdc z&49lEYS(sHL(7pzS&lz&rG|OUH$*Fj?S2AQEazL41OB;WrKgwI0H2~SiT(d6`Tehh N*jm9X%gjA6{{<5*TEhSU delta 2888 zcmZuz2{e>#8y98F1kk) z0)dFz+E_S3AOdjy3xRIsGb&4GuJb#t8LC=hY8pCOxsQAUuI`jp$~Y@8b1uy?zd3SG z`;J!d?v9;1)%I&x+8ocoJ0ApFA+ucyV^UI%b9;lrS z?oI-CC4!)cNS1&A7T6&Ba$DRu?=P%-DR#DFG zp%%VZu_69fLj8j-Lm&|k^X{C$bReZ}Qpg&G;kkt>f=?9m%4O!`$Gj8OYrlL-rC*0) z(!|ZvNz!G@eu3Qa2pFuosEqq_LZ0CvF`*E!?@ltT2;gXo5Ikz`e(8>p72a$4_RC_5 z|6|KbRc6u!!K%Dnt!U)!Et= zw_*H`{y-zL!erJQ?1f1G>NnB zfM|i2cX z1{Z|mjcgUE#RsQoBA2xsRkbl1(utB6^Fh$lDD&Do*7wwk?C~o4I@ES?`q?nnYwIKp=AgJ@exaEJA(i<-Por1PUeK@w>P;qP51lO8Z_S_#l1~v z1FZES)l3dWG{-Tp72kiW=?ajx}$sy@#XA-uAhsj$lf5Se3cSI+L zEn>r)CQzO2hLKB4BOO*jic@bCn!}KhOGU))=SNH^QC}AkJiSK~>w`|sD3?`u9vp!3 zrz{?x7|{m%d)9qbCWUMGG^}zHHs@;P=WO}lAFF)G-Ute%Y(m=NI(Ed(+G%Am$D@f% zX^v>A>Op;4B^?On91dO!`uKgM`vv0TJ;B$>OY2@wBn#@1UZ!)xZEcRUU^|f?I&xIOA3B?R0oI?+%z4qB%xR@We6m9(o z5T037jN~aiS@ROAUGWl1*}x&;fci6vscUuh^If5nliK?7g#lnUZO@y&gu#MaO2r6u zid(crMM0~e^BV5sm96Ip#`_sAeGM&J^uM|^Y;|iAHD5k#l_+@Q2|SyZ_r$F)V6RMZ zAMt9X8`?iy=p0{qyIu4)J^vQs=nk3Uk3=2LLA@$TAPKQ9zt1ARM%0l3j0YN` z{y|Qz=-XUls#|&h*z<`3A6B1(Q`fILfD)a{eV$!DJXmoVYTN1}y!Ftt{A<*4HT%u= ztw^0vqt)?b5on#>=RQK+M?W~Dp=~IQr?Bm4DZzi9>k?4U=%|%Ls zM&p{#j&z+_zqO*>z~5xTs&jISoYm8^T}0^B`uArBJ6Tq-Iz+vUqq-)%TuTemSj-6k zQr@#TrrFx<^c=qJZAuE~-a7Loc?B&w@DnUHxqyGS7e8#Dj+-5YL#Kz{Z)kcoGmN?dW@uoSf9vbJc>F(=49FJV5n zw&%vQk|#F(d*noPwCgmFGH!Nrd3>hw?Bx}lqy0Gd^1U*9WE@QxP<1r9jESoV-dhbNIqDdd!LJ)%WyuESrvPGY@2B*Rx<21GA7zBq}wl z@4xkdUnMN3X3okfFXY?4PKEzM#4r5K{Eq*HFlBTI?>jpw?%()r0}E5; z-H)+AnXMcnM^pfT9P32T8b6yBxyC*A81MrVVjjo-n2d8kapoK}VGBwMV1F-PLh_}f zKC&AASP}Wb(b-6h#nTcpm)yajwKNqD>N)Rz@q)pB5!mb?(wV&~=hXkT;WleBG(HCr z8@XcRzrkKGKeeYKhQTDIl|4XI#8fiptBEcE;Da*!`>#J0GTNvV4-~JX)}D?X!jxqo zD!78QmncTo0CvN_JGQ;cA!f?t{qVcULe@(P7(zeYeKaPV{s@y}SU~{@Wx+i?@nvKx z<($0>7=EbS6czmSA~B)|Oq>X+1M zDFYXE>79mjAf+>6qd-6RWMia6bRGHAnaaDPMhVTIZ%d~!$1m42ScY_l9+vkRXpZh9 z#j=%Ig6NGDSTgHe^Dv>PKFT7Q#12~Z>ISEQRIc>*$_Gx-!Z<9w_jc^Y4*?@_zl|0N zp|83^M$+j6nTaHJ!j=%~!}WZlRK`${XCrCtCjqFhZj^8v5@SB5HooAHRct7`~esZ<<@tX7Je!Q?{5khve!oTRbkzyEhGOlKPmkfm-9) z8k~_GXxHpfzc5=vS+G+~lH(g2iAf5Lx`N{9FkyT744coalFS4Q6ypG4(RWX_haT{l mBK9jXc?zQlP#pcH7mSs89Ab8Q Date: Mon, 13 Nov 2023 10:46:12 -0600 Subject: [PATCH 2/4] Automatic changelog generation for PR #2391 [ci skip] --- html/changelogs/AutoChangeLog-pr-2391.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2391.yml diff --git a/html/changelogs/AutoChangeLog-pr-2391.yml b/html/changelogs/AutoChangeLog-pr-2391.yml new file mode 100644 index 000000000000..f98ee83005e0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2391.yml @@ -0,0 +1,4 @@ +author: retlaw34 +changes: + - {rscadd: Adds a lot of new pAI faces! pAIs rejoice!} +delete-after: true From 4bb948e1a998097a3a53e9f1e346a47a50afb021 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Mon, 13 Nov 2023 14:19:58 -0500 Subject: [PATCH 3/4] Syndicate-ing (#2221) ## About The Pull Request makes all syndicate outfits give their mob a bespoke syndicate faction Also removes the syndicate lavabase and a bunch of old ghost roles ## Why It's Good For The Game IFF (2028) and cruft removal ## Changelog :cl: del: the syndicate lavaland base has been removed. code: syndicate outfits have been repathed. Please report anything weird. /:cl: --------- Signed-off-by: Bjarl <94164348+Bjarl@users.noreply.github.com> Co-authored-by: meemofcourse <75212565+meemofcourse@users.noreply.github.com> --- _maps/RandomRuins/SpaceRuins/lab4071.dmm | 54 +- _maps/configs/syndicate_aegis.json | 14 +- .../configs/syndicate_cybersun_kansatsu.json | 12 +- _maps/configs/syndicate_gorlex_hyena.json | 10 +- _maps/configs/syndicate_gorlex_komodo.json | 14 +- _maps/configs/syndicate_lugol.json | 18 +- _maps/configs/syndicate_luxembourg.json | 8 +- _maps/configs/syndicate_twinkleshine.json | 16 +- code/__DEFINES/atmospherics.dm | 10 - code/__DEFINES/factions.dm | 6 + code/game/area/areas/ruins/lavaland.dm | 36 - code/game/machinery/airlock_control.dm | 4 - code/game/machinery/buttons.dm | 12 - code/game/machinery/doors/airlock_types.dm | 8 - code/game/machinery/doors/poddoor.dm | 7 - .../embedded_controller/airlock_controller.dm | 9 - code/game/machinery/igniter.dm | 3 - .../objects/structures/ghost_role_spawners.dm | 214 ----- .../components/binary_devices/dp_vent_pump.dm | 4 - code/modules/clothing/outfits/syndicate.dm | 825 ++++++++++++++++++ code/modules/clothing/outfits/vr.dm | 41 - code/modules/jobs/job_types/assistant.dm | 65 +- .../jobs/job_types/atmospheric_technician.dm | 8 - code/modules/jobs/job_types/bartender.dm | 37 +- code/modules/jobs/job_types/botanist.dm | 11 - code/modules/jobs/job_types/brig_physician.dm | 36 - code/modules/jobs/job_types/captain.dm | 65 -- .../jobs/job_types/cargo_technician.dm | 5 - code/modules/jobs/job_types/chemist.dm | 9 - code/modules/jobs/job_types/chief_engineer.dm | 29 - .../jobs/job_types/chief_medical_officer.dm | 8 - .../jobs/job_types/head_of_personnel.dm | 24 - .../jobs/job_types/head_of_security.dm | 10 - code/modules/jobs/job_types/medical_doctor.dm | 21 - code/modules/jobs/job_types/paramedic.dm | 16 - code/modules/jobs/job_types/prisoner.dm | 6 - code/modules/jobs/job_types/psychologist.dm | 10 - code/modules/jobs/job_types/quartermaster.dm | 10 - .../jobs/job_types/security_officer.dm | 44 - code/modules/jobs/job_types/shaft_miner.dm | 61 -- .../jobs/job_types/station_engineer.dm | 65 -- code/modules/jobs/job_types/warden.dm | 32 - .../ruins/lavalandruin_code/syndicate_base.dm | 4 +- shiptest.dme | 3 +- 44 files changed, 886 insertions(+), 1018 deletions(-) create mode 100644 code/__DEFINES/factions.dm create mode 100644 code/modules/clothing/outfits/syndicate.dm delete mode 100644 code/modules/clothing/outfits/vr.dm diff --git a/_maps/RandomRuins/SpaceRuins/lab4071.dmm b/_maps/RandomRuins/SpaceRuins/lab4071.dmm index 2f4c94d3c939..0e35f81af2f8 100644 --- a/_maps/RandomRuins/SpaceRuins/lab4071.dmm +++ b/_maps/RandomRuins/SpaceRuins/lab4071.dmm @@ -231,17 +231,6 @@ /turf/open/floor/plasteel/mono/white, /area/ruin/space/has_grav/crazylab/crew) "dO" = ( -/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{ - assignedrole = "Unlicensed Chemist"; - dir = 4; - flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options."; - id_job = "Unlicensed Chemist"; - important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim."; - mob_name = "unlicensed chemist"; - name = "Unlicensed Chemist"; - outfit = /datum/outfit/job/chemist/juniorchemist; - short_desc = "You are a chemist in an illegal laboratory." - }, /obj/machinery/button/door{ id = 64; name = "Dorm Shutters"; @@ -254,34 +243,6 @@ /obj/structure/bookcase/random/reference, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/crazylab/crew) -"eh" = ( -/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{ - assignedrole = "Unlicensed Chemist"; - dir = 4; - flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options."; - id_job = "Unlicensed Chemist"; - important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim."; - mob_name = "unlicensed chemist"; - name = "Unlicensed Chemist"; - outfit = /datum/outfit/job/chemist/juniorchemist; - short_desc = "You are a chemist in an illegal laboratory." - }, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/has_grav/crazylab/crew) -"et" = ( -/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{ - assignedrole = "Unlicensed Chemist"; - dir = 8; - flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options."; - id_job = "Unlicensed Chemist"; - important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim."; - mob_name = "unlicensed chemist"; - name = "Unlicensed Chemist"; - outfit = /datum/outfit/job/chemist/juniorchemist; - short_desc = "You are a chemist in an illegal laboratory." - }, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/has_grav/crazylab/crew) "eA" = ( /obj/structure/bookcase/random/nonfiction, /turf/open/floor/plasteel/grimy, @@ -570,17 +531,6 @@ /area/ruin/space/has_grav/crazylab/crew) "jL" = ( /obj/machinery/light/directional/south, -/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{ - assignedrole = "Unlicensed Chemist"; - dir = 4; - flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options."; - id_job = "Unlicensed Chemist"; - important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim."; - mob_name = "unlicensed chemist"; - name = "Unlicensed Chemist"; - outfit = /datum/outfit/job/chemist/juniorchemist; - short_desc = "You are a chemist in an illegal laboratory." - }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/crazylab/crew) "jO" = ( @@ -4957,7 +4907,7 @@ GV GV ao cq -eh +gP gV jG lN @@ -4995,7 +4945,7 @@ GV GV ao cq -et +gP hf jO lS diff --git a/_maps/configs/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json index 50d7dea915e7..9dc307f7f091 100644 --- a/_maps/configs/syndicate_aegis.json +++ b/_maps/configs/syndicate_aegis.json @@ -18,38 +18,38 @@ ], "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/captain/syndicate", + "outfit": "/datum/outfit/job/syndicate/captain", "officer": true, "slots": 1 }, "Lead Doctor": { - "outfit": "/datum/outfit/job/cmo/syndicate/nsv", + "outfit": "/datum/outfit/job/syndicate/cmo/suns", "slots": 1 }, "Ship Doctor":{ - "outfit": "/datum/outfit/job/doctor/syndicate/nsv", + "outfit": "/datum/outfit/job/syndicate/doctor/suns", "slots": 2 }, "Mechanic": { - "outfit": "/datum/outfit/job/engineer/syndicate", + "outfit": "/datum/outfit/job/syndicate/engineer", "slots": 1 }, "Deck Service Assistant": { - "outfit": "/datum/outfit/job/botanist/syndicate/nsv", + "outfit": "/datum/outfit/job/syndicate/botanist/suns", "slots": 2 }, "Ship Psychologist": { - "outfit": "/datum/outfit/job/psychologist/syndicate/nsv", + "outfit": "/datum/outfit/job/syndicate/psychologist/suns", "slots": 1 }, "Long Term Patient": { - "outfit": "/datum/outfit/job/prisoner/syndicatepatient", + "outfit": "/datum/outfit/job/syndicate/patient", "slots": 2 } }, diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index 8696db8e0359..fbde6dc608d6 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -15,26 +15,26 @@ "map_path": "_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm", "map_id": "cybersun_kansatsu", "job_slots": { - "Captain": { - "outfit": "/datum/outfit/job/captain/syndicate/cybersun", + "Commander": { + "outfit": "/datum/outfit/job/syndicate/captain/cybersun", "officer": true, "slots": 1 }, "Intelligence Officer": { - "outfit": "/datum/outfit/job/head_of_personnel/syndicate/intel", + "outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun", "officer": true, "slots": 1 }, "Engineer": { - "outfit": "/datum/outfit/job/engineer/syndicate/cybersun", + "outfit": "/datum/outfit/job/syndicate/engineer/cybersun", "slots": 1 }, "Field Agent": { - "outfit": "/datum/outfit/job/miner/syndicate/cybersun", + "outfit": "/datum/outfit/job/syndicate/miner/cybersun", "slots": 2 }, "Junior Agent": { - "outfit": "/datum/outfit/job/assistant/syndicate/cyberagent", + "outfit": "/datum/outfit/job/syndicate/assistant/cybersun", "slots": 2 } }, diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json index 6e1fa6ae92ce..4e9086139275 100644 --- a/_maps/configs/syndicate_gorlex_hyena.json +++ b/_maps/configs/syndicate_gorlex_hyena.json @@ -18,25 +18,25 @@ "map_path": "_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm", "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/captain/syndicate/gorlex", + "outfit": "/datum/outfit/job/syndicate/captain/gorlex", "officer": true, "slots": 1 }, "Foreman": { - "outfit": "/datum/outfit/job/ce/syndicate/gorlex", + "outfit": "/datum/outfit/job/syndicate/ce/gorlex", "officer": true, "slots": 1 }, "Mechanic": { - "outfit": "/datum/outfit/job/engineer/syndicate/gorlex", + "outfit": "/datum/outfit/job/syndicate/engineer/gorlex", "slots": 1 }, "Wrecker": { - "outfit": "/datum/outfit/job/miner/syndicate/gorlex", + "outfit": "/datum/outfit/job/syndicate/miner/gorlex", "slots": 2 }, "Junior Agent": { - "outfit": "/datum/outfit/job/assistant/syndicate/gorlex", + "outfit": "/datum/outfit/job/syndicate/assistant/gorlex", "slots": 2 } }, diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json index da4b9e58a795..5692eaf44a14 100644 --- a/_maps/configs/syndicate_gorlex_komodo.json +++ b/_maps/configs/syndicate_gorlex_komodo.json @@ -19,33 +19,33 @@ "limit": 1, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/captain/syndicate/gorlex", + "outfit": "/datum/outfit/job/syndicate/captain/gorlex", "officer": true, "slots": 1 }, "Sergeant": { - "outfit": "/datum/outfit/job/hos/syndicate", + "outfit": "/datum/outfit/job/syndicate/hos/gorlex", "officer": true, "slots": 1 }, "Medic": { - "outfit": "/datum/outfit/job/doctor/syndicate_komodo", + "outfit": "/datum/outfit/job/syndicate/doctor/gorlex", "slots": 1 }, "Mechanic": { - "outfit": "/datum/outfit/job/engineer/syndicate/gorlex", + "outfit": "/datum/outfit/job/syndicate/miner/gorlex", "slots": 1 }, "Trooper": { - "outfit": "/datum/outfit/job/security/syndicate/gorlex", + "outfit": "/datum/outfit/job/syndicate/security/gorlex", "slots": 3 }, "Deck assistant": { - "outfit": "/datum/outfit/job/assistant/syndicate/gorlex", + "outfit": "/datum/outfit/job/syndicate/assistant/gorlex", "slots": 2 }, "Bridge officer": { - "outfit": "/datum/outfit/job/head_of_personnel/syndicate", + "outfit": "/datum/outfit/job/syndicate/head_of_personnel", "slots": 1 } }, diff --git a/_maps/configs/syndicate_lugol.json b/_maps/configs/syndicate_lugol.json index 268769618857..26599d93a8ee 100644 --- a/_maps/configs/syndicate_lugol.json +++ b/_maps/configs/syndicate_lugol.json @@ -17,28 +17,28 @@ "limit": 2, "job_slots": { "Project Overseer": { - "outfit": "/datum/outfit/job/ce/gec", + "outfit": "/datum/outfit/job/syndicate/ce/gec", "slots": 1, "officer": true }, - "GEC Engineer": { - "outfit": "/datum/outfit/job/engineer/gec", + "GEC Engineering": { + "outfit": "/datum/outfit/job/syndicate/engineer/gec", "slots": 3 }, - "Atmospheric Technician": { - "outfit": "/datum/outfit/job/atmos/gec", + "GEC Atmospherics": { + "outfit": "/datum/outfit/job/syndicate/atmos/gec", "slots": 3 }, "Beverage Specialist": { - "outfit": "/datum/outfit/job/bartender/syndicate", + "outfit": "/datum/outfit/job/syndicate/bartender", "slots": 1 }, - "Shaft Miner": { - "outfit": "/datum/outfit/job/miner/syndicate/gec", + "GEC Miner": { + "outfit": "/datum/outfit/job/syndicate/miner/gec", "slots": 1 }, "GEC Apprentice": { - "outfit": "/datum/outfit/job/assistant/syndicate/gec", + "outfit": "/datum/outfit/job/syndicate/assistant/gec", "slots": 2 } }, diff --git a/_maps/configs/syndicate_luxembourg.json b/_maps/configs/syndicate_luxembourg.json index d34f20183fae..1433f2da547a 100644 --- a/_maps/configs/syndicate_luxembourg.json +++ b/_maps/configs/syndicate_luxembourg.json @@ -18,19 +18,19 @@ "starting_funds": 6000, "job_slots": { "Manager": { - "outfit": "/datum/outfit/job/quartermaster/donk", + "outfit": "/datum/outfit/job/syndicate/quartermaster/donk", "slots": 1 }, "Customer Service Representative": { - "outfit": "/datum/outfit/job/cargo_tech/donk", + "outfit": "/datum/outfit/job/syndicate/cargo_tech/donk", "slots": 5 }, "Food and Beverage Specialist": { - "outfit": "/datum/outfit/job/bartender/syndicate", + "outfit": "/datum/outfit/job/syndicate/bartender", "slots": 1 }, "GEC Contracted Engineer": { - "outfit": "/datum/outfit/job/engineer/gec", + "outfit": "/datum/outfit/job/syndicate/engineer/gec", "slots": 1 } }, diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index 2c7a57e1bd66..e5765b1691dd 100644 --- a/_maps/configs/syndicate_twinkleshine.json +++ b/_maps/configs/syndicate_twinkleshine.json @@ -18,37 +18,37 @@ "map_path": "_maps/shuttles/syndicate/syndicate_twinkleshine.dmm", "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/captain/syndicate/sbc", + "outfit": "/datum/outfit/job/syndicate/captain/twink", "officer": true, "slots": 1 }, "Lieutenant": { - "outfit": "/datum/outfit/job/warden/syndicate/sbc", + "outfit": "/datum/outfit/job/syndicate/hos/twink", "officer": true, "slots": 1 }, "Medic": { - "outfit": "/datum/outfit/job/brig_phys/syndicate/sbc", + "outfit": "/datum/outfit/job/syndicate/paramedic/twink", "slots": 2 }, "Engineer": { - "outfit": "/datum/outfit/job/engineer/syndicate/sbc", + "outfit": "/datum/outfit/job/syndicate/engineer/twink", "slots": 2 }, "Operative": { - "outfit": "/datum/outfit/job/security/syndicate/sbc", + "outfit": "/datum/outfit/job/syndicate/security/twink", "slots": 5 }, "Bartender": { - "outfit": "/datum/outfit/job/bartender/syndicate/sbc", + "outfit": "/datum/outfit/job/syndicate/bartender/twink", "slots": 1 }, "Miner": { - "outfit": "/datum/outfit/job/miner/syndicate/sbc", + "outfit": "/datum/outfit/job/syndicate/miner/twink", "slots": 1 }, "Deck Assistant": { - "outfit": "/datum/outfit/job/assistant/syndicate/sbc", + "outfit": "/datum/outfit/job/syndicate/assistant/twink", "slots": 2 } }, diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 02a85927c142..4600cb626da0 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -292,16 +292,6 @@ #define INCINERATOR_ATMOS_AIRLOCK_INTERIOR "atmos_incinerator_airlock_interior" #define INCINERATOR_ATMOS_AIRLOCK_EXTERIOR "atmos_incinerator_airlock_exterior" -//Syndicate lavaland base incinerator (lavaland_surface_syndicate_base1.dmm) -#define INCINERATOR_SYNDICATELAVA_IGNITER "syndicatelava_igniter" -#define INCINERATOR_SYNDICATELAVA_MAINVENT "syndicatelava_mainvent" -#define INCINERATOR_SYNDICATELAVA_AUXVENT "syndicatelava_auxvent" -#define INCINERATOR_SYNDICATELAVA_DP_VENTPUMP "syndicatelava_airlock_pump" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR "syndicatelava_airlock_sensor" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER "syndicatelava_airlock_controller" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR "syndicatelava_airlock_interior" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR "syndicatelava_airlock_exterior" - //MULTIPIPES //IF YOU EVER CHANGE THESE CHANGE SPRITES TO MATCH. #define PIPING_LAYER_MIN 1 diff --git a/code/__DEFINES/factions.dm b/code/__DEFINES/factions.dm new file mode 100644 index 000000000000..a6fbc5c87546 --- /dev/null +++ b/code/__DEFINES/factions.dm @@ -0,0 +1,6 @@ +//"Antag" factions +// anything with these factions should be hostile to the average player. +#define FACTION_ANTAG_SYNDICATE "Syndicate" + +//Player Factions +#define FACTION_PLAYER_SYNDICATE "playerSyndicate" diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index 645d98fc8f58..e9dc0b9fda0a 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -60,42 +60,6 @@ name = "Cult Altar" ambientsounds = SPOOKY -//Syndicate lavaland base - -/area/ruin/unpowered/syndicate_lava_base/engineering - name = "Syndicate Lavaland Engineering" - -/area/ruin/unpowered/syndicate_lava_base/medbay - name = "Syndicate Lavaland Medbay" - -/area/ruin/unpowered/syndicate_lava_base/arrivals - name = "Syndicate Lavaland Arrivals" - -/area/ruin/unpowered/syndicate_lava_base/bar - name = "Syndicate Lavaland Bar" - -/area/ruin/unpowered/syndicate_lava_base/main - name = "Syndicate Lavaland Primary Hallway" - area_flags = HIDDEN_AREA | BLOBS_ALLOWED | UNIQUE_AREA // WS edit - Fix various startup runtimes - -/area/ruin/unpowered/syndicate_lava_base/cargo - name = "Syndicate Lavaland Cargo Bay" - -/area/ruin/unpowered/syndicate_lava_base/chemistry - name = "Syndicate Lavaland Chemistry" - -/area/ruin/unpowered/syndicate_lava_base/virology - name = "Syndicate Lavaland Virology" - -/area/ruin/unpowered/syndicate_lava_base/testlab - name = "Syndicate Lavaland Experimentation Lab" - -/area/ruin/unpowered/syndicate_lava_base/dormitories - name = "Syndicate Lavaland Dormitories" - -/area/ruin/unpowered/syndicate_lava_base/telecomms - name = "Syndicate Lavaland Telecommunications" - //Xeno Nest /area/ruin/unpowered/xenonest diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 9a3f470fe99d..67d1e1f4a07f 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -110,10 +110,6 @@ id_tag = INCINERATOR_ATMOS_AIRLOCK_SENSOR master_tag = INCINERATOR_ATMOS_AIRLOCK_CONTROLLER -/obj/machinery/airlock_sensor/incinerator_syndicatelava - id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR - master_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER - /obj/machinery/airlock_sensor/update_icon_state() if(!on) icon_state = "[base_icon_state]_off" diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index efaa9454d307..1a89a2b011cc 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -220,15 +220,6 @@ id = INCINERATOR_ATMOS_AUXVENT req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) -/obj/machinery/button/door/incinerator_vent_syndicatelava_main - name = "turbine vent control" - id = INCINERATOR_SYNDICATELAVA_MAINVENT - req_access = list(ACCESS_SYNDICATE) - -/obj/machinery/button/door/incinerator_vent_syndicatelava_aux - name = "Combustion Chamber Vent control" - id = INCINERATOR_SYNDICATELAVA_AUXVENT - req_access = list(ACCESS_SYNDICATE) /obj/machinery/button/massdriver name = "mass driver button" @@ -260,9 +251,6 @@ /obj/machinery/button/ignition/incinerator/atmos id = INCINERATOR_ATMOS_IGNITER -/obj/machinery/button/ignition/incinerator/syndicatelava - id = INCINERATOR_SYNDICATELAVA_IGNITER - /obj/machinery/button/flasher name = "flasher button" desc = "A remote control switch for a mounted flasher." diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 92fb368bdc19..8e0ed982b501 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -83,14 +83,6 @@ req_access = list(ACCESS_SYNDICATE) has_hatch = FALSE -/obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior - name = "Turbine Interior Airlock" - id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR - -/obj/machinery/door/airlock/glass/incinerator/syndicatelava_exterior - name = "Turbine Exterior Airlock" - id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR - /obj/machinery/door/airlock/command/glass opacity = FALSE glass = TRUE diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 95410818cbcb..4e846c26f14a 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -106,13 +106,6 @@ name = "Combustion Chamber Vent" id = INCINERATOR_ATMOS_AUXVENT -/obj/machinery/door/poddoor/incinerator_syndicatelava_main - name = "turbine vent" - id = INCINERATOR_SYNDICATELAVA_MAINVENT - -/obj/machinery/door/poddoor/incinerator_syndicatelava_aux - name = "Combustion Chamber Vent" - id = INCINERATOR_SYNDICATELAVA_AUXVENT /obj/machinery/door/poddoor/Bumped(atom/movable/AM) if(density) diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index a4de8908abfe..c0938bc2bdb9 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -230,15 +230,6 @@ sanitize_external = TRUE sensor_tag = INCINERATOR_ATMOS_AIRLOCK_SENSOR -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_syndicatelava - name = "Incinerator Access Console" - airpump_tag = INCINERATOR_SYNDICATELAVA_DP_VENTPUMP - exterior_door_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR - id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER - interior_door_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR - sanitize_external = TRUE - sensor_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR - /obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload) . = ..() if(!mapload) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index a610ec5d11b8..8117ad2c251a 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -20,9 +20,6 @@ /obj/machinery/igniter/incinerator_atmos id = INCINERATOR_ATMOS_IGNITER -/obj/machinery/igniter/incinerator_syndicatelava - id = INCINERATOR_SYNDICATELAVA_IGNITER - /obj/machinery/igniter/on on = TRUE icon_state = "igniter1" diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index fec2c2f121ae..727187aa14df 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -356,54 +356,6 @@ new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src)) return ..() -//Space Hotel Staff -/obj/effect/mob_spawn/human/hotel_staff //not free antag u little shits - name = "staff sleeper" - desc = "A sleeper designed for long-term stasis between guest visits." - mob_name = "hotel staff member" - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper_s" - objectives = "Cater to visiting guests with your fellow staff. Do not leave your assigned hotel and always remember: The customer is always right!" - death = FALSE - roundstart = FALSE - random = TRUE - outfit = /datum/outfit/hotelstaff - short_desc = "You are a staff member of a top-of-the-line space hotel!" - flavour_text = "You are a staff member of a top-of-the-line space hotel! Cater to guests and make sure the manager doesn't fire you." - important_info = "DON'T leave the hotel" - assignedrole = "Hotel Staff" - -/datum/outfit/hotelstaff - name = "Hotel Staff" - uniform = /obj/item/clothing/under/misc/assistantformal - shoes = /obj/item/clothing/shoes/laceup - r_pocket = /obj/item/radio/off - back = /obj/item/storage/backpack - implants = list(/obj/item/implant/mindshield) - -/obj/effect/mob_spawn/human/hotel_staff/security - name = "hotel security sleeper" - mob_name = "hotel security member" - outfit = /datum/outfit/hotelstaff/security - short_desc = "You are a peacekeeper." - flavour_text = "You have been assigned to this hotel to protect the interests of the company while keeping the peace between \ - guests and the staff." - important_info = "Do NOT leave the hotel, as that is grounds for contract termination." - objectives = "Do not leave your assigned hotel. Try and keep the peace between staff and guests, non-lethal force heavily advised if possible." - -/datum/outfit/hotelstaff/security - name = "Hotel Security" - uniform = /obj/item/clothing/under/rank/security/officer/blueshirt - shoes = /obj/item/clothing/shoes/jackboots - suit = /obj/item/clothing/suit/armor/vest/blueshirt - head = /obj/item/clothing/head/helmet/blueshirt - back = /obj/item/storage/backpack/security - belt = /obj/item/storage/belt/security/full - -/obj/effect/mob_spawn/human/hotel_staff/Destroy() - new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src)) - return ..() - /obj/effect/mob_spawn/human/demonic_friend name = "Essence of friendship" desc = "Oh boy! Oh boy! A friend!" @@ -475,121 +427,6 @@ implants = list(/obj/item/implant/weapons_auth) id = /obj/item/card/id/syndicate -/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H) - H.faction |= ROLE_SYNDICATE - -//shiptest edit start, adding egors updated starfury roles, this should theoritacly not fuck with shit since this code is unused anyways -/obj/effect/mob_spawn/human/syndicate/battlecruiser - name = "Syndicate Battlecruiser Ship Operative" - short_desc = "You are a crewmember aboard the Syndicate flagship Starfury." - flavour_text = "Your job is to follow your higher-ranking operatives' orders, assisting in pretty much anything that might need your help." - important_info = "While you don't have a strict role, you are supposed to obey orders given by anyone on the ship, including medical, engineering and assault operatives." - outfit = /datum/outfit/syndicate_empty/sbc - assignedrole = "Battlecruiser Operative" - mob_name = "syndicate operative" - id_job = "Syndicate Operative" - random = TRUE - roundstart = FALSE - death = FALSE - anchored = TRUE - density = FALSE - -/datum/outfit/syndicate_empty/sbc - name = "Syndicate Battlecruiser Ship Deck Assistant" - uniform = /obj/item/clothing/under/syndicate/aclfgrunt - gloves = /obj/item/clothing/gloves/combat - l_pocket = /obj/item/gun/ballistic/automatic/pistol - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault - id = /obj/item/card/id/syndicate_command/crew_id - backpack_contents = list(/obj/item/storage/box/survival/syndie=1) - -/obj/effect/mob_spawn/human/syndicate/battlecruiser/engineering - name = "Syndicate Battlecruiser Ship Engineer" - short_desc = "You are an engineer aboard the Syndicate flagship Starfury." - flavour_text = "Your job is to maintain the ship, and keep the engine running. If you are unfamiliar with how the supermatter engine functions, do not attempt to start it alone; ask a fellow crewman for help." - important_info = "While your role means you can help in the assault with your tools, you must first and foremost keep the cruiser and engine in a working state." - outfit = /datum/outfit/syndicate_empty/sbc/engi - assignedrole = "Battlecruiser Engineer" - mob_name = "syndicate engineer" - id_job = "Syndicate Engineer" - -/datum/outfit/syndicate_empty/sbc/engi - name = "Syndicate Battlecruiser Ship Engineer" - glasses = /obj/item/clothing/glasses/meson/night - uniform = /obj/item/clothing/under/syndicate/gorlex - r_pocket = /obj/item/analyzer - belt = /obj/item/storage/belt/utility/syndicate - back = /obj/item/storage/backpack/industrial - backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/construction/rcd/combat, /obj/item/rcd_ammo/large) - -/obj/effect/mob_spawn/human/syndicate/battlecruiser/medical - name = "Syndicate Battlecruiser Ship Medical Doctor" - short_desc = "You are a medical doctor aboard the Syndicate flagship: the SBC Starfury." - flavour_text = "Your job is to maintain the crew's physical health and keep your comrades alive at all cost." - important_info = "The armory has nothing to help you with your job, and your role is to assist assault operatives, not to do their work for them." - outfit = /datum/outfit/syndicate_empty/sbc/med - assignedrole = "Battlecruiser Medical Doctor" - mob_name = "syndicate medic" - id_job = "Syndicate Medical Doctor" - -/datum/outfit/syndicate_empty/sbc/med - name = "Syndicate Battlecruiser Ship Medical Doctor" - gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil - glasses = /obj/item/clothing/glasses/hud/health - belt = /obj/item/pda/medical - back = /obj/item/storage/backpack/duffelbag/syndie/med - backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical) - -/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault - name = "Syndicate Battlecruiser Assault Operative" - short_desc = "You are an assault operative aboard the syndicate flagship Starfury." - flavour_text = "Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13. There is an armory, multiple assault ships, and beam cannons to attack the station with." - important_info = "Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!" - outfit = /datum/outfit/syndicate_empty/sbc/operative - assignedrole = "Battlecruiser Assault Operative" - mob_name = "syndicate assault operative" - id_job = "Syndicate Assault Operative" - -/datum/outfit/syndicate_empty/sbc/operative - name = "Syndicate Battlecruiser Operative" - uniform = /obj/item/clothing/under/syndicate/camo - glasses = /obj/item/clothing/glasses/night - belt = /obj/item/storage/belt/military - back = /obj/item/storage/backpack/duffelbag/syndie - suit = /obj/item/clothing/suit/armor/vest - backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/gun_voucher/syndicate=1) - -/datum/outfit/syndicate_empty/sbc/lieutenant - name = "Syndicate Battlecruiser Lieutenant" - head = /obj/item/clothing/head/HoS/beret/syndicate - ears = /obj/item/radio/headset/syndicate/alt/leader - uniform = /obj/item/clothing/under/syndicate/combat - id = /obj/item/card/id/syndicate_command/lieutenant - backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/storage/box/survival/syndie=1) - -/obj/effect/mob_spawn/human/syndicate/battlecruiser/captain - name = "Syndicate Battlecruiser Captain" - short_desc = "You are the captain aboard the Syndicate flagship Starfury." - flavour_text = "Your job is to oversee your crew, defend the ship, and destroy Space Station 13. The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal." - important_info = "As the captain, this whole operation falls on your shoulders. You do not need to nuke the station, causing sufficient damage and preventing your ship from being destroyed will be enough." - outfit = /datum/outfit/syndicate_empty/sbc/captain - id_access_list = list(150,151) - id_job = "Syndicate Captain" - assignedrole = "Battlecruiser Captain" - mob_name = "syndicate captain" - -/datum/outfit/syndicate_empty/sbc/captain - name = "Syndicate Battlecruiser Captain" - l_pocket = /obj/item/melee/transforming/energy/sword/saber/red - ears = /obj/item/radio/headset/syndicate/alt/captain - uniform = /obj/item/clothing/under/syndicate/aclf - suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - suit_store = /obj/item/gun/ballistic/revolver/mateba - head = /obj/item/clothing/head/HoS/syndicate - mask = /obj/item/clothing/mask/cigarette/cigar/havana - glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch - id = /obj/item/card/id/syndicate_command/captain_id //Ancient cryogenic sleepers. Players become NT crewmen from a hundred year old space station, now on the verge of collapse. /obj/effect/mob_spawn/human/oldsec @@ -736,57 +573,6 @@ /obj/effect/mob_spawn/human/pirate/gunner rank = "Gunner" -//Forgotten syndicate ship - -/obj/effect/mob_spawn/human/syndicatespace - name = "Syndicate Ship Crew Member" - roundstart = FALSE - death = FALSE - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper_s" - short_desc = "You are a syndicate operative, awoken deep in hostile space." - flavour_text = "Your ship is part of the infamous \"sleeper\" doctrine of syndicate strike forces, who flung unpowered vessels with cryo-frozen crew deep into Nanotrasen territory, tasked to cause havoc and carry out covert reconnisance. The chill in your bones informs you that you've been asleep far longer than intended. Your vessel appears to be in a sorry state, and a tinny alarm pierces through your fugue to report unknown contacts aboard the vessel. It's going to be one of those days." - important_info = "Obey orders given by your captain. Prevent yourself and any syndicate assets from falling into enemy hands." - outfit = /datum/outfit/syndicatespace/syndicrew - assignedrole = "Cybersun Crewmember" - -/obj/effect/mob_spawn/human/syndicatespace/Initialize(mapload) - . = ..() - var/policy = get_policy(ROLE_SYNDICATE_CYBERSUN) - if(policy) - important_info = policy - -/datum/outfit/syndicatespace/syndicrew/post_equip(mob/living/carbon/human/H) - H.faction |= ROLE_SYNDICATE - -/obj/effect/mob_spawn/human/syndicatespace/special(mob/living/new_spawn) - new_spawn.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND) - -/obj/effect/mob_spawn/human/syndicatespace/captain - name = "Syndicate Ship Captain" - roundstart = FALSE - death = FALSE - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper_s" - short_desc = "You are the captain of a long-slumbering syndicate vessel, stuck deep in enemy territory." - flavour_text = "Your ship is part of the infamous \"sleeper\" doctrine of syndicate strike forces, who flung unpowered vessels with cryo-frozen crew deep into Nanotrasen territory, tasked to cause havoc and carry out covert reconnisance. The chill in your bones informs you that you've been asleep far longer than intended. Your vessel appears to be in a sorry state, and a tinny alarm pierces through your fugue to report unknown contacts aboard the vessel. It's going to be one of those days." - important_info = "Protect the ship and secret documents in your backpack with your own life. Secure the syndicate assets present at your covert landing site. Prevent them, your crew, and yourself from falling into corporate hands." - outfit = /datum/outfit/syndicatespace/syndicaptain - assignedrole = "Cybersun Captain" - -/obj/effect/mob_spawn/human/syndicatespace/syndicaptain/Initialize(mapload) - . = ..() - var/policy = get_policy(ROLE_SYNDICATE_CYBERSUN_CAPTAIN) - if(policy) - important_info = policy - -/datum/outfit/syndicatespace/syndicaptain/post_equip(mob/living/carbon/human/H) - H.faction |= ROLE_SYNDICATE - -/obj/effect/mob_spawn/human/syndicatespace/captain/Destroy() - new/obj/structure/fluff/empty_sleeper/syndicate/captain(get_turf(src)) - return ..() - /datum/outfit/syndicatespace/syndicrew name = "Syndicate Ship Crew Member" uniform = /obj/item/clothing/under/syndicate/combat diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm index 0f6520a2c622..1f7b18ead917 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm @@ -291,10 +291,6 @@ id_tag = INCINERATOR_ATMOS_DP_VENTPUMP frequency = FREQ_AIRLOCK_CONTROL -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_syndicatelava - id_tag = INCINERATOR_SYNDICATELAVA_DP_VENTPUMP - frequency = FREQ_AIRLOCK_CONTROL - /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2 piping_layer = 2 icon_state = "dpvent_map-2" diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm new file mode 100644 index 000000000000..1c6c257ae71c --- /dev/null +++ b/code/modules/clothing/outfits/syndicate.dm @@ -0,0 +1,825 @@ +//top outfit of everything syndicate. Don't change this. + +/datum/outfit/job/syndicate + name = "Syndicate (mostly) Empty" + + uniform = /obj/item/clothing/under/syndicate + box = /obj/item/storage/box/survival/syndie + id = /obj/item/card/id/syndicate_command/crew_id + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/syndie + courierbag = /obj/item/storage/backpack/messenger/sec + +/datum/outfit/job/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(visualsOnly) + return + H.faction |= list(FACTION_PLAYER_SYNDICATE) + +//generates a codename and assigns syndicate access, used in the twinkleshine. +/datum/outfit/job/syndicate/proc/assign_codename(mob/living/carbon/human/H) + var/obj/item/card/id/I = H.wear_id + I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(1, 12)) // squidquest real + I.access |= list(ACCESS_SYNDICATE) + I.update_label() + +//and now, for the Assistants + +/datum/outfit/job/syndicate/assistant + name = "Junior Agent (Assistant)" + jobtype = /datum/job/assistant + + uniform = /obj/item/clothing/under/syndicate/intern + alt_uniform = null + + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/color/black + ears = /obj/item/radio/headset + back = /obj/item/storage/backpack + + id = /obj/item/card/id/syndicate_command/crew_id + r_pocket = /obj/item/radio + belt = /obj/item/pda + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/syndie + courierbag = /obj/item/storage/backpack/messenger/sec + + box = /obj/item/storage/box/survival/syndie + +/datum/outfit/job/syndicate/assistant/gorlex + name = "Junior Agent (Gorlex Marauders)" + + uniform = /obj/item/clothing/under/syndicate/gorlex + alt_uniform = /obj/item/clothing/under/syndicate + +/datum/outfit/job/syndicate/assistant/gec + name = "Deckhand (GEC)" + + uniform = /obj/item/clothing/under/syndicate + suit = /obj/item/clothing/suit/toggle/hazard + + head = /obj/item/clothing/head/safety_helmet + +/datum/outfit/job/syndicate/assistant/cybersun + name = "Junior Agent (Cybersun)" + + uniform = /obj/item/clothing/under/syndicate + shoes = /obj/item/clothing/shoes/jackboots + r_pocket = /obj/item/radio + head = /obj/item/clothing/head/soft/black + +/datum/outfit/job/syndicate/assistant/twink + name = "Deck Assistant (Twinkleshine)" + + uniform = /obj/item/clothing/under/syndicate/intern + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/combat + ears = /obj/item/radio/headset/syndicate/alt + mask = /obj/item/clothing/mask/chameleon + r_pocket = /obj/item/kitchen/knife/combat/survival + back = /obj/item/storage/backpack + belt = /obj/item/storage/belt/military/assault + implants = list(/obj/item/implant/weapons_auth) + id = /obj/item/card/id/syndicate_command/crew_id + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/syndie + courierbag = /obj/item/storage/backpack/messenger/sec + + box = /obj/item/storage/box/survival/syndie + +/datum/outfit/job/syndicate/assistant/twink/post_equip(mob/living/carbon/human/H) + . = ..() + + assign_codename(H) + +//atmos techs + +//Shiptest +/datum/outfit/job/syndicate/atmos + name = "Atmospheric Technician (Syndicate)" + jobtype = /datum/job/atmos + + belt = /obj/item/storage/belt/utility/atmostech + + uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician + alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard + alt_suit = /obj/item/clothing/suit/hazardvest + dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering + + r_pocket = /obj/item/analyzer + l_pocket = /obj/item/pda/atmos + + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel/eng + duffelbag = /obj/item/storage/backpack/duffelbag/engineering + courierbag = /obj/item/storage/backpack/messenger/engi + + box = /obj/item/storage/box/survival/engineer + + pda_slot = ITEM_SLOT_LPOCKET + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) + +/datum/outfit/job/syndicate/atmos/gec + name = "Atmospheric Technician (GEC)" + + uniform = /obj/item/clothing/under/syndicate/gec/atmos_tech + suit = /obj/item/clothing/suit/toggle/hazard + head = /obj/item/clothing/head/hardhat + id = /obj/item/card/id/syndicate_command/crew_id + + +//bartenders + +/datum/outfit/job/syndicate/bartender + name = "Bartender (Syndicate)" + jobtype = /datum/job/bartender + + id = /obj/item/card/id/syndicate_command/crew_id + head = /obj/item/clothing/head/HoS/beret/syndicate + glasses = /obj/item/clothing/glasses/sunglasses/reagent + belt = /obj/item/pda/bar + uniform = /obj/item/clothing/under/rank/civilian/bartender + alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple + alt_suit = /obj/item/clothing/suit/apron/purple_bartender + suit = /obj/item/clothing/suit/armor/vest + backpack_contents = list(/obj/item/storage/box/beanbag=1) + shoes = /obj/item/clothing/shoes/laceup + + +/datum/outfit/job/syndicate/bartender/post_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + + var/obj/item/card/id/W = H.wear_id + if(H.age < AGE_MINOR) + W.registered_age = AGE_MINOR + to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!") + + +/datum/outfit/job/syndicate/bartender/twink + name = "Bartender (Twinkleshine)" + + uniform = /obj/item/clothing/under/syndicate/donk + shoes = /obj/item/clothing/shoes/laceup + gloves = /obj/item/clothing/gloves/color/white + ears = /obj/item/radio/headset/syndicate + mask = /obj/item/clothing/mask/chameleon + belt = /obj/item/storage/belt/bandolier + implants = list(/obj/item/implant/weapons_auth) + id = /obj/item/card/id/syndicate_command/crew_id + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/syndie + courierbag = /obj/item/storage/backpack/messenger/sec + + box = /obj/item/storage/box/survival/syndie + +/datum/outfit/job/syndicate/bartender/twink/post_equip(mob/living/carbon/human/H) + . = ..() + assign_codename(H) + +//botanist +/datum/outfit/job/syndicate/botanist + name = "Botanist (Syndicate)" + jobtype = /datum/job/hydro + belt = /obj/item/pda/botanist + suit = /obj/item/clothing/suit/apron + alt_suit = /obj/item/clothing/suit/apron/overalls + gloves =/obj/item/clothing/gloves/botanic_leather + suit_store = /obj/item/plant_analyzer + +/datum/outfit/job/syndicate/botanist/suns + name = "Botanist-Chemist (SUNS)" + + id = /obj/item/card/id/syndicate_command/crew_id + shoes = /obj/item/clothing/shoes/jackboots + glasses = /obj/item/clothing/glasses/science + suit = /obj/item/clothing/suit/toggle/labcoat/chemist + suit_store = null + +//Capitan (Captain) + +/datum/outfit/job/syndicate/captain + name = "Captain (Syndicate)" + jobtype = /datum/job/captain + + id = /obj/item/card/id/syndicate_command/captain_id + ears = /obj/item/radio/headset/syndicate/alt/captain + uniform = /obj/item/clothing/under/syndicate/aclf + shoes = /obj/item/clothing/shoes/jackboots + head = /obj/item/clothing/head/HoS/syndicate + gloves = /obj/item/clothing/gloves/combat + suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/pda/captain) + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/sec + courierbag = /obj/item/storage/backpack/messenger/sec + + box = /obj/item/storage/box/survival/syndie + +/datum/outfit/job/syndicate/captain/aclf + name = "Captain (ACLF)" + + +/datum/outfit/job/syndicate/captain/twink + name = "Captain (Twinkleshine)" + + uniform = /obj/item/clothing/under/syndicate/aclf + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/combat + ears = /obj/item/radio/headset/syndicate/alt/captain + mask = /obj/item/clothing/mask/chameleon + l_pocket = /obj/item/melee/transforming/energy/sword/saber/red + suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate + suit_store = /obj/item/gun/ballistic/revolver/mateba + r_pocket = /obj/item/kitchen/knife/combat/survival + belt = /obj/item/storage/belt/military/assault + glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch + implants = list(/obj/item/implant/weapons_auth) + + +/datum/outfit/job/syndicate/captain/sbc/post_equip(mob/living/carbon/human/H) + . = ..() + assign_codename(H) + + +/datum/outfit/job/syndicate/captain/gorlex + name = "Captain (Gorlex Marauders)" + uniform = /obj/item/clothing/under/syndicate/aclf + + head = /obj/item/clothing/head/aclfcap + suit = /obj/item/clothing/suit/aclf + +/datum/outfit/job/syndicate/captain/cybersun + name = "Captain (Cybersun)" + + uniform = /obj/item/clothing/under/suit/black_really + head = /obj/item/clothing/head/HoS/syndicate + gloves = /obj/item/clothing/gloves/combat + suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate + + +//cargo tech + +/datum/outfit/job/syndicate/cargo_tech + name = "Cargo Tech (Syndicate)" + jobtype = /datum/job/cargo_tech + + id = /obj/item/card/id/syndicate_command/crew_id + uniform = /obj/item/clothing/under/syndicate/donk + suit = /obj/item/clothing/suit/hazardvest/donk + + belt = /obj/item/pda/cargo + alt_suit = /obj/item/clothing/suit/hazardvest + l_hand = /obj/item/export_scanner + backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) + + +/datum/outfit/job/syndicate/cargo_tech/donk + name = "Customer Associate (Donk! Co)" + +//chemist + +/datum/outfit/job/syndicate/chemist + name = "Chemist (Syndicate)" + jobtype = /datum/job/chemist + + uniform = /obj/item/clothing/under/syndicate/intern + id = /obj/item/card/id/syndicate_command/crew_id + l_pocket =/obj/item/pda/chemist + + glasses = /obj/item/clothing/glasses/science + belt = /obj/item/pda/chemist + shoes = /obj/item/clothing/shoes/sneakers/white + suit = /obj/item/clothing/suit/toggle/labcoat/chemist + + box = /obj/item/storage/box/survival/medical + +/datum/outfit/job/syndicate/chemist/gec + name = "Chemist (GEC)" + + uniform = /obj/item/clothing/under/syndicate/intern + suit = /obj/item/clothing/suit/toggle/hazard + head = /obj/item/clothing/head/hardhat + belt = /obj/item/storage/belt/utility/full/engi + id = /obj/item/card/id/syndicate_command/crew_id + l_pocket =/obj/item/pda/chemist + +//Chief Engineer + +/datum/outfit/job/syndicate/ce + name = "Chief Engineer (Syndicate)" + jobtype = /datum/job/chief_engineer + + id = /obj/item/card/id/syndicate_command/crew_id + ears = /obj/item/radio/headset/syndicate/alt + glasses = /obj/item/clothing/glasses/sunglasses + + belt = /obj/item/storage/belt/utility/chief/full + l_pocket = /obj/item/pda/heads/ce + uniform = /obj/item/clothing/under/rank/engineering/chief_engineer + shoes = /obj/item/clothing/shoes/sneakers/brown + head = /obj/item/clothing/head/hardhat/white + gloves = /obj/item/clothing/gloves/color/black + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1) + + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel/eng + duffelbag = /obj/item/storage/backpack/duffelbag/engineering + courierbag = /obj/item/storage/backpack/messenger/engi + box = /obj/item/storage/box/survival/engineer + pda_slot = ITEM_SLOT_LPOCKET + chameleon_extras = /obj/item/stamp/ce + + +/datum/outfit/job/syndicate/ce/gec + name = "Chief Engineer (GEC)" + + uniform = /obj/item/clothing/under/syndicate/gec/chief_engineer + suit = /obj/item/clothing/suit/toggle/hazard + head = /obj/item/clothing/head/hardhat/white + shoes =/obj/item/clothing/shoes/laceup + ears = /obj/item/radio/headset/syndicate/alt/captain + id = /obj/item/card/id/syndicate_command/captain_id + gloves = /obj/item/clothing/gloves/combat + +/datum/outfit/job/syndicate/ce/gorlex + name = "Foreman (Gorlex Marauders)" + + ears = /obj/item/radio/headset/syndicate/alt + uniform = /obj/item/clothing/under/syndicate/gorlex + alt_uniform = null + suit = /obj/item/clothing/suit/toggle/hazard + alt_suit = null + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/combat + +//Chief Medical Officer + +/datum/outfit/job/syndicate/cmo + name = "Chief Medical Officer (Syndicate)" + jobtype = /datum/job/cmo + + uniform = /obj/item/clothing/under/syndicate + ears = /obj/item/radio/headset/syndicate/alt/captain + id = /obj/item/card/id/syndicate_command/captain_id + shoes = /obj/item/clothing/shoes/jackboots + belt = /obj/item/pda/heads/cmo + l_pocket = /obj/item/pinpointer/crew + shoes = /obj/item/clothing/shoes/sneakers/brown + suit = /obj/item/clothing/suit/toggle/labcoat/cmo + l_hand = /obj/item/storage/firstaid/medical + suit_store = /obj/item/flashlight/pen + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) + +/datum/outfit/job/syndicate/cmo/suns + name = "Medical Director (SUNS)" + +//"Head Of Personnel" + +/datum/outfit/job/syndicate/head_of_personnel + name = "Bridge Officer (Syndicate)" + jobtype = /datum/job/head_of_personnel + + ears = /obj/item/radio/headset/syndicate/alt + uniform = /obj/item/clothing/under/syndicate/aclfgrunt + shoes = /obj/item/clothing/shoes/jackboots + head = /obj/item/clothing/head/HoS/beret/syndicate + gloves = /obj/item/clothing/gloves/color/white + id = /obj/item/card/id/syndicate_command/crew_id + r_pocket = /obj/item/kitchen/knife/combat/survival + glasses = /obj/item/clothing/glasses/hud/health + belt = /obj/item/pda/heads/head_of_personnel + backpack_contents = list(/obj/item/storage/box/ids=1,\ + /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) + +/datum/outfit/job/syndicate/head_of_personnel/cybersun + name = "Intelligence Officer (Cybersun)" + + ears = /obj/item/radio/headset/syndicate/alt + uniform = /obj/item/clothing/under/suit/charcoal + shoes = /obj/item/clothing/shoes/jackboots + head = /obj/item/clothing/head/HoS/syndicate + gloves = /obj/item/clothing/gloves/combat + id = /obj/item/card/id/syndicate_command/crew_id + r_pocket = /obj/item/kitchen/knife/combat/survival + glasses = /obj/item/clothing/glasses/sunglasses + +//head of security + +/datum/outfit/job/syndicate/hos + name = "Head Of Security (Syndicate)" + jobtype = /datum/job/hos + + ears = /obj/item/radio/headset/syndicate/alt + uniform = /obj/item/clothing/under/syndicate/combat + head = /obj/item/clothing/head/warden + suit = /obj/item/clothing/suit/armor/vest/syndie + id = /obj/item/card/id/syndicate_command/crew_id + belt = /obj/item/pda/heads/hos + shoes = /obj/item/clothing/shoes/jackboots + head = /obj/item/clothing/head/HoS + glasses = /obj/item/clothing/glasses/hud/security/sunglasses + suit_store = /obj/item/gun/energy/e_gun + r_pocket = /obj/item/assembly/flash/handheld + l_pocket = /obj/item/restraints/handcuffs + backpack_contents = list(/obj/item/melee/baton/loaded=1) + + backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/storage/box/survival/syndie=1) + +/datum/outfit/job/syndicate/hos/gorlex + name = "Sergeant (Syndicate)" + +/datum/outfit/job/syndicate/hos/twink + name = "Lieutenant (Twinkleshine)" + uniform = /obj/item/clothing/under/syndicate/aclf + head = /obj/item/clothing/head/HoS/beret/syndicate + ears = /obj/item/radio/headset/syndicate/alt + mask = /obj/item/clothing/mask/chameleon + gloves = /obj/item/clothing/gloves/combat + l_pocket = /obj/item/gun/ballistic/automatic/pistol + r_pocket = /obj/item/kitchen/knife/combat/survival + belt = /obj/item/storage/belt/military/assault + shoes = /obj/item/clothing/shoes/combat + suit = /obj/item/clothing/suit/armor/vest + alt_suit = /obj/item/clothing/suit/aclf + id = /obj/item/card/id/syndicate_command/lieutenant + implants = list(/obj/item/implant/weapons_auth) + backpack_contents = list(/obj/item/melee/baton) + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/syndie + courierbag = /obj/item/storage/backpack/messenger/sec + + box = /obj/item/storage/box/survival/syndie + +/datum/outfit/job/syndicate/hos/twink/post_equip(mob/living/carbon/human/H) + . = ..() + assign_codename(H) + +//medical doctors (assorted) + +/datum/outfit/job/syndicate/doctor + name = "Medical Doctor (Syndicate)" + jobtype = /datum/job/doctor + + uniform = /obj/item/clothing/under/syndicate + id = /obj/item/card/id/syndicate_command/crew_id + shoes = /obj/item/clothing/shoes/jackboots + belt = /obj/item/pda/medical + shoes = /obj/item/clothing/shoes/sneakers/white + suit = /obj/item/clothing/suit/toggle/labcoat + alt_suit = /obj/item/clothing/suit/apron/surgical + l_hand = /obj/item/storage/firstaid/medical + suit_store = /obj/item/flashlight/pen + +/datum/outfit/job/syndicate/doctor/suns + name = "Medical Doctor (SUNS)" + +/datum/outfit/job/syndicate/doctor/cybersun + name = "Medical Doctor (Cybersun)" + + uniform = /obj/item/clothing/under/syndicate/cybersun + accessory = /obj/item/clothing/accessory/armband/medblue + shoes = /obj/item/clothing/shoes/jackboots + +/datum/outfit/job/syndicate/doctor/gorlex + name = "Medical Doctor (Gorlex)" + + uniform = /obj/item/clothing/under/syndicate/gorlex + glasses = /obj/item/clothing/glasses/hud/health/prescription + r_pocket = /obj/item/kitchen/knife/combat/survival + back = /obj/item/storage/backpack/duffelbag/syndie/med + id = /obj/item/card/id/syndicate_command/crew_id + backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,) + +//paramedics + + +/datum/outfit/job/syndicate/paramedic + name = "Paramedic (Syndicate)" + jobtype = /datum/job/paramedic + + + id = /obj/item/card/id/syndicate_command/crew_id + uniform = /obj/item/clothing/under/syndicate/gorlex + alt_uniform = null + shoes = /obj/item/clothing/shoes/jackboots + + head = /obj/item/clothing/head/soft/paramedic + suit = /obj/item/clothing/suit/toggle/labcoat/paramedic + alt_suit = /obj/item/clothing/suit/apron/surgical + gloves = /obj/item/clothing/gloves/color/latex/nitrile + belt = /obj/item/storage/belt/medical/paramedic + id = /obj/item/card/id + l_pocket = /obj/item/pda/medical + suit_store = /obj/item/flashlight/pen + backpack_contents = list(/obj/item/roller=1) + pda_slot = ITEM_SLOT_LPOCKET + +/datum/outfit/job/syndicate/paramedic/gorlex + name = "Paramedic (Gorlex)" + +/datum/outfit/job/syndicate/paramedic/cybersun + name = "Field Medic (Cybersun Industries)" + + uniform = /obj/item/clothing/under/syndicate/medic + head = /obj/item/clothing/head/soft/cybersun + shoes = /obj/item/clothing/shoes/combat + suit = /obj/item/clothing/suit/toggle/labcoat/raincoat + +/datum/outfit/job/syndicate/paramedic/twink + name = "Medic (Twinkleshine)" + + gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil + alt_uniform = /obj/item/clothing/under/syndicate/cybersun + glasses = /obj/item/clothing/glasses/hud/health + belt = /obj/item/storage/belt/medical + back = /obj/item/storage/backpack/duffelbag/syndie/med + shoes = /obj/item/clothing/shoes/combat + suit = /obj/item/clothing/suit/longcoat/roboblack + alt_suit = /obj/item/clothing/suit/toggle/labcoat + suit_store = null + ears = /obj/item/radio/headset/syndicate + mask = /obj/item/clothing/mask/chameleon + id = /obj/item/card/id/syndicate_command/crew_id/med + implants = list(/obj/item/implant/weapons_auth) + backpack_contents = list(/obj/item/pda/brig_phys) + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med + courierbag = /obj/item/storage/backpack/messenger/sec + + box = /obj/item/storage/box/survival/syndie + +/datum/outfit/job/syndicate/paramedic/twink/post_equip(mob/living/carbon/human/H) + . = ..() + assign_codename(H) + +//psychologist + +/datum/outfit/job/syndicate/psychologist + name = "Psychologist (Syndicate)" + jobtype = /datum/job/psychologist + + id = /obj/item/card/id/syndicate_command/crew_id + uniform = /obj/item/clothing/under/rank/medical/psychiatrist + suit = /obj/item/clothing/suit/toggle/labcoat + shoes = /obj/item/clothing/shoes/laceup + alt_uniform = null + l_hand = /obj/item/clipboard + belt = /obj/item/pda/medical + pda_slot = ITEM_SLOT_BELT + +/datum/outfit/job/syndicate/psychologist/suns + name = "Ship Psychologist (SUNS)" + +//patient (prisoner) + +/datum/outfit/job/syndicate/patient + name = "Long Term Patient" + jobtype = /datum/job/prisoner + + id = /obj/item/card/id/patient + uniform = /obj/item/clothing/under/rank/medical/gown + alt_suit = null + shoes = /obj/item/clothing/shoes/sandal/slippers + +//Quartermaster + +/datum/outfit/job/syndicate/quartermaster + name = "Quartermaster (Syndicate)" + jobtype = /datum/job/qm + + id = /obj/item/card/id/syndicate_command/captain_id + + ears = /obj/item/radio/headset/syndicate/alt + uniform = /obj/item/clothing/under/syndicate/donk/qm + suit = /obj/item/clothing/suit/hazardvest/donk/qm + ears = /obj/item/radio/headset/syndicate/alt + shoes = /obj/item/clothing/shoes/laceup + belt = /obj/item/pda/quartermaster + glasses = /obj/item/clothing/glasses/sunglasses + l_hand = /obj/item/clipboard + backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) + +/datum/outfit/job/syndicate/quartermaster/donk + name = "Manager (Donk! Co.)" + id = /obj/item/card/id/syndicate_command/captain_id + + ears = /obj/item/radio/headset/syndicate/alt + uniform = /obj/item/clothing/under/syndicate/donk/qm + suit = /obj/item/clothing/suit/hazardvest/donk/qm + ears = /obj/item/radio/headset/syndicate/alt + shoes = /obj/item/clothing/shoes/laceup + +//security officers + +/datum/outfit/job/syndicate/security + name = "Operative (Syndicate)" + jobtype = /datum/job/officer + + + uniform = /obj/item/clothing/under/syndicate + r_pocket = /obj/item/kitchen/knife/combat/survival + belt = /obj/item/storage/belt/military + back = /obj/item/storage/backpack + suit = /obj/item/clothing/suit/armor/vest + id = /obj/item/card/id/syndicate_command/crew_id + + ears = /obj/item/radio/headset/alt + gloves = /obj/item/clothing/gloves/color/black + head = /obj/item/clothing/head/helmet/sec + shoes = /obj/item/clothing/shoes/jackboots + l_pocket = /obj/item/restraints/handcuffs + r_pocket = /obj/item/assembly/flash/handheld + + backpack_contents = list( + /obj/item/melee/baton/loaded=1, + ) + + +/datum/outfit/job/syndicate/security/gorlex + name = "Assault Operative (Gorlex)" + +/datum/outfit/job/syndicate/security/twink + name = "Operative (Twinkleshine)" + uniform = /obj/item/clothing/under/syndicate/combat + ears = /obj/item/radio/headset/syndicate/alt + mask = /obj/item/clothing/mask/chameleon + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/combat + l_pocket = /obj/item/gun/ballistic/automatic/pistol + r_pocket = /obj/item/kitchen/knife/combat/survival + belt = /obj/item/storage/belt/military/assault + id = /obj/item/card/id/syndicate_command/crew_id + implants = list(/obj/item/implant/weapons_auth) + backpack_contents = list(/obj/item/gun_voucher/syndicate=1) + + head = null + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/syndie + courierbag = /obj/item/storage/backpack/messenger/sec + + box = /obj/item/storage/box/survival/syndie + +/datum/outfit/job/syndicate/security/twink/post_equip(mob/living/carbon/human/H) + . = ..() + assign_codename(H) + +//Miners + +/datum/outfit/job/syndicate/miner + name = "Miner (Syndicate)" + jobtype = /datum/job/mining + + belt = /obj/item/pda/shaftminer + ears = /obj/item/radio/headset/headset_cargo/mining + shoes = /obj/item/clothing/shoes/workboots/mining + gloves = /obj/item/clothing/gloves/explorer + uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland + l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival + r_pocket = /obj/item/storage/bag/ore + backpack_contents = list( + /obj/item/flashlight/seclite=1,\ + /obj/item/kitchen/knife/combat/survival=1,\ + /obj/item/mining_voucher=1,\ + /obj/item/stack/marker_beacon/ten=1) + +/datum/outfit/job/syndicate/miner/gorlex + name = "Wrecker (Gorlex Marauders)" + + uniform = /obj/item/clothing/under/syndicate/gorlex + shoes = /obj/item/clothing/shoes/workboots + ears = /obj/item/radio/headset/alt + +/datum/outfit/job/syndicate/miner/twink + name = "Miner (Twinkleshine)" + + uniform = /obj/item/clothing/under/syndicate/gorlex + shoes = /obj/item/clothing/shoes/workboots + glasses = /obj/item/clothing/glasses/meson/night + gloves = /obj/item/clothing/gloves/explorer + ears = /obj/item/radio/headset/syndicate + mask = /obj/item/clothing/mask/chameleon + r_pocket = /obj/item/kitchen/knife/combat/survival + belt = /obj/item/storage/belt/mining/alt + implants = list(/obj/item/implant/weapons_auth) + id = /obj/item/card/id/syndicate_command/crew_id/engi + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/syndie + courierbag = /obj/item/storage/backpack/messenger/sec + + box = /obj/item/storage/box/survival/mining + +/datum/outfit/job/syndicate/miner/twink/post_equip(mob/living/carbon/human/H) + . = ..() + assign_codename(H) + +/datum/outfit/job/syndicate/miner/cybersun + name = "Field Agent (Cybersun)" + + id = /obj/item/card/id/syndicate_command/crew_id + ears = /obj/item/radio/headset + uniform = /obj/item/clothing/under/syndicate + accessory = /obj/item/clothing/accessory/armband/cargo + head = /obj/item/clothing/head/soft/black + r_pocket = /obj/item/radio + +/datum/outfit/job/syndicate/miner/gec + name = "Shaft Miner (GEC)" + + id = /obj/item/card/id/syndicate_command/crew_id + ears = /obj/item/radio/headset + uniform = /obj/item/clothing/under/syndicate + alt_uniform = null + accessory = /obj/item/clothing/accessory/armband/cargo + head = /obj/item/clothing/head/soft/black + r_pocket = /obj/item/radio + head = /obj/item/clothing/head/hardhat/orange + suit = /obj/item/clothing/suit/toggle/industrial + suit_store = /obj/item/tank/internals/emergency_oxygen/double + +//"station" engineers + +/datum/outfit/job/syndicate/engineer + name = "Ship Technician (Syndicate)" + jobtype = /datum/job/engineer + + id = /obj/item/card/id/syndicate_command/crew_id + uniform = /obj/item/clothing/under/syndicate/aclfgrunt + accessory = /obj/item/clothing/accessory/armband/engine + glasses = /obj/item/clothing/glasses/sunglasses + shoes = /obj/item/clothing/shoes/jackboots + + belt = /obj/item/storage/belt/utility/full/engi + l_pocket = /obj/item/pda/engineering + head = /obj/item/clothing/head/hardhat/dblue + r_pocket = /obj/item/t_scanner + + box = /obj/item/storage/box/survival/engineer + pda_slot = ITEM_SLOT_LPOCKET + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) + +/datum/outfit/job/syndicate/engineer/gec + name = "Ship Engineer (GEC)" + + uniform = /obj/item/clothing/under/syndicate/gec + suit = /obj/item/clothing/suit/toggle/hazard + head = /obj/item/clothing/head/hardhat + id = /obj/item/card/id/syndicate_command/crew_id + +/datum/outfit/job/syndicate/engineer/gorlex + name = "Mechanic (Gorlex Marauders)" + + uniform = /obj/item/clothing/under/syndicate/gorlex + shoes = /obj/item/clothing/shoes/workboots + alt_uniform = null + glasses = null + +/datum/outfit/job/syndicate/engineer/twink + name = "Ship Engineer (Twinkleshine)" + + uniform = /obj/item/clothing/under/syndicate/gec + accessory = null + glasses = /obj/item/clothing/glasses/meson/night + head = /obj/item/clothing/head/hardhat/orange + gloves = /obj/item/clothing/gloves/tackler/combat/insulated + ears = /obj/item/radio/headset/syndicate + mask = /obj/item/clothing/mask/chameleon + back = /obj/item/storage/backpack/industrial + belt = /obj/item/storage/belt/utility/syndicate + shoes = /obj/item/clothing/shoes/combat + suit = /obj/item/clothing/suit/hazardvest + alt_suit = /obj/item/clothing/suit/toggle/hazard + implants = list(/obj/item/implant/weapons_auth) + id = /obj/item/card/id/syndicate_command/crew_id/engi + backpack_contents = list(/obj/item/construction/rcd/combat, /obj/item/rcd_ammo/large) + + box = /obj/item/storage/box/survival/syndie + +/datum/outfit/job/syndicate/engineer/twink/post_equip(mob/living/carbon/human/H) + . = ..() + assign_codename(H) + +/datum/outfit/job/syndicate/engineer/cybersun + name = "Engineer (Cybersun)" + + uniform = /obj/item/clothing/under/syndicate/cybersun + shoes = /obj/item/clothing/shoes/workboots + r_pocket = /obj/item/radio + head = /obj/item/clothing/head/beanie/black + accessory = /obj/item/clothing/accessory/armband/engine diff --git a/code/modules/clothing/outfits/vr.dm b/code/modules/clothing/outfits/vr.dm deleted file mode 100644 index 825dd8e46c32..000000000000 --- a/code/modules/clothing/outfits/vr.dm +++ /dev/null @@ -1,41 +0,0 @@ -/datum/outfit/vr - name = "Basic VR" - uniform = /obj/item/clothing/under/color/random - shoes = /obj/item/clothing/shoes/sneakers/black - ears = /obj/item/radio/headset - id = /obj/item/card/id - -/datum/outfit/vr/pre_equip(mob/living/carbon/human/H) - H.dna.species.before_equip_job(null, H) - -/datum/outfit/vr/post_equip(mob/living/carbon/human/H) - var/obj/item/card/id/id = H.wear_id - if (istype(id)) - id.access |= get_all_accesses() - -/datum/outfit/vr/syndicate - name = "Syndicate VR Operative - Basic" - uniform = /obj/item/clothing/under/syndicate - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - back = /obj/item/storage/backpack - id = /obj/item/card/id/syndicate - belt = /obj/item/gun/ballistic/automatic/pistol - l_pocket = /obj/item/paper/fluff/vr/fluke_ops - backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\ - /obj/item/kitchen/knife/combat/survival) - -/datum/outfit/vr/syndicate/post_equip(mob/living/carbon/human/H) - . = ..() - var/obj/item/uplink/U = new /obj/item/uplink/nuclear_restricted(H, H.key, 80) - H.equip_to_slot_or_del(U, ITEM_SLOT_BACKPACK) - var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(H) - W.implant(H) - var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(H) - E.implant(H) - H.faction |= ROLE_SYNDICATE - H.update_icons() - -/obj/item/paper/fluff/vr/fluke_ops - name = "Where is my uplink?" - default_raw_text = "Use the radio in your backpack." diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index b6e6c9e2b731..26df953b9523 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -78,7 +78,6 @@ Assistant /datum/outfit/job/assistant/inteq name = "IRMG Recruit (Inteq)" - uniform = /obj/item/clothing/under/syndicate/inteq /datum/outfit/job/assistant/intern @@ -121,60 +120,6 @@ Assistant shoes = /obj/item/clothing/shoes/laceup suit = /obj/item/clothing/suit/toggle/lawyer/black -/datum/outfit/job/assistant/syndicate - name = "Junior Agent (Assistant)" - - id = /obj/item/card/id/syndicate_command/crew_id - uniform = /obj/item/clothing/under/syndicate - alt_uniform = null - shoes = /obj/item/clothing/shoes/jackboots - -/datum/outfit/job/assistant/syndicate/gorlex - name = "Junior Agent (Gorlex Marauders)" - - uniform = /obj/item/clothing/under/syndicate/gorlex - alt_uniform = /obj/item/clothing/under/syndicate - -/datum/outfit/job/assistant/syndicate/gec - name = "Deckhand (GEC)" - - id = /obj/item/card/id/syndicate_command/crew_id - uniform = /obj/item/clothing/under/syndicate - suit = /obj/item/clothing/suit/toggle/hazard - alt_uniform = null - shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/safety_helmet - -/datum/outfit/job/assistant/syndicate/sbc - name = "Deck Assistant (Twinkleshine)" - - uniform = /obj/item/clothing/under/syndicate - alt_uniform = /obj/item/clothing/under/syndicate/intern - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - r_pocket = /obj/item/kitchen/knife/combat/survival - back = /obj/item/storage/backpack - implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - - box = /obj/item/storage/box/survival/syndie - -/datum/outfit/job/assistant/syndicate/sbc/post_equip(mob/living/carbon/human/H) - H.faction |= list("PlayerSyndicate") - - var/obj/item/card/id/I = H.wear_id - I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(1, 4)) // squidquest real - I.assignment = "Deck Assistant" - I.access |= list(ACCESS_SYNDICATE) - I.update_label() - /datum/outfit/job/assistant/independent/crewmatefancy name = "Crewmate (Independent)" @@ -208,9 +153,7 @@ Assistant gloves = /obj/item/clothing/gloves/color/white accessory = /obj/item/clothing/neck/scarf/darkblue -/datum/outfit/job/assistant/waiter/syndicate - name = "Assistant (Syndicate Waiter)" - uniform = /obj/item/clothing/under/suit/waiter/syndicate + /datum/outfit/job/assistant/roumain name = "Shadow (Saint-Roumain Militia)" @@ -222,13 +165,7 @@ Assistant head = /obj/item/clothing/head/cowboy/sec/roumain/shadow -/datum/outfit/job/assistant/syndicate/cyberagent - name = "Junior Agent (Cybersun)" - uniform = /obj/item/clothing/under/syndicate - shoes = /obj/item/clothing/shoes/jackboots - r_pocket = /obj/item/radio - head = /obj/item/clothing/head/soft/black /datum/outfit/job/assistant/pharma name = "Pharmacology Student" diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index eb2df5a68039..f00d87eb6ba4 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -40,14 +40,6 @@ suit_store = /obj/item/tank/internals/oxygen internals_slot = ITEM_SLOT_SUITSTORE -/datum/outfit/job/atmos/gec - name = "Atmospheric Technician (GEC)" - - uniform = /obj/item/clothing/under/syndicate/gec/atmos_tech - suit = /obj/item/clothing/suit/toggle/hazard - head = /obj/item/clothing/head/hardhat - id = /obj/item/card/id/syndicate_command/crew_id - /datum/outfit/job/atmos/frontiersmen name = "Atmospheric Technician (Frontiersmen)" diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 680fe6ee880d..f704f1c62139 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -1,6 +1,7 @@ /datum/job/bartender name = "Bartender" - wiki_page = "Drinks" //WS Edit - Wikilinks/Warning + wiki_page = "Drinks" + outfit = /datum/outfit/job/bartender @@ -17,16 +18,12 @@ belt = /obj/item/pda/bar ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/bartender - alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple //WS Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple alt_suit = /obj/item/clothing/suit/apron/purple_bartender suit = /obj/item/clothing/suit/armor/vest backpack_contents = list(/obj/item/storage/box/beanbag=1) shoes = /obj/item/clothing/shoes/laceup -/datum/outfit/job/bartender/syndicate - id = /obj/item/card/id/syndicate_command/crew_id - head = /obj/item/clothing/head/HoS/beret/syndicate - /datum/outfit/job/bartender/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -35,34 +32,6 @@ W.registered_age = AGE_MINOR to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!") -/datum/outfit/job/bartender/syndicate/sbc - name = "Bartender (Twinkleshine)" - - uniform = /obj/item/clothing/under/syndicate/donk - shoes = /obj/item/clothing/shoes/laceup - gloves = /obj/item/clothing/gloves/color/white - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - belt = /obj/item/storage/belt/bandolier - implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - - box = /obj/item/storage/box/survival/syndie - -/datum/outfit/job/bartender/syndicate/sbc/post_equip(mob/living/carbon/human/H) - H.faction |= list("PlayerSyndicate") - - var/obj/item/card/id/I = H.wear_id - I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(2, 5)) // squidquest real - I.assignment = "Bartender" - I.access |= list(ACCESS_SYNDICATE) - I.update_label() - /datum/outfit/job/bartender/pharma name = "Mixologist" diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 27906b1d8bac..17820864e57f 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -27,17 +27,6 @@ satchel = /obj/item/storage/backpack/satchel/hyd courierbag = /obj/item/storage/backpack/messenger/hyd -//shiptest!!!!!!!!!! -/datum/outfit/job/botanist/syndicate/nsv - name = "Botanist-Chemist (NSV-M)" - - uniform = /obj/item/clothing/under/syndicate - id = /obj/item/card/id/syndicate_command/crew_id - shoes = /obj/item/clothing/shoes/jackboots - glasses = /obj/item/clothing/glasses/science - suit = /obj/item/clothing/suit/toggle/labcoat/chemist - suit_store = null - /datum/outfit/job/botanist/pharma name = "Herbalist" diff --git a/code/modules/jobs/job_types/brig_physician.dm b/code/modules/jobs/job_types/brig_physician.dm index 6b670693186e..d27f2df6b859 100644 --- a/code/modules/jobs/job_types/brig_physician.dm +++ b/code/modules/jobs/job_types/brig_physician.dm @@ -45,39 +45,3 @@ suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys l_pocket = /obj/item/reagent_containers/syringe alt_suit = null - -/datum/outfit/job/brig_phys/syndicate/sbc - name = "Medic (Twinkleshine)" - - uniform = /obj/item/clothing/under/rank/medical/doctor/red - gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil - alt_uniform = /obj/item/clothing/under/syndicate/cybersun - glasses = /obj/item/clothing/glasses/hud/health - belt = /obj/item/storage/belt/medical - back = /obj/item/storage/backpack/duffelbag/syndie/med - shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/longcoat/roboblack - alt_suit = /obj/item/clothing/suit/toggle/labcoat - suit_store = null - head = null - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - id = /obj/item/card/id/syndicate_command/crew_id/med - implants = list(/obj/item/implant/weapons_auth) - backpack_contents = list(/obj/item/pda/brig_phys) - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med - courierbag = /obj/item/storage/backpack/messenger/sec - - box = /obj/item/storage/box/survival/syndie - -/datum/outfit/job/brig_phys/syndicate/sbc/post_equip(mob/living/carbon/human/H) - H.faction |= list("PlayerSyndicate") - - var/obj/item/card/id/I = H.wear_id - I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(6, 8)) // squidquest real - I.assignment = "Medic" - I.access |= list(ACCESS_SYNDICATE) - I.update_label() diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 229d98435c46..78e7eb8dde74 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -90,71 +90,6 @@ glasses = /obj/item/clothing/glasses/sunglasses alt_suit = null -/datum/outfit/job/captain/syndicate - name = "Captain (ACLF)" - id = /obj/item/card/id/syndicate_command/captain_id - ears = /obj/item/radio/headset/syndicate/alt/captain - uniform = /obj/item/clothing/under/syndicate/aclf - shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/HoS/syndicate - gloves = /obj/item/clothing/gloves/combat - suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/sec - courierbag = /obj/item/storage/backpack/messenger/sec - -/datum/outfit/job/captain/syndicate/sbc - name = "Captain (Twinkleshine)" - - uniform = /obj/item/clothing/under/syndicate/aclf - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/syndicate/alt/captain - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - l_pocket = /obj/item/melee/transforming/energy/sword/saber/red - suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - suit_store = /obj/item/gun/ballistic/revolver/mateba - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault - glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch - id = /obj/item/card/id/syndicate_command/captain_id - implants = list(/obj/item/implant/weapons_auth) - backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/pda/captain) - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - - box = /obj/item/storage/box/survival/syndie - -/datum/outfit/job/captain/syndicate/sbc/post_equip(mob/living/carbon/human/H) - H.faction |= list("PlayerSyndicate") - - var/obj/item/card/id/I = H.wear_id - I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(9, 12)) // squidquest real - I.access = get_all_accesses()+get_all_syndicate_access() - I.update_label() - -/datum/outfit/job/captain/syndicate/gorlex - name = "Captain (Gorlex Marauders)" - - uniform = /obj/item/clothing/under/syndicate/aclf - shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/aclfcap - suit = /obj/item/clothing/suit/aclf - -/datum/outfit/job/captain/syndicate/cybersun - name = "Cybersun Commander" - - uniform = /obj/item/clothing/under/suit/black_really - shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/HoS/syndicate - gloves = /obj/item/clothing/gloves/combat - suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - /datum/outfit/job/captain/minutemen name = "Captain (Colonial Minutemen)" diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index c5d2b14aa0eb..22f85ed9f57a 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -35,11 +35,6 @@ gloves = /obj/item/clothing/gloves/fingerless glasses = /obj/item/clothing/glasses/sunglasses/big -/datum/outfit/job/cargo_tech/donk - name = "Customer Associate (Donk! Co.)" - id = /obj/item/card/id/syndicate_command/crew_id - uniform = /obj/item/clothing/under/syndicate/donk - suit = /obj/item/clothing/suit/hazardvest/donk /datum/outfit/job/cargo_tech/frontiersmen name = "Cargo Tech (frontiersmen)" diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index 9e26a0787865..d98181af7324 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -76,15 +76,6 @@ backpack_contents = list(/obj/item/clothing/glasses/science=1) //Shiptest -/datum/outfit/job/chemist/gec - name = "Chemist (GEC)" - - uniform = /obj/item/clothing/under/syndicate/intern - suit = /obj/item/clothing/suit/toggle/hazard - head = /obj/item/clothing/head/hardhat - belt = /obj/item/storage/belt/utility/full/engi - id = /obj/item/card/id/syndicate_command/crew_id - l_pocket =/obj/item/pda/chemist /datum/outfit/job/chemist/pharma name = "Pharmacist" diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 76d49f4b0f4d..5b862731db49 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -72,35 +72,6 @@ neck = /obj/item/clothing/neck/tie/green backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1, /obj/item/clothing/gloves/color/black=1) -/datum/outfit/job/ce/gec - name = "Chief Engineer (GEC)" - - uniform = /obj/item/clothing/under/syndicate/gec/chief_engineer - suit = /obj/item/clothing/suit/toggle/hazard - head = /obj/item/clothing/head/hardhat/white - shoes =/obj/item/clothing/shoes/laceup - ears = /obj/item/radio/headset/syndicate/alt/captain - id = /obj/item/card/id/syndicate_command/captain_id - gloves = /obj/item/clothing/gloves/combat - -/datum/outfit/job/ce/syndicate - name = "Chief Engineer (Syndicate Generic)" - - id = /obj/item/card/id/syndicate_command/crew_id - ears = /obj/item/radio/headset/syndicate/alt - glasses = /obj/item/clothing/glasses/sunglasses - -/datum/outfit/job/ce/syndicate/gorlex - name = "Foreman (Gorlex Marauders)" - - ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/syndicate/gorlex - alt_uniform = null - suit = /obj/item/clothing/suit/toggle/hazard - alt_suit = null - shoes = /obj/item/clothing/shoes/jackboots - gloves = /obj/item/clothing/gloves/combat - /datum/outfit/job/ce/inteq name = "IRMG Artificer Class II (Inteq)" diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 92e270ee22e7..f614aab080a0 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -75,14 +75,6 @@ suit_store = null backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/storage/firstaid/medical=1, /obj/item/flashlight/pen=1) -//Shiptest! -/datum/outfit/job/cmo/syndicate/nsv - name = "Medical Director (NSV-M)" - - uniform = /obj/item/clothing/under/syndicate - ears = /obj/item/radio/headset/syndicate/alt/captain - id = /obj/item/card/id/syndicate_command/captain_id - shoes = /obj/item/clothing/shoes/jackboots /datum/outfit/job/cmo/pharma name = "Chief Pharmacist" diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 2e97961b7fcb..e38e758cf71e 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -95,30 +95,6 @@ backpack_contents = list(/obj/item/storage/box/ids=1,\ /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) -/datum/outfit/job/head_of_personnel/syndicate - name = "Bridge Officer (Syndicate)" - - ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/syndicate/aclfgrunt - shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/HoS/beret/syndicate - gloves = /obj/item/clothing/gloves/color/white - id = /obj/item/card/id/syndicate_command/crew_id - r_pocket = /obj/item/kitchen/knife/combat/survival - glasses = /obj/item/clothing/glasses/hud/health - -/datum/outfit/job/head_of_personnel/syndicate/intel - name = "Intelligence Officer (Syndicate)" - - ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/suit/charcoal - shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/HoS/syndicate - gloves = /obj/item/clothing/gloves/combat - id = /obj/item/card/id/syndicate_command/crew_id - r_pocket = /obj/item/kitchen/knife/combat/survival - glasses = /obj/item/clothing/glasses/sunglasses - /datum/outfit/job/head_of_personnel/beluga uniform = /obj/item/clothing/under/rank/command/head_of_personnel diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index f38c9fd3a901..8c59ec2a7cad 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -61,16 +61,6 @@ suit_store = /obj/item/tank/internals/oxygen backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/gun/energy/e_gun=1, /obj/item/ammo_box/magazine/co9mm=1) //WS edit - free lethals -/datum/outfit/job/hos/syndicate - name = "Sergeant (Syndicate)" - - ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/syndicate/combat - head = /obj/item/clothing/head/warden - suit = /obj/item/clothing/suit/armor/vest/syndie - id = /obj/item/card/id/syndicate_command/crew_id - backpack_contents = list(/obj/item/melee/classic_baton=1,/obj/item/storage/box/survival/syndie=1) - /datum/outfit/job/hos/nanotrasen name = "Head of Security (Nanotrasen)" diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 49a23855c3c8..66a3f950bc57 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -106,27 +106,6 @@ uniform = /obj/item/clothing/under/costume/sailor shoes = /obj/item/clothing/shoes/jackboots -/datum/outfit/job/doctor/cybersun - name = "Operations Assistant (Medical Doctor)" - - uniform = /obj/item/clothing/under/syndicate/cybersun - accessory = /obj/item/clothing/accessory/armband/medblue - shoes = /obj/item/clothing/shoes/jackboots -/datum/outfit/job/doctor/syndicate/nsv - name = "Medical Doctor (NSV-M)" - - uniform = /obj/item/clothing/under/syndicate - id = /obj/item/card/id/syndicate_command/crew_id - shoes = /obj/item/clothing/shoes/jackboots - -/datum/outfit/job/doctor/syndicate_komodo - name = "Ship Medical Doctor" - uniform = /obj/item/clothing/under/syndicate/gorlex - glasses = /obj/item/clothing/glasses/hud/health/prescription - r_pocket = /obj/item/kitchen/knife/combat/survival - back = /obj/item/storage/backpack/duffelbag/syndie/med - id = /obj/item/card/id/syndicate_command/crew_id - backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,) /datum/outfit/job/doctor/roumain name = "Hunter Doctor (Saint-Roumain Militia)" diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index a51249c10f7d..5ac130370a6c 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -53,22 +53,6 @@ backpack = /obj/item/storage/backpack/ert/medical belt = /obj/item/storage/belt/medical/webbing/paramedic -/datum/outfit/job/paramedic/syndicate/gorlex - name = "Paramedic (Gorlex)" - - id = /obj/item/card/id/syndicate_command/crew_id - uniform = /obj/item/clothing/under/syndicate/gorlex - alt_uniform = null - shoes = /obj/item/clothing/shoes/jackboots - -/datum/outfit/job/paramedic/syndicate - name = "Field Medic (Cybersun Industries)" - - uniform = /obj/item/clothing/under/syndicate/medic - head = /obj/item/clothing/head/soft/cybersun - shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/toggle/labcoat/raincoat - /datum/outfit/job/paramedic/inteq name = "IRMG Corpsman (Inteq)" diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 16195bfc1a85..aca27ae4acbf 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -29,9 +29,3 @@ name = "Shotcaller" l_pocket = /obj/item/kitchen/knife/shiv -/datum/outfit/job/prisoner/syndicatepatient - name = "Long Term Patient" - id = /obj/item/card/id/patient - uniform = /obj/item/clothing/under/rank/medical/gown - alt_suit = null - shoes = /obj/item/clothing/shoes/sandal/slippers diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm index de4a0eb10a24..1bc260c61c5f 100644 --- a/code/modules/jobs/job_types/psychologist.dm +++ b/code/modules/jobs/job_types/psychologist.dm @@ -25,13 +25,3 @@ satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med -//Shiptest Outfits - -/datum/outfit/job/psychologist/syndicate/nsv - name = "Ship Psychologist" - id = /obj/item/card/id/syndicate_command/crew_id - uniform = /obj/item/clothing/under/rank/medical/psychiatrist - suit = /obj/item/clothing/suit/toggle/labcoat - shoes = /obj/item/clothing/shoes/laceup - alt_uniform = null - l_hand = /obj/item/clipboard diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 3399fb9de9f1..68380b99fa05 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -36,16 +36,6 @@ glasses = /obj/item/clothing/glasses/sunglasses head = /obj/item/clothing/head/cowboy/sec -/datum/outfit/job/quartermaster/donk - name = "Manager (Donk! Co.)" - id = /obj/item/card/id/syndicate_command/captain_id - - ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/syndicate/donk/qm - suit = /obj/item/clothing/suit/hazardvest/donk/qm - ears = /obj/item/radio/headset/syndicate/alt - shoes = /obj/item/clothing/shoes/laceup - /datum/outfit/job/quartermaster/requisitionsofficer name = "Requisitions Officer" suit = /obj/item/clothing/suit/jacket/miljacket diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 781e6f360dc5..20b753f56abd 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -100,8 +100,6 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S chameleon_extras = list(/obj/item/gun/energy/disabler, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet) //The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state -//Shiptest outfits begin - /datum/outfit/job/security/pirate name = "Buccaneer (Pirate)" @@ -289,47 +287,6 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S courierbag = /obj/item/storage/backpack/messenger backpack_contents = null -/datum/outfit/job/security/syndicate/gorlex - name = "Syndicate Battlecruiser Assault Operative" - uniform = /obj/item/clothing/under/syndicate - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military - back = /obj/item/storage/backpack - suit = /obj/item/clothing/suit/armor/vest - id = /obj/item/card/id/syndicate_command/crew_id - backpack_contents = list(/obj/item/storage/box/survival/syndie=1) - -/datum/outfit/job/security/syndicate/sbc - name = "Operative (Twinkleshine)" - uniform = /obj/item/clothing/under/syndicate/combat - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat - l_pocket = /obj/item/gun/ballistic/automatic/pistol - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault - id = /obj/item/card/id/syndicate_command/crew_id - implants = list(/obj/item/implant/weapons_auth) - backpack_contents = list(/obj/item/gun_voucher/syndicate=1) - - head = null - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - - box = /obj/item/storage/box/survival/syndie - -/datum/outfit/job/security/syndicate/sbc/post_equip(mob/living/carbon/human/H) - H.faction |= list("PlayerSyndicate") - - var/obj/item/card/id/I = H.wear_id - I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(4, 8)) // squidquest real - I.assignment = "Operative" - I.access |= list(ACCESS_SYNDICATE) - I.update_label() - /datum/outfit/job/security/aipirate name = "Nodesman (Security)" @@ -359,7 +316,6 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S l_pocket = /obj/item/flashlight/seclite r_pocket = /obj/item/tank/internals/emergency_oxygen/double - /datum/outfit/job/security/lp name = "LP Security Specialist" diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 1fade6b2ecf0..6a3f13da7c78 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -90,43 +90,6 @@ satchel = /obj/item/storage/backpack/satchel/tox courierbag = /obj/item/storage/backpack/messenger/tox -/datum/outfit/job/miner/syndicate/gorlex - name = "Wrecker (Gorlex Marauders)" - - uniform = /obj/item/clothing/under/syndicate/gorlex - shoes = /obj/item/clothing/shoes/workboots - ears = /obj/item/radio/headset/alt - -/datum/outfit/job/miner/syndicate/sbc - name = "Miner (Twinkleshine)" - - uniform = /obj/item/clothing/under/syndicate/gorlex - shoes = /obj/item/clothing/shoes/workboots - glasses = /obj/item/clothing/glasses/meson/night - gloves = /obj/item/clothing/gloves/explorer - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/mining/alt - implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id/engi - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - - box = /obj/item/storage/box/survival/mining - -/datum/outfit/job/miner/syndicate/sbc/post_equip(mob/living/carbon/human/H) - H.faction |= list("PlayerSyndicate") - - var/obj/item/card/id/I = H.wear_id - I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(5, 7)) // squidquest real - I.assignment = "Miner" - I.access |= list(ACCESS_SYNDICATE, ACCESS_ENGINE) - I.update_label() - /datum/outfit/job/miner/old name = "Shaft Miner (Legacy)" suit = /obj/item/clothing/suit/hooded/explorer/old @@ -162,30 +125,6 @@ /obj/item/borg/upgrade/modkit/aoe=1 ) -/datum/outfit/job/miner/syndicate/cybersun - name = "Field Agent" - - id = /obj/item/card/id/syndicate_command/crew_id - ears = /obj/item/radio/headset - uniform = /obj/item/clothing/under/syndicate - accessory = /obj/item/clothing/accessory/armband/cargo - head = /obj/item/clothing/head/soft/black - r_pocket = /obj/item/radio - -/datum/outfit/job/miner/syndicate/gec - name = "Shaft Miner (GEC)" - - id = /obj/item/card/id/syndicate_command/crew_id - ears = /obj/item/radio/headset - uniform = /obj/item/clothing/under/syndicate - alt_uniform = null - accessory = /obj/item/clothing/accessory/armband/cargo - head = /obj/item/clothing/head/soft/black - r_pocket = /obj/item/radio - head = /obj/item/clothing/head/hardhat/orange - suit = /obj/item/clothing/suit/toggle/industrial - suit_store = /obj/item/tank/internals/emergency_oxygen/double - /datum/outfit/job/miner/hazard/minutemen name = "Industrial Miner (Minutemen)" gloves = /obj/item/clothing/gloves/color/black diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index cf774d8a25bb..a347965d9323 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -84,61 +84,6 @@ suit = /obj/item/clothing/suit/toggle/hazard alt_suit = /obj/item/clothing/suit/hazardvest -/datum/outfit/job/engineer/syndicate - name = "Ship Technician (Engineer)" - - id = /obj/item/card/id/syndicate_command/crew_id - uniform = /obj/item/clothing/under/syndicate/aclfgrunt - accessory = /obj/item/clothing/accessory/armband/engine - glasses = /obj/item/clothing/glasses/sunglasses - shoes = /obj/item/clothing/shoes/jackboots - -/datum/outfit/job/engineer/gec - name = "Station Engineer (GEC)" - - uniform = /obj/item/clothing/under/syndicate/gec - suit = /obj/item/clothing/suit/toggle/hazard - head = /obj/item/clothing/head/hardhat - id = /obj/item/card/id/syndicate_command/crew_id - -/datum/outfit/job/engineer/syndicate/gorlex - name = "Mechanic (Gorlex Marauders)" - - uniform = /obj/item/clothing/under/syndicate/gorlex - shoes = /obj/item/clothing/shoes/workboots - alt_uniform = null - glasses = null - -/datum/outfit/job/engineer/syndicate/sbc - name = "Ship Engineer (Twinkleshine)" - - uniform = /obj/item/clothing/under/syndicate/gec - accessory = null - glasses = /obj/item/clothing/glasses/meson/night - head = /obj/item/clothing/head/hardhat/orange - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - back = /obj/item/storage/backpack/industrial - belt = /obj/item/storage/belt/utility/syndicate - shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/hazardvest - alt_suit = /obj/item/clothing/suit/toggle/hazard - implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id/engi - backpack_contents = list(/obj/item/construction/rcd/combat, /obj/item/rcd_ammo/large) - - box = /obj/item/storage/box/survival/syndie - -/datum/outfit/job/engineer/syndicate/sbc/post_equip(mob/living/carbon/human/H) - H.faction |= list("PlayerSyndicate") - - var/obj/item/card/id/I = H.wear_id - I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(6, 8)) // squidquest real - I.assignment = "Engineer" - I.access |= list(ACCESS_SYNDICATE) - I.update_label() - /datum/outfit/job/engineer/independent/ship_engineer name = "Ship Engineer (Independent)" @@ -161,16 +106,6 @@ r_pocket = null glasses = null - -/datum/outfit/job/engineer/syndicate/cybersun - name = "Engineer (Cybersun)" - - uniform = /obj/item/clothing/under/syndicate/cybersun - shoes = /obj/item/clothing/shoes/workboots - r_pocket = /obj/item/radio - head = /obj/item/clothing/head/beanie/black - accessory = /obj/item/clothing/accessory/armband/engine - /datum/outfit/job/engineer/aipirate name = "Nodesman (Engineer)" diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index a59b68a49892..f16d6119d147 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -109,35 +109,3 @@ suit = /obj/item/clothing/suit/armor/vest/security/warden/alt/nt alt_uniform = null alt_suit = null - -/datum/outfit/job/warden/syndicate/sbc - name = "Lieutenant (Twinkleshine)" - uniform = /obj/item/clothing/under/syndicate/aclf - head = /obj/item/clothing/head/HoS/beret/syndicate - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - gloves = /obj/item/clothing/gloves/combat - l_pocket = /obj/item/gun/ballistic/automatic/pistol - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault - shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/armor/vest - alt_suit = /obj/item/clothing/suit/aclf - id = /obj/item/card/id/syndicate_command/lieutenant - implants = list(/obj/item/implant/weapons_auth) - backpack_contents = list(/obj/item/melee/baton) - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - - box = /obj/item/storage/box/survival/syndie - -/datum/outfit/job/warden/syndicate/sbc/post_equip(mob/living/carbon/human/H) - H.faction |= list("PlayerSyndicate") - - var/obj/item/card/id/I = H.wear_id - I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(8, 10)) // squidquest real - I.access |= list(ACCESS_SYNDICATE) - I.update_label() diff --git a/code/modules/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/ruins/lavalandruin_code/syndicate_base.dm index 5d6295f54d0c..bbcce202096b 100644 --- a/code/modules/ruins/lavalandruin_code/syndicate_base.dm +++ b/code/modules/ruins/lavalandruin_code/syndicate_base.dm @@ -1,11 +1,9 @@ -//lavaland_surface_syndicate_base1.dmm - /obj/machinery/vending/syndichem name = "\improper SyndiChem" desc = "A vending machine full of grenades and grenade accessories. Sponsored by DonkCo(tm)." req_access = list(ACCESS_SYNDICATE) products = list( - /obj/item/stack/cable_coil/random = 5, //WS Edit - Random added from Smartwire Revert + /obj/item/stack/cable_coil/random = 5, /obj/item/assembly/igniter = 20, /obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 5, diff --git a/shiptest.dme b/shiptest.dme index a437a742f0dc..b39d8c19e544 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -56,6 +56,7 @@ #include "code\__DEFINES\economy.dm" #include "code\__DEFINES\events.dm" #include "code\__DEFINES\exports.dm" +#include "code\__DEFINES\factions.dm" #include "code\__DEFINES\fantasy_affixes.dm" #include "code\__DEFINES\fastdmm2.dm" #include "code\__DEFINES\fishing.dm" @@ -1951,8 +1952,8 @@ #include "code\modules\clothing\outfits\gezena.dm" #include "code\modules\clothing\outfits\plasmaman.dm" #include "code\modules\clothing\outfits\solgov.dm" +#include "code\modules\clothing\outfits\syndicate.dm" #include "code\modules\clothing\outfits\standard.dm" -#include "code\modules\clothing\outfits\vr.dm" #include "code\modules\clothing\outfits\vv_outfit.dm" #include "code\modules\clothing\shoes\_shoes.dm" #include "code\modules\clothing\shoes\bananashoes.dm" From dbc88b0ef17d3aa8d686c2b1709c83cf06681700 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 13 Nov 2023 13:23:00 -0600 Subject: [PATCH 4/4] Automatic changelog generation for PR #2221 [ci skip] --- html/changelogs/AutoChangeLog-pr-2221.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2221.yml diff --git a/html/changelogs/AutoChangeLog-pr-2221.yml b/html/changelogs/AutoChangeLog-pr-2221.yml new file mode 100644 index 000000000000..5959d739bbc0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2221.yml @@ -0,0 +1,5 @@ +author: Bjarl +changes: + - {rscdel: the syndicate lavaland base has been removed.} + - {code_imp: syndicate outfits have been repathed. Please report anything weird.} +delete-after: true