From edaf429ffabe7e54895c90ece6dd6c987cca957a Mon Sep 17 00:00:00 2001 From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com> Date: Sat, 23 Jul 2022 12:32:13 -0400 Subject: [PATCH] SFA Returns (#14467) --- code/game/objects/items/devices/modkit.dm | 19 +++++++- .../crates_lockers/crates/gear_loadout.dm | 2 + code/modules/clothing/spacesuits/void/misc.dm | 17 +++++++ html/changelogs/dansemacabre-sfareturns.yml | 41 ++++++++++++++++ .../contained_items/voidsuits/warlordsuit.dmi | Bin 4393 -> 4760 bytes maps/away/ships/sfa_patrol_ship.dmm | 45 +++++++++++++----- maps/away/ships/sol.dm | 2 +- maps/away/ships/sol_ship_ghostroles.dm | 8 ++-- 8 files changed, 115 insertions(+), 19 deletions(-) create mode 100644 html/changelogs/dansemacabre-sfareturns.yml diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 93733f42687..e7ac1ba9c72 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -234,6 +234,18 @@ /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/mrsp ) +/obj/item/voidsuit_modkit/sfa + name = "sfa voidsuit kit" + desc = "A highly complicated device that allows you to convert a Solarian voidsuit into a warlord variant. Wow!" + desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item\ + The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit\ + or else it will be deleted." + w_class = ITEMSIZE_SMALL + suit_options = list( + /obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/sfa, + /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/sfa + ) + /obj/item/storage/box/srf name = "srf modkit box" desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." @@ -262,4 +274,9 @@ /obj/item/storage/box/mrsp name = "mrsp modkit box" desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." - starts_with = list(/obj/item/voidsuit_modkit/mrsp = 4) \ No newline at end of file + starts_with = list(/obj/item/voidsuit_modkit/mrsp = 4) + +/obj/item/storage/box/sfa + name = "sfa modkit box" + desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." + starts_with = list(/obj/item/voidsuit_modkit/sfa = 4) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 54d4365fe5a..49d95a14037 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -175,6 +175,7 @@ new /obj/item/storage/box/ssmd(src) new /obj/item/storage/box/spg(src) new /obj/item/storage/box/mrsp(src) + new /obj/item/storage/box/sfa(src) /obj/structure/closet/crate/secure/gear_loadout/sol_single/fill() new /obj/item/clothing/under/rank/sol/marine(src) @@ -191,6 +192,7 @@ new /obj/item/storage/box/ssmd(src) new /obj/item/storage/box/spg(src) new /obj/item/storage/box/mrsp(src) + new /obj/item/storage/box/sfa(src) /obj/structure/closet/crate/secure/gear_loadout/syndicate_softsuits req_access = list() diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index f853f3dbf64..ee4c89aaa8b 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -887,4 +887,21 @@ icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi' icon_state = "mrsp_suit" item_state = "mrsp_suit" + contained_sprite = TRUE + +/obj/item/clothing/head/helmet/space/void/sol/sfa + name = "southern fleet administration voidsuit helmet" + desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Southern Fleet Administration to make it more easily identifiable from other forces using the Type-4, warlord or not." + icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi' + icon_state = "sfa_helmet" + item_state = "sfa_helmet" + contained_sprite = TRUE + +/obj/item/clothing/suit/space/void/sol/sfa + name = "southern fleet administration voidsuit" + desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the scant forces of the Southern Fleet Administration to make it more easily identifiable \ + from other forces using the Type-4, warlord or not. Due to poor maintenance, the highlights appear to have gone out." + icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi' + icon_state = "sfa_suit" + item_state = "sfa_suit" contained_sprite = TRUE \ No newline at end of file diff --git a/html/changelogs/dansemacabre-sfareturns.yml b/html/changelogs/dansemacabre-sfareturns.yml new file mode 100644 index 00000000000..5dd3c05d6a8 --- /dev/null +++ b/html/changelogs/dansemacabre-sfareturns.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: TheDanseMacabre + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "As a result of recent lore updates, the SFA ship has been enabled to spawn in the CRZ and disabled in Tau Ceti. Also adds SFA warlord armor." diff --git a/icons/obj/contained_items/voidsuits/warlordsuit.dmi b/icons/obj/contained_items/voidsuits/warlordsuit.dmi index ee1cd5c803d8e5f30fd5645fa8e90e11fa28969d..8fdd085d092826910c4ca29ffd40725f2c9b046e 100644 GIT binary patch literal 4760 zcmZ{ocT^MIy2e9jp_$M`F%UvWP*4zQnn08)2uer50@AB=fk=(?rdSY2L_g^wMT%5K ziUw> zASN+J0YR7gxY6A{O!bc*SVA>Y`LPvc*hH!fxp z2=X1at3h(*&L7Ek29EDFXyFygJwbO3CmVhphnwgbJ|L!$zqEy}Uktfq+m_=nZvQ$$ z$Dpi?%Ln>EzbEB!9(KexL2GQ@uv)hjksnY;qcv9X^*D$PYFR6(U3p=tQ4tiSzjnQC zRG;9LTh!(!#8IYsJz&z6Fk8+P;{w@XOIj!wC_3{!(0cuN#w2e{o8#e8D}UdqqdEs{ zN$c+hQ$`;MTAT;iP?g_fg%UgD`avMrlEDRS^N?q2_9zr$t}4SIXgk4@#v=RfB5iW zoL82_M)uUDe&CT;!GX3KO-IC`jWu_**&i?NGn#}1xE|UI@J1cp3U?3)k1cuVYds&j zSr?)}jzbb}I?Px1UV9xC8(nQrJXLP_ex;z7@bk=JZBSGE$Nf@SYq4Ty8kYv_w%4I= ziZ>j5rQXOxEX1OFtF#)UvBuSj?*Tf9D@#=Ax8xu3_ugZ~j0i`umpkz*Uyaa@ z`W6?;xSux2jbDAD7!Q-p5@<$W4Ys@oB_9PxyA+1M}OpYpymbK^dWAq=#sO;?B-g$%NC@;(^jV0j^^eZ*4-aZ4%8i^y}F z$h+w1GU3?ah_OU|wW6RIbt;jCYuhW2TV5A~`aTkh2o*j{fT-B!j$4VqHKRH(-3 z&(!p6aMy#%_0l{m@ZJII&seL6jDK}L9b#E;#FF>tBo_0jn`ZsUw2NG4I!~u}F#}51NX5g~=k6QfW6;wZmSWvAODAj_ zFQnTiy(n4EzgZ2AgEymtNzf2Bea%=UTf}ShM>&p?6M@Mtv2KDJ0um;J{L<}yE5PF) z{v%0H;PGak@jGkho^S3oFZxk)Hi*dQ>iwA_JUf{BSWpic8mh(f{_4A9UV7h++C~?U z=^wAkQ}1`bKE{LhtT}!*$GHA<$#7=|wf(&W>zSNAt*t(md#OdGJX2PahX z1FWCaH=D|@4=;a7_A^mLPH}?WIh7PEG>%=mP&4OMtx<7YE;5^(_0Uq-<{f1_27+-R z3UZRm6qtUj;Gc&jqz@e;DqJ8LPBkgWaVTz1CDIpHqLS>AbQaH^>Z;vu9$$gaj_k4$2H)OZ6Xq=2d=$iHa@k{N8ev$maOtlMg`S0j-HjZR zqE$}(tQmPuBenm|VR9J{Q`{q6A`$(|<@<4+1iOksJMk;El5whg)a`HfAoH;D#qfle z$3gS*UQEk&%iZo;H<+W6d)TdYAk}7FSK_a9-HL%!+m;i!SE|piq+&qr>@wFec-82D zC>@rv)i*GG`RG0TAk>!UInJ&aBg8%OLP)fH=3 z5+L5JOL;wbUuk9_%VIxS;{MrLu{W72daweZ^}AOM-0AwuldxdT zHdyzi+s;rCd9hl;Pfx!&9F(6zZdud!S5lH zsoOQPQkiSBC)p2j!@+b{<^&71q;Ax_Ox@&857JC)?g+`+j^#Kly!IhYWNhvGjgN@A zvsJvzyEff)v=eB~EpDHcxZWY%;UbUOMM4bI$KXT}k^4n*>7 zM6+YB(RQCsnd(C`i;LVTi*U4Pv7NomGM6UBvsNu;%=}OSC-@CW_r$2#-tbY`Box`N zlLPx@xz>1s)H%fo-FLS`&$4E>Vtr`dhH9TI&uJ2hYsX%#y)CcoFjUrb%y)oAEO9sJ zXg81YnTEJyE=7fMjdUE3UiDntLvk;z^oKd1KeQt@nl!zd3DHjypzZN~m1!i9BDEFUQr691_-r=lYj9S$i-wLtha zB{~(%4h|?9o(|x38G_Awa5E`Wg4pAN_KY-{Gr~bX7{)?(TFJwl_O)@qn>iFJ*h`2> zFf9`?1k4M}3Bs}K7U|Z}FWjLkM6}?@=0ooU~LsQ-o zxW@{$W;nn{A3-Z(8QT+?dfp!wRFcupD8koJ7Fj=cg9N~0=a=%OOpj?dppnt;no;+v z#qUECz1i~JAw(W`qS^0U75Lw|%Kdk)()@pN)v5o=RlU6J2g1DDShl_G8hZ!?eCXbt z#29y>uuqy&@4@{%k3T7sBIfi=zYNRWW)EG4=hy$$BffoFCDHqsP=yXt&Fws8=x(4# zpKh2kl(p$Vv2o<{8Z4K2Ifh6&tLfaSOf)mUBe0iPqBp0N;YJ)H8)X!tZE#{bl<|>* z%_E9#qasq~m>uvte4;a&Xp)_>iR=k;KBC02%l_1Q8<%oiSN+-ECwOxFOtjTUwqttN zz#=SQY%SQ}ke<)LtW@->t)#s%U7$cvcAg~C5QA-1Mvo$62Ph$|?j{D-UPZUGm|slv z6}&z*DS2*26qXZ`*n27PNxiV*&*`)`p-%!U(_kTYe__X6qfs66^)ik_Z*|6GBA?qh zcc;dO-4x=5Kv#wD4!$U!kNPfFW#Sm6F^u{wJb2w?1xF)N*`-^&&)k~@9_!wwm&!N< zp2&)pI9wRfnd=uvHtp;iG+rvS0mr3|hOlasIo@tS1p&$ip@rTCvJp4*@<+HY_hv=# z-(Zb`(@m+6jPgcJlUDE*2e2I^)kNBmpilmceHUr-8RhiaG5alcDJDGr-n8@NfI~}Z z61J=GRupc`G!?lmOTDM225{2-(p=!yNm796x{hP z7YM{*K}4{5qWu??hYmc0utxjAtFnIJZS z+7{mVJrFJwbAY=Nf=x|}qG6a@P_MY+858aU&yHl0pi;>U&_h-X(2hHBau^xfWQ#)! zU#`d+XL8%a4eD|NgcljnSl6$6U^=mGlNBKN&2dpN1s#lc(~+V`f*L8j z;ZpS$1)BVbF29aiM5r~29x9^XB1NVqQ-3E<#W-Ae%?Ythu-)}j{YQR1`AWk)hvq=d z87I1$-zPc~TQF{S@xD<9{^~C%O+z%T4bZ{TBIC-!YZwQrS;T2U&W-+4KZomR7{t6X z3yb1bDkoI38L(s-+J(OStya5GXT)TFL2v0q9CnFDo7jdr7rkx~Z2QI-GL>J@*E<=5 z)fd;_gzq0`l%t~8+%rX3?u(ng%Fx|kYEbr9b+~cIf^5kTwVMn0$RLsT(3EI@M z;v4bun(axwY^1TZH_&%9Y7v#-GWBd z20;O&9bs;)_W*Y-iVhDT4k&g%$315mb1l6CEPwv34Bs~|H361? zv<0wa(CY!I>h@ESCr1uG)(uTjz{z)MWs0p{uUi6{#($Bo2(?O@vYc%KzDxOjS@E$4 ff1%j9>_O{ay@F+LtFAJB@qi32np`N?xgPxwYza(^ literal 4393 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 diff --git a/maps/away/ships/sfa_patrol_ship.dmm b/maps/away/ships/sfa_patrol_ship.dmm index 87c2d5f1f43..cf98d604c80 100644 --- a/maps/away/ships/sfa_patrol_ship.dmm +++ b/maps/away/ships/sfa_patrol_ship.dmm @@ -767,6 +767,25 @@ /obj/effect/floor_decal/carpet{ dir = 1 }, +/obj/item/clothing/ears/skrell/chain/festive, +/obj/item/clothing/ears/skrell/chain/silver/average, +/obj/item/clothing/ears/skrell/chain/silver/average, +/obj/item/clothing/ears/skrell/chain/ebony, +/obj/item/clothing/ears/skrell/chain/ebony, +/obj/item/clothing/ears/skrell/chain/redjewels, +/obj/item/clothing/ears/skrell/chain/bluejewels, +/obj/item/clothing/ears/skrell/chain/bluejewels, +/obj/item/clothing/ears/skrell/chain, +/obj/item/clothing/ears/skrell/chain, +/obj/item/clothing/ears/skrell/chain, +/obj/item/clothing/ears/skrell/band/silver, +/obj/item/clothing/ears/skrell/band/ebony, +/obj/item/clothing/ears/skrell/band/ebony, +/obj/item/clothing/ears/skrell/band/bluejewels, +/obj/item/clothing/ears/skrell/band/bluejewels, +/obj/item/clothing/ears/skrell/band/bluejewels, +/obj/item/clothing/ears/skrell/band, +/obj/item/clothing/ears/skrell/band, /turf/simulated/floor/carpet, /area/ship/sfa_patrol_ship) "fFu" = ( @@ -886,7 +905,7 @@ /area/ship/sfa_patrol_ship) "gqw" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1 + dir = 8 }, /obj/effect/shuttle_landmark/sfa_shuttle/hangar, /turf/simulated/floor, @@ -1230,14 +1249,14 @@ "iQt" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/clothing/suit/space/void/sol, -/obj/item/clothing/head/helmet/space/void/sol, /obj/item/clothing/shoes/magboots, /obj/machinery/light{ icon_state = "tube1"; inserted_light = /obj/item/light/tube/colored/blue }, /obj/item/tank/jetpack/carbondioxide, +/obj/item/clothing/suit/space/void/sol/sfa, +/obj/item/clothing/head/helmet/space/void/sol/sfa, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship) "iQy" = ( @@ -1577,10 +1596,10 @@ "lwj" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/clothing/suit/space/void/sol, -/obj/item/clothing/head/helmet/space/void/sol, /obj/item/clothing/shoes/magboots, /obj/item/tank/jetpack/carbondioxide, +/obj/item/clothing/suit/space/void/sol/sfa, +/obj/item/clothing/head/helmet/space/void/sol/sfa, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship) "lFg" = ( @@ -2429,8 +2448,6 @@ "vfY" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/clothing/suit/space/void/sol, -/obj/item/clothing/head/helmet/space/void/sol, /obj/item/clothing/shoes/magboots, /obj/effect/decal/cleanable/cobweb, /obj/machinery/light{ @@ -2438,6 +2455,8 @@ icon_state = "tube1" }, /obj/item/tank/jetpack/carbondioxide, +/obj/item/clothing/suit/space/void/sol/sfa, +/obj/item/clothing/head/helmet/space/void/sol/sfa, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship) "vgc" = ( @@ -2506,10 +2525,10 @@ req_access = list(203) }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/item/gun/projectile/automatic/c20r/sol, -/obj/item/gun/projectile/automatic/c20r/sol, -/obj/item/ammo_magazine/a10mm, -/obj/item/ammo_magazine/a10mm, +/obj/item/storage/box/shotgunshells, +/obj/item/storage/box/beanbags, +/obj/item/storage/box/flashshells, +/obj/item/gun/projectile/shotgun/pump/combat/sol, /turf/simulated/floor, /area/ship/sfa_patrol_ship) "vCD" = ( @@ -34043,7 +34062,7 @@ qil qil qil mWk -qil +gqw qil mWk qil @@ -34809,7 +34828,7 @@ yjk yjk fnY sBA -gqw +eYX hjW hZq jIP diff --git a/maps/away/ships/sol.dm b/maps/away/ships/sol.dm index a7f306e2be1..87e893dd4b2 100644 --- a/maps/away/ships/sol.dm +++ b/maps/away/ships/sol.dm @@ -2,7 +2,7 @@ name = "SFA Patrol Ship" description = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship’s lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Southern Fleet Administration, an all-but-defunct Solarian warlord state." suffix = "ships/sfa_patrol_ship.dmm" - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH) + sectors = list(SECTOR_CORP_ZONE) spawn_weight = 1 spawn_cost = 1 id = "sfa_patrol_ship" diff --git a/maps/away/ships/sol_ship_ghostroles.dm b/maps/away/ships/sol_ship_ghostroles.dm index 7681ded341b..85f31e1ff69 100644 --- a/maps/away/ships/sol_ship_ghostroles.dm +++ b/maps/away/ships/sol_ship_ghostroles.dm @@ -3,7 +3,7 @@ /datum/ghostspawner/human/sfa_navy_crewman short_name = "sfa_navy_crewman" name = "SFA Navy Crewman" - desc = "Crew the Southern Fleet Administration auxiliary patrol ship. Figure out what to do now that the warlord you serve is dead." + desc = "Crew the Southern Fleet Administration corvette. Figure out what to do now that the warlord you serve is dead." tags = list("External") mob_name_prefix = "PO3. " @@ -41,9 +41,9 @@ /datum/ghostspawner/human/sfa_navy_officer short_name = "sfa_navy_officer" name = "SFA Navy Officer" - desc = "Pilot and command a Southern Fleet Administration auxiliary patrol ship. Figure out what to do now that the warlord you serve is dead." + desc = "Pilot and command a Southern Fleet Administration corvette. Figure out what to do now that the warlord you serve is dead." tags = list("External") - mob_name_prefix = "ENS. " + mob_name_prefix = "LT. " spawnpoints = list("sfa_navy_officer") max_count = 1 @@ -78,7 +78,7 @@ /datum/ghostspawner/human/sfa_marine short_name = "sfa_marine" name = "SFA Marine" - desc = "Protect the Southern Fleet Administration auxiliary patrol ship. Figure out what to do now that the warlord you serve is dead." + desc = "Protect the Southern Fleet Administration corvette. Figure out what to do now that the warlord you serve is dead." tags = list("External") mob_name_prefix = "Pfc. "