cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Not So Simple Animals (#3103)

Browse Source 
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
This commit is contained in:
Arokha Sieyes
2017-03-22 15:30:07 -04:00
committed by Anewbe
parent e1554f323b
commit 9660186dfd
55 changed files with 4658 additions and 3851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@
/obj/structure/largecrate/animal/goat
name = "goat crate"
held_type = /mob/living/simple_animal/hostile/retaliate/goat
held_type = /mob/living/simple_animal/retaliate/goat
/obj/structure/largecrate/animal/cat
name = "cat carrier"