diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 4e723f0e281..1a22a89eddc 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -461,6 +461,7 @@ var/d2 = 1 layer = 2.5 var/color="red" + var/obj/structure/powerswitch/power_switch /obj/structure/cable/yellow color="yellow" @@ -901,6 +902,7 @@ + /obj/structure/noticeboard name = "Notice Board" icon = 'stationobjs.dmi' diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index a5e037413c2..4a14756a41f 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -748,6 +748,11 @@ w_class = 2.0 flags = FPRINT | TABLEPASS +/obj/item/weapon/caution/cone + desc = "This cone is trying to warn you of something!" + name = "warning cone" + icon_state = "cone" + /obj/item/weapon/paper name = "Paper" diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index e5365fe3408..bc5e765cab7 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -126,6 +126,10 @@ if(istype(W, /obj/item/weapon/wirecutters)) + if(power_switch) + user << "\red This piece of cable is tied to a power switch. Flip the switch to remove it." + return + if (shock(user, 50)) return diff --git a/code/modules/power/switch.dm b/code/modules/power/switch.dm new file mode 100644 index 00000000000..6037a7d9be6 --- /dev/null +++ b/code/modules/power/switch.dm @@ -0,0 +1,84 @@ +//This is a power switch. When turned on it looks at the cables around the tile that it's on and notes which cables are trying to connect to it. +//After it knows this it creates the number of cables from the center to each of the cables attempting to conenct. These cables cannot be removed +//with wirecutters. When the switch is turned off it removes all the cables on the tile it's on. +//The switch uses a 5s delay to prevent powernet change spamming. + +/obj/structure/powerswitch + name = "power switch" + desc = "A switch that controls power." + icon = 'power.dmi' + icon_state = "switch-dbl-up" + var/icon_state_on = "switch-dbl-down" + var/icon_state_off = "switch-dbl-up" + flags = FPRINT + density = 0 + anchored = 1 + var/on = 0 //up is off, down is on + var/busy = 0 //set to 1 when you start pulling + + simple + icon_state = "switch-up" + icon_state_on = "switch-down" + icon_state_off = "switch-up" + + + examine() + ..() + if(on) + usr << "The switch is in the on position" + else + usr << "The switch is in the off position" + + attack_ai(mob/user) + user << "\red You're an AI. This is a manual switch. It's not going to work." + return + + attack_hand(mob/user) + + if(busy) + user << "\red This switch is already being toggled." + return + + ..() + + busy = 1 + for(var/mob/O in viewers(user)) + O.show_message(text("\red [user] started pulling the [src]."), 1) + + if(do_after(user, 50)) + set_state(!on) + for(var/mob/O in viewers(user)) + O.show_message(text("\red [user] flipped the [src] into the [on ? "on": "off"] position."), 1) + busy = 0 + + proc/set_state(var/state) + on = state + if(on) + icon_state = icon_state_on + var/list/connection_dirs = list() + for(var/direction in list(1,2,4,8,5,6,9,10)) + for(var/obj/structure/cable/C in get_step(src,direction)) + if(C.d1 == turn(direction, 180) || C.d2 == turn(direction, 180)) + connection_dirs += direction + break + + for(var/direction in connection_dirs) + var/obj/structure/cable/C = new/obj/structure/cable(src.loc) + C.d1 = 0 + C.d2 = direction + C.icon_state = "[C.d1]-[C.d2]" + C.power_switch = src + + var/datum/powernet/PN = new() + PN.number = powernets.len + 1 + powernets += PN + C.netnum = PN.number + PN.cables += C + + C.mergeConnectedNetworks(C.d2) + C.mergeConnectedNetworksOnTurf() + + else + icon_state = icon_state_off + for(var/obj/structure/cable/C in src.loc) + del(C) \ No newline at end of file diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 656bd54310c..0f4c00c8dfd 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 1d2dc870c7f..3460395fefd 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/tgstation.dme b/tgstation.dme index be82eb0cbf0..ae4811c9974 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5,637 +5,176 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR ".svn" -#define FILE_DIR ".svn/prop-base" -#define FILE_DIR ".svn/text-base" -#define FILE_DIR "bot" -#define FILE_DIR "bot/.svn" -#define FILE_DIR "bot/.svn/text-base" -#define FILE_DIR "bot/fmlquotes" -#define FILE_DIR "bot/fmlquotes/.svn" -#define FILE_DIR "bot/Marakov" -#define FILE_DIR "bot/Marakov/.svn" -#define FILE_DIR "bot/Marakov/.svn/text-base" -#define FILE_DIR "bot/memos" -#define FILE_DIR "bot/memos/.svn" -#define FILE_DIR "bot/suggestions" -#define FILE_DIR "bot/suggestions/.svn" -#define FILE_DIR "bot/userquotes" -#define FILE_DIR "bot/userquotes/.svn" -#define FILE_DIR "bot/xkcdcache" -#define FILE_DIR "bot/xkcdcache/.svn" -#define FILE_DIR "bot/YTCache" -#define FILE_DIR "bot/YTCache/.svn" #define FILE_DIR "code" -#define FILE_DIR "code/.svn" -#define FILE_DIR "code/.svn/text-base" #define FILE_DIR "code/ATMOSPHERICS" -#define FILE_DIR "code/ATMOSPHERICS/.svn" -#define FILE_DIR "code/ATMOSPHERICS/.svn/text-base" #define FILE_DIR "code/ATMOSPHERICS/components" -#define FILE_DIR "code/ATMOSPHERICS/components/.svn" -#define FILE_DIR "code/ATMOSPHERICS/components/.svn/text-base" #define FILE_DIR "code/ATMOSPHERICS/components/binary_devices" -#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices/.svn" -#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices/.svn/text-base" #define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices" -#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices/.svn" -#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices/.svn/text-base" #define FILE_DIR "code/ATMOSPHERICS/components/unary" -#define FILE_DIR "code/ATMOSPHERICS/components/unary/.svn" -#define FILE_DIR "code/ATMOSPHERICS/components/unary/.svn/text-base" -#define FILE_DIR "code/atoms" -#define FILE_DIR "code/atoms/.svn" -#define FILE_DIR "code/atoms/clothing" -#define FILE_DIR "code/atoms/clothing/.svn" -#define FILE_DIR "code/atoms/mob" -#define FILE_DIR "code/atoms/mob/.svn" -#define FILE_DIR "code/atoms/mob/living" -#define FILE_DIR "code/atoms/mob/living/.svn" -#define FILE_DIR "code/atoms/mob/living/sapien" -#define FILE_DIR "code/atoms/mob/living/sapien/.svn" -#define FILE_DIR "code/atoms/objects" -#define FILE_DIR "code/atoms/objects/.svn" -#define FILE_DIR "code/atoms/objects/radio" -#define FILE_DIR "code/atoms/objects/radio/.svn" -#define FILE_DIR "code/atoms/objects/storage" -#define FILE_DIR "code/atoms/objects/storage/.svn" #define FILE_DIR "code/datums" -#define FILE_DIR "code/datums/.svn" -#define FILE_DIR "code/datums/.svn/text-base" #define FILE_DIR "code/datums/diseases" -#define FILE_DIR "code/datums/diseases/.svn" -#define FILE_DIR "code/datums/diseases/.svn/prop-base" -#define FILE_DIR "code/datums/diseases/.svn/text-base" #define FILE_DIR "code/datums/helper_datums" -#define FILE_DIR "code/datums/helper_datums/.svn" -#define FILE_DIR "code/datums/helper_datums/.svn/text-base" #define FILE_DIR "code/datums/spells" -#define FILE_DIR "code/datums/spells/.svn" -#define FILE_DIR "code/datums/spells/.svn/text-base" #define FILE_DIR "code/defines" -#define FILE_DIR "code/defines/.svn" -#define FILE_DIR "code/defines/.svn/text-base" #define FILE_DIR "code/defines/area" -#define FILE_DIR "code/defines/area/.svn" -#define FILE_DIR "code/defines/area/.svn/text-base" #define FILE_DIR "code/defines/mob" -#define FILE_DIR "code/defines/mob/.svn" #define FILE_DIR "code/defines/mob/dead" -#define FILE_DIR "code/defines/mob/dead/.svn" -#define FILE_DIR "code/defines/mob/dead/.svn/text-base" #define FILE_DIR "code/defines/mob/living" -#define FILE_DIR "code/defines/mob/living/.svn" -#define FILE_DIR "code/defines/mob/living/.svn/text-base" #define FILE_DIR "code/defines/mob/living/carbon" -#define FILE_DIR "code/defines/mob/living/carbon/.svn" -#define FILE_DIR "code/defines/mob/living/carbon/.svn/text-base" #define FILE_DIR "code/defines/mob/living/silicon" -#define FILE_DIR "code/defines/mob/living/silicon/.svn" -#define FILE_DIR "code/defines/mob/living/silicon/.svn/text-base" #define FILE_DIR "code/defines/obj" -#define FILE_DIR "code/defines/obj/.svn" -#define FILE_DIR "code/defines/obj/.svn/text-base" #define FILE_DIR "code/defines/obj/clothing" -#define FILE_DIR "code/defines/obj/clothing/.svn" -#define FILE_DIR "code/defines/obj/clothing/.svn/text-base" -#define FILE_DIR "code/defines/obj/spawner" -#define FILE_DIR "code/defines/obj/spawner/.svn" #define FILE_DIR "code/defines/procs" -#define FILE_DIR "code/defines/procs/.svn" -#define FILE_DIR "code/defines/procs/.svn/text-base" -#define FILE_DIR "code/defines/turf" -#define FILE_DIR "code/defines/turf/.svn" #define FILE_DIR "code/FEA" -#define FILE_DIR "code/FEA/.svn" -#define FILE_DIR "code/FEA/.svn/text-base" #define FILE_DIR "code/game" -#define FILE_DIR "code/game/.svn" -#define FILE_DIR "code/game/.svn/prop-base" -#define FILE_DIR "code/game/.svn/text-base" #define FILE_DIR "code/game/area" -#define FILE_DIR "code/game/area/.svn" -#define FILE_DIR "code/game/area/.svn/text-base" #define FILE_DIR "code/game/asteroid" -#define FILE_DIR "code/game/asteroid/.svn" -#define FILE_DIR "code/game/asteroid/.svn/text-base" #define FILE_DIR "code/game/gamemodes" -#define FILE_DIR "code/game/gamemodes/.svn" -#define FILE_DIR "code/game/gamemodes/.svn/text-base" #define FILE_DIR "code/game/gamemodes/blob" -#define FILE_DIR "code/game/gamemodes/blob/.svn" -#define FILE_DIR "code/game/gamemodes/blob/.svn/text-base" #define FILE_DIR "code/game/gamemodes/changeling" -#define FILE_DIR "code/game/gamemodes/changeling/.svn" -#define FILE_DIR "code/game/gamemodes/changeling/.svn/text-base" -#define FILE_DIR "code/game/gamemodes/ctf" -#define FILE_DIR "code/game/gamemodes/ctf/.svn" #define FILE_DIR "code/game/gamemodes/cult" -#define FILE_DIR "code/game/gamemodes/cult/.svn" -#define FILE_DIR "code/game/gamemodes/cult/.svn/text-base" -#define FILE_DIR "code/game/gamemodes/deathmatch" -#define FILE_DIR "code/game/gamemodes/deathmatch/.svn" #define FILE_DIR "code/game/gamemodes/events" -#define FILE_DIR "code/game/gamemodes/events/.svn" -#define FILE_DIR "code/game/gamemodes/events/.svn/text-base" #define FILE_DIR "code/game/gamemodes/extended" -#define FILE_DIR "code/game/gamemodes/extended/.svn" -#define FILE_DIR "code/game/gamemodes/extended/.svn/text-base" #define FILE_DIR "code/game/gamemodes/malfunction" -#define FILE_DIR "code/game/gamemodes/malfunction/.svn" -#define FILE_DIR "code/game/gamemodes/malfunction/.svn/text-base" #define FILE_DIR "code/game/gamemodes/meteor" -#define FILE_DIR "code/game/gamemodes/meteor/.svn" -#define FILE_DIR "code/game/gamemodes/meteor/.svn/text-base" -#define FILE_DIR "code/game/gamemodes/monkey" -#define FILE_DIR "code/game/gamemodes/monkey/.svn" #define FILE_DIR "code/game/gamemodes/nuclear" -#define FILE_DIR "code/game/gamemodes/nuclear/.svn" -#define FILE_DIR "code/game/gamemodes/nuclear/.svn/text-base" -#define FILE_DIR "code/game/gamemodes/restructuring" -#define FILE_DIR "code/game/gamemodes/restructuring/.svn" #define FILE_DIR "code/game/gamemodes/revolution" -#define FILE_DIR "code/game/gamemodes/revolution/.svn" -#define FILE_DIR "code/game/gamemodes/revolution/.svn/text-base" -#define FILE_DIR "code/game/gamemodes/ruby" -#define FILE_DIR "code/game/gamemodes/ruby/.svn" #define FILE_DIR "code/game/gamemodes/sandbox" -#define FILE_DIR "code/game/gamemodes/sandbox/.svn" -#define FILE_DIR "code/game/gamemodes/sandbox/.svn/text-base" #define FILE_DIR "code/game/gamemodes/traitor" -#define FILE_DIR "code/game/gamemodes/traitor/.svn" -#define FILE_DIR "code/game/gamemodes/traitor/.svn/text-base" #define FILE_DIR "code/game/gamemodes/wizard" -#define FILE_DIR "code/game/gamemodes/wizard/.svn" -#define FILE_DIR "code/game/gamemodes/wizard/.svn/text-base" #define FILE_DIR "code/game/jobs" -#define FILE_DIR "code/game/jobs/.svn" -#define FILE_DIR "code/game/jobs/.svn/text-base" #define FILE_DIR "code/game/jobs/job" -#define FILE_DIR "code/game/jobs/job/.svn" -#define FILE_DIR "code/game/jobs/job/.svn/text-base" #define FILE_DIR "code/game/machinery" -#define FILE_DIR "code/game/machinery/.svn" -#define FILE_DIR "code/game/machinery/.svn/prop-base" -#define FILE_DIR "code/game/machinery/.svn/text-base" -#define FILE_DIR "code/game/machinery/antimatter_engine" -#define FILE_DIR "code/game/machinery/antimatter_engine/.svn" #define FILE_DIR "code/game/machinery/atmoalter" -#define FILE_DIR "code/game/machinery/atmoalter/.svn" -#define FILE_DIR "code/game/machinery/atmoalter/.svn/text-base" #define FILE_DIR "code/game/machinery/bots" -#define FILE_DIR "code/game/machinery/bots/.svn" -#define FILE_DIR "code/game/machinery/bots/.svn/text-base" #define FILE_DIR "code/game/machinery/computer" -#define FILE_DIR "code/game/machinery/computer/.svn" -#define FILE_DIR "code/game/machinery/computer/.svn/text-base" #define FILE_DIR "code/game/machinery/doors" -#define FILE_DIR "code/game/machinery/doors/.svn" -#define FILE_DIR "code/game/machinery/doors/.svn/text-base" #define FILE_DIR "code/game/machinery/embedded_controller" -#define FILE_DIR "code/game/machinery/embedded_controller/.svn" -#define FILE_DIR "code/game/machinery/embedded_controller/.svn/text-base" #define FILE_DIR "code/game/machinery/kitchen" -#define FILE_DIR "code/game/machinery/kitchen/.svn" -#define FILE_DIR "code/game/machinery/kitchen/.svn/text-base" #define FILE_DIR "code/game/machinery/pipe" -#define FILE_DIR "code/game/machinery/pipe/.svn" -#define FILE_DIR "code/game/machinery/pipe/.svn/text-base" -#define FILE_DIR "code/game/machinery/power" -#define FILE_DIR "code/game/machinery/power/.svn" #define FILE_DIR "code/game/machinery/telecomms" -#define FILE_DIR "code/game/machinery/telecomms/.svn" -#define FILE_DIR "code/game/machinery/telecomms/.svn/text-base" #define FILE_DIR "code/game/magic" -#define FILE_DIR "code/game/magic/.svn" -#define FILE_DIR "code/game/magic/.svn/text-base" #define FILE_DIR "code/game/magic/cultist" -#define FILE_DIR "code/game/magic/cultist/.svn" -#define FILE_DIR "code/game/magic/cultist/.svn/prop-base" -#define FILE_DIR "code/game/magic/cultist/.svn/text-base" #define FILE_DIR "code/game/mecha" -#define FILE_DIR "code/game/mecha/.svn" -#define FILE_DIR "code/game/mecha/.svn/prop-base" -#define FILE_DIR "code/game/mecha/.svn/text-base" #define FILE_DIR "code/game/mecha/combat" -#define FILE_DIR "code/game/mecha/combat/.svn" -#define FILE_DIR "code/game/mecha/combat/.svn/text-base" #define FILE_DIR "code/game/mecha/equipment" -#define FILE_DIR "code/game/mecha/equipment/.svn" -#define FILE_DIR "code/game/mecha/equipment/.svn/text-base" #define FILE_DIR "code/game/mecha/equipment/tools" -#define FILE_DIR "code/game/mecha/equipment/tools/.svn" -#define FILE_DIR "code/game/mecha/equipment/tools/.svn/text-base" #define FILE_DIR "code/game/mecha/equipment/weapons" -#define FILE_DIR "code/game/mecha/equipment/weapons/.svn" -#define FILE_DIR "code/game/mecha/equipment/weapons/.svn/text-base" #define FILE_DIR "code/game/mecha/medical" -#define FILE_DIR "code/game/mecha/medical/.svn" -#define FILE_DIR "code/game/mecha/medical/.svn/text-base" #define FILE_DIR "code/game/mecha/working" -#define FILE_DIR "code/game/mecha/working/.svn" -#define FILE_DIR "code/game/mecha/working/.svn/text-base" #define FILE_DIR "code/game/objects" -#define FILE_DIR "code/game/objects/.svn" -#define FILE_DIR "code/game/objects/.svn/text-base" #define FILE_DIR "code/game/objects/alien" -#define FILE_DIR "code/game/objects/alien/.svn" -#define FILE_DIR "code/game/objects/alien/.svn/text-base" #define FILE_DIR "code/game/objects/closets" -#define FILE_DIR "code/game/objects/closets/.svn" -#define FILE_DIR "code/game/objects/closets/.svn/text-base" #define FILE_DIR "code/game/objects/closets/secure" -#define FILE_DIR "code/game/objects/closets/secure/.svn" -#define FILE_DIR "code/game/objects/closets/secure/.svn/text-base" #define FILE_DIR "code/game/objects/devices" -#define FILE_DIR "code/game/objects/devices/.svn" -#define FILE_DIR "code/game/objects/devices/.svn/text-base" #define FILE_DIR "code/game/objects/devices/PDA" -#define FILE_DIR "code/game/objects/devices/PDA/.svn" -#define FILE_DIR "code/game/objects/devices/PDA/.svn/text-base" #define FILE_DIR "code/game/objects/items" -#define FILE_DIR "code/game/objects/items/.svn" -#define FILE_DIR "code/game/objects/items/.svn/text-base" #define FILE_DIR "code/game/objects/items/weapons" -#define FILE_DIR "code/game/objects/items/weapons/.svn" -#define FILE_DIR "code/game/objects/items/weapons/.svn/text-base" #define FILE_DIR "code/game/objects/items/weapons/implants" -#define FILE_DIR "code/game/objects/items/weapons/implants/.svn" -#define FILE_DIR "code/game/objects/items/weapons/implants/.svn/text-base" #define FILE_DIR "code/game/objects/radio" -#define FILE_DIR "code/game/objects/radio/.svn" -#define FILE_DIR "code/game/objects/radio/.svn/text-base" #define FILE_DIR "code/game/objects/secstorage" -#define FILE_DIR "code/game/objects/secstorage/.svn" -#define FILE_DIR "code/game/objects/secstorage/.svn/text-base" -#define FILE_DIR "code/game/objects/spawners" -#define FILE_DIR "code/game/objects/spawners/.svn" #define FILE_DIR "code/game/objects/stacks" -#define FILE_DIR "code/game/objects/stacks/.svn" -#define FILE_DIR "code/game/objects/stacks/.svn/text-base" #define FILE_DIR "code/game/objects/storage" -#define FILE_DIR "code/game/objects/storage/.svn" -#define FILE_DIR "code/game/objects/storage/.svn/text-base" #define FILE_DIR "code/game/objects/tanks" -#define FILE_DIR "code/game/objects/tanks/.svn" -#define FILE_DIR "code/game/objects/tanks/.svn/text-base" #define FILE_DIR "code/game/verbs" -#define FILE_DIR "code/game/verbs/.svn" -#define FILE_DIR "code/game/verbs/.svn/text-base" #define FILE_DIR "code/js" -#define FILE_DIR "code/js/.svn" -#define FILE_DIR "code/js/.svn/text-base" #define FILE_DIR "code/modules" -#define FILE_DIR "code/modules/.svn" #define FILE_DIR "code/modules/admin" -#define FILE_DIR "code/modules/admin/.svn" -#define FILE_DIR "code/modules/admin/.svn/text-base" #define FILE_DIR "code/modules/admin/verbs" -#define FILE_DIR "code/modules/admin/verbs/.svn" -#define FILE_DIR "code/modules/admin/verbs/.svn/text-base" #define FILE_DIR "code/modules/assembly" -#define FILE_DIR "code/modules/assembly/.svn" -#define FILE_DIR "code/modules/assembly/.svn/text-base" #define FILE_DIR "code/modules/chemical" -#define FILE_DIR "code/modules/chemical/.svn" -#define FILE_DIR "code/modules/chemical/.svn/text-base" #define FILE_DIR "code/modules/clothing" -#define FILE_DIR "code/modules/clothing/.svn" -#define FILE_DIR "code/modules/clothing/.svn/text-base" #define FILE_DIR "code/modules/clothing/glasses" -#define FILE_DIR "code/modules/clothing/glasses/.svn" -#define FILE_DIR "code/modules/clothing/glasses/.svn/text-base" #define FILE_DIR "code/modules/clothing/spacesuits" -#define FILE_DIR "code/modules/clothing/spacesuits/.svn" -#define FILE_DIR "code/modules/clothing/spacesuits/.svn/text-base" #define FILE_DIR "code/modules/clothing/suits" -#define FILE_DIR "code/modules/clothing/suits/.svn" -#define FILE_DIR "code/modules/clothing/suits/.svn/text-base" #define FILE_DIR "code/modules/clothing/uniforms" -#define FILE_DIR "code/modules/clothing/uniforms/.svn" -#define FILE_DIR "code/modules/clothing/uniforms/.svn/text-base" #define FILE_DIR "code/modules/critters" -#define FILE_DIR "code/modules/critters/.svn" -#define FILE_DIR "code/modules/critters/.svn/text-base" #define FILE_DIR "code/modules/critters/hivebots" -#define FILE_DIR "code/modules/critters/hivebots/.svn" -#define FILE_DIR "code/modules/critters/hivebots/.svn/text-base" #define FILE_DIR "code/modules/food" -#define FILE_DIR "code/modules/food/.svn" -#define FILE_DIR "code/modules/food/.svn/text-base" #define FILE_DIR "code/modules/mining" -#define FILE_DIR "code/modules/mining/.svn" -#define FILE_DIR "code/modules/mining/.svn/text-base" #define FILE_DIR "code/modules/mob" -#define FILE_DIR "code/modules/mob/.svn" -#define FILE_DIR "code/modules/mob/.svn/text-base" #define FILE_DIR "code/modules/mob/dead" -#define FILE_DIR "code/modules/mob/dead/.svn" #define FILE_DIR "code/modules/mob/dead/observer" -#define FILE_DIR "code/modules/mob/dead/observer/.svn" -#define FILE_DIR "code/modules/mob/dead/observer/.svn/text-base" #define FILE_DIR "code/modules/mob/living" -#define FILE_DIR "code/modules/mob/living/.svn" -#define FILE_DIR "code/modules/mob/living/.svn/text-base" #define FILE_DIR "code/modules/mob/living/blob" -#define FILE_DIR "code/modules/mob/living/blob/.svn" -#define FILE_DIR "code/modules/mob/living/blob/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon" -#define FILE_DIR "code/modules/mob/living/carbon/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/alien" -#define FILE_DIR "code/modules/mob/living/carbon/alien/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/alien/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/alien/larva" -#define FILE_DIR "code/modules/mob/living/carbon/alien/larva/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/alien/larva/.svn/text-base" -#define FILE_DIR "code/modules/mob/living/carbon/alien/special" -#define FILE_DIR "code/modules/mob/living/carbon/alien/special/.svn" #define FILE_DIR "code/modules/mob/living/carbon/brain" -#define FILE_DIR "code/modules/mob/living/carbon/brain/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/brain/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/human" -#define FILE_DIR "code/modules/mob/living/carbon/human/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/human/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/metroid" -#define FILE_DIR "code/modules/mob/living/carbon/metroid/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/metroid/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/monkey" -#define FILE_DIR "code/modules/mob/living/carbon/monkey/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/monkey/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon" -#define FILE_DIR "code/modules/mob/living/silicon/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon/ai" -#define FILE_DIR "code/modules/mob/living/silicon/ai/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/ai/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon/decoy" -#define FILE_DIR "code/modules/mob/living/silicon/decoy/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/decoy/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon/pai" -#define FILE_DIR "code/modules/mob/living/silicon/pai/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/pai/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon/robot" -#define FILE_DIR "code/modules/mob/living/silicon/robot/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/robot/.svn/text-base" #define FILE_DIR "code/modules/mob/new_player" -#define FILE_DIR "code/modules/mob/new_player/.svn" -#define FILE_DIR "code/modules/mob/new_player/.svn/text-base" #define FILE_DIR "code/modules/mob/organ" -#define FILE_DIR "code/modules/mob/organ/.svn" -#define FILE_DIR "code/modules/mob/organ/.svn/text-base" #define FILE_DIR "code/modules/mob/simple_animal" -#define FILE_DIR "code/modules/mob/simple_animal/.svn" -#define FILE_DIR "code/modules/mob/simple_animal/.svn/text-base" #define FILE_DIR "code/modules/power" -#define FILE_DIR "code/modules/power/.svn" -#define FILE_DIR "code/modules/power/.svn/text-base" #define FILE_DIR "code/modules/power/antimatter" -#define FILE_DIR "code/modules/power/antimatter/.svn" -#define FILE_DIR "code/modules/power/antimatter/.svn/text-base" #define FILE_DIR "code/modules/power/singularity" -#define FILE_DIR "code/modules/power/singularity/.svn" -#define FILE_DIR "code/modules/power/singularity/.svn/text-base" #define FILE_DIR "code/modules/power/singularity/particle_accelerator" -#define FILE_DIR "code/modules/power/singularity/particle_accelerator/.svn" -#define FILE_DIR "code/modules/power/singularity/particle_accelerator/.svn/text-base" #define FILE_DIR "code/modules/projectiles" -#define FILE_DIR "code/modules/projectiles/.svn" -#define FILE_DIR "code/modules/projectiles/.svn/text-base" #define FILE_DIR "code/modules/projectiles/ammunition" -#define FILE_DIR "code/modules/projectiles/ammunition/.svn" -#define FILE_DIR "code/modules/projectiles/ammunition/.svn/text-base" #define FILE_DIR "code/modules/projectiles/guns" -#define FILE_DIR "code/modules/projectiles/guns/.svn" -#define FILE_DIR "code/modules/projectiles/guns/.svn/text-base" #define FILE_DIR "code/modules/projectiles/guns/energy" -#define FILE_DIR "code/modules/projectiles/guns/energy/.svn" -#define FILE_DIR "code/modules/projectiles/guns/energy/.svn/text-base" #define FILE_DIR "code/modules/projectiles/guns/projectile" -#define FILE_DIR "code/modules/projectiles/guns/projectile/.svn" -#define FILE_DIR "code/modules/projectiles/guns/projectile/.svn/text-base" #define FILE_DIR "code/modules/projectiles/projectile" -#define FILE_DIR "code/modules/projectiles/projectile/.svn" -#define FILE_DIR "code/modules/projectiles/projectile/.svn/text-base" #define FILE_DIR "code/modules/recycling" -#define FILE_DIR "code/modules/recycling/.svn" -#define FILE_DIR "code/modules/recycling/.svn/text-base" #define FILE_DIR "code/modules/research" -#define FILE_DIR "code/modules/research/.svn" -#define FILE_DIR "code/modules/research/.svn/text-base" #define FILE_DIR "code/modules/security levels" -#define FILE_DIR "code/modules/security levels/.svn" -#define FILE_DIR "code/modules/security levels/.svn/text-base" #define FILE_DIR "code/unused" -#define FILE_DIR "code/unused/.svn" -#define FILE_DIR "code/unused/.svn/text-base" #define FILE_DIR "code/unused/beast" -#define FILE_DIR "code/unused/beast/.svn" -#define FILE_DIR "code/unused/beast/.svn/text-base" #define FILE_DIR "code/unused/computer2" -#define FILE_DIR "code/unused/computer2/.svn" -#define FILE_DIR "code/unused/computer2/.svn/text-base" #define FILE_DIR "code/unused/disease2" -#define FILE_DIR "code/unused/disease2/.svn" -#define FILE_DIR "code/unused/disease2/.svn/text-base" #define FILE_DIR "code/unused/gamemodes" -#define FILE_DIR "code/unused/gamemodes/.svn" -#define FILE_DIR "code/unused/gamemodes/.svn/text-base" #define FILE_DIR "code/unused/hivebot" -#define FILE_DIR "code/unused/hivebot/.svn" -#define FILE_DIR "code/unused/hivebot/.svn/text-base" #define FILE_DIR "code/unused/mining" -#define FILE_DIR "code/unused/mining/.svn" -#define FILE_DIR "code/unused/mining/.svn/text-base" #define FILE_DIR "code/unused/optics" -#define FILE_DIR "code/unused/optics/.svn" -#define FILE_DIR "code/unused/optics/.svn/text-base" #define FILE_DIR "code/unused/pda2" -#define FILE_DIR "code/unused/pda2/.svn" -#define FILE_DIR "code/unused/pda2/.svn/text-base" #define FILE_DIR "code/unused/powerarmor" -#define FILE_DIR "code/unused/powerarmor/.svn" -#define FILE_DIR "code/unused/powerarmor/.svn/text-base" #define FILE_DIR "code/unused/spacecraft" -#define FILE_DIR "code/unused/spacecraft/.svn" -#define FILE_DIR "code/unused/spacecraft/.svn/text-base" #define FILE_DIR "code/WorkInProgress" -#define FILE_DIR "code/WorkInProgress/.svn" -#define FILE_DIR "code/WorkInProgress/.svn/text-base" #define FILE_DIR "code/WorkInProgress/mapload" -#define FILE_DIR "code/WorkInProgress/mapload/.svn" -#define FILE_DIR "code/WorkInProgress/mapload/.svn/text-base" #define FILE_DIR "code/WorkInProgress/organs" -#define FILE_DIR "code/WorkInProgress/organs/.svn" -#define FILE_DIR "code/WorkInProgress/organs/.svn/text-base" #define FILE_DIR "code/WorkInProgress/virus2" -#define FILE_DIR "code/WorkInProgress/virus2/.svn" -#define FILE_DIR "code/WorkInProgress/virus2/.svn/text-base" -#define FILE_DIR "config" -#define FILE_DIR "config/.svn" -#define FILE_DIR "config/.svn/text-base" -#define FILE_DIR "config/names" -#define FILE_DIR "config/names/.svn" -#define FILE_DIR "config/names/.svn/text-base" -#define FILE_DIR "data" -#define FILE_DIR "data/.svn" -#define FILE_DIR "data/.svn/text-base" -#define FILE_DIR "data/logs" -#define FILE_DIR "data/logs/2012" -#define FILE_DIR "data/logs/2012/02-February" -#define FILE_DIR "data/player_saves" -#define FILE_DIR "data/player_saves/k" -#define FILE_DIR "data/player_saves/k/korphaeron" #define FILE_DIR "html" -#define FILE_DIR "html/.svn" -#define FILE_DIR "html/.svn/prop-base" -#define FILE_DIR "html/.svn/text-base" #define FILE_DIR "icons" -#define FILE_DIR "icons/.svn" -#define FILE_DIR "icons/.svn/prop-base" -#define FILE_DIR "icons/.svn/text-base" #define FILE_DIR "icons/48x48" -#define FILE_DIR "icons/48x48/.svn" -#define FILE_DIR "icons/48x48/.svn/prop-base" -#define FILE_DIR "icons/48x48/.svn/text-base" #define FILE_DIR "icons/effects" -#define FILE_DIR "icons/effects/.svn" -#define FILE_DIR "icons/effects/.svn/prop-base" -#define FILE_DIR "icons/effects/.svn/text-base" #define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/mecha/.svn" -#define FILE_DIR "icons/mecha/.svn/prop-base" -#define FILE_DIR "icons/mecha/.svn/text-base" #define FILE_DIR "icons/misc" -#define FILE_DIR "icons/misc/.svn" -#define FILE_DIR "icons/misc/.svn/prop-base" -#define FILE_DIR "icons/misc/.svn/text-base" #define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/.svn" -#define FILE_DIR "icons/mob/.svn/prop-base" -#define FILE_DIR "icons/mob/.svn/text-base" #define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/.svn" -#define FILE_DIR "icons/obj/.svn/prop-base" -#define FILE_DIR "icons/obj/.svn/text-base" #define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/assemblies/.svn" -#define FILE_DIR "icons/obj/assemblies/.svn/prop-base" -#define FILE_DIR "icons/obj/assemblies/.svn/text-base" #define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/atmospherics/.svn" -#define FILE_DIR "icons/obj/atmospherics/.svn/prop-base" -#define FILE_DIR "icons/obj/atmospherics/.svn/text-base" #define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/clothing/.svn" -#define FILE_DIR "icons/obj/clothing/.svn/prop-base" -#define FILE_DIR "icons/obj/clothing/.svn/text-base" #define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/doors/.svn" -#define FILE_DIR "icons/obj/doors/.svn/prop-base" -#define FILE_DIR "icons/obj/doors/.svn/text-base" #define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/machines/.svn" -#define FILE_DIR "icons/obj/machines/.svn/prop-base" -#define FILE_DIR "icons/obj/machines/.svn/text-base" #define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/obj/pipes/.svn" -#define FILE_DIR "icons/obj/pipes/.svn/prop-base" -#define FILE_DIR "icons/obj/pipes/.svn/text-base" #define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/pda_icons/.svn" -#define FILE_DIR "icons/pda_icons/.svn/prop-base" -#define FILE_DIR "icons/pda_icons/.svn/text-base" -#define FILE_DIR "icons/PSD files" -#define FILE_DIR "icons/PSD files/.svn" -#define FILE_DIR "icons/PSD files/.svn/prop-base" -#define FILE_DIR "icons/PSD files/.svn/text-base" #define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/spideros_icons/.svn" -#define FILE_DIR "icons/spideros_icons/.svn/prop-base" -#define FILE_DIR "icons/spideros_icons/.svn/text-base" #define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/Testing/.svn" -#define FILE_DIR "icons/Testing/.svn/prop-base" -#define FILE_DIR "icons/Testing/.svn/text-base" #define FILE_DIR "icons/turf" -#define FILE_DIR "icons/turf/.svn" -#define FILE_DIR "icons/turf/.svn/prop-base" -#define FILE_DIR "icons/turf/.svn/text-base" #define FILE_DIR "icons/vending_icons" -#define FILE_DIR "icons/vending_icons/.svn" -#define FILE_DIR "icons/vending_icons/.svn/prop-base" -#define FILE_DIR "icons/vending_icons/.svn/text-base" #define FILE_DIR "interface" -#define FILE_DIR "interface/.svn" -#define FILE_DIR "interface/.svn/text-base" #define FILE_DIR "maps" -#define FILE_DIR "maps/.svn" -#define FILE_DIR "maps/.svn/text-base" -#define FILE_DIR "music" -#define FILE_DIR "music/.svn" -#define FILE_DIR "music/.svn/text-base" #define FILE_DIR "sound" -#define FILE_DIR "sound/.svn" #define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/ambience/.svn" -#define FILE_DIR "sound/ambience/.svn/prop-base" -#define FILE_DIR "sound/ambience/.svn/text-base" #define FILE_DIR "sound/announcer" -#define FILE_DIR "sound/announcer/.svn" -#define FILE_DIR "sound/announcer/.svn/prop-base" -#define FILE_DIR "sound/announcer/.svn/text-base" #define FILE_DIR "sound/bots" -#define FILE_DIR "sound/bots/.svn" -#define FILE_DIR "sound/bots/.svn/prop-base" -#define FILE_DIR "sound/bots/.svn/text-base" #define FILE_DIR "sound/effects" -#define FILE_DIR "sound/effects/.svn" -#define FILE_DIR "sound/effects/.svn/prop-base" -#define FILE_DIR "sound/effects/.svn/text-base" #define FILE_DIR "sound/items" -#define FILE_DIR "sound/items/.svn" -#define FILE_DIR "sound/items/.svn/prop-base" -#define FILE_DIR "sound/items/.svn/text-base" #define FILE_DIR "sound/machines" -#define FILE_DIR "sound/machines/.svn" -#define FILE_DIR "sound/machines/.svn/prop-base" -#define FILE_DIR "sound/machines/.svn/text-base" #define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/mecha/.svn" -#define FILE_DIR "sound/mecha/.svn/prop-base" -#define FILE_DIR "sound/mecha/.svn/text-base" #define FILE_DIR "sound/misc" -#define FILE_DIR "sound/misc/.svn" -#define FILE_DIR "sound/misc/.svn/prop-base" -#define FILE_DIR "sound/misc/.svn/text-base" #define FILE_DIR "sound/piano" -#define FILE_DIR "sound/piano/.svn" -#define FILE_DIR "sound/piano/.svn/prop-base" -#define FILE_DIR "sound/piano/.svn/text-base" -#define FILE_DIR "sound/spells" -#define FILE_DIR "sound/spells/.svn" #define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/.svn" -#define FILE_DIR "sound/voice/.svn/prop-base" -#define FILE_DIR "sound/voice/.svn/text-base" #define FILE_DIR "sound/weapons" -#define FILE_DIR "sound/weapons/.svn" -#define FILE_DIR "sound/weapons/.svn/prop-base" -#define FILE_DIR "sound/weapons/.svn/text-base" -#define FILE_DIR "SQL" -#define FILE_DIR "SQL/.svn" -#define FILE_DIR "SQL/.svn/text-base" -#define FILE_DIR "tools" -#define FILE_DIR "tools/.svn" -#define FILE_DIR "tools/.svn/prop-base" -#define FILE_DIR "tools/.svn/text-base" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG @@ -1399,6 +938,7 @@ #include "code\modules\power\sd_DynamicAreaLighting.dm" #include "code\modules\power\smes.dm" #include "code\modules\power\solar.dm" +#include "code\modules\power\switch.dm" #include "code\modules\power\terminal.dm" #include "code\modules\power\tracker.dm" #include "code\modules\power\turbine.dm"