Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

code/modules/awaymissions/mission_code/spacehotel.dm

@@ -92,7 +92,6 @@
 	icon = 'icons/obj/doors/Doorsand.dmi'
 	icon_state = "door_closed"
 	autoclose = 1
-	atom_say_verb = "beeps"
 	var/doorOpen = 'sound/machines/airlock.ogg'
 	var/doorClose = 'sound/machines/airlock.ogg'
 	var/doorDeni = 'sound/machines/DeniedBeep.ogg'

code/modules/awaymissions/mission_code/wildwest.dm

@@ -119,7 +119,7 @@
 				to_chat(user, "<B>Your wish is granted, but at a terrible cost...</B>")
 				to_chat(user, "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart.")
 				ticker.mode.traitors += user.mind
-				user.mind.special_role = "traitor"
+				user.mind.special_role = SPECIAL_ROLE_TRAITOR
 				var/datum/objective/hijack/hijack = new
 				hijack.owner = user.mind
 				user.mind.objectives += hijack