diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm index f3ec7530560..8aafae55c82 100644 --- a/_maps/RandomZLevels/mothership_astrum.dmm +++ b/_maps/RandomZLevels/mothership_astrum.dmm @@ -476,7 +476,7 @@ "iF" = ( /obj/structure/alien/weeds, /mob/living/basic/alien/drone{ - faction = list("Abductor"); + faction = list("Abductor") }, /turf/open/floor/plating/abductor2, /area/awaymission/mothership_astrum/deck4) @@ -496,7 +496,7 @@ "iS" = ( /obj/structure/alien/weeds/creature, /mob/living/basic/alien/drone{ - faction = list("Abductor"); + faction = list("Abductor") }, /turf/open/floor/plating/abductor2, /area/awaymission/mothership_astrum/deck4) @@ -920,7 +920,7 @@ /area/awaymission/mothership_astrum/halls) "pz" = ( /mob/living/basic/alien/drone{ - faction = list("Abductor"); + faction = list("Abductor") }, /turf/open/floor/mineral/abductor, /area/awaymission/mothership_astrum/halls) @@ -2510,7 +2510,7 @@ "LT" = ( /obj/structure/alien/weeds, /mob/living/basic/alien/drone{ - faction = list("Abductor"); + faction = list("Abductor") }, /turf/open/floor/mineral/abductor, /area/awaymission/mothership_astrum/halls) @@ -2889,7 +2889,7 @@ /area/awaymission/mothership_astrum/halls) "PI" = ( /mob/living/basic/alien/drone{ - faction = list("Abductor"); + faction = list("Abductor") }, /obj/structure/alien/weeds, /turf/open/floor/mineral/abductor, @@ -3101,7 +3101,7 @@ /area/awaymission/mothership_astrum/deck2) "Se" = ( /mob/living/basic/alien/drone{ - faction = list("Abductor"); + faction = list("Abductor") }, /turf/open/floor/plating/abductor2, /area/awaymission/mothership_astrum/halls) diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index 193edf6854c..a0bbcd991b3 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -67161,7 +67161,7 @@ /obj/structure/closet/athletic_mixed, /obj/item/clothing/mask/animal/frog, /obj/item/clothing/head/helmet/skull, -/obj/item/clothing/head/costume/jester/alt, +/obj/item/clothing/head/costume/jesteralt, /obj/item/clothing/head/costume/ushanka, /obj/item/clothing/mask/gas/soviet, /obj/item/clothing/mask/luchador/rudos, diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index 0ab5d2444af..bc9e7e53713 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -797,3 +797,30 @@ NOVA EDIT END */ /datum/greyscale_config/gi/worn name = "Gi (Worn)" icon_file = 'icons/mob/clothing/under/costume.dmi' + +/datum/greyscale_config/jester_suit + name = "Jester Suit" + icon_file = 'icons/obj/clothing/under/civilian.dmi' + json_config = 'code/datums/greyscale/json_configs/jester_suit.json' + +/datum/greyscale_config/jester_suit/worn + name = "Jester Suit (Worn)" + icon_file = 'icons/mob/clothing/under/civilian.dmi' + +/datum/greyscale_config/jester_shoes + name = "Jester Shoes" + icon_file = 'icons/obj/clothing/shoes.dmi' + json_config = 'code/datums/greyscale/json_configs/jester_shoes.json' + +/datum/greyscale_config/jester_shoes/worn + name = "Jester Shoes (Worn)" + icon_file = 'icons/mob/clothing/feet.dmi' + +/datum/greyscale_config/jester_hat + name = "Jester Hat" + icon_file = 'icons/obj/clothing/head/costume.dmi' + json_config = 'code/datums/greyscale/json_configs/jester_hat.json' + +/datum/greyscale_config/jester_hat/worn + name = "Jester Hat (Worn)" + icon_file = 'icons/mob/clothing/head/costume.dmi' diff --git a/code/datums/greyscale/json_configs/jester_hat.json b/code/datums/greyscale/json_configs/jester_hat.json new file mode 100644 index 00000000000..b5147e7a009 --- /dev/null +++ b/code/datums/greyscale/json_configs/jester_hat.json @@ -0,0 +1,21 @@ +{ + "jester_map": [ + { + "type": "icon_state", + "icon_state": "jester_a", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "jester_b", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "jester_bells", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/jester_shoes.json b/code/datums/greyscale/json_configs/jester_shoes.json new file mode 100644 index 00000000000..b5147e7a009 --- /dev/null +++ b/code/datums/greyscale/json_configs/jester_shoes.json @@ -0,0 +1,21 @@ +{ + "jester_map": [ + { + "type": "icon_state", + "icon_state": "jester_a", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "jester_b", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "jester_bells", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/jester_suit.json b/code/datums/greyscale/json_configs/jester_suit.json new file mode 100644 index 00000000000..aac60f18be7 --- /dev/null +++ b/code/datums/greyscale/json_configs/jester_suit.json @@ -0,0 +1,16 @@ +{ + "jester_map": [ + { + "type": "icon_state", + "icon_state": "jester_a", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "jester_b", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 87dba8e0d69..2b871d23a43 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -192,9 +192,15 @@ /obj/item/clothing/head/costume/jester name = "jester hat" desc = "A hat with bells, to add some merriness to the suit." - icon_state = "jester_hat" + icon_state = "jester_map" + greyscale_colors = "#00ff00#ff0000" + greyscale_config = /datum/greyscale_config/jester_hat + greyscale_config_worn = /datum/greyscale_config/jester_hat/worn + flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/head/costume/jester/alt +/obj/item/clothing/head/costume/jesteralt + name = "jester hat" + desc = "A hat with bells, to add some merriness to the suit." icon_state = "jester2" /obj/item/clothing/head/costume/rice_hat diff --git a/code/modules/clothing/shoes/costume.dm b/code/modules/clothing/shoes/costume.dm index 1e15f25e1f6..bf8000d9a08 100644 --- a/code/modules/clothing/shoes/costume.dm +++ b/code/modules/clothing/shoes/costume.dm @@ -105,8 +105,12 @@ /obj/item/clothing/shoes/jester_shoes name = "jester shoes" desc = "Shoes that jingle with every step!!" - icon_state = "green_jester_shoes" + icon_state = "jester_map" inhand_icon_state = null + greyscale_colors = "#00ff00#ff0000" + greyscale_config = /datum/greyscale_config/jester_shoes + greyscale_config_worn = /datum/greyscale_config/jester_shoes/worn + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/shoes/jester_shoes/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm index a85488e4b64..f6fdaf38e0d 100644 --- a/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -80,9 +80,15 @@ /obj/item/clothing/under/rank/civilian/clown/jester name = "jester suit" desc = "A jolly dress, well suited to entertain your master, nuncle." - icon_state = "jester" + icon_state = "jester_map" + greyscale_colors = "#00ff00#ff0000" + greyscale_config = /datum/greyscale_config/jester_suit + greyscale_config_worn = /datum/greyscale_config/jester_suit/worn + flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/under/rank/civilian/clown/jester/alt +/obj/item/clothing/under/rank/civilian/clown/jesteralt + name = "jester suit" + desc = "A jolly dress, well suited to entertain your master, nuncle." icon_state = "jester2" /obj/item/clothing/under/rank/civilian/clown/sexy diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index 612d82302e7..3ae1eb68e86 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi index 4bce495a291..1f4f12ff8c8 100644 Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index 7283996c3b1..d172185d4a4 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/obj/clothing/head/costume.dmi b/icons/obj/clothing/head/costume.dmi index e72c278b6eb..25bc62a5314 100644 Binary files a/icons/obj/clothing/head/costume.dmi and b/icons/obj/clothing/head/costume.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 37f561bb44b..ec2a128a865 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi index 8552c5b9660..8f7c28ca047 100644 Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ diff --git a/modular_nova/master_files/code/modules/clothing/shoes/costume.dm b/modular_nova/master_files/code/modules/clothing/shoes/costume.dm new file mode 100644 index 00000000000..50c081d3580 --- /dev/null +++ b/modular_nova/master_files/code/modules/clothing/shoes/costume.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/shoes/jester_shoes + greyscale_config_worn_digi = /datum/greyscale_config/jester_shoes/worn/digi diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/civilian/clown_mime.dm new file mode 100644 index 00000000000..71a173f42d4 --- /dev/null +++ b/modular_nova/master_files/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/under/rank/civilian/clown/jester + greyscale_config_worn_digi = /datum/greyscale_config/jester_suit/worn/digi diff --git a/modular_nova/master_files/icons/mob/clothing/feet_digi.dmi b/modular_nova/master_files/icons/mob/clothing/feet_digi.dmi index 45f532e0104..50f5816a8dd 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/feet_digi.dmi and b/modular_nova/master_files/icons/mob/clothing/feet_digi.dmi differ diff --git a/modular_nova/master_files/icons/mob/clothing/under/civilian_digi.dmi b/modular_nova/master_files/icons/mob/clothing/under/civilian_digi.dmi index fc9fddc928d..fc67f8fb76e 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/under/civilian_digi.dmi and b/modular_nova/master_files/icons/mob/clothing/under/civilian_digi.dmi differ diff --git a/modular_nova/modules/GAGS/greyscale_configs.dm b/modular_nova/modules/GAGS/greyscale_configs.dm index 4dc3b4f8b00..4f49220255e 100644 --- a/modular_nova/modules/GAGS/greyscale_configs.dm +++ b/modular_nova/modules/GAGS/greyscale_configs.dm @@ -1174,6 +1174,10 @@ // KILT // COSTUMES +/datum/greyscale_config/jester_suit/worn/digi + name = "Jester Suit (Worn, Digi)" + icon_file = 'modular_nova/master_files/icons/mob/clothing/under/civilian_digi.dmi' + /datum/greyscale_config/buttondown_slacks/worn/digi name = "Buttondown with Slacks (Worn, Digi)" icon_file = SHORTS_PANTS_SHIRTS_DIGIFILE @@ -1558,6 +1562,10 @@ TREK name = "Fancy Heels (Worn, Digi)" json_config = 'modular_nova/modules/GAGS/json_configs/shoes/fancyheels/fancyheels_worn_digi.json' +/datum/greyscale_config/jester_shoes/worn/digi + name = "Jester Shoes (Worn, Digi)" + icon_file = 'modular_nova/master_files/icons/mob/clothing/feet_digi.dmi' + // TESHARI FALLBACKS. /datum/greyscale_config/teshari diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_heads.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_heads.dm index 8d877a72724..543e1ca4698 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_heads.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_heads.dm @@ -589,6 +589,14 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea name = "White Naval Officer Cap" item_path = /obj/item/clothing/head/hats/imperial/white +/datum/loadout_item/head/jester + name = "Jester hat" + item_path = /obj/item/clothing/head/costume/jester + +/datum/loadout_item/head/jesteralt + name = "Jester hat (Alt)" + item_path = /obj/item/clothing/head/costume/jesteralt + /datum/loadout_item/head/azulea_oldblood name = "Oldblood's Royal cap" item_path = /obj/item/clothing/head/hats/caphat/azulean/old_blood diff --git a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 51db0efdcf2..0d619fdcbcf 100644 --- a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -421,6 +421,14 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Treasure Hunter" item_path = /obj/item/clothing/under/rank/civilian/curator/treasure_hunter +/datum/loadout_item/under/miscellaneous/jester + name = "Jester Suit" + item_path = /obj/item/clothing/under/rank/civilian/clown/jester + +/datum/loadout_item/under/miscellaneous/jesteralt + name = "Jeset Suit (Alt)" + item_path = /obj/item/clothing/under/rank/civilian/clown/jesteralt + /datum/loadout_item/under/miscellaneous/overalls name = "Overalls" item_path = /obj/item/clothing/under/misc/overalls diff --git a/modular_nova/modules/modular_vending/code/autodrobe.dm b/modular_nova/modules/modular_vending/code/autodrobe.dm index 8640c22266a..481108a9e71 100644 --- a/modular_nova/modules/modular_vending/code/autodrobe.dm +++ b/modular_nova/modules/modular_vending/code/autodrobe.dm @@ -17,8 +17,8 @@ "products" = list( /obj/item/clothing/mask/gas/clownbald = 1, /obj/item/clothing/mask/gas/clown_colourable = 1, - /obj/item/clothing/head/costume/jester/alt = 1, - /obj/item/clothing/under/rank/civilian/clown/jester/alt = 1, + /obj/item/clothing/head/costume/jesteralt = 1, + /obj/item/clothing/under/rank/civilian/clown/jesteralt = 1, ), ), list( diff --git a/tgstation.dme b/tgstation.dme index 5d3eca2f650..84ab17fe1a8 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6473,6 +6473,7 @@ #include "modular_nova\master_files\code\modules\clothing\outfits\standard.dm" #include "modular_nova\master_files\code\modules\clothing\shoes\bananashoes.dm" #include "modular_nova\master_files\code\modules\clothing\shoes\boots.dm" +#include "modular_nova\master_files\code\modules\clothing\shoes\costume.dm" #include "modular_nova\master_files\code\modules\clothing\shoes\sneakers.dm" #include "modular_nova\master_files\code\modules\clothing\shoes\wheelys.dm" #include "modular_nova\master_files\code\modules\clothing\suits\_suits.dm" @@ -6497,6 +6498,7 @@ #include "modular_nova\master_files\code\modules\clothing\under\jobs\rnd.dm" #include "modular_nova\master_files\code\modules\clothing\under\jobs\security.dm" #include "modular_nova\master_files\code\modules\clothing\under\jobs\civilian\civilian.dm" +#include "modular_nova\master_files\code\modules\clothing\under\jobs\civilian\clown_mime.dm" #include "modular_nova\master_files\code\modules\clothing\under\jobs\civilian\suits.dm" #include "modular_nova\master_files\code\modules\entombed_quirk\code\entombed.dm" #include "modular_nova\master_files\code\modules\entombed_quirk\code\entombed_mod.dm" diff --git a/tools/UpdatePaths/Scripts/82339_jester_repath.txt b/tools/UpdatePaths/Scripts/82339_jester_repath.txt new file mode 100644 index 00000000000..1c7012ebf58 --- /dev/null +++ b/tools/UpdatePaths/Scripts/82339_jester_repath.txt @@ -0,0 +1,2 @@ +/obj/item/clothing/head/costume/jester/alt : /obj/item/clothing/head/costume/jesteralt {@OLD} +/obj/item/clothing/under/rank/civilian/clown/jester/alt : /obj/item/clothing/under/rank/civilian/clown/jesteralt {@OLD}