Merge branch 'fuxes' into 'Bleeding-Edge'

Bugfixes

* Fixes corgi meat objective not working (Fixes #110)

* Fixes corgi meat recipes not working

* Fixes gibber runtimes (Fixes #104, Fixes #88)

* Fixes mobs not rotating properly on shuttles

See merge request !132

code/game/gamemodes/steal_items.dm

@@ -116,7 +116,7 @@
 
 /datum/theft_objective/traitor/corgi
 	name = "a piece of corgi meat"
-	typepath = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi
+	typepath = /obj/item/weapon/reagent_containers/food/snacks/meat/animal/corgi
 
 /datum/theft_objective/traitor/rd_jumpsuit
 	name = "the research director's jumpsuit"

code/game/machinery/kitchen/gibber.dm

@@ -245,7 +245,11 @@ obj/machinery/gibber/New()
 	var/sourcename = src.occupant.real_name
 	var/sourcejob = src.occupant.job
 	var/sourcenutriment = src.occupant.nutrition / 15
-	var/sourcetotalreagents = src.occupant.reagents.total_volume
+	var/sourcetotalreagents
+
+	if(src.occupant.reagents)
+		sourcetotalreagents = src.occupant.reagents.total_volume
+
 	var/totalslabs = src.occupant.size
 
 	var/obj/item/weapon/reagent_containers/food/snacks/meat/human/allmeat[totalslabs]
@@ -255,7 +259,10 @@ obj/machinery/gibber/New()
 		newmeat.subjectname = sourcename
 		newmeat.subjectjob = sourcejob
 		newmeat.reagents.add_reagent ("nutriment", sourcenutriment / totalslabs) // Thehehe. Fat guys go first
-		src.occupant.reagents.trans_to (newmeat, round (sourcetotalreagents / totalslabs, 1)) // Transfer all the reagents from the
+
+		if(src.occupant.reagents)
+			src.occupant.reagents.trans_to (newmeat, round (sourcetotalreagents / totalslabs, 1)) // Transfer all the reagents from the
+
 		allmeat[i] = newmeat
 
 	src.occupant.attack_log += "\[[time_stamp()]\] Was gibbed by <B>[key_name(user)]</B>" //One shall not simply gib a mob unnoticed!
@@ -299,7 +306,10 @@ obj/machinery/gibber/New()
 	var/sourcename = victim.real_name
 	var/sourcejob = victim.job
 	var/sourcenutriment = victim.nutrition / 15
-	var/sourcetotalreagents = victim.reagents.total_volume
+	var/sourcetotalreagents
+	if(victim.reagents)
+		sourcetotalreagents = victim.reagents.total_volume
+
 	var/totalslabs = victim.size
 
 	var/obj/item/weapon/reagent_containers/food/snacks/meat/allmeat[totalslabs]
@@ -318,7 +328,10 @@ obj/machinery/gibber/New()
 		if(newmeat==null)
 			return
 		newmeat.reagents.add_reagent ("nutriment", sourcenutriment / totalslabs) // Thehehe. Fat guys go first
-		victim.reagents.trans_to (newmeat, round (sourcetotalreagents / totalslabs, 1)) // Transfer all the reagents from the
+
+		if(victim.reagents)
+			victim.reagents.trans_to (newmeat, round (sourcetotalreagents / totalslabs, 1)) // Transfer all the reagents from the
+
 		allmeat[i] = newmeat
 
 	victim.attack_log += "\[[time_stamp()]\] Was auto-gibbed by <B>[src]</B>" //One shall not simply gib a mob unnoticed!
@@ -336,7 +349,7 @@ obj/machinery/gibber/New()
 		else
 			var/obj/effect/decal/cleanable/blood/gibs/O = getFromPool(/obj/effect/decal/cleanable/blood/gibs, Tx)
 			O.New(Tx,2)
-	del(victim)
+	qdel(victim)
 	spawn(src.gibtime)
 		playsound(get_turf(src), 'sound/effects/gib2.ogg', 50, 1)
 		operating = 0

code/modules/food/recipes_microwave.dm

@@ -817,8 +817,8 @@
 /datum/recipe/corgikabob
 	items = list(
 		/obj/item/stack/rods,
-		/obj/item/weapon/reagent_containers/food/snacks/meat/corgi,
-		/obj/item/weapon/reagent_containers/food/snacks/meat/corgi,
+		/obj/item/weapon/reagent_containers/food/snacks/meat/animal/corgi,
+		/obj/item/weapon/reagent_containers/food/snacks/meat/animal/corgi,
 		)
 	result = /obj/item/weapon/reagent_containers/food/snacks/corgikabob
 
@@ -1527,7 +1527,7 @@
 /datum/recipe/cornydog
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/grown/corn,
-		/obj/item/weapon/reagent_containers/food/snacks/meat/corgi,
+		/obj/item/weapon/reagent_containers/food/snacks/meat/animal/corgi,
 		/obj/item/stack/rods)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cornydog
 

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -441,11 +441,6 @@
 						else if(ishuman(movement_target.loc) )
 							if(prob(20))
 								emote("stares at [movement_target.loc]'s [movement_target] with a sad puppy-face")
-
-/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
-	name = "Corgi meat"
-	desc = "Tastes like the tears of the station. Gives off the faint aroma of a valid salad. Just like mom used to make. This revalation horrifies you greatly."
-
 //PC stuff-Sieve
 
 /mob/living/simple_animal/corgi/regenerate_icons()

code/modules/mob/mob.dm

@@ -1780,7 +1780,7 @@ mob/proc/walking()
 	return
 
 /mob/shuttle_rotate(angle)
-	src.dir = turn(src.dir, angle) //rotating pixel_x and pixel_y is bad
+	src.dir = turn(src.dir, -angle) //rotating pixel_x and pixel_y is bad
 
 /mob/can_shuttle_move()
 	return 1

code/modules/reagents/reagent_containers/food/snacks/meat.dm

@@ -15,7 +15,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/meat/animal/monkey
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/animal/corgi
-	desc = "Tastes like... well you know..."
+	desc = "Tastes like the tears of the station. Gives off the faint aroma of a valid salad. Just like mom used to make. This revelation horrifies you greatly."
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh
 	name = "synthetic meat"