removes rej files

2017-04-24 21:34:58 -05:00
parent 198fb4e343
commit de1d8188ae
4 changed files with 1 additions and 127 deletions
@@ -1,63 +0,0 @@
-diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm	(rejected hunks)
-@@ -93201,11 +93199,11 @@ cpy
- cDv
- cDD
- cqU
-cMF
-+cMD
- cEu
- cMI
-cMJ
-cML
-+cMI
-+cMD
- cFL
- cGf
- cGw
-@@ -93457,12 +93455,12 @@ chV
- cDq
- cqf
- cqD
-cME
-+cMD
- crs
- cEv
- cEv
- cFe
-cMM
-+cMD
- cFM
- czE
- cGx
-@@ -93975,7 +93973,7 @@ cqZ
- crt
- cMH
- cAm
-cMK
-+cMH
- cMN
- cFO
- csC
-@@ -94490,7 +94488,7 @@ crv
- cEy
- cEy
- cFh
-cMO
-+cMD
- cFQ
- czE
- cGx
-@@ -94743,11 +94741,11 @@ cDr
- cDw
- cDE
- cEa
-cMG
-+cMD
- cEz
- cEz
- cEz
-cMP
-+cMD
- cFR
- cGf
- cGz
@@ -1,21 +0,0 @@
-diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm	(rejected hunks)
-@@ -286,16 +294,9 @@ GLOBAL_LIST(external_rsc_urls)
- 			message_admins("New user: [key_name_admin(src)] is connecting here for the first time.")
- 			if (config.irc_first_connection_alert)
- 				send2irc_adminless_only("New-user", "[key_name(src)] is connecting for the first time!")
-
-		player_age = 0 // set it from -1 to 0 so the job selection code doesn't have a panic attack
-
-	else if (isnum(player_age) && player_age < config.notify_new_player_age)
-		message_admins("New user: [key_name_admin(src)] just connected with an age of [player_age] day[(player_age==1?"":"s")]")
-
-	if(!IsGuestKey(key) && SSdbcore.IsConnected())
-		findJoinDate()
-
-	sync_client_with_db(tdata)
-+	else if (isnum(cached_player_age) && cached_player_age < config.notify_new_player_age)
-+		message_admins("New user: [key_name_admin(src)] just connected with an age of [cached_player_age] day[(player_age==1?"":"s")]")
-+	
- 	get_message_output("watchlist entry", ckey)
- 	check_ip_intel()
- 
@@ -1,42 +0,0 @@
-diff a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm	(rejected hunks)
-@@ -272,25 +272,24 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
- 
- /mob/dead/observer/Move(NewLoc, direct)
- 	if(updatedir)
-		setDir(direct )//only update dir if we actually need it, so overlays won't spin on base sprites that don't have directions of their own
-+		setDir(direct)//only update dir if we actually need it, so overlays won't spin on base sprites that don't have directions of their own
-+	var/oldloc = loc
-+
- 	if(NewLoc)
- 		loc = NewLoc
-		for(var/obj/effect/step_trigger/S in NewLoc)
-			S.Crossed(src)
- 		update_parallax_contents()
-		return
-	loc = get_turf(src) //Get out of closets and such as a ghost
-	if((direct & NORTH) && y < world.maxy)
-		y++
-	else if((direct & SOUTH) && y > 1)
-		y--
-	if((direct & EAST) && x < world.maxx)
-		x++
-	else if((direct & WEST) && x > 1)
-		x--
-
-	for(var/obj/effect/step_trigger/S in locate(x, y, z))	//<-- this is dumb
-		S.Crossed(src)
-+	else
-+		loc = get_turf(src) //Get out of closets and such as a ghost
-+		if((direct & NORTH) && y < world.maxy)
-+			y++
-+		else if((direct & SOUTH) && y > 1)
-+			y--
-+		if((direct & EAST) && x < world.maxx)
-+			x++
-+		else if((direct & WEST) && x > 1)
-+			x--
-+
-+	Moved(oldloc, direct)
- 
- /mob/dead/observer/is_active()
- 	return 0
@@ -687,8 +687,8 @@
 #include "code\game\objects\effects\mines.dm"
 #include "code\game\objects\effects\misc.dm"
 #include "code\game\objects\effects\overlays.dm"
-#include "code\game\objects\effects\proximity.dm"
 #include "code\game\objects\effects\portals.dm"
+#include "code\game\objects\effects\proximity.dm"
 #include "code\game\objects\effects\spiders.dm"
 #include "code\game\objects\effects\step_triggers.dm"
 #include "code\game\objects\effects\wanted_poster.dm"