rej cleanup

2017-05-02 04:56:46 -05:00
parent 7ab8ee8cae
commit 4a6ffec412
18 changed files with 0 additions and 297 deletions
@@ -1,9 +0,0 @@
-diff a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm	(rejected hunks)
-@@ -30,6 +30,7 @@
- 		loc = pick(newplayer_start)
- 	else
- 		loc = locate(1,1,1)
-+	return INITIALIZE_HINT_NORMAL
- 
- /mob/dead/new_player/proc/new_player_panel()
- 
@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm	(rejected hunks)
-@@ -106,7 +106,7 @@ Difficulty: Very Hard
- 	var/target
- 
- /obj/effect/overlay/temp/at_shield/Initialize(mapload, new_target)
-	..()
-+	. = ..()
- 	target = new_target
- 	INVOKE_ASYNC(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE)
- 
@@ -1,23 +0,0 @@
-diff a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm	(rejected hunks)
-@@ -96,8 +96,8 @@ Difficulty: Medium
- 	duration = 12
- 	pixel_z = 500
- 
-/obj/effect/overlay/temp/fireball/Initialize(loc)
-	..()
-+/obj/effect/overlay/temp/fireball/Initialize()
-+	. = ..()
- 	animate(src, pixel_z = 0, time = 12)
- 
- /obj/effect/overlay/temp/target
-@@ -121,8 +121,8 @@ Difficulty: Medium
- /obj/effect/overlay/temp/target/ex_act()
- 	return
- 
-/obj/effect/overlay/temp/target/Initialize(loc)
-	..()
-+/obj/effect/overlay/temp/target/Initialize()
-+	. = ..()
- 	INVOKE_ASYNC(src, .proc/fall)
- 
- /obj/effect/overlay/temp/target/proc/fall()