Fixes mimana sprites. Small fix to snap corn picking. Fixes russian revolver not killing you.

This commit is contained in:
phil235
2015-02-22 23:02:07 +01:00
parent bd870d649c
commit 3e100729bc
5 changed files with 17 additions and 8 deletions
+15 -6
View File
@@ -278,6 +278,13 @@
/obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM)
if(..()) qdel(src)
/obj/item/weapon/grown/bananapeel/mimanapeel
name = "mimana peel"
desc = "A mimana peel."
icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "mimana_peel"
/obj/item/weapon/grown/corncob
name = "corn cob"
desc = "A reminder of meals gone by."
@@ -316,9 +323,11 @@
/obj/item/weapon/grown/snapcorn/attack_self(mob/user as mob)
..()
user << "<span class='notice'>You pick up the snap pops from the cob.</span>"
for(var/i, i<=snap_pops, i++)
new /obj/item/toy/snappop(user.loc)
user.unEquip(src)
new /obj/item/weapon/grown/corncob(user.loc)
qdel(src)
user << "<span class='notice'>You pick up a snap pops from the cob.</span>"
var/obj/item/toy/snappop/S = new /obj/item/toy/snappop(user.loc)
if(ishuman(user))
user.put_in_hands(S)
snap_pops -= 1
if(!snap_pops)
new /obj/item/weapon/grown/corncob(user.loc)
qdel(src)
+1 -1
View File
@@ -210,7 +210,7 @@
name = "pack of mimana seeds"
desc = "They're seeds that grow into mimana trees. When grown, keep away from mime."
icon_state = "seed-mimana"
species = "banana"
species = "mimana"
plantname = "Mimana Tree"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/mimana
lifespan = 50
@@ -216,7 +216,7 @@
playsound(user, fire_sound, 50, 1)
var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting))
var/limb_name = affecting.getDisplayName()
if(affecting == "head" || affecting == "eyes" || affecting == "mouth")
if(affecting.name == "head" || affecting.name == "eyes" || affecting.name == "mouth")
user.apply_damage(300, BRUTE, affecting)
user.visible_message("<span class='danger'>[user.name] fires [src] at \his head!</span>", "<span class='userdanger'>You fire [src] at your head!</span>", "You hear a gunshot!")
else
Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB