Merge remote-tracking branch 'refs/remotes/VOREStation/master'

This commit is contained in:
Cameron653
2016-07-02 16:50:14 -04:00
4 changed files with 17 additions and 0 deletions
@@ -0,0 +1,16 @@
/mob/living/simple_animal/hostile/vore/large/deathclaw
name = "deathclaw"
desc = "Big! Big! The size of three men! Claws as long as my forearm! Ripped apart! Ripped apart!"
icon = 'icons/mob/vore64x64.dmi'
icon_dead = "deathclaw-dead"
icon_living = "deathclaw"
icon_state = "deathclaw"
old_x = -16
old_y = 0
pixel_x = -16
pixel_y = 0
maxHealth = 200
health = 200
capacity = 2
max_size = 2
min_size = 0.25
Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 31 KiB

+1
View File
@@ -1604,6 +1604,7 @@
#include "code\modules\mob\living\simple_animal\hostile\vore\bear.dm"
#include "code\modules\mob\living\simple_animal\hostile\vore\carp.dm"
#include "code\modules\mob\living\simple_animal\hostile\vore\creature.dm"
#include "code\modules\mob\living\simple_animal\hostile\vore\deathclaw.dm"
#include "code\modules\mob\living\simple_animal\hostile\vore\mimic.dm"
#include "code\modules\mob\living\simple_animal\hostile\vore\vore.dm"
#include "code\modules\mob\living\voice\voice.dm"