diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index ebcd15277ba..9578a209b89 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -34,6 +34,12 @@ slot = slot_wear_suit faction = "Necropolis Industries" +/datum/gear/faction/necro_research_alt + display_name = "brown necropolis research uniform" + path = /obj/item/clothing/under/rank/necropolis/research/alt + slot = slot_wear_suit + faction = "Necropolis Industries" + /datum/gear/faction/eridani_beret display_name = "eridani beret" path = /obj/item/clothing/head/beret/sec/eri @@ -44,4 +50,4 @@ display_name = "zeng-hu black uniform" path = /obj/item/clothing/under/rank/zeng/alt slot = slot_wear_suit - faction = "Zeng-hu Pharmaceuticals" \ No newline at end of file + faction = "Zeng-Hu Pharmaceuticals" \ No newline at end of file diff --git a/html/changelogs/paradoxspace-ilied.yml b/html/changelogs/paradoxspace-ilied.yml new file mode 100644 index 00000000000..eb4106a7178 --- /dev/null +++ b/html/changelogs/paradoxspace-ilied.yml @@ -0,0 +1,44 @@ +################################ +# 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: ParadoxSpace & AmoryBlaine + +# 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: + - bugfix: "Adds the alt Necropolis research uniform to the loadout. My bad." + - tweak: "Refactors the Necropolis security uniform just a little bit." + - bugfix: "Fixes being unable to select the alt Zeng-Hu uniform and the Idris service uniform having no sprite, as well as various other small fixes." + - bugfix: "Fixes Bedhead 5 to properly come up all the way." \ No newline at end of file diff --git a/icons/mob/human_face/hair.dmi b/icons/mob/human_face/hair.dmi index feec133c172..80700373fce 100644 Binary files a/icons/mob/human_face/hair.dmi and b/icons/mob/human_face/hair.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 402bf7de069..67f9e04e2af 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index b5e4a01595b..17f2579bb6f 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ