mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-29 15:06:39 +01:00
Fixed conflicts with another thing.
This commit is contained in:
@@ -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."
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user