From 19f5455cee11bcf275ee8a0f2b922e0feebebaad Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 28 Aug 2022 18:59:23 -0400
Subject: [PATCH] powder that makes you say yes
---
code/modules/resleeving/autoresleever.dm | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/code/modules/resleeving/autoresleever.dm b/code/modules/resleeving/autoresleever.dm
index 24b54035b3..b902df6796 100644
--- a/code/modules/resleeving/autoresleever.dm
+++ b/code/modules/resleeving/autoresleever.dm
@@ -78,7 +78,6 @@
if(!is_alien_whitelisted(ghost, GLOB.all_species[ghost_client?.prefs?.species]) && !check_rights(R_ADMIN, 0)) // Prevents a ghost ghosting in on a slot and spawning via a resleever with race they're not whitelisted for, getting around normal join restrictions.
to_chat(ghost, "You are not whitelisted to spawn as this species!")
return
-<<<<<<< HEAD
// CHOMPedit start
var/datum/species/chosen_species
@@ -90,19 +89,6 @@
return
// CHOMPEdit End: Add checks for Whitelist + Resleeving
-=======
-
- /* // Comments out NO_SCAN restriction, as per headmin/maintainer request.
- var/datum/species/chosen_species
- if(ghost.client.prefs.species) // In case we somehow don't have a species set here.
- chosen_species = GLOB.all_species[ghost_client.prefs.species]
-
- if(chosen_species.flags && NO_SCAN) // Sanity. Prevents species like Xenochimera, Proteans, etc from rejoining the round via resleeve, as they should have their own methods of doing so already, as agreed to when you whitelist as them.
- to_chat(ghost, "This species cannot be resleeved!")
- return
- */
-
->>>>>>> 574adc02e0... Merge pull request #13541 from Heroman3003/customizable_key
//Name matching is ugly but mind doesn't persist to look at.
var/charjob
var/datum/data/record/record_found