From b7b9a49204c6a6cf0590cd0b9419d1ec0ed32d3f Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 3 Feb 2015 10:35:42 +0100 Subject: [PATCH] Revert "dnm Another pass at WIP folder" --- baystation12.dme | 75 +++++++++--------- .../Cib/MedicalSideEffects.dm} | 0 .../Mini}/atmos_control.dm | 0 .../Ported}/policetape.dm | 0 .../WorkInProgress/Susan}/biocraps.dmi | Bin .../WorkInProgress/Susan}/desert.dmi | Bin .../Wrongnumber}/weldbackpack.dm | 0 .../weapons => WorkInProgress}/autopsy.dm | 0 .../verbs => WorkInProgress}/buildmode.dm | 0 .../computer3/NTOS.dm | 0 .../computer3/bios.dm | 0 .../computer3/buildandrepair.dm | 0 .../computer3/component.dm | 0 .../computer3/computer.dm | 0 .../computer3/computer3_notes.dm | 0 .../computer3/computers/HolodeckControl.dm | 0 .../computer3/computers/Operating.dm | 0 .../computer3/computers/arcade.dm | 0 .../computer3/computers/atmos_alert.dm | 0 .../computer3/computers/camera.dm | 0 .../computer3/computers/card.dm | 0 .../computer3/computers/communications.dm | 0 .../computer3/computers/crew.dm | 0 .../computer3/computers/customs.dm | 0 .../computer3/computers/law.dm | 0 .../computer3/computers/medical.dm | 0 .../computer3/computers/power.dm | 0 .../computer3/computers/prisoner.dm | 0 .../computer3/computers/robot.dm | 0 .../computer3/computers/security.dm | 0 .../computer3/computers/welcome.dm | 0 .../computer3/file.dm | 0 .../computer3/laptop.dm | 0 .../computer3/lapvend.dm | 0 .../computer3/networking.dm | 0 .../computer3/program.dm | 0 .../computer3/program_disks.dm | 0 .../computer3/server.dm | 0 .../computer3/storage.dm | 0 .../explosion_particles.dm | 0 .../{game => WorkInProgress}/periodic_news.dm | 0 41 files changed, 38 insertions(+), 37 deletions(-) rename code/{modules/mob/living/carbon/human/chem_side_effects.dm => WorkInProgress/Cib/MedicalSideEffects.dm} (100%) rename code/{game/machinery/computer => WorkInProgress/Mini}/atmos_control.dm (100%) rename code/{game/objects/items/weapons => WorkInProgress/Ported}/policetape.dm (100%) rename {icons/mob => code/WorkInProgress/Susan}/biocraps.dmi (100%) rename {icons/turf => code/WorkInProgress/Susan}/desert.dmi (100%) rename code/{game/objects/items/weapons => WorkInProgress/Wrongnumber}/weldbackpack.dm (100%) rename code/{game/objects/items/weapons => WorkInProgress}/autopsy.dm (100%) rename code/{modules/admin/verbs => WorkInProgress}/buildmode.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/NTOS.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/bios.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/buildandrepair.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/component.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computer.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computer3_notes.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/HolodeckControl.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/Operating.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/arcade.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/atmos_alert.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/camera.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/card.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/communications.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/crew.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/customs.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/law.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/medical.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/power.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/prisoner.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/robot.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/security.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/computers/welcome.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/file.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/laptop.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/lapvend.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/networking.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/program.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/program_disks.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/server.dm (100%) rename code/{game/machinery => WorkInProgress}/computer3/storage.dm (100%) rename code/{game/objects/effects => WorkInProgress}/explosion_particles.dm (100%) rename code/{game => WorkInProgress}/periodic_news.dm (100%) diff --git a/baystation12.dme b/baystation12.dme index 975f83fbca..04a5375f1f 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -194,7 +194,6 @@ #include "code\game\asteroid.dm" #include "code\game\atoms.dm" #include "code\game\atoms_movable.dm" -#include "code\game\periodic_news.dm" #include "code\game\response_team.dm" #include "code\game\shuttle_engines.dm" #include "code\game\skincmd.dm" @@ -373,7 +372,6 @@ #include "code\game\machinery\computer\aifixer.dm" #include "code\game\machinery\computer\arcade.dm" #include "code\game\machinery\computer\atmos_alert.dm" -#include "code\game\machinery\computer\atmos_control.dm" #include "code\game\machinery\computer\buildandrepair.dm" #include "code\game\machinery\computer\camera.dm" #include "code\game\machinery\computer\card.dm" @@ -400,36 +398,6 @@ #include "code\game\machinery\computer\station_alert.dm" #include "code\game\machinery\computer\supply.dm" #include "code\game\machinery\computer\syndicate_specops_shuttle.dm" -#include "code\game\machinery\computer3\bios.dm" -#include "code\game\machinery\computer3\buildandrepair.dm" -#include "code\game\machinery\computer3\component.dm" -#include "code\game\machinery\computer3\computer.dm" -#include "code\game\machinery\computer3\computer3_notes.dm" -#include "code\game\machinery\computer3\file.dm" -#include "code\game\machinery\computer3\laptop.dm" -#include "code\game\machinery\computer3\lapvend.dm" -#include "code\game\machinery\computer3\networking.dm" -#include "code\game\machinery\computer3\NTOS.dm" -#include "code\game\machinery\computer3\program.dm" -#include "code\game\machinery\computer3\program_disks.dm" -#include "code\game\machinery\computer3\server.dm" -#include "code\game\machinery\computer3\storage.dm" -#include "code\game\machinery\computer3\computers\arcade.dm" -#include "code\game\machinery\computer3\computers\atmos_alert.dm" -#include "code\game\machinery\computer3\computers\camera.dm" -#include "code\game\machinery\computer3\computers\card.dm" -#include "code\game\machinery\computer3\computers\communications.dm" -#include "code\game\machinery\computer3\computers\crew.dm" -#include "code\game\machinery\computer3\computers\customs.dm" -#include "code\game\machinery\computer3\computers\HolodeckControl.dm" -#include "code\game\machinery\computer3\computers\law.dm" -#include "code\game\machinery\computer3\computers\medical.dm" -#include "code\game\machinery\computer3\computers\Operating.dm" -#include "code\game\machinery\computer3\computers\power.dm" -#include "code\game\machinery\computer3\computers\prisoner.dm" -#include "code\game\machinery\computer3\computers\robot.dm" -#include "code\game\machinery\computer3\computers\security.dm" -#include "code\game\machinery\computer3\computers\welcome.dm" #include "code\game\machinery\doors\airlock.dm" #include "code\game\machinery\doors\airlock_control.dm" #include "code\game\machinery\doors\airlock_electronics.dm" @@ -500,7 +468,6 @@ #include "code\game\objects\effects\bump_teleporter.dm" #include "code\game\objects\effects\chemsmoke.dm" #include "code\game\objects\effects\effect_system.dm" -#include "code\game\objects\effects\explosion_particles.dm" #include "code\game\objects\effects\gibs.dm" #include "code\game\objects\effects\glowshroom.dm" #include "code\game\objects\effects\landmarks.dm" @@ -586,7 +553,6 @@ #include "code\game\objects\items\stacks\tiles\plasteel.dm" #include "code\game\objects\items\stacks\tiles\tile_types.dm" #include "code\game\objects\items\weapons\AI_modules.dm" -#include "code\game\objects\items\weapons\autopsy.dm" #include "code\game\objects\items\weapons\candle.dm" #include "code\game\objects\items\weapons\cards_ids.dm" #include "code\game\objects\items\weapons\cigs_lighters.dm" @@ -604,7 +570,6 @@ #include "code\game\objects\items\weapons\mop.dm" #include "code\game\objects\items\weapons\paint.dm" #include "code\game\objects\items\weapons\paiwire.dm" -#include "code\game\objects\items\weapons\policetape.dm" #include "code\game\objects\items\weapons\power_cells.dm" #include "code\game\objects\items\weapons\RCD.dm" #include "code\game\objects\items\weapons\RSF.dm" @@ -620,7 +585,6 @@ #include "code\game\objects\items\weapons\tools.dm" #include "code\game\objects\items\weapons\twohanded.dm" #include "code\game\objects\items\weapons\weaponry.dm" -#include "code\game\objects\items\weapons\weldbackpack.dm" #include "code\game\objects\items\weapons\wires.dm" #include "code\game\objects\items\weapons\circuitboards\broken.dm" #include "code\game\objects\items\weapons\circuitboards\circuitboard.dm" @@ -781,7 +745,6 @@ #include "code\modules\admin\verbs\adminsay.dm" #include "code\modules\admin\verbs\atmosdebug.dm" #include "code\modules\admin\verbs\BrokenInhands.dm" -#include "code\modules\admin\verbs\buildmode.dm" #include "code\modules\admin\verbs\check_customitem_activity.dm" #include "code\modules\admin\verbs\cinematic.dm" #include "code\modules\admin\verbs\custom_event.dm" @@ -1495,6 +1458,10 @@ #include "code\TriDimension\Structures.dm" #include "code\TriDimension\Structures_presets.dm" #include "code\TriDimension\Turfs.dm" +#include "code\WorkInProgress\autopsy.dm" +#include "code\WorkInProgress\buildmode.dm" +#include "code\WorkInProgress\explosion_particles.dm" +#include "code\WorkInProgress\periodic_news.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_animals.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_plants.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_tribe.dm" @@ -1518,8 +1485,42 @@ #include "code\WorkInProgress\Cael_Aislinn\Rust\virtual_particle_catcher.dm" #include "code\WorkInProgress\Cael_Aislinn\Supermatter\LaserComputer.dm" #include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm" +#include "code\WorkInProgress\Cib\MedicalSideEffects.dm" +#include "code\WorkInProgress\computer3\bios.dm" +#include "code\WorkInProgress\computer3\buildandrepair.dm" +#include "code\WorkInProgress\computer3\component.dm" +#include "code\WorkInProgress\computer3\computer.dm" +#include "code\WorkInProgress\computer3\computer3_notes.dm" +#include "code\WorkInProgress\computer3\file.dm" +#include "code\WorkInProgress\computer3\laptop.dm" +#include "code\WorkInProgress\computer3\lapvend.dm" +#include "code\WorkInProgress\computer3\networking.dm" +#include "code\WorkInProgress\computer3\NTOS.dm" +#include "code\WorkInProgress\computer3\program.dm" +#include "code\WorkInProgress\computer3\program_disks.dm" +#include "code\WorkInProgress\computer3\server.dm" +#include "code\WorkInProgress\computer3\storage.dm" +#include "code\WorkInProgress\computer3\computers\arcade.dm" +#include "code\WorkInProgress\computer3\computers\atmos_alert.dm" +#include "code\WorkInProgress\computer3\computers\camera.dm" +#include "code\WorkInProgress\computer3\computers\card.dm" +#include "code\WorkInProgress\computer3\computers\communications.dm" +#include "code\WorkInProgress\computer3\computers\crew.dm" +#include "code\WorkInProgress\computer3\computers\customs.dm" +#include "code\WorkInProgress\computer3\computers\HolodeckControl.dm" +#include "code\WorkInProgress\computer3\computers\law.dm" +#include "code\WorkInProgress\computer3\computers\medical.dm" +#include "code\WorkInProgress\computer3\computers\Operating.dm" +#include "code\WorkInProgress\computer3\computers\power.dm" +#include "code\WorkInProgress\computer3\computers\prisoner.dm" +#include "code\WorkInProgress\computer3\computers\robot.dm" +#include "code\WorkInProgress\computer3\computers\security.dm" +#include "code\WorkInProgress\computer3\computers\welcome.dm" +#include "code\WorkInProgress\Mini\atmos_control.dm" +#include "code\WorkInProgress\Ported\policetape.dm" #include "code\WorkInProgress\SkyMarshal\officer_stuff.dm" #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm" +#include "code\WorkInProgress\Wrongnumber\weldbackpack.dm" #include "code\ZAS\_docs.dm" #include "code\ZAS\_gas_mixture_xgm.dm" #include "code\ZAS\_xgm_gas_data.dm" diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/WorkInProgress/Cib/MedicalSideEffects.dm similarity index 100% rename from code/modules/mob/living/carbon/human/chem_side_effects.dm rename to code/WorkInProgress/Cib/MedicalSideEffects.dm diff --git a/code/game/machinery/computer/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm similarity index 100% rename from code/game/machinery/computer/atmos_control.dm rename to code/WorkInProgress/Mini/atmos_control.dm diff --git a/code/game/objects/items/weapons/policetape.dm b/code/WorkInProgress/Ported/policetape.dm similarity index 100% rename from code/game/objects/items/weapons/policetape.dm rename to code/WorkInProgress/Ported/policetape.dm diff --git a/icons/mob/biocraps.dmi b/code/WorkInProgress/Susan/biocraps.dmi similarity index 100% rename from icons/mob/biocraps.dmi rename to code/WorkInProgress/Susan/biocraps.dmi diff --git a/icons/turf/desert.dmi b/code/WorkInProgress/Susan/desert.dmi similarity index 100% rename from icons/turf/desert.dmi rename to code/WorkInProgress/Susan/desert.dmi diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/WorkInProgress/Wrongnumber/weldbackpack.dm similarity index 100% rename from code/game/objects/items/weapons/weldbackpack.dm rename to code/WorkInProgress/Wrongnumber/weldbackpack.dm diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/WorkInProgress/autopsy.dm similarity index 100% rename from code/game/objects/items/weapons/autopsy.dm rename to code/WorkInProgress/autopsy.dm diff --git a/code/modules/admin/verbs/buildmode.dm b/code/WorkInProgress/buildmode.dm similarity index 100% rename from code/modules/admin/verbs/buildmode.dm rename to code/WorkInProgress/buildmode.dm diff --git a/code/game/machinery/computer3/NTOS.dm b/code/WorkInProgress/computer3/NTOS.dm similarity index 100% rename from code/game/machinery/computer3/NTOS.dm rename to code/WorkInProgress/computer3/NTOS.dm diff --git a/code/game/machinery/computer3/bios.dm b/code/WorkInProgress/computer3/bios.dm similarity index 100% rename from code/game/machinery/computer3/bios.dm rename to code/WorkInProgress/computer3/bios.dm diff --git a/code/game/machinery/computer3/buildandrepair.dm b/code/WorkInProgress/computer3/buildandrepair.dm similarity index 100% rename from code/game/machinery/computer3/buildandrepair.dm rename to code/WorkInProgress/computer3/buildandrepair.dm diff --git a/code/game/machinery/computer3/component.dm b/code/WorkInProgress/computer3/component.dm similarity index 100% rename from code/game/machinery/computer3/component.dm rename to code/WorkInProgress/computer3/component.dm diff --git a/code/game/machinery/computer3/computer.dm b/code/WorkInProgress/computer3/computer.dm similarity index 100% rename from code/game/machinery/computer3/computer.dm rename to code/WorkInProgress/computer3/computer.dm diff --git a/code/game/machinery/computer3/computer3_notes.dm b/code/WorkInProgress/computer3/computer3_notes.dm similarity index 100% rename from code/game/machinery/computer3/computer3_notes.dm rename to code/WorkInProgress/computer3/computer3_notes.dm diff --git a/code/game/machinery/computer3/computers/HolodeckControl.dm b/code/WorkInProgress/computer3/computers/HolodeckControl.dm similarity index 100% rename from code/game/machinery/computer3/computers/HolodeckControl.dm rename to code/WorkInProgress/computer3/computers/HolodeckControl.dm diff --git a/code/game/machinery/computer3/computers/Operating.dm b/code/WorkInProgress/computer3/computers/Operating.dm similarity index 100% rename from code/game/machinery/computer3/computers/Operating.dm rename to code/WorkInProgress/computer3/computers/Operating.dm diff --git a/code/game/machinery/computer3/computers/arcade.dm b/code/WorkInProgress/computer3/computers/arcade.dm similarity index 100% rename from code/game/machinery/computer3/computers/arcade.dm rename to code/WorkInProgress/computer3/computers/arcade.dm diff --git a/code/game/machinery/computer3/computers/atmos_alert.dm b/code/WorkInProgress/computer3/computers/atmos_alert.dm similarity index 100% rename from code/game/machinery/computer3/computers/atmos_alert.dm rename to code/WorkInProgress/computer3/computers/atmos_alert.dm diff --git a/code/game/machinery/computer3/computers/camera.dm b/code/WorkInProgress/computer3/computers/camera.dm similarity index 100% rename from code/game/machinery/computer3/computers/camera.dm rename to code/WorkInProgress/computer3/computers/camera.dm diff --git a/code/game/machinery/computer3/computers/card.dm b/code/WorkInProgress/computer3/computers/card.dm similarity index 100% rename from code/game/machinery/computer3/computers/card.dm rename to code/WorkInProgress/computer3/computers/card.dm diff --git a/code/game/machinery/computer3/computers/communications.dm b/code/WorkInProgress/computer3/computers/communications.dm similarity index 100% rename from code/game/machinery/computer3/computers/communications.dm rename to code/WorkInProgress/computer3/computers/communications.dm diff --git a/code/game/machinery/computer3/computers/crew.dm b/code/WorkInProgress/computer3/computers/crew.dm similarity index 100% rename from code/game/machinery/computer3/computers/crew.dm rename to code/WorkInProgress/computer3/computers/crew.dm diff --git a/code/game/machinery/computer3/computers/customs.dm b/code/WorkInProgress/computer3/computers/customs.dm similarity index 100% rename from code/game/machinery/computer3/computers/customs.dm rename to code/WorkInProgress/computer3/computers/customs.dm diff --git a/code/game/machinery/computer3/computers/law.dm b/code/WorkInProgress/computer3/computers/law.dm similarity index 100% rename from code/game/machinery/computer3/computers/law.dm rename to code/WorkInProgress/computer3/computers/law.dm diff --git a/code/game/machinery/computer3/computers/medical.dm b/code/WorkInProgress/computer3/computers/medical.dm similarity index 100% rename from code/game/machinery/computer3/computers/medical.dm rename to code/WorkInProgress/computer3/computers/medical.dm diff --git a/code/game/machinery/computer3/computers/power.dm b/code/WorkInProgress/computer3/computers/power.dm similarity index 100% rename from code/game/machinery/computer3/computers/power.dm rename to code/WorkInProgress/computer3/computers/power.dm diff --git a/code/game/machinery/computer3/computers/prisoner.dm b/code/WorkInProgress/computer3/computers/prisoner.dm similarity index 100% rename from code/game/machinery/computer3/computers/prisoner.dm rename to code/WorkInProgress/computer3/computers/prisoner.dm diff --git a/code/game/machinery/computer3/computers/robot.dm b/code/WorkInProgress/computer3/computers/robot.dm similarity index 100% rename from code/game/machinery/computer3/computers/robot.dm rename to code/WorkInProgress/computer3/computers/robot.dm diff --git a/code/game/machinery/computer3/computers/security.dm b/code/WorkInProgress/computer3/computers/security.dm similarity index 100% rename from code/game/machinery/computer3/computers/security.dm rename to code/WorkInProgress/computer3/computers/security.dm diff --git a/code/game/machinery/computer3/computers/welcome.dm b/code/WorkInProgress/computer3/computers/welcome.dm similarity index 100% rename from code/game/machinery/computer3/computers/welcome.dm rename to code/WorkInProgress/computer3/computers/welcome.dm diff --git a/code/game/machinery/computer3/file.dm b/code/WorkInProgress/computer3/file.dm similarity index 100% rename from code/game/machinery/computer3/file.dm rename to code/WorkInProgress/computer3/file.dm diff --git a/code/game/machinery/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm similarity index 100% rename from code/game/machinery/computer3/laptop.dm rename to code/WorkInProgress/computer3/laptop.dm diff --git a/code/game/machinery/computer3/lapvend.dm b/code/WorkInProgress/computer3/lapvend.dm similarity index 100% rename from code/game/machinery/computer3/lapvend.dm rename to code/WorkInProgress/computer3/lapvend.dm diff --git a/code/game/machinery/computer3/networking.dm b/code/WorkInProgress/computer3/networking.dm similarity index 100% rename from code/game/machinery/computer3/networking.dm rename to code/WorkInProgress/computer3/networking.dm diff --git a/code/game/machinery/computer3/program.dm b/code/WorkInProgress/computer3/program.dm similarity index 100% rename from code/game/machinery/computer3/program.dm rename to code/WorkInProgress/computer3/program.dm diff --git a/code/game/machinery/computer3/program_disks.dm b/code/WorkInProgress/computer3/program_disks.dm similarity index 100% rename from code/game/machinery/computer3/program_disks.dm rename to code/WorkInProgress/computer3/program_disks.dm diff --git a/code/game/machinery/computer3/server.dm b/code/WorkInProgress/computer3/server.dm similarity index 100% rename from code/game/machinery/computer3/server.dm rename to code/WorkInProgress/computer3/server.dm diff --git a/code/game/machinery/computer3/storage.dm b/code/WorkInProgress/computer3/storage.dm similarity index 100% rename from code/game/machinery/computer3/storage.dm rename to code/WorkInProgress/computer3/storage.dm diff --git a/code/game/objects/effects/explosion_particles.dm b/code/WorkInProgress/explosion_particles.dm similarity index 100% rename from code/game/objects/effects/explosion_particles.dm rename to code/WorkInProgress/explosion_particles.dm diff --git a/code/game/periodic_news.dm b/code/WorkInProgress/periodic_news.dm similarity index 100% rename from code/game/periodic_news.dm rename to code/WorkInProgress/periodic_news.dm