diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index ad617e4980..9bdc9659e2 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -12,6 +12,7 @@ starts_with = list( /obj/item/clothing/under/rank/security = 3, /obj/item/clothing/under/rank/security2 = 3, + /obj/item/clothing/under/rank/security/turtleneck = 3, /obj/item/clothing/under/rank/security/skirt = 2, /obj/item/clothing/shoes/boots/jackboots = 3, /obj/item/clothing/head/soft/sec = 3, @@ -178,6 +179,7 @@ starts_with = list( /obj/item/clothing/under/rank/engineer = 3, /obj/item/clothing/under/rank/engineer/skirt = 3, + /obj/item/clothing/under/rank/engineer/turtleneck = 3, /obj/item/clothing/shoes/orange = 3, /obj/item/clothing/head/hardhat = 3, /obj/item/clothing/head/beret/engineering = 3, @@ -218,6 +220,7 @@ starts_with = list( /obj/item/clothing/under/rank/scientist = 3, /obj/item/clothing/under/rank/scientist/skirt = 2, + /obj/item/clothing/under/rank/scientist/turtleneck = 3, /obj/item/clothing/suit/storage/toggle/labcoat = 3, /obj/item/clothing/shoes/white = 3, /obj/item/clothing/shoes/slippers = 3, @@ -313,6 +316,7 @@ starts_with = list( /obj/item/clothing/under/rank/medical = 2, /obj/item/clothing/under/rank/medical/skirt = 2, + /obj/item/clothing/under/rank/medical/turtleneck = 2, /obj/item/clothing/under/rank/medical/scrubs, /obj/item/clothing/under/rank/medical/scrubs/green, /obj/item/clothing/under/rank/medical/scrubs/purple, diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 1a13b75906..8b1e1772b4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -163,6 +163,26 @@ path = /obj/item/clothing/under/rank/head_of_security/skirt allowed_roles = list("Head of Security") +/datum/gear/uniform/job_turtle/science + display_name = "turtleneck, science" + path = /obj/item/clothing/under/rank/scientist/turtleneck + allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist") + +/datum/gear/uniform/job_turtle/security + display_name = "turtleneck, security" + path = /obj/item/clothing/under/rank/security/turtleneck + allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") + +/datum/gear/uniform/job_turtle/engineering + display_name = "turtleneck, engineering" + path = /obj/item/clothing/under/rank/engineer/turtleneck + allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer") + +/datum/gear/uniform/job_turtle/medical + display_name = "turtleneck, medical" + path = /obj/item/clothing/under/rank/medical/turtleneck + allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychologist", "Search and Rescue", "Chemist") + /datum/gear/uniform/jeans_qm display_name = "jeans, QM" path = /obj/item/clothing/under/rank/cargo/jeans diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index b1131b100b..f57cc95ce8 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -19,6 +19,13 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) rolled_sleeves = 0 +/obj/item/clothing/under/rank/engineer/turtleneck + name = "engineering turtleneck" + desc = "It's a stylish turtleneck with minor radiation shielding. Nobody's going to see it behind the voidsuit, though." + icon_state = "turtle_eng" + rolled_down = -1 + rolled_sleeves = -1 + /obj/item/clothing/under/rank/roboticist desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work." name = "roboticist's jumpsuit" diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index b958d18840..44fae55c92 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -30,6 +30,14 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) rolled_sleeves = 0 +/obj/item/clothing/under/rank/scientist/turtleneck + name = "science turtleneck" + desc = "It's a stylish turtleneck weaved with an explosive-resistant, comfortable mesh. You don't have to look like a dork to be a dork." + icon_state = "turtle_sci" + item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple") + rolled_down = -1 + rolled_sleeves = -1 + /obj/item/clothing/under/rank/chemist desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it." name = "chemist's jumpsuit" @@ -106,6 +114,13 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) rolled_sleeves = 0 +/obj/item/clothing/under/rank/medical/turtleneck + name = "medical turtleneck" + desc = "It's a stylish turtleneck made of bioresistant fiber. Look good, save lives- what more could you want?" + icon_state = "turtle_med" + rolled_down = -1 + rolled_sleeves = -1 + /obj/item/clothing/under/rank/medical/paramedic name = "short sleeve medical jumpsuit" desc = "It's made of a special fiber that provides minor protection against biohazards. This one has a cross on the chest denoting that the wearer is trained medical personnel." diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 9680de4884..c9546fad06 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -26,6 +26,13 @@ siemens_coefficient = 0.9 rolled_sleeves = 0 +/obj/item/clothing/under/rank/security/turtleneck + name = "security turtleneck" + desc = "It's a stylish turtleneck made of a robust nanoweave. Nobody said the Law couldn't be fashionable." + icon_state = "turtle_sec" + rolled_down = -1 + rolled_sleeves = -1 + /obj/item/clothing/under/rank/dispatch name = "dispatcher's uniform" desc = "A dress shirt and khakis with a security patch sewn on." diff --git a/html/changelogs/mistyLuminescence - turtlenecks.yml b/html/changelogs/mistyLuminescence - turtlenecks.yml new file mode 100644 index 0000000000..f0abec1e51 --- /dev/null +++ b/html/changelogs/mistyLuminescence - turtlenecks.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: mistyLuminescence + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds departmental turtlenecks, available in department wardrobes or the loadout selection. Look good... in space." diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 9e4860eca3..cbad7d8591 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 91230723f1..f375428c12 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ