From 6f6f0cbb6222f3d20cd1aba9daa4fcebcaef4070 Mon Sep 17 00:00:00 2001
From: Putnam <putnam3145@gmail.com>
Date: Mon, 6 Jan 2020 23:33:29 -0800
Subject: [PATCH] Tweaks to ghost dojo

---
 _maps/map_files/generic/CentCom.dmm            | 18 +++++++++++++++---
 .../objects/structures/ghost_role_spawners.dm  |  3 ++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 6129d263fd..735d6c72e3 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -16736,6 +16736,10 @@
 	smooth = 1
 	},
 /area/centcom/holding)
+"Nf" = (
+/obj/machinery/autoylathe,
+/turf/open/indestructible/hotelwood,
+/area/centcom/holding)
 "Ni" = (
 /obj/structure/table/reinforced,
 /obj/item/clipboard,
@@ -18166,6 +18170,13 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding)
+"VL" = (
+/obj/machinery/button/crematorium{
+	id = crematoriumGhostDojo;
+	pixel_x = -25
+	},
+/turf/open/indestructible/hotelwood,
+/area/centcom/holding)
 "VO" = (
 /turf/closed/indestructible/riveted,
 /area/centcom/supplypod)
@@ -18248,7 +18259,8 @@
 /area/centcom/holding)
 "Ww" = (
 /obj/structure/bodycontainer/crematorium{
-	dir = 4
+	dir = 4;
+	id = crematoriumGhostDojo
 	},
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding)
@@ -43145,7 +43157,7 @@ CT
 oV
 CT
 Nd
-Sd
+VL
 Ww
 Sd
 Nd
@@ -45169,7 +45181,7 @@ aa
 aa
 aa
 Nd
-Sd
+Nf
 Sd
 Rh
 Mm
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 705ca9a884..418884435c 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -629,7 +629,8 @@
 		new_spawn.AddElement(/datum/element/ghost_role_eligibility)
 		ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
 		ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
-		to_chat(new_spawn,"<span class='boldwarning'>You maybe sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!</span>")
+		ADD_TRAIT(new_spawn,TRAIT_PACIFISM,GHOSTROLE_TRAIT)
+		to_chat(new_spawn,"<span class='boldwarning'>You may be sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!</span>")
 		to_chat(new_spawn,"<span class='boldwarning'>You can turn yourself into a ghost and freely reenter your body with the ghost action.</span>")
 		var/datum/action/ghost/G = new(new_spawn)
 		G.Grant(new_spawn)