diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index f967a5b16c2..5c4201e2bc0 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -114,7 +114,8 @@ name = "seclite" desc = "A robust flashlight used by security." icon_state = "seclite" - item_state = "flashlight" //only temporary change this to 'seclite' once we get the proper left/right hand sprites. + item_state = "seclite" + icon_override = 'icons/mob/in-hand/tools.dmi' force = 9 // Not as good as a stun baton. brightness_on = 5 // A little better than the standard flashlight. hitsound = 'sound/weapons/genhit1.ogg' 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 14aba6754d6..260b7961b13 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -186,9 +186,6 @@ new /obj/item/weapon/gun/energy/taser(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/taperoll/police(src) - new /obj/item/device/hailer(src) - new /obj/item/clothing/head/soft/sec/corp(src) - new /obj/item/clothing/under/rank/security/corp(src) return /obj/structure/closet/secure_closet/blueshield diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index c9060e062e5..a3a768991d0 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -26,15 +26,22 @@ new /obj/item/clothing/under/rank/security2(src) new /obj/item/clothing/under/rank/security2(src) new /obj/item/clothing/under/rank/security2(src) + new /obj/item/clothing/under/rank/security/corp(src) + new /obj/item/clothing/under/rank/security/corp(src) + new /obj/item/clothing/under/rank/security/corp(src) new /obj/item/clothing/shoes/jackboots(src) new /obj/item/clothing/shoes/jackboots(src) new /obj/item/clothing/shoes/jackboots(src) new /obj/item/clothing/head/soft/sec(src) new /obj/item/clothing/head/soft/sec(src) new /obj/item/clothing/head/soft/sec(src) + new /obj/item/clothing/head/soft/sec/corp(src) + new /obj/item/clothing/head/soft/sec/corp(src) + new /obj/item/clothing/head/soft/sec/corp(src) new /obj/item/clothing/head/beret/sec(src) new /obj/item/clothing/head/beret/sec(src) new /obj/item/clothing/head/beret/sec(src) + return diff --git a/icons/mob/in-hand/tools.dmi b/icons/mob/in-hand/tools.dmi new file mode 100644 index 00000000000..963efda7050 Binary files /dev/null and b/icons/mob/in-hand/tools.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 0586c8c364a..61b1d4e26d5 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ