diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm index 245a0eba52..dc6534bed6 100644 --- a/code/datums/outfits/jobs/security.dm +++ b/code/datums/outfits/jobs/security.dm @@ -26,10 +26,8 @@ /decl/hierarchy/outfit/job/security/detective name = OUTFIT_JOB_NAME("Detective") - head = /obj/item/clothing/head/det uniform = /obj/item/clothing/under/det suit = /obj/item/clothing/suit/storage/det_trench - l_pocket = /obj/item/flame/lighter/zippo shoes = /obj/item/clothing/shoes/laceup r_hand = /obj/item/storage/briefcase/crimekit id_type = /obj/item/card/id/security/detective @@ -38,9 +36,9 @@ satchel_one = /obj/item/storage/backpack/satchel/norm backpack_contents = list(/obj/item/storage/box/evidence = 1) -/decl/hierarchy/outfit/job/security/detective/forensic +/decl/hierarchy/outfit/job/security/forensic name = OUTFIT_JOB_NAME("Forensic technician") - head = null + uniform = /obj/item/clothing/under/rank/security/forensics suit = /obj/item/clothing/suit/storage/forensics/blue /decl/hierarchy/outfit/job/security/officer diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 10ed3d70d3..d2d6804db8 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -102,7 +102,7 @@ /datum/alt_title/forensic_tech title = "Forensic Technician" title_blurb = "A Forensic Technician works more with hard evidence and labwork than a Detective, but they share the purpose of solving crimes." - title_outfit = /decl/hierarchy/outfit/job/security/detective/forensic + title_outfit = /decl/hierarchy/outfit/job/security/forensic ////////////////////////////////// // Security Officer diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index ff310895ed..b9c661ef7b 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -128,7 +128,7 @@ //Forensics /obj/item/clothing/suit/storage/forensics - name = "jacket" + name = "forensics windbreaker" desc = "A forensics technician jacket." body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER @@ -138,24 +138,24 @@ armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/suit/storage/forensics/red - name = "red jacket" + name = "red forensics windbreaker" desc = "A red forensics technician jacket." icon_state = "forensics_red" item_state_slots = list(slot_r_hand_str = "suit_red", slot_l_hand_str = "suit_red") /obj/item/clothing/suit/storage/forensics/red/long - name = "long red jacket" + name = "long red forensics windbreaker" desc = "A long red forensics technician jacket." icon_state = "forensics_red_long" /obj/item/clothing/suit/storage/forensics/blue - name = "blue jacket" + name = "blue forensics windbreaker" desc = "A blue forensics technician jacket." icon_state = "forensics_blue" item_state_slots = list(slot_r_hand_str = "suit_navy", slot_l_hand_str = "suit_navy") /obj/item/clothing/suit/storage/forensics/blue/long - name = "long blue jacket" + name = "long blue forensics windbreaker." desc = "A long blue forensics technician jacket." icon_state = "forensics_blue_long" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 67b2c4b4e0..b23f70ccf1 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -8,15 +8,6 @@ /* * Security */ -/obj/item/clothing/under/rank/warden - desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders." - name = "warden's jumpsuit" - icon_state = "warden" - item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 - rolled_sleeves = 0 - /obj/item/clothing/under/rank/security name = "security officer's jumpsuit" desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection." @@ -33,14 +24,12 @@ 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." - icon_state = "dispatch" - item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective") - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS - siemens_coefficient = 0.9 +/obj/item/clothing/under/rank/security/navyblue + name = "security officer's uniform" + desc = "The latest in fashionable security outfits." + icon_state = "officerblueclothes" + item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") + rolled_sleeves = 0 /obj/item/clothing/under/rank/security2 name = "security officer's uniform" @@ -56,20 +45,6 @@ item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") rolled_sleeves = 0 -/obj/item/clothing/under/rank/warden/corp - icon_state = "warden_corporate" - item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") - rolled_sleeves = 0 - -/obj/item/clothing/under/tactical - name = "tactical jumpsuit" - desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection." - icon_state = "swatunder" - item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green") - armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 - rolled_sleeves = -1 - /* * Detective */ @@ -82,17 +57,6 @@ rolled_sleeves = 0 starting_accessories = list(/obj/item/clothing/accessory/tie/blue_clip) -/* -/obj/item/clothing/under/det/verb/rollup() - set name = "Roll Suit Sleeves" - set category = "Object" - set src in usr - var/unrolled = item_state_slots[slot_w_uniform_str] == initial(worn_state) - item_state_slots[slot_w_uniform_str] = unrolled ? "[worn_state]_r" : initial(worn_state) - var/mob/living/carbon/human/H = loc - H.update_inv_w_uniform(1) - to_chat(H, "You roll the sleeves of your shirt [unrolled ? "up" : "down"]") -*/ /obj/item/clothing/under/det/grey icon_state = "detective2" desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks." @@ -114,6 +78,7 @@ icon_state = "det_corporate" item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") desc = "A more modern uniform for corporate investigators." + starting_accessories = null /obj/item/clothing/under/det/waistcoat icon_state = "detective" @@ -131,6 +96,10 @@ desc = "A serious-looking white blouse paired with a formal black pencil skirt." item_state_slots = list(slot_r_hand_str = "sl_suit", slot_l_hand_str = "sl_suit") +/obj/item/clothing/under/rank/security/forensics + name = "forensic technician's jumpsuit" + icon_state = "forensicsred" + /* * Head of Security */ @@ -148,6 +117,13 @@ item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") rolled_sleeves = 0 +/obj/item/clothing/under/rank/head_of_security/navyblue + desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security." + name = "head of security's uniform" + icon_state = "hosblueclothes" + item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") + rolled_sleeves = 0 + //Jensen cosplay gear /obj/item/clothing/under/rank/head_of_security/jensen desc = "You never asked for anything that stylish." @@ -156,25 +132,47 @@ rolled_sleeves = -1 /* - * Navy uniforms + * Warden */ -/obj/item/clothing/under/rank/security/navyblue - name = "security officer's uniform" - desc = "The latest in fashionable security outfits." - icon_state = "officerblueclothes" - item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") + +/obj/item/clothing/under/rank/warden + desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders." + name = "warden's jumpsuit" + icon_state = "warden" + item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + siemens_coefficient = 0.9 rolled_sleeves = 0 -/obj/item/clothing/under/rank/head_of_security/navyblue - desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security." - name = "head of security's uniform" - icon_state = "hosblueclothes" - item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") +/obj/item/clothing/under/rank/warden/corp + icon_state = "warden_corporate" + item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") rolled_sleeves = 0 - /obj/item/clothing/under/rank/warden/navyblue desc = "The insignia on this uniform tells you that this uniform belongs to the Warden." name = "warden's uniform" icon_state = "wardenblueclothes" item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") rolled_sleeves = 0 + +/* + * Other + */ + +/obj/item/clothing/under/rank/dispatch + name = "dispatcher's uniform" + desc = "A dress shirt and khakis with a security patch sewn on." + icon_state = "dispatch" + item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective") + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS + siemens_coefficient = 0.9 + +/obj/item/clothing/under/tactical + name = "tactical jumpsuit" + desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection." + icon_state = "swatunder" + item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green") + armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0) + siemens_coefficient = 0.9 + rolled_sleeves = -1 diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 215901b18a..c9874b4788 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/spacesuit.dmi b/icons/mob/spacesuit.dmi index d25dc19966..f340a96557 100644 Binary files a/icons/mob/spacesuit.dmi and b/icons/mob/spacesuit.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index b73e8d5ea6..ab7376fbda 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 389036d90a..97c1921033 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/mob/uniform_1.dmi b/icons/mob/uniform_1.dmi index 675f8f32e8..2efd4c2cde 100644 Binary files a/icons/mob/uniform_1.dmi and b/icons/mob/uniform_1.dmi differ diff --git a/icons/mob/uniform_rolled_down.dmi b/icons/mob/uniform_rolled_down.dmi index 9bfbfef811..1aa4f68cd0 100644 Binary files a/icons/mob/uniform_rolled_down.dmi and b/icons/mob/uniform_rolled_down.dmi differ diff --git a/icons/mob/uniform_sleeves_rolled.dmi b/icons/mob/uniform_sleeves_rolled.dmi index 384675d290..5b1f0f983f 100644 Binary files a/icons/mob/uniform_sleeves_rolled.dmi and b/icons/mob/uniform_sleeves_rolled.dmi differ diff --git a/icons/obj/clothing/spacesuits.dmi b/icons/obj/clothing/spacesuits.dmi index 029f037306..792e133423 100644 Binary files a/icons/obj/clothing/spacesuits.dmi and b/icons/obj/clothing/spacesuits.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index b655d4ad3c..aaa8750692 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 9e0ca71a52..7711a29af4 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/clothing/uniforms_1.dmi b/icons/obj/clothing/uniforms_1.dmi index 9b2d84273e..d590efa720 100644 Binary files a/icons/obj/clothing/uniforms_1.dmi and b/icons/obj/clothing/uniforms_1.dmi differ