diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm index a0164a39399..5c3a4ebea3b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -143,6 +143,13 @@ J.species_tag = tag return J +/datum/gear/head/skrell_helmet + display_name = "Skrellmet" + path = /obj/item/clothing/head/helmet/security/skrell + whitelisted = list(SPECIES_SKRELL) + sort_category = "Xenowear - Skrell" + allowed_roles = list("Head of Security", "Warden", "Security Officer", "Investigator", "Head of Personnel", "Captain") + /* Skrellian Social Score */ @@ -163,4 +170,4 @@ datum/gear_tweak/social_credit/get_metadata(var/user, var/metadata) datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/passport/jargon/PP, var/metadata) if(!istype(PP)) return - PP.credit_score = metadata + pick(-0.01, 0, 0.01) \ No newline at end of file + PP.credit_score = metadata + pick(-0.01, 0, 0.01) diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index cf3026ac030..dfdc0734a68 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -204,6 +204,13 @@ icon_state = "helm_sec" item_state = "helm_sec" +/obj/item/clothing/head/helmet/security/skrell + name = "skrellmet" + desc = "A helmet built for use by a Skrell. This one appears to be fairly standard and reliable." + icon_state = "helm_skrell" + item_state = "helm_skrell" + valid_accessory_slots = null + /obj/item/clothing/head/helmet/security/heavy name = "corporate heavy helmet" desc = "A shiny and heavy helmet in corporate black! Goes well with the respective plate carrier." @@ -230,4 +237,4 @@ laser = ARMOR_LASER_RIFLE, energy = ARMOR_ENERGY_SMALL, bomb = ARMOR_BOMB_PADDED, - ) \ No newline at end of file + ) diff --git a/html/changelogs/nerocavalier-skrellmet.yml b/html/changelogs/nerocavalier-skrellmet.yml new file mode 100644 index 00000000000..678dc3fa980 --- /dev/null +++ b/html/changelogs/nerocavalier-skrellmet.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: NeroCavalier + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Ports the Skrellian Helmet from bay. Security, HoP, and Captains will be able to get it in their loadouts under Xenowear - Skrell" + diff --git a/icons/clothing/kit/modular_armor.dmi b/icons/clothing/kit/modular_armor.dmi index 16d57546ed5..cb021d8b142 100644 Binary files a/icons/clothing/kit/modular_armor.dmi and b/icons/clothing/kit/modular_armor.dmi differ