cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repaths corgi puppies to be a child of corgis, actually deletes pug.dm, o space jesus is this fixed yet

Browse Source
This commit is contained in:
bgobandit
2015-07-24 02:04:49 -04:00
parent f932fac0db
commit dff81b5359
3 changed files with 5 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/dog.dm
+5 -6
View File
@@ -23,7 +23,7 @@
icon_dead = "corgi_dead"
gender = MALE
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi = 3)
childtype = /mob/living/simple_animal/pet/dog/corgipuppy
childtype = /mob/living/simple_animal/pet/dog/corgi/puppy
species = /mob/living/simple_animal/pet/dog
var/shaved = 0
var/obj/item/inventory_head
@@ -473,7 +473,7 @@
back_icon = image('icons/mob/corgi_back.dmi', icon_state = inventory_back.icon_state)
overlays += back_icon
if(facehugger)
if(istype(src, /mob/living/simple_animal/pet/dog/corgipuppy))
if(istype(src, /mob/living/simple_animal/pet/dog/corgi/puppy))
overlays += image('icons/mob/mask.dmi',"facehugger_corgipuppy")
else
overlays += image('icons/mob/mask.dmi',"facehugger_corgi")
@@ -485,20 +485,19 @@
/mob/living/simple_animal/pet/dog/corgipuppy
/mob/living/simple_animal/pet/dog/corgi/puppy
name = "\improper corgi puppy"
real_name = "corgi"
desc = "It's a corgi puppy."
desc = "It's a corgi puppy!"
icon_state = "puppy"
icon_living = "puppy"
icon_dead = "puppy_dead"
var.shaved = 0
density = 0
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL
//puppies cannot wear anything.
/mob/living/simple_animal/pet/dog/corgipuppy/Topic(href, href_list)
/mob/living/simple_animal/pet/dog/corgi/puppy/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
usr << "<span class='warning'>You can't fit this on [src]!</span>"
return
code/modules/mob/living/simple_animal/friendly/pug.dm
-30
View File
@@ -1,30 +0,0 @@
/mob/living/simple_animal/pet/pug
name = "\improper pug"
real_name = "pug"
desc = "It's a pug."
icon = 'icons/mob/pets.dmi'
icon_state = "pug"
icon_living = "pug"
icon_dead = "pug_dead"
speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
speak_emote = list("barks", "woofs")
emote_hear = list("barks!", "woofs!", "yaps.","pants.")
emote_see = list("shakes its head.", "chases its tail.","shivers.")
speak_chance = 1
turns_per_move = 10
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug = 3)
response_help = "pets"
response_disarm = "bops"
response_harm = "kicks"
see_in_dark = 5
/mob/living/simple_animal/pet/pug/Life()
..()
if(!stat && !resting && !buckled)
if(prob(1))
emote("me", 1, pick("chases its tail."))
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
dir = i
sleep(1)