diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 8993adf9cf3..02daa2c3678 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -108,6 +108,15 @@ brightness_on = 2 +/obj/item/device/flashlight/maglite + name = "maglite" + desc = "A robust flashlight used by security." + icon_state = "maglite" + item_state = "maglite" + force = 9 // Not as good as a stun baton. + brightness_on = 5 // A little better than the standard flashlight. + + // the desk lamps are a bit special /obj/item/device/flashlight/lamp name = "desk lamp" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index a36e5770eee..a330f3fcc1f 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -114,9 +114,14 @@ "/obj/item/ammo_casing/shotgun", "/obj/item/ammo_box", "/obj/item/weapon/reagent_containers/food/snacks/donut/normal", - "/obj/item/weapon/reagent_containers/food/snacks/donut/jelly" + "/obj/item/weapon/reagent_containers/food/snacks/donut/jelly", + "/obj/item/device/flashlight/maglite" ) +/obj/item/weapon/storage/belt/security/New() + ..() + new /obj/item/device/flashlight/maglite(src) + /obj/item/weapon/storage/belt/soulstone name = "soul stone belt" desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 14ab6be99f7..aba52a8c4f3 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -1,6 +1,6 @@ /obj/item/clothing/suit/armor - allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) + allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglite) body_parts_covered = CHEST cold_protection = CHEST|GROIN diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 38726cb726e..2a36957ae95 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -86,7 +86,7 @@ icon = 'icons/obj/items.dmi' icon_state = "album" item_state = "briefcase" - can_hold = list("/obj/item/weapon/photo",) + can_hold = list("/obj/item/weapon/photo") /* diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 6e4b095e8c1..9ae960134eb 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 0bc19db3c47..9a7393747b2 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 5379d6e70e0..23af9238904 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ