From 8af3d0e2faa5113f8aeed645753aafd5aa76f578 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Mon, 16 Mar 2020 00:09:03 +0100
Subject: [PATCH] Fixing a little issue with the musician trait etcetera.

---
 code/datums/traits/good.dm                            | 4 ++--
 code/game/turfs/simulated/walls.dm                    | 3 ++-
 code/modules/mob/living/simple_animal/friendly/dog.dm | 2 +-
 tgstation.dme                                         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
index f6ac0e26af..23fd75f982 100644
--- a/code/datums/traits/good.dm
+++ b/code/datums/traits/good.dm
@@ -108,10 +108,10 @@
 	var/mob/living/carbon/human/H = quirk_holder
 	var/obj/item/choice_beacon/music/B = new(get_turf(H))
 	H.put_in_hands(B)
-	H.equip_to_slot(B, SLOT_IN_BACKPACK)
+	H.equip_to_slot_if_possible(B, SLOT_IN_BACKPACK)
 	var/obj/item/musicaltuner/musicaltuner = new(get_turf(H))
 	H.put_in_hands(musicaltuner)
-	H.equip_to_slot(musicaltuner, SLOT_IN_BACKPACK)
+	H.equip_to_slot_if_possible(musicaltuner, SLOT_IN_BACKPACK)
 	H.regenerate_icons()
 
 /datum/quirk/photographer
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index d26a6efb02..268e8e9109 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -70,7 +70,8 @@
 
 /turf/closed/wall/proc/break_wall()
 	new sheet_type(src, sheet_amount)
-	return new girder_type(src)
+	if(girder_type)
+		return new girder_type(src)
 
 /turf/closed/wall/proc/devastate_wall()
 	new sheet_type(src, sheet_amount)
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 46cdc755db..8837b7be34 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -447,7 +447,7 @@
 				sleep(3)
 				step_to(src,movement_target,1)
 
-				if(movement_target)		//Not redundant due to sleeps, Item can be gone in 6 decisecomds
+				if(movement_target?.loc)		//Not redundant due to sleeps, Item can be gone in 6 decisecomds
 					if (movement_target.loc.x < src.x)
 						setDir(WEST)
 					else if (movement_target.loc.x > src.x)
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"