Merge pull request #195 from LetterJay/master

hawks, capras, and donation item

code/controllers/subsystem/events.dm

@@ -59,6 +59,17 @@ var/datum/subsystem/events/SSevent
 /datum/subsystem/events/proc/reschedule()
 	scheduled = world.time + rand(frequency_lower, max(frequency_lower,frequency_upper))
 
+	if(world.time > 108000) //2:45
+		frequency_lower=1000
+		frequency_upper=1500
+		//if ((!( ticker ) || emergency_shuttle.location))
+		//if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_CALL)
+		//	return
+		if(SSshuttle.emergency.mode < SHUTTLE_CALL)
+			SSshuttle.emergency.request(null, 1.5)
+			log_game("Round time limit reached. Shuttle has been auto-called.")
+			message_admins("Round time limit reached. Shuttle called.")
+
 //selects a random event based on whether it can occur and it's 'weight'(probability)
 /datum/subsystem/events/proc/spawnEvent()
 	if(!config.allow_random_events)

code/game/objects/items/weapons/storage/backpack.dm

@@ -273,6 +273,13 @@
 	level = 1
 	cant_hold = list(/obj/item/weapon/storage/backpack/satchel/flat) //muh recursive backpacks
 
+/obj/item/weapon/storage/backpack/satchel/duty
+	name = "duty satchel"
+	desc = "An extra trendy looking satchel."
+	icon_state = "satchel-duty"
+
+
+
 /obj/item/weapon/storage/backpack/satchel/flat/hide(var/intact)
 	if(intact)
 		invisibility = INVISIBILITY_MAXIMUM

code/modules/mob/living/carbon/human/species_types/furrypeople.dm

@@ -37,14 +37,29 @@ datum/species/canid
 /datum/species/ailurus
 	name = "Ailurus"
 	id = "ailurus"
-	default_color = "BCAC9B"
+	default_color = "4B4B4B"
 	species_traits = list(EYECOLOR,LIPS,HAIR)
 	mutant_bodyparts = list("mam_tail")
 	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "ailurus")
 	attack_verb = "claw"
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
-	roundstart = 1 //no sprites yet
+	roundstart = 1
+
+/datum/species/capra
+	name = "Capra"
+	id = "capra"
+	default_color = "4B4B4B"
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
+	mutant_bodyparts = list("mam_tail")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "capra")
+	attack_verb = "claw"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	roundstart = 1
+
+
+
 
 //AVIAN//
 /datum/species/avian
@@ -60,6 +75,18 @@ datum/species/canid
 	roundstart = 0 //no sprites yet
 	blacklisted = 1
 
+/datum/species/avian
+	name = "Hawk"
+	id = "hawk"
+	default_color = "BCAC9B"
+	species_traits = list(EYECOLOR,LIPS,HAIR)
+	mutant_bodyparts = list("mam_tail")
+	default_features = list("wings" = "hawk")
+	attack_verb = "peck"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	roundstart = 1
+
 //AQUATIC//
 /datum/species/shark
 	name = "Shark"

code/modules/mob/new_player/sprite_accessories.dm

@@ -1701,6 +1701,17 @@
 	name = "Ailurus"
 	icon_state = "ailurus"
 
+//Capra
+/datum/sprite_accessory/mam_tails/capra
+	name = "Capra"
+	icon_state = "capra"
+
+//Hawk
+/datum/sprite_accessory/mam_tails/hawk
+	name = "Hawk"
+	icon_state = "hawk"
+
+
 //Mammal Specific Body Markings
 /datum/sprite_accessory/mam_body_markings
 	color_src = MUTCOLORS2