diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 51fdb490bfc..9cf6d015a22 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -183,6 +183,7 @@ new /obj/item/clothing/under/rank/det/grey(src) new /obj/item/clothing/accessory/waistcoat(src) new /obj/item/clothing/suit/det_suit/grey(src) + new /obj/item/clothing/suit/det_suit/noir(src) new /obj/item/clothing/head/fedora(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/storage/box/evidence(src) diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 5ccaa471a36..733caccac1f 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -46,6 +46,12 @@ icon_state = "horribletie" item_color = "horribletie" +/obj/item/clothing/neck/tie/detective + name = "loose tie" + desc = "A loosely tied necktie, a perfect accessory for the over-worked detective." + icon_state = "detective" + item_color = "detective" + /obj/item/clothing/neck/stethoscope name = "stethoscope" desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing." diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index 19ffc53ef4f..9c2ddd797ea 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -43,8 +43,9 @@ /datum/outfit/plasmaman/detective name = "Detective Plasmaman" - head = /obj/item/clothing/head/helmet/space/plasmaman/security + head = /obj/item/clothing/head/helmet/space/plasmaman/white uniform = /obj/item/clothing/under/plasmaman/enviroslacks + ears = /obj/item/radio/headset/headset_sec /datum/outfit/plasmaman/warden name = "Warden Plasmaman" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index deaedfec18f..7717bdd0d7c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -92,6 +92,12 @@ icon_state = "greydet" item_state = "greydet" +/obj/item/clothing/suit/det_suit/noir + name = "noir suit coat" + desc = "A dapper private investigator's grey suit coat." + icon_state = "detsuit" + item_state = "detsuit" + //Engineering /obj/item/clothing/suit/hazardvest name = "hazard vest" diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 209d844145f..47aa82cb8d2 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -30,6 +30,7 @@ belt = /obj/item/pda/detective ears = /obj/item/radio/headset/headset_sec/alt uniform = /obj/item/clothing/under/rank/det + neck = /obj/item/clothing/neck/tie/detective shoes = /obj/item/clothing/shoes/sneakers/brown suit = /obj/item/clothing/suit/det_suit gloves = /obj/item/clothing/gloves/color/black diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 8378790d2f7..8e2451b77ed 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -38,7 +38,7 @@ if(M.stat || !in_range(M,src)) return - + if (recent_spin > world.time) return recent_spin = world.time + spin_delay @@ -72,17 +72,21 @@ to_chat(user, "It can be spun with alt+click") /obj/item/gun/ballistic/revolver/detective - name = "\improper .38 Mars Special" - desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds." + name = "\improper Colt Detective Special" + desc = "A classic, if not outdated, law enforcement firearm. Uses .38-special rounds." fire_sound = 'sound/weapons/revolver38shot.ogg' icon_state = "detective" mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 obj_flags = UNIQUE_RENAME unique_reskin = list("Default" = "detective", - "Leopard Spots" = "detective_leopard", - "Black Panther" = "detective_panther", + "Fitz Special" = "detective_fitz", + "Police Positive Special" = "detective_police", + "Blued Steel" = "detective_blued", + "Stainless Steel" = "detective_stainless", "Gold Trim" = "detective_gold", - "The Peacemaker" = "detective_peacemaker" + "Leopard Spots" = "detective_leopard", + "The Peacemaker" = "detective_peacemaker", + "Black Panther" = "detective_panther" ) /obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) diff --git a/icons/mob/neck.dmi b/icons/mob/neck.dmi index 32878b64c9e..53699dcfeeb 100644 Binary files a/icons/mob/neck.dmi and b/icons/mob/neck.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index afecbc463e0..46060259c4b 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 030134b4799..701988f5959 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 0f3668ce102..15f6f05b7d6 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e33c1697233..6078ddcc099 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 10eb7266f42..46bd26ce193 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ