Merge pull request #3269 from VOREStation/aro-runtimes

Fixes several runtimes
This commit is contained in:
Aronai Sieyes
2018-03-18 01:41:32 -04:00
committed by GitHub
5 changed files with 17 additions and 13 deletions
+1 -1
View File
@@ -393,7 +393,7 @@
P.activate()
/obj/item/projectile/proc/impact_effect(var/matrix/M)
if(ispath(tracer_type))
if(ispath(tracer_type) && location)
var/obj/effect/projectile/P = new impact_type(location.loc)
if(istype(P))
@@ -48,7 +48,7 @@
return
/obj/item/weapon/reagent_containers/food/snacks/attack(mob/M as mob, mob/user as mob, def_zone)
if(!reagents.total_volume)
if(reagents && !reagents.total_volume)
user << "<span class='danger'>None of [src] left!</span>"
user.drop_from_inventory(src)
qdel(src)
@@ -29,7 +29,8 @@
LAZYINITLIST(targets)
//We can't keep a mob reference, that's a bad idea, so instead name+ref should suffice.
var/hash = md5(target.real_name + "\ref[target]")
var/name_to_use = ismob(target) ? target.real_name : target.name
var/hash = md5(name_to_use + "\ref[target]")
//Just once!
targets |= hash
@@ -6,7 +6,7 @@
icon_state = "micro"
slot_flags = SLOT_FEET | SLOT_HEAD | SLOT_ID
w_class = ITEMSIZE_SMALL
item_icons = null // Override value from parent. We don't have magic sprites.
item_icons = list() // No in-hand sprites (for now, anyway, we could totally add some)
pixel_y = 0 // Override value from parent.
/obj/item/weapon/holder/micro/examine(var/mob/user)