Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

This commit is contained in:
Markolie
2017-02-06 19:55:37 +01:00
parent 2a23862c6a
commit 7a4c33bbcd
26 changed files with 639 additions and 171 deletions
+2 -2
View File
@@ -20,7 +20,7 @@
name = "practice laser"
damage = 0
nodamage = 1
log = 0
log_override = TRUE
/obj/item/projectile/beam/scatter
name = "laser pellet"
@@ -75,7 +75,7 @@
damage_type = STAMINA
flag = "laser"
var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
log = 0
log_override = TRUE
/obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0)
. = ..()
@@ -37,7 +37,7 @@
var/obj/item/weapon/pen/pen = null
edge = 0
embed = 0
log = 0//it won't log even when there's a pen inside, but since the damage will be so low, I don't think there's any point in making it any more complex
log_override = TRUE//it won't log even when there's a pen inside, but since the damage will be so low, I don't think there's any point in making it any more complex
/obj/item/projectile/bullet/reusable/foam_dart/handle_drop()
if(dropped)
@@ -65,4 +65,4 @@
icon_state = "foamdart_riot"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
stamina = 25
log = 1
log_override = FALSE