Skip to content
Open
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
18 changes: 18 additions & 0 deletions code/datums/greyscale/json_configs/gaiter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"gaiter": [
{
"type": "icon_state",
"icon_state": "gaiter_obj",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"gaiter_up": [
{
"type": "icon_state",
"icon_state": "gaiter_obj_up",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
18 changes: 18 additions & 0 deletions code/datums/greyscale/json_configs/gaiter_worn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"gaiter": [
{
"type": "icon_state",
"icon_state": "gaiter",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"gaiter_up": [
{
"type": "icon_state",
"icon_state": "gaiter_up",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
18 changes: 18 additions & 0 deletions code/datums/greyscale/json_configs/wraps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"wraps": [
{
"type": "icon_state",
"icon_state": "wraps",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"legwraps": [
{
"type": "icon_state",
"icon_state": "legwraps",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Binary file modified icons/map_icons/clothing/mask.dmi
Binary file not shown.
Binary file modified icons/map_icons/clothing/shoes.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6768,6 +6768,7 @@
#include "maplestation_modules\story_content\phoneguy_equipment\code\headphone.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\providence_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"
Expand Down
23 changes: 23 additions & 0 deletions maplestation_modules/code/datums/greyscale/_greyscale_config.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,26 @@
/datum/greyscale_config/sweet_bow/worn
name = "Sweet Bow (Worn)"
icon_file = 'maplestation_modules/story_content/eveleen_equipment/icons/mob/head.dmi'

/datum/greyscale_config/neck_gaiter
name = "Neck Gaiter"
icon_file = 'maplestation_modules/story_content/providence_equipment/icons/obj/mask.dmi'
json_config = 'code/datums/greyscale/json_configs/gaiter.json'

/datum/greyscale_config/neck_gaiter/worn
name = "Neck Gaiter (Worn)"
icon_file = 'maplestation_modules/story_content/providence_equipment/icons/mob/mask.dmi'
json_config = 'code/datums/greyscale/json_configs/gaiter_worn.json'

/datum/greyscale_config/legwraps
name = "Legwraps"
icon_file = 'maplestation_modules/story_content/providence_equipment/icons/obj/wraps.dmi'
json_config = 'code/datums/greyscale/json_configs/wraps.json'

/datum/greyscale_config/legwraps/worn
name = "Legwraps (Worn)"
icon_file = 'maplestation_modules/story_content/providence_equipment/icons/mob/wrap.dmi'

/datum/greyscale_config/legwraps/worn/digi
name = "Legwraps (Worn, Digi)"
icon_file = 'maplestation_modules/story_content/providence_equipment/icons/mob/wrap_digi.dmi'
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
// meck galter

/obj/item/clothing/mask/neck_gaiter
name = "neck gaiter"
desc = "A cloth for covering your neck, and usually part of your face too, but that part's optional. Has a small respirator to be used with internals."
actions_types = list(/datum/action/item_action/adjust)
icon = 'maplestation_modules/story_content/providence_equipment/icons/obj/mask.dmi'
worn_icon = 'maplestation_modules/story_content/providence_equipment/icons/mob/mask.dmi'
alternate_worn_layer = LOW_FACEMASK_LAYER
icon_state = "neck_gaiter"
post_init_icon_state = "gaiter"
inhand_icon_state = "balaclava"
greyscale_config = /datum/greyscale_config/neck_gaiter
greyscale_config_worn = /datum/greyscale_config/neck_gaiter/worn
greyscale_colors = "#666666"
clothing_flags = BLOCK_GAS_SMOKE_EFFECT|MASKINTERNALS
w_class = WEIGHT_CLASS_SMALL
flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
visor_flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
flags_cover = MASKCOVERSMOUTH
visor_flags_cover = MASKCOVERSMOUTH
flags_1 = IS_PLAYER_COLORABLE_1
interaction_flags_click = NEED_DEXTERITY|ALLOW_RESTING

/obj/item/clothing/mask/neck_gaiter/attack_self(mob/user)
adjust_visor(user)

/obj/item/clothing/mask/neck_gaiter/click_alt(mob/user)
adjust_visor(user)
return CLICK_ACTION_SUCCESS

/obj/item/clothing/mask/neck_gaiter/click_alt_secondary(mob/user)
alternate_worn_layer = (alternate_worn_layer == initial(alternate_worn_layer) ? NONE : initial(alternate_worn_layer))
user.update_clothing(ITEM_SLOT_MASK)
balloon_alert(user, "wearing [alternate_worn_layer == initial(alternate_worn_layer) ? "below" : "above"] suits")

/obj/item/clothing/mask/neck_gaiter/examine(mob/user)
. = ..()
. += span_notice("[src] can be worn above or below your suit. Alt-Right-click to toggle.")
. += span_notice("Alt-click [src] to adjust it.")

/datum/loadout_item/mask/neck_gaiter
name = "Neck Gaiter"
item_path = /obj/item/clothing/mask/neck_gaiter

// croptop jacket

/obj/item/clothing/suit/jacket/crop_top_jacket
name = "crop-top jacket"
desc = "A remarkably fancy-looking two-tone cropped jacket with a nice gold trim."
icon = 'maplestation_modules/story_content/providence_equipment/icons/mob/crop_jacket.dmi'
worn_icon = 'maplestation_modules/story_content/providence_equipment/icons/mob/crop_jacket.dmi'
icon_state = "crop_jacket"
worn_icon_state = "crop_jacket"

/datum/loadout_item/suit/crop_top_jacket
name = "Crop-top Jacket"
item_path = /obj/item/clothing/suit/jacket/crop_top_jacket

// both leg wraps

/obj/item/clothing/shoes/wraps
name = "cloth foot wraps"
desc = "Simple cloth footwraps, suitable for padding the heels."
icon = 'maplestation_modules/story_content/providence_equipment/icons/obj/wraps.dmi'
worn_icon = 'maplestation_modules/story_content/providence_equipment/icons/mob/wrap.dmi'
digitigrade_file = 'maplestation_modules/story_content/providence_equipment/icons/mob/wrap_digi.dmi'
icon_state = "wraps"
post_init_icon_state = "wraps"
greyscale_config = /datum/greyscale_config/legwraps
greyscale_config_worn = /datum/greyscale_config/legwraps/worn
greyscale_colors = "#FFFFFF"
body_parts_covered = FALSE
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/clothing/shoes/wraps/leg
name = "cloth leg wraps"
desc = "Simple cloth legwraps, for when socks aren't good enough."
icon_state = "legwraps"
post_init_icon_state = "legwraps"

/datum/loadout_item/shoes/wraps
name = "Cloth Foot Wraps"
item_path = /obj/item/clothing/shoes/wraps

/datum/loadout_item/shoes/legwraps
name = "Cloth Leg Wraps"
item_path = /obj/item/clothing/shoes/wraps/leg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading