| [name][extra_color_data] | "
dat += "[gear.cost] | "
if(islist(gear.restricted_roles))
if(gear.restricted_roles.len)
@@ -2623,8 +2649,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
current_tab = text2num(href_list["tab"])
if(href_list["preference"] == "gear")
if(href_list["clear_loadout"])
- chosen_gear = list()
- gear_points = CONFIG_GET(number/initial_gear_points)
+ loadout_data["SAVE_[loadout_slot]"] = list()
save_preferences()
if(href_list["select_category"])
gear_category = html_decode(href_list["select_category"])
@@ -2637,10 +2662,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(!G)
return
var/toggle = text2num(href_list["toggle_gear"])
- if(!toggle && (G.type in chosen_gear))//toggling off and the item effectively is in chosen gear)
- chosen_gear -= G.type
- gear_points += initial(G.cost)
- else if(toggle && (!(is_type_in_ref_list(G, chosen_gear))))
+ if(!toggle && has_loadout_gear(loadout_slot, "[G.type]"))//toggling off and the item effectively is in chosen gear)
+ remove_gear_from_loadout(loadout_slot, "[G.type]")
+ else if(toggle && !(has_loadout_gear(loadout_slot, "[G.type]")))
if(!is_loadout_slot_available(G.category))
to_chat(user, "You cannot take this loadout, as you've already chosen too many of the same category!")
return
@@ -2648,8 +2672,46 @@ GLOBAL_LIST_EMPTY(preferences_datums)
to_chat(user, "This is an item intended for donator use only. You are not authorized to use this item.")
return
if(gear_points >= initial(G.cost))
- chosen_gear += G.type
- gear_points -= initial(G.cost)
+ var/list/new_loadout_data = list(LOADOUT_ITEM = "[G.type]")
+ if(length(G.loadout_initial_colors))
+ new_loadout_data[LOADOUT_COLOR] = G.loadout_initial_colors
+ else
+ new_loadout_data[LOADOUT_COLOR] = list("#FFFFFF")
+ if(loadout_data["SAVE_[loadout_slot]"])
+ loadout_data["SAVE_[loadout_slot]"] += list(new_loadout_data) //double packed because it does the union of the CONTENTS of the lists
+ else
+ loadout_data["SAVE_[loadout_slot]"] = list(new_loadout_data) //double packed because you somehow had no save slot in your loadout?
+ if(href_list["loadout_color"])
+ var/name = html_decode(href_list["loadout_gear_name"])
+ var/datum/gear/G = GLOB.loadout_items[gear_category][gear_subcategory][name]
+ if(!G)
+ return
+ var/user_gear = has_loadout_gear(loadout_slot, "[G.type]")
+ if(!user_gear)
+ return
+ if(!length(user_gear[LOADOUT_COLOR]))
+ user_gear[LOADOUT_COLOR] = list("#FFFFFF")
+ var/current_color = user_gear[LOADOUT_COLOR][1]
+ var/new_color = input(user, "Polychromic options", "Choose Color", current_color) as color|null
+ user_gear[LOADOUT_COLOR][1] = sanitize_hexcolor(new_color, 6, TRUE, current_color)
+ if(href_list["loadout_color_polychromic"])
+ var/name = html_decode(href_list["loadout_gear_name"])
+ var/datum/gear/G = GLOB.loadout_items[gear_category][gear_subcategory][name]
+ if(!G)
+ return
+ var/user_gear = has_loadout_gear(loadout_slot, "[G.type]")
+ if(!user_gear)
+ return
+ var/list/color_options = list()
+ for(var/i=1, i<=length(G.loadout_initial_colors), i++)
+ color_options += "Color [i]"
+ var/color_to_change = input(user, "Polychromic options", "Recolor [name]") as null|anything in color_options
+ if(color_to_change)
+ var/color_index = text2num(copytext(color_to_change, 7))
+ var/current_color = user_gear[LOADOUT_COLOR][color_index]
+ var/new_color = input(user, "Polychromic options", "Choose [color_to_change] Color", current_color) as color|null
+ if(new_color)
+ user_gear[LOADOUT_COLOR][color_index] = sanitize_hexcolor(new_color, 6, TRUE, current_color)
ShowChoices(user)
return 1
@@ -2867,8 +2929,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
/datum/preferences/proc/is_loadout_slot_available(slot)
var/list/L
LAZYINITLIST(L)
- for(var/i in chosen_gear)
- var/datum/gear/G = i
+ for(var/i in loadout_data["SAVE_[loadout_slot]"])
+ var/datum/gear/G = i[LOADOUT_ITEM]
var/occupied_slots = L[initial(G.category)] ? L[initial(G.category)] + 1 : 1
LAZYSET(L, initial(G.category), occupied_slots)
switch(slot)
@@ -2882,6 +2944,18 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(L[slot] < DEFAULT_SLOT_AMT)
return TRUE
+/datum/preferences/proc/has_loadout_gear(save_slot, gear_type)
+ var/list/gear_list = loadout_data["SAVE_[save_slot]"]
+ for(var/loadout_gear in gear_list)
+ if(loadout_gear[LOADOUT_ITEM] == gear_type)
+ return loadout_gear
+ return FALSE
+
+/datum/preferences/proc/remove_gear_from_loadout(save_slot, gear_type)
+ var/find_gear = has_loadout_gear(save_slot, gear_type)
+ if(find_gear)
+ loadout_data["SAVE_[save_slot]"] -= list(find_gear)
+
#undef DEFAULT_SLOT_AMT
#undef HANDS_SLOT_AMT
#undef BACKPACK_SLOT_AMT
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index acc24b13bd..86f7622a93 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX 46
+#define SAVEFILE_VERSION_MAX 47
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -262,6 +262,29 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
features["color_scheme"] = OLD_CHARACTER_COLORING //advanced is off by default
+ if(current_version < 47) //loadout save gets changed to json
+ var/text_to_load
+ S["loadout"] >> text_to_load
+ var/list/saved_loadout_paths = splittext(text_to_load, "|")
+ //MAXIMUM_LOADOUT_SAVES save slots per loadout now
+ for(var/i=1, i<= MAXIMUM_LOADOUT_SAVES, i++)
+ loadout_data["SAVE_[i]"] = list()
+ for(var/some_gear_item in saved_loadout_paths)
+ if(!ispath(text2path(some_gear_item)))
+ message_admins("Failed to copy item [some_gear_item] to new loadout system when migrating from version [current_version] to 40, issue: item is not a path")
+ continue
+ var/datum/gear/gear_item = text2path(some_gear_item)
+ if(!(initial(gear_item.loadout_flags) & LOADOUT_CAN_COLOR_POLYCHROMIC))
+ loadout_data["SAVE_1"] += list(list(LOADOUT_ITEM = some_gear_item)) //for the migration we put their old save into the first save slot, which is loaded by default!
+ else
+ //the same but we setup some new polychromic data (you can't get the initial value for a list so we have to do this horrible thing here)
+ var/datum/gear/temporary_gear_item = new gear_item
+ loadout_data["SAVE_1"] += list(list(LOADOUT_ITEM = some_gear_item, LOADOUT_COLOR = temporary_gear_item.loadout_initial_colors))
+ qdel(temporary_gear_item)
+ //it's double packed into a list because += will union the two lists contents
+
+ S["loadout"] = safe_json_encode(loadout_data)
+
/datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey)
return
@@ -711,20 +734,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
var/list/json_from_file = json_decode(file2text(char_vr_path))
if(json_from_file)
belly_prefs = json_from_file["belly_prefs"]
+
//gear loadout
- var/text_to_load
- S["loadout"] >> text_to_load
- var/list/saved_loadout_paths = splittext(text_to_load, "|")
- chosen_gear = list()
- gear_points = CONFIG_GET(number/initial_gear_points)
- for(var/i in saved_loadout_paths)
- var/datum/gear/path = text2path(i)
- if(path)
- var/init_cost = initial(path.cost)
- if(init_cost > gear_points)
- continue
- chosen_gear += path
- gear_points -= init_cost
+ loadout_data = safe_json_decode(S["loadout"])
//try to fix any outdated data if necessary
//preference updating will handle saving the updated data for us.
@@ -1058,11 +1070,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//gear loadout
- if(chosen_gear.len)
- var/text_to_save = chosen_gear.Join("|")
- S["loadout"] << text_to_save
+ if(length(loadout_data))
+ S["loadout"] << safe_json_encode(loadout_data)
else
- S["loadout"] << "" //empty string to reset the value
+ S["loadout"] << safe_json_encode(list())
cit_character_pref_save(S)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 66d4b46c60..15a5345ad1 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -11,12 +11,25 @@
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
resistance_flags = NONE
mutantrace_variation = STYLE_MUZZLE
+ visor_flags_inv = HIDEFACE
+ var/flavor_adjust = TRUE //can it do the heehoo alt click to hide/show identity
+
+/obj/item/clothing/mask/gas/examine(mob/user)
+ . = ..()
+ if(flavor_adjust)
+ . += "Alt-click to toggle identity concealment. it's currently [flags_inv & HIDEFACE ? "on" : "off"]."
+
+/obj/item/clothing/mask/gas/AltClick(mob/user)
+ . = ..()
+ if(flavor_adjust && adjustmask(user, TRUE))
+ return TRUE
/obj/item/clothing/mask/gas/glass
name = "glass gas mask"
desc = "A face-covering mask that can be connected to an air supply. This one doesn't obscure your face however." //More accurate
icon_state = "gas_clear"
flags_inv = HIDEEYES
+ flavor_adjust = FALSE
// **** Welding gas mask ****
@@ -35,6 +48,7 @@
visor_flags_inv = HIDEEYES
visor_flags_cover = MASKCOVERSEYES
resistance_flags = FIRE_PROOF
+ flavor_adjust = FALSE
/obj/item/clothing/mask/gas/welding/attack_self(mob/user)
weldingvisortoggle(user)
@@ -72,7 +86,6 @@
flags_cover = MASKCOVERSEYES
resistance_flags = FLAMMABLE
actions_types = list(/datum/action/item_action/adjust)
- visor_flags_inv = HIDEFACE
dog_fashion = /datum/dog_fashion/head/clown
var/static/list/clownmask_designs
@@ -87,15 +100,6 @@
"The Rainbow Color" = image(icon = src.icon, icon_state = "rainbow")
)
-/obj/item/clothing/mask/gas/clown_hat/examine(mob/user)
- . = ..()
- . += "Alt-click to toggle identity concealment. it's currently [flags_inv & HIDEFACE ? "on" : "off"]."
-
-/obj/item/clothing/mask/gas/clown_hat/AltClick(mob/user)
- . = ..()
- if(adjustmask(user, TRUE))
- return TRUE
-
/obj/item/clothing/mask/gas/clown_hat/ui_action_click(mob/user)
if(!istype(user) || user.incapacitated())
return
@@ -130,18 +134,8 @@
flags_cover = MASKCOVERSEYES
resistance_flags = FLAMMABLE
actions_types = list(/datum/action/item_action/adjust)
- visor_flags_inv = HIDEFACE
var/static/list/mimemask_designs
-/obj/item/clothing/mask/gas/mime/examine(mob/user)
- . = ..()
- . += "Alt-click to toggle identity concealment. it's currently [flags_inv & HIDEFACE ? "on" : "off"]."
-
-/obj/item/clothing/mask/gas/mime/AltClick(mob/user)
- . = ..()
- if(adjustmask(user, TRUE))
- return TRUE
-
/obj/item/clothing/mask/gas/mime/Initialize(mapload)
.=..()
if(!mimemask_designs)
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 3aa9e6519a..c6c97f7cba 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -567,7 +567,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and
/datum/holiday/xmas/proc/roundstart_celebrate()
for(var/obj/machinery/computer/security/telescreen/entertainment/Monitor in GLOB.machines)
- Monitor.icon_state = "entertainment_xmas"
+ Monitor.icon_state_on = "entertainment_xmas"
for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_living_list)
Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 2eb68fe30d..e4877176d3 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -176,6 +176,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
//Called when cloning, copies some vars that should be kept
/datum/species/proc/copy_properties_from(datum/species/old_species)
mutant_bodyparts["limbs_id"] = old_species.mutant_bodyparts["limbs_id"]
+ eye_type = old_species.eye_type
+ mutanttongue = old_species.mutanttongue
return
//Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced.
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 6541deda1c..ffa3f7478b 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -123,7 +123,7 @@
/obj/structure/reagent_dispensers/plumbed/storage/ComponentInitialize()
AddComponent(/datum/component/plumbing/tank)
-
+
//////////////
//Fuel Tanks//
//////////////
@@ -134,16 +134,20 @@
icon_state = "fuel"
reagent_id = /datum/reagent/fuel
-/obj/structure/reagent_dispensers/fueltank/high //Unused - Good for ghost roles
+/obj/structure/reagent_dispensers/fueltank/high
name = "high-capacity fuel tank"
desc = "A now illegal tank, full of highly pressurized industrial welding fuel. Do not consume or have a open flame close to this tank."
icon_state = "fuel_high"
- tank_volume = 3000
+ tank_volume = 5000
/obj/structure/reagent_dispensers/fueltank/boom()
explosion(get_turf(src), 0, 1, 5, flame_range = 5)
qdel(src)
+/obj/structure/reagent_dispensers/fueltank/high/boom()
+ explosion(get_turf(src), 0, 2, 5, flame_range = 12)
+ qdel(src)
+
/obj/structure/reagent_dispensers/fueltank/blob_act(obj/structure/blob/B)
boom()
diff --git a/html/changelogs/AutoChangeLog-pr-13617.yml b/html/changelogs/AutoChangeLog-pr-13617.yml
new file mode 100644
index 0000000000..532882eecc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13617.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "loadout now has save slot support and colour choosing/saving for polychromic items"
diff --git a/html/changelogs/AutoChangeLog-pr-13713.yml b/html/changelogs/AutoChangeLog-pr-13713.yml
new file mode 100644
index 0000000000..36228f10c5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13713.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "all gas masks (but welding + glass) can be alt clicked to show/hide identity"
diff --git a/html/changelogs/AutoChangeLog-pr-13734.yml b/html/changelogs/AutoChangeLog-pr-13734.yml
new file mode 100644
index 0000000000..a4ea9fdfac
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13734.yml
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes:
+ - bugfix: "Fixes Reflective Blobs"
diff --git a/html/changelogs/AutoChangeLog-pr-13737.yml b/html/changelogs/AutoChangeLog-pr-13737.yml
new file mode 100644
index 0000000000..6c1121256f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13737.yml
@@ -0,0 +1,4 @@
+author: "qwertyquerty"
+delete-after: True
+changes:
+ - bugfix: "Flash the screen on climax"
diff --git a/html/changelogs/AutoChangeLog-pr-13739.yml b/html/changelogs/AutoChangeLog-pr-13739.yml
new file mode 100644
index 0000000000..6db29bf922
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13739.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - bugfix: "custom eyes and tongues now properly carry across cloning"
diff --git a/html/changelogs/AutoChangeLog-pr-13743.yml b/html/changelogs/AutoChangeLog-pr-13743.yml
new file mode 100644
index 0000000000..00ff1a55bd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13743.yml
@@ -0,0 +1,5 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - bugfix: "entertainment monitors no longer invisible"
+ - rscadd: "entertainment monitors now light up and display text when motion is detected in thunderdome"
diff --git a/html/changelogs/AutoChangeLog-pr-13747.yml b/html/changelogs/AutoChangeLog-pr-13747.yml
new file mode 100644
index 0000000000..f8b6111c08
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13747.yml
@@ -0,0 +1,6 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - rscadd: ""
+ - tweak: "Added the ability for cargo to buy a large welding tank"
+ - imageadd: "Tweaked large tank reagent sprites to /tg/'s"
diff --git a/html/changelogs/AutoChangeLog-pr-13750.yml b/html/changelogs/AutoChangeLog-pr-13750.yml
new file mode 100644
index 0000000000..a89abdd440
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13750.yml
@@ -0,0 +1,6 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes:
+ - bugfix: "Fixes the conveyor belt issues in Delta Station's cargo wing"
+ - rscdel: "Removes some of the dirt around the affected area (presumably they would have cleaned it up while working on it)"
+ - rscadd: "Adds a floor light to fix the \"dark spot\" cargo had"
diff --git a/html/changelogs/AutoChangeLog-pr-13762.yml b/html/changelogs/AutoChangeLog-pr-13762.yml
new file mode 100644
index 0000000000..841e4d91c0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13762.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - tweak: "luxury shuttle no longer has noteleport"
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index f14f77585b..b9c891ddb9 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/status_display.dmi b/icons/obj/status_display.dmi
index 68082395d0..6833e9ff24 100644
Binary files a/icons/obj/status_display.dmi and b/icons/obj/status_display.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index 4a21fb41fd..d58dda7f7d 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -287,6 +287,8 @@
slot = SLOT_IN_BACKPACK
path = /obj/item/clothing/neck/cloak/polychromic/polyce
ckeywhitelist = list("worksbythesea", "blakeryan")
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#808080", "#8CC6FF", "#FF3535")
/datum/gear/donator/ssk
name = "Stun Sword Kit"
diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm
index 0ebfa060f2..2a7b77bd47 100644
--- a/modular_citadel/code/modules/client/loadout/_loadout.dm
+++ b/modular_citadel/code/modules/client/loadout/_loadout.dm
@@ -53,6 +53,8 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
var/path //item-to-spawn path
var/cost = 1 //normally, each loadout costs a single point.
var/geargroupID //defines the ID that the gear inherits from the config
+ var/loadout_flags = 0
+ var/list/loadout_initial_colors = list()
//NEW DONATOR SYTSEM STUFF
var/donoritem //autoset on new if null
diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm
index c7eff6ce78..7c3c11f25c 100644
--- a/modular_citadel/code/modules/client/loadout/neck.dm
+++ b/modular_citadel/code/modules/client/loadout/neck.dm
@@ -86,7 +86,11 @@
/datum/gear/neck/polycloak
name = "Polychromatic Cloak"
path = /obj/item/clothing/neck/cloak/polychromic
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#FFFFFF", "#FFFFFF", "#808080")
/datum/gear/neck/altpolycloak
name = "Alternate Cloak"
path = /obj/item/clothing/neck/cloak/alt/polychromic
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#FFFFFF", "#676767", "#4C4C4C")
diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm
index d0be26a8a4..7c21ed84d0 100644
--- a/modular_citadel/code/modules/client/loadout/suit.dm
+++ b/modular_citadel/code/modules/client/loadout/suit.dm
@@ -101,6 +101,8 @@
name = "Polychromic winter coat"
path = /obj/item/clothing/suit/hooded/wintercoat/polychromic
cost = 4 //too many people with neon green coats is hard on the eyes
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#6A6964", "#C4B8A6", "#0000FF")
/datum/gear/suit/coat/med
name = "Medical winter coat"
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index 76389e2015..b76e223f25 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -47,6 +47,8 @@
/datum/gear/uniform/maidcostume/polychromic
name = "Polychromic maid costume"
path = /obj/item/clothing/under/rank/civilian/janitor/maid/polychromic
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#FFFFFF", "#000000")
/datum/gear/uniform/mailmanuniform
name = "Mailman's jumpsuit"
@@ -227,36 +229,50 @@
name = "Polychromic Jumpsuit"
path = /obj/item/clothing/under/misc/polyjumpsuit
cost = 2
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#FFFFFF", "#808080", "#353535")
/datum/gear/uniform/skirt/poly
name = "Polychromic Jumpskirt"
path = /obj/item/clothing/under/dress/skirt/polychromic
cost = 2
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#FFFFFF", "#F08080", "#808080")
/datum/gear/uniform/suit/poly
name = "Polychromic Button-up Shirt"
path = /obj/item/clothing/under/misc/poly_shirt
cost = 3
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#FFFFFF", "#353535", "#353535")
/datum/gear/uniform/skirt/poly/pleated
name = "Polychromic Pleated Sweaterskirt"
path = /obj/item/clothing/under/dress/skirt/polychromic/pleated
cost = 3
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#8CC6FF", "#808080", "#FF3535")
/datum/gear/uniform/polykilt
name = "Polychromic Kilt"
path = /obj/item/clothing/under/costume/kilt/polychromic
cost = 3
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#FFFFFF", "#F08080")
/datum/gear/uniform/shorts/poly
name = "Polychromic Shorts"
path = /obj/item/clothing/under/misc/polyshorts
cost = 3
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#353535", "#808080", "#808080")
/datum/gear/uniform/shorts/poly/athletic
name = "Polychromic Athletic Shorts"
path = /obj/item/clothing/under/shorts/polychromic
cost = 2
+ loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#FFFFFF", "#F08080")
/datum/gear/uniform/hopcasual
name = "Casual Head of Personnel's uniform"
|