diff --git a/code/controllers/subsystems/traumas.dm b/code/controllers/subsystems/traumas.dm index 3df5aafa0a5..164006442d8 100644 --- a/code/controllers/subsystems/traumas.dm +++ b/code/controllers/subsystems/traumas.dm @@ -56,7 +56,7 @@ var/datum/controller/subsystem/traumas/SStraumas /obj/item/melee/baton, /obj/item/gun/energy/taser, /obj/item/handcuffs, /obj/item/clothing/glasses/sunglasses/sechud, /obj/machinery/door/airlock/security, /obj/item/clothing/under/rank/cadet, /obj/structure/sign/directions/security, /obj/item/clothing/head/bio_hood/security, /obj/item/clothing/head/bomb_hood/security, /obj/item/clothing/head/helmet/space/void/security, - /obj/item/clothing/head/soft/sec, /obj/item/clothing/suit/armor/vest/security, /obj/item/clothing/suit/bio_suit/security, + /obj/item/clothing/head/softcap/security, /obj/item/clothing/suit/armor/vest/security, /obj/item/clothing/suit/bio_suit/security, /obj/item/clothing/suit/bomb_suit/security, /obj/item/clothing/suit/security/navyofficer, /obj/item/clothing/suit/space/void/security, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/device/magnetic_lock/security,/obj/item/toy/figure/secofficer, /obj/item/gun/bang/sec, /obj/item/gun/projectile/sec, /obj/item/book/manual/wiki/security_space_law)), diff --git a/code/datums/outfits/ert/iac.dm b/code/datums/outfits/ert/iac.dm index 60ba936d784..a05f75cef59 100644 --- a/code/datums/outfits/ert/iac.dm +++ b/code/datums/outfits/ert/iac.dm @@ -3,7 +3,7 @@ uniform = /obj/item/clothing/under/rank/iacjumpsuit suit = /obj/item/clothing/suit/storage/iacvest - head = /obj/item/clothing/head/soft/iacberet + head = /obj/item/clothing/head/softcap/iacberet mask = /obj/item/clothing/mask/surgical glasses = /obj/item/clothing/glasses/hud/health/aviator shoes = /obj/item/clothing/shoes/iac diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index 0d1d3293026..ec45dfb29a1 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -285,9 +285,9 @@ /obj/item/clothing/head/helmet/material/makeshift/plasteel, /obj/item/clothing/head/helmet/kettle, /obj/item/clothing/head/helmet/tank/olive, - /obj/item/clothing/head/soft/grey, - /obj/item/clothing/head/soft/himeo, - /obj/item/clothing/head/soft/yellow, + /obj/item/clothing/head/softcap, + /obj/item/clothing/head/softcap/himeo, + /obj/item/clothing/head/softcap/red, /obj/item/clothing/head/that, /obj/item/clothing/head/turban, /obj/item/clothing/head/turban/grey, @@ -546,7 +546,7 @@ suit = /obj/item/clothing/suit/space/cult suit_store = /obj/item/gun/energy/rifle/cult - + /datum/outfit/admin/syndicate/raider_mage name = "Raider Mage" allow_backbag_choice = FALSE @@ -622,4 +622,4 @@ var/obj/item/card/id/syndicate/raider/passport = new(H.loc) passport.name = "[H.real_name]'s Passport" if(W) - W.handle_item_insertion(passport) \ No newline at end of file + W.handle_item_insertion(passport) diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 9afadab60fb..a0d7b28405b 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -779,7 +779,7 @@ /obj/item/clothing/head/pumpkin/lantern = 0.4, /obj/item/clothing/head/redcoat = 0.2, /obj/item/clothing/head/richard = 0.3, - /obj/item/clothing/head/soft/rainbow = 0.7, + /obj/item/clothing/head/softcap/rainbow = 0.7, /obj/item/clothing/head/syndicatefake = 0.5, /obj/item/clothing/head/ushanka = 0.3, /obj/item/clothing/head/witchwig = 0.5, @@ -914,6 +914,7 @@ /obj/random/glowstick = 0.4, /obj/random/hoodie = 0.5, /obj/random/bandana = 0.5, + /obj/random/softcap = 0.5, /obj/random/junk = 0.4, /obj/random/medical = 0.4, /obj/random/pda_cart = 0.5, @@ -941,7 +942,7 @@ /obj/item/clothing/gloves/black = 10, /obj/item/clothing/head/chameleon = 0.5, - /obj/item/clothing/head/soft/grey = 5, + /obj/item/clothing/head/softcap = 5, /obj/item/clothing/mask/chameleon = 1, /obj/item/clothing/mask/gas/ = 10, @@ -1032,6 +1033,24 @@ /obj/item/clothing/head/bandana/captain = 1 ) +/obj/random/softcap + name = "random softcap" + desc = "This is a random softcap." + icon = 'icons/obj/clothing/hats/soft_caps.dmi' + icon_state = "softcap" + problist = list( + /obj/item/clothing/head/softcap/colorable/random = 5, + /obj/item/clothing/head/softcap/engineering = 3, + /obj/item/clothing/head/softcap/atmos = 3, + /obj/item/clothing/head/softcap/medical = 3, + /obj/item/clothing/head/softcap/science = 3, + /obj/item/clothing/head/softcap/hydro = 3, + /obj/item/clothing/head/softcap/cargo = 3, + /obj/item/clothing/head/softcap/miner = 3, + /obj/item/clothing/head/softcap/security = 2, + /obj/item/clothing/head/softcap/captain = 1 + ) + /obj/random/highvalue name = "random high valuable item" desc = "This is a random high valuable item." diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 26ca501203c..d76a21d2933 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -70,7 +70,7 @@ new /obj/item/device/radio/headset/headset_service(src) new /obj/item/cartridge/janitor(src) new /obj/item/clothing/gloves/black(src) - new /obj/item/clothing/head/soft/purple(src) + new /obj/item/clothing/head/softcap/janitor(src) new /obj/item/clothing/head/bandana/janitor(src) new /obj/item/gun/energy/mousegun(src) new /obj/item/device/flashlight(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 9705e815621..47be3ab6f85 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -16,7 +16,7 @@ new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/device/radio/headset/headset_cargo/alt(src) new /obj/item/clothing/gloves/black(src) - new /obj/item/clothing/head/soft/yellow(src) + new /obj/item/clothing/head/softcap/cargo(src) new /obj/item/clothing/head/bandana/cargo(src) new /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/cargo_delivery(src) new /obj/item/export_scanner(src) @@ -41,7 +41,7 @@ new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/tank/emergency_oxygen(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/clothing/head/soft/yellow(src) + new /obj/item/clothing/head/softcap/cargo(src) new /obj/item/clothing/head/bandana/cargo(src) new /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/cargo_delivery(src) new /obj/item/export_scanner(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 7d86f25f9b9..aabd0a9b55e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -295,7 +295,7 @@ new /obj/item/storage/backpack/security(src) else new /obj/item/storage/backpack/satchel_sec(src) - new /obj/item/clothing/head/soft/sec/corp(src) + new /obj/item/clothing/head/softcap/security/corp(src) new /obj/item/clothing/under/rank/security/corp(src) new /obj/item/clothing/suit/storage/vest/officer(src) new /obj/item/clothing/head/helmet(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index d98113d2041..ce4bcfafa9f 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -20,9 +20,9 @@ new /obj/item/clothing/gloves/black_leather(src) new /obj/item/clothing/gloves/black_leather(src) new /obj/item/clothing/gloves/black_leather(src) - new /obj/item/clothing/head/soft/sec(src) - new /obj/item/clothing/head/soft/sec(src) - new /obj/item/clothing/head/soft/sec(src) + new /obj/item/clothing/head/softcap/security(src) + new /obj/item/clothing/head/softcap/security(src) + new /obj/item/clothing/head/softcap/security(src) new /obj/item/clothing/head/beret/sec(src) new /obj/item/clothing/head/beret/sec(src) new /obj/item/clothing/head/beret/sec(src) @@ -380,9 +380,9 @@ new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/head/soft/grey(src) - new /obj/item/clothing/head/soft/grey(src) - new /obj/item/clothing/head/soft/grey(src) + new /obj/item/clothing/head/softcap(src) + new /obj/item/clothing/head/softcap(src) + new /obj/item/clothing/head/softcap(src) new /obj/item/clothing/head/bandana(src) new /obj/item/clothing/head/bandana(src) new /obj/item/clothing/head/bandana(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index f65e0067451..babf2dd6de9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -1,6 +1,6 @@ /datum/gear/faction display_name = "idris cap" - path = /obj/item/clothing/head/soft/sec/idris + path = /obj/item/clothing/head/softcap/security/idris slot = slot_head sort_category = "Factions" cost = 1 @@ -59,7 +59,7 @@ /datum/gear/faction/eridani_cap display_name = "eridani cap" - path = /obj/item/clothing/head/soft/eri + path = /obj/item/clothing/head/softcap/eri slot = slot_head faction = "Eridani Private Military Contractors" diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 85b3786013a..ffc13c7b135 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -34,26 +34,33 @@ path = /obj/item/clothing/head/bandana/colorable flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION -/datum/gear/head/cap - display_name = "cap selection" - description = "A selection of colored caps." - path = /obj/item/clothing/head/soft/blue +/datum/gear/head/softcap + display_name = "softcap selection" + description = "A selection of softcaps. Comes in departmental colors." + path = /obj/item/clothing/head/softcap -/datum/gear/head/cap/New() +/datum/gear/head/softcap/New() ..() - var/caps = list() - caps["red cap"] = /obj/item/clothing/head/soft - caps["orange cap"] = /obj/item/clothing/head/soft/orange - caps["yellow cap"] = /obj/item/clothing/head/soft/yellow - caps["green cap"] = /obj/item/clothing/head/soft/green - caps["blue cap"] = /obj/item/clothing/head/soft/blue - caps["purple cap"] = /obj/item/clothing/head/soft/purple - caps["rainbow cap"] = /obj/item/clothing/head/soft/rainbow - caps["black cap"] = /obj/item/clothing/head/soft/black - caps["grey cap"] = /obj/item/clothing/head/soft/grey - caps["white cap"] = /obj/item/clothing/head/soft/white - caps["flat cap"] = /obj/item/clothing/head/flatcap - gear_tweaks += new/datum/gear_tweak/path(caps) + var/softcaps = list() + softcaps["softcap"] = /obj/item/clothing/head/softcap + softcaps["softcap, rainbow"] = /obj/item/clothing/head/softcap/rainbow + softcaps["softcap, red"] = /obj/item/clothing/head/softcap/red + softcaps["softcap, captain"] = /obj/item/clothing/head/softcap/captain + softcaps["softcap, security"] = /obj/item/clothing/head/softcap/security + softcaps["softcap, science"] = /obj/item/clothing/head/softcap/science + softcaps["softcap, medical"] = /obj/item/clothing/head/softcap/medical + softcaps["softcap, engineering"] = /obj/item/clothing/head/softcap/engineering + softcaps["softcap, atmospherics"] = /obj/item/clothing/head/softcap/atmos + softcaps["softcap, hydroponics"] = /obj/item/clothing/head/softcap/hydro + softcaps["softcap, cargo"] = /obj/item/clothing/head/softcap/cargo + softcaps["softcap, mining"] = /obj/item/clothing/head/softcap/miner + + gear_tweaks += new/datum/gear_tweak/path(softcaps) + +/datum/gear/head/softcap/colorable + display_name = "softcap (colorable)" + path = /obj/item/clothing/head/softcap/colorable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/head/beret/eng display_name = "beret, engie-orange" @@ -70,7 +77,6 @@ path = /obj/item/clothing/head/beret/sec allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician") - /datum/gear/head/warden display_name = "headwear, security (warden)" description = "A selection of warden headwear." @@ -108,12 +114,12 @@ /datum/gear/head/corp display_name = "cap, corporate (security)" - path = /obj/item/clothing/head/soft/sec/corp + path = /obj/item/clothing/head/softcap/security/corp allowed_roles = list("Security Officer","Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",) /datum/gear/head/sec display_name = "cap, security" - path = /obj/item/clothing/head/soft/sec + path = /obj/item/clothing/head/softcap/security allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",) /datum/gear/head/hardhat @@ -182,6 +188,7 @@ hats["hat, cowboy"] = /obj/item/clothing/head/cowboy hats["hat, wide-brimmed cowboy"] = /obj/item/clothing/head/cowboy/wide hats["hat, sombrero"] = /obj/item/clothing/head/sombrero + hats["hat, flatcap"] = /obj/item/clothing/head/flatcap gear_tweaks += new/datum/gear_tweak/path(hats) /datum/gear/head/hijab @@ -250,7 +257,7 @@ /datum/gear/head/iacberet display_name = "IAC Beret" - path = /obj/item/clothing/head/soft/iacberet + path = /obj/item/clothing/head/softcap/iacberet allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Resident") flags = GEAR_HAS_DESC_SELECTION @@ -277,12 +284,12 @@ /datum/gear/head/himeo display_name = "himean cap" - path = /obj/item/clothing/head/soft/himeo + path = /obj/item/clothing/head/softcap/himeo flags = GEAR_HAS_DESC_SELECTION /datum/gear/head/vysoka display_name = "vysokan fur cap" - path = /obj/item/clothing/head/soft/vysoka + path = /obj/item/clothing/head/softcap/vysoka flags = GEAR_HAS_DESC_SELECTION /datum/gear/head/buckethat @@ -301,4 +308,4 @@ var/gadpathur = list() gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/soft/gadpathur gadpathur["gadpathurian beret"] = /obj/item/clothing/head/soft/gadpathur/beret - gear_tweaks += new/datum/gear_tweak/path(gadpathur) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(gadpathur) diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm index 94e410911df..6e7d46862f6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_religion.dm +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -44,8 +44,8 @@ /datum/gear/religion/dominia/beret/New() ..() var/beret = list() - beret["tribunal initiate's beret"] = /obj/item/clothing/head/soft/dominia - beret["tribunalist's beret"] = /obj/item/clothing/head/soft/dominia/priest + beret["tribunal initiate's beret"] = /obj/item/clothing/head/softcap/dominia + beret["tribunalist's beret"] = /obj/item/clothing/head/softcap/dominia/priest gear_tweaks += new/datum/gear_tweak/path(beret) /datum/gear/religion/dominia/cape @@ -63,4 +63,4 @@ /datum/gear/religion/dominia/accessory display_name = "tribunal necklace" - path = "/obj/item/clothing/accessory/dominia" \ No newline at end of file + path = "/obj/item/clothing/accessory/dominia" diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 8bbb0e4e885..9d99b4eef4c 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -319,7 +319,7 @@ item_state = "dominia_priest" slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING -/obj/item/clothing/head/soft/dominia +/obj/item/clothing/head/softcap/dominia name = "tribunal initiate’s beret" desc = "A simple red beret with a golden badge marking its wearer as an initiate of the Moroz Holy Tribunal." desc_fluff = " While initiates dress humbly in white and red clothing, this does not mean that House Caladius - the primary source of the Holy Tribunal’s \ @@ -329,7 +329,7 @@ item_state = "dominia_beret" contained_sprite = TRUE -/obj/item/clothing/head/soft/dominia/priest +/obj/item/clothing/head/softcap/dominia/priest name = "tribunalist’s beret" desc = " black beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal’s clergy." desc_fluff = "With their black and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \ @@ -347,4 +347,4 @@ icon = 'icons/clothing/accessories/dominia_amulet.dmi' item_state = "dominia_amulet" icon_state = "dominia_amulet" - contained_sprite = TRUE \ No newline at end of file + contained_sprite = TRUE diff --git a/code/modules/clothing/factions/himeo.dm b/code/modules/clothing/factions/himeo.dm index e07b23adf6c..bb0621b778e 100644 --- a/code/modules/clothing/factions/himeo.dm +++ b/code/modules/clothing/factions/himeo.dm @@ -12,8 +12,7 @@ icon_state = "coat_himeo_grey" item_state = "coat_himeo_grey" -/obj/item/clothing/head/soft/himeo - +/obj/item/clothing/head/softcap/himeo name = "himean cap" desc = "A field cap of Himean origin. This particular cap has the United Syndicates of Himeo's typical symbol - a white hexagon surrounded by red triangles - on its face." desc_fluff = "The M372 field cap is a standard-issue cap of Himeo's military, and a common sight throughout the planet and the space around it. This particular model is a reproduction, due to its lack of the traditional ear covers on the Himean model." diff --git a/code/modules/clothing/factions/vysoka.dm b/code/modules/clothing/factions/vysoka.dm index 226e2bcf957..b7d71d7e06a 100644 --- a/code/modules/clothing/factions/vysoka.dm +++ b/code/modules/clothing/factions/vysoka.dm @@ -16,11 +16,11 @@ item_state = "chokha_vysoka_f" contained_sprite = TRUE -/obj/item/clothing/head/soft/vysoka +/obj/item/clothing/head/softcap/vysoka name = "vysokan fur cap" desc = "A fur hat from Vysoka made of authentic ohdker fur." desc_fluff = "The ohdker is a common animal on Vysoka that serves as a livestock and beast of burden, depending on the needs at the time. Its fur is highly prized on Vysoka, and major cities often export it off-world to location such as Xanu Prime." icon_state = "cap_vysoka" item_state = "cap_vysoka" icon = 'icons/clothing/head/vysoka_cap.dmi' - contained_sprite = TRUE \ No newline at end of file + contained_sprite = TRUE diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index a9de51779b2..7fc2498b08c 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -1,91 +1,139 @@ -/obj/item/clothing/head/soft - name = "red cap" - desc = "It's a baseball hat in a tasteless red color." - icon_state = "redsoft" - var/flipped = 0 +/obj/item/clothing/head/softcap + name = "softcap" + desc = "It's a softcap in a tasteless color." + icon = 'icons/obj/clothing/hats/soft_caps.dmi' + icon_state = "softcap" + contained_sprite = TRUE + var/flipped = FALSE siemens_coefficient = 0.9 -/obj/item/clothing/head/soft/dropped() - src.icon_state = initial(icon_state) - src.flipped=0 +/obj/item/clothing/head/softcap/dropped() + icon_state = initial(icon_state) + item_state = icon_state + flipped = FALSE ..() -/obj/item/clothing/head/soft/attack_self(mob/user) - src.flipped = !src.flipped - if(src.flipped) - icon_state = "[icon_state]_flipped" - to_chat(user, "You flip the hat backwards.") - else - src.icon_state = initial(icon_state) - to_chat(user, "You flip the hat back in normal position.") +/obj/item/clothing/head/softcap/on_slotmove() + icon_state = initial(icon_state) + item_state = icon_state + flipped = FALSE + ..() + +/obj/item/clothing/head/softcap/verb/ToggleHat() + set name = "Flip Hat" + set category = "Object" + set src in usr + + if(use_check_and_message(usr)) + return 0 + + flipped = !flipped + icon_state = "[initial(icon_state)][flipped ? "_flipped" : ""]" + item_state = icon_state + to_chat(usr, "You flip the hat [flipped ? "backwards" : "forwards"].") update_clothing_icon() //so our mob-overlays update -/obj/item/clothing/head/soft/orange - name = "orange cap" - desc = "It's a peaked cap in a tasteless orange color." - icon_state = "orangesoft" +/obj/item/clothing/head/softcap/colorable + icon_state = "softcap_colorable" -/obj/item/clothing/head/soft/yellow - name = "yellow cap" - desc = "It's a peaked cap in a tasteless yellow color." - icon_state = "yellowsoft" +/obj/item/clothing/head/softcap/colorable/random/Initialize() + . = ..() + color = get_random_colour(TRUE) -/obj/item/clothing/head/soft/green - name = "green cap" - desc = "It's a peaked cap in a tasteless green color." - icon_state = "greensoft" - -/obj/item/clothing/head/soft/blue - name = "blue cap" - desc = "It's a peaked cap in a tasteless blue color." - icon_state = "bluesoft" - -/obj/item/clothing/head/soft/purple - name = "purple cap" - desc = "It's a peaked cap in a tasteless purple color." - icon_state = "purplesoft" - -/obj/item/clothing/head/soft/black - name = "black cap" - desc = "It's a peaked cap in a tasteless black color." - icon_state = "blacksoft" - -/obj/item/clothing/head/soft/grey - name = "grey cap" - desc = "It's a peaked cap in a tasteful grey color." - icon_state = "greysoft" - -/obj/item/clothing/head/soft/white - name = "white cap" - desc = "It's a peaked cap in a tasteless white color." - icon_state = "whitesoft" - -/obj/item/clothing/head/soft/rainbow +/obj/item/clothing/head/softcap/rainbow name = "rainbow cap" desc = "It's a peaked cap in a bright rainbow of colors." icon_state = "rainbowsoft" -/obj/item/clothing/head/soft/sec - name = "security cap" - desc = "It's a field cap in tasteful blue color." - icon_state = "secsoft" +/obj/item/clothing/head/softcap/red // Antag red. + name = "red softcap" + desc = "It's a softcap in a menacing crimson red." + icon_state = "softcap_red" + item_state = "softcap_red" -/obj/item/clothing/head/soft/sec/corp +// Departmental softcaps. By Wowzewow (Wezzy). + +/obj/item/clothing/head/softcap/captain + name = "captain's softcap" + desc = "It's a peaked cap in a authoritative blue and yellow." + icon_state = "softcap_captain" + item_state = "softcap_captain" + +/obj/item/clothing/head/softcap/security + name = "security softcap" + desc = "It's a peaked cap in a secure blue and grey." + icon_state = "softcap_sec" + item_state = "softcap_sec" + +/obj/item/clothing/head/softcap/medical + name = "medical softcap" + desc = "It's a peaked cap in a sterile white and green." + icon_state = "softcap_med" + item_state = "softcap_med" + +/obj/item/clothing/head/softcap/science + name = "science softcap" + desc = "It's a peaked cap in a analytical white and purple." + icon_state = "softcap_sci" + item_state = "softcap_sci" + +/obj/item/clothing/head/softcap/engineering + name = "engineering softcap" + desc = "It's a peaked cap in a reflective yellow and orange." + icon_state = "softcap_engi" + item_state = "softcap_engi" + +/obj/item/clothing/head/softcap/atmos + name = "atmospherics softcap" + desc = "It's a peaked cap in a refreshing yellow and blue." + icon_state = "softcap_atmos" + item_state = "softcap_atmos" + +/obj/item/clothing/head/softcap/hydro + name = "hydroponics softcap" + desc = "It's a peaked cap in a fresh green and blue." + icon_state = "softcap_hydro" + item_state = "softcap_hydro" + +/obj/item/clothing/head/softcap/cargo + name = "cargo softcap" + desc = "It's a peaked cap in a dusty yellow and grey." + icon_state = "softcap_cargo" + item_state = "softcap_cargo" + +/obj/item/clothing/head/softcap/miner + name = "mining softcap" + desc = "It's a peaked cap in a chalky purple and brown." + icon_state = "softcap_miner" + item_state = "softcap_miner" + +/obj/item/clothing/head/softcap/janitor + name = "janitor softcap" + desc = "It's a peaked cap in a sanitary purple and yellow." + icon_state = "softcap_janitor" + item_state = "softcap_janitor" + +// Corporate. + +/obj/item/clothing/head/softcap/security/corp name = "corporate security cap" - desc = "It's field cap in corporate colors." - icon_state = "corpsoft" + desc = "It's field cap in corporate colors. In an oppresive grey, no doubt." + icon_state = "corp" + item_state = "corp" -/obj/item/clothing/head/soft/sec/idris +/obj/item/clothing/head/softcap/security/idris name = "idris cap" - desc = "It's an Idris cap." - icon_state = "idrissec" + desc = "It's a company-issue Idris cap. Comes with flagrant corporate branding." + icon_state = "idris" + item_state = "idris" -/obj/item/clothing/head/soft/iacberet +/obj/item/clothing/head/softcap/iacberet name = "IAC soft cap" - desc = "It's field cap in IAC colors." - icon_state = "iachat" + desc = "An IAC soft cap. Standard issue and utilitarian." + icon_state = "iac" + item_state = "iac" -/obj/item/clothing/head/soft/eri +/obj/item/clothing/head/softcap/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" + icon_state = "eridani" diff --git a/html/changelogs/wezzy_deptcaps.yml b/html/changelogs/wezzy_deptcaps.yml new file mode 100644 index 00000000000..e9ee68484dc --- /dev/null +++ b/html/changelogs/wezzy_deptcaps.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: Wowzewow (Wezzy) + +# 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 departmental caps. Check your loadouts." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 7681eb840c2..24ef2ee663b 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/clothing/lefthand_hats.dmi b/icons/mob/items/clothing/lefthand_hats.dmi index 4f8fd12e397..6c9483ff41e 100644 Binary files a/icons/mob/items/clothing/lefthand_hats.dmi and b/icons/mob/items/clothing/lefthand_hats.dmi differ diff --git a/icons/mob/items/clothing/righthand_hats.dmi b/icons/mob/items/clothing/righthand_hats.dmi index 4e6361b95c9..ae206f379d8 100644 Binary files a/icons/mob/items/clothing/righthand_hats.dmi and b/icons/mob/items/clothing/righthand_hats.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 0bbe4eb1f50..b284e692884 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/hats/soft_caps.dmi b/icons/obj/clothing/hats/soft_caps.dmi new file mode 100644 index 00000000000..4693ff9f20e Binary files /dev/null and b/icons/obj/clothing/hats/soft_caps.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 001f601006e..b193a4a8d4f 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -17775,9 +17775,9 @@ /obj/item/clothing/accessory/sleevepatch/erisec, /obj/item/clothing/accessory/sleevepatch/erisec, /obj/item/clothing/accessory/sleevepatch/erisec, -/obj/item/clothing/head/soft/eri, -/obj/item/clothing/head/soft/eri, -/obj/item/clothing/head/soft/eri, +/obj/item/clothing/head/softcap/eri, +/obj/item/clothing/head/softcap/eri, +/obj/item/clothing/head/softcap/eri, /obj/item/clothing/head/beret/sec/eri, /obj/item/clothing/under/rank/zavodskoi, /obj/item/clothing/under/rank/zavodskoi, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index fe357200e3c..d93a9727d30 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -61264,7 +61264,6 @@ /turf/simulated/floor/plating, /area/maintenance/medbay) "hqT" = ( -/obj/item/clothing/head/soft/white, /obj/item/clothing/mask/gas/mime, /obj/item/clothing/shoes/mime, /obj/item/clothing/under/mime, diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index f3f8984f487..d97d948b0b3 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -16183,12 +16183,12 @@ /area/quartermaster/loading) "En" = ( /obj/structure/table/standard, -/obj/item/clothing/head/soft/yellow, +/obj/item/clothing/head/softcap/cargo, /obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, -/obj/item/clothing/head/soft/yellow, +/obj/item/clothing/head/softcap/cargo, /obj/effect/floor_decal/corner/brown/full{ dir = 8 }, diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index ccff9bb7fbf..9776d58a1cb 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -11689,7 +11689,6 @@ /obj/structure/closet{ name = "Prisoner's Locker" }, -/obj/item/clothing/head/soft/orange, /obj/item/clothing/shoes/sandal, /turf/simulated/floor/tiled, /area/security/prison) @@ -26012,7 +26011,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "aYy" = ( -/obj/item/clothing/head/soft/grey{ +/obj/item/clothing/head/softcap{ pixel_x = -2; pixel_y = 3 }, @@ -35271,12 +35270,12 @@ /area/maintenance/locker) "bqe" = ( /obj/structure/table/standard, -/obj/item/clothing/head/soft/yellow, +/obj/item/clothing/head/softcap/cargo, /obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, -/obj/item/clothing/head/soft/yellow, +/obj/item/clothing/head/softcap/cargo, /turf/simulated/floor/tiled, /area/quartermaster/loading) "bqf" = (