Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
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
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
/area/ruin/unpowered)
"an" = (
/obj/structure/closet/malf,
/obj/item/clothing/gloves/color/rainbow/clown,
/obj/item/clothing/gloves/color/rainbow,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/under/rank/clown,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/under/rank/clown,
/obj/item/storage/backpack/clown,
/obj/item/clothing/gloves/color/rainbow/clown,
/obj/item/clothing/gloves/color/rainbow,
/turf/open/floor/wood,
/area/ruin/powered)
"ak" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
pixel_x = 12;
pixel_y = 7
},
/obj/item/clothing/shoes/yogs/fire_crocs{
/obj/item/clothing/shoes/fire_crocs{
pixel_x = 30;
pixel_y = 13
},
Expand Down
28 changes: 28 additions & 0 deletions code/__DEFINES/dye_keys.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#define DYE_REGISTRY_UNDER "under"
#define DYE_REGISTRY_JUMPSKIRT "jumpskirt"
#define DYE_REGISTRY_GLOVES "gloves"
#define DYE_REGISTRY_SNEAKERS "sneakers"
#define DYE_REGISTRY_FANNYPACK "fannypack"
#define DYE_REGISTRY_BEDSHEET "bedsheet"

#define DYE_RED "red"
#define DYE_ORANGE "orange"
#define DYE_YELLOW "yellow"
#define DYE_GREEN "green"
#define DYE_BLUE "blue"
#define DYE_PURPLE "purple"
#define DYE_BLACK "black"
#define DYE_WHITE "white"
#define DYE_RAINBOW "rainbow"
#define DYE_MIME "mime"
#define DYE_COSMIC "cosmic"
#define DYE_QM "qm"
#define DYE_LAW "law"
#define DYE_CAPTAIN "captain"
#define DYE_HOP "hop"
#define DYE_HOS "hos"
#define DYE_CE "ce"
#define DYE_RD "rd"
#define DYE_CMO "cmo"
#define DYE_REDCOAT "redcoat"
#define DYE_CLOWN "clown"
3 changes: 1 addition & 2 deletions code/game/gamemodes/changeling/changeling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
C.appearance = chosen_prof.appearance_list[slot]
C.name = chosen_prof.name_list[slot]
C.flags_cover = chosen_prof.flags_cover_list[slot]
C.item_color = chosen_prof.item_color_list[slot]
C.item_state = chosen_prof.item_state_list[slot]
if(equip)
user.equip_to_slot_or_del(C, GLOB.slot2slot[slot])
Expand All @@ -172,4 +171,4 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
round_credits += "<br>"

round_credits += ..()
return round_credits
return round_credits
2 changes: 1 addition & 1 deletion code/game/gamemodes/clown_ops/clown_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
attack_verb_on = list("slipped")
clumsy_check = FALSE
sharpness = SHARP_NONE
item_color = "yellow"
saber_color = "yellow"
heat = 0
light_color = "#ffff00"
var/next_trombone_allowed = 0
Expand Down
Loading