mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-27 02:23:10 +00:00
Fixed conflicts with another thing.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 117 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 118 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Reference in New Issue
Block a user