diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index 5b1e2929e67..0a8f7c8f1e4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -52,6 +52,12 @@ slot = slot_head faction = "Eridani Private Military Contractors" +/datum/gear/faction/eridani_cap + display_name = "eridani cap" + path = /obj/item/clothing/head/soft/eri + slot = slot_head + faction = "Eridani Private Military Contractors" + /datum/gear/faction/zenghu_uniform_alt display_name = "zeng-hu white uniform" path = /obj/item/clothing/under/rank/zeng/alt diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 585cf4f0c23..a9de51779b2 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -84,3 +84,8 @@ name = "IAC soft cap" desc = "It's field cap in IAC colors." icon_state = "iachat" + +/obj/item/clothing/head/soft/eri + name = "eridani cap" + desc = "A grey EPMC fatigue cap with the symbol of the Eridani Corporate Federation on its front. For amoral mercenaries that prefer style over protection." + icon_state = "eridanihat" diff --git a/html/changelogs/Aboshehab_Edridani_Cap.yml b/html/changelogs/Aboshehab_Edridani_Cap.yml new file mode 100644 index 00000000000..f2e6c3e1dc7 --- /dev/null +++ b/html/changelogs/Aboshehab_Edridani_Cap.yml @@ -0,0 +1,41 @@ +################################ +# 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: Aboshehab + +# 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: "Adds eridani cap, acquirable in the loadout within the factions tab. Sprites courtesy of Wigglesworth Jones " diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 973e7294767..0f88ea6eb13 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 90cd54c97d2..889d8209d52 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ