ANIMAL FARM 2

_maps/map_files/TgStation/tgstation.2.1.3.dmm

@@ -19865,6 +19865,10 @@
 	pixel_y = 30
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/camera{
+	c_tag = "Hydroponics North";
+	dir = 2
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -58644,6 +58648,13 @@
 	},
 /turf/space,
 /area/space)
+"coT" = (
+/mob/living/simple_animal/cow{
+	gender = "female";
+	name = "Bessie"
+	},
+/turf/simulated/floor/plasteel,
+/area/hydroponics)
 "coU" = (
 /obj/structure/table,
 /obj/item/weapon/surgicaldrill,
@@ -58755,6 +58766,10 @@
 	icon_state = "shuttlefloor4"
 	},
 /area/shuttle/syndicate)
+"cpg" = (
+/obj/machinery/incubator,
+/turf/simulated/floor/plasteel,
+/area/hydroponics)
 "cph" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -64285,24 +64300,17 @@
 	},
 /area/crew_quarters/kitchen)
 "cAD" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/plating{
-	icon_state = "warnplate";
-	dir = 1
+/obj/machinery/nest,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
 	},
-/area/maintenance/disposal)
+/area/hydroponics)
 "cAE" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
+/obj/machinery/trough,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/medical/morgue)
+/area/hydroponics)
 "cAF" = (
 /turf/simulated/floor/plating,
 /area/maintenance/disposal)
@@ -64325,10 +64333,15 @@
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads)
 "cAH" = (
+/mob/living/simple_animal/chicken{
+	gender = "male";
+	name = "Dan"
+	},
 /turf/simulated/floor/plasteel{
-	icon_state = "dark"
+	dir = 1;
+	icon_state = "green"
 	},
-/area/medical/morgue)
+/area/hydroponics)
 "cAI" = (
 /obj/machinery/conveyor_switch/oneway{
 	convdir = -1;
@@ -64342,8 +64355,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/disposal)
 "cAK" = (
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint2)
+/mob/living/simple_animal/cow{
+	gender = "male";
+	name = "Ben"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "green"
+	},
+/area/hydroponics)
 "cAL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /mob/living/simple_animal/hostile/lizard{
@@ -64353,10 +64373,12 @@
 /turf/simulated/floor/plasteel,
 /area/janitor)
 "cAM" = (
-/turf/simulated/floor/plasteel{
-	icon_state = "floorgrime"
+/mob/living/simple_animal/chicken{
+	gender = "female";
+	name = "Danielle"
 	},
-/area/maintenance/aft)
+/turf/simulated/floor/plasteel,
+/area/hydroponics)
 "cAN" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Security Maintenance";
@@ -79019,7 +79041,7 @@ bgj
 bgj
 bjc
 cAF
-bkA
+cAF
 bja
 aaa
 aaa
@@ -79274,8 +79296,8 @@ beO
 beU
 bgl
 bhL
-cAD
-bkA
+bjc
+cAF
 blV
 beO
 aaa
@@ -84889,7 +84911,7 @@ aaa
 aaa
 aaa
 ali
-alX
+aKY
 ali
 asC
 apQ
@@ -85731,7 +85753,7 @@ bTv
 bCq
 bVC
 bWx
-cAM
+bWy
 bYv
 bZl
 bCq
@@ -90521,7 +90543,7 @@ aaD
 aat
 aat
 aat
-awN
+aat
 abA
 acd
 acd
@@ -91287,7 +91309,7 @@ aag
 aaf
 aaj
 aaq
-amB
+aay
 aaE
 aaJ
 aaN
@@ -94492,7 +94514,7 @@ cii
 cpB
 cqi
 cAP
-cqG
+cAP
 crv
 cqY
 cAl
@@ -102129,7 +102151,7 @@ aGL
 aHM
 aJm
 aKz
-cAA
+aKR
 aND
 aJC
 aPP
@@ -102908,7 +102930,7 @@ aRC
 aSK
 aVz
 aVz
-cAC
+aVz
 aYL
 aJI
 bbz
@@ -103415,7 +103437,7 @@ aIf
 aJA
 aKC
 aKC
-cAB
+aKC
 aON
 aQk
 aRD
@@ -103690,7 +103712,7 @@ bfL
 bhm
 bhm
 bhm
-cAH
+bhm
 bkP
 bmV
 boc
@@ -104717,7 +104739,7 @@ bcq
 bfL
 bhp
 biB
-cAE
+biB
 biB
 bkU
 bmX
@@ -104948,7 +104970,7 @@ anf
 anf
 alP
 arA
-blT
+anf
 alP
 atw
 alP
@@ -105472,9 +105494,9 @@ aIq
 aKK
 aMy
 aIp
-aOX
-aQm
-aRJ
+cAD
+cAH
+cAM
 aRJ
 aRJ
 aVK
@@ -105729,13 +105751,13 @@ aIp
 aKI
 aMt
 aIp
-aOW
+cAD
 aQm
 aRJ
+cpg
 aSS
 aUj
 aRJ
-aRJ
 aYQ
 cBg
 bam
@@ -105986,13 +106008,13 @@ aIp
 aKI
 aMA
 aIp
-aOX
+cAE
 aQm
 aRJ
+cpg
 aST
 aUk
 aRJ
-aRJ
 aYQ
 bam
 aYV
@@ -106226,7 +106248,7 @@ apz
 aqw
 arr
 asw
-cpA
+asw
 auE
 apC
 awG
@@ -106243,9 +106265,9 @@ aIp
 aKL
 aMz
 aNQ
-aOX
-aQm
-aRJ
+cAE
+cAK
+coT
 aRJ
 aRJ
 aRJ
@@ -106490,7 +106512,7 @@ awH
 auF
 alP
 aAr
-blT
+anf
 alP
 aaa
 aFq
@@ -111877,14 +111899,14 @@ aaf
 alP
 anf
 apE
-blT
+anf
 anf
 asB
 asB
 asB
 avL
 awR
-cAy
+auI
 azu
 aAz
 asB
@@ -114264,7 +114286,7 @@ bPN
 cbe
 cbY
 bQZ
-cAK
+btp
 ceS
 cae
 bky
@@ -116802,7 +116824,7 @@ aaf
 bky
 bky
 brI
-cAK
+btp
 btp
 bvR
 btp

code/__HELPERS/icons.dm

@@ -956,3 +956,12 @@ var/global/list/humanoid_icon_cache = list()
 	else
 		return humanoid_icon_cache[icon_id]
 
+//What the mob looks like during a DISCO INFERNO
+/proc/getOnFireIcon(icon/A, safety=1)
+	var/icon/flat_icon = safety ? A : new(A)
+	flat_icon.Blend(rgb(255,255,255))
+	flat_icon.BecomeAlphaMask()
+	var/icon/static_icon = new/icon('icons/effects/effects.dmi', "on_fire_overlay")
+	static_icon.AddAlphaMask(flat_icon)
+	return static_icon
+

code/__PATH_COMPATIBILITY/path_compatibility.dm

@@ -18,4 +18,29 @@
 	/obj/structure/bed/chair/janicart/secway
 		parent_type = /obj/vehicle/secway
 
-*/
+	parent_type = /obj/vehicle/atv*/
+//Animal Farm Botany Expansion - 2016
+/mob/living/simple_animal/chick
+	parent_type = /mob/living/simple_animal/farm/chick
+/mob/living/simple_animal/chicken
+	parent_type = /mob/living/simple_animal/farm/chicken
+/mob/living/simple_animal/hostile/retaliate/goat
+	parent_type = /mob/living/simple_animal/farm/goat
+/mob/living/simple_animal/chicken/rabbit
+	parent_type = /mob/living/simple_animal/farm/rabbit
+/mob/living/simple_animal/chicken/rabbit/space
+	parent_type = /mob/living/simple_animal/farm/rabbit/space
+/mob/living/simple_animal/hostile/carp
+	parent_type = /mob/living/simple_animal/farm/carp
+/mob/living/simple_animal/hostile/carp/megacarp
+	parent_type = /mob/living/simple_animal/farm/carp/megacarp
+/mob/living/simple_animal/hostile/carp/holocarp
+	parent_type = /mob/living/simple_animal/farm/carp/holocarp
+/mob/living/simple_animal/hostile/carp/ranged
+	parent_type = /mob/living/simple_animal/hostile/carp_ranged
+/mob/living/simple_animal/hostile/carp/ranged/chaos
+	parent_type = /mob/living/simple_animal/hostile/carp_ranged/chaos
+/mob/living/simple_animal/cow
+	parent_type = /mob/living/simple_animal/farm/cow
+/mob/living/simple_animal/hostile/carp/cayenne
+	parent_type = /mob/living/simple_animal/farm/carp/cayenne