diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index d3a9e9acc2d..698c9b8aa2e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -136,6 +136,8 @@ zavodskoi_headwear["zavodskoi cap, alt"] = /obj/item/clothing/head/softcap/zavod/alt zavodskoi_headwear["zavodskoi woolen hat"] = /obj/item/clothing/head/wool/zavod zavodskoi_headwear["zavodskoi woolen hat, alt"] = /obj/item/clothing/head/wool/zavod/alt + zavodskoi_headwear["zavodskoi pilotka cap"] = /obj/item/clothing/head/sidecap/zavod + zavodskoi_headwear["zavodskoi pilotka cap, alt"] = /obj/item/clothing/head/sidecap/zavod/alt gear_tweaks += new /datum/gear_tweak/path(zavodskoi_headwear) /datum/gear/faction/zavod_sec_uniforms @@ -197,7 +199,7 @@ slot = slot_wear_suit faction = "Zavodskoi Interstellar" allowed_roles = list("Head of Security", "Warden") - + /datum/gear/faction/zavod_warden_coat/New() ..() var/list/zavod_warden_coat = list() @@ -305,6 +307,7 @@ pmcg_headwear["EPMC softcap"] = /obj/item/clothing/head/softcap/pmc/epmc pmcg_headwear["PMCG woolen hat"] = /obj/item/clothing/head/wool/pmc pmcg_headwear["EPMC woolen hat"] = /obj/item/clothing/head/wool/pmc/alt + pmcg_headwear["PMCG garrison cap"] = /obj/item/clothing/head/sidecap/pmcg gear_tweaks += new /datum/gear_tweak/path(pmcg_headwear) /datum/gear/faction/pmc_modsuit @@ -330,6 +333,7 @@ pmcg_sec_uniforms["EPMC uniform"] = /obj/item/clothing/under/rank/security/pmc/epmc pmcg_sec_uniforms["EPMC uniform, alt"] = /obj/item/clothing/under/rank/security/pmc/epmc/alt pmcg_sec_uniforms["EPMC detective uniform"] = /obj/item/clothing/under/det/pmc/alt + pmcg_sec_uniforms["wildlands squadron uniform"] = /obj/item/clothing/under/rank/security/pmc/wildlands_squadron gear_tweaks += new /datum/gear_tweak/path(pmcg_sec_uniforms) /datum/gear/faction/erisec_patch @@ -483,6 +487,7 @@ var/list/heph_headwear = list() heph_headwear["beret, hephaestus"] = /obj/item/clothing/head/beret/corporate/heph heph_headwear["hephaestus woolen hat"] = /obj/item/clothing/head/wool/heph + heph_headwear["hephaestus side cap"] = /obj/item/clothing/head/sidecap/heph gear_tweaks += new /datum/gear_tweak/path(heph_headwear) /datum/gear/faction/heph_passcard @@ -566,7 +571,7 @@ orion_headwear["orion woolen hat"] = /obj/item/clothing/head/wool/orion orion_headwear["orion woolen hat, alt"] = /obj/item/clothing/head/wool/orion/alt gear_tweaks += new /datum/gear_tweak/path(orion_headwear) - + //SCC /datum/gear/faction/scc_armband display_name = "SCC armband" diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index e4921800e43..3fb67912c48 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -101,6 +101,11 @@ path = /obj/item/clothing/head/beret/colorable flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/head/sidecap + display_name = "side cap" + path = /obj/item/clothing/head/sidecap + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/head/warden display_name = "headwear, security (warden)" description = "A selection of warden headwear." diff --git a/code/modules/clothing/factions/pmcg.dm b/code/modules/clothing/factions/pmcg.dm index 8a6902dc1e9..fa291151517 100644 --- a/code/modules/clothing/factions/pmcg.dm +++ b/code/modules/clothing/factions/pmcg.dm @@ -59,4 +59,11 @@ if(use_check_and_message(usr)) return - select_modsuit(usr) \ No newline at end of file + select_modsuit(usr) + +/obj/item/clothing/under/rank/security/pmc/wildlands_squadron + name = "wildlands squadron uniform" + desc = "A set of uniform fatigues used by employees of the Wildlands Squadron, a Private Military Contracting Group subsidiary. The original design is remarkably similar to the Mictlan System Defense Force's uniform, of which many of the original members of the Wildlands Squadron were members." + icon = 'icons/obj/item/clothing/department_uniforms/security.dmi' + icon_state = "pmc_ws" + item_state = "pmc_ws" \ No newline at end of file diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 4f62fa62bf9..8ac78a5b346 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -191,3 +191,35 @@ /obj/item/clothing/head/flatcap/bartender/idris icon_state = "idris_bartender_flatcap" item_state = "idris_bartender_flatcap" + +/obj/item/clothing/head/sidecap + name = "side cap" + desc = "A simple cap, often worn by pilots." + icon = 'icons/obj/item/clothing/head/sidecap.dmi' + contained_sprite = TRUE + icon_state = "side_cap" + item_state = "side_cap" + +/obj/item/clothing/head/sidecap/zavod + name = "zavodskoi pilotka cap" + desc = "A simple cap, often worn by pilots. This one is in Zavodskoi colors." + icon_state = "zavodskoi_pilotka" + item_state = "zavodskoi_pilotka" + +/obj/item/clothing/head/sidecap/pmcg + name = "pmcg garrison cap" + desc = "A simple cap, often worn by pilots. This one is in PMCG colors." + icon_state = "pmcg_side_cap" + item_state = "pmcg_side_cap" + +/obj/item/clothing/head/sidecap/heph + name = "hephaestus side cap" + desc = "A simple cap, often worn by pilots. This one is in Hephaestus colors." + icon_state = "heph_side_cap" + item_state = "heph_side_cap" + +/obj/item/clothing/head/sidecap/zavod/alt + name = "black zavodskoi pilotka cap" + desc = "A simple cap, often worn by pilots. This one is in Zavodskoi colors." + icon_state = "zavodskoi_pilotka_alt" + item_state = "zavodskoi_pilotka_alt" \ No newline at end of file diff --git a/html/changelogs/dansemacabre-drippy.yml b/html/changelogs/dansemacabre-drippy.yml new file mode 100644 index 00000000000..6af1eecf2ff --- /dev/null +++ b/html/changelogs/dansemacabre-drippy.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: TheDanseMacabre + +# 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: "Added a Wildlands Squadron uniform, a generic side cap, and four factional side caps to the loadout." diff --git a/icons/obj/item/clothing/department_uniforms/security.dmi b/icons/obj/item/clothing/department_uniforms/security.dmi index 2175f3f0705..eafe6359ab2 100644 Binary files a/icons/obj/item/clothing/department_uniforms/security.dmi and b/icons/obj/item/clothing/department_uniforms/security.dmi differ diff --git a/icons/obj/item/clothing/head/sidecap.dmi b/icons/obj/item/clothing/head/sidecap.dmi new file mode 100644 index 00000000000..0b8b4c1bca8 Binary files /dev/null and b/icons/obj/item/clothing/head/sidecap.dmi differ