diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 47b012eecff..ca4071f4d6d 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -89,9 +89,9 @@ /datum/outfit/job/hop name = "Head of Personnel" jobtype = /datum/job/hop - uniform = /obj/item/clothing/under/rank/civilian/head_of_personnel + uniform = /obj/item/clothing/under/rank/civilian/hop shoes = /obj/item/clothing/shoes/brown - head = /obj/item/clothing/head/hopcap + head = /obj/item/clothing/head/hop glasses = /obj/item/clothing/glasses/hud/skills/sunglasses l_ear = /obj/item/radio/headset/heads/hop id = /obj/item/card/id/hop diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index d3c5ea44ef6..f76156c129c 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -52,14 +52,16 @@ desc = "A bag for storing extra clothes and shoes. This one belongs to the head of personnel." /obj/item/storage/bag/garment/head_of_personnel/populate_contents() - new /obj/item/clothing/head/hopcap(src) - new /obj/item/clothing/head/hopcap/beret(src) - new /obj/item/clothing/suit/mantle/armor/head_of_personnel(src) + new /obj/item/clothing/head/hop(src) + new /obj/item/clothing/head/hop/beret(src) + new /obj/item/clothing/suit/mantle/armor/hop(src) new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/clothing/under/rank/civilian/head_of_personnel(src) - new /obj/item/clothing/under/rank/civilian/head_of_personnel/dress(src) - new /obj/item/clothing/under/rank/civilian/head_of_personnel/dress_hr(src) - new /obj/item/clothing/under/rank/civilian/head_of_personnel/oldman(src) + new /obj/item/clothing/suit/hopcoat(src) + new /obj/item/clothing/under/rank/civilian/hop(src) + new /obj/item/clothing/under/rank/civilian/hop/skirt(src) + new /obj/item/clothing/under/rank/civilian/hop/dress(src) + new /obj/item/clothing/under/rank/civilian/hop/formal(src) + new /obj/item/clothing/under/rank/civilian/hop/oldman(src) new /obj/item/clothing/under/suit/female(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/shoes/black(src) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 06929b6311e..828e88d0992 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -179,7 +179,7 @@ /datum/gear/hat/beret_job/hop display_name = "Beret, head of personnel" - path = /obj/item/clothing/head/hopcap/beret + path = /obj/item/clothing/head/hop/beret allowed_roles = list("Head of Personnel") /datum/gear/hat/beret_job/sci diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index 6de3e2dd9fe..9c01e17cac9 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -251,7 +251,7 @@ /datum/gear/suit/mantle/job/hop display_name = "Mantle, head of personnel" - path = /obj/item/clothing/suit/mantle/armor/head_of_personnel + path = /obj/item/clothing/suit/mantle/armor/hop allowed_roles = list("Head of Personnel") /datum/gear/suit/mantle/job/rd diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 0de18c3d4b0..b377d517e2b 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -203,6 +203,11 @@ path = /obj/item/clothing/under/rank/security/head_of_security/skirt allowed_roles = list("Head of Security") +/datum/gear/uniform/skirt/job/head_of_personnel + display_name = "Skirt, hop" + path = /obj/item/clothing/under/rank/civilian/hop/skirt + allowed_roles = list("Head of Personnel") + /datum/gear/uniform/skirt/job/magistrate display_name = "Skirt, magistrate" path = /obj/item/clothing/under/rank/procedure/magistrate/skirt diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 5761dfdcbef..3641624520c 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -50,17 +50,23 @@ icon_state = "captain_beret_white" //Head of Personnel -/obj/item/clothing/head/hopcap +/obj/item/clothing/head/hop name = "head of personnel's cap" icon_state = "hopcap" desc = "The symbol of true bureaucratic micromanagement." armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) dog_fashion = /datum/dog_fashion/head/hop + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' + ) -/obj/item/clothing/head/hopcap/beret +/obj/item/clothing/head/hop/beret name = "head of personnel's beret" desc = "For doing paperwork with style." - icon_state = "hop_beret" + icon_state = "beret_hop" + dog_fashion = /datum/dog_fashion/head/hop sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Drask" = 'icons/mob/clothing/species/drask/head.dmi', diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index 0984dc2c347..81da15db9d6 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -259,13 +259,26 @@ resistance_flags = NONE //Head of Personnel -/obj/item/clothing/suit/mantle/armor/head_of_personnel +/obj/item/clothing/suit/mantle/armor/hop name = "head of personnel's shawl" desc = "An armored shawl for the head of personnel. It's remarkably well kept." icon_state = "hopmantle" item_state = "hopmantle" armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) +/obj/item/clothing/suit/hopcoat + name = "head of personnel's coat" + desc = "A big coat for the Head of Personnel who wants to make a fashion statement. Has armour woven within the fabric." + icon_state = "hopcoat" + item_state = "hopcoat" + armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi' + ) + //Dignitaries /obj/item/clothing/suit/storage/ntrep name = "\improper Nanotrasen Representative jacket" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index ad4d59225f1..3c91205d81e 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -5,42 +5,48 @@ "Human" = 'icons/mob/clothing/under/civilian.dmi', "Vox" = 'icons/mob/clothing/species/vox/under/civilian.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/civilian.dmi', - "Grey" = 'icons/mob/clothing/species/grey/under/civilian.dmi' + "Grey" = 'icons/mob/clothing/species/grey/under/civilian.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/under/civilian.dmi' ) -/obj/item/clothing/under/rank/civilian/head_of_personnel - desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." +/obj/item/clothing/under/rank/civilian/hop name = "head of personnel's jumpsuit" + desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." icon_state = "hop" - item_state = "b_suit" item_color = "hop" -/obj/item/clothing/under/rank/civilian/head_of_personnel/dress +/obj/item/clothing/under/rank/civilian/hop/skirt + name = "head of personnel's jumpskirt" + desc = "It's a jumpskirt worn by someone who works in the position of \"Head of Personnel\"." + icon_state = "hop_skirt" + item_color = "hop_skirt" + +/obj/item/clothing/under/rank/civilian/hop/dress name = "head of personnel's dress uniform" desc = "Feminine fashion for the style conscious Head of Personnel." - icon_state = "dress_hop" - item_color = "dress_hop" + icon_state = "hop_dress" + item_color = "hop_dress" -/obj/item/clothing/under/rank/civilian/head_of_personnel_whimsy - desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does." +/obj/item/clothing/under/rank/civilian/hop/formal + name = "head of personnel's formal uniform" + desc = "A stylish choice for a formal occasion." + icon_state = "hop_formal" + item_color = "hop_formal" + +/obj/item/clothing/under/rank/civilian/hop/whimsy name = "head of personnel's suit" - icon_state = "hopwhimsy" - item_state = "hopwhimsy" - item_color = "hopwhimsy" + desc = "A blue sweater and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does." + icon_state = "hop_whimsy" + item_state = "hop_whimsy" + item_color = "hop_whimsy" -/obj/item/clothing/under/rank/civilian/head_of_personnel/oldman +/obj/item/clothing/under/rank/civilian/hop/oldman name = "old man's suit" desc = "A classic suit for the older gentleman with built in back support." icon_state = "oldman" item_state = "oldman" item_color = "oldman" -/obj/item/clothing/under/rank/civilian/head_of_personnel/dress_hr - name = "human resources director's uniform" - desc = "Superior class for the nosy H.R. Director." - icon_state = "huresource" - item_color = "huresource" - /obj/item/clothing/under/rank/civilian/bartender desc = "It looks like it could use some more flair." name = "bartender's uniform" diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index fcac5dc7111..ddc2be55232 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index c3ef64d8921..baef8c01ccb 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index 1fde8dff5b8..b4bf22f7f1e 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/drask/under/civilian.dmi b/icons/mob/clothing/species/drask/under/civilian.dmi index 65abb049671..53ce570efc5 100644 Binary files a/icons/mob/clothing/species/drask/under/civilian.dmi and b/icons/mob/clothing/species/drask/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index de0ff096287..15518988940 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index b70786592df..45f1f6cc44a 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/under/civilian.dmi b/icons/mob/clothing/species/grey/under/civilian.dmi index a05f1c92099..aef84913923 100644 Binary files a/icons/mob/clothing/species/grey/under/civilian.dmi and b/icons/mob/clothing/species/grey/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi index bf89ab29c2a..8e398165f2c 100644 Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/civilian.dmi b/icons/mob/clothing/species/kidan/under/civilian.dmi new file mode 100644 index 00000000000..9c8d974d336 Binary files /dev/null and b/icons/mob/clothing/species/kidan/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 374d72b7698..846a0da4041 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 63c10abda38..52aa1343e51 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/under/civilian.dmi b/icons/mob/clothing/species/vox/under/civilian.dmi index 873a6838fd3..63f65aa8e3c 100644 Binary files a/icons/mob/clothing/species/vox/under/civilian.dmi and b/icons/mob/clothing/species/vox/under/civilian.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index a7108da33bd..b034654674c 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index 6eda3ab2810..3811856e8a7 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 4ea3ac1a1d4..c3db618d381 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 5aedfb731b7..aaf4877597a 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e3a7bb2f218..2660087f11c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi index 770a8cd4679..774f95bf868 100644 Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ