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

All hail glorious leader tigercat

code/modules/awaymissions/mission_code/spacehotel.dm

@@ -230,19 +230,15 @@
 // to check a person into a room; no financial stuff; returns the keycard
 /obj/effect/hotel_controller/proc/checkin(roomid, mob/living/carbon/occupant, obj/item/weapon/card/id/id)
 	if(!istype(occupant))
-		world << "no occupant"
 		return null
 	var/obj/machinery/door/unpowered/hotel_door/D = room_doors["[roomid]"]
 	if(!D || D.occupant || (occupant in guests))
-		world << "room occupied"
 		return null
 
 	D.account = get_card_account(id, occupant)
 	if(!D.account)
-		world << "no account"
 		return null
 	if(!D.account.charge(100, transaction_purpose = "10 minutes", dest_name = name))
-		world << "xaction failed"
 		return null
 
 	D.occupant = occupant

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -175,7 +175,7 @@ var/sc_safecode5 = "[rand(0,9)]"
 /obj/singularity/narsie/sc_Narsie/consume(var/atom/A)
 	if(is_type_in_list(A, uneatable))
 		return 0
-	if (istype(A,/mob/living))
+	if(istype(A,/mob/living))
 		var/mob/living/L = A
 		L.gib()
 	else if(istype(A,/obj/))

code/modules/awaymissions/mission_code/wildwest.dm

@@ -65,7 +65,7 @@
 	else if(is_special_character(user))
 		to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this.  Something instinctual makes you pull away.")
 
-	else if (!insistinga)
+	else if(!insistinga)
 		to_chat(user, "Your first touch makes the Wish Granter stir, listening to you.  Are you really sure you want to do this?")
 		insistinga++