Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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)
11 changes: 11 additions & 0 deletions maplestation_modules/code/modules/clothing/head/loadout_helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion maplestation_modules/code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'

10 changes: 10 additions & 0 deletions maplestation_modules/code/modules/clothing/neck/loadout_neck.dm
Original file line number Diff line number Diff line change
@@ -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
Loading
Loading