diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 94674972c78..5a878a1b16b 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -353,6 +353,20 @@ var/global/list/gear_datums = list() slot = slot_glasses allowed_roles = list("Security Officer","Head of Security","Warden") +/datum/gear/prescriptionsec + display_name = "Security HUD, prescription" + path = /obj/item/clothing/glasses/hud/security/prescription + cost = 1 + slot = slot_glasses + allowed_roles = list("Security Officer","Head of Security","Warden") + +/datum/gear/prescriptionmed + display_name = "Medical HUD, prescription" + path = /obj/item/clothing/glasses/hud/health/prescription + cost = 1 + slot = slot_glasses + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist") + /datum/gear/thugshades display_name = "Sunglasses, Fat" path = /obj/item/clothing/glasses/sunglasses/big @@ -419,6 +433,36 @@ var/global/list/gear_datums = list() slot = slot_w_uniform cost = 1 +/datum/gear/croptop + display_name = "croptop, NT" + path = /obj/item/clothing/under/croptop + slot = slot_w_uniform + cost = 1 + +/datum/gear/croptop/grey + display_name = "croptop, grey" + path = /obj/item/clothing/under/croptop/grey + slot = slot_w_uniform + cost = 1 + +/datum/gear/croptop/red + display_name = "croptop, red" + path = /obj/item/clothing/under/croptop/red + slot = slot_w_uniform + cost = 1 + +/datum/gear/cuttop + display_name = "cut top, grey" + path = /obj/item/clothing/under/cuttop + slot = slot_w_uniform + cost = 1 + +/datum/gear/cuttop/red + display_name = "cut top, red" + path = /obj/item/clothing/under/cuttop/red + slot = slot_w_uniform + cost = 1 + /datum/gear/blackjumpskirt display_name = "jumpskirt, black" path = /obj/item/clothing/under/blackjumpskirt @@ -715,6 +759,42 @@ var/global/list/gear_datums = list() slot = slot_w_uniform cost = 1 +/datum/gear/shorts/jeans/female + display_name = "shorts, female, jeans" + path = /obj/item/clothing/under/shorts/jeans/female + slot = slot_w_uniform + cost = 1 + +/datum/gear/shorts/jeans/classic/female + display_name = "shorts, female, classic jeans" + path = /obj/item/clothing/under/shorts/jeans/classic/female + slot = slot_w_uniform + cost = 1 + +/datum/gear/shorts/jeans/mustang/female + display_name = "shorts, female, mustang jeans" + path = /obj/item/clothing/under/shorts/jeans/mustang/female + slot = slot_w_uniform + cost = 1 + +/datum/gear/shorts/jeans/youngfolks/female + display_name = "shorts, female, young folks jeans" + path = /obj/item/clothing/under/shorts/jeans/youngfolks/female + slot = slot_w_uniform + cost = 1 + +/datum/gear/shorts/jeans/black/female + display_name = "shorts, female, black jeans" + path = /obj/item/clothing/under/shorts/jeans/black/female + slot = slot_w_uniform + cost = 1 + +/datum/gear/shorts/khaki/female + display_name = "shorts, female, khaki" + path = /obj/item/clothing/under/shorts/khaki/female + slot = slot_w_uniform + cost = 1 + /datum/gear/amishsuit display_name = "suit, amish" path = /obj/item/clothing/under/sl_suit diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 161fc470579..30e5bc37732 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -19,7 +19,6 @@ /obj/item/clothing/glasses/hud/health/prescription name = "Prescription Health Scanner HUD" desc = "A medical HUD integrated with a set of prescription glasses" - icon_state = "healthhud" prescription = 1 icon_state = "healthhudpresc" item_state = "healthhudpresc" @@ -37,7 +36,6 @@ /obj/item/clothing/glasses/hud/security/prescription name = "Prescription Security HUD" desc = "A security HUD integrated with a set of prescription glasses" - icon_state = "securityhud" prescription = 1 icon_state = "sechudpresc" item_state = "sechudpresc" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 3825b737186..105b8d9c804 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -566,3 +566,38 @@ icon_state = "blue_blazer" item_state = "blue_blazer" worn_state = "blue_blazer" + +/obj/item/clothing/under/croptop + name = "crop top" + desc = "A shirt that has had the top cropped. This one is NT sponsored." + icon_state = "croptop" + item_state = "gy_suit" + worn_state = "croptop" + +/obj/item/clothing/under/croptop/red + name = "red crop top" + desc = "A red shirt that has had the top cropped." + icon_state = "croptop_red" + item_state = "r_suit" + worn_state = "croptop_red" + +/obj/item/clothing/under/croptop/grey + name = "grey crop top" + desc = "A grey shirt that has had the top cropped." + icon_state = "croptop_grey" + item_state = "gy_suit" + worn_state = "croptop_grey" + +/obj/item/clothing/under/cuttop + name = "grey cut top" + desc = "A grey shirt that has had the top cut low." + icon_state = "cuttop" + item_state = "gy_suit" + worn_state = "cuttop" + +/obj/item/clothing/under/cuttop/red + name = "red cut top" + desc = "A red shirt that has had the top cut low." + icon_state = "cuttop_red" + item_state = "r_suit" + worn_state = "cuttop_red" \ No newline at end of file diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index b22de3a5ba2..b870b49d598 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -35,28 +35,52 @@ icon_state = "jeans_shorts" worn_state = "jeans_shorts" +/obj/item/clothing/under/shorts/jeans/female + icon_state = "jeans_shorts_f" + worn_state = "jeans_shorts_f" + /obj/item/clothing/under/shorts/jeans/classic name = "classic jeans shorts" icon_state = "jeansclassic_shorts" worn_state = "jeansclassic_shorts" +/obj/item/clothing/under/shorts/jeans/classic/female + icon_state = "jeansclassic_shorts_f" + worn_state = "jeansclassic_shorts_f" + /obj/item/clothing/under/shorts/jeans/mustang name = "mustang jeans shorts" icon_state = "jeansmustang_shorts" worn_state = "jeansmustang_shorts" +/obj/item/clothing/under/shorts/jeans/mustang/female + icon_state = "jeansmustang_shorts_f" + worn_state = "jeansmustang_shorts_f" + /obj/item/clothing/under/shorts/jeans/youngfolks name = "young folks jeans shorts" icon_state = "jeansyoungfolks_shorts" worn_state = "jeansyoungfolks_shorts" +/obj/item/clothing/under/shorts/jeans/youngfolks/female + icon_state = "jeansyoungfolks_shorts_f" + worn_state = "jeansyoungfolks_shorts_f" + /obj/item/clothing/under/shorts/jeans/black name = "black jeans shorts" icon_state = "black_shorts" worn_state = "black_shorts" +/obj/item/clothing/under/shorts/jeans/black/female + icon_state = "black_shorts_f" + worn_state = "black_shorts_f" + /obj/item/clothing/under/shorts/khaki name = "khaki shorts" desc = "For that island getaway. It's five o'clock somewhere, right?" icon_state = "khaki_shorts" - worn_state = "khaki_shorts" \ No newline at end of file + worn_state = "khaki_shorts" + +/obj/item/clothing/under/shorts/khaki/female + icon_state = "khaki_shorts_f" + worn_state = "khaki_shorts_f" \ No newline at end of file diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 5e6d56b219f..3742d3a30f3 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 687acb2bac4..6ed423e2bff 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index a961207ec57..882a6928773 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/robot_storage.dmi b/icons/obj/robot_storage.dmi index 5a996c01e7e..52b79d26603 100644 Binary files a/icons/obj/robot_storage.dmi and b/icons/obj/robot_storage.dmi differ