diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 3e12bcb7f18..44e7dddca1e 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -82,9 +82,12 @@ ads_list = list("Apply your brilliant deductive methods in style!", "They already smell of cigarettes!") vend_reply = "Thank you for using the DetDrobe!" products = list(/obj/item/clothing/under/rank/security/detective = 2, + /obj/item/clothing/under/rank/security/detective/black = 1, + /obj/item/clothing/under/rank/security/detective/skirt = 1, /obj/item/clothing/suit/storage/det_suit = 2, /obj/item/clothing/suit/storage/det_suit/forensics/red = 1, /obj/item/clothing/suit/storage/det_suit/forensics/blue = 1, + /obj/item/clothing/suit/storage/det_suit/forensics/black = 1, /obj/item/clothing/suit/armor/vest/det_suit = 1, /obj/item/clothing/glasses/sunglasses/noir = 2, /obj/item/clothing/head/det_hat = 2, @@ -100,9 +103,12 @@ /obj/item/reagent_containers/food/drinks/flask/detflask = 2, /obj/item/storage/fancy/cigarettes/dromedaryco = 5) prices = list(/obj/item/clothing/under/rank/security/detective = 50, + /obj/item/clothing/under/rank/security/detective/black = 75, + /obj/item/clothing/under/rank/security/detective/skirt = 75, /obj/item/clothing/suit/storage/det_suit = 75, /obj/item/clothing/suit/storage/det_suit/forensics/red = 75, /obj/item/clothing/suit/storage/det_suit/forensics/blue = 75, + /obj/item/clothing/suit/storage/det_suit/forensics/black = 75, /obj/item/clothing/suit/armor/vest/det_suit = 75, /obj/item/clothing/head/det_hat = 40, /obj/item/clothing/glasses/sunglasses/noir = 30, diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 5f8a158f629..5d320aac129 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -110,7 +110,8 @@ dog_fashion = /datum/dog_fashion/head/detective sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) //Mime diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 203bcab686a..46092ff3d67 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -274,6 +274,11 @@ item_state = "fedora" desc = "A great hat ruined by being within fifty yards of you." actions_types = list(/datum/action/item_action/tip_fedora) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' + ) + /obj/item/clothing/head/fedora/attack_self(mob/user) tip_fedora(user) diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index 13ba6cea62e..7d3460e4fc2 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -144,7 +144,10 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi' ) //Forensics @@ -166,6 +169,11 @@ desc = "A blue forensics technician jacket." icon_state = "forensics_blue" +/obj/item/clothing/suit/storage/det_suit/forensics/black + name = "black jacket" + desc = "A black forensics technician jacket." + icon_state = "forensics_black" + //Blueshield /obj/item/clothing/suit/storage/blueshield name = "blueshield's coat" diff --git a/code/modules/clothing/under/jobs/security_jumpsuits.dm b/code/modules/clothing/under/jobs/security_jumpsuits.dm index 6bfabc64c41..d319cda2cbc 100644 --- a/code/modules/clothing/under/jobs/security_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/security_jumpsuits.dm @@ -101,6 +101,25 @@ icon_state = "detective" item_state = "det" item_color = "detective" + sprite_sheets = list( + "Human" = 'icons/mob/clothing/under/security.dmi', + "Vox" = 'icons/mob/clothing/species/vox/under/security.dmi', + "Drask" = 'icons/mob/clothing/species/drask/under/security.dmi', + "Grey" = 'icons/mob/clothing/species/grey/under/security.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/under/security.dmi' + ) + +/obj/item/clothing/under/rank/security/detective/skirt + name = "detective's jumpskirt" + icon_state = "det_skirt" + item_color = "det_skirt" + +/obj/item/clothing/under/rank/security/detective/black + name = "forensics jumpsuit" + desc = "A black forensics technician jumpsuit." + icon_state = "det_black" + item_color = "det_black" + /* * Head of Security diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 462b4941067..98fefc6f829 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/species/drask/gloves.dmi b/icons/mob/clothing/species/drask/gloves.dmi index 916eddecf34..dbc775fd02f 100644 Binary files a/icons/mob/clothing/species/drask/gloves.dmi and b/icons/mob/clothing/species/drask/gloves.dmi differ diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index 784376699f3..282bdfdb940 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/drask/under/security.dmi b/icons/mob/clothing/species/drask/under/security.dmi index 706af17fc26..53f8b8ff46e 100644 Binary files a/icons/mob/clothing/species/drask/under/security.dmi and b/icons/mob/clothing/species/drask/under/security.dmi differ diff --git a/icons/mob/clothing/species/grey/gloves.dmi b/icons/mob/clothing/species/grey/gloves.dmi index 4c6dc146fe2..f24910643e6 100644 Binary files a/icons/mob/clothing/species/grey/gloves.dmi and b/icons/mob/clothing/species/grey/gloves.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index 57185b4aaa0..8b00c30ae01 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index cbfb8f56687..c836529cf83 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/under/security.dmi b/icons/mob/clothing/species/grey/under/security.dmi index 6a2d9e4448b..085db6cd36d 100644 Binary files a/icons/mob/clothing/species/grey/under/security.dmi and b/icons/mob/clothing/species/grey/under/security.dmi differ diff --git a/icons/mob/clothing/species/kidan/gloves.dmi b/icons/mob/clothing/species/kidan/gloves.dmi index c6926af40a0..2dc6b40529d 100644 Binary files a/icons/mob/clothing/species/kidan/gloves.dmi and b/icons/mob/clothing/species/kidan/gloves.dmi differ diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi index ab55784757f..4f5d6a4245d 100644 Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/security.dmi b/icons/mob/clothing/species/kidan/under/security.dmi new file mode 100644 index 00000000000..efc446eee37 Binary files /dev/null and b/icons/mob/clothing/species/kidan/under/security.dmi differ diff --git a/icons/mob/clothing/species/vox/gloves.dmi b/icons/mob/clothing/species/vox/gloves.dmi index 85e821ce867..713d99e3f87 100644 Binary files a/icons/mob/clothing/species/vox/gloves.dmi and b/icons/mob/clothing/species/vox/gloves.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 66464bc1b9d..c5ce01a0f07 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 49fb6074989..dd9269c4128 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/under/security.dmi b/icons/mob/clothing/species/vox/under/security.dmi index ca9f21ccf2d..f8cf40741ea 100644 Binary files a/icons/mob/clothing/species/vox/under/security.dmi and b/icons/mob/clothing/species/vox/under/security.dmi differ diff --git a/icons/mob/clothing/under/security.dmi b/icons/mob/clothing/under/security.dmi index da1b0deff94..4e1267adca6 100644 Binary files a/icons/mob/clothing/under/security.dmi and b/icons/mob/clothing/under/security.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 108050d275d..ccd10bcd5b7 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index e637d12b1e5..d0edc5a9155 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 04e0357c3cc..4bbc478f1b9 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/security.dmi b/icons/obj/clothing/under/security.dmi index bab6669ae12..8675363241f 100644 Binary files a/icons/obj/clothing/under/security.dmi and b/icons/obj/clothing/under/security.dmi differ diff --git a/paradise.dme b/paradise.dme index 5d5800d442e..5f4d03b3a46 100644 --- a/paradise.dme +++ b/paradise.dme @@ -188,9 +188,9 @@ #include "code\_onclick\hud\alien_hud.dm" #include "code\_onclick\hud\alien_larva.dm" #include "code\_onclick\hud\blob_overmind.dm" -#include "code\_onclick\hud\follow_alert.dm" #include "code\_onclick\hud\bot_hud.dm" #include "code\_onclick\hud\constructs_hud.dm" +#include "code\_onclick\hud\follow_alert.dm" #include "code\_onclick\hud\fullscreen.dm" #include "code\_onclick\hud\ghost_hud.dm" #include "code\_onclick\hud\guardian_hud.dm" @@ -446,8 +446,8 @@ #include "code\datums\helper_datums\topic_input.dm" #include "code\datums\keybindings\_keybinding.dm" #include "code\datums\keybindings\admin_keybinds.dm" -#include "code\datums\keybindings\client.dm" #include "code\datums\keybindings\carbon_keybinds.dm" +#include "code\datums\keybindings\client.dm" #include "code\datums\keybindings\emote_keybinds.dm" #include "code\datums\keybindings\human_keybinds.dm" #include "code\datums\keybindings\living_keybinds.dm" @@ -2426,12 +2426,12 @@ #include "code\modules\reagents\chemistry\recipes\drinks_reactions.dm" #include "code\modules\reagents\chemistry\recipes\drugs_reactions.dm" #include "code\modules\reagents\chemistry\recipes\food_reactions.dm" -#include "code\modules\reagents\chemistry\recipes\others.dm" #include "code\modules\reagents\chemistry\recipes\medicine_reactions.dm" +#include "code\modules\reagents\chemistry\recipes\others.dm" #include "code\modules\reagents\chemistry\recipes\pyrotechnics.dm" #include "code\modules\reagents\chemistry\recipes\slime_extracts.dm" -#include "code\modules\reagents\reagent_containers\applicator.dm" #include "code\modules\reagents\chemistry\recipes\toxins_reactions.dm" +#include "code\modules\reagents\reagent_containers\applicator.dm" #include "code\modules\reagents\reagent_containers\borghydro.dm" #include "code\modules\reagents\reagent_containers\chemical_bottle.dm" #include "code\modules\reagents\reagent_containers\dropper.dm"