From d98fcfcc1402e094de585b7b628176f54060d772 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sat, 11 Mar 2017 02:40:18 +0000 Subject: [PATCH] Adds pike, weak pike and strong carp, also adds them to the belt mining lists --- .../living/simple_animal/hostile/pike_vr.dm | 31 ++++++++++++++++++ code/modules/rogueminer_vr/controller.dm | 21 ++++++++---- icons/mob/spaceshark.dmi | Bin 0 -> 3989 bytes vorestation.dme | 1 + 4 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 code/modules/mob/living/simple_animal/hostile/pike_vr.dm create mode 100644 icons/mob/spaceshark.dmi diff --git a/code/modules/mob/living/simple_animal/hostile/pike_vr.dm b/code/modules/mob/living/simple_animal/hostile/pike_vr.dm new file mode 100644 index 00000000000..c177f9ee095 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/pike_vr.dm @@ -0,0 +1,31 @@ +/mob/living/simple_animal/hostile/carp/pike + name = "space pike" + desc = "A bigger, angrier cousin of the space carp." + icon = 'icons/mob/spaceshark.dmi' + icon_state = "shark" + icon_living = "shark" + icon_dead = "shark_dead" + meat_amount = 10 + turns_per_move = 2 + move_to_delay = 2 + speed = 0 + mob_size = MOB_LARGE + + pixel_x = -16 + + health = 150 + maxHealth = 150 + + harm_intent_damage = 5 + melee_damage_lower = 20 + melee_damage_upper = 25 + + break_stuff_probability = 35 + +/mob/living/simple_animal/hostile/carp/pike/weak + health = 75 + maxHealth = 75 + +/mob/living/simple_animal/hostile/carp/strong + maxHealth = 50 + health = 50 \ No newline at end of file diff --git a/code/modules/rogueminer_vr/controller.dm b/code/modules/rogueminer_vr/controller.dm index 1ee3e5fd707..d471b98dcdb 100644 --- a/code/modules/rogueminer_vr/controller.dm +++ b/code/modules/rogueminer_vr/controller.dm @@ -55,12 +55,21 @@ var/datum/controller/rogue/rm_controller = new() ///// Monster Lists ///// var/mobs = list( - "tier1" = list(/mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/goose), - "tier2" = list(/mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/goose), - "tier3" = list(/mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/goose,/mob/living/simple_animal/hostile/vore/bear), - "tier4" = list(/mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/goose,/mob/living/simple_animal/hostile/vore/bear), - "tier5" = list(/mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/goose,/mob/living/simple_animal/hostile/vore/bear), - "tier6" = list(/mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/goose,/mob/living/simple_animal/hostile/vore/bear) + "tier1" = list(/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/goose), + + "tier2" = list(/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/goose), + + "tier3" = list(/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/goose, + /mob/living/simple_animal/hostile/vore/bear, /mob/living/simple_animal/hostile/carp/strong), + + "tier4" = list(/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/goose, /mob/living/simple_animal/hostile/vore/bear, + /mob/living/simple_animal/hostile/carp/strong, /mob/living/simple_animal/hostile/carp/pike/weak), + + "tier5" = list(/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/vore/bear, /mob/living/simple_animal/hostile/carp/pike/weak, + /mob/living/simple_animal/hostile/carp/strong, /mob/living/simple_animal/hostile/carp/pike), + + "tier6" = list(/mob/living/simple_animal/hostile/vore/bear, /mob/living/simple_animal/hostile/carp/strong, + /mob/living/simple_animal/hostile/carp/pike, /mob/living/simple_animal/hostile/carp/pike/weak) ) /datum/controller/rogue/New() diff --git a/icons/mob/spaceshark.dmi b/icons/mob/spaceshark.dmi new file mode 100644 index 0000000000000000000000000000000000000000..615fd87a01f4bf003676f093f2a7df5bfcd4a867 GIT binary patch literal 3989 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 literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 090aab09de1..284fdcdd3e5 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1824,6 +1824,7 @@ #include "code\modules\mob\living\simple_animal\hostile\goose_vr.dm" #include "code\modules\mob\living\simple_animal\hostile\hivebot.dm" #include "code\modules\mob\living\simple_animal\hostile\hostile.dm" +#include "code\modules\mob\living\simple_animal\hostile\pike_vr.dm" #include "code\modules\mob\living\simple_animal\hostile\pirate.dm" #include "code\modules\mob\living\simple_animal\hostile\russian.dm" #include "code\modules\mob\living\simple_animal\hostile\syndicate.dm"