diff --git a/modular_skyrat/master_files/icons/mob/clothing/feet.dmi b/modular_skyrat/master_files/icons/mob/clothing/feet.dmi index 1c298665725..bf770d50fdd 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/feet.dmi and b/modular_skyrat/master_files/icons/mob/clothing/feet.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head.dmi index 4e32f31c27c..3e1dc9ee297 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/head.dmi and b/modular_skyrat/master_files/icons/mob/clothing/head.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi index 199b04b4ede..97fbd918832 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi index 0fbd3041c3a..7e712d8de06 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi and b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/shoes.dmi b/modular_skyrat/master_files/icons/obj/clothing/shoes.dmi index 1f42d058a24..ac3cddf0f29 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/shoes.dmi and b/modular_skyrat/master_files/icons/obj/clothing/shoes.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi index f41d8ea4296..22e574a3dcd 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi and b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_skyrat/modules/customization/modules/client/loadout/head.dm b/modular_skyrat/modules/customization/modules/client/loadout/head.dm index 0278532330e..596984cf8ad 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/head.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/head.dm @@ -202,6 +202,22 @@ /datum/loadout_item/head/job subcategory = LOADOUT_SUBCATEGORY_JOB +/datum/loadout_item/head/job/captain/imperial + name = "Captain's Naval Cap" + path = /obj/item/clothing/head/imperial/cap + restricted_roles = list("Captain") + +/datum/loadout_item/head/job/hop/imperial + name = "Head of Personnel's Naval Cap" + path = /obj/item/clothing/head/imperial/hop + restricted_roles = list("Head of Personnel") + +/*/datum/loadout_item/head/job/ce/imperial + name = "Chief Engineer's blast helmet." + path = /obj/item/clothing/head/imperial/ce + restricted_roles = list("Chief Engineer")*/ + + /datum/loadout_item/head/job/cowboyhat/sec name = "Cowboy Hat, Security" path = /obj/item/clothing/head/cowboyhat/sec @@ -220,11 +236,22 @@ restricted_desc = "Security" restricted_roles = list("Warden","Detective","Security Medic","Security Sergeant","Security Officer","Head of Security","Civil Disputes Officer") -/datum/loadout_item/head/job/navybluehosberet +/datum/loadout_item/head/job/blasthelmet + name = "General's Helmet" + path = /obj/item/clothing/head/imperialhelmet + restricted_desc = "Security and Command" + restricted_roles = list("Warden","Detective","Security Medic","Security Sergeant","Security Officer","Civil Disputes Officer","Captain", "Head of Personnel", "Blueshield", "Head of Security", "Research Director", "Quartermaster", "Chief Medical Officer", "Chief Engineer") + +/datum/loadout_item/head/job/hos/imperial name = "Head of security's navyblue beret" path = /obj/item/clothing/head/beret/sec/navyhos restricted_roles = list("Head of Security") +/datum/loadout_item/head/job/navybluehosberet + name = "Head of Security's Naval Cap" + path = /obj/item/clothing/head/imperial/hos + restricted_roles = list("Head of Security") + /datum/loadout_item/head/job/solhoscap name = "Head of security's Sol Cap" path = /obj/item/clothing/head/hos/beret/peacekeeper/sol @@ -262,6 +289,24 @@ restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist","Security Medic") restricted_desc = "Medical" +/datum/loadout_item/head/job/imperial + name = "Naval Officer Cap" + path = /obj/item/clothing/head/imperial + restricted_roles = list("Captain", "Head of Personnel", "Blueshield", "Head of Security", "Research Director", "Quartermaster", "Chief Medical Officer", "Chief Engineer") + restricted_desc = "Command Staff" + +/datum/loadout_item/head/job/impgrey + name = "Grey Naval Officer Cap" + path = /obj/item/clothing/head/imperial/grey + restricted_roles = list("Captain", "Head of Personnel", "Blueshield", "Head of Security", "Research Director", "Quartermaster", "Chief Medical Officer", "Chief Engineer") + restricted_desc = "Command Staff" + +/datum/loadout_item/head/job/impred + name = "Red Naval Officer Cap" + path = /obj/item/clothing/head/imperial/red + restricted_roles = list("Captain", "Head of Personnel", "Blueshield", "Head of Security", "Research Director", "Quartermaster", "Chief Medical Officer", "Chief Engineer") + restricted_desc = "Command Staff" + // JOB - Berets /datum/loadout_item/head/job/atmos_beret name = "Atmospherics Beret" diff --git a/modular_skyrat/modules/customization/modules/client/loadout/shoes.dm b/modular_skyrat/modules/customization/modules/client/loadout/shoes.dm index 61cb907bfbd..5cf6a42d4b2 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/shoes.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/shoes.dm @@ -102,6 +102,14 @@ name = "Brown Jackboots" path = /obj/item/clothing/shoes/jungleboots +/datum/loadout_item/shoes/thighboot + name = "Thigh Boots" + path = /obj/item/clothing/shoes/jackboots/thigh + +/datum/loadout_item/shoes/kneeboot + name = "Knee Boots" + path = /obj/item/clothing/shoes/jackboots/knee + /datum/loadout_item/shoes/disco name = "Green Snakeskin Shoes" path = /obj/item/clothing/shoes/discoshoes diff --git a/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm b/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm index c456c302187..eb0c74d5786 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm @@ -568,6 +568,16 @@ path = /obj/item/clothing/under/rank/captain/dress restricted_roles = list("Captain") +/datum/loadout_item/uniform/job/impcap + name = "Captain's Naval Jumpsuit" + path = /obj/item/clothing/under/rank/captain/imperial + restricted_roles = list("Captain") + +/datum/loadout_item/uniform/job/imphop + name = "Head of Personnel's Naval Jumpsuit" + path = /obj/item/clothing/under/rank/civilian/head_of_personnel/imperial + restricted_roles = list("Head of Personnel") + /datum/loadout_item/uniform/job/lowprison name = "Low Security Prisoner Jumpsuit" path = /obj/item/clothing/under/rank/prisoner/lowsec @@ -625,6 +635,11 @@ path = /obj/item/clothing/under/rank/security/head_of_security/formal restricted_roles = list("Head of Security") +/datum/loadout_item/uniform/job/imphos + name = "Head of Security's Naval Uniform" + path = /obj/item/clothing/under/rank/security/head_of_security/imperial + restricted_roles = list("Head of Security") + /datum/loadout_item/uniform/job/solhos name = "Head of Security Sol uniform" path = /obj/item/clothing/under/rank/security/head_of_security/peacekeeper/sol @@ -785,6 +800,11 @@ restricted_roles = list("Chief Medical Officer", "Chemist") restricted_desc = "Chemistry" +/datum/loadout_item/uniform/job/impcmo + name = "Chief Medical Officer's Naval Uniform" + path = /obj/item/clothing/under/rank/medical/chief_medical_officer/imperial + restricted_roles = list("Chief Medical Officer") + /datum/loadout_item/uniform/job/gorka_cargo name = "Supply Gorka" path = /obj/item/clothing/under/utility/cargo/gorka @@ -846,6 +866,16 @@ restricted_roles = list("Station Engineer","Atmospheric Technician", "Chief Engineer") restricted_desc = "Engineering" +/datum/loadout_item/uniform/job/impce + name = "Chief Engineer's Naval Uniform" + path = /obj/item/clothing/under/rank/engineering/chief_engineer/imperial + restricted_roles = list("Chief Engineer") + +/datum/loadout_item/uniform/job/imprd + name = "Research Director's Naval Uniform" + path = /obj/item/clothing/under/rank/rnd/research_director/imperial + restricted_roles = list("Research Director") + //JOB - UTILITY @@ -896,6 +926,30 @@ restricted_roles = list("Captain", "Head of Personnel", "Blueshield", "Head of Security", "Research Director", "Quartermaster", "Chief Medical Officer", "Chief Engineer") restricted_desc = "Command Staff" +/datum/loadout_item/uniform/job/impcommand + name = "Light Grey Officer's Naval Jumpsuit" + path = /obj/item/clothing/under/imperial + restricted_roles = list("Captain", "Head of Personnel", "Blueshield", "Head of Security", "Research Director", "Quartermaster", "Chief Medical Officer", "Chief Engineer") + restricted_desc = "Command Staff" + +/datum/loadout_item/uniform/job/impcom + name = "Grey Officer's Naval Jumpsuit" + path = /obj/item/clothing/under/imperial/grey + restricted_roles = list("Captain", "Head of Personnel", "Blueshield", "Head of Security", "Research Director", "Quartermaster", "Chief Medical Officer", "Chief Engineer") + restricted_desc = "Command Staff" + +/datum/loadout_item/uniform/job/impred + name = "Red Officer's Naval Jumpsuit" + path = /obj/item/clothing/under/imperial/red + restricted_roles = list("Captain", "Head of Personnel", "Blueshield", "Head of Security", "Research Director", "Quartermaster", "Chief Medical Officer", "Chief Engineer") + restricted_desc = "Command Staff" + +/datum/loadout_item/uniform/job/impcomtrous + name = "Grey Officer's Naval Jumpsuit (Trousers)" + path = /obj/item/clothing/under/imperial/grey/trouser + restricted_roles = list("Captain", "Head of Personnel", "Blueshield", "Head of Security", "Research Director", "Quartermaster", "Chief Medical Officer", "Chief Engineer") + restricted_desc = "Command Staff" + /datum/loadout_item/uniform/job/robosleek name = "Sleek Roboticist Jumpsuit" path = /obj/item/clothing/under/utility/robo_sleek @@ -1121,4 +1175,3 @@ name = "Green Feminine Christmas Suit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/christmas/croptop/green*/ - diff --git a/modular_skyrat/modules/customization/modules/clothing/head/head.dm b/modular_skyrat/modules/customization/modules/clothing/head/head.dm index 3e02967b014..cedef8d93d3 100644 --- a/modular_skyrat/modules/customization/modules/clothing/head/head.dm +++ b/modular_skyrat/modules/customization/modules/clothing/head/head.dm @@ -299,3 +299,93 @@ /obj/item/clothing/head/flowerpin/ComponentInitialize() . = ..() AddElement(/datum/element/polychromic, poly_colors) + + +/obj/item/clothing/head/imperial + name = "naval officer cap" + desc = "A grey cap with a silver disk in the center." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "impcom" + mutant_variants = NONE + +/obj/item/clothing/head/imperial/hop + name = "head of personnel's naval officer cap" + desc = "A olive cap with a silver disk in the center." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "imphop" + armor = list(MELEE = 25, BULLET = 15, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) + +/obj/item/clothing/head/imperial/hos + name = "head of security's naval officer cap" + desc = "A tar black cap with a silver disk in the center." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "imphos" + armor = list(MELEE = 40, BULLET = 30, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 10, RAD = 0, FIRE = 50, ACID = 60, WOUND = 10) + strip_delay = 80 + +/obj/item/clothing/head/imperial/grey + name = "grey naval officer cap" + desc = "A light grey with a silver disk in the center." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "impcommand" + +/obj/item/clothing/head/imperial/cap + name = "captain's naval officer cap" + desc = "A white cap with a silver disk in the center." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "impcap" + armor = list(MELEE = 25, BULLET = 15, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, RAD = 0, FIRE = 50, ACID = 50, WOUND = 5) + strip_delay = 60 + +/obj/item/clothing/head/imperial/ce + name = "chief engineer's blast helmet" + desc = "Despite seeming like it's made of metal, it's actually a very cheap plastic.." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + armor = list(MELEE = 15, BULLET = 5, LASER = 20, ENERGY = 10, BOMB = 20, BIO = 10, RAD = 20, FIRE = 100, ACID = 50, WOUND = 10) + clothing_flags = STOPSPRESSUREDAMAGE + heat_protection = HEAD + max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT + cold_protection = HEAD + min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT + icon_state = "impce" + +/obj/item/clothing/head/imperial/red + name = "red naval officer cap" + desc = "A red cap with a silver disk in the center." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "impred_cap" +/obj/item/clothing/head/imperialhelmet + name = "blast helmet" + desc = "A sharp helmet with some goggles on the top" + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "gblast_helmet" + mutant_variants = NONE + var/goggles = FALSE + +/obj/item/clothing/head/imperialhelmet/proc/adjust_goggles(mob/living/carbon/user) //using my own donator item as a base omegalul + if(user?.incapacitated()) + return + if(goggles) + icon_state = "gblast_helmet" + to_chat(user, "You put all your effort into pulling the goggles up.") + else + icon_state = "gblast_helmetv" + to_chat(user, "You focus all your willpower to put the goggles down on your eyes.") + goggles = !goggles + if(user) + user.head_update(src, forced = 1) + user.update_action_buttons_icon() + +/obj/item/clothing/head/imperialhelmet/ui_action_click(mob/living/carbon/user, action) + adjust_goggles(user) + +/obj/item/clothing/head/imperialhelmet/attack_self(mob/living/carbon/user) + adjust_goggles(user) diff --git a/modular_skyrat/modules/customization/modules/clothing/shoes/shoes.dm b/modular_skyrat/modules/customization/modules/clothing/shoes/shoes.dm index 9a71f5afc7e..3476d2f5bc9 100644 --- a/modular_skyrat/modules/customization/modules/clothing/shoes/shoes.dm +++ b/modular_skyrat/modules/customization/modules/clothing/shoes/shoes.dm @@ -97,5 +97,19 @@ desc = "Shoes for the sporty individual. The giants of Charlton play host to the titans of Ipswich - making them both seem normal sized." icon_state = "sportshoe" +/obj/item/clothing/shoes/jackboots/thigh + name = "thigh boots" + desc = "Black leather boots that go up to the thigh." + icon = 'modular_skyrat/master_files/icons/obj/clothing/shoes.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/feet.dmi' + icon_state = "thighboots" + +/obj/item/clothing/shoes/jackboots/knee + name = "knee boots" + desc = "Black leather boots that go up to the knee." + icon = 'modular_skyrat/master_files/icons/obj/clothing/shoes.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/feet.dmi' + icon_state = "kneeboots" + diff --git a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm index 4267a222913..f037624f83e 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm @@ -495,6 +495,75 @@ icon_state = "workpants_red" +/obj/item/clothing/under/rank/captain/imperial + desc = "A white jumpsuit adorned with golden epaulets and a rank badge denoting a Captain. There are two ways to destroy a person, kill him, or ruin his reputation." + name = "captain's naval jumpsuit" + icon_state = "impcap" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + +/obj/item/clothing/under/rank/civilian/head_of_personnel/imperial + desc = "A olive green navel suit and a rank badge denoting the Personnel Officer. Target, maximum firepower." + name = "head of personnel's naval jumpsuit" + icon_state = "imphop" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + +/obj/item/clothing/under/rank/security/head_of_security/imperial + desc = "A tar black navel jumpsuit and a rank badge denoting the Officer of The Internal Security Division. Be careful your underlings don't bump their head on a door." + name = "head of security's naval jumpsuit" + icon_state = "imphos" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + +/obj/item/clothing/under/rank/rnd/research_director/imperial + desc = "A grey, sterile jumpsuit with a rank badge denoting the Officer of the Internal Science Division. It's a peaceful life." + name = "research director's naval jumpsuit" + icon_state = "imprd" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + +/obj/item/clothing/under/rank/engineering/chief_engineer/imperial + desc = "A black, lead lined jumpsuit with a rank badge denoting the Officer of the Internal Engineering Division. Doesn't come with a death machine building guide." + name = "chief engineer's naval jumpsuit" + icon_state = "impce" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + +/obj/item/clothing/under/rank/medical/chief_medical_officer/imperial + desc = "A teal, sterile jumpsuit with a rank badge denoting the Officer of the Medical Corps. Doesn't protect against blaster fire." + name = "chief medical officer's naval jumpsuit" + icon_state = "impcmo" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + +/obj/item/clothing/under/imperial + desc = "A light grey jumpsuit with a rank badge denoting an Officer. Doesn't protect against blaster fire." + name = "light grey officer's naval jumpsuit" + icon_state = "impcom" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + +/obj/item/clothing/under/imperial/grey + desc = "A grey jumpsuit with a rank badge denoting an Officer. Doesn't protect against blaster fire." + name = "grey officer's naval jumpsuit" + icon_state = "impcommand" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + +/obj/item/clothing/under/imperial/grey/trouser + desc = "A grey jumpsuit with a rank badge denoting an Officer. This one has grey trousers." + name = "grey officer's naval jumpsuit" + icon_state = "admiral_uniform" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + +/obj/item/clothing/under/imperial/red + desc = "A red jumpsuit with a rank badge denoting an Officer. Doesn't protect against blaster fire." + name = "red officer's naval jumpsuit" + icon_state = "impred_uniform" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi'