From fb143c425adbae555aee77f522242b1d69cc050b Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 7 Sep 2023 20:30:58 -0300 Subject: [PATCH] Cyclops Mining Vessel - Second Take (#16738) * the heph ship * Fixed things * Fixes * Stuff * leave * Fixes * fix * spawn fix * airlock and stuff outside * Whoops --- aurorastation.dme | 3 + code/game/jobs/access_datum.dm | 6 +- code/modules/clothing/under/jobs/civilian.dm | 9 + code/modules/clothing/under/jobs/security.dm | 8 + html/changelogs/alberyk-hephship.yml | 6 + .../under/uniforms/cyclops_uniforms.dmi | Bin 0 -> 1542 bytes maps/away/ships/heph/cyclops/cyclops.dmm | 70342 ++++++++++++++++ .../ships/heph/cyclops/cyclops_ghostroles.dm | 113 + .../heph/cyclops/cyclops_mining_areas.dm | 51 + .../ships/heph/cyclops/cyclops_mining_ship.dm | 106 + 10 files changed, 70643 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/alberyk-hephship.yml create mode 100644 icons/clothing/under/uniforms/cyclops_uniforms.dmi create mode 100644 maps/away/ships/heph/cyclops/cyclops.dmm create mode 100644 maps/away/ships/heph/cyclops/cyclops_ghostroles.dm create mode 100644 maps/away/ships/heph/cyclops/cyclops_mining_areas.dm create mode 100644 maps/away/ships/heph/cyclops/cyclops_mining_ship.dm diff --git a/aurorastation.dme b/aurorastation.dme index 145848c71df..8e67d2b6dd4 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3487,6 +3487,9 @@ #include "maps\away\ships\hegemony\miners_guild\miners_guild_areas.dm" #include "maps\away\ships\hegemony\miners_guild\miners_guild_ghostroles.dm" #include "maps\away\ships\hegemony\miners_guild\miners_guild_station.dm" +#include "maps\away\ships\heph\cyclops\cyclops_ghostroles.dm" +#include "maps\away\ships\heph\cyclops\cyclops_mining_areas.dm" +#include "maps\away\ships\heph\cyclops\cyclops_mining_ship.dm" #include "maps\away\ships\iac\iac_rescue_ship.dm" #include "maps\away\ships\iac\iac_rescue_ship_ghostroles.dm" #include "maps\away\ships\kataphracts\kataphract_areas.dm" diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index c519cf04a1f..ebd7a8bf661 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -623,7 +623,6 @@ var/const/access_kataphract_knight = 114 id = access_unathi_pirate access_type = ACCESS_TYPE_CENTCOM - /var/const/access_iac_rescue_ship = 211 /datum/access/access_iac_rescue_ship id = access_iac_rescue_ship @@ -647,4 +646,9 @@ var/const/access_kataphract_knight = 114 /var/const/access_merchants_guild = 215 /datum/access/access_merchants_guild id = access_merchants_guild + access_type = ACCESS_TYPE_CENTCOM + +/var/const/access_hephaestus= 216 +/datum/access/access_hephaestus + id = access_hephaestus access_type = ACCESS_TYPE_CENTCOM \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index d253060f624..09cacf3e9c7 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -237,3 +237,12 @@ /obj/item/clothing/under/rank/machinist/orion icon_state = "orion_machinist" item_state = "orion_machinist" + +/obj/item/clothing/under/rank/captain/hephaestus + name = "hephaestus captain's jumpsuit" + desc = "It's a green-and-orange jumpsuit with some gold markings denoting the rank of \"Captain\" used by Hephaestus Industries." + icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi' + icon_state = "heph_captain" + item_state = "heph_captain" + worn_state = "heph_captain" + contained_sprite = TRUE \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index a1f08de2d50..55a45334223 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -100,6 +100,14 @@ icon_state = "pmc_cadet" item_state = "pmc_cadet" +/obj/item/clothing/under/rank/security/heph + name = "hephaestus security officer uniform" + desc = "A green-and-orange uniform worn by Security Officers of smaller Hephaestus Industries vessels." + icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi' + icon_state = "heph_security" + item_state = "heph_security" + contained_sprite = TRUE + /obj/item/clothing/under/rank/warden name = "warden's uniform" desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection." diff --git a/html/changelogs/alberyk-hephship.yml b/html/changelogs/alberyk-hephship.yml new file mode 100644 index 00000000000..1146c227341 --- /dev/null +++ b/html/changelogs/alberyk-hephship.yml @@ -0,0 +1,6 @@ +author: Alberyk, ReadThisNamePlz + +delete-after: True + +changes: + - rscadd: "Added the Cyclops Mining Vessel away ship." diff --git a/icons/clothing/under/uniforms/cyclops_uniforms.dmi b/icons/clothing/under/uniforms/cyclops_uniforms.dmi new file mode 100644 index 0000000000000000000000000000000000000000..89dc3e35d952344b4703a7711644250f47027bf3 GIT binary patch literal 1542 zcmV+h2Ko7kP)C00015P)t-s0000b zB_%{eL^wD&CO#ucgdbW52X7V@z?CF4UKXow8IlSLtArs?EgN)38jV#T8yy}iE-yhu zMrvwmVPRpzf-KaOKp7?$vu6-4PZwfhVr)7QY)BcFWFmo#)sFxG00DGTPE!Ct=GbNc z005GDR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;Zh zDainGjE%TBGg33tGfE(w;*!LYR3K9+BeftSzBo0xv?#NrGQKoViHkEOv#1!PpNliC zC^0t`#5TmC0ioIukLu*af|A6{Jdza0=NF`ssDoI?Bin#Sld^)Vp9?rl0i5A!nhA%5 zvH$=Cyh%hsRCt{2T7h!fIuJCH0+Is;2aHfK|NoosPIeq-xRqR}o6H++i)p*^-CD98 z?M|zzprD|j;2W#eYB~ab0Io2r4J4G(=FMoOAv^KKbB9^W^JuMtn!QGezY5}>#M zDcDJ5Q(L8!-N$3yNPImCs3o2SH1(E-**y}lr*oTa-ADrHL^{7F0W}SH>@e_AfXEL5 zwl*)oZh?SZwd0d%4FBm-z>cplUcJP>EMTSdodEstAVj{2GtfwU6rh#P3!p*bJ-`LV zC4l@S0PuVu1qlJe%q0ZW`#L3n?vlD$PQamUKR!O%_V6tKH3$j#Iu{kt$K&xtAD!S; zil-OA>2yLgk06>}2e`md9q0r3(~0;*2hH-*0{9y6`P9E61z2F@aRF|S>Yp1>1RTZ& z@Gj5r{{sP9ABMwod>oNr=L{$)C@3iS-RRDqY=J*_n7`Ny=Cf#9c6F+4LH%Hy_db{) zcOX7Amj?1#tUo_nvghsRr)++M3*H1ex`6mA&j8}9&c+$EKwq@KWY3ZLHPo4kcaFXd z;G2tWJmCAg8SEtiWE$F*?0MUgw~!jpncj4+r*BaJ{rmOOTs`E!XHep+Rm0|!&C9Nl zoZroO6D!d74e_zR$a8<5LFW<*Msq6mrw)Fo5WLiXAqcm~BaineYLAhK08 z33!6%{@*hQ6y)47H;4tE;Q7Az7AW5(t4V;o1gxAs#(Q}Jll-l_-3j2oJwkCtv*UzD zPMO+6+uzQ&p1z;rvombN?R^^yg|hnQ|AbO|}W zq8XyMTo3bwD#oCE06a}_A9|YPC;4fHkbtEz&CrhtaEW)oKN8^iQ78g_OaT9&l{Kn%6k^xP)3iB1ki?qN5}%qU4jDggTcEys34xo_6`XkbuQ)* zp#PMhNcE$Cj{=~7X8}Gn16@xv65#F<6rujto;@V??tTbako9AC7#BejFxDRv6rq0f z?n zI6n=P>ZkL8=&wU6f*GnL3nT?(@&WSiAMsc6{|9gif(mdvG7XgKXYv8hmmd;K5MmyS zolRUrz7+tS%LfcS1^gSXacq!sR_OuRe84!)cTB=Of@f^zfNVaHcdrJetg{AW>lXoL z^zTdE1KE6_zghC{HsRmt9dJ&%`~IA;|0N$NC@3f>`2Cof4_t7COEMqGU~WD@{tosh z^Z&epx%mKjd{lzXe?a-btp0QIfhHlK!TCU5z}$S`dVx#8<{RY$bNbKB2k<>`#rZ&9 zz#rrTc-QG*K9I%V$p;+F2WH{*d>|z4d0xQl`G9#zz|#3Z7E9*?SuC9o