From 78bfdcb7631545dcb63daa22e561f3f660820070 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Tue, 30 Aug 2016 22:50:39 -0400
Subject: [PATCH] changes now conflicts later

---
 code/game/gamemodes/cult/cult_items.dm |   3 +-
 interface/stylesheet.dm                | 130 -------------------------
 2 files changed, 1 insertion(+), 132 deletions(-)
 delete mode 100644 interface/stylesheet.dm

diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 06caf38ca4f..a3843e3184a 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -291,7 +291,6 @@
 		return
 
 	var/outer_tele_radius = 9
-	var/inner_tele_radius = 0
 
 	var/mob/living/carbon/C = user
 	var/turf/mobloc = get_turf(C)
@@ -301,7 +300,7 @@
 			continue
 		if(get_dir(C, T) != C.dir)
 			continue
-		if(T in range(user, inner_tele_radius))
+		if(T == mobloc)
 			continue
 		if(istype(T, /turf/space))
 			continue
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
deleted file mode 100644
index cc40f375048..00000000000
--- a/interface/stylesheet.dm
+++ /dev/null
@@ -1,130 +0,0 @@
-client/script = {"<style>
-body					{font-family: Verdana, sans-serif;}
-
-h1, h2, h3, h4, h5, h6	{color: #0000ff;	font-family: Georgia, Verdana, sans-serif;}
-
-em						{font-style: normal;	font-weight: bold;}
-
-.motd					{color: #638500;	font-family: Verdana, sans-serif;}
-.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6
-	{color: #638500;	text-decoration: underline;}
-.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover
-	{color: #638500;}
-
-.italics				{					font-style: italic;}
-
-.prefix					{					font-weight: bold;}
-
-.ooc					{					font-weight: bold;}
-.looc					{color: #6699CC;}
-.adminobserverooc		{color: #0099cc;	font-weight: bold;}
-.adminooc				{color: #b82e00;	font-weight: bold;}
-.mentorhelp				{color: #0077bb;	font-weight: bold;}
-.adminhelp				{color: #aa0000;	font-weight: bold;}
-
-.adminobserver			{color: #996600;	font-weight: bold;}
-.admin					{color: #386aff;	font-weight: bold;}
-
-.playerreply			{color: #8800bb;	font-weight: bold;}
-
-.name					{					font-weight: bold;}
-
-.say					{}
-.deadsay				{color: #5c00e6;}
-.radio					{color: #008000;}
-.deptradio				{color: #993399;}
-.comradio				{color: #193A7A;}
-.syndradio				{color: #6D3F40;}
-.centradio				{color: #5C5C8A;}
-.airadio				{color: #FF00FF;}
-.secradio				{color: #A30000;}
-.engradio				{color: #A66300;}
-.medradio				{color: #008160;}
-.sciradio				{color: #993399;}
-.supradio				{color: #5F4519;}
-.srvradio				{color: #6eaa2c;}
-.admin_channel			{color: #9A04D1;	font-weight: bold;}
-.mod_channel			{color: #402A14;	font-weight: bold;}
-.mod_channel_admin      {color: #402A14;	font-weight: bold;}
-
-.alert					{color: #ff0000;}
-h1.alert, h2.alert		{color: #000000;}
-
-.emote					{					font-style: italic;}
-.selecteddna			{color: #FFFFFF; 	background-color: #001B1B}
-
-.attack					{color: #ff0000;}
-.moderate				{color: #CC0000;}
-.disarm					{color: #990000;}
-.passive				{color: #660000;}
-
-.biggerdanger			{color: #ff0000;	font-weight: bold; font-size: 5;}
-.userdanger				{color: #ff0000;	font-weight: bold; font-size: 3;}
-.danger					{color: #ff0000;	font-weight: bold;}
-.warning				{color: #ff0000;	font-style: italic;}
-.announce 				{color: #228b22;	font-weight: bold;}
-.boldannounce			{color: #ff0000;	font-weight: bold;}
-.greenannounce			{color: #00ff00;	font-weight: bold;}
-.rose					{color: #ff5050;}
-.info					{color: #0000CC;}
-.notice					{color: #000099;}
-.boldnotice				{color: #000099;	font-weight: bold;}
-.suicide				{color: #ff5050;	font-style: italic;}
-
-.newscaster				{color: #800000;}
-.ghostalert				{color: #5c00e6;	font-style: italic; font-weight: bold;}
-
-.mod					{color: #735638;	font-weight: bold;}
-.modooc					{color: #184880;	font-weight: bold;}
-
-.alien					{color: #543354;}
-.noticealien			{color: #00c000;}
-.alertalien				{color: #00c000; font-weight: bold;}
-.tajaran				{color: #803B56;}
-.tajaran_signlang		{color: #941C1C;}
-.skrell					{color: #00CED1;}
-.soghun					{color: #145314;}
-.solcom					{color: #22228B;}
-.changeling				{color: #800080;}
-.vox					{color: #AA00AA;}
-.diona					{color: #007200;}
-.trinary				{color: #727272;}
-.kidan					{color: #664205;}
-.slime					{color: #0077AA;}
-.drask					{color: #a3d4eb; font-family: "Arial Black";}
-.clown					{color: #ff0000;}
-.shadowling				{color: #3b2769;}
-.vulpkanin				{color: #B97A57;}
-.abductor				{color: #800080;}
-.rough					{color: #7092BE; font-family: "Trebuchet MS", cursive, sans-serif;}
-.say_quote				{font-family: Georgia, Verdana, sans-serif;}
-.sans					{font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
-.grey					{font-family: "Wingdings", cursive, sans-serif;}
-.cultspeech				{color: #7F0000; font-style: italic;}
-.cult					{color: #960000;}
-.cultitalic				{color: #960000;	font-style: italic;}
-.cultlarge				{color: #960000; font-weight: bold; font-size: 3;}
-.narsie					{color: #960000; font-weight: bold; font-size: 15;}
-
-.say_quote				{font-family: Georgia, Verdana, sans-serif;}
-
-.interface				{color: #330033;}
-
-.big					{font-size: 3;}
-.reallybig				{font-size: 4;}
-.greentext				{color: #00FF00;	font-size: 3;}
-.redtext				{color: #FF0000;	font-size: 3;}
-
-.revennotice			{color: #1d2953;}
-.revenboldnotice		{color: #1d2953;	font-weight: bold;}
-.revenbignotice			{color: #1d2953;	font-weight: bold; font-size: 3;}
-.revenminor				{color: #823abb}
-.revenwarning			{color: #760fbb;	font-style: italic;}
-.revendanger			{color: #760fbb;	font-weight: bold; font-size: 3;}
-
-.memo					{color: #638500;	text-align: center;}
-.memoedit				{text-align: center;	font-size: 2;}
-
-BIG IMG.icon 			{width: 32px; height: 32px;}
-
-</style>"}