cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12221 from Fox-McCloud/fix-pugs

Browse Source 
Fixes Pugs
This commit is contained in:
variableundefined
2019-09-06 19:08:26 -04:00
committed by GitHub
parent f8f4bb8b21 0854f75f7b
commit 90847c7bb1
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/crittercrate.dm
+1 -1
View File
@@ -75,7 +75,7 @@
/obj/structure/closet/critter/pug
name = "pug crate"
content_mob = /mob/living/simple_animal/pet/pug
content_mob = /mob/living/simple_animal/pet/dog/pug
/obj/structure/closet/critter/fox
name = "fox crate"
code/modules/mob/living/simple_animal/friendly/dog.dm
+1 -1
View File
@@ -756,7 +756,7 @@
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
collar_type = "pug"
/mob/living/simple_animal/pet/pug/handle_automated_movement()
/mob/living/simple_animal/pet/dog/pug/handle_automated_movement()
. = ..()
if(!resting && !buckled)
if(prob(1))
code/modules/mob/transform_procs.dm
+1 -1
View File
@@ -293,7 +293,7 @@
return 1
if(ispath(MP, /mob/living/simple_animal/chick))
return 1
if(ispath(MP, /mob/living/simple_animal/pet/pug))
if(ispath(MP, /mob/living/simple_animal/pet/dog/pug))
return 1
if(ispath(MP, /mob/living/simple_animal/butterfly))
return 1
code/modules/research/experimentor.dm
+2 -2
View File
@@ -620,7 +620,7 @@
/obj/item/relic/New()
icon_state = pick("shock_kit","armor-igniter-analyzer","infra-igniter0","infra-igniter1","radio-multitool","prox-radio1","radio-radio","timer-multitool0","radio-igniter-tank")
realName = "[pick("broken","twisted","spun","improved","silly","regular","badly made")] [pick("device","object","toy","suspicious tech","gear")]"
floof = pick(/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/dog/fox, /mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/pug, /mob/living/simple_animal/lizard, /mob/living/simple_animal/diona, /mob/living/simple_animal/butterfly, /mob/living/carbon/human/monkey)
floof = pick(/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/dog/fox, /mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/lizard, /mob/living/simple_animal/diona, /mob/living/simple_animal/butterfly, /mob/living/carbon/human/monkey)
/obj/item/relic/proc/reveal()
@@ -677,7 +677,7 @@
to_chat(user, message)
var/animals = rand(1,25)
var/counter
var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/dog/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/dog/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/dog/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
for(counter = 1; counter < animals; counter++)
var/mobType = pick(valid_animals)
new mobType(get_turf(src))