diff --git a/modular_skyrat/master_files/icons/mob/clothing/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head.dmi index 2ea77f691d3..1a4240e7df0 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/head.dmi and b/modular_skyrat/master_files/icons/mob/clothing/head.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/mask.dmi b/modular_skyrat/master_files/icons/mob/clothing/mask.dmi index 95d9ea76ef8..4b7cf117ff7 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/mask.dmi and b/modular_skyrat/master_files/icons/mob/clothing/mask.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi b/modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi index e53d558cd97..f07163e9e75 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi and b/modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/suit.dmi b/modular_skyrat/master_files/icons/mob/clothing/suit.dmi index 255827cca1d..d7853ff3b3d 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/suit.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suit.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi index c8656103cbd..6b7d5df0940 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi index afd53ad4f94..d94f146131a 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi index dd2a163342d..32fc7363a23 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi index e995ed80851..4117f920546 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi and b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/masks.dmi b/modular_skyrat/master_files/icons/obj/clothing/masks.dmi index 99df660fb68..00596eda1fb 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/masks.dmi and b/modular_skyrat/master_files/icons/obj/clothing/masks.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi index 0aa284f4117..47d28b15655 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi and b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi index 10f314175a4..dedc3aa6138 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi and b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_skyrat/modules/blastwave_outfits/code/cargo_packs.dm b/modular_skyrat/modules/blastwave_outfits/code/cargo_packs.dm new file mode 100644 index 00000000000..d837c7162a5 --- /dev/null +++ b/modular_skyrat/modules/blastwave_outfits/code/cargo_packs.dm @@ -0,0 +1,13 @@ +/datum/supply_pack/costumes_toys/blastwave + name = "Blastwave Costume Crate" + desc = "Contains an outfit, which replicates the style of army clothing from the underrated video game \"Blastwave: Goners of the Lost City\"." + cost = CARGO_CRATE_VALUE * 3 + contains = list( + /obj/item/clothing/under/blastwave = 1, + /obj/item/clothing/suit/blastwave = 1, + /obj/item/clothing/head/blastwave = 1, + /obj/item/clothing/head/blastwave/officer = 1, + /obj/item/clothing/mask/gas/full = 1, + /obj/item/clothing/shoes/workboots = 1 + ) + crate_name = "blastwave costume crate" diff --git a/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_head.dm b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_head.dm new file mode 100644 index 00000000000..147f70cc1b3 --- /dev/null +++ b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_head.dm @@ -0,0 +1,78 @@ +/obj/item/clothing/head/blastwave + name = "blastwave helmet" + desc = "A plastic helmet with paint applied. Protects as much as cardboard box named 'Bomb Shelter'." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "blastwave_helmet" + flags_inv = HIDEHAIR + uses_advanced_reskins = TRUE + unique_reskin = list( + "Default (Purple)" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_suit", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit" + ), + "Red" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_suit_r", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit_r" + ), + "Green" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_suit_g", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit_g" + ), + "Blue" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_suit_b", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit_b" + ), + "Yellow" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_suit_y", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit_y" + ) + ) + +/obj/item/clothing/head/blastwave/officer + name = "blastwave peaked cap" + desc = "A simple, militaristic cap." + icon_state = "blastwave_offcap" + flags_inv = 0 + unique_reskin = list( + "Default (Purple)" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_offcap", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_offcap" + ), + "Red" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_offcap_r", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_offcap_r" + ), + "Green" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_offcap_g", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_offcap_g" + ), + "Blue" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_offcap_b", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_offcap_b" + ), + "Yellow" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi', + RESKIN_ICON_STATE = "blastwave_offcap_y", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_offcap_y" + ) + ) diff --git a/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_mask.dm b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_mask.dm new file mode 100644 index 00000000000..e19b933de2f --- /dev/null +++ b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_mask.dm @@ -0,0 +1,8 @@ +/obj/item/clothing/mask/gas/full + name = "full gas mask" + desc = "A close-fitting mask. Equipment beloved by many trenchers, mooks and romantically apocalyptic people." + icon = 'modular_skyrat/master_files/icons/obj/clothing/masks.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/mask.dmi' + worn_icon_muzzled = 'modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi' + icon_state = "gas_full" + flags_inv = HIDEEARS | HIDEEYES | HIDEFACE | HIDEHAIR | HIDEFACIALHAIR | HIDESNOUT diff --git a/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_suit.dm b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_suit.dm new file mode 100644 index 00000000000..411767918ca --- /dev/null +++ b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_suit.dm @@ -0,0 +1,41 @@ +/obj/item/clothing/suit/blastwave + name = "blastwave trenchcoat" + desc = "A generic trenchcoat of the boring wars." + icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi' + icon_state = "blastwave_suit" + body_parts_covered = CHEST|GROIN|LEGS|ARMS + uses_advanced_reskins = TRUE + unique_reskin = list( + "Default (Purple)" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi', + RESKIN_ICON_STATE = "blastwave_suit", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit" + ), + "Red" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi', + RESKIN_ICON_STATE = "blastwave_suit_r", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit_r" + ), + "Green" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi', + RESKIN_ICON_STATE = "blastwave_suit_g", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit_g" + ), + "Blue" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi', + RESKIN_ICON_STATE = "blastwave_suit_b", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit_b" + ), + "Yellow" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi', + RESKIN_ICON_STATE = "blastwave_suit_y", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_suit_y" + ) + ) diff --git a/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_uniform.dm b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_uniform.dm new file mode 100644 index 00000000000..9bb18d94c07 --- /dev/null +++ b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_uniform.dm @@ -0,0 +1,41 @@ +/obj/item/clothing/under/blastwave + name = "blastwave uniform" + desc = "An utilitarian uniform of rugged warfare." + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi' + icon_state = "blastwave_uniform" + can_adjust = FALSE + uses_advanced_reskins = TRUE + unique_reskin = list( + "Default (Purple)" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi', + RESKIN_ICON_STATE = "blastwave_uniform", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_uniform" + ), + "Red" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi', + RESKIN_ICON_STATE = "blastwave_uniform_r", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_uniform_r" + ), + "Green" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi', + RESKIN_ICON_STATE = "blastwave_uniform_g", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_uniform_g" + ), + "Blue" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi', + RESKIN_ICON_STATE = "blastwave_uniform_b", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_uniform_b" + ), + "Yellow" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi', + RESKIN_ICON_STATE = "blastwave_uniform_y", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi', + RESKIN_WORN_ICON_STATE = "blastwave_uniform_y" + ) + ) diff --git a/modular_skyrat/modules/blastwave_outfits/readme.md b/modular_skyrat/modules/blastwave_outfits/readme.md new file mode 100644 index 00000000000..2f0414d56af --- /dev/null +++ b/modular_skyrat/modules/blastwave_outfits/readme.md @@ -0,0 +1,48 @@ +TODO + +## Title: GWTB-like Outfit. + +MODULE ID: N/A + +### Description: + +Adds "Gone with the Blastwave" webcomic-inspired outfit. Colors are pre-set via reskinning, and it is not GAGsified at the time being. +This version do not provide armor values. + +### TG Proc/File Changes: + +- N/A + + +### Defines: + +- N/A + + +### Master file additions + +- #CHANGE modular_skyrat\master_files\icons\mob\clothing\head.dmi +- #CHANGE modular_skyrat\master_files\icons\mob\clothing\mask_muzzled.dmi +- #CHANGE modular_skyrat\master_files\icons\mob\clothing\mask.dmi +- #CHANGE modular_skyrat\master_files\icons\mob\clothing\suit_digi.dmi +- #CHANGE modular_skyrat\master_files\icons\mob\clothing\suit.dmi +- #CHANGE modular_skyrat\master_files\icons\mob\clothing\uniform_digi.dmi +- #CHANGE modular_skyrat\master_files\icons\mob\clothing\uniform.dmi +- #CHANGE modular_skyrat\master_files\icons\obj\clothing\hats.dmi +- #CHANGE modular_skyrat\master_files\icons\obj\clothing\masks.dmi +- #CHANGE modular_skyrat\master_files\icons\obj\clothing\suits.dmi +- #CHANGE modular_skyrat\master_files\icons\obj\clothing\uniforms.dmi + + +### Included files that are not contained in this module: + +- #CHANGE modular_skyrat\modules\loadouts\loadout_items\loadout_datum_heads.dm +- #CHANGE modular_skyrat\modules\loadouts\loadout_items\loadout_datum_suit.dm +- #CHANGE modular_skyrat\modules\loadouts\loadout_items\under\loadout_datum_under.dm + + +### Credits: + +Older TG-Station's Detective's Greycoat (blastwave coats are modified versions of it: added colored arm-patches, cuffs and lining), normal helmets (added paint and removed in-built goggles), officer's cap (added colored pin), utility uniform (added color-collar and shoulders); + +[Gone with the Blastwave](http://www.blastwave-comic.com) webcomic by Kimmo Lemetti - inspiration. diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm index ef0f6934bea..fc04684aa15 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm @@ -385,6 +385,14 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea name = "Fashionable Baseball Cap" item_path = /obj/item/clothing/head/soft/yankee +/datum/loadout_item/head/blastwave_helmet + name = "Blastwave Plastic Helmet" + item_path = /obj/item/clothing/head/blastwave + +/datum/loadout_item/head/blastwave_cap + name = "Blastwave Peaked Cap" + item_path = /obj/item/clothing/head/blastwave/officer + /* * COWBOY */ diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm index 86c91837760..77f2374730f 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -425,6 +425,10 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su name = "Cardigan" item_path = /obj/item/clothing/suit/toggle/jacket/cardigan +/datum/loadout_item/suit/blastwave_suit + name = "Blastwave Trenchcoat" + item_path = /obj/item/clothing/suit/blastwave + /* * HOODIES */ diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index a8409a7fbb5..9f936f5003d 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -428,6 +428,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Tactical Pants" item_path = /obj/item/clothing/under/pants/tactical +/datum/loadout_item/under/miscellaneous/blastwave_uniform + name = "Blastwave Uniform" + item_path = /obj/item/clothing/under/blastwave + //HALLOWEEN /datum/loadout_item/under/miscellaneous/pj_blood name = "Blood-red Pajamas" diff --git a/tgstation.dme b/tgstation.dme index c93f078289c..daa1b14a7df 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4940,6 +4940,11 @@ #include "modular_skyrat\modules\black_mesa\code\mobs\mob_spawners.dm" #include "modular_skyrat\modules\black_mesa\code\mobs\nihilanth.dm" #include "modular_skyrat\modules\black_mesa\code\mobs\vortigaunt.dm" +#include "modular_skyrat\modules\blastwave_outfits\code\cargo_packs.dm" +#include "modular_skyrat\modules\blastwave_outfits\code\clothing\blastwave_head.dm" +#include "modular_skyrat\modules\blastwave_outfits\code\clothing\blastwave_mask.dm" +#include "modular_skyrat\modules\blastwave_outfits\code\clothing\blastwave_suit.dm" +#include "modular_skyrat\modules\blastwave_outfits\code\clothing\blastwave_uniform.dm" #include "modular_skyrat\modules\blueshield\code\blueshield.dm" #include "modular_skyrat\modules\blueshield\code\blueshield_closet.dm" #include "modular_skyrat\modules\blueshield\code\blueshield_clothing.dm"