cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes old mecha mob path, goats werent animals for some reason.

Browse Source
This commit is contained in:
Neerti
2018-10-21 23:13:09 -04:00
parent 7bfad11a60
commit 56a65ee2bb
10 changed files with 467 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/technomancer/spells/summon/summon_creature.dm
View File

@@ -22,7 +22,7 @@
"Chick" = /mob/living/simple_mob/animal/passive/chick,
"Crab" = /mob/living/simple_mob/animal/passive/crab,
"Parrot" = /mob/living/simple_animal/parrot,
"Goat" = /mob/living/simple_mob/goat,
"Goat" = /mob/living/simple_mob/animal/goat,
"Cat" = /mob/living/simple_animal/cat,
"Kitten" = /mob/living/simple_animal/cat/kitten,
"Corgi" = /mob/living/simple_mob/animal/passive/dog/corgi,

5
code/game/objects/random/mob.dm
View File

@@ -28,7 +28,7 @@
prob(10);/mob/living/simple_mob/animal/passive/chicken,
prob(6);/mob/living/simple_mob/animal/passive/chick,
prob(10);/mob/living/simple_mob/animal/passive/cow,
prob(6);/mob/living/simple_mob/goat,
prob(6);/mob/living/simple_mob/animal/goat,
prob(10);/mob/living/simple_mob/animal/passive/penguin,
prob(10);/mob/living/simple_mob/animal/passive/mouse,
prob(10);/mob/living/simple_mob/animal/passive/yithian,
@@ -163,7 +163,8 @@
/obj/random/mob/robotic/item_to_spawn() //Hivebots have a total number of 'lots' equal to the lesser drone, at 60.
return pick(prob(60);/mob/living/simple_mob/mechanical/combat_drone/lesser,
prob(50);/mob/living/simple_mob/mechanical/combat_drone,
prob(15);/mob/living/simple_animal/hostile/mecha/malf_drone,
prob(15);/mob/living/simple_mob/mechanical/mecha/ripley,
prob(15);/mob/living/simple_mob/mechanical/mecha/odysseus,
prob(10);/mob/living/simple_mob/mechanical/hivebot,
prob(15);/mob/living/simple_mob/mechanical/hivebot/swarm,
prob(10);/mob/living/simple_mob/mechanical/hivebot/ranged_damage,

2
code/game/objects/structures/crates_lockers/largecrate.dm
View File

@@ -98,7 +98,7 @@
/obj/structure/largecrate/animal/goat
name = "goat crate"
starts_with = list(/mob/living/simple_mob/goat)
starts_with = list(/mob/living/simple_mob/animal/goat)
/obj/structure/largecrate/animal/cat
name = "cat carrier"

10
code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
View File

@@ -1,4 +1,4 @@
/mob/living/simple_mob/goat
/mob/living/simple_mob/animal/goat
name = "goat"
desc = "Not known for their pleasant disposition."
tt_desc = "E Oreamnos americanus"
@@ -27,12 +27,12 @@
var/datum/reagents/udder = null
/mob/living/simple_mob/goat/New()
/mob/living/simple_mob/animal/goat/New()
udder = new(50)
udder.my_atom = src
..()
/mob/living/simple_mob/goat/Life()
/mob/living/simple_mob/animal/goat/Life()
. = ..()
if(.)
if(stat == CONSCIOUS)
@@ -54,13 +54,13 @@
var/step = get_step_to(src, food, 0)
Move(step)
/mob/living/simple_mob/goat/Move()
/mob/living/simple_mob/animal/goat/Move()
..()
if(!stat)
for(var/obj/effect/plant/SV in loc)
SV.die_off(1)
/mob/living/simple_mob/goat/attackby(var/obj/item/O as obj, var/mob/user as mob)
/mob/living/simple_mob/animal/goat/attackby(var/obj/item/O as obj, var/mob/user as mob)
var/obj/item/weapon/reagent_containers/glass/G = O
if(stat == CONSCIOUS && istype(G) && G.is_open_container())
user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")

2
code/modules/mob/mob_helpers.dm
View File

@@ -542,7 +542,7 @@ proc/is_blind(A)
if(. == SAFE_PERP)
return SAFE_PERP
if(!istype(src, /mob/living/simple_mob/goat))
if(!istype(src, /mob/living/simple_mob/animal/goat))
if(hostile)
if(faction != "neutral") // Otherwise Runtime gets killed.
threatcount += 4

2
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -38,7 +38,7 @@
/obj/machinery/disease2/incubator,
/obj/machinery/disposal,
/mob/living/simple_mob/animal/passive/cow,
/mob/living/simple_mob/goat,
/mob/living/simple_mob/animal/goat,
/obj/machinery/computer/centrifuge,
/obj/machinery/sleeper,
/obj/machinery/smartfridge/,

2
code/modules/xenoarcheaology/artifacts/autocloner.dm
View File

@@ -37,7 +37,7 @@
/mob/living/simple_animal/parrot,
/mob/living/simple_mob/animal/passive/crab,
/mob/living/simple_mob/animal/passive/mouse,
/mob/living/simple_mob/goat)
/mob/living/simple_mob/animal/goat)
//todo: how the hell is the asteroid permanently powered?
/obj/machinery/auto_cloner/process()