From ec0cd3b973e6887f750f01bad4ad14392140486d Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Fri, 30 Dec 2011 16:43:41 +0000 Subject: [PATCH] Moved a batch of unchecked and a few unused files into the unused folder. Remember if your scrolling though the list and something is unchecked it should almost certainly be checked. Simple animals moved over to the actual mob code area and out of the defines. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2868 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/washing_machine.dm | 12 +++++----- code/game/structure/structure.dm | 0 .../mob/simple_animal/cat.dm | 0 .../mob/simple_animal/corgi.dm | 0 .../mob/simple_animal/crab.dm | 0 .../mob/simple_animal/life.dm | 0 .../mob/simple_animal/shade.dm | 0 .../AI_Visibility.dm | 0 .../virus2/Prob.dm => unused/Virus2Prob.dm} | 0 .../{modules/recycling => unused}/conveyor.dm | 0 .../Disease2 => unused/disease2}/analyser.dm | 0 .../Disease2 => unused/disease2}/base.dm | 0 .../disease2}/biohazard destroyer.dm | 0 .../disease2}/cureimplanter.dm | 0 .../Disease2 => unused/disease2}/curer.dm | 0 .../disease2}/diseasesplicer.dm | 0 .../disease2}/dishincubator.dm | 0 .../Disease2 => unused/disease2}/isolator.dm | 0 .../disease2}/monkeydispensor.dm | 0 .../chemical => unused}/full-beakers.dm | 0 code/{WorkInProgress => unused}/jobs.dm | 0 .../organs/implants.dm | 0 .../organs/organs.dm | 0 .../powerarmor}/powerarmor.dm | 0 .../powerarmor}/powerarmorcomponents.dm | 0 code/{modules/recycling => unused}/scrap.dm | 0 tgstation.dme | 23 ++++++++----------- 27 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 code/game/structure/structure.dm rename code/{defines => modules}/mob/simple_animal/cat.dm (100%) rename code/{defines => modules}/mob/simple_animal/corgi.dm (100%) rename code/{defines => modules}/mob/simple_animal/crab.dm (100%) rename code/{defines => modules}/mob/simple_animal/life.dm (100%) rename code/{defines => modules}/mob/simple_animal/shade.dm (100%) rename code/{WorkInProgress => unused}/AI_Visibility.dm (100%) rename code/{WorkInProgress/virus2/Prob.dm => unused/Virus2Prob.dm} (100%) rename code/{modules/recycling => unused}/conveyor.dm (100%) rename code/{WorkInProgress/virus2/Disease2 => unused/disease2}/analyser.dm (100%) rename code/{WorkInProgress/virus2/Disease2 => unused/disease2}/base.dm (100%) rename code/{WorkInProgress/virus2/Disease2 => unused/disease2}/biohazard destroyer.dm (100%) rename code/{WorkInProgress/virus2/Disease2 => unused/disease2}/cureimplanter.dm (100%) rename code/{WorkInProgress/virus2/Disease2 => unused/disease2}/curer.dm (100%) rename code/{WorkInProgress/virus2/Disease2 => unused/disease2}/diseasesplicer.dm (100%) rename code/{WorkInProgress/virus2/Disease2 => unused/disease2}/dishincubator.dm (100%) rename code/{WorkInProgress/virus2/Disease2 => unused/disease2}/isolator.dm (100%) rename code/{WorkInProgress/virus2/Disease2 => unused/disease2}/monkeydispensor.dm (100%) rename code/{modules/chemical => unused}/full-beakers.dm (100%) rename code/{WorkInProgress => unused}/jobs.dm (100%) rename code/{WorkInProgress => unused}/organs/implants.dm (100%) rename code/{WorkInProgress => unused}/organs/organs.dm (100%) rename code/{game/objects/items/clothing => unused/powerarmor}/powerarmor.dm (100%) rename code/{game/objects/items/clothing => unused/powerarmor}/powerarmorcomponents.dm (100%) rename code/{modules/recycling => unused}/scrap.dm (100%) diff --git a/code/game/objects/washing_machine.dm b/code/game/objects/washing_machine.dm index f4904427c19..327d2690e02 100644 --- a/code/game/objects/washing_machine.dm +++ b/code/game/objects/washing_machine.dm @@ -189,9 +189,9 @@ if ( istype(W,/obj/item/clothing/suit/syndicatefake ) ) user << "This item does not fit." return - if ( istype(W,/obj/item/clothing/suit/powered ) ) - user << "This item does not fit." - return +// if ( istype(W,/obj/item/clothing/suit/powered ) ) +// user << "This item does not fit." +// return if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) ) user << "This item does not fit." return @@ -213,9 +213,9 @@ if ( istype(W,/obj/item/clothing/head/syndicatefake ) ) user << "This item does not fit." return - if ( istype(W,/obj/item/clothing/head/powered ) ) - user << "This item does not fit." - return +// if ( istype(W,/obj/item/clothing/head/powered ) ) +// user << "This item does not fit." +// return if ( istype(W,/obj/item/clothing/head/helmet ) ) user << "This item does not fit." return diff --git a/code/game/structure/structure.dm b/code/game/structure/structure.dm deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/code/defines/mob/simple_animal/cat.dm b/code/modules/mob/simple_animal/cat.dm similarity index 100% rename from code/defines/mob/simple_animal/cat.dm rename to code/modules/mob/simple_animal/cat.dm diff --git a/code/defines/mob/simple_animal/corgi.dm b/code/modules/mob/simple_animal/corgi.dm similarity index 100% rename from code/defines/mob/simple_animal/corgi.dm rename to code/modules/mob/simple_animal/corgi.dm diff --git a/code/defines/mob/simple_animal/crab.dm b/code/modules/mob/simple_animal/crab.dm similarity index 100% rename from code/defines/mob/simple_animal/crab.dm rename to code/modules/mob/simple_animal/crab.dm diff --git a/code/defines/mob/simple_animal/life.dm b/code/modules/mob/simple_animal/life.dm similarity index 100% rename from code/defines/mob/simple_animal/life.dm rename to code/modules/mob/simple_animal/life.dm diff --git a/code/defines/mob/simple_animal/shade.dm b/code/modules/mob/simple_animal/shade.dm similarity index 100% rename from code/defines/mob/simple_animal/shade.dm rename to code/modules/mob/simple_animal/shade.dm diff --git a/code/WorkInProgress/AI_Visibility.dm b/code/unused/AI_Visibility.dm similarity index 100% rename from code/WorkInProgress/AI_Visibility.dm rename to code/unused/AI_Visibility.dm diff --git a/code/WorkInProgress/virus2/Prob.dm b/code/unused/Virus2Prob.dm similarity index 100% rename from code/WorkInProgress/virus2/Prob.dm rename to code/unused/Virus2Prob.dm diff --git a/code/modules/recycling/conveyor.dm b/code/unused/conveyor.dm similarity index 100% rename from code/modules/recycling/conveyor.dm rename to code/unused/conveyor.dm diff --git a/code/WorkInProgress/virus2/Disease2/analyser.dm b/code/unused/disease2/analyser.dm similarity index 100% rename from code/WorkInProgress/virus2/Disease2/analyser.dm rename to code/unused/disease2/analyser.dm diff --git a/code/WorkInProgress/virus2/Disease2/base.dm b/code/unused/disease2/base.dm similarity index 100% rename from code/WorkInProgress/virus2/Disease2/base.dm rename to code/unused/disease2/base.dm diff --git a/code/WorkInProgress/virus2/Disease2/biohazard destroyer.dm b/code/unused/disease2/biohazard destroyer.dm similarity index 100% rename from code/WorkInProgress/virus2/Disease2/biohazard destroyer.dm rename to code/unused/disease2/biohazard destroyer.dm diff --git a/code/WorkInProgress/virus2/Disease2/cureimplanter.dm b/code/unused/disease2/cureimplanter.dm similarity index 100% rename from code/WorkInProgress/virus2/Disease2/cureimplanter.dm rename to code/unused/disease2/cureimplanter.dm diff --git a/code/WorkInProgress/virus2/Disease2/curer.dm b/code/unused/disease2/curer.dm similarity index 100% rename from code/WorkInProgress/virus2/Disease2/curer.dm rename to code/unused/disease2/curer.dm diff --git a/code/WorkInProgress/virus2/Disease2/diseasesplicer.dm b/code/unused/disease2/diseasesplicer.dm similarity index 100% rename from code/WorkInProgress/virus2/Disease2/diseasesplicer.dm rename to code/unused/disease2/diseasesplicer.dm diff --git a/code/WorkInProgress/virus2/Disease2/dishincubator.dm b/code/unused/disease2/dishincubator.dm similarity index 100% rename from code/WorkInProgress/virus2/Disease2/dishincubator.dm rename to code/unused/disease2/dishincubator.dm diff --git a/code/WorkInProgress/virus2/Disease2/isolator.dm b/code/unused/disease2/isolator.dm similarity index 100% rename from code/WorkInProgress/virus2/Disease2/isolator.dm rename to code/unused/disease2/isolator.dm diff --git a/code/WorkInProgress/virus2/Disease2/monkeydispensor.dm b/code/unused/disease2/monkeydispensor.dm similarity index 100% rename from code/WorkInProgress/virus2/Disease2/monkeydispensor.dm rename to code/unused/disease2/monkeydispensor.dm diff --git a/code/modules/chemical/full-beakers.dm b/code/unused/full-beakers.dm similarity index 100% rename from code/modules/chemical/full-beakers.dm rename to code/unused/full-beakers.dm diff --git a/code/WorkInProgress/jobs.dm b/code/unused/jobs.dm similarity index 100% rename from code/WorkInProgress/jobs.dm rename to code/unused/jobs.dm diff --git a/code/WorkInProgress/organs/implants.dm b/code/unused/organs/implants.dm similarity index 100% rename from code/WorkInProgress/organs/implants.dm rename to code/unused/organs/implants.dm diff --git a/code/WorkInProgress/organs/organs.dm b/code/unused/organs/organs.dm similarity index 100% rename from code/WorkInProgress/organs/organs.dm rename to code/unused/organs/organs.dm diff --git a/code/game/objects/items/clothing/powerarmor.dm b/code/unused/powerarmor/powerarmor.dm similarity index 100% rename from code/game/objects/items/clothing/powerarmor.dm rename to code/unused/powerarmor/powerarmor.dm diff --git a/code/game/objects/items/clothing/powerarmorcomponents.dm b/code/unused/powerarmor/powerarmorcomponents.dm similarity index 100% rename from code/game/objects/items/clothing/powerarmorcomponents.dm rename to code/unused/powerarmor/powerarmorcomponents.dm diff --git a/code/modules/recycling/scrap.dm b/code/unused/scrap.dm similarity index 100% rename from code/modules/recycling/scrap.dm rename to code/unused/scrap.dm diff --git a/tgstation.dme b/tgstation.dme index 0baead61518..7d3562cd585 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -22,7 +22,6 @@ #define FILE_DIR "code/defines/mob/living" #define FILE_DIR "code/defines/mob/living/carbon" #define FILE_DIR "code/defines/mob/living/silicon" -#define FILE_DIR "code/defines/mob/simple_animal" #define FILE_DIR "code/defines/obj" #define FILE_DIR "code/defines/obj/clothing" #define FILE_DIR "code/defines/procs" @@ -70,7 +69,6 @@ #define FILE_DIR "code/game/objects/devices" #define FILE_DIR "code/game/objects/devices/PDA" #define FILE_DIR "code/game/objects/items" -#define FILE_DIR "code/game/objects/items/clothing" #define FILE_DIR "code/game/objects/items/weapons" #define FILE_DIR "code/game/objects/items/weapons/implants" #define FILE_DIR "code/game/objects/radio" @@ -78,7 +76,6 @@ #define FILE_DIR "code/game/objects/stacks" #define FILE_DIR "code/game/objects/storage" #define FILE_DIR "code/game/objects/tanks" -#define FILE_DIR "code/game/structure" #define FILE_DIR "code/game/verbs" #define FILE_DIR "code/js" #define FILE_DIR "code/modules" @@ -116,6 +113,7 @@ #define FILE_DIR "code/modules/mob/living/silicon/robot" #define FILE_DIR "code/modules/mob/new_player" #define FILE_DIR "code/modules/mob/organ" +#define FILE_DIR "code/modules/mob/simple_animal" #define FILE_DIR "code/modules/power" #define FILE_DIR "code/modules/power/antimatter" #define FILE_DIR "code/modules/power/singularity" @@ -132,17 +130,18 @@ #define FILE_DIR "code/unused" #define FILE_DIR "code/unused/beast" #define FILE_DIR "code/unused/computer2" +#define FILE_DIR "code/unused/disease2" #define FILE_DIR "code/unused/gamemodes" #define FILE_DIR "code/unused/hivebot" #define FILE_DIR "code/unused/mining" #define FILE_DIR "code/unused/optics" +#define FILE_DIR "code/unused/organs" #define FILE_DIR "code/unused/pda2" +#define FILE_DIR "code/unused/powerarmor" #define FILE_DIR "code/unused/spacecraft" #define FILE_DIR "code/WorkInProgress" #define FILE_DIR "code/WorkInProgress/mapload" -#define FILE_DIR "code/WorkInProgress/organs" #define FILE_DIR "code/WorkInProgress/virus2" -#define FILE_DIR "code/WorkInProgress/virus2/Disease2" #define FILE_DIR "html" #define FILE_DIR "icons" #define FILE_DIR "icons/48x48" @@ -284,11 +283,6 @@ #include "code\defines\mob\living\silicon\pai.dm" #include "code\defines\mob\living\silicon\robot.dm" #include "code\defines\mob\living\silicon\silicon.dm" -#include "code\defines\mob\simple_animal\cat.dm" -#include "code\defines\mob\simple_animal\corgi.dm" -#include "code\defines\mob\simple_animal\crab.dm" -#include "code\defines\mob\simple_animal\life.dm" -#include "code\defines\mob\simple_animal\shade.dm" #include "code\defines\obj\closet.dm" #include "code\defines\obj\clothing.dm" #include "code\defines\obj\computer.dm" @@ -630,8 +624,6 @@ #include "code\game\objects\items\shock_kit.dm" #include "code\game\objects\items\tk_grab.dm" #include "code\game\objects\items\trash.dm" -#include "code\game\objects\items\clothing\powerarmor.dm" -#include "code\game\objects\items\clothing\powerarmorcomponents.dm" #include "code\game\objects\items\weapons\AI_modules.dm" #include "code\game\objects\items\weapons\cameras.dm" #include "code\game\objects\items\weapons\cards_ids.dm" @@ -694,7 +686,6 @@ #include "code\game\objects\tanks\emergency.dm" #include "code\game\objects\tanks\jetpack.dm" #include "code\game\objects\tanks\oxygen.dm" -#include "code\game\structure\structure.dm" #include "code\game\verbs\AI_status.dm" #include "code\game\verbs\authorize.dm" #include "code\game\verbs\checkkarma.dm" @@ -742,6 +733,7 @@ #include "code\modules\assembly\timer.dm" #include "code\modules\chemical\Chemistry-Holder.dm" #include "code\modules\chemical\Chemistry-Machinery.dm" +#include "code\modules\chemical\Chemistry-Readme.dm" #include "code\modules\chemical\Chemistry-Reagents.dm" #include "code\modules\chemical\Chemistry-Recipes.dm" #include "code\modules\chemical\Chemistry-Tools.dm" @@ -912,6 +904,11 @@ #include "code\modules\mob\organ\organ.dm" #include "code\modules\mob\organ\organ_external.dm" #include "code\modules\mob\organ\organ_internal.dm" +#include "code\modules\mob\simple_animal\cat.dm" +#include "code\modules\mob\simple_animal\corgi.dm" +#include "code\modules\mob\simple_animal\crab.dm" +#include "code\modules\mob\simple_animal\life.dm" +#include "code\modules\mob\simple_animal\shade.dm" #include "code\modules\power\apc.dm" #include "code\modules\power\cable.dm" #include "code\modules\power\cell.dm"