diff --git a/maplestation.dme b/maplestation.dme index 37e4499c977c..d16c388f218e 100644 --- a/maplestation.dme +++ b/maplestation.dme @@ -6515,13 +6515,15 @@ #include "maplestation_modules\code\modules\clothing\digi_clothing.dm" #include "maplestation_modules\code\modules\clothing\accessories\accessories.dm" #include "maplestation_modules\code\modules\clothing\accessories\loadout_accessories.dm" -#include "maplestation_modules\code\modules\clothing\equipment_sets\bartender_equipment\code\barmanvintage.dm" #include "maplestation_modules\code\modules\clothing\equipment_sets\captain_equipment\code\captainclothing.dm" #include "maplestation_modules\code\modules\clothing\equipment_sets\casual_clothing\code\casualclothing.dm" #include "maplestation_modules\code\modules\clothing\equipment_sets\chaplain_equipment\code\chaplainclothing.dm" +#include "maplestation_modules\code\modules\clothing\equipment_sets\cmo_equipment\code\clothing.dm" #include "maplestation_modules\code\modules\clothing\equipment_sets\kimono\code\kimonoclothing.dm" #include "maplestation_modules\code\modules\clothing\equipment_sets\noble_equipment\code\beacon.dm" #include "maplestation_modules\code\modules\clothing\equipment_sets\noble_equipment\code\nobleclothing.dm" +#include "maplestation_modules\code\modules\clothing\equipment_sets\paramedic_equipment\paramedicclothing.dm" +#include "maplestation_modules\code\modules\clothing\equipment_sets\rd_equipment\rd_equipment.dm" #include "maplestation_modules\code\modules\clothing\glasses\beer_eyepatch.dm" #include "maplestation_modules\code\modules\clothing\glasses\blind_goggles.dm" #include "maplestation_modules\code\modules\clothing\glasses\hud_eyepatches.dm" @@ -6534,6 +6536,7 @@ #include "maplestation_modules\code\modules\clothing\head\wig.dm" #include "maplestation_modules\code\modules\clothing\masks\ornithid_masks.dm" #include "maplestation_modules\code\modules\clothing\neck\coconut_bra.dm" +#include "maplestation_modules\code\modules\clothing\neck\loadout_neck.dm" #include "maplestation_modules\code\modules\clothing\shoes\digi_shoes.dm" #include "maplestation_modules\code\modules\clothing\shoes\heavy_shoes.dm" #include "maplestation_modules\code\modules\clothing\shoes\laceup.dm" @@ -6548,6 +6551,7 @@ #include "maplestation_modules\code\modules\clothing\suits\towels_greyscale.dm" #include "maplestation_modules\code\modules\clothing\under\digi_under.dm" #include "maplestation_modules\code\modules\clothing\under\loadout_under.dm" +#include "maplestation_modules\code\modules\clothing\under\jobs\bartender.dm" #include "maplestation_modules\code\modules\clothing\under\jobs\rnd.dm" #include "maplestation_modules\code\modules\clothing\under\jobs\security.dm" #include "maplestation_modules\code\modules\events\resource_drift.dm" @@ -6795,36 +6799,15 @@ #include "maplestation_modules\code\modules\wiremod\component_printer.dm" #include "maplestation_modules\code\modules\wiremod\shells.dm" #ifdef MAPLESTATION_STORY_CONTENT -#include "maplestation_modules\story_content\albert_equipment\code\albertclothing.dm" -#include "maplestation_modules\story_content\albert_equipment\code\albertitem.dm" -#include "maplestation_modules\story_content\alraune_miscitems\code\alrmiscitem.dm" #include "maplestation_modules\story_content\armored_corps\code\clothing\aylie_cloak.dm" #include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\gauss_override.dm" #include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\laser_override.dm" #include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\ppc_override.dm" #include "maplestation_modules\story_content\armored_corps\code\melee\void_blade.dm" -#include "maplestation_modules\story_content\bell_equipment\code\bellclothing.dm" -#include "maplestation_modules\story_content\enma_equipment\code\enmaclothes.dm" -#include "maplestation_modules\story_content\eveleen_equipment\code\clothing.dm" -#include "maplestation_modules\story_content\grey_equipment\code\greyclothing.dm" -#include "maplestation_modules\story_content\isaac_equipment\code\isaacclothing.dm" -#include "maplestation_modules\story_content\jessie_equipment\code\jessie_clothing.dm" -#include "maplestation_modules\story_content\laurence_equipment\code\laurence_clothing.dm" -#include "maplestation_modules\story_content\lini_equipment\code\liniclothing.dm" -#include "maplestation_modules\story_content\localnode_equipment\localnode_core.dm" -#include "maplestation_modules\story_content\molly_equipment\code\mollyclothing.dm" -#include "maplestation_modules\story_content\noname_equipment\code\nonameclothing.dm" -#include "maplestation_modules\story_content\noname_equipment\code\nonameitems.dm" -#include "maplestation_modules\story_content\nurse_equipment\code\vinceclothing.dm" -#include "maplestation_modules\story_content\phoneguy_equipment\code\headphone.dm" +#include "maplestation_modules\story_content\misc\underwear.dm" #include "maplestation_modules\story_content\post_overlay\code\post_overlay.dm" -#include "maplestation_modules\story_content\prince_equipment\code\clothing.dm" -#include "maplestation_modules\story_content\randall_equipment\code\randallclothing.dm" -#include "maplestation_modules\story_content\reshia_equipment\code\reshiaclothing.dm" -#include "maplestation_modules\story_content\ritz_equipment\code\ritzclothing.dm" #include "maplestation_modules\story_content\shiro_equipment\code\shiroclothing.dm" #include "maplestation_modules\story_content\story_posters\code\contraband.dm" -#include "maplestation_modules\story_content\stranger_equipment\code\strangerclothing.dm" #include "maplestation_modules\story_content\volkan_equipment\code\councilgifts.dm" #include "maplestation_modules\story_content\volkan_equipment\code\sunitems.dm" #include "maplestation_modules\story_content\volkan_equipment\code\volkancomponents.dm" diff --git a/maplestation_modules/code/datums/greyscale/_greyscale_config.dm b/maplestation_modules/code/datums/greyscale/_greyscale_config.dm index 78aefe88e5cc..2450b368c896 100644 --- a/maplestation_modules/code/datums/greyscale/_greyscale_config.dm +++ b/maplestation_modules/code/datums/greyscale/_greyscale_config.dm @@ -62,9 +62,9 @@ /datum/greyscale_config/sweet_bow name = "Sweet Bow" - icon_file = 'maplestation_modules/story_content/eveleen_equipment/icons/obj/head.dmi' + icon_file = 'maplestation_modules/icons/obj/clothing/hats.dmi' json_config = 'code/datums/greyscale/json_configs/sweet_bow.json' /datum/greyscale_config/sweet_bow/worn name = "Sweet Bow (Worn)" - icon_file = 'maplestation_modules/story_content/eveleen_equipment/icons/mob/head.dmi' + icon_file = 'maplestation_modules/icons/mob/clothing/head.dmi' diff --git a/maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/code/casualclothing.dm b/maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/code/casualclothing.dm index a3c05628e4b9..241b1d6fb8c7 100644 --- a/maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/code/casualclothing.dm +++ b/maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/code/casualclothing.dm @@ -9,7 +9,7 @@ inhand_icon_state = "hoodie" supports_variations_flags = NONE -/datum/loadout_item/under/jumpsuit/hoodie +/datum/loadout_item/under/plainclothes/hoodie name = "Workout Hoodie" item_path = /obj/item/clothing/under/jumpsuit/casualhoodie @@ -25,7 +25,7 @@ supports_variations_flags = NONE can_adjust = FALSE -/datum/loadout_item/under/jumpsuit/casualdress +/datum/loadout_item/under/formal/casualdress name = "Casual Dress" item_path = /obj/item/clothing/under/jumpsuit/blueskirt @@ -70,10 +70,6 @@ name = "Fuzzy Cloak" item_path = /obj/item/clothing/neck/cloak/casual -/datum/loadout_item/neck/casual_cloak/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - /obj/item/clothing/glasses/sunglasses/casual name = "casual sunglasses" desc = "Stylish sunglasses intended to be purely cosmetic. Makes you look cool at a fraction of the cost." diff --git a/maplestation_modules/story_content/prince_equipment/code/clothing.dm b/maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/code/clothing.dm similarity index 52% rename from maplestation_modules/story_content/prince_equipment/code/clothing.dm rename to maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/code/clothing.dm index de8f61ddc755..e2de30b69a3b 100644 --- a/maplestation_modules/story_content/prince_equipment/code/clothing.dm +++ b/maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/code/clothing.dm @@ -1,10 +1,10 @@ /obj/item/clothing/under/rank/medical/chief_medical_officer/special name = "fitted doctor's uniform" desc = "A custom fit uniform made from higher quality fabric. Its pockets are deeper than the a standard uniform." - icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_item.dmi' - worn_icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_worn.dmi' - lefthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_lhand.dmi' - righthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_rhand.dmi' + icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_item.dmi' + worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_worn.dmi' + lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_lhand.dmi' + righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_rhand.dmi' // Item: "uni" // Sleeves adjusted: "uni_r" (UNUSED) // Adjusted: "uni_d" @@ -18,10 +18,10 @@ /obj/item/clothing/shoes/jackboots/medical name = "medical boots" desc = "Medical grade boots with slots for medical pens. This particular pair seems to have thicker soles on the bottom." - icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_item.dmi' - worn_icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_worn.dmi' - lefthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_lhand.dmi' - righthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_rhand.dmi' + icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_item.dmi' + worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_worn.dmi' + lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_lhand.dmi' + righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_rhand.dmi' // Item: "boots" // Inhand: "boots" // Worn: "boots" @@ -36,10 +36,10 @@ /obj/item/clothing/gloves/latex/nitrile/special name = "high grade nitriles" desc = "Medical grade gloves made from thicker material. These are more resistant to tearing and cuts." - icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_item.dmi' - worn_icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_worn.dmi' - lefthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_lhand.dmi' - righthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_rhand.dmi' + icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_item.dmi' + worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_worn.dmi' + lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_lhand.dmi' + righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_rhand.dmi' // Item: "gloves" // Inhand: "gloves" // Worn: "gloves" @@ -53,10 +53,10 @@ /obj/item/clothing/suit/toggle/labcoat/cmo/special name = "elaborate medical lab coat" desc = "A labcoat made from specialized, high quality fabric to repel blood and other fluids." - icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_item.dmi' - worn_icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_worn.dmi' - lefthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_lhand.dmi' - righthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_rhand.dmi' + icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_item.dmi' + worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_worn.dmi' + lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_lhand.dmi' + righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_rhand.dmi' // Item: "coat" // Adjusted (open): "coat_open" // Inhand: "coat" @@ -68,10 +68,10 @@ /obj/item/storage/belt/medical/cmo name = "chief medical officer's belt" desc = "A belt made with liquid resistant fabric. The emblem on the side suggests this belongs to the Chief Medical Officer." - icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_item.dmi' - worn_icon = 'maplestation_modules/story_content/prince_equipment/icons/doctor_worn.dmi' - lefthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_lhand.dmi' - righthand_file = 'maplestation_modules/story_content/prince_equipment/icons/doctor_rhand.dmi' + icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_item.dmi' + worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_worn.dmi' + lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_lhand.dmi' + righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_rhand.dmi' // Item: "belt" // Inhand: "belt" // Worn: "belt" diff --git a/maplestation_modules/story_content/prince_equipment/icons/doctor_item.dmi b/maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_item.dmi similarity index 100% rename from maplestation_modules/story_content/prince_equipment/icons/doctor_item.dmi rename to maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_item.dmi diff --git a/maplestation_modules/story_content/prince_equipment/icons/doctor_lhand.dmi b/maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_lhand.dmi similarity index 100% rename from maplestation_modules/story_content/prince_equipment/icons/doctor_lhand.dmi rename to maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_lhand.dmi diff --git a/maplestation_modules/story_content/prince_equipment/icons/doctor_rhand.dmi b/maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_rhand.dmi similarity index 100% rename from maplestation_modules/story_content/prince_equipment/icons/doctor_rhand.dmi rename to maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_rhand.dmi diff --git a/maplestation_modules/story_content/prince_equipment/icons/doctor_worn.dmi b/maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_worn.dmi similarity index 100% rename from maplestation_modules/story_content/prince_equipment/icons/doctor_worn.dmi rename to maplestation_modules/code/modules/clothing/equipment_sets/cmo_equipment/icons/doctor_worn.dmi diff --git a/maplestation_modules/code/modules/clothing/equipment_sets/paramedic_equipment/paramedicclothing.dm b/maplestation_modules/code/modules/clothing/equipment_sets/paramedic_equipment/paramedicclothing.dm new file mode 100644 index 000000000000..48f21251ade4 --- /dev/null +++ b/maplestation_modules/code/modules/clothing/equipment_sets/paramedic_equipment/paramedicclothing.dm @@ -0,0 +1,30 @@ +/obj/item/clothing/under/rank/medical/paramedic/green + name = "green paramedic jumpsuit" + desc = "Similarly made like other paramedic's clothings, though it's green, likely brought from another sector." + icon = 'maplestation_modules/icons/obj/clothing/under/medical.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/under/medical.dmi' + digitigrade_file = 'maplestation_modules/icons/mob/clothing/under/medical_digi.dmi' + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/suit/toggle/labcoat/medical/green + name = "green medical labcoat" + desc = "A suit that protects against minor chemical spills. This one is greener than you'd typically expect." + icon = 'maplestation_modules/icons/obj/clothing/labcoat.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/labcoat.dmi' + icon_state = "labcoat_med" + +/obj/item/clothing/gloves/latex/nitrile/green + name = "green nitrile gloves" + desc = "Pricy sterile gloves that are thicker than latex. And it's also green." + icon = 'maplestation_modules/icons/obj/clothing/gloves.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/gloves.dmi' + greyscale_colors = "#298b32" + +/obj/item/clothing/shoes/medical/green + name = "green medical shoes" + desc = "Comfortable-looking shoes, though also quite distinct." + icon_state = "medical" + icon = 'maplestation_modules/icons/obj/clothing/shoes/shoes.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/shoes/shoes.dmi' + digitigrade_file = 'maplestation_modules/icons/mob/clothing/shoes/digi_shoes.dmi' + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION diff --git a/maplestation_modules/code/modules/clothing/equipment_sets/rd_equipment/rd_equipment.dm b/maplestation_modules/code/modules/clothing/equipment_sets/rd_equipment/rd_equipment.dm new file mode 100644 index 000000000000..fe115b7d8275 --- /dev/null +++ b/maplestation_modules/code/modules/clothing/equipment_sets/rd_equipment/rd_equipment.dm @@ -0,0 +1,91 @@ +/obj/item/clothing/under/rank/rnd/research_director/holoturtleneck + name = "holointegrated turtleneck" + desc = "A black turtleneck paired with jeans. It's missing one sleeve and has a triad of small holoprojectors installed on its neck, back and belt buckle." + icon = 'maplestation_modules/icons/obj/clothing/rd.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/rd.dmi' + icon_state = "turtleneck" + base_icon_state = "turtleneck" + inhand_icon_state = "bl_suit" + can_adjust = TRUE + alt_covers_chest = FALSE + var/projectors_enabled = TRUE + +/obj/item/clothing/under/rank/rnd/research_director/holoturtleneck/Initialize(mapload) + . = ..() + update_appearance() + +/obj/item/clothing/under/rank/rnd/research_director/holoturtleneck/click_alt_secondary(mob/user) + projectors_enabled = !projectors_enabled + update_appearance() + update_slot_icon() + +/obj/item/clothing/under/rank/rnd/research_director/holoturtleneck/update_icon_state() + . = ..() + icon_state = "[base_icon_state][projectors_enabled ? "" : "_noholo"]" + worn_icon_state = "[base_icon_state][adjusted ? "_d" : ""][projectors_enabled ? "" : "_noholo"]" + +/obj/item/clothing/under/rank/rnd/research_director/holoturtleneck/update_overlays() + . = ..() + if(projectors_enabled) + . += emissive_appearance(icon, "[icon_state]_e", offset_spokesman = src, alpha = src.alpha) + +/obj/item/clothing/under/rank/rnd/research_director/holoturtleneck/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if(projectors_enabled && !isinhands) + . += emissive_appearance(worn_icon, "[icon_state]_e", offset_spokesman = loc, alpha = src.alpha) + +/obj/item/clothing/gloves/black/holo + name = "mixed gloves" + desc = "A pair of uneven black gloves. Left glove has been cut into nothing more than a strip of fabric with a holoprojector built into it." + icon = 'maplestation_modules/icons/obj/clothing/rd.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/rd.dmi' + icon_state = "gloves" + base_icon_state = "gloves" + var/projectors_enabled = TRUE + +/obj/item/clothing/gloves/black/holo/Initialize(mapload) + . = ..() + update_appearance() + +/obj/item/clothing/gloves/black/holo/click_alt_secondary(mob/user) + projectors_enabled = !projectors_enabled + update_appearance() + update_slot_icon() + +/obj/item/clothing/gloves/black/holo/update_icon_state() + . = ..() + icon_state = "[base_icon_state][projectors_enabled ? "" : "_noholo"]" + worn_icon_state = icon_state + +/obj/item/clothing/gloves/black/holo/update_overlays() + . = ..() + if(projectors_enabled) + . += emissive_appearance(icon, "[icon_state]_e", offset_spokesman = src, alpha = src.alpha) + +/obj/item/clothing/gloves/black/holo/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if(projectors_enabled && !isinhands) + . += emissive_appearance(worn_icon, "[icon_state]_e", offset_spokesman = loc, alpha = src.alpha) + +// Retexture of RD's jacket +/obj/item/clothing/suit/toggle/labcoat/research_director/sidecape + name = "researcher's shoulder cape" + desc = "A white shoulder cape decorated with purple stripes made from an acid-proof material." + icon = 'maplestation_modules/icons/obj/clothing/rd.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/rd.dmi' + icon_state = "cloak" + base_icon_state = "cloak" + slot_flags = ITEM_SLOT_NECK | ITEM_SLOT_OCLOTHING + +/obj/item/clothing/suit/toggle/labcoat/research_director/sidecape/equipped(mob/living/user, slot) + . = ..() + if (slot == ITEM_SLOT_NECK) + set_armor(/datum/armor/none) + else + set_armor(initial(armor_type)) + +/obj/item/storage/bag/garment/research_director/PopulateContents() + . = ..() + new /obj/item/clothing/suit/toggle/labcoat/research_director/sidecape(src) + new /obj/item/clothing/under/rank/rnd/research_director/holoturtleneck(src) + new /obj/item/clothing/gloves/black/holo(src) diff --git a/maplestation_modules/code/modules/clothing/head/loadout_helmet.dm b/maplestation_modules/code/modules/clothing/head/loadout_helmet.dm index df5ef1915e49..683e777ff41f 100644 --- a/maplestation_modules/code/modules/clothing/head/loadout_helmet.dm +++ b/maplestation_modules/code/modules/clothing/head/loadout_helmet.dm @@ -18,3 +18,14 @@ greyscale_colors = "#ffffff#afafaf" icon = 'icons/map_icons/clothing/head/beret.dmi' icon_state = "/obj/item/clothing/head/beret/greyscale_badge" + +/obj/item/clothing/head/bow/sweet + name = "sweet bow" + desc = "A sweet bow that you can place on the back of your head." + icon = 'icons/map_icons/clothing/head/_head.dmi' + icon_state = "/obj/item/clothing/head/bow/sweet" + post_init_icon_state = "sweet_bow" + greyscale_config = /datum/greyscale_config/sweet_bow + greyscale_config_worn = /datum/greyscale_config/sweet_bow/worn + greyscale_colors = "#7b9ab5" + flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/maplestation_modules/code/modules/clothing/head/misc.dm b/maplestation_modules/code/modules/clothing/head/misc.dm index e1789ed7288f..7fb526aaf9a8 100644 --- a/maplestation_modules/code/modules/clothing/head/misc.dm +++ b/maplestation_modules/code/modules/clothing/head/misc.dm @@ -6,4 +6,3 @@ worn_icon_state = "eggcellent_hat" icon = 'maplestation_modules/icons/obj/clothing/hats.dmi' worn_icon = 'maplestation_modules/icons/mob/clothing/head.dmi' - diff --git a/maplestation_modules/code/modules/clothing/neck/loadout_neck.dm b/maplestation_modules/code/modules/clothing/neck/loadout_neck.dm new file mode 100644 index 000000000000..3a3e74727a01 --- /dev/null +++ b/maplestation_modules/code/modules/clothing/neck/loadout_neck.dm @@ -0,0 +1,10 @@ +/obj/item/clothing/neck/mantle + name = "hazard mantle" + desc = "A mantle made of fire and acid proof materials to protect the wearer." + icon = 'maplestation_modules/icons/obj/clothing/mantle.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/mantle.dmi' + icon_state = "light" + inhand_icon_state = null + w_class = WEIGHT_CLASS_SMALL + body_parts_covered = CHEST|ARMS + resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/maplestation_modules/code/modules/clothing/shoes/loadout_shoes.dm b/maplestation_modules/code/modules/clothing/shoes/loadout_shoes.dm index 88a4c36d3609..95208fc7edab 100644 --- a/maplestation_modules/code/modules/clothing/shoes/loadout_shoes.dm +++ b/maplestation_modules/code/modules/clothing/shoes/loadout_shoes.dm @@ -42,3 +42,31 @@ desc = "Fancy high heels. Despite the looks, these weren't tailor-made for you by a fairy godmother." icon_state = "/obj/item/clothing/shoes/heels/fancy" post_init_icon_state = "fancy_heels" + +// loadout items are indexed by typepath, so this is here to be a placeholder. +/obj/item/clothing/shoes/barefoot + name = "barefoot" + icon = null + icon_state = null + item_flags = ABSTRACT|DROPDEL + +/obj/item/clothing/shoes/workboots/designershoes + name = "designer boots" + desc = "Fashionable leather boots with golden details. Worth more than your monthly salary." + icon = 'maplestation_modules/icons/obj/clothing/designer.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/designer.dmi' + icon_state = "designerboots" + +/obj/item/clothing/shoes/workboots/brown + name = "short brown boots" + desc = "Leather boots that have seem to be roughly cut short. Looks like they've seen better days." + icon = 'maplestation_modules/icons/mob/clothing/delinquent.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/delinquent.dmi' + icon_state = "shortboot" + +/obj/item/clothing/shoes/workboots/mercenary + name = "mercenary boots" + desc = "Steel toed boots, durable and lightweight." + icon = 'maplestation_modules/icons/obj/clothing/mercenary.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/mercenary.dmi' + icon_state = "liniboots" diff --git a/maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/code/barmanvintage.dm b/maplestation_modules/code/modules/clothing/under/jobs/bartender.dm similarity index 50% rename from maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/code/barmanvintage.dm rename to maplestation_modules/code/modules/clothing/under/jobs/bartender.dm index 3d22ce5f4786..c4395328457b 100644 --- a/maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/code/barmanvintage.dm +++ b/maplestation_modules/code/modules/clothing/under/jobs/bartender.dm @@ -1,8 +1,8 @@ /obj/item/clothing/under/rank/civilian/bartender/vintageskirt desc = "This is probably more than enough flair for one." name = "vintage bartender's skirt" - icon = 'maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/icons/barmanvintage_icon.dmi' - worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/icons/barmanvintage_worn.dmi' + icon = 'maplestation_modules/icons/obj/clothing/under/barmanvintage.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/under/barmanvintage.dmi' inhand_icon_state = "bar_suit" icon_state = "barman_vintage" alt_covers_chest = TRUE diff --git a/maplestation_modules/code/modules/clothing/under/loadout_under.dm b/maplestation_modules/code/modules/clothing/under/loadout_under.dm index 89a0c2670079..498198678dfe 100644 --- a/maplestation_modules/code/modules/clothing/under/loadout_under.dm +++ b/maplestation_modules/code/modules/clothing/under/loadout_under.dm @@ -97,3 +97,26 @@ icon_state = "countess" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDESHOES + +/obj/item/clothing/under/jumpsuit/redshirt + name = "deep red shirt" + desc = "A casual gothic outfit adorned with black accessories." + icon = 'maplestation_modules/icons/obj/clothing/under/red.dmi' + worn_icon = 'maplestation_modules/icons/obj/clothing/under/red.dmi' + icon_state = "deepred" + inhand_icon_state = null + +/obj/item/clothing/under/jumpsuit/designershirt + name = "designer outfit" + desc = "A very expensive outfit tailored to your body. Worth more than your monthly salary." + icon = 'maplestation_modules/icons/obj/clothing/designer.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/designer.dmi' + icon_state = "designeroutfit" + inhand_icon_state = null + +/obj/item/clothing/under/jumpsuit/merc + name = "mercenary uniform" + desc = "An old uniform that a mercenary would wear." + icon = 'maplestation_modules/icons/obj/clothing/mercenary.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/mercenary.dmi' + icon_state = "liniuniform" diff --git a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_heads.dm b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_heads.dm index 8fd290c76347..0938da5b3450 100644 --- a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_heads.dm +++ b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_heads.dm @@ -280,3 +280,7 @@ name = "Santa Hat" item_path = /obj/item/clothing/head/costume/santa/gags required_holiday = FESTIVE_SEASON + +/datum/loadout_item/head/sweet_bow + name = "Sweet Bow" + item_path = /obj/item/clothing/head/bow/sweet diff --git a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_neck.dm b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_neck.dm index c4699ae4e7c1..418ff58ac174 100644 --- a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_neck.dm +++ b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_neck.dm @@ -53,3 +53,7 @@ /datum/loadout_item/neck/robe_cape name = "Robe Cape" item_path = /obj/item/clothing/neck/robe_cape + +/datum/loadout_item/neck/mantle + name = "Hazard Mantle" + item_path = /obj/item/clothing/neck/mantle diff --git a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm index 742c1a44de32..e79c8e7ab64e 100644 --- a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm +++ b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm @@ -106,9 +106,10 @@ /datum/loadout_item/shoes/barefoot/insert_path_into_outfit(datum/outfit/outfit, list/item_details, mob/living/carbon/human/equipper, visuals_only, job_equipping_step) outfit.shoes = null -// loadout items are indexed by typepath, so this is here to be a placeholder. -/obj/item/clothing/shoes/barefoot - name = "barefoot" - icon = null - icon_state = null - item_flags = ABSTRACT|DROPDEL +/datum/loadout_item/shoes/designer + name = "Designer Boots" + item_path = /obj/item/clothing/shoes/workboots/designershoes + +/datum/loadout_item/shoes/reshiaboot + name = "Short Brown Boots" + item_path = /obj/item/clothing/shoes/workboots/brown diff --git a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm index 09b7ab374127..e6d1a5c98b29 100644 --- a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm +++ b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm @@ -343,3 +343,15 @@ /datum/loadout_item/under/jumpsuit/mvfjumpsuit name = "Pale Jumpsuit" item_path = /obj/item/clothing/under/mvfjumpsuit + +/datum/loadout_item/under/plainclothes/redshirt + name = "Deep Red Shirt" + item_path = /obj/item/clothing/under/jumpsuit/redshirt + +/datum/loadout_item/under/formal/designer + name = "Designer Outfit" + item_path = /obj/item/clothing/under/jumpsuit/designershirt + +/datum/loadout_item/under/plainclothes/mercenary + name = "Mercenary Uniform" + item_path = /obj/item/clothing/under/jumpsuit/merc diff --git a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm index 8cfaaba1d6b6..aaee451f4e44 100644 --- a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -362,6 +362,11 @@ icon = 'maplestation_modules/icons/mob/human_face.dmi' icon_state = "hair_toxiclong" +/datum/sprite_accessory/hair/nia + name = "Nia" + icon = 'maplestation_modules/icons/mob/human_face.dmi' + icon_state = "hair_nia" + // https://github.com/Skyrat-SS13/Skyrat-tg/pull/17656 /datum/sprite_accessory/tails/lizard/big name = "Big" @@ -485,36 +490,12 @@ icon_state = "sideswept" /// -- Undershirts -- -/datum/sprite_accessory/undershirt/ratvarsoul - name = "Ratvar's Soul" - icon_state = "ratvarsoul" - icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi' - gender = NEUTER - -/datum/sprite_accessory/undershirt/defib - name = "Defib" - icon_state = "defib" - icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi' - gender = NEUTER - -/datum/sprite_accessory/undershirt/fleshmass - name = "Pulsating Mass" - icon_state = "fleshmass" - icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi' - gender = NEUTER - /datum/sprite_accessory/undershirt/whiteblouse name = "White Blouse and Bloomers" icon_state = "blouse" icon ='maplestation_modules/icons/mob/clothing/underwear.dmi' gender = NEUTER -/datum/sprite_accessory/undershirt/enmagradient - name = "Red and Blue Gradients" - icon_state = "redblue" - icon ='maplestation_modules/icons/mob/clothing/underwear.dmi' - gender = NEUTER - /// -- Frills -- /datum/sprite_accessory/frills/big name = "Big" @@ -545,6 +526,7 @@ name = "Mismatched Checkered Socks" icon_state = "mismatchpoker" icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi' + natural_spawn = FALSE /datum/sprite_accessory/socks/pokersocks name = "High Black Stockings" diff --git a/maplestation_modules/code/modules/vending/clothesmate.dm b/maplestation_modules/code/modules/vending/clothesmate.dm index e5c67a43fbd7..546b3127b824 100644 --- a/maplestation_modules/code/modules/vending/clothesmate.dm +++ b/maplestation_modules/code/modules/vending/clothesmate.dm @@ -44,14 +44,6 @@ /obj/item/clothing/shoes/heels = 3, ), ), -#ifdef MAPLESTATION_STORY_CONTENT - list( - "name" = "Special", - "products" = list( - /obj/item/clothing/suit/hooded/acolyte = 20, - ), - ), -#endif ) added_premium = list( /obj/item/clothing/shoes/heels/fancy = 2, diff --git a/maplestation_modules/code/modules/vending/wardrobes.dm b/maplestation_modules/code/modules/vending/wardrobes.dm index b5642b736c45..ab57c83b594e 100644 --- a/maplestation_modules/code/modules/vending/wardrobes.dm +++ b/maplestation_modules/code/modules/vending/wardrobes.dm @@ -15,3 +15,11 @@ /obj/item/clothing/shoes/laceup/burgundy = 2, /obj/item/clothing/shoes/laceup/brown = 2, ) + +/obj/machinery/vending/wardrobe/medi_wardrobe + added_products = list( + /obj/item/clothing/gloves/latex/nitrile/green = 2, + /obj/item/clothing/shoes/medical/green = 3, + /obj/item/clothing/suit/toggle/labcoat/medical/green = 3, + /obj/item/clothing/under/rank/medical/paramedic/green = 3, + ) diff --git a/maplestation_modules/story_content/reshia_equipment/icons/reshclothes_worn.dmi b/maplestation_modules/icons/mob/clothing/delinquent.dmi similarity index 100% rename from maplestation_modules/story_content/reshia_equipment/icons/reshclothes_worn.dmi rename to maplestation_modules/icons/mob/clothing/delinquent.dmi diff --git a/maplestation_modules/story_content/grey_equipment/icons/greyclothing_worn.dmi b/maplestation_modules/icons/mob/clothing/designer.dmi similarity index 100% rename from maplestation_modules/story_content/grey_equipment/icons/greyclothing_worn.dmi rename to maplestation_modules/icons/mob/clothing/designer.dmi diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/mob/gloves.dmi b/maplestation_modules/icons/mob/clothing/gloves.dmi similarity index 100% rename from maplestation_modules/story_content/eveleen_equipment/icons/mob/gloves.dmi rename to maplestation_modules/icons/mob/clothing/gloves.dmi diff --git a/maplestation_modules/icons/mob/clothing/head.dmi b/maplestation_modules/icons/mob/clothing/head.dmi index 53b58c15ccae..b35847679979 100644 Binary files a/maplestation_modules/icons/mob/clothing/head.dmi and b/maplestation_modules/icons/mob/clothing/head.dmi differ diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/mob/labcoat.dmi b/maplestation_modules/icons/mob/clothing/labcoat.dmi similarity index 100% rename from maplestation_modules/story_content/eveleen_equipment/icons/mob/labcoat.dmi rename to maplestation_modules/icons/mob/clothing/labcoat.dmi diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/mob/mantle.dmi b/maplestation_modules/icons/mob/clothing/mantle.dmi similarity index 100% rename from maplestation_modules/story_content/eveleen_equipment/icons/mob/mantle.dmi rename to maplestation_modules/icons/mob/clothing/mantle.dmi diff --git a/maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi b/maplestation_modules/icons/mob/clothing/mercenary.dmi similarity index 100% rename from maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi rename to maplestation_modules/icons/mob/clothing/mercenary.dmi diff --git a/maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_worn.dmi b/maplestation_modules/icons/mob/clothing/rd.dmi similarity index 100% rename from maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_worn.dmi rename to maplestation_modules/icons/mob/clothing/rd.dmi diff --git a/maplestation_modules/icons/mob/clothing/shoes/digi_shoes.dmi b/maplestation_modules/icons/mob/clothing/shoes/digi_shoes.dmi index 7fac26fda1a9..cfc8793b0f9f 100644 Binary files a/maplestation_modules/icons/mob/clothing/shoes/digi_shoes.dmi and b/maplestation_modules/icons/mob/clothing/shoes/digi_shoes.dmi differ diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/mob/shoes.dmi b/maplestation_modules/icons/mob/clothing/shoes/shoes.dmi similarity index 100% rename from maplestation_modules/story_content/eveleen_equipment/icons/mob/shoes.dmi rename to maplestation_modules/icons/mob/clothing/shoes/shoes.dmi diff --git a/maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/icons/barmanvintage_worn.dmi b/maplestation_modules/icons/mob/clothing/under/barmanvintage.dmi similarity index 100% rename from maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/icons/barmanvintage_worn.dmi rename to maplestation_modules/icons/mob/clothing/under/barmanvintage.dmi diff --git a/maplestation_modules/icons/mob/clothing/under/medical.dmi b/maplestation_modules/icons/mob/clothing/under/medical.dmi index a1431d5d98d2..e6e97765d07c 100644 Binary files a/maplestation_modules/icons/mob/clothing/under/medical.dmi and b/maplestation_modules/icons/mob/clothing/under/medical.dmi differ diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/mob/medical_digi.dmi b/maplestation_modules/icons/mob/clothing/under/medical_digi.dmi similarity index 100% rename from maplestation_modules/story_content/eveleen_equipment/icons/mob/medical_digi.dmi rename to maplestation_modules/icons/mob/clothing/under/medical_digi.dmi diff --git a/maplestation_modules/story_content/albert_equipment/icons/albertclothing_worn.dmi b/maplestation_modules/icons/mob/clothing/under/red.dmi similarity index 100% rename from maplestation_modules/story_content/albert_equipment/icons/albertclothing_worn.dmi rename to maplestation_modules/icons/mob/clothing/under/red.dmi diff --git a/maplestation_modules/icons/mob/clothing/underwear.dmi b/maplestation_modules/icons/mob/clothing/underwear.dmi index b9ea3824f3ca..01a83f54b167 100644 Binary files a/maplestation_modules/icons/mob/clothing/underwear.dmi and b/maplestation_modules/icons/mob/clothing/underwear.dmi differ diff --git a/maplestation_modules/icons/mob/human_face.dmi b/maplestation_modules/icons/mob/human_face.dmi index f73443b7bb59..29bbb72da11e 100644 Binary files a/maplestation_modules/icons/mob/human_face.dmi and b/maplestation_modules/icons/mob/human_face.dmi differ diff --git a/maplestation_modules/story_content/reshia_equipment/icons/reshclothes_item.dmi b/maplestation_modules/icons/obj/clothing/delinquent.dmi similarity index 100% rename from maplestation_modules/story_content/reshia_equipment/icons/reshclothes_item.dmi rename to maplestation_modules/icons/obj/clothing/delinquent.dmi diff --git a/maplestation_modules/story_content/grey_equipment/icons/greyclothing_item.dmi b/maplestation_modules/icons/obj/clothing/designer.dmi similarity index 100% rename from maplestation_modules/story_content/grey_equipment/icons/greyclothing_item.dmi rename to maplestation_modules/icons/obj/clothing/designer.dmi diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/obj/gloves.dmi b/maplestation_modules/icons/obj/clothing/gloves.dmi similarity index 100% rename from maplestation_modules/story_content/eveleen_equipment/icons/obj/gloves.dmi rename to maplestation_modules/icons/obj/clothing/gloves.dmi diff --git a/maplestation_modules/icons/obj/clothing/hats.dmi b/maplestation_modules/icons/obj/clothing/hats.dmi index 449971f582be..d9c674609201 100644 Binary files a/maplestation_modules/icons/obj/clothing/hats.dmi and b/maplestation_modules/icons/obj/clothing/hats.dmi differ diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/obj/labcoat.dmi b/maplestation_modules/icons/obj/clothing/labcoat.dmi similarity index 100% rename from maplestation_modules/story_content/eveleen_equipment/icons/obj/labcoat.dmi rename to maplestation_modules/icons/obj/clothing/labcoat.dmi diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/obj/mantle.dmi b/maplestation_modules/icons/obj/clothing/mantle.dmi similarity index 100% rename from maplestation_modules/story_content/eveleen_equipment/icons/obj/mantle.dmi rename to maplestation_modules/icons/obj/clothing/mantle.dmi diff --git a/maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi b/maplestation_modules/icons/obj/clothing/mercenary.dmi similarity index 100% rename from maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi rename to maplestation_modules/icons/obj/clothing/mercenary.dmi diff --git a/maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_item.dmi b/maplestation_modules/icons/obj/clothing/rd.dmi similarity index 100% rename from maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_item.dmi rename to maplestation_modules/icons/obj/clothing/rd.dmi diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/obj/shoes.dmi b/maplestation_modules/icons/obj/clothing/shoes/shoes.dmi similarity index 100% rename from maplestation_modules/story_content/eveleen_equipment/icons/obj/shoes.dmi rename to maplestation_modules/icons/obj/clothing/shoes/shoes.dmi diff --git a/maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/icons/barmanvintage_icon.dmi b/maplestation_modules/icons/obj/clothing/under/barmanvintage.dmi similarity index 100% rename from maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/icons/barmanvintage_icon.dmi rename to maplestation_modules/icons/obj/clothing/under/barmanvintage.dmi diff --git a/maplestation_modules/icons/obj/clothing/under/medical.dmi b/maplestation_modules/icons/obj/clothing/under/medical.dmi index f83a7aafb910..aeaf96cbc2b0 100644 Binary files a/maplestation_modules/icons/obj/clothing/under/medical.dmi and b/maplestation_modules/icons/obj/clothing/under/medical.dmi differ diff --git a/maplestation_modules/story_content/albert_equipment/icons/albertclothing_item.dmi b/maplestation_modules/icons/obj/clothing/under/red.dmi similarity index 100% rename from maplestation_modules/story_content/albert_equipment/icons/albertclothing_item.dmi rename to maplestation_modules/icons/obj/clothing/under/red.dmi diff --git a/maplestation_modules/story_content/albert_equipment/code/albertclothing.dm b/maplestation_modules/story_content/albert_equipment/code/albertclothing.dm deleted file mode 100644 index eb00ed94dfad..000000000000 --- a/maplestation_modules/story_content/albert_equipment/code/albertclothing.dm +++ /dev/null @@ -1,12 +0,0 @@ -// --- suit thing --- -/obj/item/clothing/under/jumpsuit/albertshirt - name = "deep red shirt" - desc = "A casual gothic outfit adorned with black accessories." - icon = 'maplestation_modules/story_content/albert_equipment/icons/albertclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/albert_equipment/icons/albertclothing_worn.dmi' - icon_state = "deepred" - inhand_icon_state = null - -/datum/loadout_item/under/jumpsuit/albertshirt - name = "Deep Red Shirt" - item_path = /obj/item/clothing/under/jumpsuit/albertshirt diff --git a/maplestation_modules/story_content/albert_equipment/code/albertitem.dm b/maplestation_modules/story_content/albert_equipment/code/albertitem.dm deleted file mode 100644 index 3cba86cdd4f8..000000000000 --- a/maplestation_modules/story_content/albert_equipment/code/albertitem.dm +++ /dev/null @@ -1,15 +0,0 @@ -// --- plushie --- -/obj/item/toy/plush/albertcat - name = "Albus" - desc = "A handstitched white and red cat plush. Holding it, your heart feels heavy.." - icon = 'maplestation_modules/story_content/albert_equipment/icons/albertitem_item.dmi' - icon_state = "albus" - inhand_icon_state = null - -/datum/loadout_item/pocket_items/plush/albertcat - name = "Plush (Albus)" - item_path = /obj/item/toy/plush/albertcat - -/datum/loadout_item/pocket_items/plush/albertcat/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/albert_equipment/icons/albertitem_item.dmi b/maplestation_modules/story_content/albert_equipment/icons/albertitem_item.dmi deleted file mode 100644 index 02dec27e80ac..000000000000 Binary files a/maplestation_modules/story_content/albert_equipment/icons/albertitem_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/alraune_miscitems/code/alrmiscitem.dm b/maplestation_modules/story_content/alraune_miscitems/code/alrmiscitem.dm deleted file mode 100644 index 2987f0116bb9..000000000000 --- a/maplestation_modules/story_content/alraune_miscitems/code/alrmiscitem.dm +++ /dev/null @@ -1,18 +0,0 @@ -// --- talisman --- - -/obj/item/clothing/head/costume/goldfulu - name = "golden fulu" - desc = "A golden talisman with an unknown script written in red." - icon = 'maplestation_modules/story_content/alraune_miscitems/icons/alrmiscitem_item.dmi' - worn_icon = 'maplestation_modules/story_content/alraune_miscitems/icons/alrmiscitem_worn.dmi' - icon_state = "fulu" - resistance_flags = INDESTRUCTIBLE - clothing_traits = list(TRAIT_TOXINLOVER) - -/datum/loadout_item/head/goldfulu - name = "Golden Fulu" - item_path = /obj/item/clothing/head/costume/goldfulu - -/datum/loadout_item/head/goldfulu/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/alraune_miscitems/icons/alrmiscitem_item.dmi b/maplestation_modules/story_content/alraune_miscitems/icons/alrmiscitem_item.dmi deleted file mode 100644 index f80c6e05452c..000000000000 Binary files a/maplestation_modules/story_content/alraune_miscitems/icons/alrmiscitem_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/alraune_miscitems/icons/alrmiscitem_worn.dmi b/maplestation_modules/story_content/alraune_miscitems/icons/alrmiscitem_worn.dmi deleted file mode 100644 index 74f797695981..000000000000 Binary files a/maplestation_modules/story_content/alraune_miscitems/icons/alrmiscitem_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/bell_equipment/code/bellclothing.dm b/maplestation_modules/story_content/bell_equipment/code/bellclothing.dm deleted file mode 100644 index ebfcf35c34cd..000000000000 --- a/maplestation_modules/story_content/bell_equipment/code/bellclothing.dm +++ /dev/null @@ -1,33 +0,0 @@ -// --- regular outfit --- - -/obj/item/clothing/under/jumpsuit/belli - name = "modified nun uniform" - desc = "A heavily modified nun uniform tinted pink with white lace and red ribbons. Stomp out cultists with style!" - icon = 'maplestation_modules/story_content/bell_equipment/icons/bellclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/bell_equipment/icons/bellclothing_worn.dmi' - icon_state = "nundress" - resistance_flags = INDESTRUCTIBLE - alternate_worn_layer = ABOVE_SHOES_LAYER - -/datum/loadout_item/under/jumpsuit/belli - name = "Modified Nun Uniform" - item_path = /obj/item/clothing/under/jumpsuit/belli - -/datum/loadout_item/under/jumpsuit/belli/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/head/costume/hat/belli - name = "pink nun veil" - desc = "A pink nun veil with just enough space to let your hair hang out." - icon = 'maplestation_modules/story_content/bell_equipment/icons/bellclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/bell_equipment/icons/bellclothing_worn.dmi' - icon_state = "nunveil" - -/datum/loadout_item/head/belli - name = "Modified Nun Veil" - item_path = /obj/item/clothing/head/costume/hat/belli - -/datum/loadout_item/head/belli/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/bell_equipment/icons/bellclothing_item.dmi b/maplestation_modules/story_content/bell_equipment/icons/bellclothing_item.dmi deleted file mode 100644 index 6d9910c2ec0b..000000000000 Binary files a/maplestation_modules/story_content/bell_equipment/icons/bellclothing_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/bell_equipment/icons/bellclothing_worn.dmi b/maplestation_modules/story_content/bell_equipment/icons/bellclothing_worn.dmi deleted file mode 100644 index 08f8f1462dc2..000000000000 Binary files a/maplestation_modules/story_content/bell_equipment/icons/bellclothing_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/enma_equipment/code/enmaclothes.dm b/maplestation_modules/story_content/enma_equipment/code/enmaclothes.dm deleted file mode 100644 index ea148432be6c..000000000000 --- a/maplestation_modules/story_content/enma_equipment/code/enmaclothes.dm +++ /dev/null @@ -1,68 +0,0 @@ -// -- enma clothes -- - -/obj/item/clothing/under/jumpsuit/enma - name = "short black robe" - desc = "A deep black robe with a very short trim. Colorful outlines adorn the sleeves and front. There's a black collar with the moon attached." - icon = 'maplestation_modules/story_content/enma_equipment/icons/enmaclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/enma_equipment/icons/enmaclothes_worn.dmi' - icon_state = "robe" - resistance_flags = INDESTRUCTIBLE - alternate_worn_layer = ABOVE_SHOES_LAYER - clothing_traits = list(TRAIT_TOXINLOVER, TRAIT_NOBREATH) // no more ahelp for nobreath - -/datum/loadout_item/under/formal/enma - name = "Short Black Robe" - item_path = /obj/item/clothing/under/jumpsuit/enma - -/datum/loadout_item/under/formal/enma/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/suit/enma - name = "thin blue scarf" - desc = "A loose scarf that barely clings on, with a yellow scarf to keep it all together. If you look close enough, you can see stars shimmering on it." - icon = 'maplestation_modules/story_content/enma_equipment/icons/enmaclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/enma_equipment/icons/enmaclothes_worn.dmi' - icon_state = "scarf" - resistance_flags = INDESTRUCTIBLE - alternate_worn_layer = ABOVE_SHOES_LAYER - -/datum/loadout_item/suit/enma - name = "Thin Blue Scarf" - item_path = /obj/item/clothing/suit/enma - -/datum/loadout_item/suit/enma/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/shoes/enma - name = "golden leg cuffs" - desc = "A golden cuff that attaches to the ankle, chained to Venus." - icon = 'maplestation_modules/story_content/enma_equipment/icons/enmaclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/enma_equipment/icons/enmaclothes_worn.dmi' - icon_state = "shackle" - resistance_flags = INDESTRUCTIBLE - -/datum/loadout_item/shoes/enma - name = "Golden Leg Cuffs" - item_path = /obj/item/clothing/shoes/enma - -/datum/loadout_item/shoes/enma/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/gloves/enma - name = "golden handcuffs" - desc = "Golden cuffs chained to several planets, Earth, Jupiter, Mars, and Neptune." - icon = 'maplestation_modules/story_content/enma_equipment/icons/enmaclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/enma_equipment/icons/enmaclothes_worn.dmi' - icon_state = "handcuffs" - resistance_flags = INDESTRUCTIBLE - -/datum/loadout_item/gloves/enma - name = "Golden Handcuffs" - item_path = /obj/item/clothing/gloves/enma - -/datum/loadout_item/gloves/enma/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/enma_equipment/icons/enmaclothes_item.dmi b/maplestation_modules/story_content/enma_equipment/icons/enmaclothes_item.dmi deleted file mode 100644 index 01d8d9c3292b..000000000000 Binary files a/maplestation_modules/story_content/enma_equipment/icons/enmaclothes_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/enma_equipment/icons/enmaclothes_worn.dmi b/maplestation_modules/story_content/enma_equipment/icons/enmaclothes_worn.dmi deleted file mode 100644 index fbafc9e221f7..000000000000 Binary files a/maplestation_modules/story_content/enma_equipment/icons/enmaclothes_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/eveleen_equipment/code/clothing.dm b/maplestation_modules/story_content/eveleen_equipment/code/clothing.dm deleted file mode 100644 index 47d27778ff3d..000000000000 --- a/maplestation_modules/story_content/eveleen_equipment/code/clothing.dm +++ /dev/null @@ -1,98 +0,0 @@ -/obj/item/clothing/head/bow/sweet - name = "sweet bow" - desc = "A sweet bow that you can place on the back of your head." - icon = 'icons/map_icons/clothing/head/_head.dmi' - icon_state = "/obj/item/clothing/head/bow/sweet" - post_init_icon_state = "sweet_bow" - greyscale_config = /datum/greyscale_config/sweet_bow - greyscale_config_worn = /datum/greyscale_config/sweet_bow/worn - greyscale_colors = "#7b9ab5" - flags_1 = IS_PLAYER_COLORABLE_1 - -/obj/item/clothing/under/rank/medical/paramedic/green - name = "green paramedic jumpsuit" - desc = "Similarly made like other paramedic's clothings, though it's green, likely brought from another sector." - icon = 'maplestation_modules/story_content/eveleen_equipment/icons/obj/medical.dmi' - worn_icon = 'maplestation_modules/story_content/eveleen_equipment/icons/mob/medical.dmi' - - -/obj/item/clothing/suit/toggle/labcoat/medical/green - name = "green medical labcoat" - desc = "A suit that protects against minor chemical spills. This one is greener than you'd typically expect." - icon = 'maplestation_modules/story_content/eveleen_equipment/icons/obj/labcoat.dmi' - worn_icon = 'maplestation_modules/story_content/eveleen_equipment/icons/mob/labcoat.dmi' - icon_state = "labcoat_med" - -/obj/item/clothing/neck/mantle - name = "hazard mantle" - desc = "A mantle made of fire and acid proof materials to protect the wearer." - icon = 'maplestation_modules/story_content/eveleen_equipment/icons/obj/mantle.dmi' - worn_icon = 'maplestation_modules/story_content/eveleen_equipment/icons/mob/mantle.dmi' - icon_state = "light" - inhand_icon_state = null - w_class = WEIGHT_CLASS_SMALL - body_parts_covered = CHEST|ARMS - resistance_flags = FIRE_PROOF | ACID_PROOF - -/obj/item/clothing/gloves/latex/nitrile/green - name = "green nitrile gloves" - desc = "Pricy sterile gloves that are thicker than latex. And it's also green." - icon = 'maplestation_modules/story_content/eveleen_equipment/icons/obj/gloves.dmi' - worn_icon = 'maplestation_modules/story_content/eveleen_equipment/icons/mob/gloves.dmi' - greyscale_colors = "#298b32" - -/obj/item/clothing/shoes/medical/green - name = "green medical shoes" - desc = "Comfortable-looking shoes, though also quite distinct." - icon = 'maplestation_modules/story_content/eveleen_equipment/icons/obj/shoes.dmi' - icon_state = "medical" - worn_icon = 'maplestation_modules/story_content/eveleen_equipment/icons/mob/shoes.dmi' - -/datum/loadout_item/head/sweet_bow - name = "Sweet Bow" - item_path = /obj/item/clothing/head/bow/sweet - -/datum/loadout_item/head/sweet_bow/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/datum/loadout_item/under/jumpsuit/green_paramedic - name = "Green Paramedic Jumpsuit" - item_path = /obj/item/clothing/under/rank/medical/paramedic/green - -/datum/loadout_item/under/jumpsuit/green_paramedic/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/datum/loadout_item/suit/green_labcoat - name = "Green Medical Labcoat" - item_path = /obj/item/clothing/suit/toggle/labcoat/medical/green - -/datum/loadout_item/suit/green_labcoat/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/datum/loadout_item/neck/mantle - name = "Hazard Mantle" - item_path = /obj/item/clothing/neck/mantle - -/datum/loadout_item/gloves/green_nitrile - name = "Green Nitrile Gloves" - item_path = /obj/item/clothing/gloves/latex/nitrile/green - -/datum/loadout_item/gloves/green_nitrile/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/datum/loadout_item/shoes/green_medical - name = "green medical shoes" - item_path = /obj/item/clothing/shoes/medical/green - -/datum/loadout_item/shoes/green_medical/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/datum/sprite_accessory/hair/nia - name = "Nia" - icon = 'maplestation_modules/icons/mob/human_face.dmi' - icon_state = "hair_nia" diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/mob/head.dmi b/maplestation_modules/story_content/eveleen_equipment/icons/mob/head.dmi deleted file mode 100644 index 72ae74042607..000000000000 Binary files a/maplestation_modules/story_content/eveleen_equipment/icons/mob/head.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/mob/medical.dmi b/maplestation_modules/story_content/eveleen_equipment/icons/mob/medical.dmi deleted file mode 100644 index 30435ac30992..000000000000 Binary files a/maplestation_modules/story_content/eveleen_equipment/icons/mob/medical.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/mob/shoes_digi.dmi b/maplestation_modules/story_content/eveleen_equipment/icons/mob/shoes_digi.dmi deleted file mode 100644 index 902f09e2992f..000000000000 Binary files a/maplestation_modules/story_content/eveleen_equipment/icons/mob/shoes_digi.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/obj/head.dmi b/maplestation_modules/story_content/eveleen_equipment/icons/obj/head.dmi deleted file mode 100644 index 0c5f4327a8e2..000000000000 Binary files a/maplestation_modules/story_content/eveleen_equipment/icons/obj/head.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/eveleen_equipment/icons/obj/medical.dmi b/maplestation_modules/story_content/eveleen_equipment/icons/obj/medical.dmi deleted file mode 100644 index 0605f388292b..000000000000 Binary files a/maplestation_modules/story_content/eveleen_equipment/icons/obj/medical.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/grey_equipment/code/greyclothing.dm b/maplestation_modules/story_content/grey_equipment/code/greyclothing.dm deleted file mode 100644 index b22a8bcba1b8..000000000000 --- a/maplestation_modules/story_content/grey_equipment/code/greyclothing.dm +++ /dev/null @@ -1,26 +0,0 @@ -/obj/item/clothing/under/jumpsuit/greyshirt - name = "designer outfit" - desc = "A very expensive outfit tailored to your body. Vex refused to show you the recipt for this" - icon = 'maplestation_modules/story_content/grey_equipment/icons/greyclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/grey_equipment/icons/greyclothing_worn.dmi' - icon_state = "designeroutfit" - inhand_icon_state = null - -/datum/loadout_item/under/formal/grey - name = "Designer Outfit" - item_path = /obj/item/clothing/under/jumpsuit/greyshirt - -/datum/loadout_item/under/formal/grey/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/shoes/greyboots - name = "designer boots" - desc = "Fashionable leather boots with golden details. Worth more than your monthly salary." - icon = 'maplestation_modules/story_content/grey_equipment/icons/greyclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/grey_equipment/icons/greyclothing_worn.dmi' - icon_state = "designerboots" - -/datum/loadout_item/shoes/grey - name = "Designer Boots" - item_path = /obj/item/clothing/shoes/greyboots diff --git a/maplestation_modules/story_content/isaac_equipment/code/isaacclothing.dm b/maplestation_modules/story_content/isaac_equipment/code/isaacclothing.dm deleted file mode 100644 index 7cb7c7956d07..000000000000 --- a/maplestation_modules/story_content/isaac_equipment/code/isaacclothing.dm +++ /dev/null @@ -1,64 +0,0 @@ -/obj/item/clothing/under/jumpsuit/paintersuit - name = "painter's suit" - desc = "A horrendously expensive suit made out of alien materials. It's well worn, covered in paint and other stains." - icon = 'maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_worn.dmi' - icon_state = "paintersuit" - body_parts_covered = CHEST|GROIN|ARMS - alternate_worn_layer = ABOVE_SHOES_LAYER - inhand_icon_state = null - -/datum/loadout_item/under/formal/isaac - name = "Painter's Suit" - item_path = /obj/item/clothing/under/jumpsuit/paintersuit - -/datum/loadout_item/under/formal/isaac/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/shoes/elvenboots - name = "elven boots" - desc = "Expensive boots made out of some sort of alien leather. Smells like looking down your nose at people." - icon = 'maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_worn.dmi' - icon_state = "elvenboots" - -/datum/loadout_item/shoes/isaac - name = "Elven Boots" - item_path = /obj/item/clothing/shoes/elvenboots - -/datum/loadout_item/shoes/isaac/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/under/jumpsuit/advsuit - name = "adventurer's suit" - desc = "A suit made to reflect the wearer's new life. There's a small moon attached to the choker and an empty gun holster at its side." - icon = 'maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_worn.dmi' - icon_state = "advsuit" - body_parts_covered = CHEST|GROIN|ARMS - inhand_icon_state = null - -/datum/loadout_item/under/formal/isaacnew - name = "Adventurer's Suit" - item_path = /obj/item/clothing/under/jumpsuit/advsuit - -/datum/loadout_item/under/formal/isaacnew/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/shoes/advboots - name = "adventurer boots" - desc = "Boots made to fit the new suit. Smells like wanting to be at equal footing with others." - icon = 'maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_worn.dmi' - icon_state = "advboots" - -/datum/loadout_item/shoes/isaacnew - name = "Adventurer Boots" - item_path = /obj/item/clothing/shoes/advboots - -/datum/loadout_item/shoes/isaacnew/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_item.dmi b/maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_item.dmi deleted file mode 100644 index adac52dbf2c4..000000000000 Binary files a/maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_worn.dmi b/maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_worn.dmi deleted file mode 100644 index a1aeef8b9cfc..000000000000 Binary files a/maplestation_modules/story_content/isaac_equipment/icons/isaacclothing_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/jessie_equipment/code/jessie_clothing.dm b/maplestation_modules/story_content/jessie_equipment/code/jessie_clothing.dm deleted file mode 100644 index 41541fed999d..000000000000 --- a/maplestation_modules/story_content/jessie_equipment/code/jessie_clothing.dm +++ /dev/null @@ -1,111 +0,0 @@ -/obj/item/clothing/under/rank/rnd/research_director/jessie_turtleneck - name = "holointegrated turtleneck" - desc = "A black turtleneck paired with jeans. It's missing one sleeve and has a triad of small holoprojectors installed on its neck, back and belt buckle." - icon = 'maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_item.dmi' - worn_icon = 'maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_worn.dmi' - icon_state = "turtleneck" - base_icon_state = "turtleneck" - inhand_icon_state = "bl_suit" - can_adjust = TRUE - alt_covers_chest = FALSE - var/projectors_enabled = TRUE - -/obj/item/clothing/under/rank/rnd/research_director/Initialize(mapload) - . = ..() - update_icon(UPDATE_OVERLAYS) - -/obj/item/clothing/under/rank/rnd/research_director/jessie_turtleneck/click_alt_secondary(mob/user) - projectors_enabled = !projectors_enabled - update_appearance() - if (user == loc) - user.update_clothing(slot_flags) - -/obj/item/clothing/under/rank/rnd/research_director/jessie_turtleneck/update_icon() - . = ..() - icon_state = "[base_icon_state][projectors_enabled ? "" : "_noholo"]" - worn_icon_state = "[base_icon_state][adjusted ? "_d" : ""][projectors_enabled ? "" : "_noholo"]" - -/obj/item/clothing/under/rank/rnd/research_director/jessie_turtleneck/update_overlays() - . = ..() - if(projectors_enabled) - . += emissive_appearance(icon, "[icon_state]_e", offset_spokesman = src, alpha = src.alpha) - -/obj/item/clothing/under/rank/rnd/research_director/jessie_turtleneck/worn_overlays(mutable_appearance/standing, isinhands, icon_file) - . = ..() - if(projectors_enabled && !isinhands) - . += emissive_appearance(worn_icon, "[icon_state]_e", offset_spokesman = loc, alpha = src.alpha) - -/datum/loadout_item/under/jumpsuit/jessie_turtleneck - name = "Holointegrated Turtleneck" - item_path = /obj/item/clothing/under/rank/rnd/research_director/jessie_turtleneck - -/datum/loadout_item/under/jumpsuit/jessie_turtleneck/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/gloves/black/jessie_gloves - name = "mixed gloves" - desc = "A pair of uneven black gloves. Left glove has been cut into nothing more than a strip of fabric with a holoprojector built into it." - icon = 'maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_item.dmi' - worn_icon = 'maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_worn.dmi' - icon_state = "gloves" - base_icon_state = "gloves" - var/projectors_enabled = TRUE - -/obj/item/clothing/gloves/black/jessie_gloves/Initialize(mapload) - . = ..() - update_icon(UPDATE_OVERLAYS) - -/obj/item/clothing/gloves/black/jessie_gloves/click_alt_secondary(mob/user) - projectors_enabled = !projectors_enabled - update_appearance() - if (user == loc) - user.update_clothing(slot_flags) - -/obj/item/clothing/gloves/black/jessie_gloves/update_icon() - . = ..() - icon_state = "[base_icon_state][projectors_enabled ? "" : "_noholo"]" - worn_icon_state = icon_state - -/obj/item/clothing/gloves/black/jessie_gloves/update_overlays() - . = ..() - if(projectors_enabled) - . += emissive_appearance(icon, "[icon_state]_e", offset_spokesman = src, alpha = src.alpha) - -/obj/item/clothing/gloves/black/jessie_gloves/worn_overlays(mutable_appearance/standing, isinhands, icon_file) - . = ..() - if(projectors_enabled && !isinhands) - . += emissive_appearance(worn_icon, "[icon_state]_e", offset_spokesman = loc, alpha = src.alpha) - -/datum/loadout_item/gloves/jessie_gloves - name = "Mixed Gloves" - item_path = /obj/item/clothing/gloves/black/jessie_gloves - -/datum/loadout_item/gloves/jessie_gloves/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -// Retexture of RD's jacket -/obj/item/clothing/suit/toggle/labcoat/research_director/jessie_cape - name = "researcher's shoulder cape" - desc = "A white shoulder cape decorated with purple stripes made from an acid-proof material." - icon = 'maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_item.dmi' - worn_icon = 'maplestation_modules/story_content/jessie_equipment/icons/jessieuniform_worn.dmi' - icon_state = "cloak" - base_icon_state = "cloak" - slot_flags = ITEM_SLOT_NECK | ITEM_SLOT_OCLOTHING - -/obj/item/clothing/suit/toggle/labcoat/research_director/jessie_cape/equipped(mob/living/user, slot) - . = ..() - if (slot == ITEM_SLOT_NECK) - set_armor(/datum/armor/none) - else - set_armor(initial(armor_type)) - -/datum/loadout_item/suit/jessie_cape - name = "Researcher's Shoulder Cape" - item_path = /obj/item/clothing/suit/toggle/labcoat/research_director/jessie_cape - -/datum/loadout_item/suit/jessie_cape/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/laurence_equipment/code/laurence_clothing.dm b/maplestation_modules/story_content/laurence_equipment/code/laurence_clothing.dm deleted file mode 100644 index bbbe5a314a65..000000000000 --- a/maplestation_modules/story_content/laurence_equipment/code/laurence_clothing.dm +++ /dev/null @@ -1,43 +0,0 @@ -/obj/item/clothing/under/rank/captain/malheur - name = "disheveled Malheur Research cook's uniform" - desc = "A disheveled Malheur Research Association Uniform. Whoever the wearer is, they don't dress for looks." - icon_state = "suit" - inhand_icon_state = "chef" - icon = 'maplestation_modules/story_content/laurence_equipment/icons/laurclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/laurence_equipment/icons/laurclothes_worn.dmi' - can_adjust = FALSE - -/obj/item/clothing/gloves/captain/malheur - name = "\improper Malheur Research chef's glove" - desc = "Gloves come in a pair normally... Wonder where the other glove could be." - icon_state = "glove" - gender = NEUTER - icon = 'maplestation_modules/story_content/laurence_equipment/icons/laurclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/laurence_equipment/icons/laurclothes_worn.dmi' - -/obj/item/clothing/shoes/malheur - name = "\improper Malheur Research buckled loafers" - desc = "Ordinary loafers, but they appear to be made with a reinforced leather. Must be standard wear for Malheur Research Uniforms." - icon_state = "loafers" - equip_delay_other = 5 SECONDS - icon = 'maplestation_modules/story_content/laurence_equipment/icons/laurclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/laurence_equipment/icons/laurclothes_worn.dmi' - -/obj/item/clothing/neck/malheur - name = "heroic scarf" - desc = "\"Heroes wear red, right?\" It looks like it can be a bit tighter." - icon = 'maplestation_modules/story_content/laurence_equipment/icons/laurclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/laurence_equipment/icons/laurclothes_worn.dmi' - icon_state = "scarf" - -/obj/item/clothing/neck/malheur/Initialize(mapload) - . = ..() - AddComponent(/datum/component/toggle_icon, "tightness") - -// Bag time -/obj/item/storage/bag/garment/cap_cust/PopulateContents() - . = ..() - new /obj/item/clothing/under/rank/captain/malheur(src) - new /obj/item/clothing/gloves/captain/malheur(src) - new /obj/item/clothing/shoes/malheur(src) - new /obj/item/clothing/neck/malheur(src) diff --git a/maplestation_modules/story_content/laurence_equipment/icons/laurclothes_item.dmi b/maplestation_modules/story_content/laurence_equipment/icons/laurclothes_item.dmi deleted file mode 100644 index 8b7413885471..000000000000 Binary files a/maplestation_modules/story_content/laurence_equipment/icons/laurclothes_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/laurence_equipment/icons/laurclothes_worn.dmi b/maplestation_modules/story_content/laurence_equipment/icons/laurclothes_worn.dmi deleted file mode 100644 index f90817ffd485..000000000000 Binary files a/maplestation_modules/story_content/laurence_equipment/icons/laurclothes_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/lini_equipment/code/liniclothing.dm b/maplestation_modules/story_content/lini_equipment/code/liniclothing.dm deleted file mode 100644 index a362d9db7b8d..000000000000 --- a/maplestation_modules/story_content/lini_equipment/code/liniclothing.dm +++ /dev/null @@ -1,31 +0,0 @@ -/obj/item/clothing/under/jumpsuit/lini - name = "Berbier Uniform" - desc = "An old uniform leftover from Lini's time with her old mercenary company, B.M.M.I. I. Worn more for convenience than anything." - resistance_flags = FIRE_PROOF|ACID_PROOF - icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi' - worn_icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi' - icon_state = "liniuniform" - -/datum/loadout_item/under/jumpsuit/pilot - name = "Berbier Uniform" - item_path = /obj/item/clothing/under/jumpsuit/lini - -/datum/loadout_item/under/jumpsuit/pilot/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/shoes/liniboots - name = "Berbier Boots" - desc = "Steel toed boots, durable and lightweight." - resistance_flags = FIRE_PROOF|ACID_PROOF - icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi' - worn_icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi' - icon_state = "liniboots" - -/datum/loadout_item/shoes/lini - name = "Berbier Boots" - item_path = /obj/item/clothing/shoes/liniboots - -/datum/loadout_item/shoes/lini/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/localnode_equipment/localnode_core.dm b/maplestation_modules/story_content/localnode_equipment/localnode_core.dm deleted file mode 100644 index a0edc89a3810..000000000000 --- a/maplestation_modules/story_content/localnode_equipment/localnode_core.dm +++ /dev/null @@ -1,31 +0,0 @@ -/* #Localnode's core. -* This is a special core item for the strange alien AI localnode. -* A character can talk as localnode when held, as this is a dual char. -* Coded by Constellado, made for Blacklist 897 -*/ - -/obj/item/localnode - name = "LocalNode#4248" - desc = "A strange blue orb, humming with alien power and smelling strongly of ozone" - icon = 'maplestation_modules/story_content/localnode_equipment/sprites/localnode.dmi' - icon_state = "localnode" - lefthand_file = 'maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_lh.dmi' - righthand_file = 'maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_rh.dmi' - inhand_icon_state = "localnode" - var/item_chat_color = "#0e5807" - var/voice_name = "LocalNode#4248" - -/obj/item/localnode/attack_self(mob/user) - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 35, TRUE) - -/obj/item/localnode/talk_into(atom/movable/A, message, channel, list/spans, datum/language/language, list/message_mods) - var/mob/M = A - if (istype(M)) - M.log_talk(message, LOG_SAY, tag="LocalNode") - - chat_color = item_chat_color// this feels cursed to call this very time but i cant get it to work - say(message, language, sanitize = FALSE) - return NOPASS - -/obj/item/localnode/get_voice(add_id_name) - return voice_name diff --git a/maplestation_modules/story_content/localnode_equipment/sprites/localnode.dmi b/maplestation_modules/story_content/localnode_equipment/sprites/localnode.dmi deleted file mode 100644 index d576678b9131..000000000000 Binary files a/maplestation_modules/story_content/localnode_equipment/sprites/localnode.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_lh.dmi b/maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_lh.dmi deleted file mode 100644 index 8be450991cde..000000000000 Binary files a/maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_lh.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_rh.dmi b/maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_rh.dmi deleted file mode 100644 index 0cf45c0f36fc..000000000000 Binary files a/maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_rh.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/misc/underwear.dm b/maplestation_modules/story_content/misc/underwear.dm new file mode 100644 index 000000000000..088f905fba96 --- /dev/null +++ b/maplestation_modules/story_content/misc/underwear.dm @@ -0,0 +1,20 @@ +/datum/sprite_accessory/undershirt/ratvarsoul + name = "Ratvar's Soul" + icon_state = "ratvarsoul" + icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi' + gender = NEUTER + natural_spawn = FALSE + +/datum/sprite_accessory/undershirt/defib + name = "Defib" + icon_state = "defib" + icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi' + gender = NEUTER + natural_spawn = FALSE + +/datum/sprite_accessory/undershirt/fleshmass + name = "Pulsating Mass" + icon_state = "fleshmass" + icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi' + gender = NEUTER + natural_spawn = FALSE diff --git a/maplestation_modules/story_content/molly_equipment/code/mollyclothing.dm b/maplestation_modules/story_content/molly_equipment/code/mollyclothing.dm deleted file mode 100644 index d60704c14a06..000000000000 --- a/maplestation_modules/story_content/molly_equipment/code/mollyclothing.dm +++ /dev/null @@ -1,37 +0,0 @@ -/obj/item/clothing/suit/toggle/mollycloak - name = "Six Shooter's Cloak" - desc = "A custom made cloak with a muffler. Good for any terrain or weather. Seems to hide a lot underneath.." - icon = 'maplestation_modules/story_content/molly_equipment/icons/mollyclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/molly_equipment/icons/mollyclothing_worn.dmi' - icon_state = "mollycloak" - toggle_noun = "cloak" - resistance_flags = INDESTRUCTIBLE - -/obj/item/clothing/suit/toggle/mollycloak/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/bag_of_holding) - -/datum/loadout_item/suit/molly - name = "Six Shooter's Cloak" - item_path = /obj/item/clothing/suit/toggle/mollycloak - -/datum/loadout_item/suit/molly/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/head/hats/mollyhat - name = "Six Shooter's Hat" - desc = "An out of place witch's hat. It's a bit worn and ridden with bullet holes.." - icon = 'maplestation_modules/story_content/molly_equipment/icons/mollyclothing_item.dmi' - worn_icon = 'maplestation_modules/story_content/molly_equipment/icons/mollyclothing_worn.dmi' - icon_state = "mollyhat" - resistance_flags = INDESTRUCTIBLE - -/datum/loadout_item/head/molly - name = "Six Shooter's Hat" - item_path = /obj/item/clothing/head/hats/mollyhat - -/datum/loadout_item/head/molly/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/molly_equipment/icons/mollyclothing_item.dmi b/maplestation_modules/story_content/molly_equipment/icons/mollyclothing_item.dmi deleted file mode 100644 index e4006a14e78c..000000000000 Binary files a/maplestation_modules/story_content/molly_equipment/icons/mollyclothing_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/molly_equipment/icons/mollyclothing_worn.dmi b/maplestation_modules/story_content/molly_equipment/icons/mollyclothing_worn.dmi deleted file mode 100644 index 6d1739d55960..000000000000 Binary files a/maplestation_modules/story_content/molly_equipment/icons/mollyclothing_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/noname_equipment/code/nonameclothing.dm b/maplestation_modules/story_content/noname_equipment/code/nonameclothing.dm deleted file mode 100644 index 0d1a16f55d4d..000000000000 --- a/maplestation_modules/story_content/noname_equipment/code/nonameclothing.dm +++ /dev/null @@ -1,196 +0,0 @@ -// --- baby mode dress --- -/obj/item/clothing/under/dress/nndress - name = "blue dress" - desc = "A small blue dress. Incredibly silky and poofy." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "nndress" - -/datum/loadout_item/under/formal/nndress - name = "Blue Dress" - item_path = /obj/item/clothing/under/dress/nndress - -/datum/loadout_item/under/formal/nndress/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/// Component to make a suit item allow the wearer to safely ventcrawl, with some drawbacks -/datum/component/ventcrawler_clothing - /// Tracks if it is currently equipped and applied - VAR_FINAL/applied = FALSE - -/datum/component/ventcrawler_clothing/Initialize() - if(!isclothing(parent)) - return COMPONENT_INCOMPATIBLE - - var/obj/item/clothing/thing = parent - thing.attach_clothing_traits(TRAIT_VENTCRAWLER_ALWAYS) - - RegisterSignal(thing, COMSIG_ITEM_EQUIPPED, PROC_REF(outfit_equipped)) - RegisterSignal(thing, COMSIG_ITEM_DROPPED, PROC_REF(outfit_dropped)) - -/datum/component/ventcrawler_clothing/Destroy() - var/obj/item/clothing/thing = parent - thing.detach_clothing_traits(TRAIT_VENTCRAWLER_ALWAYS) - - UnregisterSignal(thing, COMSIG_ITEM_EQUIPPED) - UnregisterSignal(thing, COMSIG_ITEM_DROPPED) - return ..() - -/datum/component/ventcrawler_clothing/proc/outfit_equipped(obj/item/clothing/source, mob/user, slot) - SIGNAL_HANDLER - - if(!ishuman(user) || !(slot & source.slot_flags)) - return - - ASSERT(!applied) - - applied = TRUE - RegisterSignal(user, COMSIG_HUMAN_BURNING, PROC_REF(on_burn)) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) - RegisterSignal(user, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(vulnerable_to_stab)) - var/mob/living/carbon/human/wearer = user - wearer.physiology.burn_mod /= 0.5 - -/datum/component/ventcrawler_clothing/proc/outfit_dropped(obj/item/clothing/source, mob/user) - SIGNAL_HANDLER - - if(!applied || !ishuman(user)) - return - - applied = FALSE - - if(!QDELING(user)) - var/mob/living/carbon/human/wearer = user - wearer.physiology.burn_mod *= 0.5 - - UnregisterSignal(user, list( - COMSIG_MOVABLE_MOVED, - COMSIG_HUMAN_BURNING, - COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, - )) - var/obj/item/clothing/thing = parent - thing.detach_clothing_traits(list( - TRAIT_NOBREATH, - TRAIT_RESISTCOLD, - TRAIT_RESISTHIGHPRESSURE, - TRAIT_RESISTLOWPRESSURE - )) - -/datum/component/ventcrawler_clothing/proc/on_move(mob/living/carbon/human/source, ...) - SIGNAL_HANDLER - - if(HAS_TRAIT(source, TRAIT_MOVE_VENTCRAWLING)) - var/obj/item/clothing/thing = parent - thing.attach_clothing_traits(list( - TRAIT_NOBREATH, - TRAIT_RESISTCOLD, - TRAIT_RESISTHIGHPRESSURE, - TRAIT_RESISTLOWPRESSURE, - )) - else - var/obj/item/clothing/thing = parent - thing.detach_clothing_traits(list( - TRAIT_NOBREATH, - TRAIT_RESISTCOLD, - TRAIT_RESISTHIGHPRESSURE, - TRAIT_RESISTLOWPRESSURE, - )) - -/datum/component/ventcrawler_clothing/proc/on_burn(mob/living/carbon/human/source) - SIGNAL_HANDLER - - source.apply_damage(5, STAMINA, forced = TRUE) - -/datum/component/ventcrawler_clothing/proc/vulnerable_to_stab(datum/source, list/damage_mods, damage, damagetype, def_zone, sharpness, ...) - SIGNAL_HANDLER - - if(sharpness) - damage_mods += 2 - -// --- second outfit --- -/obj/item/clothing/under/dress/nnseconddress - name = "fancy blue dress" - desc = "A decorated blue dress. Appears silky, but feels rough upon touching it.." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "nnseconddress" - resistance_flags = INDESTRUCTIBLE - -/obj/item/clothing/under/dress/nnseconddress/Initialize(mapload) - . = ..() - AddComponent(/datum/component/ventcrawler_clothing) - -/obj/item/clothing/shoes/nnredshoes - name = "fake red shoes" - desc = "Red Mary Janes with a shining texture. Gliding your finger over it, it feels like sandpaper.." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "nnshoes" - -/obj/item/clothing/head/costume/nnbluebonnet - name = "blue bonnet" - desc = "A decorated bonnet with various charms." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "nnbonnet" - -// --- alter ego outfit --- - -/obj/item/clothing/head/costume/crown/atrox - name = "rosed crown" - desc = "A small golden grown adorned with painted red roses. One of them looks unfinished." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "amcrown" - -/obj/item/clothing/under/jumpsuit/atrox - name = "regal red and black suit" - desc = "A regal suit that reminds you of a foul-tempered monarch. Sentence first, verdict last." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "amsuit" - resistance_flags = INDESTRUCTIBLE - -/obj/item/clothing/under/jumpsuit/atrox/Initialize(mapload) - . = ..() - AddComponent(/datum/component/ventcrawler_clothing) - -/obj/item/clothing/shoes/atrox - name = "regal white boots" - desc = "White boots with a heart motif. Not a single piece of dirt attaches itself to it." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "amboots" - -// --- bnuuy --- - -/obj/item/clothing/head/costume/hat/blanche - name = "fluffy sun hat" - desc = "A white sunhat with fluffy rabbit ears. Stylish!" - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "blhat" - -/obj/item/clothing/glasses/blanche - name = "feathery monocle" - desc = "A monocle decorated with white feathers and black lace. With a red gem in front, they can't see your eye, but you can certainly see them." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "blmask" - -/obj/item/clothing/under/jumpsuit/blanche - name = "white fluffy dress" - desc = "A large white dress decorated with various playing card suits. On the side is a large golden stopwatch, just to check if you're late." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "bldress" - resistance_flags = INDESTRUCTIBLE - alternate_worn_layer = ABOVE_SHOES_LAYER - -/obj/item/clothing/shoes/blanche - name = "delicate white heels" - desc = "Small white heels with red claws in the front, along with large cuffs. Hop away!" - icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' - icon_state = "blshoes" diff --git a/maplestation_modules/story_content/noname_equipment/code/nonameitems.dm b/maplestation_modules/story_content/noname_equipment/code/nonameitems.dm deleted file mode 100644 index e0ed60f98049..000000000000 --- a/maplestation_modules/story_content/noname_equipment/code/nonameitems.dm +++ /dev/null @@ -1,210 +0,0 @@ -// --- baby mode book --- -/obj/item/storage/book/nonamebook - name = "Fortuna Grimoire" - desc = "A magical storybook! Countless stories are written here, though every page contains ineligible writing with unknown symbols.." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - icon_state = "grimoire" - inhand_icon_state = "grimoire" - worn_icon_state = "grimoire" - lefthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi' - righthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi' - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - actions_types = list(/datum/action/item_action/toggle_light) - light_color = LIGHT_COLOR_BLUE - light_system = OVERLAY_LIGHT - light_range = 3 - light_power = 1 - light_on = FALSE - /// Can we toggle this light on and off (used for contexual screentips only) - var/toggle_context = TRUE - /// The sound the light makes when it's turned on - var/sound_on = 'sound/weapons/magin.ogg' - /// The sound the light makes when it's turned off - var/sound_off = 'sound/weapons/magout.ogg' - /// Is the light turned on or off currently - var/on = FALSE - var/empty = FALSE - -/obj/item/storage/book/nonamebook/Initialize(mapload) //book doubles as a casino set briefcase - . = ..() - create_storage(max_slots = 12, max_total_storage = 24, max_specific_storage = WEIGHT_CLASS_NORMAL) - -/obj/item/storage/book/nonamebook/PopulateContents() //essentially a loadout thing for nono - if(empty) - return - var/static/items_inside = list( - /obj/item/toy/spadepokerchip = 1, - /obj/item/toy/heartpokerchip = 1, - /obj/item/toy/clubpokerchip = 1, - /obj/item/toy/diamondpokerchip = 1, - /obj/item/toy/jokerpokerchip = 1, - /obj/item/dice/d6 = 2, - /obj/item/toy/cards/deck = 1, - /obj/item/toy/plush/nonamecat = 1, - /obj/item/clothing/under/dress/nnseconddress = 1, - /obj/item/clothing/shoes/nnredshoes = 1, - /obj/item/clothing/head/costume/nnbluebonnet = 1) - generate_items_inside(items_inside,src) - -/obj/item/storage/book/nonamebook/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) - // single use lights can be toggled on once - if(isnull(held_item) && (toggle_context || !on)) - context[SCREENTIP_CONTEXT_RMB] = "Toggle light" - return CONTEXTUAL_SCREENTIP_SET - - if(istype(held_item, /obj/item/flashlight) && (toggle_context || !on)) - context[SCREENTIP_CONTEXT_LMB] = "Toggle light" - return CONTEXTUAL_SCREENTIP_SET - - return NONE - -/obj/item/storage/book/nonamebook/proc/update_brightness(mob/user) - if(on) - icon_state = "[initial(icon_state)]-on" - else - icon_state = initial(icon_state) - set_light_on(on) - if(light_system == COMPLEX_LIGHT) - update_light() - -/obj/item/storage/book/nonamebook/attack_self(mob/user) - balloon_alert(user, "the pages twist..") - toggle_light(user) - -/obj/item/storage/book/nonamebook/proc/toggle_light(mob/user) - on = !on - playsound(user, on ? sound_on : sound_off, 40, TRUE) - update_brightness(user) - update_item_action_buttons() - -//i literally just slapped flashlight stuff on a book - -// --- plushie --- - -/obj/item/toy/plush/nonamecat - name = "Cheshire" - desc = "A small blue and white cat plush! It looks handstitched." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - icon_state = "cheshire" - inhand_icon_state = "cheshire" - lefthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi' - righthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi' - divine = TRUE //why would you hurt nono's plush you psycho - -// -- poker chip props -- - -/obj/item/toy/spadepokerchip - name = "Poker Chip of Spades" - desc = "A poker chip representing spades. Underneath, it says '$25'. The spades suit lacks deals with good fortune, more suited to misfortune. This chip however, grants the holder a small amount of luck, as well as misfortune to balance. You feel at ease holding it." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - icon_state = "spadechip" - w_class = WEIGHT_CLASS_TINY - -/obj/item/toy/heartpokerchip - name = "Poker Chip of Hearts" - desc = "A poker chip representing hearts. Underneath, it says '$50'. The hearts suit gives fortune to those with love, yet can grant broken connections as well. This chip grants the holder a fair amount of luck, as well as misfortune to balance. You feel a bit uneasy holding it." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - icon_state = "heartchip" - w_class = WEIGHT_CLASS_TINY - -/obj/item/toy/clubpokerchip - name = "Poker Chip of Clubs" - desc = "A poker chip representing clubs. Underneath, it says '$100'. The clubs suit grants happiness to one's future, as well as warn one of troubling times. This chip grants the holder an abnormal amount of luck, as well as misfortune to balance. Holding it, you feel a small weight tied to you." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - icon_state = "clubchip" - w_class = WEIGHT_CLASS_TINY - -/obj/item/toy/diamondpokerchip - name = "Poker Chip of Diamonds" - desc = "A poker chip representing diamonds. Underneath, it says '$500'. The diamonds suit grants wealth and prosperity, along with the weight it brings it allures. This chip grants the holder a great amount of luck, as well as misfortune to balance. Holding it, you feel as if it's leeching off of you." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - icon_state = "diamondchip" - w_class = WEIGHT_CLASS_TINY - -/obj/item/toy/jokerpokerchip - name = "Poker Chip of the Joker" - desc = "A poker chip representing the Joker. Underneath, it says '$1000'. The Joker grants both freedom and captivity tied to one's life. This chip grants the holder an immeasurable amount of luck, as well as misfortune to balance. You feel as if you're holding your own existence within it. Your back burns." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - icon_state = "jokerchip" - w_class = WEIGHT_CLASS_TINY - -// --- alter ego items --- - -/obj/item/cane/atrox - name = "flamingo cane" - desc = "A cane with a flamingo head ontop. Used to either discipline others or play croquet." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - icon_state = "amcane" - inhand_icon_state = "amcane" - lefthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi' - righthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi' - force = 5 - throwforce = 5 - w_class = WEIGHT_CLASS_SMALL - -/obj/structure/chair/atrox - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_structure.dmi' - icon_state = "amthrone" - name = "golden plastic throne" - desc = "A shoddy throne painted red and gold. You can see some paint scratched off if you look close enough." - max_integrity = 50 - item_chair = /obj/item/chair/atrox - -/obj/item/chair/atrox - name = "golden plastic throne" - desc = "A relatively light throne. Better hope no one breaks your ego with it." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_structure.dmi' - icon_state = "amthrone_toppled" - inhand_icon_state = "amthrone" - lefthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi' - righthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi' - w_class = WEIGHT_CLASS_NORMAL - force = 7 - throw_range = 5 - break_chance = 25 - origin_type = /obj/structure/chair/atrox - -/obj/item/storage/bag/atrox - name = "unusual red bag" - desc = "An unusual red bag carrying items that suit an unusual red prince." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - worn_icon_state = "ambag" - icon_state = "ambag" - w_class = WEIGHT_CLASS_NORMAL - -/obj/item/storage/bag/atrox/Initialize(mapload) - . = ..() - atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL - atom_storage.max_total_storage = 21 - atom_storage.max_slots = 7 - -/obj/item/storage/bag/atrox/PopulateContents() //loadout item for alter ego - var/static/items_inside = list( - /obj/item/clothing/head/costume/crown/atrox = 1, - /obj/item/clothing/under/jumpsuit/atrox = 1, - /obj/item/clothing/shoes/atrox = 1, - /obj/item/chair/atrox = 1, - /obj/item/chair/plastic = 1, //coping - /obj/item/cane/atrox = 1, - /obj/item/clothing/head/costume/hat/blanche = 1, - /obj/item/clothing/glasses/blanche = 1, - /obj/item/clothing/under/jumpsuit/blanche = 1, - /obj/item/clothing/shoes/blanche = 1, - /obj/item/cane/blanche = 1, - ) - generate_items_inside(items_inside, src) - -// --- bnuuy items --- - -/obj/item/cane/blanche - name = "red umbrella" - desc = "A plain red umbrella to keep you dry, or alternatively, swat people away." - icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' - icon_state = "blbrella" - inhand_icon_state = "blbrella" - lefthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi' - righthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi' - force = 5 - throwforce = 5 - w_class = WEIGHT_CLASS_SMALL diff --git a/maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi b/maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi deleted file mode 100644 index 8d3848dad7ae..000000000000 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi b/maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi deleted file mode 100644 index d49bddf6f0d5..000000000000 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi b/maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi deleted file mode 100644 index 52078562f0eb..000000000000 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi b/maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi deleted file mode 100644 index 3e6ce823b99d..000000000000 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi b/maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi deleted file mode 100644 index 5e8cc1572a61..000000000000 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/noname_equipment/icons/nnitem_structure.dmi b/maplestation_modules/story_content/noname_equipment/icons/nnitem_structure.dmi deleted file mode 100644 index 53de33de9c1e..000000000000 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nnitem_structure.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/nurse_equipment/code/vinceclothing.dm b/maplestation_modules/story_content/nurse_equipment/code/vinceclothing.dm deleted file mode 100644 index c996639c53c1..000000000000 --- a/maplestation_modules/story_content/nurse_equipment/code/vinceclothing.dm +++ /dev/null @@ -1,78 +0,0 @@ -// -- nurse outfit -- - -/obj/item/clothing/under/dress/vince - name = "violet nurse uniform" - desc = "A short violet nurse dress, lined with subtle red and pink hues." - icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi' - worn_icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi' - icon_state = "vincedress" - resistance_flags = INDESTRUCTIBLE - -/datum/loadout_item/under/jumpsuit/vince - name = "Violet Nurse Uniform" - item_path = /obj/item/clothing/under/dress/vince - -/datum/loadout_item/under/jumpsuit/vince/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/shoes/vince - name = "slick syringe heels" - desc = "Black pumps with decorative syringes making the heels. They're decorative, right?" - icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi' - worn_icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi' - icon_state = "vinceshoes" - resistance_flags = INDESTRUCTIBLE - -/obj/item/clothing/shoes/vince/Initialize(mapload) - . = ..() - AddComponent( \ - /datum/component/shoe_footstep, \ - sounds = list( \ - 'maplestation_modules/sound/items/highheel1.ogg', \ - 'maplestation_modules/sound/items/highheel2.ogg', \ - ), \ - volume = 55, \ - chance_per_play = 50, \ - can_tape = TRUE, \ - ) - -/datum/loadout_item/shoes/vince - name = "Slick Syringe Heels" - item_path = /obj/item/clothing/shoes/vince - -/datum/loadout_item/shoes/vince/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/head/costume/vince - name = "violet nurse cap" - desc = "A violet nurse cap with a deep red 'X' on it. Shouldn't violate the Geneva Convention." - icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi' - worn_icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi' - icon_state = "vincecap" - resistance_flags = INDESTRUCTIBLE - -/datum/loadout_item/head/vince - name = "Violet Nurse Cap" - item_path = /obj/item/clothing/head/costume/vince - -/datum/loadout_item/head/vince/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/gloves/vince - name = "buckled black gloves" - desc = "Slick black gloves with a neon green palm and pink lining. Poisonous!" - icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi' - worn_icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi' - icon_state = "vincegloves" - resistance_flags = INDESTRUCTIBLE - -/datum/loadout_item/gloves/vince - name = "Buckled Black Gloves" - item_path = /obj/item/clothing/gloves/vince - -/datum/loadout_item/gloves/vince/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi b/maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi deleted file mode 100644 index d559111dde1f..000000000000 Binary files a/maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi b/maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi deleted file mode 100644 index e54cfa711f14..000000000000 Binary files a/maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/phoneguy_equipment/code/headphone.dm b/maplestation_modules/story_content/phoneguy_equipment/code/headphone.dm deleted file mode 100644 index 610f7656d5db..000000000000 --- a/maplestation_modules/story_content/phoneguy_equipment/code/headphone.dm +++ /dev/null @@ -1,12 +0,0 @@ -// --Hello? Hello hello?-- -/obj/item/clothing/head/headphone - name = "head phone" - desc = "It's a fully operational phone that sits comfortably over your head. How this works is beyond you." - icon = 'maplestation_modules/story_content/phoneguy_equipment/icons/headphone_item.dmi' - worn_icon = 'maplestation_modules/story_content/phoneguy_equipment/icons/headphone_worn.dmi' - lefthand_file = 'maplestation_modules/story_content/phoneguy_equipment/icons/headphone_lhand.dmi' - righthand_file = 'maplestation_modules/story_content/phoneguy_equipment/icons/headphone_rhand.dmi' - icon_state = "phonehead" - resistance_flags = ACID_PROOF|FIRE_PROOF - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE|HIDESNOUT - flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH|PEPPERPROOF diff --git a/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_item.dmi b/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_item.dmi deleted file mode 100644 index 1f80bfd42c36..000000000000 Binary files a/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_lhand.dmi b/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_lhand.dmi deleted file mode 100644 index 210b724901b4..000000000000 Binary files a/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_lhand.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_rhand.dmi b/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_rhand.dmi deleted file mode 100644 index 46962dc54516..000000000000 Binary files a/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_rhand.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_worn.dmi b/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_worn.dmi deleted file mode 100644 index ec66e95da55e..000000000000 Binary files a/maplestation_modules/story_content/phoneguy_equipment/icons/headphone_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/randall_equipment/code/randallclothing.dm b/maplestation_modules/story_content/randall_equipment/code/randallclothing.dm deleted file mode 100644 index 57bbbccb7833..000000000000 --- a/maplestation_modules/story_content/randall_equipment/code/randallclothing.dm +++ /dev/null @@ -1,106 +0,0 @@ -//this charlatan gucci'd down to the socks but need $4!? - -/obj/item/clothing/under/jumpsuit/randallsuit - name = "expensive suit" - desc = "A well fitted suit. The shirt is tailored with a cold shoulder style and the neck is tied with a jewel that sparkles with an otherworldly glow." - icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_icon.dmi' - worn_icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_worn.dmi' - icon_state = "randallsuit" - can_be_bloody = FALSE - can_adjust = FALSE - resistance_flags = INDESTRUCTIBLE - clothing_traits = list(TRAIT_PACIFISM, TRAIT_VIRUSIMMUNE, TRAIT_NOHUNGER, TRAIT_NOBLOOD, TRAIT_NOBREATH, TRAIT_NODEATH) //so my ass isnt spending 5 minutes roundstart loading these on but if someone steals his clothes itll be really funny - -/obj/item/clothing/under/jumpsuit/randallsuit/nyarl - name = "even more expensive suit" - desc = "An extremely well fitted suit. The shirt is tailored with a cold shoulder style and the whole outfit is covered in weird out of place belts." - icon_state = "nyarlsuit" - -/obj/item/clothing/suit/randallcoat - name = "dress coat" - desc = "A dress coat worn loosely around the shoulders. It's adorned with gold and jewels." - icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_icon.dmi' - worn_icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_worn.dmi' - icon_state = "randallcoat" - can_be_bloody = FALSE - resistance_flags = INDESTRUCTIBLE - -/obj/item/clothing/suit/randallcoat/nyarl - name = "loose coat" - desc = "A dress coat worn around the shoulders, billowing around them. Very soft." - icon_state = "nyarlcoat" - -/obj/item/clothing/shoes/randallboots - name = "strange leather boots" - desc = "Thigh-high leather boots made from an unknown animal. The heels click on the ground." - icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_icon.dmi' - worn_icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_worn.dmi' - icon_state = "randallboots" - can_be_bloody = FALSE - can_be_tied = FALSE - resistance_flags = INDESTRUCTIBLE - -/obj/item/clothing/shoes/randallboots/nyarl - icon_state = "nyarlboots" - -/obj/item/clothing/gloves/randallgloves - name = "clawed gloves" - desc = "Solid black gloves with a single claw ring on each." - icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_icon.dmi' - worn_icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_worn.dmi' - icon_state = "randallgloves" - can_be_bloody = FALSE - resistance_flags = INDESTRUCTIBLE - -/obj/item/clothing/gloves/randallgloves/nyarl - name = "clawed gloves" - desc = "Solid black gloves with a claw ring on each finger. Must be really annoying." - icon_state = "nyarlgloves" - -/obj/item/clothing/gloves/randallgloves/Initialize(mapload) - . = ..() - AddElement(/datum/element/glove_slapper) - -/datum/outfit/randall - name = "The United Amateur" - - uniform = /obj/item/clothing/under/jumpsuit/randallsuit - suit = /obj/item/clothing/suit/randallcoat - shoes = /obj/item/clothing/shoes/randallboots - gloves = /obj/item/clothing/gloves/randallgloves - l_hand = /obj/item/cane - -/datum/outfit/nyarl - name = "The Crawling Chaos" - - uniform = /obj/item/clothing/under/jumpsuit/randallsuit/nyarl - suit = /obj/item/clothing/suit/randallcoat/nyarl - shoes = /obj/item/clothing/shoes/randallboots/nyarl - gloves = /obj/item/clothing/gloves/randallgloves/nyarl - -//for acolytes - -/obj/item/clothing/suit/hooded/acolyte - name = "acolyte robes" - desc = "The official outfit of worshipping your Lord, Blessed be It!" - icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_icon.dmi' - worn_icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_worn.dmi' - icon_state = "acolyterobe" - inhand_icon_state = "xenos_suit" //picking something that looks like it if anyone ever has it inhands i dont have time for the sprite rn - body_parts_covered = CHEST|GROIN|LEGS|ARMS|FEET - flags_inv = HIDEJUMPSUIT - hoodtype = /obj/item/clothing/head/hooded/acolytehood - -/obj/item/clothing/head/hooded/acolytehood - name = "acolyte hood" - desc = "The official hood of worshipping your Lord, Blessed be It!" - icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_icon.dmi' - worn_icon = 'maplestation_modules/story_content/randall_equipment/icons/randall_worn.dmi' - icon_state = "acolytehood" - inhand_icon_state = null - body_parts_covered = HEAD - flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEMASK - -/datum/loadout_item/suit/acolyte - name = "Acolyte Robes" - item_path = /obj/item/clothing/suit/hooded/acolyte diff --git a/maplestation_modules/story_content/randall_equipment/icons/randall_icon.dmi b/maplestation_modules/story_content/randall_equipment/icons/randall_icon.dmi deleted file mode 100644 index b8cfbfcc3ba0..000000000000 Binary files a/maplestation_modules/story_content/randall_equipment/icons/randall_icon.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/randall_equipment/icons/randall_worn.dmi b/maplestation_modules/story_content/randall_equipment/icons/randall_worn.dmi deleted file mode 100644 index 11d9ae2da466..000000000000 Binary files a/maplestation_modules/story_content/randall_equipment/icons/randall_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/reshia_equipment/code/reshiaclothing.dm b/maplestation_modules/story_content/reshia_equipment/code/reshiaclothing.dm deleted file mode 100644 index 9a4468c22f5b..000000000000 --- a/maplestation_modules/story_content/reshia_equipment/code/reshiaclothing.dm +++ /dev/null @@ -1,43 +0,0 @@ -// --- hat --- -/obj/item/clothing/head/hats/reshiacap - name = "black delinquent cap" - desc = "A black cap with small golden studs and a golden emblem. You have no reason to wear this correctly." - icon = 'maplestation_modules/story_content/reshia_equipment/icons/reshclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/reshia_equipment/icons/reshclothes_worn.dmi' - icon_state = "delinquent" - -/datum/loadout_item/head/reshiacap - name = "Cap (Delinquent, Black)" - item_path = /obj/item/clothing/head/hats/reshiacap - -/datum/loadout_item/head/reshiacap/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -// --- coat --- -/obj/item/clothing/under/jumpsuit/reshiacoat - name = "black uniform coat" - desc = "A long black coat reminescent of that to a school uniform, with a gold and red armband attached. The fabric feels otherworldly." - icon = 'maplestation_modules/story_content/reshia_equipment/icons/reshclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/reshia_equipment/icons/reshclothes_worn.dmi' - icon_state = "blackuniform" - -/datum/loadout_item/under/formal/reshiacoat - name = "Black Uniform Coat" - item_path = /obj/item/clothing/under/jumpsuit/reshiacoat - -/datum/loadout_item/under/formal/reshiacoat/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -// --- shoes --- -/obj/item/clothing/shoes/reshiaboot - name = "short brown boots" - desc = "Leather boots that have seem to be roughly cut short. Looks like they've seen better days." - icon = 'maplestation_modules/story_content/reshia_equipment/icons/reshclothes_item.dmi' - worn_icon = 'maplestation_modules/story_content/reshia_equipment/icons/reshclothes_worn.dmi' - icon_state = "shortboot" - -/datum/loadout_item/shoes/reshiaboot - name = "Short Brown Boots" - item_path = /obj/item/clothing/shoes/reshiaboot diff --git a/maplestation_modules/story_content/ritz_equipment/code/ritzclothing.dm b/maplestation_modules/story_content/ritz_equipment/code/ritzclothing.dm deleted file mode 100644 index 621edb4e1b6d..000000000000 --- a/maplestation_modules/story_content/ritz_equipment/code/ritzclothing.dm +++ /dev/null @@ -1,48 +0,0 @@ -// --- ritz cracker --- -/obj/item/clothing/under/rank/rnd/mrauniform - name = "Malheur Research Association uniform" - desc = "Uniform worn by the head of the Malheur Research Association." - resistance_flags = FIRE_PROOF|ACID_PROOF - icon = 'maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_item.dmi' - worn_icon = 'maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_worn.dmi' - icon_state = "ritzuniform" - -/datum/loadout_item/under/formal/ritzuniform - name = "Malheur Research Association uniform" - item_path = /obj/item/clothing/under/rank/rnd/mrauniform - -/datum/loadout_item/under/formal/ritzuniform/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/shoes/mrashoes - name = "Malheur Research Association boots" - desc = "Standard uniform boots. Probably magical." - resistance_flags = FIRE_PROOF|ACID_PROOF - icon = 'maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_item.dmi' - worn_icon = 'maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_worn.dmi' - icon_state = "ritzshoes" - -/datum/loadout_item/shoes/mrashoes - name = "Malheur Research Association boots" - item_path = /obj/item/clothing/shoes/mrashoes - -/datum/loadout_item/shoes/mrashoes/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" - -/obj/item/clothing/gloves/mragloves - name = "Malheur Research Association gloves" - desc = "Standard uniform black gloves. There's a red symbol on the right hand." - resistance_flags = FIRE_PROOF|ACID_PROOF - icon = 'maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_item.dmi' - worn_icon = 'maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_worn.dmi' - icon_state = "ritzgloves" - -/datum/loadout_item/gloves/mragloves - name = "Malheur Research Association gloves" - item_path = /obj/item/clothing/gloves/mragloves - -/datum/loadout_item/gloves/mragloves/get_item_information() - . = ..() - .[FA_ICON_MASKS_THEATER] = "Character item" diff --git a/maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_item.dmi b/maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_item.dmi deleted file mode 100644 index a3693390cc22..000000000000 Binary files a/maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_item.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_worn.dmi b/maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_worn.dmi deleted file mode 100644 index 98b09ffc18e6..000000000000 Binary files a/maplestation_modules/story_content/ritz_equipment/icons/ritzuniform_worn.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/stranger_equipment/code/strangerclothing.dm b/maplestation_modules/story_content/stranger_equipment/code/strangerclothing.dm deleted file mode 100644 index bec1de75ec73..000000000000 --- a/maplestation_modules/story_content/stranger_equipment/code/strangerclothing.dm +++ /dev/null @@ -1,27 +0,0 @@ -// funny lore man, overpowered so lavaland enemies/the crew dont kill him, won't attack crewmates so no worry about that. not meant to be worn by crewmembers -/obj/item/clothing/suit/armor/strangerarmor - name = "stranger's armor" - desc = "A massive, bulky suit of armor. Resembles some sort of death knight." - icon = 'maplestation_modules/story_content/stranger_equipment/icons/stranger_icons.dmi' - worn_icon = 'maplestation_modules/story_content/stranger_equipment/icons/stranger_worn.dmi' - icon_state = "strangerarmor" - w_class = WEIGHT_CLASS_BULKY - body_parts_covered = FULL_BODY - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEHEADGEAR|HIDEJUMPSUIT|HIDEMASK|HIDENECK|HIDESHOES - clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL - resistance_flags = INDESTRUCTIBLE - min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT - max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT - strip_delay = 10 MINUTES //so people don't steal it. it can probably be made unable to take off but its so much funnier to have it take absurdly long - slowdown = 2 - armor_type = /datum/armor/unobtanium_armor - -/datum/armor/unobtanium_armor - melee = 100 - bullet = 80 - laser = 50 - energy = 50 - bomb = 100 - bio = 100 - fire = 90 - acid = 90 diff --git a/maplestation_modules/story_content/stranger_equipment/icons/stranger_icons.dmi b/maplestation_modules/story_content/stranger_equipment/icons/stranger_icons.dmi deleted file mode 100644 index 0e84fdf0de06..000000000000 Binary files a/maplestation_modules/story_content/stranger_equipment/icons/stranger_icons.dmi and /dev/null differ diff --git a/maplestation_modules/story_content/stranger_equipment/icons/stranger_worn.dmi b/maplestation_modules/story_content/stranger_equipment/icons/stranger_worn.dmi deleted file mode 100644 index 0e84fdf0de06..000000000000 Binary files a/maplestation_modules/story_content/stranger_equipment/icons/stranger_worn.dmi and /dev/null differ