diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 7738e965ca1..103f38b9b72 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -136,7 +136,7 @@ /datum/outfit/job/nanotrasenrep name = "Nanotrasen Representative" jobtype = /datum/job/nanotrasenrep - uniform = /obj/item/clothing/under/rank/civilian/dress_shirt + uniform = /obj/item/clothing/under/rank/centcom/representative suit = /obj/item/clothing/suit/storage/ntrep shoes = /obj/item/clothing/shoes/centcom glasses = /obj/item/clothing/glasses/hud/skills/sunglasses @@ -224,11 +224,10 @@ /datum/outfit/job/judge name = "Magistrate" jobtype = /datum/job/judge - uniform = /obj/item/clothing/under/suit/really_black - suit = /obj/item/clothing/suit/judgerobe + uniform = /obj/item/clothing/under/rank/centcom/magistrate + suit = /obj/item/clothing/suit/magirobe gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/centcom - head = /obj/item/clothing/head/powdered_wig l_ear = /obj/item/radio/headset/heads/magistrate/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses id = /obj/item/card/id/magistrate diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 635c5507acf..2b3d91127c0 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -139,6 +139,8 @@ /obj/item/storage/bag/garment/nanotrasen_representative/populate_contents() new /obj/item/clothing/head/ntrep(src) new /obj/item/clothing/under/rank/centcom/representative(src) + new /obj/item/clothing/under/rank/centcom/representative/skirt(src) + new /obj/item/clothing/under/rank/centcom/representative/formal(src) new /obj/item/clothing/under/rank/civilian/lawyer/oldman(src) new /obj/item/clothing/under/rank/civilian/lawyer/black(src) new /obj/item/clothing/under/suit/female(src) @@ -155,9 +157,10 @@ /obj/item/storage/bag/garment/magistrate/populate_contents() new /obj/item/clothing/head/justice_wig(src) new /obj/item/clothing/head/powdered_wig(src) - new /obj/item/clothing/under/suit/really_black(src) new /obj/item/clothing/under/rank/centcom/magistrate(src) - new /obj/item/clothing/suit/judgerobe(src) + new /obj/item/clothing/under/rank/centcom/magistrate/skirt(src) + new /obj/item/clothing/under/rank/centcom/magistrate/formal(src) + new /obj/item/clothing/suit/magirobe(src) new /obj/item/clothing/shoes/centcom(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/gloves/color/white(src) @@ -169,6 +172,8 @@ /obj/item/storage/bag/garment/blueshield/populate_contents() new /obj/item/clothing/head/beret/centcom/officer(src) new /obj/item/clothing/head/beret/centcom/officer/navy(src) + new /obj/item/clothing/under/rank/centcom/blueshield(src) + new /obj/item/clothing/under/rank/centcom/blueshield/skirt(src) new /obj/item/clothing/under/rank/centcom/blueshield/formal(src) new /obj/item/clothing/suit/armor/vest/blueshield(src) new /obj/item/clothing/suit/storage/blueshield(src) diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 9aa71a8f1b1..b34f88fd5fb 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/magistrate + display_name = "Skirt, magistrate" + path = /obj/item/clothing/under/rank/centcom/magistrate/skirt + allowed_roles = list("Magistrate") + /datum/gear/uniform/skirt/job/ntrep display_name = "Skirt, nt rep" path = /obj/item/clothing/under/rank/centcom/representative/skirt diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index f7b68bf2bf8..9741623c758 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -235,6 +235,12 @@ icon_state = "white" item_state = "wgloves" item_color="mime" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi', + "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi', + "Grey" = 'icons/mob/clothing/species/grey/gloves.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi', + ) /obj/item/clothing/gloves/color/white/redcoat item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way. diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm index 1aeb44174a8..54af6756295 100644 --- a/code/modules/clothing/gloves/misc_gloves.dm +++ b/code/modules/clothing/gloves/misc_gloves.dm @@ -45,6 +45,12 @@ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 200, ACID = 50) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi', + "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi', + "Grey" = 'icons/mob/clothing/species/grey/gloves.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi', + ) /obj/item/clothing/gloves/bracer name = "bone bracers" diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index ca3e1d34b71..f0c57c70e71 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -63,6 +63,12 @@ desc = "A cap issued to Nanotrasen Representatives." icon_state = "ntrep" + 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', + ) + //Chaplain /obj/item/clothing/head/hooded/chaplain_hood diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index b5ef74578f1..c15e60678de 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -180,7 +180,10 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', ) //Engineering @@ -287,9 +290,28 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', ) +/obj/item/clothing/suit/magirobe + name = "magistrate's robe" + desc = "An opulent robe that commands authority. Issued only to licensed magistrates." + icon_state = "magirobe" + item_state = "magirobe" + body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS + allowed = list(/obj/item/storage/fancy/cigarettes, /obj/item/stack/spacecash, /obj/item/flash, /obj/item/gavelhammer) + flags_inv = HIDEJUMPSUIT + + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + ) + //Medical /obj/item/clothing/suit/storage/fr_jacket name = "first responder jacket" diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index 1d7816250b9..7df15705181 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -97,11 +97,11 @@ /obj/item/clothing/suit/judgerobe - name = "judge's robe" - desc = "This robe commands authority." + name = "judge's robe costume" + desc = "A fancy costume giving off an aura of authority." icon_state = "judge" item_state = "judge" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/stack/spacecash) flags_inv = HIDEJUMPSUIT diff --git a/code/modules/clothing/under/centcom.dm b/code/modules/clothing/under/centcom.dm index dad10eb5b3d..ec418e667b3 100644 --- a/code/modules/clothing/under/centcom.dm +++ b/code/modules/clothing/under/centcom.dm @@ -10,7 +10,8 @@ "Human" = 'icons/mob/clothing/under/centcom.dmi', "Vox" = 'icons/mob/clothing/species/vox/under/centcom.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/centcom.dmi', - "Grey" = 'icons/mob/clothing/species/grey/under/centcom.dmi' + "Grey" = 'icons/mob/clothing/species/grey/under/centcom.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/under/centcom.dmi' ) /obj/item/clothing/under/rank/centcom/sensor @@ -56,35 +57,56 @@ desc = "Gold trim on space-black cloth, this uniform is worn by generals of the Trans-Solar Federation. It has exotic materials for protection." /obj/item/clothing/under/rank/centcom/representative - name = "formal Nanotrasen Representative's uniform" - desc = "Gold trim on space-black cloth, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder." - icon_state = "officer" - item_state = "g_suit" - item_color = "officer" - displays_id = FALSE - -/obj/item/clothing/under/rank/centcom/representative/Initialize(mapload) - . = ..() - desc = "Gold trim on space-black cloth, this uniform bears [station_name()] on the left shoulder." + name = "\improper Nanotrasen representative's uniform" + desc = "Fine black cotton pants and white shirt with blue and gold trim." + icon_state = "ntrep" + item_state = "ntrep" + item_color = "ntrep" /obj/item/clothing/under/rank/centcom/representative/skirt - desc = "A silky smooth black and gold representative uniform with blue markings." - name = "representative skirt" - icon_state = "ntrepf" - item_state = "ntrepf" - item_color = "ntrepf" + name = "\improper Nanotrasen representative's skirt" + desc = "A silky black skirt and white shirt with blue and gold trim." + icon_state = "ntrep_skirt" + item_state = "ntrep_skirt" + item_color = "ntrep_skirt" -/obj/item/clothing/under/rank/centcom/magistrate - name = "formal magistrate's uniform" - desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder." - icon_state = "officer" - item_state = "g_suit" - item_color = "officer" +/obj/item/clothing/under/rank/centcom/representative/formal + name = "formal Nanotrasen representative's uniform" + desc = "A formal black suit with gold trim and a blue tie, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder." + icon_state = "ntrep_formal" + item_state = "ntrep_formal" + item_color = "ntrep_formal" displays_id = FALSE -/obj/item/clothing/under/rank/centcom/magistrate/Initialize(mapload) +/obj/item/clothing/under/rank/centcom/representative/formal/Initialize(mapload) . = ..() - desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Magistrate\" and bears [station_name()] on the left shoulder." + desc = "A formal black suit with gold trim and a blue tie, this uniform bears [station_name()] on the left shoulder." + +/obj/item/clothing/under/rank/centcom/magistrate + name = "magistrate's uniform" + desc = "Fine black cotton pants and white shirt with a black tie and gold trim." + icon_state = "magistrate" + item_state = "magistrate" + item_color = "magistrate" + +/obj/item/clothing/under/rank/centcom/magistrate/skirt + name = "magistrate's skirt" + desc = "A silky black skirt and white shirt with a black tie and gold trim." + icon_state = "magistrate_skirt" + item_state = "magistrate_skirt" + item_color = "magistrate_skirt" + +/obj/item/clothing/under/rank/centcom/magistrate/formal + name = "formal magistrate's uniform" + desc = "A formal black suit with gold trim and a snazzy red tie, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder." + icon_state = "magistrate_formal" + item_state = "magistrate_formal" + item_color = "magistrate_formal" + displays_id = FALSE + +/obj/item/clothing/under/rank/centcom/magistrate/formal/Initialize(mapload) + . = ..() + desc = "A formal black suit with gold trim and a snazzy red tie, this uniform displays the rank of \"Magistrate\" and bears [station_name()] on the left shoulder." /obj/item/clothing/under/rank/centcom/diplomatic name = "\improper Nanotrasen diplomatic uniform" @@ -96,23 +118,25 @@ /obj/item/clothing/under/rank/centcom/blueshield name = "blueshield's uniform" - desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants, all made out of a sturdy material. Blueshield standard issue." + desc = "A short-sleeved black uniform, paired with grey armored cargo pants, all made out of a sturdy material. Blueshield standard issue." icon_state = "blueshield" - item_state = "bl_suit" + item_state = "blueshield" item_color = "blueshield" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 20, ACID = 20) /obj/item/clothing/under/rank/centcom/blueshield/skirt name = "blueshield's skirt" desc = "A short, black and grey with blue markings skirted uniform. For the feminine Blueshield." - icon_state = "blueshieldf" - item_state = "blueshieldf" - item_color = "blueshieldf" + icon_state = "blueshield_skirt" + item_state = "blueshield_skirt" + item_color = "blueshield_skirt" + armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 20, ACID = 20) /obj/item/clothing/under/rank/centcom/blueshield/formal name = "formal blueshield's uniform" - desc = "Gold trim on space-black cloth, this uniform bears \"Close Protection\" on the left shoulder. It's got exotic materials for protection." - icon_state = "officer" - item_state = "g_suit" - item_color = "officer" + desc = "A formal black suit with blue trim and tie, this uniform bears \"Close Protection\" on the left shoulder. It's got exotic materials for protection." + icon_state = "blueshield_formal" + item_state = "blueshield_formal" + item_color = "blueshield_formal" + armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 20, ACID = 20) displays_id = FALSE diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 1a09b9c3efa..8c7f1e83a86 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -137,13 +137,6 @@ item_state = "internalaffairs" item_color = "internalaffairs" -/obj/item/clothing/under/rank/civilian/dress_shirt - desc = "A well-ironed dress shirt and matching set of black pants." - name = "dress shirt" - icon_state = "internalaffairs" - item_state = "internalaffairs" - item_color = "internalaffairs" - /obj/item/clothing/under/rank/civilian/lawyer name = "lawyer suit" desc = "Slick threads." diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index f41576fe1ad..0eb0ce17661 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 3c9c7e11002..0de2e55a717 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 1524f365190..784376699f3 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/centcom.dmi b/icons/mob/clothing/species/drask/under/centcom.dmi index cd25bf17ed2..9cebf9d668d 100644 Binary files a/icons/mob/clothing/species/drask/under/centcom.dmi and b/icons/mob/clothing/species/drask/under/centcom.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index 439cb13120f..57185b4aaa0 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 734e0f83442..d78eee0250c 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/centcom.dmi b/icons/mob/clothing/species/grey/under/centcom.dmi index 39e7000a2a9..22d5902fc44 100644 Binary files a/icons/mob/clothing/species/grey/under/centcom.dmi and b/icons/mob/clothing/species/grey/under/centcom.dmi differ diff --git a/icons/mob/clothing/species/kidan/gloves.dmi b/icons/mob/clothing/species/kidan/gloves.dmi index 1f78e34d667..e200d0abe88 100644 Binary files a/icons/mob/clothing/species/kidan/gloves.dmi and b/icons/mob/clothing/species/kidan/gloves.dmi differ diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi index c9c69a9c06f..ab55784757f 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/centcom.dmi b/icons/mob/clothing/species/kidan/under/centcom.dmi new file mode 100644 index 00000000000..8d4e6b73a5d Binary files /dev/null and b/icons/mob/clothing/species/kidan/under/centcom.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 55dc49091c7..117ac40ee76 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 a8c6b23f540..6cae59db2a9 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/centcom.dmi b/icons/mob/clothing/species/vox/under/centcom.dmi index 5d4754518ac..8897f814edd 100644 Binary files a/icons/mob/clothing/species/vox/under/centcom.dmi and b/icons/mob/clothing/species/vox/under/centcom.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 11c950ad6aa..9e33b33f17d 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/under/centcom.dmi b/icons/mob/clothing/under/centcom.dmi index a7a10ce9299..300dc5b9446 100644 Binary files a/icons/mob/clothing/under/centcom.dmi and b/icons/mob/clothing/under/centcom.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index a766a49f8b5..26587ddea7a 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 13f3a362faa..48b4694b85d 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 49f511bba71..48defd2abf7 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 29e9756812e..bb09604b90a 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/centcom.dmi b/icons/obj/clothing/under/centcom.dmi index a36c4b367e9..52643d17eea 100644 Binary files a/icons/obj/clothing/under/centcom.dmi and b/icons/obj/clothing/under/centcom.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index e70a99d2908..81415b02b35 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ