rej file cleanup

This commit is contained in:
LetterJay
2017-04-25 01:15:04 -05:00
parent 81fadec9e4
commit 8088ce38cc
4 changed files with 0 additions and 44 deletions
@@ -1,18 +0,0 @@
diff a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm (rejected hunks)
@@ -156169,11 +156302,11 @@ cKF
cKF
aaa
aaa
-aaa
-aaa
-aaa
-btw
-aaa
+cKF
+cKF
+cKF
+cKF
+cKF
aaa
aaa
aaa
-1
View File
@@ -1 +0,0 @@
@@ -1,14 +0,0 @@
diff a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm (rejected hunks)
@@ -682,10 +682,10 @@
status += "numb"
if(status == "")
status = "OK"
- to_chat(src, " [status == "OK" ? "\blue" : "\red"] Your [LB.name] is [status].")
+ to_chat(src, "\t [status == "OK" ? "\blue" : "\red"] Your [LB.name] is [status].")
for(var/obj/item/I in LB.embedded_objects)
- to_chat(src, " <a href='byond://?src=\ref[src];embedded_object=\ref[I];embedded_limb=\ref[LB]' class='warning'>There is \a [I] embedded in your [LB.name]!</a>")
+ to_chat(src, "\t <a href='byond://?src=\ref[src];embedded_object=\ref[I];embedded_limb=\ref[LB]' class='warning'>There is \a [I] embedded in your [LB.name]!</a>")
for(var/t in missing)
to_chat(src, "<span class='boldannounce'>Your [parse_zone(t)] is missing!</span>")
-11
View File
@@ -1,11 +0,0 @@
diff a/tgstation.dme b/tgstation.dme (rejected hunks)
@@ -656,8 +656,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"