Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable

Species tweaks
This commit is contained in:
Zuhayr
2015-09-21 19:08:53 +09:30
33 changed files with 62 additions and 62 deletions
@@ -92,7 +92,7 @@
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(H.species.is_small)
if(issmall(H))
user << "<span class='warning'>It's too heavy for you to wield fully.</span>"
return
else
@@ -175,7 +175,7 @@
else if(istype(A,/obj/effect/plant))
var/obj/effect/plant/P = A
P.die_off()
//spears, bay edition
/obj/item/weapon/material/twohanded/spear
icon_state = "spearglass0"
@@ -9,7 +9,7 @@
name = master_item.name
verbs -= /obj/item/verb/verb_pickup //make sure this is never picked up.
..()
/obj/item/weapon/storage/internal/Destroy()
master_item = null
..()