cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #5270

Browse Source 
Changes simple_animal/Die() to use death from mob/living instead.
This commit is contained in:
Boop
2014-06-16 23:30:37 +01:00
parent 7a4d0f873d
commit 07a6ad4897
19 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/constructs.dm
+1 -1
View File
@@ -34,7 +34,7 @@
for(var/spell in construct_spells)
spell_list += new spell(src)
/mob/living/simple_animal/construct/Die()
/mob/living/simple_animal/construct/death()
..()
new /obj/item/weapon/ectoplasm (src.loc)
for(var/mob/M in viewers(src, null))
code/modules/mob/living/simple_animal/friendly/crab.dm
+1 -1
View File
@@ -46,7 +46,7 @@
if(prob(50))
user << "\red \b This kills the crab."
health -= 20
Die()
death()
else
GetMad()
get
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+1 -1
View File
@@ -222,7 +222,7 @@ var/global/chicken_count = 0
pixel_y = rand(0, 10)
chicken_count += 1
/mob/living/simple_animal/chicken/Die()
/mob/living/simple_animal/chicken/death()
..()
chicken_count -= 1
code/modules/mob/living/simple_animal/friendly/mouse.dm
+1 -1
View File
@@ -134,7 +134,7 @@
M << 'sound/effects/mousesqueek.ogg'
..()
/mob/living/simple_animal/mouse/Die()
/mob/living/simple_animal/mouse/death()
layer = MOB_LAYER
if(client)
client.time_died_as_mouse = world.time
code/modules/mob/living/simple_animal/friendly/slime.dm
+1 -1
View File
@@ -70,7 +70,7 @@
overlays += "aslime-:33"
/mob/living/simple_animal/slime/adult/Die()
/mob/living/simple_animal/slime/adult/death()
var/mob/living/simple_animal/slime/S1 = new /mob/living/simple_animal/slime (src.loc)
S1.icon_state = "[src.colour] baby slime"
S1.icon_living = "[src.colour] baby slime"
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+2 -2
View File
@@ -162,7 +162,7 @@
M.show_message("\red [src] makes an odd warbling noise, fizzles, and explodes.")
explosion(get_turf(loc), -1, -1, 3, 5)
eject_brain()
Die()
death()
/mob/living/simple_animal/spiderbot/proc/update_icon()
if(mmi)
@@ -200,7 +200,7 @@
..()
/mob/living/simple_animal/spiderbot/Die()
/mob/living/simple_animal/spiderbot/death()
living_mob_list -= src
dead_mob_list += src
code/modules/mob/living/simple_animal/hostile/alien.dm
+1 -1
View File
@@ -87,7 +87,7 @@
damage = 30
icon_state = "toxin"
/mob/living/simple_animal/hostile/alien/Die()
/mob/living/simple_animal/hostile/alien/death()
..()
visible_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...")
playsound(src, 'sound/voice/hiss6.ogg', 100, 1)
code/modules/mob/living/simple_animal/hostile/hivebot.dm
+1 -1
View File
@@ -44,7 +44,7 @@
ranged = 1
/mob/living/simple_animal/hostile/hivebot/Die()
/mob/living/simple_animal/hostile/hivebot/death()
..()
visible_message("<b>[src]</b> blows apart!")
new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc)
code/modules/mob/living/simple_animal/hostile/hostile.dm
+1 -1
View File
@@ -116,7 +116,7 @@
L += mechas_list
return L
/mob/living/simple_animal/hostile/Die()
/mob/living/simple_animal/hostile/death()
..()
walk(src, 0)
code/modules/mob/living/simple_animal/hostile/mimic.dm
+3 -3
View File
@@ -41,7 +41,7 @@
if(.)
emote("growls at [.]")
/mob/living/simple_animal/hostile/mimic/Die()
/mob/living/simple_animal/hostile/mimic/death()
..()
visible_message("\red <b>[src]</b> stops moving!")
del(src)
@@ -107,7 +107,7 @@
..()
icon_state = initial(icon_state)
/mob/living/simple_animal/hostile/mimic/crate/Die()
/mob/living/simple_animal/hostile/mimic/crate/death()
var/obj/structure/closet/crate/C = new(get_turf(src))
// Put loot in crate
@@ -141,7 +141,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
..(loc)
CopyObject(copy, creator)
/mob/living/simple_animal/hostile/mimic/copy/Die()
/mob/living/simple_animal/hostile/mimic/copy/death()
for(var/atom/movable/M in src)
M.loc = get_turf(src)
code/modules/mob/living/simple_animal/hostile/pirate.dm
+1 -1
View File
@@ -47,7 +47,7 @@
weapon1 = /obj/item/weapon/gun/energy/laser
/mob/living/simple_animal/hostile/pirate/Die()
/mob/living/simple_animal/hostile/pirate/death()
..()
if(corpse)
new corpse (src.loc)
code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+1 -1
View File
@@ -157,7 +157,7 @@
hostile_drone = 0
walk(src,0)
/mob/living/simple_animal/hostile/retaliate/malf_drone/Die()
/mob/living/simple_animal/hostile/retaliate/malf_drone/death()
src.visible_message("\blue \icon[src] [src] suddenly breaks apart.")
..()
del(src)
code/modules/mob/living/simple_animal/hostile/russian.dm
+1 -1
View File
@@ -45,7 +45,7 @@
casingtype = /obj/item/ammo_casing/a357
/mob/living/simple_animal/hostile/russian/Die()
/mob/living/simple_animal/hostile/russian/death()
..()
if(corpse)
new corpse (src.loc)
code/modules/mob/living/simple_animal/hostile/syndicate.dm
+2 -2
View File
@@ -35,7 +35,7 @@
faction = "syndicate"
status_flags = CANPUSH
/mob/living/simple_animal/hostile/syndicate/Die()
/mob/living/simple_animal/hostile/syndicate/death()
..()
if(corpse)
new corpse (src.loc)
@@ -157,7 +157,7 @@
max_n2 = 0
minbodytemp = 0
/mob/living/simple_animal/hostile/viscerator/Die()
/mob/living/simple_animal/hostile/viscerator/death()
..()
visible_message("\red <b>[src]</b> is smashed into pieces!")
del src
code/modules/mob/living/simple_animal/hostile/tree.dm
+1 -1
View File
@@ -50,7 +50,7 @@
L.Weaken(3)
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
/mob/living/simple_animal/hostile/tree/Die()
/mob/living/simple_animal/hostile/tree/death()
..()
visible_message("\red <b>[src]</b> is hacked into pieces!")
new /obj/item/stack/sheet/wood(loc)
code/modules/mob/living/simple_animal/parrot.dm
+1 -1
View File
@@ -101,7 +101,7 @@
/mob/living/simple_animal/parrot/proc/perch_player)
/mob/living/simple_animal/parrot/Die()
/mob/living/simple_animal/parrot/death()
if(held_item)
held_item.loc = src.loc
held_item = null
code/modules/mob/living/simple_animal/simple_animal.dm
+3 -5
View File
@@ -82,7 +82,7 @@
if(health < 1)
Die()
death()
if(health > maxHealth)
health = maxHealth
@@ -405,13 +405,11 @@
statpanel("Status")
stat(null, "Health: [round((health / maxHealth) * 100)]%")
/mob/living/simple_animal/proc/Die()
living_mob_list -= src
dead_mob_list += src
/mob/living/simple_animal/death()
icon_state = icon_dead
stat = DEAD
density = 0
return
return ..()
/mob/living/simple_animal/ex_act(severity)
if(!blinded)
code/modules/mob/living/simple_animal/worm.dm
+1 -1
View File
@@ -168,7 +168,7 @@
newHead.Attach(newHeadPrevious)
if(die)
newHead.Die()
newHead.death()
del(src)