From 6b6f8112789e6dd11566cfffd79194100927c8de Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 9 Oct 2018 10:43:49 -0700 Subject: [PATCH 1/2] Merge pull request #5634 from lbnesquik/Kates-Kobold-Remov Remove kobold.dm --- .../living/simple_animal/humanoids/kobold.dm | 43 ------------------- vorestation.dme | 1 - 2 files changed, 44 deletions(-) delete mode 100644 code/modules/mob/living/simple_animal/humanoids/kobold.dm diff --git a/code/modules/mob/living/simple_animal/humanoids/kobold.dm b/code/modules/mob/living/simple_animal/humanoids/kobold.dm deleted file mode 100644 index 7355fce470..0000000000 --- a/code/modules/mob/living/simple_animal/humanoids/kobold.dm +++ /dev/null @@ -1,43 +0,0 @@ -//kobold -/mob/living/simple_animal/kobold - name = "kobold" - desc = "A small, rat-like creature." - icon = 'icons/mob/mob.dmi' - icon_state = "kobold_idle" - icon_living = "kobold_idle" - icon_dead = "kobold_dead" - intelligence_level = SA_HUMANOID - - run_at_them = 0 - cooperative = 1 - - turns_per_move = 5 - see_in_dark = 6 - - response_help = "pets" - response_disarm = "gently pushes aside" - response_harm = "kicks" - - min_oxy = 16 //Require atleast 16kPA oxygen - minbodytemp = 223 //Below -50 Degrees Celcius - maxbodytemp = 323 //Above 50 Degrees Celcius - - speak_chance = 5 - speak = list("You no take candle!","Ooh, pretty shiny.","Me take?","Where gold here...","Me likey.") - speak_emote = list("mutters","hisses","grumbles") - emote_hear = list("mutters under it's breath.","grumbles.", "yips!") - emote_see = list("looks around suspiciously.", "scratches it's arm.","putters around a bit.") - - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey - -/mob/living/simple_animal/kobold/Life() - . = ..() - if(!.) return - - if(prob(5)) - flick("kobold_act",src) - -/mob/living/simple_animal/kobold/Move(var/dir) - ..() - if(!stat) - flick("kobold_walk",src) diff --git a/vorestation.dme b/vorestation.dme index b348bd23b2..a202176561 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2251,7 +2251,6 @@ #include "code\modules\mob\living\simple_animal\constructs\soulstone.dm" #include "code\modules\mob\living\simple_animal\humanoids\clown.dm" #include "code\modules\mob\living\simple_animal\humanoids\head.dm" -#include "code\modules\mob\living\simple_animal\humanoids\kobold.dm" #include "code\modules\mob\living\simple_animal\humanoids\mechamobs.dm" #include "code\modules\mob\living\simple_animal\humanoids\pirate.dm" #include "code\modules\mob\living\simple_animal\humanoids\russian.dm"