From b453a25e145c273bdfb83430c89ac94f36edb773 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 15 Mar 2020 15:41:32 +0100
Subject: [PATCH] Something about banana pies, runtime errors and warnings.

---
 code/datums/beam.dm                           |   3 ++-
 code/game/machinery/magnet.dm                 |   4 ++--
 code/modules/admin/verbs/randomverbs.dm       |   6 +++---
 .../food_and_drinks/food/snacks_pie.dm        |   6 +++---
 icons/effects/creampie.dmi                    | Bin 2281 -> 2280 bytes
 tgstation.dme                                 |   2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index d97ee9a773..2622b6ae39 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -83,6 +83,7 @@
 	elements.Cut()
 
 /datum/beam/Destroy()
+	finished = TRUE
 	Reset()
 	target = null
 	origin = null
@@ -100,7 +101,7 @@
 	var/length = round(sqrt((DX)**2+(DY)**2)) //hypotenuse of the triangle formed by target and origin's displacement
 
 	for(N in 0 to length-1 step 32)//-1 as we want < not <=, but we want the speed of X in Y to Z and step X
-		if(QDELETED(src) || finished)
+		if(finished)
 			break
 		var/obj/effect/ebeam/X = new beam_type(origin_oldloc)
 		X.owner = src
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index 50edbe5891..c4494b822f 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -316,7 +316,7 @@
 			if("togglemoving")
 				moving = !moving
 				if(moving)
-					spawn() MagnetMove()
+					INVOKE_ASYNC(src, .proc/MagnetMove)
 
 
 	updateUsrDialog()
@@ -325,7 +325,7 @@
 	if(looping)
 		return
 
-	while(moving && rpath.len >= 1)
+	while(moving && length(rpath) >= 1)
 
 		if(stat & (BROKEN|NOPOWER))
 			break
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index b8b92b0a58..b8175326ec 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1315,15 +1315,15 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/creamy = new(get_turf(target))
 			creamy.splat(target)
 		if (ADMIN_PUNISHMENT_CUSTOM_PIE)
-			var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/A = new(get_turf(target))
+			var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/A = new()
 			if(!A.reagents)
-				var/amount = input(usr, "Specify the reagent size of [A]", "Set Reagent Size", 50) as num
+				var/amount = input(usr, "Specify the reagent size of [A]", "Set Reagent Size", 50) as num|null
 				if(amount)
 					A.create_reagents(amount)
 			if(A.reagents)
 				var/chosen_id = choose_reagent_id(usr)
 				if(chosen_id)
-					var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num
+					var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num|null
 					if(amount)
 						A.reagents.add_reagent(chosen_id, amount)
 						A.splat(target)
diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm
index b3ad6b5126..178f4e786b 100644
--- a/code/modules/food_and_drinks/food/snacks_pie.dm
+++ b/code/modules/food_and_drinks/food/snacks_pie.dm
@@ -44,8 +44,8 @@
 	if(ishuman(hit_atom))
 		var/mob/living/carbon/human/H = hit_atom
 		var/mutable_appearance/creamoverlay = mutable_appearance('icons/effects/creampie.dmi')
-		if(H.dna.species.limbs_id == "lizard")
-			creamoverlay.icon_state = "creampie_lizard"
+		if((dna.species.default_features["mam_snouts"] && dna.features["mam_snouts"] != "None") || (dna.species.default_features["snout"] && dna.features["snout"] != "None"))
+			creamoverlay.icon_state = "creampie_snout"
 		else
 			creamoverlay.icon_state = "creampie_human"
 		if(stunning)
@@ -53,7 +53,7 @@
 		H.adjust_blurriness(1)
 		H.visible_message("<span class='warning'>[H] is creamed by [src]!</span>", "<span class='userdanger'>You've been creamed by [src]!</span>")
 		playsound(H, "desceration", 50, TRUE)
-		if(!H.is_mouth_covered())	
+		if(!H.is_mouth_covered())
 			reagents.trans_to(H,15) //Cream pie combat
 		if(!H.creamed) // one layer at a time
 			H.add_overlay(creamoverlay)
diff --git a/icons/effects/creampie.dmi b/icons/effects/creampie.dmi
index 6caecf7d767c3f4880957c5790ed05a2b696faeb..d85131f47d3677c19118a93dbe6352dde626832f 100644
GIT binary patch
delta 240
zcmV<M01yA^5$F++Z2|0&ZWe!T0x=AR=j16OSP|+$hb}A#R56rSK;~jDX^DMuas}R=
zJ6J#hDcNl4`=md%Gd9ch_hxHWKO6mz5<Qbyn9u2lRwr+h>znyZD~G;u>E6Ty3Hx$X
z3qoi;?pzmuMp{`faj>;I2m~DJ>IEK&yOfUyra!#o^EFH3^YJqh2bN#f<ttX0Fdv79
zG}RNU9H-dwFxcvAGOH#p$CZHWzJFA~gt0CYkeV_fU}2<RpfbVXF<`-&I1n2<UtkQI
q-^C+hTj*E>`);Lglv*B>Ju73g-mY#x@Cwmx6`{^DBtx@f0fq-2>}@Il

delta 241
zcmV<N01p4?5$O?-Z2|3(ZWe!z0wEMdYxoMHtuc;TY-3}_Y%JDaFzj$0&;ce7)Lp-R
z8Mo0y6X@O}=Y$In#$vts-0npEwdEI3Fy4ukSWai0U5$!5HH$fC8m86pzX?%Bq;k{{
zr0os%`fQ~eai$D~!RG8h(qgEq7kFoGl2kr#y*uGIpKm<1CLjNS^VVQfuk#f}-XR~C
z4{53=mT4bD?}wYMJ|^>O@=8xDPJO3C<?k5KlnHQcnP5>E=_p;9pwU^x0zN&ea5e?T
rF!_DxfWFXCkm}t?-zW_|CVN)KVzaC7U+@p(Cl&7A03^q=VgZH+GNf~J

diff --git a/tgstation.dme b/tgstation.dme
index 06c841e021..8b04b3deac 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1498,6 +1498,7 @@
 #include "code\modules\antagonists\swarmer\swarmer.dm"
 #include "code\modules\antagonists\swarmer\swarmer_event.dm"
 #include "code\modules\antagonists\traitor\datum_traitor.dm"
+#include "code\modules\antagonists\traitor\syndicate_contract.dm"
 #include "code\modules\antagonists\traitor\classes\ai.dm"
 #include "code\modules\antagonists\traitor\classes\assassin.dm"
 #include "code\modules\antagonists\traitor\classes\freeform.dm"
@@ -1506,7 +1507,6 @@
 #include "code\modules\antagonists\traitor\classes\martyr.dm"
 #include "code\modules\antagonists\traitor\classes\subterfuge.dm"
 #include "code\modules\antagonists\traitor\classes\traitor_class.dm"
-#include "code\modules\antagonists\traitor\syndicate_contract.dm"
 #include "code\modules\antagonists\traitor\equipment\contractor.dm"
 #include "code\modules\antagonists\traitor\equipment\Malf_Modules.dm"
 #include "code\modules\antagonists\traitor\IAA\internal_affairs.dm"