Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] GAGSifies the jester costume #2730

Merged
merged 1 commit into from
Apr 5, 2024
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
12 changes: 6 additions & 6 deletions _maps/RandomZLevels/mothership_astrum.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/NSVBlueshift/Blueshift.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
21 changes: 21 additions & 0 deletions code/datums/greyscale/json_configs/jester_hat.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
21 changes: 21 additions & 0 deletions code/datums/greyscale/json_configs/jester_shoes.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
16 changes: 16 additions & 0 deletions code/datums/greyscale/json_configs/jester_suit.json
Original file line number Diff line number Diff line change
@@ -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 ]
}
]
}
10 changes: 8 additions & 2 deletions code/modules/clothing/head/hat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion code/modules/clothing/shoes/costume.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
10 changes: 8 additions & 2 deletions code/modules/clothing/under/jobs/civilian/clown_mime.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/mob/clothing/feet.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/head/costume.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/civilian.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/head/costume.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/civilian.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/obj/item/clothing/shoes/jester_shoes
greyscale_config_worn_digi = /datum/greyscale_config/jester_shoes/worn/digi
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/obj/item/clothing/under/rank/civilian/clown/jester
greyscale_config_worn_digi = /datum/greyscale_config/jester_suit/worn/digi
Binary file modified modular_nova/master_files/icons/mob/clothing/feet_digi.dmi
Binary file not shown.
Binary file not shown.
8 changes: 8 additions & 0 deletions modular_nova/modules/GAGS/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions modular_nova/modules/modular_vending/code/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions tools/UpdatePaths/Scripts/82339_jester_repath.txt
Original file line number Diff line number Diff line change
@@ -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}
Loading