diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index b0c116ab417..8c4c2447998 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -316,6 +316,12 @@ path = /obj/item/clothing/glasses/welding category = "General" +/datum/autolathe/recipe/maglight + name = "maglight" + path = /obj/item/device/flashlight/maglight + hidden = 1 + category = "General" + /datum/autolathe/recipe/flamethrower name = "flamethrower" path = /obj/item/weapon/flamethrower/full diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 8b172cbe528..2287c096e26 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -93,6 +93,20 @@ brightness_on = 2 w_class = 1 +/obj/item/device/flashlight/maglight + name = "maglight" + desc = "A very, very heavy duty flashlight." + icon_state = "maglight" + item_state = "maglight" + force = 13 + flags = CONDUCT + brightness_on = 4 + slot_flags = SLOT_BELT + w_class = 2 + attack_verb = list ("smacked", "thwacked", "thunked") + matter = list(DEFAULT_WALL_MATERIAL = 200,"glass" = 50) + hitsound = "swing_hit" + /obj/item/device/flashlight/drone name = "low-power flashlight" desc = "A miniature lamp, that might be used by small robots." diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 2bc82202981..f977830ef35 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -53,7 +53,8 @@ /obj/item/weapon/material/minihoe, /obj/item/weapon/material/hatchet, /obj/item/device/analyzer/plant_analyzer, - /obj/item/weapon/extinguisher/mini + /obj/item/weapon/extinguisher/mini, + /obj/item/device/flashlight/maglight ) 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 1a6005ba46d..78ddef7438f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -136,6 +136,7 @@ new /obj/item/weapon/melee/telebaton(src) new /obj/item/clothing/head/beret/sec/corporate/hos(src) new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src) + new /obj/item/device/flashlight/maglight(src) return @@ -179,6 +180,7 @@ new /obj/item/weapon/storage/box/holobadge(src) new /obj/item/clothing/head/beret/sec/corporate/warden(src) new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src) + new /obj/item/device/flashlight/maglight(src) return @@ -221,6 +223,7 @@ new /obj/item/ammo_magazine/c45m/rubber(src) new /obj/item/weapon/gun/energy/taser(src) new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src) + new /obj/item/device/flashlight/maglight(src) return diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index a7cac5981b8..61b297f9cc5 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 046289248df..6e6d8bdac57 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 1f1c7d3f0a0..c5f91d2ab2e 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ