Resprites, renames, and repaths the detective uniforms.
@@ -106,7 +106,7 @@
|
|||||||
if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
|
if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
|
||||||
if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
|
if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform)
|
H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform)
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
|
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
|
||||||
H.equip_to_slot_or_del(new /obj/item/device/pda/detective(H), slot_belt)
|
H.equip_to_slot_or_del(new /obj/item/device/pda/detective(H), slot_belt)
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
|
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
|
||||||
H.equip_to_slot_or_del(new /obj/item/weapon/flame/lighter/zippo(H), slot_l_store)
|
H.equip_to_slot_or_del(new /obj/item/weapon/flame/lighter/zippo(H), slot_l_store)
|
||||||
@@ -119,8 +119,8 @@
|
|||||||
if(H.mind.role_alt_title && H.mind.role_alt_title == "Forensic Technician")
|
if(H.mind.role_alt_title && H.mind.role_alt_title == "Forensic Technician")
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
|
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
|
||||||
else
|
else
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit)
|
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_trench(H), slot_wear_suit)
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(H), slot_head)
|
H.equip_to_slot_or_del(new /obj/item/clothing/head/det(H), slot_head)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
icon = 'icons/obj/coatrack.dmi'
|
icon = 'icons/obj/coatrack.dmi'
|
||||||
icon_state = "coatrack0"
|
icon_state = "coatrack0"
|
||||||
var/obj/item/clothing/suit/coat
|
var/obj/item/clothing/suit/coat
|
||||||
var/list/allowed = list(/obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/det_suit)
|
var/list/allowed = list(/obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/det_trench)
|
||||||
|
|
||||||
/obj/structure/coatrack/attack_hand(mob/user as mob)
|
/obj/structure/coatrack/attack_hand(mob/user as mob)
|
||||||
user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src]")
|
user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src]")
|
||||||
@@ -48,5 +48,5 @@
|
|||||||
overlays += image(icon, icon_state = "coat_lab")
|
overlays += image(icon, icon_state = "coat_lab")
|
||||||
if (istype(coat, /obj/item/clothing/suit/storage/toggle/labcoat/cmo))
|
if (istype(coat, /obj/item/clothing/suit/storage/toggle/labcoat/cmo))
|
||||||
overlays += image(icon, icon_state = "coat_cmo")
|
overlays += image(icon, icon_state = "coat_cmo")
|
||||||
if (istype(coat, /obj/item/clothing/suit/storage/det_suit))
|
if (istype(coat, /obj/item/clothing/suit/storage/det_trench))
|
||||||
overlays += image(icon, icon_state = "coat_det")
|
overlays += image(icon, icon_state = "coat_det")
|
||||||
|
|||||||
@@ -246,16 +246,16 @@
|
|||||||
New()
|
New()
|
||||||
..()
|
..()
|
||||||
new /obj/item/clothing/under/det(src)
|
new /obj/item/clothing/under/det(src)
|
||||||
|
new /obj/item/clothing/under/det/grey(src)
|
||||||
new /obj/item/clothing/under/det/black(src)
|
new /obj/item/clothing/under/det/black(src)
|
||||||
new /obj/item/clothing/under/det/slob(src)
|
new /obj/item/clothing/suit/storage/det_trench(src)
|
||||||
new /obj/item/clothing/suit/storage/det_suit(src)
|
new /obj/item/clothing/suit/storage/det_trench/grey(src)
|
||||||
new /obj/item/clothing/suit/storage/det_suit/black(src)
|
|
||||||
new /obj/item/clothing/suit/storage/forensics/blue(src)
|
new /obj/item/clothing/suit/storage/forensics/blue(src)
|
||||||
new /obj/item/clothing/suit/storage/forensics/red(src)
|
new /obj/item/clothing/suit/storage/forensics/red(src)
|
||||||
new /obj/item/clothing/gloves/black(src)
|
new /obj/item/clothing/gloves/black(src)
|
||||||
new /obj/item/clothing/head/det_hat(src)
|
new /obj/item/clothing/head/det(src)
|
||||||
new /obj/item/clothing/head/det_hat/black(src)
|
new /obj/item/clothing/head/det/grey(src)
|
||||||
new /obj/item/clothing/shoes/brown(src)
|
new /obj/item/clothing/shoes/laceup(src)
|
||||||
new /obj/item/weapon/storage/box/evidence(src)
|
new /obj/item/weapon/storage/box/evidence(src)
|
||||||
new /obj/item/device/radio/headset/headset_sec(src)
|
new /obj/item/device/radio/headset/headset_sec(src)
|
||||||
new /obj/item/device/detective_scanner(src)
|
new /obj/item/device/detective_scanner(src)
|
||||||
|
|||||||
@@ -624,9 +624,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
|
|||||||
M.equip_to_slot_or_del(new /obj/item/clothing/under/det(M), slot_w_uniform)
|
M.equip_to_slot_or_del(new /obj/item/clothing/under/det(M), slot_w_uniform)
|
||||||
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
|
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
|
||||||
|
|
||||||
M.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(M), slot_wear_suit)
|
M.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_trench(M), slot_wear_suit)
|
||||||
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/plain/monocle(M), slot_glasses)
|
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/plain/monocle(M), slot_glasses)
|
||||||
M.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(M), slot_head)
|
M.equip_to_slot_or_del(new /obj/item/clothing/head/det(M), slot_head)
|
||||||
|
|
||||||
M.equip_to_slot_or_del(new /obj/item/weapon/cloaking_device(M), slot_r_store)
|
M.equip_to_slot_or_del(new /obj/item/weapon/cloaking_device(M), slot_r_store)
|
||||||
|
|
||||||
|
|||||||
@@ -93,9 +93,9 @@
|
|||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
|
||||||
|
|
||||||
//Detective
|
//Detective
|
||||||
/obj/item/clothing/suit/storage/det_suit
|
/obj/item/clothing/suit/storage/det_trench
|
||||||
name = "coat"
|
name = "brown trenchcoat"
|
||||||
desc = "An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business."
|
desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration!"
|
||||||
icon_state = "detective"
|
icon_state = "detective"
|
||||||
item_state = "det_suit"
|
item_state = "det_suit"
|
||||||
blood_overlay_type = "coat"
|
blood_overlay_type = "coat"
|
||||||
@@ -104,7 +104,8 @@
|
|||||||
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
|
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
|
||||||
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
|
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
|
||||||
|
|
||||||
/obj/item/clothing/suit/storage/det_suit/black
|
/obj/item/clothing/suit/storage/det_trench/grey
|
||||||
|
name = "grey trenchcoat"
|
||||||
icon_state = "detective2"
|
icon_state = "detective2"
|
||||||
|
|
||||||
//Forensics
|
//Forensics
|
||||||
|
|||||||
@@ -74,35 +74,28 @@
|
|||||||
* Detective
|
* Detective
|
||||||
*/
|
*/
|
||||||
/obj/item/clothing/under/det
|
/obj/item/clothing/under/det
|
||||||
name = "hard-worn suit"
|
name = "detective's suit"
|
||||||
desc = "Someone who wears this means business."
|
desc = "A rumpled white dress shirt paired with well-worn grey slacks, complete with a blue striped tie and a faux-gold tie clip."
|
||||||
icon_state = "detective"
|
icon_state = "detective"
|
||||||
item_state = "det"
|
item_state = "det"
|
||||||
worn_state = "detective"
|
worn_state = "detective"
|
||||||
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||||
siemens_coefficient = 0.9
|
siemens_coefficient = 0.9
|
||||||
|
|
||||||
/obj/item/clothing/under/det/black
|
/obj/item/clothing/under/det/grey
|
||||||
icon_state = "detective2"
|
icon_state = "detective2"
|
||||||
worn_state = "detective2"
|
worn_state = "detective2"
|
||||||
|
desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie."
|
||||||
|
|
||||||
|
/obj/item/clothing/under/det/black
|
||||||
|
icon_state = "detective3"
|
||||||
|
worn_state = "detective3"
|
||||||
item_state = "sl_suit"
|
item_state = "sl_suit"
|
||||||
|
desc = "An immaculate white dress shirt, paired with a pair of dark grey dress pants, a red tie, and a charcoal vest."
|
||||||
|
|
||||||
/obj/item/clothing/under/det/slob
|
/obj/item/clothing/head/det
|
||||||
icon_state = "polsuit"
|
name = "fedora"
|
||||||
worn_state = "polsuit"
|
desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
|
||||||
|
|
||||||
/obj/item/clothing/under/det/slob/verb/rollup()
|
|
||||||
set name = "Roll suit sleeves"
|
|
||||||
set category = "Object"
|
|
||||||
set src in usr
|
|
||||||
worn_state = worn_state == "polsuit" ? "polsuit_rolled" : "polsuit"
|
|
||||||
if (ishuman(loc))
|
|
||||||
var/mob/living/carbon/human/H = loc
|
|
||||||
H.update_inv_w_uniform(1)
|
|
||||||
|
|
||||||
/obj/item/clothing/head/det_hat
|
|
||||||
name = "hat"
|
|
||||||
desc = "Someone who wears this will look very smart."
|
|
||||||
icon_state = "detective"
|
icon_state = "detective"
|
||||||
item_state_slots = list(
|
item_state_slots = list(
|
||||||
slot_l_hand_str = "det_hat",
|
slot_l_hand_str = "det_hat",
|
||||||
@@ -113,8 +106,9 @@
|
|||||||
siemens_coefficient = 0.9
|
siemens_coefficient = 0.9
|
||||||
body_parts_covered = 0
|
body_parts_covered = 0
|
||||||
|
|
||||||
/obj/item/clothing/head/det_hat/black
|
/obj/item/clothing/head/det/grey
|
||||||
icon_state = "detective2"
|
icon_state = "detective2"
|
||||||
|
desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 0 B After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 0 B After Width: | Height: | Size: 311 KiB |
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 130 KiB |
|
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 159 KiB |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 210 KiB |
|
Before Width: | Height: | Size: 262 KiB After Width: | Height: | Size: 287 KiB |
|
Before Width: | Height: | Size: 236 KiB After Width: | Height: | Size: 249 KiB |
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 92 KiB After Width: | Height: | Size: 102 KiB |
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 0 B After Width: | Height: | Size: 14 KiB |