diff --git a/code/datums/outfits/ert/hephaestus_ert.dm b/code/datums/outfits/ert/hephaestus_ert.dm index 278942ba0b4..03e72c54709 100644 --- a/code/datums/outfits/ert/hephaestus_ert.dm +++ b/code/datums/outfits/ert/hephaestus_ert.dm @@ -1,6 +1,6 @@ /obj/outfit/admin/ert/hephaestus name = "Hephaestus Asset Protection" - uniform = /obj/item/clothing/under/rank/security/heph + uniform = /obj/item/clothing/under/ert/hephaestus shoes = /obj/item/clothing/shoes/jackboots species_shoes = list( SPECIES_UNATHI = /obj/item/clothing/shoes/jackboots/toeless @@ -44,7 +44,8 @@ H.equip_to_slot_if_possible(boots, slot_shoes) /obj/outfit/admin/ert/hephaestus/medic - name = "Hephaestus Medic" + name = "Hephaestus Asset Protection - Medic" + uniform = /obj/item/clothing/under/ert/hephaestus/medic belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex @@ -78,7 +79,8 @@ ) /obj/outfit/admin/ert/hephaestus/engi - name = "Hephaestus Engineer" + name = "Hephaestus Asset Protection - Engineer" + uniform = /obj/item/clothing/under/ert/hephaestus/engineer back = /obj/item/storage/backpack/duffel/heph belt = /obj/item/storage/belt/utility/very_full gloves = /obj/item/clothing/gloves/yellow @@ -99,5 +101,5 @@ belt_contents = null /obj/outfit/admin/ert/hephaestus/leader - name = "Hephaestus Squad Leader" - uniform = /obj/item/clothing/under/rank/captain/hephaestus + name = "Hephaestus Asset Protection - Squad Leader" + uniform = /obj/item/clothing/under/ert/hephaestus/leader diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 5d2646043e7..a8e266bcc0a 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -128,6 +128,12 @@ icon_state = "surgcap_idris" item_state = "surgcap_idris" +// Hephaestus doesn't have medical jobs, but off-ships use them. + +/obj/item/clothing/head/surgery/heph + icon_state = "surgcap_heph" + item_state = "surgcap_heph" + /obj/item/clothing/head/warden name = "warden hat" desc = "A warden hat. For showing who is in charge of the brig." diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 0ee7ba74a83..9f5b7f5417c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -320,6 +320,10 @@ icon_state = "idris_surgown" item_state = "idris_surgown" +/obj/item/clothing/suit/storage/surgical_gown/heph + icon_state = "heph_surgown" + item_state = "heph_surgown" + //Mime /obj/item/clothing/suit/suspenders name = "suspenders" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 4a8342538d3..a28a4f75ed0 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -299,6 +299,20 @@ worn_state = "heph_captain" contained_sprite = TRUE +/obj/item/clothing/head/caphat/cap/hephaestus + name = "captain's cap" + desc = "You fear to wear it for the negligence it brings. This one is in the colors of Hephaestus Industries" + icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi' + icon_state = "heph_captain_cap" + item_state = "heph_captain_cap" + +/obj/item/clothing/gloves/captain/hephaestus + name = "captain's gloves" + desc = "Green gloves, with a nice gold trim. Swanky." + icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi' + icon_state = "heph_captain_gloves" + item_state = "heph_captain_gloves" + /obj/item/clothing/under/rank/captain/einstein name = "einstein captain's jumpsuit" desc = "It's a grey-green jumpsuit with some gold markings denoting the rank of \"Captain\" used by Einstein Engines." diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index ff3ee4880eb..eff82a48c5c 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -184,6 +184,11 @@ icon_state = "pmc_alt_phys" item_state = "pmc_alt_phys" +// Hephaestus doesn't have medical jobs, but off-ships use them +/obj/item/clothing/under/rank/medical/heph + icon_state = "heph_phys" + item_state = "heph_phys" + // Intern /obj/item/clothing/under/rank/medical/intern diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 94053546048..73374f9849d 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -785,3 +785,43 @@ desc = "A shirt and tie underneath a shortcoat, used by high-ranking commissioned officers of the All-Xanu Armed Forces." icon_state = "xanu_cap" item_state = "xanu_cap" + +//Hephaestus ERT + +/obj/item/clothing/under/ert/hephaestus + name = "\improper Hephaestus military tactical uniform" + desc = "A green colored uniform worn by Hephaestus Industries's private military forces and hostile terraforming corps." + icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi' + icon_state = "heph_military" + item_state = "heph_military" + contained_sprite = TRUE + rolled_sleeves = 0 + +/obj/item/clothing/under/ert/hephaestus/medic + name = "\improper Hephaestus military medic tactical uniform" + desc = "A green colored uniform worn by Hephaestus Industries's private military forces and hostile terraforming corps. This one has blue highlights denoting a squad medic." + has_accents = TRUE + accent_color = COLOR_CYAN_BLUE + +/obj/item/clothing/under/ert/hephaestus/engineer + name = "\improper Hephaestus military engineer tactical uniform" + desc = "A green colored uniform worn by Hephaestus Industries's private military forces and hostile terraforming corps. This one has orange highlights denoting a squad engineer." + has_accents = TRUE + accent_color = COLOR_ORANGE + +/obj/item/clothing/under/ert/hephaestus/leader + name = "\improper Hephaestus military leader tactical uniform" + desc = "A green colored uniform worn by Hephaestus Industries's private military forces and hostile terraforming corps. This one has red highlights denoting a squad leader." + has_accents = TRUE + accent_color = COLOR_RED + +/obj/item/clothing/head/hephaestus_military + name = "\improper Hephaestus military utility cover" + desc = "A military cover issued to Hephaestus Industries's private military personnel as part of their uniform." + icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi' + icon_state = "heph_military_utility" + item_state = "heph_military_utility" + contained_sprite = TRUE + armor = list( + MELEE = ARMOR_MELEE_MINOR + ) diff --git a/html/changelogs/GeneralCamo - Hephaestus Expansion.yml b/html/changelogs/GeneralCamo - Hephaestus Expansion.yml new file mode 100644 index 00000000000..df1af21b6c7 --- /dev/null +++ b/html/changelogs/GeneralCamo - Hephaestus Expansion.yml @@ -0,0 +1,61 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: GeneralCamo + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added new Hephaestus ERT/military uniforms." + - rscadd: "Added new Hephaestus captain's cap and gloves." + - rscadd: "Added a new Hephaestus physician's uniform." + - rscadd: "Added a new Hephaestus surgical gown and cap." diff --git a/icons/clothing/under/uniforms/cyclops_uniforms.dmi b/icons/clothing/under/uniforms/cyclops_uniforms.dmi index 89dc3e35d95..55ea349a91b 100644 Binary files a/icons/clothing/under/uniforms/cyclops_uniforms.dmi and b/icons/clothing/under/uniforms/cyclops_uniforms.dmi differ diff --git a/icons/obj/item/clothing/department_uniforms/medical.dmi b/icons/obj/item/clothing/department_uniforms/medical.dmi index 107e0f04edc..5bf90a0bb81 100644 Binary files a/icons/obj/item/clothing/department_uniforms/medical.dmi and b/icons/obj/item/clothing/department_uniforms/medical.dmi differ diff --git a/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm b/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm index dda4b6d71b7..89eca7d03f6 100644 --- a/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm +++ b/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm @@ -101,6 +101,8 @@ name = "Cyclops Crew Captain" uniform = /obj/item/clothing/under/rank/captain/hephaestus + head = /obj/item/clothing/head/caphat/cap/hephaestus + gloves = /obj/item/clothing/gloves/captain/hephaestus back = /obj/item/storage/backpack/satchel/leather /datum/ghostspawner/human/cyclops_crew/engineer diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm index 874d3c01173..3a436464448 100644 --- a/maps/away/ships/heph/heph_security/heph_security.dmm +++ b/maps/away/ships/heph/heph_security/heph_security.dmm @@ -441,8 +441,8 @@ /area/heph_security_ship/medbay) "du" = ( /obj/item/clothing/head/beret/corporate/heph, -/obj/item/clothing/under/rank/security/heph, -/obj/item/clothing/under/rank/security/heph, +/obj/item/clothing/under/ert/hephaestus, +/obj/item/clothing/under/ert/hephaestus, /obj/item/clothing/head/beret/corporate/heph, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, @@ -457,6 +457,10 @@ /obj/structure/sign/poster{ pixel_y = 32 }, +/obj/item/clothing/head/hephaestus_military, +/obj/item/clothing/head/hephaestus_military, +/obj/item/clothing/under/ert/hephaestus/medic, +/obj/item/clothing/under/ert/hephaestus/engineer, /turf/simulated/floor/carpet, /area/heph_security_ship/crew) "dv" = ( @@ -2097,9 +2101,9 @@ /turf/simulated/floor, /area/heph_security_ship/engineering) "ow" = ( -/obj/item/clothing/under/rank/security/heph, +/obj/item/clothing/under/ert/hephaestus, /obj/item/clothing/head/beret/corporate/heph, -/obj/item/clothing/under/rank/security/heph, +/obj/item/clothing/under/ert/hephaestus, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/pouches/black, @@ -2125,6 +2129,10 @@ /obj/structure/sign/poster{ pixel_y = 32 }, +/obj/item/clothing/head/hephaestus_military, +/obj/item/clothing/head/hephaestus_military, +/obj/item/clothing/under/ert/hephaestus/medic, +/obj/item/clothing/under/ert/hephaestus/engineer, /turf/simulated/floor/carpet, /area/heph_security_ship/crew) "oy" = ( @@ -2865,12 +2873,13 @@ dir = 1 }, /obj/item/clothing/accessory/holster/hip/brown, -/obj/item/clothing/under/rank/captain/hephaestus, +/obj/item/clothing/under/ert/hephaestus/leader, /obj/structure/closet/cabinet, /obj/machinery/alarm/south{ req_one_access = null; req_access = list(216) }, +/obj/item/clothing/head/caphat/cap/hephaestus, /turf/simulated/floor/carpet, /area/heph_security_ship/captain) "sw" = ( @@ -7205,7 +7214,9 @@ /obj/structure/closet/secure_closet/medical3{ req_access = null }, -/obj/item/clothing/under/rank/medical/surgeon, +/obj/item/clothing/under/rank/medical/heph, +/obj/item/clothing/suit/storage/surgical_gown/heph, +/obj/item/clothing/head/surgery/heph, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/pouches/white, /obj/effect/floor_decal/industrial/outline/medical, diff --git a/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm b/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm index 30c46d3b55a..dc4cfe16496 100644 --- a/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm +++ b/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm @@ -20,7 +20,8 @@ /obj/outfit/admin/heph_security name = "Hephaestus Asset Protection" - uniform = /obj/item/clothing/under/rank/security/heph + uniform = /obj/item/clothing/under/ert/hephaestus + head = /obj/item/clothing/head/hephaestus_military shoes = /obj/item/clothing/shoes/jackboots gloves = /obj/item/clothing/gloves/combat l_ear = /obj/item/device/radio/headset/ship @@ -72,4 +73,5 @@ /obj/outfit/admin/heph_security/captain name = "Hephaestus Asset Protection Squad Leader" - uniform = /obj/item/clothing/under/rank/captain/hephaestus + uniform = /obj/item/clothing/under/ert/hephaestus/leader + head = /obj/item/clothing/head/caphat/cap/hephaestus