Merge branch 'master' into master

modular_citadel/code/controllers/subsystem/shuttle.dm

@@ -1,6 +1,7 @@
-/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 3 hours has passed.
-	if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //3 hours
-		SSshuttle.emergency.request()
-		priority_announce("The shift has come to an end and the shuttle called.")
+/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 2 hours have passed.
+	if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //2 hours
+		SSshuttle.emergency.request(silent = TRUE)
+		priority_announce("The shift has come to an end and the shuttle called. [seclevel2num(get_security_level()) == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, 'sound/ai/shuttlecalled.ogg', "Priority")
 		log_game("Round time limit reached. Shuttle has been auto-called.")
 		message_admins("Round time limit reached. Shuttle called.")
+		emergencyNoRecall = TRUE

modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm

@@ -41,6 +41,10 @@
 	devourable = TRUE
 	digestable = TRUE
 
+/mob/living/simple_animal/kiwi
+	devourable = TRUE
+	digestable = TRUE
+
 //STATION PETS
 /mob/living/simple_animal/pet
 	devourable = TRUE
@@ -65,7 +69,6 @@
 /mob/living/simple_animal/sloth
 	devourable = TRUE
 	digestable = TRUE
-	feeding = TRUE
 
 /mob/living/simple_animal/parrot
 	devourable = TRUE
@@ -84,57 +87,48 @@
 /mob/living/simple_animal/hostile/lizard
 	devourable = TRUE
 	digestable = TRUE
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/alien
-	devourable = TRUE
-	digestable = TRUE
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/bear
-	devourable = TRUE
-	digestable = TRUE
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/poison/giant_spider
-	devourable = TRUE
-	digestable = TRUE
 	feeding = TRUE
 	vore_active = TRUE
+	isPredator = TRUE
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/retaliate/poison/snake
-	devourable = TRUE
-	digestable = TRUE
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/gorilla
-	devourable = TRUE
-	digestable = TRUE
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/asteroid/goliath
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
+	feeding = TRUE //for pet Goliaths I guess or something.
 	vore_active = TRUE
 	isPredator = TRUE
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/carp
-	devourable = TRUE
-	digestable = TRUE
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE