diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 9c248da9a2c..3b70419f9d8 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -501,11 +501,11 @@ GLOBAL_VAR_INIT(record_id_num, 1001) clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "security_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if("Chief Engineer") - clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "chief_s") + clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "chief_engineer_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Station Engineer") - clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "engine_s") + clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "engineer_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Life Support Specialist") diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index 4042bb5789e..1a598016a8f 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -1431,7 +1431,7 @@ if(4) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CHIEF) - clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "chief_s") + clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "chief_engineer_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_OVERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) @@ -1447,7 +1447,7 @@ if(4) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_ENGINEER) - clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "engine_s") + clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "engineer_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_yellow"), ICON_OVERLAY) diff --git a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm index a857f5bcc3d..15adfb45ab6 100644 --- a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm @@ -5,32 +5,33 @@ "Human" = 'icons/mob/clothing/under/engineering.dmi', "Vox" = 'icons/mob/clothing/species/vox/under/engineering.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/engineering.dmi', - "Grey" = 'icons/mob/clothing/species/grey/under/engineering.dmi' + "Grey" = 'icons/mob/clothing/species/grey/under/engineering.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/under/engineering.dmi' ) /obj/item/clothing/under/rank/engineering/chief_engineer - desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding." name = "chief engineer's jumpsuit" - icon_state = "chiefengineer" - item_state = "chief" - item_color = "chief" + desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding." + icon_state = "chief_engineer" + item_state = "chief_engineer" + item_color = "chief_engineer" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 200, ACID = 35) resistance_flags = NONE /obj/item/clothing/under/rank/engineering/chief_engineer/skirt - desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding." name = "chief engineer's jumpskirt" - icon_state = "chieff" - item_color = "chieff" + desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding." + icon_state = "chief_engineer_skirt" + item_color = "chief_engineer_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT /obj/item/clothing/under/rank/engineering/atmospheric_technician - desc = "It's a jumpsuit worn by atmospheric technicians." name = "atmospheric technician's jumpsuit" + desc = "It's a jumpsuit worn by atmospheric technicians." icon_state = "atmos" - item_state = "atmos_suit" + item_state = "atmos" item_color = "atmos" resistance_flags = NONE @@ -63,18 +64,18 @@ return 1 /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt - desc = "It's a jumpskirt worn by atmospheric technicians." name = "atmospheric technician's jumpskirt" - icon_state = "atmosf" - item_color = "atmosf" + desc = "It's a jumpskirt worn by atmospheric technicians." + icon_state = "atmos_skirt" + item_color = "atmos_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/engineering/engineer - desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding." name = "engineer's jumpsuit" - icon_state = "engine" - item_state = "engi_suit" - item_color = "engine" + desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding." + icon_state = "engineer" + item_state = "engineer" + item_color = "engineer" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 75, ACID = 10) resistance_flags = NONE @@ -83,8 +84,8 @@ random_sensor = FALSE /obj/item/clothing/under/rank/engineering/engineer/skirt - desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding." name = "engineer's jumpskirt" - icon_state = "enginef" - item_color = "enginef" + desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding." + icon_state = "engineer_skirt" + item_color = "engineer_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS diff --git a/icons/mob/clothing/head/beret.dmi b/icons/mob/clothing/head/beret.dmi index 4b57e149c6b..bc5b8facb79 100644 Binary files a/icons/mob/clothing/head/beret.dmi and b/icons/mob/clothing/head/beret.dmi differ diff --git a/icons/mob/clothing/species/drask/head/beret.dmi b/icons/mob/clothing/species/drask/head/beret.dmi index 1d189a9c9de..7254e00ca5b 100644 Binary files a/icons/mob/clothing/species/drask/head/beret.dmi and b/icons/mob/clothing/species/drask/head/beret.dmi differ diff --git a/icons/mob/clothing/species/drask/under/engineering.dmi b/icons/mob/clothing/species/drask/under/engineering.dmi index d17cc7af5b5..8249019fea1 100644 Binary files a/icons/mob/clothing/species/drask/under/engineering.dmi and b/icons/mob/clothing/species/drask/under/engineering.dmi differ diff --git a/icons/mob/clothing/species/grey/under/engineering.dmi b/icons/mob/clothing/species/grey/under/engineering.dmi index 586e3abd826..8f51c6e6675 100644 Binary files a/icons/mob/clothing/species/grey/under/engineering.dmi and b/icons/mob/clothing/species/grey/under/engineering.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/engineering.dmi b/icons/mob/clothing/species/kidan/under/engineering.dmi new file mode 100644 index 00000000000..6eb7d1f92df Binary files /dev/null and b/icons/mob/clothing/species/kidan/under/engineering.dmi differ diff --git a/icons/mob/clothing/species/vox/head/beret.dmi b/icons/mob/clothing/species/vox/head/beret.dmi index 0c5494d4f63..827f085bf54 100644 Binary files a/icons/mob/clothing/species/vox/head/beret.dmi and b/icons/mob/clothing/species/vox/head/beret.dmi differ diff --git a/icons/mob/clothing/species/vox/under/engineering.dmi b/icons/mob/clothing/species/vox/under/engineering.dmi index 5f3ac6466a1..5c0a82c7735 100644 Binary files a/icons/mob/clothing/species/vox/under/engineering.dmi and b/icons/mob/clothing/species/vox/under/engineering.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 56d38a303f6..a892cb58a88 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/under/engineering.dmi b/icons/mob/clothing/under/engineering.dmi index 9457017ef68..0fd865f2d8f 100644 Binary files a/icons/mob/clothing/under/engineering.dmi and b/icons/mob/clothing/under/engineering.dmi differ diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi index 45a8ef77f58..fae5d85c0e9 100644 Binary files a/icons/obj/clothing/head/beret.dmi and b/icons/obj/clothing/head/beret.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 96d09f5dea7..28812a7544e 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/engineering.dmi b/icons/obj/clothing/under/engineering.dmi index d990d71282f..abfc9abb793 100644 Binary files a/icons/obj/clothing/under/engineering.dmi and b/icons/obj/clothing/under/engineering.dmi differ