diff --git a/code/modules/client/preference_setup/loadout/items/xeno/human.dm b/code/modules/client/preference_setup/loadout/items/xeno/human.dm index a2fb2e6cac7..4a74b8f76c1 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/human.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/human.dm @@ -84,6 +84,13 @@ whitelisted = list(SPECIES_HUMAN_OFFWORLD) sort_category = "Xenowear - Human" +/datum/gear/offworlder_rig/colorable + display_name = "colorable exo-stellar skeleton" + path = /obj/item/rig/light/offworlder/colorable + whitelisted = list(SPECIES_HUMAN_OFFWORLD) + sort_category = "Xenowear - Human" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/accessory/offworlder_card display_name = "scarab passblade" path = /obj/item/clothing/accessory/badge/passcard/scarab diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index d68822a8a3e..748563eb391 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -750,6 +750,8 @@ if(check_slot && check_slot == use_obj) return use_obj.forceMove(wearer) + if(src.color) + use_obj.color = src.color if(!wearer.equip_to_slot_if_possible(use_obj, equip_to, 0, 1)) use_obj.forceMove(src) if(check_slot) diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index a2875537d0d..c37d4fa7906 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -241,6 +241,9 @@ cold_protection = UPPER_TORSO flags_inv = 0 +/obj/item/rig/light/offworlder/colorable + icon_state = "offworlder_rig_colorable" + /obj/item/rig/light/offworlder/frontier name = "advanced mobility hardsuit control module" desc = "Patterned off of the standard Exo-Stellar Skeleton, this sophisticated and light hardsuit is a staple of many armed forces throughout the Frontier. The mobility it grants compared to bulkier suits, while still packing the potential for a versatile toolset, has made it especially popular in the often cramped environments of ships and stations." diff --git a/html/changelogs/CometBlaze-exoskeleton.yml b/html/changelogs/CometBlaze-exoskeleton.yml new file mode 100644 index 00000000000..dffb4707864 --- /dev/null +++ b/html/changelogs/CometBlaze-exoskeleton.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: CometBlaze + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a colorable exo-stellar skeletons offworlders can pick in the loadout." diff --git a/icons/obj/item/clothing/rig/offworlder.dmi b/icons/obj/item/clothing/rig/offworlder.dmi index 05a86989484..16387c82a93 100644 Binary files a/icons/obj/item/clothing/rig/offworlder.dmi and b/icons/obj/item/clothing/rig/offworlder.dmi differ