From 5968a3e6bb85b17057b22782001023532abd994d Mon Sep 17 00:00:00 2001 From: stephen001 Date: Fri, 23 May 2008 17:36:21 +0000 Subject: [PATCH] Added new trunk. --- {main-src/Code => Code}/!atoms.dm | 0 .../Machinery/Atmoalter/_atmoalter.dm | 0 .../Code => Code}/Machinery/Atmoalter/canister.dm | 0 .../Code => Code}/Machinery/Atmoalter/heater.dm | 0 .../Code => Code}/Machinery/Atmoalter/siphs.dm | 0 .../Code => Code}/Machinery/Computer/_computer.dm | 0 .../Code => Code}/Machinery/Computer/airtunnel.dm | 0 .../Code => Code}/Machinery/Computer/atmosphere.dm | 0 {main-src/Code => Code}/Machinery/Computer/card.dm | 0 .../Machinery/Computer/communications.dm | 0 {main-src/Code => Code}/Machinery/Computer/data.dm | 0 .../Code => Code}/Machinery/Computer/engine.dm | 0 .../Code => Code}/Machinery/Computer/hologram.dm | 0 .../Code => Code}/Machinery/Computer/med_data.dm | 0 {main-src/Code => Code}/Machinery/Computer/pod.dm | 0 .../Machinery/Computer/prision_shuttle.dm | 0 .../Machinery/Computer/secure_data.dm | 0 .../Code => Code}/Machinery/Computer/shuttle.dm | 0 .../Code => Code}/Machinery/Computer/sleeper.dm | 0 {main-src/Code => Code}/Machinery/Door/_door.dm | 0 {main-src/Code => Code}/Machinery/Door/airlock.dm | 0 .../Code => Code}/Machinery/Door/false_wall.dm | 0 {main-src/Code => Code}/Machinery/Door/firedoor.dm | 0 {main-src/Code => Code}/Machinery/Door/poddoor.dm | 0 {main-src/Code => Code}/Machinery/Door/window.dm | 0 {main-src/Code => Code}/Machinery/Power/_power.dm | 0 {main-src/Code => Code}/Machinery/Power/apc.dm | 0 .../Code => Code}/Machinery/Power/generator.dm | 0 {main-src/Code => Code}/Machinery/Power/monitor.dm | 0 {main-src/Code => Code}/Machinery/Power/smes.dm | 0 {main-src/Code => Code}/Machinery/Power/solar.dm | 0 .../Code => Code}/Machinery/Power/solar_control.dm | 0 .../Code => Code}/Machinery/Power/terminal.dm | 0 {main-src/Code => Code}/Machinery/Power/turbine.dm | 0 {main-src/Code => Code}/Machinery/_machinery.dm | 0 {main-src/Code => Code}/Machinery/_pipe_misc.dm | 0 {main-src/Code => Code}/Machinery/alarm.dm | 0 {main-src/Code => Code}/Machinery/at_indicator.dm | 0 {main-src/Code => Code}/Machinery/autolathe.dm | 0 {main-src/Code => Code}/Machinery/camera.dm | 0 {main-src/Code => Code}/Machinery/cell_charger.dm | 0 {main-src/Code => Code}/Machinery/circulator.dm | 0 {main-src/Code => Code}/Machinery/connector.dm | 0 {main-src/Code => Code}/Machinery/cryocell.dm | 0 {main-src/Code => Code}/Machinery/dispenser.dm | 0 {main-src/Code => Code}/Machinery/door_control.dm | 0 {main-src/Code => Code}/Machinery/firealarm.dm | 0 {main-src/Code => Code}/Machinery/freezer.dm | 0 {main-src/Code => Code}/Machinery/gas_sensor.dm | 0 {main-src/Code => Code}/Machinery/igniter.dm | 0 {main-src/Code => Code}/Machinery/injector.dm | 0 {main-src/Code => Code}/Machinery/inlet.dm | 0 {main-src/Code => Code}/Machinery/junction.dm | 0 {main-src/Code => Code}/Machinery/light_switch.dm | 0 {main-src/Code => Code}/Machinery/manifold.dm | 0 {main-src/Code => Code}/Machinery/meter.dm | 0 {main-src/Code => Code}/Machinery/nuclearbomb.dm | 0 {main-src/Code => Code}/Machinery/pipeline.dm | 0 {main-src/Code => Code}/Machinery/pipes.dm | 0 {main-src/Code => Code}/Machinery/pod.dm | 0 {main-src/Code => Code}/Machinery/recharger.dm | 0 {main-src/Code => Code}/Machinery/recon.dm | 0 {main-src/Code => Code}/Machinery/sec_lock.dm | 0 {main-src/Code => Code}/Machinery/shuttle.dm | 0 {main-src/Code => Code}/Machinery/sleeper.dm | 0 {main-src/Code => Code}/Machinery/valve.dm | 0 {main-src/Code => Code}/Machinery/vent.dm | 0 {main-src/Code => Code}/Test.dm | 0 {main-src/Code => Code}/TextHandling.dm | 0 {main-src/Code => Code}/_debug.dm | 0 {main-src/Code => Code}/aaaDefines.dm | 0 {main-src/Code => Code}/airtunnel.dm | 0 {main-src/Code => Code}/areas.dm | 0 {main-src/Code => Code}/blob.dm | 0 {main-src/Code => Code}/cell_process.dm | 0 {main-src/Code => Code}/cellautomata.dm | 0 {main-src/Code => Code}/chemical.dm | 0 {main-src/Code => Code}/colour2html.dm | 0 {main-src/Code => Code}/computer.dm | 0 {main-src/Code => Code}/cryo.dm | 0 {main-src/Code => Code}/datumvars.dm | 0 {main-src/Code => Code}/demo.dm | 0 {main-src/Code => Code}/dna.dm | 0 {main-src/Code => Code}/engine.dm | 0 {main-src/Code => Code}/globals.dm | 0 {main-src/Code => Code}/h_sandbox.dm | 0 {main-src/Code => Code}/hexadecimal.dm | 0 {main-src/Code => Code}/instructions.dm | 0 {main-src/Code => Code}/inverthtml.dm | 0 {main-src/Code => Code}/items.dm | 0 {main-src/Code => Code}/mob.dm | 0 {main-src/Code => Code}/modules.dm | 0 {main-src/Code => Code}/newitems.dm | 0 {main-src/Code => Code}/newobjects.dm | 0 {main-src/Code => Code}/overview.dm | 0 {main-src/Code => Code}/power.dm | 0 {main-src/Code => Code}/shuttle.dm | 0 {main-src/Code => Code}/ss13_algorithm2.dm | 0 {main-src/Code => Code}/sun.dm | 0 {main-src/Code => Code}/vote.dm | 0 {main-src/Code => Code}/weap_sat.dm | 0 {main-src/Code => Code}/weapons.dm | 13 ++++--------- {main-src/Icons => Icons}/Cryogenic2.dmi | Bin {main-src/Icons => Icons}/Door1.dmi | Bin {main-src/Icons => Icons}/Doorf.dmi | Bin {main-src/Icons => Icons}/Icons.dmi | Bin {main-src/Icons => Icons}/aircontrol.dmi | Bin {main-src/Icons => Icons}/airtunnel.dmi | Bin {main-src/Icons => Icons}/airtunnelcomputer.dmi | Bin {main-src/Icons => Icons}/alert.dmi | Bin {main-src/Icons => Icons}/alphacolors.dmi | Bin {main-src/Icons => Icons}/ammo.dmi | Bin {main-src/Icons => Icons}/assemblies.dmi | Bin {main-src/Icons => Icons}/b_items.dmi | Bin {main-src/Icons => Icons}/belt.dmi | Bin {main-src/Icons => Icons}/blob.dmi | Bin {main-src/Icons => Icons}/canister.dmi | Bin {main-src/Icons => Icons}/dam_human.dmi | Bin {main-src/Icons => Icons}/dam_mask.dmi | Bin {main-src/Icons => Icons}/dam_zones.dmi | Bin {main-src/Icons => Icons}/doors.dmi | Bin {main-src/Icons => Icons}/engine.dmi | Bin {main-src/Icons => Icons}/enginecomputer.dmi | Bin {main-src/Icons => Icons}/escapepod.dmi | Bin {main-src/Icons => Icons}/generator.dmi | Bin {main-src/Icons => Icons}/ghost.dmi | Bin {main-src/Icons => Icons}/heat_pipe.dmi | Bin {main-src/Icons => Icons}/help.htm | 0 {main-src/Icons => Icons}/hi_pipe.dmi | Bin {main-src/Icons => Icons}/human.dmi | Bin {main-src/Icons => Icons}/imap.dmi | Bin {main-src/Icons => Icons}/items.dmi | Bin {main-src/Icons => Icons}/junct-pipe.dmi | Bin {main-src/Icons => Icons}/l_items.dmi | Bin {main-src/Icons => Icons}/lighting.dmi | Bin {main-src/Icons => Icons}/mark.dmi | Bin {main-src/Icons => Icons}/meteor.dmi | Bin {main-src/Icons => Icons}/mob.dmi | Bin {main-src/Icons => Icons}/module.dmi | Bin {main-src/Icons => Icons}/monkey.dmi | Bin {main-src/Icons => Icons}/pipe-item.dmi | Bin {main-src/Icons => Icons}/pipes.dmi | Bin {main-src/Icons => Icons}/plasma.dmi | Bin {main-src/Icons => Icons}/power.dmi | Bin {main-src/Icons => Icons}/power_cond.dmi | Bin {main-src/Icons => Icons}/r_items.dmi | Bin {main-src/Icons => Icons}/reg_pipe.dmi | Bin {main-src/Icons => Icons}/screen.dmi | Bin {main-src/Icons => Icons}/screen1.dmi | Bin {main-src/Icons => Icons}/security.dmi | Bin {main-src/Icons => Icons}/shards.dmi | Bin {main-src/Icons => Icons}/shuttle.dmi | Bin {main-src/Icons => Icons}/ss13mapd.png | Bin {main-src/Icons => Icons}/stationobjs.dmi | Bin {main-src/Icons => Icons}/table.dmi | Bin {main-src/Icons => Icons}/turfs.dmi | Bin {main-src/Icons => Icons}/turfs2.dmi | Bin {main-src/Icons => Icons}/uniforms.dmi | Bin {main-src/Icons => Icons}/wall.dmi | Bin {main-src/Icons => Icons}/water.dmi | Bin {main-src/Icons => Icons}/weap_sat.dmi | Bin {main-src/Icons => Icons}/windoor.dmi | Bin {main-src/Icons => Icons}/wire.dmi | Bin {main-src/Icons => Icons}/zone_sel.dmi | Bin {main-src/Interface => Interface}/skin.dmf | 0 main-src/_changes.dm => _changes.dm | 0 main-src/_design.dm => _design.dm | 0 main-src/config.txt => config.txt | 0 main-src/main.dmp => main.dmp | 0 main-src/spacestation13.dme => spacestation13.dme | 0 main-src/ss13h.dmp => ss13h.dmp | 0 .../changes-40.93.4 to 40.93.2H9.5.txt | 0 172 files changed, 4 insertions(+), 9 deletions(-) rename {main-src/Code => Code}/!atoms.dm (100%) rename {main-src/Code => Code}/Machinery/Atmoalter/_atmoalter.dm (100%) rename {main-src/Code => Code}/Machinery/Atmoalter/canister.dm (100%) rename {main-src/Code => Code}/Machinery/Atmoalter/heater.dm (100%) rename {main-src/Code => Code}/Machinery/Atmoalter/siphs.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/_computer.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/airtunnel.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/atmosphere.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/card.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/communications.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/data.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/engine.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/hologram.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/med_data.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/pod.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/prision_shuttle.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/secure_data.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/shuttle.dm (100%) rename {main-src/Code => Code}/Machinery/Computer/sleeper.dm (100%) rename {main-src/Code => Code}/Machinery/Door/_door.dm (100%) rename {main-src/Code => Code}/Machinery/Door/airlock.dm (100%) rename {main-src/Code => Code}/Machinery/Door/false_wall.dm (100%) rename {main-src/Code => Code}/Machinery/Door/firedoor.dm (100%) rename {main-src/Code => Code}/Machinery/Door/poddoor.dm (100%) rename {main-src/Code => Code}/Machinery/Door/window.dm (100%) rename {main-src/Code => Code}/Machinery/Power/_power.dm (100%) rename {main-src/Code => Code}/Machinery/Power/apc.dm (100%) rename {main-src/Code => Code}/Machinery/Power/generator.dm (100%) rename {main-src/Code => Code}/Machinery/Power/monitor.dm (100%) rename {main-src/Code => Code}/Machinery/Power/smes.dm (100%) rename {main-src/Code => Code}/Machinery/Power/solar.dm (100%) rename {main-src/Code => Code}/Machinery/Power/solar_control.dm (100%) rename {main-src/Code => Code}/Machinery/Power/terminal.dm (100%) rename {main-src/Code => Code}/Machinery/Power/turbine.dm (100%) rename {main-src/Code => Code}/Machinery/_machinery.dm (100%) rename {main-src/Code => Code}/Machinery/_pipe_misc.dm (100%) rename {main-src/Code => Code}/Machinery/alarm.dm (100%) rename {main-src/Code => Code}/Machinery/at_indicator.dm (100%) rename {main-src/Code => Code}/Machinery/autolathe.dm (100%) rename {main-src/Code => Code}/Machinery/camera.dm (100%) rename {main-src/Code => Code}/Machinery/cell_charger.dm (100%) rename {main-src/Code => Code}/Machinery/circulator.dm (100%) rename {main-src/Code => Code}/Machinery/connector.dm (100%) rename {main-src/Code => Code}/Machinery/cryocell.dm (100%) rename {main-src/Code => Code}/Machinery/dispenser.dm (100%) rename {main-src/Code => Code}/Machinery/door_control.dm (100%) rename {main-src/Code => Code}/Machinery/firealarm.dm (100%) rename {main-src/Code => Code}/Machinery/freezer.dm (100%) rename {main-src/Code => Code}/Machinery/gas_sensor.dm (100%) rename {main-src/Code => Code}/Machinery/igniter.dm (100%) rename {main-src/Code => Code}/Machinery/injector.dm (100%) rename {main-src/Code => Code}/Machinery/inlet.dm (100%) rename {main-src/Code => Code}/Machinery/junction.dm (100%) rename {main-src/Code => Code}/Machinery/light_switch.dm (100%) rename {main-src/Code => Code}/Machinery/manifold.dm (100%) rename {main-src/Code => Code}/Machinery/meter.dm (100%) rename {main-src/Code => Code}/Machinery/nuclearbomb.dm (100%) rename {main-src/Code => Code}/Machinery/pipeline.dm (100%) rename {main-src/Code => Code}/Machinery/pipes.dm (100%) rename {main-src/Code => Code}/Machinery/pod.dm (100%) rename {main-src/Code => Code}/Machinery/recharger.dm (100%) rename {main-src/Code => Code}/Machinery/recon.dm (100%) rename {main-src/Code => Code}/Machinery/sec_lock.dm (100%) rename {main-src/Code => Code}/Machinery/shuttle.dm (100%) rename {main-src/Code => Code}/Machinery/sleeper.dm (100%) rename {main-src/Code => Code}/Machinery/valve.dm (100%) rename {main-src/Code => Code}/Machinery/vent.dm (100%) rename {main-src/Code => Code}/Test.dm (100%) rename {main-src/Code => Code}/TextHandling.dm (100%) rename {main-src/Code => Code}/_debug.dm (100%) rename {main-src/Code => Code}/aaaDefines.dm (100%) rename {main-src/Code => Code}/airtunnel.dm (100%) rename {main-src/Code => Code}/areas.dm (100%) rename {main-src/Code => Code}/blob.dm (100%) rename {main-src/Code => Code}/cell_process.dm (100%) rename {main-src/Code => Code}/cellautomata.dm (100%) rename {main-src/Code => Code}/chemical.dm (100%) rename {main-src/Code => Code}/colour2html.dm (100%) rename {main-src/Code => Code}/computer.dm (100%) rename {main-src/Code => Code}/cryo.dm (100%) rename {main-src/Code => Code}/datumvars.dm (100%) rename {main-src/Code => Code}/demo.dm (100%) rename {main-src/Code => Code}/dna.dm (100%) rename {main-src/Code => Code}/engine.dm (100%) rename {main-src/Code => Code}/globals.dm (100%) rename {main-src/Code => Code}/h_sandbox.dm (100%) rename {main-src/Code => Code}/hexadecimal.dm (100%) rename {main-src/Code => Code}/instructions.dm (100%) rename {main-src/Code => Code}/inverthtml.dm (100%) rename {main-src/Code => Code}/items.dm (100%) rename {main-src/Code => Code}/mob.dm (100%) rename {main-src/Code => Code}/modules.dm (100%) rename {main-src/Code => Code}/newitems.dm (100%) rename {main-src/Code => Code}/newobjects.dm (100%) rename {main-src/Code => Code}/overview.dm (100%) rename {main-src/Code => Code}/power.dm (100%) rename {main-src/Code => Code}/shuttle.dm (100%) rename {main-src/Code => Code}/ss13_algorithm2.dm (100%) rename {main-src/Code => Code}/sun.dm (100%) rename {main-src/Code => Code}/vote.dm (100%) rename {main-src/Code => Code}/weap_sat.dm (100%) rename {main-src/Code => Code}/weapons.dm (96%) rename {main-src/Icons => Icons}/Cryogenic2.dmi (100%) rename {main-src/Icons => Icons}/Door1.dmi (100%) rename {main-src/Icons => Icons}/Doorf.dmi (100%) rename {main-src/Icons => Icons}/Icons.dmi (100%) rename {main-src/Icons => Icons}/aircontrol.dmi (100%) rename {main-src/Icons => Icons}/airtunnel.dmi (100%) rename {main-src/Icons => Icons}/airtunnelcomputer.dmi (100%) rename {main-src/Icons => Icons}/alert.dmi (100%) rename {main-src/Icons => Icons}/alphacolors.dmi (100%) rename {main-src/Icons => Icons}/ammo.dmi (100%) rename {main-src/Icons => Icons}/assemblies.dmi (100%) rename {main-src/Icons => Icons}/b_items.dmi (100%) rename {main-src/Icons => Icons}/belt.dmi (100%) rename {main-src/Icons => Icons}/blob.dmi (100%) rename {main-src/Icons => Icons}/canister.dmi (100%) rename {main-src/Icons => Icons}/dam_human.dmi (100%) rename {main-src/Icons => Icons}/dam_mask.dmi (100%) rename {main-src/Icons => Icons}/dam_zones.dmi (100%) rename {main-src/Icons => Icons}/doors.dmi (100%) rename {main-src/Icons => Icons}/engine.dmi (100%) rename {main-src/Icons => Icons}/enginecomputer.dmi (100%) rename {main-src/Icons => Icons}/escapepod.dmi (100%) rename {main-src/Icons => Icons}/generator.dmi (100%) rename {main-src/Icons => Icons}/ghost.dmi (100%) rename {main-src/Icons => Icons}/heat_pipe.dmi (100%) rename {main-src/Icons => Icons}/help.htm (100%) rename {main-src/Icons => Icons}/hi_pipe.dmi (100%) rename {main-src/Icons => Icons}/human.dmi (100%) rename {main-src/Icons => Icons}/imap.dmi (100%) rename {main-src/Icons => Icons}/items.dmi (100%) rename {main-src/Icons => Icons}/junct-pipe.dmi (100%) rename {main-src/Icons => Icons}/l_items.dmi (100%) rename {main-src/Icons => Icons}/lighting.dmi (100%) rename {main-src/Icons => Icons}/mark.dmi (100%) rename {main-src/Icons => Icons}/meteor.dmi (100%) rename {main-src/Icons => Icons}/mob.dmi (100%) rename {main-src/Icons => Icons}/module.dmi (100%) rename {main-src/Icons => Icons}/monkey.dmi (100%) rename {main-src/Icons => Icons}/pipe-item.dmi (100%) rename {main-src/Icons => Icons}/pipes.dmi (100%) rename {main-src/Icons => Icons}/plasma.dmi (100%) rename {main-src/Icons => Icons}/power.dmi (100%) rename {main-src/Icons => Icons}/power_cond.dmi (100%) rename {main-src/Icons => Icons}/r_items.dmi (100%) rename {main-src/Icons => Icons}/reg_pipe.dmi (100%) rename {main-src/Icons => Icons}/screen.dmi (100%) rename {main-src/Icons => Icons}/screen1.dmi (100%) rename {main-src/Icons => Icons}/security.dmi (100%) rename {main-src/Icons => Icons}/shards.dmi (100%) rename {main-src/Icons => Icons}/shuttle.dmi (100%) rename {main-src/Icons => Icons}/ss13mapd.png (100%) rename {main-src/Icons => Icons}/stationobjs.dmi (100%) rename {main-src/Icons => Icons}/table.dmi (100%) rename {main-src/Icons => Icons}/turfs.dmi (100%) rename {main-src/Icons => Icons}/turfs2.dmi (100%) rename {main-src/Icons => Icons}/uniforms.dmi (100%) rename {main-src/Icons => Icons}/wall.dmi (100%) rename {main-src/Icons => Icons}/water.dmi (100%) rename {main-src/Icons => Icons}/weap_sat.dmi (100%) rename {main-src/Icons => Icons}/windoor.dmi (100%) rename {main-src/Icons => Icons}/wire.dmi (100%) rename {main-src/Icons => Icons}/zone_sel.dmi (100%) rename {main-src/Interface => Interface}/skin.dmf (100%) rename main-src/_changes.dm => _changes.dm (100%) rename main-src/_design.dm => _design.dm (100%) rename main-src/config.txt => config.txt (100%) rename main-src/main.dmp => main.dmp (100%) rename main-src/spacestation13.dme => spacestation13.dme (100%) rename main-src/ss13h.dmp => ss13h.dmp (100%) rename {main-src/supporting-docs => supporting-docs}/changes-40.93.4 to 40.93.2H9.5.txt (100%) diff --git a/main-src/Code/!atoms.dm b/Code/!atoms.dm similarity index 100% rename from main-src/Code/!atoms.dm rename to Code/!atoms.dm diff --git a/main-src/Code/Machinery/Atmoalter/_atmoalter.dm b/Code/Machinery/Atmoalter/_atmoalter.dm similarity index 100% rename from main-src/Code/Machinery/Atmoalter/_atmoalter.dm rename to Code/Machinery/Atmoalter/_atmoalter.dm diff --git a/main-src/Code/Machinery/Atmoalter/canister.dm b/Code/Machinery/Atmoalter/canister.dm similarity index 100% rename from main-src/Code/Machinery/Atmoalter/canister.dm rename to Code/Machinery/Atmoalter/canister.dm diff --git a/main-src/Code/Machinery/Atmoalter/heater.dm b/Code/Machinery/Atmoalter/heater.dm similarity index 100% rename from main-src/Code/Machinery/Atmoalter/heater.dm rename to Code/Machinery/Atmoalter/heater.dm diff --git a/main-src/Code/Machinery/Atmoalter/siphs.dm b/Code/Machinery/Atmoalter/siphs.dm similarity index 100% rename from main-src/Code/Machinery/Atmoalter/siphs.dm rename to Code/Machinery/Atmoalter/siphs.dm diff --git a/main-src/Code/Machinery/Computer/_computer.dm b/Code/Machinery/Computer/_computer.dm similarity index 100% rename from main-src/Code/Machinery/Computer/_computer.dm rename to Code/Machinery/Computer/_computer.dm diff --git a/main-src/Code/Machinery/Computer/airtunnel.dm b/Code/Machinery/Computer/airtunnel.dm similarity index 100% rename from main-src/Code/Machinery/Computer/airtunnel.dm rename to Code/Machinery/Computer/airtunnel.dm diff --git a/main-src/Code/Machinery/Computer/atmosphere.dm b/Code/Machinery/Computer/atmosphere.dm similarity index 100% rename from main-src/Code/Machinery/Computer/atmosphere.dm rename to Code/Machinery/Computer/atmosphere.dm diff --git a/main-src/Code/Machinery/Computer/card.dm b/Code/Machinery/Computer/card.dm similarity index 100% rename from main-src/Code/Machinery/Computer/card.dm rename to Code/Machinery/Computer/card.dm diff --git a/main-src/Code/Machinery/Computer/communications.dm b/Code/Machinery/Computer/communications.dm similarity index 100% rename from main-src/Code/Machinery/Computer/communications.dm rename to Code/Machinery/Computer/communications.dm diff --git a/main-src/Code/Machinery/Computer/data.dm b/Code/Machinery/Computer/data.dm similarity index 100% rename from main-src/Code/Machinery/Computer/data.dm rename to Code/Machinery/Computer/data.dm diff --git a/main-src/Code/Machinery/Computer/engine.dm b/Code/Machinery/Computer/engine.dm similarity index 100% rename from main-src/Code/Machinery/Computer/engine.dm rename to Code/Machinery/Computer/engine.dm diff --git a/main-src/Code/Machinery/Computer/hologram.dm b/Code/Machinery/Computer/hologram.dm similarity index 100% rename from main-src/Code/Machinery/Computer/hologram.dm rename to Code/Machinery/Computer/hologram.dm diff --git a/main-src/Code/Machinery/Computer/med_data.dm b/Code/Machinery/Computer/med_data.dm similarity index 100% rename from main-src/Code/Machinery/Computer/med_data.dm rename to Code/Machinery/Computer/med_data.dm diff --git a/main-src/Code/Machinery/Computer/pod.dm b/Code/Machinery/Computer/pod.dm similarity index 100% rename from main-src/Code/Machinery/Computer/pod.dm rename to Code/Machinery/Computer/pod.dm diff --git a/main-src/Code/Machinery/Computer/prision_shuttle.dm b/Code/Machinery/Computer/prision_shuttle.dm similarity index 100% rename from main-src/Code/Machinery/Computer/prision_shuttle.dm rename to Code/Machinery/Computer/prision_shuttle.dm diff --git a/main-src/Code/Machinery/Computer/secure_data.dm b/Code/Machinery/Computer/secure_data.dm similarity index 100% rename from main-src/Code/Machinery/Computer/secure_data.dm rename to Code/Machinery/Computer/secure_data.dm diff --git a/main-src/Code/Machinery/Computer/shuttle.dm b/Code/Machinery/Computer/shuttle.dm similarity index 100% rename from main-src/Code/Machinery/Computer/shuttle.dm rename to Code/Machinery/Computer/shuttle.dm diff --git a/main-src/Code/Machinery/Computer/sleeper.dm b/Code/Machinery/Computer/sleeper.dm similarity index 100% rename from main-src/Code/Machinery/Computer/sleeper.dm rename to Code/Machinery/Computer/sleeper.dm diff --git a/main-src/Code/Machinery/Door/_door.dm b/Code/Machinery/Door/_door.dm similarity index 100% rename from main-src/Code/Machinery/Door/_door.dm rename to Code/Machinery/Door/_door.dm diff --git a/main-src/Code/Machinery/Door/airlock.dm b/Code/Machinery/Door/airlock.dm similarity index 100% rename from main-src/Code/Machinery/Door/airlock.dm rename to Code/Machinery/Door/airlock.dm diff --git a/main-src/Code/Machinery/Door/false_wall.dm b/Code/Machinery/Door/false_wall.dm similarity index 100% rename from main-src/Code/Machinery/Door/false_wall.dm rename to Code/Machinery/Door/false_wall.dm diff --git a/main-src/Code/Machinery/Door/firedoor.dm b/Code/Machinery/Door/firedoor.dm similarity index 100% rename from main-src/Code/Machinery/Door/firedoor.dm rename to Code/Machinery/Door/firedoor.dm diff --git a/main-src/Code/Machinery/Door/poddoor.dm b/Code/Machinery/Door/poddoor.dm similarity index 100% rename from main-src/Code/Machinery/Door/poddoor.dm rename to Code/Machinery/Door/poddoor.dm diff --git a/main-src/Code/Machinery/Door/window.dm b/Code/Machinery/Door/window.dm similarity index 100% rename from main-src/Code/Machinery/Door/window.dm rename to Code/Machinery/Door/window.dm diff --git a/main-src/Code/Machinery/Power/_power.dm b/Code/Machinery/Power/_power.dm similarity index 100% rename from main-src/Code/Machinery/Power/_power.dm rename to Code/Machinery/Power/_power.dm diff --git a/main-src/Code/Machinery/Power/apc.dm b/Code/Machinery/Power/apc.dm similarity index 100% rename from main-src/Code/Machinery/Power/apc.dm rename to Code/Machinery/Power/apc.dm diff --git a/main-src/Code/Machinery/Power/generator.dm b/Code/Machinery/Power/generator.dm similarity index 100% rename from main-src/Code/Machinery/Power/generator.dm rename to Code/Machinery/Power/generator.dm diff --git a/main-src/Code/Machinery/Power/monitor.dm b/Code/Machinery/Power/monitor.dm similarity index 100% rename from main-src/Code/Machinery/Power/monitor.dm rename to Code/Machinery/Power/monitor.dm diff --git a/main-src/Code/Machinery/Power/smes.dm b/Code/Machinery/Power/smes.dm similarity index 100% rename from main-src/Code/Machinery/Power/smes.dm rename to Code/Machinery/Power/smes.dm diff --git a/main-src/Code/Machinery/Power/solar.dm b/Code/Machinery/Power/solar.dm similarity index 100% rename from main-src/Code/Machinery/Power/solar.dm rename to Code/Machinery/Power/solar.dm diff --git a/main-src/Code/Machinery/Power/solar_control.dm b/Code/Machinery/Power/solar_control.dm similarity index 100% rename from main-src/Code/Machinery/Power/solar_control.dm rename to Code/Machinery/Power/solar_control.dm diff --git a/main-src/Code/Machinery/Power/terminal.dm b/Code/Machinery/Power/terminal.dm similarity index 100% rename from main-src/Code/Machinery/Power/terminal.dm rename to Code/Machinery/Power/terminal.dm diff --git a/main-src/Code/Machinery/Power/turbine.dm b/Code/Machinery/Power/turbine.dm similarity index 100% rename from main-src/Code/Machinery/Power/turbine.dm rename to Code/Machinery/Power/turbine.dm diff --git a/main-src/Code/Machinery/_machinery.dm b/Code/Machinery/_machinery.dm similarity index 100% rename from main-src/Code/Machinery/_machinery.dm rename to Code/Machinery/_machinery.dm diff --git a/main-src/Code/Machinery/_pipe_misc.dm b/Code/Machinery/_pipe_misc.dm similarity index 100% rename from main-src/Code/Machinery/_pipe_misc.dm rename to Code/Machinery/_pipe_misc.dm diff --git a/main-src/Code/Machinery/alarm.dm b/Code/Machinery/alarm.dm similarity index 100% rename from main-src/Code/Machinery/alarm.dm rename to Code/Machinery/alarm.dm diff --git a/main-src/Code/Machinery/at_indicator.dm b/Code/Machinery/at_indicator.dm similarity index 100% rename from main-src/Code/Machinery/at_indicator.dm rename to Code/Machinery/at_indicator.dm diff --git a/main-src/Code/Machinery/autolathe.dm b/Code/Machinery/autolathe.dm similarity index 100% rename from main-src/Code/Machinery/autolathe.dm rename to Code/Machinery/autolathe.dm diff --git a/main-src/Code/Machinery/camera.dm b/Code/Machinery/camera.dm similarity index 100% rename from main-src/Code/Machinery/camera.dm rename to Code/Machinery/camera.dm diff --git a/main-src/Code/Machinery/cell_charger.dm b/Code/Machinery/cell_charger.dm similarity index 100% rename from main-src/Code/Machinery/cell_charger.dm rename to Code/Machinery/cell_charger.dm diff --git a/main-src/Code/Machinery/circulator.dm b/Code/Machinery/circulator.dm similarity index 100% rename from main-src/Code/Machinery/circulator.dm rename to Code/Machinery/circulator.dm diff --git a/main-src/Code/Machinery/connector.dm b/Code/Machinery/connector.dm similarity index 100% rename from main-src/Code/Machinery/connector.dm rename to Code/Machinery/connector.dm diff --git a/main-src/Code/Machinery/cryocell.dm b/Code/Machinery/cryocell.dm similarity index 100% rename from main-src/Code/Machinery/cryocell.dm rename to Code/Machinery/cryocell.dm diff --git a/main-src/Code/Machinery/dispenser.dm b/Code/Machinery/dispenser.dm similarity index 100% rename from main-src/Code/Machinery/dispenser.dm rename to Code/Machinery/dispenser.dm diff --git a/main-src/Code/Machinery/door_control.dm b/Code/Machinery/door_control.dm similarity index 100% rename from main-src/Code/Machinery/door_control.dm rename to Code/Machinery/door_control.dm diff --git a/main-src/Code/Machinery/firealarm.dm b/Code/Machinery/firealarm.dm similarity index 100% rename from main-src/Code/Machinery/firealarm.dm rename to Code/Machinery/firealarm.dm diff --git a/main-src/Code/Machinery/freezer.dm b/Code/Machinery/freezer.dm similarity index 100% rename from main-src/Code/Machinery/freezer.dm rename to Code/Machinery/freezer.dm diff --git a/main-src/Code/Machinery/gas_sensor.dm b/Code/Machinery/gas_sensor.dm similarity index 100% rename from main-src/Code/Machinery/gas_sensor.dm rename to Code/Machinery/gas_sensor.dm diff --git a/main-src/Code/Machinery/igniter.dm b/Code/Machinery/igniter.dm similarity index 100% rename from main-src/Code/Machinery/igniter.dm rename to Code/Machinery/igniter.dm diff --git a/main-src/Code/Machinery/injector.dm b/Code/Machinery/injector.dm similarity index 100% rename from main-src/Code/Machinery/injector.dm rename to Code/Machinery/injector.dm diff --git a/main-src/Code/Machinery/inlet.dm b/Code/Machinery/inlet.dm similarity index 100% rename from main-src/Code/Machinery/inlet.dm rename to Code/Machinery/inlet.dm diff --git a/main-src/Code/Machinery/junction.dm b/Code/Machinery/junction.dm similarity index 100% rename from main-src/Code/Machinery/junction.dm rename to Code/Machinery/junction.dm diff --git a/main-src/Code/Machinery/light_switch.dm b/Code/Machinery/light_switch.dm similarity index 100% rename from main-src/Code/Machinery/light_switch.dm rename to Code/Machinery/light_switch.dm diff --git a/main-src/Code/Machinery/manifold.dm b/Code/Machinery/manifold.dm similarity index 100% rename from main-src/Code/Machinery/manifold.dm rename to Code/Machinery/manifold.dm diff --git a/main-src/Code/Machinery/meter.dm b/Code/Machinery/meter.dm similarity index 100% rename from main-src/Code/Machinery/meter.dm rename to Code/Machinery/meter.dm diff --git a/main-src/Code/Machinery/nuclearbomb.dm b/Code/Machinery/nuclearbomb.dm similarity index 100% rename from main-src/Code/Machinery/nuclearbomb.dm rename to Code/Machinery/nuclearbomb.dm diff --git a/main-src/Code/Machinery/pipeline.dm b/Code/Machinery/pipeline.dm similarity index 100% rename from main-src/Code/Machinery/pipeline.dm rename to Code/Machinery/pipeline.dm diff --git a/main-src/Code/Machinery/pipes.dm b/Code/Machinery/pipes.dm similarity index 100% rename from main-src/Code/Machinery/pipes.dm rename to Code/Machinery/pipes.dm diff --git a/main-src/Code/Machinery/pod.dm b/Code/Machinery/pod.dm similarity index 100% rename from main-src/Code/Machinery/pod.dm rename to Code/Machinery/pod.dm diff --git a/main-src/Code/Machinery/recharger.dm b/Code/Machinery/recharger.dm similarity index 100% rename from main-src/Code/Machinery/recharger.dm rename to Code/Machinery/recharger.dm diff --git a/main-src/Code/Machinery/recon.dm b/Code/Machinery/recon.dm similarity index 100% rename from main-src/Code/Machinery/recon.dm rename to Code/Machinery/recon.dm diff --git a/main-src/Code/Machinery/sec_lock.dm b/Code/Machinery/sec_lock.dm similarity index 100% rename from main-src/Code/Machinery/sec_lock.dm rename to Code/Machinery/sec_lock.dm diff --git a/main-src/Code/Machinery/shuttle.dm b/Code/Machinery/shuttle.dm similarity index 100% rename from main-src/Code/Machinery/shuttle.dm rename to Code/Machinery/shuttle.dm diff --git a/main-src/Code/Machinery/sleeper.dm b/Code/Machinery/sleeper.dm similarity index 100% rename from main-src/Code/Machinery/sleeper.dm rename to Code/Machinery/sleeper.dm diff --git a/main-src/Code/Machinery/valve.dm b/Code/Machinery/valve.dm similarity index 100% rename from main-src/Code/Machinery/valve.dm rename to Code/Machinery/valve.dm diff --git a/main-src/Code/Machinery/vent.dm b/Code/Machinery/vent.dm similarity index 100% rename from main-src/Code/Machinery/vent.dm rename to Code/Machinery/vent.dm diff --git a/main-src/Code/Test.dm b/Code/Test.dm similarity index 100% rename from main-src/Code/Test.dm rename to Code/Test.dm diff --git a/main-src/Code/TextHandling.dm b/Code/TextHandling.dm similarity index 100% rename from main-src/Code/TextHandling.dm rename to Code/TextHandling.dm diff --git a/main-src/Code/_debug.dm b/Code/_debug.dm similarity index 100% rename from main-src/Code/_debug.dm rename to Code/_debug.dm diff --git a/main-src/Code/aaaDefines.dm b/Code/aaaDefines.dm similarity index 100% rename from main-src/Code/aaaDefines.dm rename to Code/aaaDefines.dm diff --git a/main-src/Code/airtunnel.dm b/Code/airtunnel.dm similarity index 100% rename from main-src/Code/airtunnel.dm rename to Code/airtunnel.dm diff --git a/main-src/Code/areas.dm b/Code/areas.dm similarity index 100% rename from main-src/Code/areas.dm rename to Code/areas.dm diff --git a/main-src/Code/blob.dm b/Code/blob.dm similarity index 100% rename from main-src/Code/blob.dm rename to Code/blob.dm diff --git a/main-src/Code/cell_process.dm b/Code/cell_process.dm similarity index 100% rename from main-src/Code/cell_process.dm rename to Code/cell_process.dm diff --git a/main-src/Code/cellautomata.dm b/Code/cellautomata.dm similarity index 100% rename from main-src/Code/cellautomata.dm rename to Code/cellautomata.dm diff --git a/main-src/Code/chemical.dm b/Code/chemical.dm similarity index 100% rename from main-src/Code/chemical.dm rename to Code/chemical.dm diff --git a/main-src/Code/colour2html.dm b/Code/colour2html.dm similarity index 100% rename from main-src/Code/colour2html.dm rename to Code/colour2html.dm diff --git a/main-src/Code/computer.dm b/Code/computer.dm similarity index 100% rename from main-src/Code/computer.dm rename to Code/computer.dm diff --git a/main-src/Code/cryo.dm b/Code/cryo.dm similarity index 100% rename from main-src/Code/cryo.dm rename to Code/cryo.dm diff --git a/main-src/Code/datumvars.dm b/Code/datumvars.dm similarity index 100% rename from main-src/Code/datumvars.dm rename to Code/datumvars.dm diff --git a/main-src/Code/demo.dm b/Code/demo.dm similarity index 100% rename from main-src/Code/demo.dm rename to Code/demo.dm diff --git a/main-src/Code/dna.dm b/Code/dna.dm similarity index 100% rename from main-src/Code/dna.dm rename to Code/dna.dm diff --git a/main-src/Code/engine.dm b/Code/engine.dm similarity index 100% rename from main-src/Code/engine.dm rename to Code/engine.dm diff --git a/main-src/Code/globals.dm b/Code/globals.dm similarity index 100% rename from main-src/Code/globals.dm rename to Code/globals.dm diff --git a/main-src/Code/h_sandbox.dm b/Code/h_sandbox.dm similarity index 100% rename from main-src/Code/h_sandbox.dm rename to Code/h_sandbox.dm diff --git a/main-src/Code/hexadecimal.dm b/Code/hexadecimal.dm similarity index 100% rename from main-src/Code/hexadecimal.dm rename to Code/hexadecimal.dm diff --git a/main-src/Code/instructions.dm b/Code/instructions.dm similarity index 100% rename from main-src/Code/instructions.dm rename to Code/instructions.dm diff --git a/main-src/Code/inverthtml.dm b/Code/inverthtml.dm similarity index 100% rename from main-src/Code/inverthtml.dm rename to Code/inverthtml.dm diff --git a/main-src/Code/items.dm b/Code/items.dm similarity index 100% rename from main-src/Code/items.dm rename to Code/items.dm diff --git a/main-src/Code/mob.dm b/Code/mob.dm similarity index 100% rename from main-src/Code/mob.dm rename to Code/mob.dm diff --git a/main-src/Code/modules.dm b/Code/modules.dm similarity index 100% rename from main-src/Code/modules.dm rename to Code/modules.dm diff --git a/main-src/Code/newitems.dm b/Code/newitems.dm similarity index 100% rename from main-src/Code/newitems.dm rename to Code/newitems.dm diff --git a/main-src/Code/newobjects.dm b/Code/newobjects.dm similarity index 100% rename from main-src/Code/newobjects.dm rename to Code/newobjects.dm diff --git a/main-src/Code/overview.dm b/Code/overview.dm similarity index 100% rename from main-src/Code/overview.dm rename to Code/overview.dm diff --git a/main-src/Code/power.dm b/Code/power.dm similarity index 100% rename from main-src/Code/power.dm rename to Code/power.dm diff --git a/main-src/Code/shuttle.dm b/Code/shuttle.dm similarity index 100% rename from main-src/Code/shuttle.dm rename to Code/shuttle.dm diff --git a/main-src/Code/ss13_algorithm2.dm b/Code/ss13_algorithm2.dm similarity index 100% rename from main-src/Code/ss13_algorithm2.dm rename to Code/ss13_algorithm2.dm diff --git a/main-src/Code/sun.dm b/Code/sun.dm similarity index 100% rename from main-src/Code/sun.dm rename to Code/sun.dm diff --git a/main-src/Code/vote.dm b/Code/vote.dm similarity index 100% rename from main-src/Code/vote.dm rename to Code/vote.dm diff --git a/main-src/Code/weap_sat.dm b/Code/weap_sat.dm similarity index 100% rename from main-src/Code/weap_sat.dm rename to Code/weap_sat.dm diff --git a/main-src/Code/weapons.dm b/Code/weapons.dm similarity index 96% rename from main-src/Code/weapons.dm rename to Code/weapons.dm index f6d5b7b..1a5c9ea 100644 --- a/main-src/Code/weapons.dm +++ b/Code/weapons.dm @@ -1289,8 +1289,7 @@ /obj/bullet/Bump(atom/A as mob|obj|turf|area) spawn( 0 ) - if (A) //fix for an odd bug whose cause I'm not certain of - I once saw the dream daemon console throw an exception in the A.las_act() line due to A being null. How the bullet managed to bump into null I do not know, but this might make it less likely. Best guess: Two bullets in the same cycle hit something whose las_act deleted it. -shadowlord13 - A.las_act("bullet", src) + A.las_act("bullet", src) //SN src = null del(src) return @@ -1322,8 +1321,7 @@ /obj/beam/a_laser/Bump(atom/A as mob|obj|turf|area) spawn( 0 ) - if (A) //fix for an odd bug whose cause I'm not certain of - I once saw the dream daemon console throw an exception in the A.las_act() line due to A being null. How the bullet managed to bump into null I do not know, but this might make it less likely. Best guess: Two bullets in the same cycle hit something whose las_act deleted it. -shadowlord13 - A.las_act(null, src) + A.las_act(null, src) //SN src = null del(src) return @@ -1331,17 +1329,14 @@ return /obj/beam/a_laser/proc/process() - //world << text("laser at [] []:[], target is [] []:[]", src.loc, src.x, src.y, src:current, src.current:x, src.current:y) + if ((!( src.current ) || src.loc == src.current)) - src.current = locate(min(max(src.x + src.xo, 1), world.maxx), min(max(src.y + src.yo, 1), world.maxy), src.z) - //world << text("current changed: target is now []. location was [],[], added [],[]", src.current, src.x, src.y, src.xo, src.yo) + src.current = locate(min(max(src.x + src.xo, 1), world.maxx), min(max(src.y + src.yo, 1), world.maxy), src.z) if ((src.x == 1 || src.x == world.maxx || src.y == 1 || src.y == world.maxy)) - //world << text("off-world, deleting") //SN src = null del(src) return step_towards(src, src.current) - //world << text("laser stepped, now [] []:[], target is [] []:[]", src.loc, src.x, src.y, src.current, src.current:x, src.current:y) src.life-- if (src.life <= 0) //SN src = null diff --git a/main-src/Icons/Cryogenic2.dmi b/Icons/Cryogenic2.dmi similarity index 100% rename from main-src/Icons/Cryogenic2.dmi rename to Icons/Cryogenic2.dmi diff --git a/main-src/Icons/Door1.dmi b/Icons/Door1.dmi similarity index 100% rename from main-src/Icons/Door1.dmi rename to Icons/Door1.dmi diff --git a/main-src/Icons/Doorf.dmi b/Icons/Doorf.dmi similarity index 100% rename from main-src/Icons/Doorf.dmi rename to Icons/Doorf.dmi diff --git a/main-src/Icons/Icons.dmi b/Icons/Icons.dmi similarity index 100% rename from main-src/Icons/Icons.dmi rename to Icons/Icons.dmi diff --git a/main-src/Icons/aircontrol.dmi b/Icons/aircontrol.dmi similarity index 100% rename from main-src/Icons/aircontrol.dmi rename to Icons/aircontrol.dmi diff --git a/main-src/Icons/airtunnel.dmi b/Icons/airtunnel.dmi similarity index 100% rename from main-src/Icons/airtunnel.dmi rename to Icons/airtunnel.dmi diff --git a/main-src/Icons/airtunnelcomputer.dmi b/Icons/airtunnelcomputer.dmi similarity index 100% rename from main-src/Icons/airtunnelcomputer.dmi rename to Icons/airtunnelcomputer.dmi diff --git a/main-src/Icons/alert.dmi b/Icons/alert.dmi similarity index 100% rename from main-src/Icons/alert.dmi rename to Icons/alert.dmi diff --git a/main-src/Icons/alphacolors.dmi b/Icons/alphacolors.dmi similarity index 100% rename from main-src/Icons/alphacolors.dmi rename to Icons/alphacolors.dmi diff --git a/main-src/Icons/ammo.dmi b/Icons/ammo.dmi similarity index 100% rename from main-src/Icons/ammo.dmi rename to Icons/ammo.dmi diff --git a/main-src/Icons/assemblies.dmi b/Icons/assemblies.dmi similarity index 100% rename from main-src/Icons/assemblies.dmi rename to Icons/assemblies.dmi diff --git a/main-src/Icons/b_items.dmi b/Icons/b_items.dmi similarity index 100% rename from main-src/Icons/b_items.dmi rename to Icons/b_items.dmi diff --git a/main-src/Icons/belt.dmi b/Icons/belt.dmi similarity index 100% rename from main-src/Icons/belt.dmi rename to Icons/belt.dmi diff --git a/main-src/Icons/blob.dmi b/Icons/blob.dmi similarity index 100% rename from main-src/Icons/blob.dmi rename to Icons/blob.dmi diff --git a/main-src/Icons/canister.dmi b/Icons/canister.dmi similarity index 100% rename from main-src/Icons/canister.dmi rename to Icons/canister.dmi diff --git a/main-src/Icons/dam_human.dmi b/Icons/dam_human.dmi similarity index 100% rename from main-src/Icons/dam_human.dmi rename to Icons/dam_human.dmi diff --git a/main-src/Icons/dam_mask.dmi b/Icons/dam_mask.dmi similarity index 100% rename from main-src/Icons/dam_mask.dmi rename to Icons/dam_mask.dmi diff --git a/main-src/Icons/dam_zones.dmi b/Icons/dam_zones.dmi similarity index 100% rename from main-src/Icons/dam_zones.dmi rename to Icons/dam_zones.dmi diff --git a/main-src/Icons/doors.dmi b/Icons/doors.dmi similarity index 100% rename from main-src/Icons/doors.dmi rename to Icons/doors.dmi diff --git a/main-src/Icons/engine.dmi b/Icons/engine.dmi similarity index 100% rename from main-src/Icons/engine.dmi rename to Icons/engine.dmi diff --git a/main-src/Icons/enginecomputer.dmi b/Icons/enginecomputer.dmi similarity index 100% rename from main-src/Icons/enginecomputer.dmi rename to Icons/enginecomputer.dmi diff --git a/main-src/Icons/escapepod.dmi b/Icons/escapepod.dmi similarity index 100% rename from main-src/Icons/escapepod.dmi rename to Icons/escapepod.dmi diff --git a/main-src/Icons/generator.dmi b/Icons/generator.dmi similarity index 100% rename from main-src/Icons/generator.dmi rename to Icons/generator.dmi diff --git a/main-src/Icons/ghost.dmi b/Icons/ghost.dmi similarity index 100% rename from main-src/Icons/ghost.dmi rename to Icons/ghost.dmi diff --git a/main-src/Icons/heat_pipe.dmi b/Icons/heat_pipe.dmi similarity index 100% rename from main-src/Icons/heat_pipe.dmi rename to Icons/heat_pipe.dmi diff --git a/main-src/Icons/help.htm b/Icons/help.htm similarity index 100% rename from main-src/Icons/help.htm rename to Icons/help.htm diff --git a/main-src/Icons/hi_pipe.dmi b/Icons/hi_pipe.dmi similarity index 100% rename from main-src/Icons/hi_pipe.dmi rename to Icons/hi_pipe.dmi diff --git a/main-src/Icons/human.dmi b/Icons/human.dmi similarity index 100% rename from main-src/Icons/human.dmi rename to Icons/human.dmi diff --git a/main-src/Icons/imap.dmi b/Icons/imap.dmi similarity index 100% rename from main-src/Icons/imap.dmi rename to Icons/imap.dmi diff --git a/main-src/Icons/items.dmi b/Icons/items.dmi similarity index 100% rename from main-src/Icons/items.dmi rename to Icons/items.dmi diff --git a/main-src/Icons/junct-pipe.dmi b/Icons/junct-pipe.dmi similarity index 100% rename from main-src/Icons/junct-pipe.dmi rename to Icons/junct-pipe.dmi diff --git a/main-src/Icons/l_items.dmi b/Icons/l_items.dmi similarity index 100% rename from main-src/Icons/l_items.dmi rename to Icons/l_items.dmi diff --git a/main-src/Icons/lighting.dmi b/Icons/lighting.dmi similarity index 100% rename from main-src/Icons/lighting.dmi rename to Icons/lighting.dmi diff --git a/main-src/Icons/mark.dmi b/Icons/mark.dmi similarity index 100% rename from main-src/Icons/mark.dmi rename to Icons/mark.dmi diff --git a/main-src/Icons/meteor.dmi b/Icons/meteor.dmi similarity index 100% rename from main-src/Icons/meteor.dmi rename to Icons/meteor.dmi diff --git a/main-src/Icons/mob.dmi b/Icons/mob.dmi similarity index 100% rename from main-src/Icons/mob.dmi rename to Icons/mob.dmi diff --git a/main-src/Icons/module.dmi b/Icons/module.dmi similarity index 100% rename from main-src/Icons/module.dmi rename to Icons/module.dmi diff --git a/main-src/Icons/monkey.dmi b/Icons/monkey.dmi similarity index 100% rename from main-src/Icons/monkey.dmi rename to Icons/monkey.dmi diff --git a/main-src/Icons/pipe-item.dmi b/Icons/pipe-item.dmi similarity index 100% rename from main-src/Icons/pipe-item.dmi rename to Icons/pipe-item.dmi diff --git a/main-src/Icons/pipes.dmi b/Icons/pipes.dmi similarity index 100% rename from main-src/Icons/pipes.dmi rename to Icons/pipes.dmi diff --git a/main-src/Icons/plasma.dmi b/Icons/plasma.dmi similarity index 100% rename from main-src/Icons/plasma.dmi rename to Icons/plasma.dmi diff --git a/main-src/Icons/power.dmi b/Icons/power.dmi similarity index 100% rename from main-src/Icons/power.dmi rename to Icons/power.dmi diff --git a/main-src/Icons/power_cond.dmi b/Icons/power_cond.dmi similarity index 100% rename from main-src/Icons/power_cond.dmi rename to Icons/power_cond.dmi diff --git a/main-src/Icons/r_items.dmi b/Icons/r_items.dmi similarity index 100% rename from main-src/Icons/r_items.dmi rename to Icons/r_items.dmi diff --git a/main-src/Icons/reg_pipe.dmi b/Icons/reg_pipe.dmi similarity index 100% rename from main-src/Icons/reg_pipe.dmi rename to Icons/reg_pipe.dmi diff --git a/main-src/Icons/screen.dmi b/Icons/screen.dmi similarity index 100% rename from main-src/Icons/screen.dmi rename to Icons/screen.dmi diff --git a/main-src/Icons/screen1.dmi b/Icons/screen1.dmi similarity index 100% rename from main-src/Icons/screen1.dmi rename to Icons/screen1.dmi diff --git a/main-src/Icons/security.dmi b/Icons/security.dmi similarity index 100% rename from main-src/Icons/security.dmi rename to Icons/security.dmi diff --git a/main-src/Icons/shards.dmi b/Icons/shards.dmi similarity index 100% rename from main-src/Icons/shards.dmi rename to Icons/shards.dmi diff --git a/main-src/Icons/shuttle.dmi b/Icons/shuttle.dmi similarity index 100% rename from main-src/Icons/shuttle.dmi rename to Icons/shuttle.dmi diff --git a/main-src/Icons/ss13mapd.png b/Icons/ss13mapd.png similarity index 100% rename from main-src/Icons/ss13mapd.png rename to Icons/ss13mapd.png diff --git a/main-src/Icons/stationobjs.dmi b/Icons/stationobjs.dmi similarity index 100% rename from main-src/Icons/stationobjs.dmi rename to Icons/stationobjs.dmi diff --git a/main-src/Icons/table.dmi b/Icons/table.dmi similarity index 100% rename from main-src/Icons/table.dmi rename to Icons/table.dmi diff --git a/main-src/Icons/turfs.dmi b/Icons/turfs.dmi similarity index 100% rename from main-src/Icons/turfs.dmi rename to Icons/turfs.dmi diff --git a/main-src/Icons/turfs2.dmi b/Icons/turfs2.dmi similarity index 100% rename from main-src/Icons/turfs2.dmi rename to Icons/turfs2.dmi diff --git a/main-src/Icons/uniforms.dmi b/Icons/uniforms.dmi similarity index 100% rename from main-src/Icons/uniforms.dmi rename to Icons/uniforms.dmi diff --git a/main-src/Icons/wall.dmi b/Icons/wall.dmi similarity index 100% rename from main-src/Icons/wall.dmi rename to Icons/wall.dmi diff --git a/main-src/Icons/water.dmi b/Icons/water.dmi similarity index 100% rename from main-src/Icons/water.dmi rename to Icons/water.dmi diff --git a/main-src/Icons/weap_sat.dmi b/Icons/weap_sat.dmi similarity index 100% rename from main-src/Icons/weap_sat.dmi rename to Icons/weap_sat.dmi diff --git a/main-src/Icons/windoor.dmi b/Icons/windoor.dmi similarity index 100% rename from main-src/Icons/windoor.dmi rename to Icons/windoor.dmi diff --git a/main-src/Icons/wire.dmi b/Icons/wire.dmi similarity index 100% rename from main-src/Icons/wire.dmi rename to Icons/wire.dmi diff --git a/main-src/Icons/zone_sel.dmi b/Icons/zone_sel.dmi similarity index 100% rename from main-src/Icons/zone_sel.dmi rename to Icons/zone_sel.dmi diff --git a/main-src/Interface/skin.dmf b/Interface/skin.dmf similarity index 100% rename from main-src/Interface/skin.dmf rename to Interface/skin.dmf diff --git a/main-src/_changes.dm b/_changes.dm similarity index 100% rename from main-src/_changes.dm rename to _changes.dm diff --git a/main-src/_design.dm b/_design.dm similarity index 100% rename from main-src/_design.dm rename to _design.dm diff --git a/main-src/config.txt b/config.txt similarity index 100% rename from main-src/config.txt rename to config.txt diff --git a/main-src/main.dmp b/main.dmp similarity index 100% rename from main-src/main.dmp rename to main.dmp diff --git a/main-src/spacestation13.dme b/spacestation13.dme similarity index 100% rename from main-src/spacestation13.dme rename to spacestation13.dme diff --git a/main-src/ss13h.dmp b/ss13h.dmp similarity index 100% rename from main-src/ss13h.dmp rename to ss13h.dmp diff --git a/main-src/supporting-docs/changes-40.93.4 to 40.93.2H9.5.txt b/supporting-docs/changes-40.93.4 to 40.93.2H9.5.txt similarity index 100% rename from main-src/supporting-docs/changes-40.93.4 to 40.93.2H9.5.txt rename to supporting-docs/changes-40.93.4 to 40.93.2H9.5.txt