Skip to content

Commit

Permalink
more
Browse files Browse the repository at this point in the history
  • Loading branch information
kittysmooch committed Sep 2, 2024
1 parent 49dcb50 commit 24615c2
Show file tree
Hide file tree
Showing 14 changed files with 232 additions and 3 deletions.
27 changes: 26 additions & 1 deletion modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
/>  フ meow! this dm file contains greyscale configs for any clothes we add. please name
/>  フ meow! this dm file contains greyscale datums for any clothes we add. please name
|  _ _| / them in obvious, easy to search ways that are consistent with your item paths <3
/` ミ_xノ
/     |
Expand Down Expand Up @@ -41,6 +41,31 @@
name = "Wide Cape (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi'

/datum/greyscale_config/ranger_poncho
name = "Ranger Poncho"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi'
json_config = 'modular_nova/modules/GAGS/json_configs/ranger_poncho/ranger_poncho.json'

/datum/greyscale_config/ranger_poncho/worn
name = "Ranger Poncho (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi'
json_config = 'modular_nova/modules/GAGS/json_configs/ranger_poncho/ranger_poncho_worn.json'

///////////
//SCARVES//
///////////

/datum/greyscale_config/face_scarf
name = "Face Scarf"
icon_file = 'modular_skyrat/modules/GAGS/icons/face_scarf.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/neck/face_scarf.json'

/datum/greyscale_config/face_scarf/worn
name = "Face Scarf (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/face_scarf_worn.dmi'



///////////
//COLLARS//
///////////
Expand Down
50 changes: 50 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
_..---...,""-._ ,/}/)
.'' , ``..'(/-< ( This dm file contains greyscale datums for ensembles or 'sets' of items, so
/ _ { ) \ / that they can be found all together in one place! To qualify as a set or
; _ `. `. < a( / ensemble the items in question should explicitly be intended to be worn together,
,' ( \ ) `. \ __.._ .: y such as the combination of maid dress, head piece, gloves, and neck piece below. )
( <\_-) )'-.____...\ `._ //-'
`. `-' /-._))) `-._)))
`...'
*/

////////////////
//MAID COSTUME//
////////////////

/datum/greyscale_config/maid_neck_cover
name = "Maid Neck Cover"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_neck_cover.json'

/datum/greyscale_config/maid_neck_cover/worn
name = "Maid Neck Cover (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi'

/datum/greyscale_config/maid_arm_covers
name = "Maid Arm Covers"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_arm_covers.json'

/datum/greyscale_config/maid_arm_covers/worn
name = "Maid Arm Covers (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi'

/datum/greyscale_config/maid_costume
name = "Maid Costume"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_costume.json'

/datum/greyscale_config/maid_costume/worn
name = "Maid Costume (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi'

/datum/greyscale_config/maid_headband
name = "Maid Headband"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_headband.json'

/datum/greyscale_config/maid_headband/worn
name = "Maid Headband (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi'
17 changes: 17 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* ( *snores* this dm file contains greyscale datums for suit slot clothes! )
/
|\ _,,,---,,_ /
/,`.-'`' -. ;-;;,_
|,4- ) )-,_..;\ ( `'-'
'---''(_/--' `-'\_)
*/

/datum/greyscale_config/chokha
name = "Chokha"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha.json'

/datum/greyscale_config/chokha/worn
name = "Chokha (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha_worn.json'
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"ranger_poncho": [
{
"type": "icon_state",
"icon_state": "ranger_obj",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "trim_obj",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"ranger_poncho_t": [
{
"type": "icon_state",
"icon_state": "ranger_obj_t",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "trim_obj_t",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"ranger_poncho": [
{
"type": "icon_state",
"icon_state": "ranger",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "trim",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"ranger_poncho_t": [
{
"type": "icon_state",
"icon_state": "ranger_t",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "trim_t",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"chokha": [
{
"type": "icon_state",
"icon_state": "chokha_obj",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "chokha_shirt_obj",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "chokha_collar_obj",
"blend_mode": "overlay",
"color_ids": [ 3 ]
},
{
"type": "icon_state",
"icon_state": "chokha_paulets_obj",
"blend_mode": "overlay",
"color_ids": [ 4 ]
},
{
"type": "icon_state",
"icon_state": "chokha_misc_obj",
"blend_mode": "overlay"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"chokha": [
{
"type": "icon_state",
"icon_state": "chokha",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "chokha_shirt",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "chokha_collar",
"blend_mode": "overlay",
"color_ids": [ 3 ]
},
{
"type": "icon_state",
"icon_state": "chokha_paulets",
"blend_mode": "overlay",
"color_ids": [ 4 ]
},
{
"type": "icon_state",
"icon_state": "chokha_misc",
"blend_mode": "overlay"
}
]
}
4 changes: 2 additions & 2 deletions modular_doppler/modular_cosmetics/code/neck/neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

/obj/item/clothing/neck/long_cape/Initialize(mapload)
. = ..()
AddComponent(/datum/component/toggle_clothes, "long_cape_t")
AddComponent(/datum/component/toggle_icon)

/obj/item/clothing/neck/wide_cape
name = "wide cape"
Expand Down Expand Up @@ -52,7 +52,7 @@

/obj/item/clothing/neck/face_scarf/Initialize(mapload)
. = ..()
AddComponent(/datum/component/toggle_clothes, "face_scarf_t")
AddComponent(/datum/component/toggle_icon)

///////////////
//MISCELLANIA//
Expand Down
9 changes: 9 additions & 0 deletions modular_doppler/modular_cosmetics/code/suits/jacket.dm
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,15 @@
//COATS//
/////////

/obj/item/clothing/suit/jacket/doppler/chokha
name = "\improper Iseurian chokha"
desc = "A ceremonial woolen coat sporting a high neck and decorative gunpowder cases on the breast. The label on this one bears the Iseurian Revolutionary flag."
icon_state = "chokha"
greyscale_config = /datum/greyscale_config/chokha
greyscale_config_worn = /datum/greyscale_config/chokha/worn
greyscale_colors = "#1c1c1c#491618#1c1c1c#491618"
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/clothing/suit/jacket/doppler/fur_coat
name = "rugged fur coat"
desc = "Even in an age where any large mammal can be grown in situ at industrial levels some insist on having \
Expand Down
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6370,6 +6370,8 @@
#include "modular_doppler\modular_cosmetics\code\neck\neck.dm"
#include "modular_doppler\modular_cosmetics\code\suits\jacket.dm"
#include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_neck.dm"
#include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_sets.dm"
#include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_suit.dm"
#include "modular_doppler\sprite_accessories\code\hair.dm"
#include "modular_doppler\tableflip\tableflip.dm"
#include "modular_doppler\wargaming\code\game_kit.dm"
Expand Down

0 comments on commit 24615c2

Please sign in to comment.