From 4eb931cb81aa52565ee6c7e25550f8721e33e505 Mon Sep 17 00:00:00 2001 From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com> Date: Fri, 1 Jul 2022 06:40:24 -0400 Subject: [PATCH] Solarian Warlord Armor (#14359) --- code/datums/outfits/ert/fsf.dm | 4 +- code/game/objects/items/devices/modkit.dm | 104 ++++++++++++++++- .../crates_lockers/crates/gear_loadout.dm | 12 ++ code/modules/clothing/spacesuits/void/misc.dm | 107 +++++++++++++++++- html/changelogs/dansemacabre-warlords.yml | 42 +++++++ .../contained_items/voidsuits/warlordsuit.dmi | Bin 0 -> 4393 bytes maps/away/ships/fsf_patrol_ship.dmm | 12 +- 7 files changed, 271 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/dansemacabre-warlords.yml create mode 100644 icons/obj/contained_items/voidsuits/warlordsuit.dmi diff --git a/code/datums/outfits/ert/fsf.dm b/code/datums/outfits/ert/fsf.dm index d6b72e78ed4..c2d353695f9 100644 --- a/code/datums/outfits/ert/fsf.dm +++ b/code/datums/outfits/ert/fsf.dm @@ -6,8 +6,8 @@ gloves = /obj/item/clothing/gloves/swat/ert belt = /obj/item/storage/belt/military back = /obj/item/storage/backpack/satchel_norm - head = /obj/item/clothing/head/helmet/space/void/sol - suit = /obj/item/clothing/suit/space/void/sol + head = /obj/item/clothing/head/helmet/space/void/sol/fsf + suit = /obj/item/clothing/suit/space/void/sol/fsf suit_store = /obj/item/gun/projectile/automatic/rifle/sol id = /obj/item/card/id/distress/fsf l_pocket = /obj/item/tank/emergency_oxygen/double diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 1771e0e8bf5..7fc34821718 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -160,4 +160,106 @@ /obj/item/clothing/suit/space/void/atmos = /obj/item/clothing/suit/space/void/atmos/himeo/tajara, /obj/item/clothing/head/helmet/space/void/atmos = /obj/item/clothing/head/helmet/space/void/atmos/himeo/tajara - ) \ No newline at end of file + ) + +/obj/item/voidsuit_modkit/srf + name = "srf 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/srf, + /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/srf + ) + +/obj/item/voidsuit_modkit/league + name = "league 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/league, + /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/league + ) + +/obj/item/voidsuit_modkit/fsf + name = "fsf 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/fsf, + /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/fsf + ) + +/obj/item/voidsuit_modkit/ssmd + name = "ssmd 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/ssmd, + /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/ssmd + ) + +/obj/item/voidsuit_modkit/spg + name = "spg 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/spg, + /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/spg + ) + +/obj/item/voidsuit_modkit/mrsp + name = "mrsp 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/mrsp, + /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/mrsp + ) + +/obj/item/storage/box/srf + name = "srf modkit box" + desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." + starts_with = list(/obj/item/voidsuit_modkit/srf = 4) + +/obj/item/storage/box/league + name = "league modkit box" + desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." + starts_with = list(/obj/item/voidsuit_modkit/league = 4) + +/obj/item/storage/box/fsf + name = "fsf modkit box" + desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." + starts_with = list(/obj/item/voidsuit_modkit/fsf = 4) + +/obj/item/storage/box/ssmd + name = "ssmd modkit box" + desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." + starts_with = list(/obj/item/voidsuit_modkit/ssmd = 4) + +/obj/item/storage/box/spg + name = "spg modkit box" + desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." + starts_with = list(/obj/item/voidsuit_modkit/spg = 4) + +/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 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 1e44f644ff3..43e3c7ca22d 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -169,6 +169,12 @@ new /obj/item/ammo_magazine/mc9mm(src) new /obj/item/ammo_magazine/mc9mm(src) new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/storage/box/srf(src) + new /obj/item/storage/box/league(src) + new /obj/item/storage/box/fsf(src) + new /obj/item/storage/box/ssmd(src) + new /obj/item/storage/box/spg(src) + new /obj/item/storage/box/mrsp(src) /obj/structure/closet/crate/secure/gear_loadout/sol_single/fill() new /obj/item/clothing/under/rank/sol/marine(src) @@ -179,6 +185,12 @@ new /obj/item/ammo_magazine/c762/sol(src) new /obj/item/gun/projectile/pistol/sol(src) new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/storage/box/srf(src) + new /obj/item/storage/box/league(src) + new /obj/item/storage/box/fsf(src) + new /obj/item/storage/box/ssmd(src) + new /obj/item/storage/box/spg(src) + new /obj/item/storage/box/mrsp(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 6d63e4b1d57..b4fbf55062d 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -60,7 +60,7 @@ /obj/item/clothing/suit/space/void/coalition name = "coalition vulture voidsuit" - desc = "An iconic Coalition of Colonies standard-issue voidsuit, designed after the Interstellar War and seen in use to this day." + desc = "An iconic voidsuit of Xanusian make, designed after the Interstellar War and seen in use to this day all throughout the Coalition of Colonies." icon_state = "vulture" item_state = "vulture" slowdown = 1 @@ -786,3 +786,108 @@ ) contained_sprite = TRUE species_restricted = list(BODYTYPE_TAJARA) + +/obj/item/clothing/head/helmet/space/void/sol/srf + name = "solarian restoration front voidsuit helmet" + desc = "An uparmored variant of the gargoyle voidsuit helmet, with a solid visor and redundant comms antenna. Intended for urban combat operations." + icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi' + icon_state = "srf_helmet" + item_state = "srf_helmet" + contained_sprite = TRUE + +/obj/item/clothing/suit/space/void/sol/srf + name = "solarian restoration front voidsuit" + desc = "A variant of the Solarian Armed Forces Type-4 \"Gargoyle\" voidsuit, the Type-5 \"Cyclops\" is the urban combat version of the Gargoyle. While practical testing showed it was a marginal improvement over the Type-4 at best, the SRF have taken to using this modification \ + both on account of its intimidating design and in an effort to distinguish its forces from others using the Type-4, warlord or not. This one has the SRF's flag on the breastplate." + icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi' + icon_state = "srf_suit" + item_state = "srf_suit" + contained_sprite = TRUE + +/obj/item/clothing/head/helmet/space/void/sol/league + name = "anti-corporate league 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 League of Independent Corporate-Free Systems to match the colors of the Xanusian \"Vulture\" voidsuit, and also features a modified comms antenna." + icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi' + icon_state = "league_helmet" + item_state = "league_helmet" + contained_sprite = TRUE + +/obj/item/clothing/suit/space/void/sol/league + name = "anti-corporate league 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 modified by the forces of the League of Independent Corporate-Free Systems to match the colors of the Xanusian \ + \"Vulture\" voidsuit, to make it more easily identified by friendly Coalition forces." + icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi' + icon_state = "league_suit" + item_state = "league_suit" + contained_sprite = TRUE + +/obj/item/clothing/head/helmet/space/void/sol/fsf + name = "free solarian fleets 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 Free Solarian Fleets 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 = "fsf_helmet" + item_state = "fsf_helmet" + contained_sprite = TRUE + +/obj/item/clothing/suit/space/void/sol/fsf + name = "free solarian fleets 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 forces of the Free Solarian Fleets 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 = "fsf_suit" + item_state = "fsf_suit" + contained_sprite = TRUE + +/obj/item/clothing/head/helmet/space/void/sol/ssmd + name = "military district voidsuit helmet" + 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 forces of the Southern Solarian Military District 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 = "ssmd_helmet" + item_state = "ssmd_helmet" + contained_sprite = TRUE + +/obj/item/clothing/suit/space/void/sol/ssmd + name = "military district 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 forces of the Southern Solarian Military District 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 = "ssmd_suit" + item_state = "ssmd_suit" + contained_sprite = TRUE + +/obj/item/clothing/head/helmet/space/void/sol/spg + name = "provisional government voidsuit helmet" + 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 forces of the Solarian Provisional Government 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 = "spg_helmet" + item_state = "spg_helmet" + contained_sprite = TRUE + +/obj/item/clothing/suit/space/void/sol/spg + name = "provisional government 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 forces of the Solarian Provisional Government 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 = "spg_suit" + item_state = "spg_suit" + contained_sprite = TRUE + +/obj/item/clothing/head/helmet/space/void/sol/mrsp + name = "shield pact voidsuit helmet" + 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 Middle Ring Shield Pact 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 = "mrsp_helmet" + item_state = "mrsp_helmet" + contained_sprite = TRUE + +/obj/item/clothing/suit/space/void/sol/mrsp + name = "shield pact 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 Middle Ring Shield Pact 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 = "mrsp_suit" + item_state = "mrsp_suit" + contained_sprite = TRUE \ No newline at end of file diff --git a/html/changelogs/dansemacabre-warlords.yml b/html/changelogs/dansemacabre-warlords.yml new file mode 100644 index 00000000000..9055ffb8136 --- /dev/null +++ b/html/changelogs/dansemacabre-warlords.yml @@ -0,0 +1,42 @@ +################################ +# 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: "Added a number of Solarian warlord variants of the normal Sol voidsuit, spawning in the FSF ship, worn by the FSF ERT, or through modkits that spawn in the sol gear crates." + - tweak: "Reworded the Vulture voidsuit's description slightly." diff --git a/icons/obj/contained_items/voidsuits/warlordsuit.dmi b/icons/obj/contained_items/voidsuits/warlordsuit.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ee1cd5c803d8e5f30fd5645fa8e90e11fa28969d GIT binary patch literal 4393 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 literal 0 HcmV?d00001 diff --git a/maps/away/ships/fsf_patrol_ship.dmm b/maps/away/ships/fsf_patrol_ship.dmm index 51187db3ed9..cd326ef662c 100644 --- a/maps/away/ships/fsf_patrol_ship.dmm +++ b/maps/away/ships/fsf_patrol_ship.dmm @@ -1180,14 +1180,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/fsf, +/obj/item/clothing/head/helmet/space/void/sol/fsf, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship) "iQy" = ( @@ -1503,10 +1503,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/fsf, +/obj/item/clothing/head/helmet/space/void/sol/fsf, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship) "lFg" = ( @@ -2293,14 +2293,14 @@ "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/machinery/light{ dir = 1; icon_state = "tube1" }, /obj/item/tank/jetpack/carbondioxide, +/obj/item/clothing/suit/space/void/sol/fsf, +/obj/item/clothing/head/helmet/space/void/sol/fsf, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship) "vgc" = (