diff --git a/code/modules/mob/living/carbon/alien/humanoid/death.dm b/code/modules/mob/living/carbon/alien/humanoid/death.dm index de242f455e2..01eb6e2f257 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/death.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/death.dm @@ -31,30 +31,4 @@ if (mind) mind.store_memory("Time of death: [tod]", 0) else src << "We seem to have misplaced your mind datum, so we can't add this to your memory, but you died at [tod]" - var/cancel - for (var/mob/M in world) - if (M.client && !M.stat) - cancel = 1 - break - - if (!cancel && !abandon_allowed) - spawn (50) - cancel = 0 - for (var/mob/M in world) - if (M.client && !M.stat) - cancel = 1 - break - - if (!cancel && !abandon_allowed) - world << "Everyone is dead! Resetting in 30 seconds!" - - feedback_set_details("end_error","no live players") - feedback_set_details("round_end","[time2text(world.realtime)]") - if(blackbox) - blackbox.save_all_data_to_sql() - - spawn (300) - log_game("Rebooting because of no live players") - world.Reboot() - return ..(gibbed) diff --git a/code/modules/mob/living/carbon/alien/larva/death.dm b/code/modules/mob/living/carbon/alien/larva/death.dm index 48b6e13c7a5..0242119ef56 100644 --- a/code/modules/mob/living/carbon/alien/larva/death.dm +++ b/code/modules/mob/living/carbon/alien/larva/death.dm @@ -34,30 +34,4 @@ var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch mind.store_memory("Time of death: [tod]", 0) - var/cancel - for (var/mob/M in world) - if (M.client && !M.stat) - cancel = 1 - break - - if (!cancel && !abandon_allowed) - spawn (50) - cancel = 0 - for (var/mob/M in world) - if (M.client && !M.stat) - cancel = 1 - break - - if (!cancel && !abandon_allowed) - world << "Everyone is dead! Resetting in 30 seconds!" - - feedback_set_details("end_error","no live players") - feedback_set_details("round_end","[time2text(world.realtime)]") - if(blackbox) - blackbox.save_all_data_to_sql() - - spawn (300) - log_game("Rebooting because of no live players") - world.Reboot() - return ..(gibbed) diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm index 6f34b926c6f..71581811e88 100644 --- a/code/modules/mob/living/carbon/brain/death.dm +++ b/code/modules/mob/living/carbon/brain/death.dm @@ -15,25 +15,8 @@ see_invisible = 2 var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch - var/cancel store_memory("Time of death: [tod]", 0) - for(var/mob/M in world) - if ((M.client && !( M.stat ))) - cancel = 1 - break - if (!( cancel )) - world << "Everyone is dead! Resetting in 30 seconds!" - - feedback_set_details("end_error","no live players") - feedback_set_details("round_end","[time2text(world.realtime)]") - if(blackbox) - blackbox.save_all_data_to_sql() - - spawn( 300 ) - log_game("Rebooting because of no live players") - world.Reboot() - return if (key) spawn(50) if(key && stat == 2) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index b788adaa653..2bdb087c462 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -47,32 +47,6 @@ message_admins("\red Traitor [key_name_admin(src)] has died.") log_game("Traitor [key_name(src)] has died.") - var/cancel - for (var/mob/M in world) - if (M.client && !M.stat) - cancel = 1 - break - - if (!cancel && !abandon_allowed) - spawn (50) - cancel = 0 - for (var/mob/M in world) - if (M.client && !M.stat) - cancel = 1 - break - - if (!cancel && !abandon_allowed) - world << "Everyone is dead! Resetting in 30 seconds!" - - feedback_set_details("end_error","no live players") - feedback_set_details("round_end","[time2text(world.realtime)]") - if(blackbox) - blackbox.save_all_data_to_sql() - - spawn (300) - log_game("Rebooting because of no live players") - world.Reboot() - return ..(gibbed) /mob/living/carbon/human/proc/ChangeToHusk() diff --git a/code/modules/mob/living/carbon/metroid/death.dm b/code/modules/mob/living/carbon/metroid/death.dm index 813929cb0d1..2356f425505 100644 --- a/code/modules/mob/living/carbon/metroid/death.dm +++ b/code/modules/mob/living/carbon/metroid/death.dm @@ -1,7 +1,7 @@ /mob/living/carbon/metroid/death(gibbed) if(src.stat == 2) return - var/cancel + if(!gibbed) if(istype(src, /mob/living/carbon/metroid/adult)) @@ -32,27 +32,8 @@ drop_item() src.hand = h - //var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch - //mind.store_memory("Time of death: [tod]", 0) - ticker.mode.check_win() - //src.icon_state = "dead" - for(var/mob/M in world) - if ((M.client && !( M.stat ))) - cancel = 1 - break - if (!( cancel )) - world << "Everyone is dead! Resetting in 30 seconds!" - feedback_set_details("end_error","no live players") - feedback_set_details("round_end","[time2text(world.realtime)]") - if(blackbox) - blackbox.save_all_data_to_sql() - - spawn( 300 ) - log_game("Rebooting because of no live players") - world.Reboot() - return if (src.key) spawn(50) if(src.key && src.stat == 2) diff --git a/code/modules/mob/living/carbon/monkey/death.dm b/code/modules/mob/living/carbon/monkey/death.dm index 0f984a3b4bd..a20b53d203c 100644 --- a/code/modules/mob/living/carbon/monkey/death.dm +++ b/code/modules/mob/living/carbon/monkey/death.dm @@ -1,7 +1,7 @@ /mob/living/carbon/monkey/death(gibbed) if(src.stat == 2) return - var/cancel + if (src.healths) src.healths.icon_state = "health5" if(!gibbed) @@ -21,27 +21,8 @@ drop_item() src.hand = h - //var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch - //mind.store_memory("Time of death: [tod]", 0) - ticker.mode.check_win() - //src.icon_state = "dead" - for(var/mob/M in world) - if ((M.client && !( M.stat ))) - cancel = 1 - break - if (!( cancel )) - world << "Everyone is dead! Resetting in 30 seconds!" - feedback_set_details("end_error","no live players") - feedback_set_details("round_end","[time2text(world.realtime)]") - if(blackbox) - blackbox.save_all_data_to_sql() - - spawn( 300 ) - log_game("Rebooting because of no live players") - world.Reboot() - return if (src.key) spawn(50) if(src.key && src.stat == 2) diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index 430bd76ef7a..ce640fc219f 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -1,5 +1,4 @@ /mob/living/silicon/ai/death(gibbed) - var/cancel stat = 2 canmove = 0 if(blind) @@ -49,24 +48,8 @@ loc.icon_state = "aicard-404" var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch - mind.store_memory("Time of death: [tod]", 0) + if(mind) mind.store_memory("Time of death: [tod]", 0) - for(var/mob/M in world) - if ((M.client && !( M.stat ))) - cancel = 1 - break - if (!( cancel )) - world << "Everyone is dead! Resetting in 30 seconds!" - - feedback_set_details("end_error","no live players") - feedback_set_details("round_end","[time2text(world.realtime)]") - if(blackbox) - blackbox.save_all_data_to_sql() - - spawn( 300 ) - log_game("Rebooting because of no live players") - world.Reboot() - return if (key) spawn(50) if(key && stat == 2) diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm index 33da7afd092..bbbe20ad14d 100644 --- a/code/modules/mob/living/silicon/pai/death.dm +++ b/code/modules/mob/living/silicon/pai/death.dm @@ -1,5 +1,4 @@ /mob/living/silicon/pai/death(gibbed) - var/cancel src.stat = 2 src.canmove = 0 if(src.blind) @@ -13,22 +12,6 @@ //var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch //mind.store_memory("Time of death: [tod]", 0) - for(var/mob/M in world) - if ((M.client && !( M.stat ))) - cancel = 1 - break - if (!( cancel )) - world << "Everyone is dead! Resetting in 30 seconds!" - - feedback_set_details("end_error","no live players") - feedback_set_details("round_end","[time2text(world.realtime)]") - if(blackbox) - blackbox.save_all_data_to_sql() - - spawn( 300 ) - log_game("Rebooting because of no live players") - world.Reboot() - return if(key) spawn(50) src.ghostize(1) diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index dec51853808..9a677ac60ab 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -1,5 +1,4 @@ /mob/living/silicon/robot/death(gibbed) - var/cancel if (!gibbed) src.emote("deathgasp") src.stat = 2 @@ -28,22 +27,6 @@ sql_report_cyborg_death(src) - for(var/mob/M in world) - if ((M.client && !( M.stat ))) - cancel = 1 - break - if (!( cancel )) - world << "Everyone is dead! Resetting in 30 seconds!" - - feedback_set_details("end_error","no live players") - feedback_set_details("round_end","[time2text(world.realtime)]") - if(blackbox) - blackbox.save_all_data_to_sql() - - spawn( 300 ) - log_game("Rebooting because of no live players") - world.Reboot() - return if (src.key) spawn(50) if(src.key && src.stat == 2) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 247f2f04e2a..5d0b42378ea 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -105,6 +105,25 @@ /mob/proc/death(gibbed) timeofdeath = world.time + + var/cancel = 0 + for(var/mob/M in world) + if(M.client && !M.stat) + cancel = 1 + break + if(!cancel) + world << "Everyone is dead! Resetting in 30 seconds!" + + feedback_set_details("end_error","no live players") + feedback_set_details("round_end","[time2text(world.realtime)]") + if(blackbox) + blackbox.save_all_data_to_sql() + + spawn(300) + log_game("Rebooting because of no live players") + world.Reboot() + return + return ..(gibbed) /mob/proc/restrained() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index e0f5acf4710..e5365fe3408 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -505,16 +505,14 @@ PN.merge_powernets(TPN) for(var/obj/machinery/power/apc/N in loc) - - if(!N) - continue + if(!N) continue var/obj/machinery/power/M M = N.terminal + if(!M) continue - if(M.netnum == 0) - if(netnum == 0) - continue + if(!M.netnum) + if(!netnum)continue var/datum/powernet/PN = powernets[netnum] PN.nodes += M M.netnum = netnum diff --git a/tgstation.dme b/tgstation.dme index 3ea03576212..cd78de76d62 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5,266 +5,6 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR ".svn" -#define FILE_DIR ".svn/pristine" -#define FILE_DIR ".svn/pristine/00" -#define FILE_DIR ".svn/pristine/01" -#define FILE_DIR ".svn/pristine/02" -#define FILE_DIR ".svn/pristine/03" -#define FILE_DIR ".svn/pristine/04" -#define FILE_DIR ".svn/pristine/05" -#define FILE_DIR ".svn/pristine/06" -#define FILE_DIR ".svn/pristine/07" -#define FILE_DIR ".svn/pristine/08" -#define FILE_DIR ".svn/pristine/09" -#define FILE_DIR ".svn/pristine/0a" -#define FILE_DIR ".svn/pristine/0b" -#define FILE_DIR ".svn/pristine/0c" -#define FILE_DIR ".svn/pristine/0d" -#define FILE_DIR ".svn/pristine/0e" -#define FILE_DIR ".svn/pristine/0f" -#define FILE_DIR ".svn/pristine/10" -#define FILE_DIR ".svn/pristine/11" -#define FILE_DIR ".svn/pristine/12" -#define FILE_DIR ".svn/pristine/13" -#define FILE_DIR ".svn/pristine/14" -#define FILE_DIR ".svn/pristine/15" -#define FILE_DIR ".svn/pristine/16" -#define FILE_DIR ".svn/pristine/17" -#define FILE_DIR ".svn/pristine/18" -#define FILE_DIR ".svn/pristine/19" -#define FILE_DIR ".svn/pristine/1a" -#define FILE_DIR ".svn/pristine/1b" -#define FILE_DIR ".svn/pristine/1c" -#define FILE_DIR ".svn/pristine/1d" -#define FILE_DIR ".svn/pristine/1e" -#define FILE_DIR ".svn/pristine/1f" -#define FILE_DIR ".svn/pristine/20" -#define FILE_DIR ".svn/pristine/21" -#define FILE_DIR ".svn/pristine/22" -#define FILE_DIR ".svn/pristine/23" -#define FILE_DIR ".svn/pristine/24" -#define FILE_DIR ".svn/pristine/25" -#define FILE_DIR ".svn/pristine/26" -#define FILE_DIR ".svn/pristine/27" -#define FILE_DIR ".svn/pristine/28" -#define FILE_DIR ".svn/pristine/29" -#define FILE_DIR ".svn/pristine/2a" -#define FILE_DIR ".svn/pristine/2b" -#define FILE_DIR ".svn/pristine/2c" -#define FILE_DIR ".svn/pristine/2d" -#define FILE_DIR ".svn/pristine/2e" -#define FILE_DIR ".svn/pristine/2f" -#define FILE_DIR ".svn/pristine/30" -#define FILE_DIR ".svn/pristine/31" -#define FILE_DIR ".svn/pristine/32" -#define FILE_DIR ".svn/pristine/33" -#define FILE_DIR ".svn/pristine/34" -#define FILE_DIR ".svn/pristine/35" -#define FILE_DIR ".svn/pristine/36" -#define FILE_DIR ".svn/pristine/37" -#define FILE_DIR ".svn/pristine/38" -#define FILE_DIR ".svn/pristine/39" -#define FILE_DIR ".svn/pristine/3a" -#define FILE_DIR ".svn/pristine/3b" -#define FILE_DIR ".svn/pristine/3c" -#define FILE_DIR ".svn/pristine/3d" -#define FILE_DIR ".svn/pristine/3e" -#define FILE_DIR ".svn/pristine/3f" -#define FILE_DIR ".svn/pristine/40" -#define FILE_DIR ".svn/pristine/41" -#define FILE_DIR ".svn/pristine/42" -#define FILE_DIR ".svn/pristine/43" -#define FILE_DIR ".svn/pristine/44" -#define FILE_DIR ".svn/pristine/45" -#define FILE_DIR ".svn/pristine/46" -#define FILE_DIR ".svn/pristine/47" -#define FILE_DIR ".svn/pristine/48" -#define FILE_DIR ".svn/pristine/49" -#define FILE_DIR ".svn/pristine/4a" -#define FILE_DIR ".svn/pristine/4b" -#define FILE_DIR ".svn/pristine/4c" -#define FILE_DIR ".svn/pristine/4d" -#define FILE_DIR ".svn/pristine/4e" -#define FILE_DIR ".svn/pristine/4f" -#define FILE_DIR ".svn/pristine/50" -#define FILE_DIR ".svn/pristine/51" -#define FILE_DIR ".svn/pristine/52" -#define FILE_DIR ".svn/pristine/53" -#define FILE_DIR ".svn/pristine/54" -#define FILE_DIR ".svn/pristine/55" -#define FILE_DIR ".svn/pristine/56" -#define FILE_DIR ".svn/pristine/57" -#define FILE_DIR ".svn/pristine/58" -#define FILE_DIR ".svn/pristine/59" -#define FILE_DIR ".svn/pristine/5a" -#define FILE_DIR ".svn/pristine/5b" -#define FILE_DIR ".svn/pristine/5c" -#define FILE_DIR ".svn/pristine/5d" -#define FILE_DIR ".svn/pristine/5e" -#define FILE_DIR ".svn/pristine/5f" -#define FILE_DIR ".svn/pristine/60" -#define FILE_DIR ".svn/pristine/61" -#define FILE_DIR ".svn/pristine/62" -#define FILE_DIR ".svn/pristine/63" -#define FILE_DIR ".svn/pristine/64" -#define FILE_DIR ".svn/pristine/65" -#define FILE_DIR ".svn/pristine/66" -#define FILE_DIR ".svn/pristine/67" -#define FILE_DIR ".svn/pristine/68" -#define FILE_DIR ".svn/pristine/69" -#define FILE_DIR ".svn/pristine/6a" -#define FILE_DIR ".svn/pristine/6b" -#define FILE_DIR ".svn/pristine/6c" -#define FILE_DIR ".svn/pristine/6d" -#define FILE_DIR ".svn/pristine/6e" -#define FILE_DIR ".svn/pristine/6f" -#define FILE_DIR ".svn/pristine/70" -#define FILE_DIR ".svn/pristine/71" -#define FILE_DIR ".svn/pristine/72" -#define FILE_DIR ".svn/pristine/73" -#define FILE_DIR ".svn/pristine/74" -#define FILE_DIR ".svn/pristine/75" -#define FILE_DIR ".svn/pristine/76" -#define FILE_DIR ".svn/pristine/77" -#define FILE_DIR ".svn/pristine/78" -#define FILE_DIR ".svn/pristine/79" -#define FILE_DIR ".svn/pristine/7a" -#define FILE_DIR ".svn/pristine/7b" -#define FILE_DIR ".svn/pristine/7c" -#define FILE_DIR ".svn/pristine/7d" -#define FILE_DIR ".svn/pristine/7e" -#define FILE_DIR ".svn/pristine/7f" -#define FILE_DIR ".svn/pristine/80" -#define FILE_DIR ".svn/pristine/81" -#define FILE_DIR ".svn/pristine/82" -#define FILE_DIR ".svn/pristine/83" -#define FILE_DIR ".svn/pristine/84" -#define FILE_DIR ".svn/pristine/85" -#define FILE_DIR ".svn/pristine/86" -#define FILE_DIR ".svn/pristine/87" -#define FILE_DIR ".svn/pristine/88" -#define FILE_DIR ".svn/pristine/89" -#define FILE_DIR ".svn/pristine/8a" -#define FILE_DIR ".svn/pristine/8b" -#define FILE_DIR ".svn/pristine/8c" -#define FILE_DIR ".svn/pristine/8d" -#define FILE_DIR ".svn/pristine/8e" -#define FILE_DIR ".svn/pristine/8f" -#define FILE_DIR ".svn/pristine/90" -#define FILE_DIR ".svn/pristine/91" -#define FILE_DIR ".svn/pristine/92" -#define FILE_DIR ".svn/pristine/93" -#define FILE_DIR ".svn/pristine/94" -#define FILE_DIR ".svn/pristine/95" -#define FILE_DIR ".svn/pristine/96" -#define FILE_DIR ".svn/pristine/97" -#define FILE_DIR ".svn/pristine/98" -#define FILE_DIR ".svn/pristine/99" -#define FILE_DIR ".svn/pristine/9a" -#define FILE_DIR ".svn/pristine/9b" -#define FILE_DIR ".svn/pristine/9c" -#define FILE_DIR ".svn/pristine/9d" -#define FILE_DIR ".svn/pristine/9e" -#define FILE_DIR ".svn/pristine/9f" -#define FILE_DIR ".svn/pristine/a0" -#define FILE_DIR ".svn/pristine/a1" -#define FILE_DIR ".svn/pristine/a2" -#define FILE_DIR ".svn/pristine/a3" -#define FILE_DIR ".svn/pristine/a4" -#define FILE_DIR ".svn/pristine/a5" -#define FILE_DIR ".svn/pristine/a6" -#define FILE_DIR ".svn/pristine/a7" -#define FILE_DIR ".svn/pristine/a8" -#define FILE_DIR ".svn/pristine/a9" -#define FILE_DIR ".svn/pristine/aa" -#define FILE_DIR ".svn/pristine/ab" -#define FILE_DIR ".svn/pristine/ac" -#define FILE_DIR ".svn/pristine/ad" -#define FILE_DIR ".svn/pristine/ae" -#define FILE_DIR ".svn/pristine/af" -#define FILE_DIR ".svn/pristine/b0" -#define FILE_DIR ".svn/pristine/b1" -#define FILE_DIR ".svn/pristine/b2" -#define FILE_DIR ".svn/pristine/b3" -#define FILE_DIR ".svn/pristine/b4" -#define FILE_DIR ".svn/pristine/b5" -#define FILE_DIR ".svn/pristine/b6" -#define FILE_DIR ".svn/pristine/b7" -#define FILE_DIR ".svn/pristine/b8" -#define FILE_DIR ".svn/pristine/b9" -#define FILE_DIR ".svn/pristine/ba" -#define FILE_DIR ".svn/pristine/bb" -#define FILE_DIR ".svn/pristine/bc" -#define FILE_DIR ".svn/pristine/bd" -#define FILE_DIR ".svn/pristine/be" -#define FILE_DIR ".svn/pristine/bf" -#define FILE_DIR ".svn/pristine/c0" -#define FILE_DIR ".svn/pristine/c1" -#define FILE_DIR ".svn/pristine/c2" -#define FILE_DIR ".svn/pristine/c3" -#define FILE_DIR ".svn/pristine/c4" -#define FILE_DIR ".svn/pristine/c5" -#define FILE_DIR ".svn/pristine/c6" -#define FILE_DIR ".svn/pristine/c7" -#define FILE_DIR ".svn/pristine/c8" -#define FILE_DIR ".svn/pristine/c9" -#define FILE_DIR ".svn/pristine/ca" -#define FILE_DIR ".svn/pristine/cb" -#define FILE_DIR ".svn/pristine/cc" -#define FILE_DIR ".svn/pristine/cd" -#define FILE_DIR ".svn/pristine/ce" -#define FILE_DIR ".svn/pristine/cf" -#define FILE_DIR ".svn/pristine/d0" -#define FILE_DIR ".svn/pristine/d1" -#define FILE_DIR ".svn/pristine/d2" -#define FILE_DIR ".svn/pristine/d3" -#define FILE_DIR ".svn/pristine/d4" -#define FILE_DIR ".svn/pristine/d5" -#define FILE_DIR ".svn/pristine/d6" -#define FILE_DIR ".svn/pristine/d7" -#define FILE_DIR ".svn/pristine/d8" -#define FILE_DIR ".svn/pristine/d9" -#define FILE_DIR ".svn/pristine/da" -#define FILE_DIR ".svn/pristine/db" -#define FILE_DIR ".svn/pristine/dc" -#define FILE_DIR ".svn/pristine/dd" -#define FILE_DIR ".svn/pristine/de" -#define FILE_DIR ".svn/pristine/df" -#define FILE_DIR ".svn/pristine/e0" -#define FILE_DIR ".svn/pristine/e1" -#define FILE_DIR ".svn/pristine/e2" -#define FILE_DIR ".svn/pristine/e3" -#define FILE_DIR ".svn/pristine/e4" -#define FILE_DIR ".svn/pristine/e5" -#define FILE_DIR ".svn/pristine/e6" -#define FILE_DIR ".svn/pristine/e7" -#define FILE_DIR ".svn/pristine/e8" -#define FILE_DIR ".svn/pristine/e9" -#define FILE_DIR ".svn/pristine/ea" -#define FILE_DIR ".svn/pristine/eb" -#define FILE_DIR ".svn/pristine/ec" -#define FILE_DIR ".svn/pristine/ed" -#define FILE_DIR ".svn/pristine/ee" -#define FILE_DIR ".svn/pristine/ef" -#define FILE_DIR ".svn/pristine/f0" -#define FILE_DIR ".svn/pristine/f1" -#define FILE_DIR ".svn/pristine/f2" -#define FILE_DIR ".svn/pristine/f3" -#define FILE_DIR ".svn/pristine/f4" -#define FILE_DIR ".svn/pristine/f5" -#define FILE_DIR ".svn/pristine/f6" -#define FILE_DIR ".svn/pristine/f7" -#define FILE_DIR ".svn/pristine/f8" -#define FILE_DIR ".svn/pristine/f9" -#define FILE_DIR ".svn/pristine/fa" -#define FILE_DIR ".svn/pristine/fb" -#define FILE_DIR ".svn/pristine/fc" -#define FILE_DIR ".svn/pristine/fd" -#define FILE_DIR ".svn/pristine/fe" -#define FILE_DIR ".svn/pristine/ff" -#define FILE_DIR "bot" -#define FILE_DIR "bot/Marakov" #define FILE_DIR "code" #define FILE_DIR "code/ATMOSPHERICS" #define FILE_DIR "code/ATMOSPHERICS/components" @@ -402,18 +142,6 @@ #define FILE_DIR "code/WorkInProgress/mapload" #define FILE_DIR "code/WorkInProgress/organs" #define FILE_DIR "code/WorkInProgress/virus2" -#define FILE_DIR "config" -#define FILE_DIR "config/names" -#define FILE_DIR "data" -#define FILE_DIR "data/logs" -#define FILE_DIR "data/logs/2011" -#define FILE_DIR "data/logs/2011/11-November" -#define FILE_DIR "data/logs/2011/12-December" -#define FILE_DIR "data/logs/2012" -#define FILE_DIR "data/logs/2012/01-January" -#define FILE_DIR "data/player_saves" -#define FILE_DIR "data/player_saves/t" -#define FILE_DIR "data/player_saves/t/trubblebass" #define FILE_DIR "html" #define FILE_DIR "icons" #define FILE_DIR "icons/48x48" @@ -428,16 +156,12 @@ #define FILE_DIR "icons/obj/machines" #define FILE_DIR "icons/obj/pipes" #define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/PSD files" #define FILE_DIR "icons/spideros_icons" #define FILE_DIR "icons/Testing" #define FILE_DIR "icons/turf" #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" -#define FILE_DIR "maps/backup/backup" -#define FILE_DIR "music" #define FILE_DIR "sound" #define FILE_DIR "sound/ambience" #define FILE_DIR "sound/announcer" @@ -450,7 +174,6 @@ #define FILE_DIR "sound/piano" #define FILE_DIR "sound/voice" #define FILE_DIR "sound/weapons" -#define FILE_DIR "SQL" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG