Cael_Aislinn
bdeb96b7e5
Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/__HELPERS/game.dm
code/controllers/shuttle_controller.dm
code/datums/datumvars.dm
code/datums/supplypacks.dm
code/defines/obj/storage.dm
code/defines/obj/vending.dm
code/defines/obj/weapon.dm
code/defines/procs/command_alert.dm
code/game/area/Space Station 13 areas.dm
code/game/atoms.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/dust.dm
code/game/gamemodes/events/miniblob.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/factions.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/jobs/access.dm
code/game/jobs/job/assistant.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/engineering.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/jobs/job_controller.dm
code/game/machinery/alarm.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/ai_core.dm
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/computer.dm
code/game/machinery/computer/message.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/constructable_frame.dm
code/game/machinery/doors/door.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/newscaster.dm
code/game/machinery/recharger.dm
code/game/machinery/spaceheater.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/machinery/teleporter.dm
code/game/machinery/wishgranter.dm
code/game/mecha/mech_fabricator.dm
code/game/mecha/working/ripley.dm
code/game/objects/items.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/flashlight.dm
code/game/objects/items/devices/radio/encryptionkey.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/medical.dm
code/game/objects/items/weapons/cards_ids.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/hydroponics.dm
code/game/objects/items/weapons/manuals.dm
code/game/objects/items/weapons/secstorage/secstorage.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/storage/firstaid.dm
code/game/objects/items/weapons/storage/kit.dm
code/game/objects/items/weapons/storage/storage.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/tools.dm
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/game/objects/structures/electricchair.dm
code/game/objects/structures/extinguisher.dm
code/game/objects/structures/watercloset.dm
code/game/objects/weapons.dm
code/game/turfs/turf.dm
code/game/vehicles/airtight/airtight.dm
code/game/vehicles/vehicle.dm
code/global.dm
code/modules/DetectiveWork/evidence.dm
code/modules/admin/IsBanned.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/admin/verbs/getlogs.dm
code/modules/client/preferences.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/critters/critter_defenses.dm
code/modules/detectivework/scanner.dm
code/modules/flufftext/Hallucination.dm
code/modules/food/recipes_microwave.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paperbin.dm
code/modules/paperwork/pen.dm
code/modules/power/cable.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/revolver.dm
code/modules/projectiles/projectile/change.dm
code/modules/projectiles/projectile/special.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/hypospray.dm
code/modules/recycling/sortingmachinery.dm
code/modules/research/designs.dm
config/config.txt
html/changelog.html
icons/mob/head.dmi
icons/mob/hud.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/mob/ties.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
icons/obj/grenade.dmi
icons/obj/projectiles.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-11 22:12:31 +10:00
Ravensdale
4dcf0f0c76
alright, 4-way manifolds, manual t-valves, pipe caps.
2013-01-05 21:39:39 -08:00
SkyMarshal
93476a2c16
Finishing touches on Air Alarms, Firedoors, and Central Atmos Control
2013-01-04 22:00:56 -07:00
giacomand@gmail.com
b9bb759cd8
-Multiple fixes for machinery not correctly updating their icons when depowered.
...
-Gave request consoles an off sprite.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5421 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 02:20:03 +00:00
Cael_Aislinn
31349fb7d3
Merge branch 'incremental_tg' r5067 into bs12_with_tgport
...
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)
Conflicts:
baystation12.dme
code/__HELPERS/type2type.dm
code/controllers/configuration.dm
code/datums/datumvars.dm
code/datums/helper_datums/getrev.dm
code/defines/obj.dm
code/game/gamemodes/events/black_hole.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job_controller.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/card.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/turrets.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/turfs/turf.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/admin_memo.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/holder2.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminpm.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/assembly/igniter.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/jobs.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/reagents/Chemistry-Machinery.dm
code/setup.dm
code/stylesheet.dm
code/world.dm
config/admins.txt
config/config.txt
html/changelog.html
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
icons/turf/areas.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 14:13:11 +10:00
Cael_Aislinn
e6c70937e5
Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/game.dm
code/__HELPERS/type2type.dm
code/datums/helper_datums/getrev.dm
code/game/atoms.dm
code/game/gamemodes/events.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/computer.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/newscaster.dm
code/game/machinery/spaceheater.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/machinery/telecomms/telemonitor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/objs.dm
code/modules/DetectiveWork/detective_work.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/verbs/adminsay.dm
code/modules/admin/verbs/getlogs.dm
code/modules/awaymissions/zlevel.dm
code/modules/client/client procs.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/flufftext/TextFilters.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/mine_items.dm
code/modules/mining/mint.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/mob.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/photocopier.dm
code/modules/power/gravitygenerator.dm
html/changelog.html
icons/mob/head.dmi
icons/mob/human_face.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/suits.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 01:07:36 +10:00
giacomand@gmail.com
7caff5dd42
-Proper fix for the scrubber/vent runtimes.
...
I made the vents and scrubbers update the area scrubber/vent info themselves, meaning that an air alarm isn't required to initialize the area/vent info and to stop it from being null.
This will add more flexibility in the future.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5331 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 18:59:47 +00:00
giacomand@gmail.com
74ac2b9611
-Fixed vent pumps/vent scrubbers runtiming on deletion when it is dragged and then consumed by a singularity.
...
-Fixed vents not correctly updating the area with their deletion.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5329 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 16:54:36 +00:00
Cael_Aislinn
2f7baa26f8
antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-01 17:49:34 +10:00
Kreastr
2faf9c7a9c
The groups exist, but the lists do not.
2012-11-12 02:41:12 +02:00
Kreastr
dc396ddb57
Fix for Issue 1868
2012-11-12 02:24:28 +02:00
giacomand@gmail.com
b00c0c2a9f
-New sprites APC sprites by TankNut!
...
-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 14:45:29 +00:00
giacomand@gmail.com
6a2d78bc94
-Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
...
-Atmos delay is now based on active players, to help fight lag for massive player rounds.
-Changed some for(blah in world) loops to use the correct lists.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
Cael_Aislinn
dd538fd3c5
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
...
Conflicts:
code/game/gamemodes/events.dm
code/game/gamemodes/wizard/veilrender.dm
code/game/jobs/job/captain.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/structures/grille.dm
code/modules/mob/living/simple_animal/life.dm
code/setup.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-22 20:15:05 +10:00
giacomand@gmail.com
6f7c26629d
-Changed xeno to have a safe way to hatch eggs with plasma.
...
http://imgur.com/80LJx
-Added a turf meter which shows the air contents of a tile.
-Added a simple vent controller for the dual vents.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4935 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-22 05:41:00 +00:00
Cael_Aislinn
2f853fe23a
Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/objects/items/devices/radio/radio.dm
code/modules/admin/admin_verbs.dm
code/modules/awaymissions/zlevel.dm
code/modules/client/client procs.dm
code/modules/mob/living/say.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/mob_cleanup.dm
code/modules/paperwork/paperbin.dm
html/changelog.html
icons/turf/areas.dmi
maps/RandomZLevels/assistantChamber.dmm
maps/RandomZLevels/fileList.txt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-21 00:25:05 +10:00
aranclanos@hotmail.com
d25a5d5aa3
Fixes issue 1001.
...
Fixes issue 994. (Chemsprayers are not included)
Fixes issue 990.
Adding some instant admin logs and server logs for some stuff in emitters/PA. See image. http://i.imgur.com/7kQpH.png
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4904 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 14:27:23 +00:00
petethegoat@gmail.com
cfb1ad5551
Committing for Aranclanos:
...
Fixes issue 986. (Constructed normal walls named wrong)
Fixes issue 1000. (Destroyed vent still shows up in air alarm)
Fixes issue 1003. (Glowshrooms don't give off light when planted!)
Fixes issue 1004. (Issues with (?) Command)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4884 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 16:45:18 +00:00
Cael_Aislinn
6bd0e536bd
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
code/datums/organs/organ_external.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/hud.dm
code/game/jobs/job/captain.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/recharger.dm
code/game/objects/hud.dm
code/game/turfs/turf.dm
code/modules/client/client defines.dm
code/modules/clothing/head/misc.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/under/miscellaneous.dm
code/modules/mob/living/carbon/alien/humanoid/hud.dm
code/modules/mob/living/carbon/human/hud.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/monkey/hud.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_helpers.dm
code/modules/mob/mob_movement.dm
code/modules/mob/screen.dm
code/modules/paperwork/filingcabinet.dm
code/modules/power/cable_heavyduty.dm
code/modules/projectiles/guns/energy/temperature.dm
code/setup.dm
config/game_options.txt
icons/mob/screen1_Midnight.dmi
icons/mob/screen1_Orange.dmi
icons/mob/screen1_alien.dmi
icons/mob/screen1_old.dmi
icons/obj/atmospherics/passive_gate.dmi
icons/obj/pipe-item.dmi
interface/interface.dm
2012-10-05 22:21:26 +10:00
baloh.matevz
d20ec0696a
- Piped tgstation 3.0.0.dmm
...
(Damn it, it took a million hours to do that, and the entire commit log is going to be two words long?!)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4804 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-04 02:30:17 +00:00
giacomand@gmail.com
5557116fd9
Committing for Numbers.
...
- Readded Volume Pumps - now they work as intended and are constructable
- Readded Passive Gates - now they work as intended and are constructable
- Readded Heat Exchangers - now they work as intended and are constructable
- Added Heater - to warm up gasses to 300C
- Adjusted volumes on big tanks and portable pumps to 2000 and 1200 respectably
- Pipe dispensers can produce the readded pieces.
- Pipe construction code updated to compesate for the new items
- New graphics for all of the above - courtesy by Ausops.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4785 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 19:31:35 +00:00
giacomand@gmail.com
f3f8340a3d
Experimental tweak, I'll revert this if everyone hates it but for now I want to see how things will be if airlocks use the environmental power channel.
...
-Changed airlocks to use the environmental power channel.
-Changed all airlock controlling devices to use the environmental power channel.
-Changed shutters to use the environmental power channel.
-Changed pipe meters to use the environmental power channel.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4784 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 18:51:23 +00:00
Cael_Aislinn
c4bd191222
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/defines/obj.dm
code/game/gamemodes/events.dm
code/game/machinery/newscaster.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/structures/stool_bed_chair_nest/bed.dm
code/game/turfs/turf.dm
code/modules/awaymissions/zlevel.dm
code/modules/maps/fromdmp.dm
code/modules/mob/living/silicon/ai/freelook/eye.dm
code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/mob_movement.dm
code/setup.dm
icons/mob/uniform.dmi
icons/obj/closet.dmi
icons/obj/clothing/uniforms.dmi
maps/RandomZLevels/assistantChamber.dmm
maps/RandomZLevels/fileList.txt
maps/tgstation.2.0.9.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-04 22:19:03 +10:00
elly1989@rocketmail.com
73e5c38a56
Preparations for reducing the number of processing machines at round-start. There are currently 8000 or so at round start, this was already pruned to 2800ish by doohl's stuff.
...
machine.process() now uses a return value to remove itself from the processing machines list. This is more efficient and will help reduce costs especially at round start where some 5000+ machines were removed from the list using first-find. Now there is no searching involved. Instead of machines.Remove(src) just do .=PROCESS_KILL that will return the flag to the proc which called it (the MC) and trigger its removal from the list. If you're deleting something don't even bother removing it from the machines list, there is no need to.
Simplified the last_processed stuff for the MC. It's now a single variable rather than 3. It is simply a typepath rather than a reference to an object (this is so it works even if said object is deleted)
MC stats in admin status_panels now show the length of the processing lists (indicated by #). I've just realised I forgot to mention what the abbreviations are:
The less obvious ones are: Dis=diseases; Net=pipes; Pnet=powernets; Mch=Machines; Tick=the game-mode ticker.
Beach-water now uses an overlay image rather than a separate object.
Fixed a typo in the shuttle console.
Hydroponics trays no longer use first-find within their process() for checking the plant is in the tray (why is that even there anyway? talk about lazy)
Removed some junk/placeholder procs like organ/proc/process() return
Removed newscasters from the processing machines lists.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4603 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 20:32:01 +00:00
Cael_Aislinn
c314b5f42b
Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12
...
Conflicts:
README.txt
SQL/tgstation_schema.sql
baystation12.dme
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/ATMOSPHERICS/pipes.dm
code/FEA/FEA_airgroup.dm
code/FEA/FEA_fire.dm
code/FEA/FEA_gas_mixture.dm
code/FEA/FEA_turf_tile.dm
code/TriDimension/Pipes.dm
code/WorkInProgress/buildmode.dm
code/WorkInProgress/organs/organs.dm
code/WorkInProgress/virus2/Disease2/analyser.dm
code/WorkInProgress/virus2/Disease2/biohazard destroyer.dm
code/WorkInProgress/virus2/Disease2/cureimplanter.dm
code/WorkInProgress/virus2/Disease2/diseasesplicer.dm
code/WorkInProgress/virus2/Disease2/dishincubator.dm
code/WorkInProgress/virus2/Disease2/isolator.dm
code/WorkInProgress/virus2/Disease2/monkeydispensor.dm
code/WorkInProgress/virus2/analyser.dm
code/WorkInProgress/virus2/antibodies.dm
code/WorkInProgress/virus2/base.dm
code/WorkInProgress/virus2/biohazard destroyer.dm
code/WorkInProgress/virus2/cureimplanter.dm
code/WorkInProgress/virus2/curer.dm
code/WorkInProgress/virus2/diseasesplicer.dm
code/WorkInProgress/virus2/dishincubator.dm
code/WorkInProgress/virus2/isolator.dm
code/WorkInProgress/virus2/monkeydispensor.dm
code/datums/ai_laws.dm
code/datums/configuration.dm
code/datums/datumvars.dm
code/datums/diseases/alien_embryo.dm
code/datums/diseases/appendicitis.dm
code/datums/diseases/robotic_transformation.dm
code/datums/diseases/xeno_transformation.dm
code/datums/helper_datums/getrev.dm
code/datums/helper_datums/teleport.dm
code/datums/helper_datums/tension.dm
code/datums/mind.dm
code/datums/mixed.dm
code/datums/shuttle_controller.dm
code/datums/spell.dm
code/datums/spells/ethereal_jaunt.dm
code/datums/spells/genetic.dm
code/datums/spells/wizard.dm
code/defines/area/Space Station 13 areas.dm
code/defines/atom.dm
code/defines/global.dm
code/defines/mob/dead/observer.dm
code/defines/mob/living/carbon/alien.dm
code/defines/mob/living/carbon/alien_humanoid.dm
code/defines/mob/living/carbon/carbon.dm
code/defines/mob/living/carbon/metroid.dm
code/defines/mob/living/carbon/monkey.dm
code/defines/mob/living/living.dm
code/defines/mob/living/silicon/ai.dm
code/defines/mob/living/silicon/robot.dm
code/defines/obj.dm
code/defines/obj/closet.dm
code/defines/obj/clothing.dm
code/defines/obj/clothing/costume.dm
code/defines/obj/computer.dm
code/defines/obj/costume.dm
code/defines/obj/decal.dm
code/defines/obj/door.dm
code/defines/obj/hydro.dm
code/defines/obj/machinery.dm
code/defines/obj/storage.dm
code/defines/obj/supplypacks.dm
code/defines/obj/toy.dm
code/defines/obj/vending.dm
code/defines/obj/weapon.dm
code/defines/procs/AStar.dm
code/defines/procs/command_name.dm
code/defines/procs/dbcore.dm
code/defines/procs/forum_activation.dm
code/defines/procs/gamehelpers.dm
code/defines/procs/helpers.dm
code/defines/procs/icon_procs.dm
code/defines/procs/station_name.dm
code/defines/procs/statistics.dm
code/defines/turf.dm
code/game/algorithm.dm
code/game/area/areas.dm
code/game/asteroid/artifacts.dm
code/game/atom_procs.dm
code/game/cellautomata.dm
code/game/dna.dm
code/game/events/EventProcs/clang.dm
code/game/events/EventProcs/dust.dm
code/game/events/EventProcs/ninja_abilities.dm
code/game/events/EventProcs/ninja_equipment.dm
code/game/events/EventProcs/space_ninja.dm
code/game/events/EventProcs/spacevines.dm
code/game/gamemodes/blob/blob.dm
code/game/gamemodes/blob/blob_finish.dm
code/game/gamemodes/blob/blob_report.dm
code/game/gamemodes/blob/theblob.dm
code/game/gamemodes/changeling/changeling.dm
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/changeling/traitor_chan.dm
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/cult/cult_items.dm
code/game/gamemodes/cult/cult_structures.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/black_hole.dm
code/game/gamemodes/events/miniblob.dm
code/game/gamemodes/factions.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/gamemodes/malfunction/malfunction.dm
code/game/gamemodes/meteor/meteor.dm
code/game/gamemodes/meteor/meteors.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/nuclear/nuclearbomb.dm
code/game/gamemodes/nuclear/pinpointer.dm
code/game/gamemodes/objective.dm
code/game/gamemodes/revolution/revolution.dm
code/game/gamemodes/sandbox/h_sandbox.dm
code/game/gamemodes/sandbox/sandbox.dm
code/game/gamemodes/setupgame.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/gamemodes/wizard/soulstone.dm
code/game/gamemodes/wizard/spellbook.dm
code/game/gamemodes/wizard/spells.dm
code/game/gamemodes/wizard/veilrender.dm
code/game/gamemodes/wizard/wizard.dm
code/game/hud.dm
code/game/jobs/access.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/civilian_chaplain.dm
code/game/jobs/job/engineering.dm
code/game/jobs/job/job.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/jobs/job/silicon.dm
code/game/jobs/job_controller.dm
code/game/jobs/jobs.dm
code/game/machinery/Beacon.dm
code/game/machinery/OpTable.dm
code/game/machinery/Sleeper.dm
code/game/machinery/alarm.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/autolathe.dm
code/game/machinery/biogenerator.dm
code/game/machinery/bots/bots.dm
code/game/machinery/bots/cleanbot.dm
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/floorbot.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/bots/mulebot.dm
code/game/machinery/camera.dm
code/game/machinery/cell_charger.dm
code/game/machinery/cloning.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/Operating.dm
code/game/machinery/computer/ai_core.dm
code/game/machinery/computer/arcade.dm
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/buildandrepair.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/communications.dm
code/game/machinery/computer/computer.dm
code/game/machinery/computer/crew.dm
code/game/machinery/computer/hologram.dm
code/game/machinery/computer/law.dm
code/game/machinery/computer/medical.dm
code/game/machinery/computer/message.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/power.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/robot.dm
code/game/machinery/computer/security.dm
code/game/machinery/computer/shuttle.dm
code/game/machinery/constructable_frame.dm
code/game/machinery/deployable.dm
code/game/machinery/door_control.dm
code/game/machinery/doors/airlock.dm
code/game/machinery/doors/airlock_electronics.dm
code/game/machinery/doors/brigdoors.dm
code/game/machinery/doors/door.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/doors/poddoor.dm
code/game/machinery/doors/unpowered.dm
code/game/machinery/doors/windowdoor.dm
code/game/machinery/flasher.dm
code/game/machinery/gateway.dm
code/game/machinery/hologram.dm
code/game/machinery/hydroponics.dm
code/game/machinery/kitchen/gibber.dm
code/game/machinery/morgue.dm
code/game/machinery/newscaster.dm
code/game/machinery/pipe/construction.dm
code/game/machinery/pipe/pipe_dispenser.dm
code/game/machinery/portable_turret.dm
code/game/machinery/recharger.dm
code/game/machinery/rechargestation.dm
code/game/machinery/requests_console.dm
code/game/machinery/shieldgen.dm
code/game/machinery/spaceheater.dm
code/game/machinery/suit_storage_unit.dm
code/game/machinery/syndicatebeacon.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/machinery/telecomms/telemonitor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/teleporter.dm
code/game/machinery/turrets.dm
code/game/machinery/vending.dm
code/game/magic/cultist/ritual.dm
code/game/magic/cultist/runes.dm
code/game/magic/library.dm
code/game/magic/musician.dm
code/game/master_controller.dm
code/game/mecha/combat/combat.dm
code/game/mecha/combat/gygax.dm
code/game/mecha/equipment/mecha_equipment.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/equipment/weapons/weapons.dm
code/game/mecha/mech_fabricator.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_construction_paths.dm
code/game/mecha/mecha_wreckage.dm
code/game/mecha/medical/medical.dm
code/game/mecha/medical/odysseus.dm
code/game/mecha/working/ripley.dm
code/game/objects/alien/facehugger.dm
code/game/objects/alien/resin.dm
code/game/objects/bodybag.dm
code/game/objects/closets.dm
code/game/objects/closets/emergency.dm
code/game/objects/closets/extinguisher.dm
code/game/objects/closets/fireaxe.dm
code/game/objects/closets/firecloset.dm
code/game/objects/closets/fitnesscloset.dm
code/game/objects/closets/janitor.dm
code/game/objects/closets/kitchen.dm
code/game/objects/closets/nuclear.dm
code/game/objects/closets/secure/bar.dm
code/game/objects/closets/secure/cargo.dm
code/game/objects/closets/secure/engineering.dm
code/game/objects/closets/secure/hydroponics.dm
code/game/objects/closets/secure/medical.dm
code/game/objects/closets/secure/personal.dm
code/game/objects/closets/secure/scientist.dm
code/game/objects/closets/secure/secure_closets.dm
code/game/objects/closets/secure/security.dm
code/game/objects/closets/syndicate.dm
code/game/objects/closets/wardrobe.dm
code/game/objects/contraband.dm
code/game/objects/crates.dm
code/game/objects/devices/PDA/PDA.dm
code/game/objects/devices/PDA/cart.dm
code/game/objects/devices/PDA/chatroom.dm
code/game/objects/devices/aicard.dm
code/game/objects/devices/flash.dm
code/game/objects/devices/flashlight.dm
code/game/objects/devices/paicard.dm
code/game/objects/devices/scanners.dm
code/game/objects/devices/taperecorder.dm
code/game/objects/devices/traitordevices.dm
code/game/objects/door_assembly.dm
code/game/objects/effect_system.dm
code/game/objects/electricchair.dm
code/game/objects/explosion.dm
code/game/objects/gibs.dm
code/game/objects/grille.dm
code/game/objects/items.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/candle.dm
code/game/objects/items/clothing.dm
code/game/objects/items/food.dm
code/game/objects/items/helper_procs.dm
code/game/objects/items/item.dm
code/game/objects/items/robot_items.dm
code/game/objects/items/robot_parts.dm
code/game/objects/items/tk_grab.dm
code/game/objects/items/weapons/AI_modules.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/RSF.dm
code/game/objects/items/weapons/cameras.dm
code/game/objects/items/weapons/cards_ids.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/items/weapons/clown_items.dm
code/game/objects/items/weapons/dna_injector.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/grenades.dm
code/game/objects/items/weapons/hand_lablers.dm
code/game/objects/items/weapons/hydroponics.dm
code/game/objects/items/weapons/implants/implant.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/implants/implantchair.dm
code/game/objects/items/weapons/implants/implanter.dm
code/game/objects/items/weapons/implants/implantfreedom.dm
code/game/objects/items/weapons/implants/implantnanoaug.dm
code/game/objects/items/weapons/implants/implantpad.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/manuals.dm
code/game/objects/items/weapons/medical.dm
code/game/objects/items/weapons/mops_cleaners.dm
code/game/objects/items/weapons/papers_bins.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/swords_axes_etc.dm
code/game/objects/items/weapons/table_rack_parts.dm
code/game/objects/items/weapons/tools.dm
code/game/objects/items/weapons/twohanded.dm
code/game/objects/items/weapons/wrappingpaper.dm
code/game/objects/mineral_doors.dm
code/game/objects/radio/beacon.dm
code/game/objects/radio/electropack.dm
code/game/objects/radio/encryptionkey.dm
code/game/objects/radio/headset.dm
code/game/objects/radio/intercom.dm
code/game/objects/radio/radio.dm
code/game/objects/secstorage/sbriefcase.dm
code/game/objects/secstorage/ssafe.dm
code/game/objects/stacks/glass.dm
code/game/objects/stacks/metal.dm
code/game/objects/stacks/stack.dm
code/game/objects/stacks/wood.dm
code/game/objects/stool.dm
code/game/objects/storage/backpack.dm
code/game/objects/storage/belt.dm
code/game/objects/storage/bible.dm
code/game/objects/storage/briefcase.dm
code/game/objects/storage/lockbox.dm
code/game/objects/storage/storage.dm
code/game/objects/storage/uplink_kits.dm
code/game/objects/structures.dm
code/game/objects/tables_racks.dm
code/game/objects/tank.dm
code/game/objects/tanks/emergency.dm
code/game/objects/tanks/jetpack.dm
code/game/objects/toys.dm
code/game/objects/transfer_valve.dm
code/game/objects/uplinks.dm
code/game/objects/watercloset.dm
code/game/objects/weapons.dm
code/game/objects/windoor_assembly.dm
code/game/objects/window.dm
code/game/prisonshuttle.dm
code/game/smoothwall.dm
code/game/sound.dm
code/game/step_triggers.dm
code/game/structure/structure.dm
code/game/supplyshuttle.dm
code/game/throwing.dm
code/game/topic.dm
code/game/turf.dm
code/game/vehicles/airtight/airtight.dm
code/game/vehicles/airtight/land.dm
code/game/vehicles/airtight/space.dm
code/game/vehicles/vehicle.dm
code/game/verbs/ooc.dm
code/game/verbs/sound.dm
code/game/verbs/suicide.dm
code/game/verbs/who.dm
code/game/vote.dm
code/modules/admin/IsBanned.dm
code/modules/admin/NewBan.dm
code/modules/admin/admin.dm
code/modules/admin/admin_investigate.dm
code/modules/admin/admin_memo.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/banjob.dm
code/modules/admin/create_mob.dm
code/modules/admin/create_object.dm
code/modules/admin/create_turf.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/MC.dm
code/modules/admin/verbs/adminhelp.dm
code/modules/admin/verbs/adminjump.dm
code/modules/admin/verbs/adminpm.dm
code/modules/admin/verbs/adminsay.dm
code/modules/admin/verbs/atmosdebug.dm
code/modules/admin/verbs/cinematic.dm
code/modules/admin/verbs/deadsay.dm
code/modules/admin/verbs/debug.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/admin/verbs/getlogs.dm
code/modules/admin/verbs/mapping.dm
code/modules/admin/verbs/massmodvar.dm
code/modules/admin/verbs/modifyvariables.dm
code/modules/admin/verbs/onlyone.dm
code/modules/admin/verbs/playsound.dm
code/modules/admin/verbs/possess.dm
code/modules/admin/verbs/pray.dm
code/modules/admin/verbs/randomverbs.dm
code/modules/admin/verbs/striketeam.dm
code/modules/admin/verbs/striketeam_syndicate.dm
code/modules/assembly/assembly.dm
code/modules/assembly/signaler.dm
code/modules/chemical/Chemistry-Machinery.dm
code/modules/chemical/Chemistry-Tools.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/costume.dm
code/modules/clothing/gimmick.dm
code/modules/clothing/glasses.dm
code/modules/clothing/glasses/glasses.dm
code/modules/clothing/glasses/hud.dm
code/modules/clothing/gloves.dm
code/modules/clothing/head/hardhat.dm
code/modules/clothing/jumpsuit.dm
code/modules/clothing/mask.dm
code/modules/clothing/shoes.dm
code/modules/clothing/spacesuit.dm
code/modules/clothing/spacesuits/captain.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/spacesuits/ninja.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/spacesuits/syndi.dm
code/modules/clothing/spacesuits/void.dm
code/modules/clothing/suit.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/bomb.dm
code/modules/clothing/suits/detective.dm
code/modules/clothing/suits/fire.dm
code/modules/clothing/suits/heavy.dm
code/modules/clothing/suits/hos.dm
code/modules/clothing/suits/labcoat.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/clothing/suits/wiz_robe.dm
code/modules/clothing/uniforms/lawyer.dm
code/modules/critters/critter.dm
code/modules/critters/critter_AI.dm
code/modules/critters/critters.dm
code/modules/critters/hivebots/hivebot.dm
code/modules/flufftext/Dreaming.dm
code/modules/flufftext/Hallucination.dm
code/modules/flufftext/TextFilters.dm
code/modules/food/food.dm
code/modules/food/meat.dm
code/modules/food/recipes_microwave.dm
code/modules/maps/SwapMaps.dm
code/modules/maps/dmm_suite.dm
code/modules/maps/fromdmp.dm
code/modules/maps/randomZlevel.dm
code/modules/maps/reader.dm
code/modules/maps/writer.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/machine_unloading.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/mint.dm
code/modules/mining/ores_materials_coins.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/dead/death.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/death.dm
code/modules/mob/living/blob/blob.dm
code/modules/mob/living/carbon/alien/alien.dm
code/modules/mob/living/carbon/alien/death.dm
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
code/modules/mob/living/carbon/alien/humanoid/death.dm
code/modules/mob/living/carbon/alien/humanoid/hud.dm
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/humanoid/login.dm
code/modules/mob/living/carbon/alien/humanoid/queen.dm
code/modules/mob/living/carbon/alien/larva/death.dm
code/modules/mob/living/carbon/alien/larva/hud.dm
code/modules/mob/living/carbon/alien/larva/larva.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/alien/larva/login.dm
code/modules/mob/living/carbon/alien/larva/powers.dm
code/modules/mob/living/carbon/alien/special/_main.dm
code/modules/mob/living/carbon/alien/special/snakeman.dm
code/modules/mob/living/carbon/brain/MMI.dm
code/modules/mob/living/carbon/brain/brain.dm
code/modules/mob/living/carbon/brain/death.dm
code/modules/mob/living/carbon/brain/hud.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/brain/say.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/hud.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackalien.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/human_damage.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/login.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/whisper.dm
code/modules/mob/living/carbon/metroid/death.dm
code/modules/mob/living/carbon/metroid/examine.dm
code/modules/mob/living/carbon/metroid/life.dm
code/modules/mob/living/carbon/metroid/login.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/carbon/metroid/powers.dm
code/modules/mob/living/carbon/monkey/death.dm
code/modules/mob/living/carbon/monkey/examine.dm
code/modules/mob/living/carbon/monkey/hud.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/monkey/login.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/mob/living/carbon/monkey/powers.dm
code/modules/mob/living/damage_procs.dm
code/modules/mob/living/living.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/login.dm
code/modules/mob/living/say.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/ai/death.dm
code/modules/mob/living/silicon/ai/examine.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/living/silicon/ai/login.dm
code/modules/mob/living/silicon/ai/move.dm
code/modules/mob/living/silicon/death.dm
code/modules/mob/living/silicon/decoy/death.dm
code/modules/mob/living/silicon/pai/death.dm
code/modules/mob/living/silicon/pai/hud.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/mob/living/silicon/pai/recruit.dm
code/modules/mob/living/silicon/pai/software.dm
code/modules/mob/living/silicon/robot/death.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/examine.dm
code/modules/mob/living/silicon/robot/hud.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/silicon/robot/login.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/mob/living/silicon/robot/say.dm
code/modules/mob/living/silicon/robot/wires.dm
code/modules/mob/living/silicon/say.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/login.dm
code/modules/mob/logout.dm
code/modules/mob/mob.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_grab.dm
code/modules/mob/mob_helpers.dm
code/modules/mob/mob_movement.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/mob/new_player/login.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/mob/new_player/savefile.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/mob/organ/organ.dm
code/modules/mob/organ/organ_external.dm
code/modules/mob/organ/pain.dm
code/modules/mob/say.dm
code/modules/mob/screen.dm
code/modules/mob/simple_animal/crab.dm
code/modules/mob/transform_procs.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/handlabeler.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paperbin.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/photocopier.dm
code/modules/paperwork/stamps.dm
code/modules/power/antimatter/computer.dm
code/modules/power/antimatter/engine.dm
code/modules/power/antimatter/fuel.dm
code/modules/power/apc.dm
code/modules/power/cable.dm
code/modules/power/cable_heavyduty.dm
code/modules/power/cell.dm
code/modules/power/generator.dm
code/modules/power/generator_type2.dm
code/modules/power/gravitygenerator.dm
code/modules/power/lighting.dm
code/modules/power/port_gen.dm
code/modules/power/sd_DynamicAreaLighting.dm
code/modules/power/singularity/collector.dm
code/modules/power/singularity/containment_field.dm
code/modules/power/singularity/emitter.dm
code/modules/power/singularity/field_generator.dm
code/modules/power/singularity/generator.dm
code/modules/power/singularity/investigate.dm
code/modules/power/singularity/particle_accelerator/particle.dm
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
code/modules/power/singularity/particle_accelerator/particle_chamber.dm
code/modules/power/singularity/particle_accelerator/particle_control.dm
code/modules/power/singularity/particle_accelerator/particle_emitter.dm
code/modules/power/singularity/particle_accelerator/particle_power.dm
code/modules/power/singularity/singularity.dm
code/modules/power/smes.dm
code/modules/power/solar.dm
code/modules/power/switch.dm
code/modules/power/turbine.dm
code/modules/projectiles/ammunition.dm
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/energy.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/energy/pulse.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/projectiles/guns/projectile.dm
code/modules/projectiles/guns/projectile/pistol.dm
code/modules/projectiles/guns/projectile/revolver.dm
code/modules/projectiles/guns/projectile/shotgun.dm
code/modules/projectiles/projectile.dm
code/modules/projectiles/projectile/beams.dm
code/modules/projectiles/projectile/bullets.dm
code/modules/projectiles/projectile/change.dm
code/modules/projectiles/projectile/special.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/recycling/conveyor2.dm
code/modules/recycling/disposal-construction.dm
code/modules/recycling/disposal.dm
code/modules/recycling/sortingmachinery.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/message_server.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/rdmachines.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/scripting/AST/Operators/Binary Operators.dm
code/modules/scripting/Implementations/Telecomms.dm
code/modules/scripting/Parser/Keywords.dm
code/modules/scripting/Scanner/Tokens.dm
code/modules/scripting/stack.dm
code/modules/security levels/keycard authentication.dm
code/modules/security levels/security levels.dm
code/setup.dm
code/stylesheet.dm
code/unused/AI_Visibility.dm
code/unused/Ultralight.dm
code/unused/airtunnel.dm
code/unused/beast/bodypart.dm
code/unused/conveyor.dm
code/unused/disease2/analyser.dm
code/unused/disease2/base.dm
code/unused/disease2/biohazard destroyer.dm
code/unused/disease2/cureimplanter.dm
code/unused/disease2/curer.dm
code/unused/disease2/diseasesplicer.dm
code/unused/disease2/dishincubator.dm
code/unused/disease2/isolator.dm
code/unused/disease2/monkeydispensor.dm
code/unused/dna.dm
code/unused/gamemodes/deathmatch.dm
code/unused/jobs.dm
code/unused/mining/datum_processing_recipe.dm
code/unused/mining/spaceship_builder_unused.dm
code/unused/new_year.dm
code/unused/spacecraft/manufacturing.dm
code/unused/spacecraft/shipcore.dm
config/README feedback.txt
config/admins.txt
config/config.txt
config/rules.html
data/mode.txt
html/add-to-changelog.html
html/archivedchangelog.html
html/changelog.css
html/changelog.html
html/changelog.js
icons/effects/blood.dmi
icons/effects/genetics.dmi
icons/misc/fullscreen.dmi
icons/mob/AI.dmi
icons/mob/alien.dmi
icons/mob/animal.dmi
icons/mob/back.dmi
icons/mob/belt.dmi
icons/mob/blob.dmi
icons/mob/critter.dmi
icons/mob/dam_human.dmi
icons/mob/eyes.dmi
icons/mob/feet.dmi
icons/mob/hands.dmi
icons/mob/head.dmi
icons/mob/human.dmi
icons/mob/human_face.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/livestock.dmi
icons/mob/mask.dmi
icons/mob/mecha.dmi
icons/mob/mob.dmi
icons/mob/monkey.dmi
icons/mob/robots.dmi
icons/mob/screen1.dmi
icons/mob/screen1_Midnight.dmi
icons/mob/screen1_Orange.dmi
icons/mob/screen1_alien.dmi
icons/mob/screen1_old.dmi
icons/mob/suit.dmi
icons/mob/uniform.dmi
icons/mob/zone_sel.dmi
icons/obj/Cryogenic2.dmi
icons/obj/aibots.dmi
icons/obj/ammo.dmi
icons/obj/atmos.dmi
icons/obj/bureaucracy.dmi
icons/obj/card.dmi
icons/obj/cigarettes.dmi
icons/obj/closet.dmi
icons/obj/clothing/glasses.dmi
icons/obj/clothing/gloves.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/uniforms.dmi
icons/obj/computer.dmi
icons/obj/contraband.dmi
icons/obj/decals.dmi
icons/obj/device.dmi
icons/obj/doors/DoorHazard.dmi
icons/obj/doors/door_assembly.dmi
icons/obj/drinks.dmi
icons/obj/engine.dmi
icons/obj/food.dmi
icons/obj/grenade.dmi
icons/obj/gun.dmi
icons/obj/harvest.dmi
icons/obj/hydroponics.dmi
icons/obj/items.dmi
icons/obj/janitor.dmi
icons/obj/library.dmi
icons/obj/lighting.dmi
icons/obj/machines/field_generator.dmi
icons/obj/machines/gateway.dmi
icons/obj/machines/mining_machines.dmi
icons/obj/machines/particle_accelerator.dmi
icons/obj/meter.dmi
icons/obj/mining.dmi
icons/obj/objects.dmi
icons/obj/paper.dmi
icons/obj/pda.dmi
icons/obj/pipes/disposal.dmi
icons/obj/plants.dmi
icons/obj/power.dmi
icons/obj/projectiles.dmi
icons/obj/robotics.dmi
icons/obj/seeds.dmi
icons/obj/singularity.dmi
icons/obj/stationobjs.dmi
icons/obj/stock_parts.dmi
icons/obj/storage.dmi
icons/obj/structures.dmi
icons/obj/surgery.dmi
icons/obj/syringe.dmi
icons/obj/tank.dmi
icons/obj/terminals.dmi
icons/obj/toy.dmi
icons/obj/vending.dmi
icons/obj/watercloset.dmi
icons/obj/weapons.dmi
icons/obj/wizard.dmi
icons/turf/areas.dmi
icons/turf/floors.dmi
icons/turf/walls.dmi
interface/interface.dm
interface/skin.dmf
maps/Antiqua.dmm
maps/RandomZLevels/assistantChamber.dmm
maps/RandomZLevels/fileList.txt
maps/tgstation.2.0.9.dmm
sound/AI/animes.ogg
sound/AI/newroundsexy.ogg
sound/AI/newroundsexy2.ogg
sound/effects/adminhelp.ogg
tools/UnstandardnessTestForDM/UnstandardnessTestForDM.sln
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.Designer.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.resx
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Program.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/AssemblyInfo.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.Designer.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.resx
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.Designer.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.settings
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/UnstandardnessTestForDM.csproj
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe.manifest
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.csproj.FileListAbsolute.txt
tools/expand_filedir_paths.py
tools/readme.txt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-08-22 04:00:11 +10:00
elly1989@rocketmail.com
4073ac9b00
Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.
...
All credits to the author for this handy little script.
I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work.
To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders"
If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-18 16:33:40 +00:00
baloh.matevz
6b1a3e46a0
- Fixes issue 804. valve networks were not properly built during initialization, which resulted in both nodes beings et properly, but only one network to be set for both nodes, despite each of them having their own network. A call to build_network() fixed the issue.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4469 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-17 08:38:40 +00:00
rockdtben@gmail.com
cc0e314925
Fixes Issue 706
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4253 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-31 17:45:30 +00:00
sieve32@gmail.com
459c558898
-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)
...
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.
r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds
[VGTG]
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-23 00:48:51 +00:00
sick-trigger
a635e68a23
Air alarm vent pressure controls increment properly.
2012-06-26 14:06:33 +10:00
Erthilo
e7e1b8f9e8
More compile stuff.
2012-06-23 16:14:00 +01:00
SkyMarshal
730461840f
UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun)
2012-06-21 13:35:34 -07:00
SkyMarshal
c2163b1f20
Atmos Alarms now work awesome.
2012-06-21 02:05:33 -07:00
SkyMarshal
5ac37c7a78
Final parts of the air alarm rewrite.
2012-06-21 02:05:33 -07:00
SkyMarshal
f953f78d73
WIP air alarms
2012-06-21 02:05:32 -07:00
d_h2005@yahoo.com
6c998fa177
This is the final part of the 3-part update, brought to you by the letter 'A'!
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3844 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-16 18:17:17 +00:00
baloh.matevz
b0a05ab52b
This part of a three part commit is brought to you by: The letter 'P'.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3843 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-16 18:14:29 +00:00
johnsonmt88@gmail.com
1554e2800c
This part of a three part commit is brought to you by: The letter 'k'.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3842 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-16 18:12:05 +00:00
johnsonmt88@gmail.com
883b290064
Server crashing and exploit fixes
...
Added a cooldown to the containment field shocking players
- If a containment field was set up in a small room, it was possible to crash the server by jumping into the field with no way to escape it. This was likely due to the hundreds of spark effects being generated every second, on top of all the other calls it had to make.
Used the existing parent proc to check for proximity, canmove and death on:
- Atmos pumps
- Atmos mixers
- Canisters. (This should finish off issue 397.)
- Crew monitering computer (This one probably didn't need it but it shouldn't change the way it works.)
Added admin checks to:
- datum/mind
- tensioner
If either of these fail an admin check an admin log will be entered into the server logs and a message will be displayed to admins.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3818 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-14 19:31:15 +00:00
baloh.matevz
d8047dfefa
- The thermoelectric generator now works... more or less. Not that I changed anything...
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3773 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-09 12:40:39 +00:00
Erthilo
eb7ae97624
TG: Welding tool: Mostly code-related, the players won't notice much.
...
- Welding tool code how has proper comments! Maybe not "proper" but at least I
don't lie and say a proc is/does something that it doesn't actually do.
- Welders now start full of fuel instead of some random amount between 10-20
- Someone decided it would be a good idea to set the welding tool's 'on/off' var
in a ton of attackby() procs. These objects and turfs shouldnt even touch this
variable. This is why people have been noticing their welding being on without
the sprite or damagetype and amount reflecting that.
- - I've removed a bunch of these instances but there are so many objects and
turfs spread out through the code, there's no way to know if I've got them all
(This is the majority of the files)
- - I've created a new proc in welding tools that checks to see if they are
turned on or not. "isOn()"
- - Since I'm not sure if I've gotten every instance of this force-var-on, I've
set the welding tool to update it's icon every process(). I hate adding checks
like this to processes but it's necessary for now.
- Added a setWelding() proc. If you HAVE to turn the welding tool on or off, use
this, don't just change the var. In fact, dont even touch the 'welding' var
anymore
- Fixes issue 435
While changing the hundreds(literally) of cases of welding tool uses I've
- Changed some :'s (object:varorproc) I've come across into .'s
(object.varorproc)
- Added checks to make sure the welding tool is actually on before using it
(some attackby()'s didnt have this. Heck, some checked how much fuel you had,
but didn't actually USE the fuel)
- Added sanity checks after some do_after()s that were missing them
Added traitor uplink items back to erro's stat tracker
- Added 'random' with the tag "RN"
- Added thermal meson glasses with the tag "TM"
- Reorganized uplinks.dm a little by moving the 'random' item generation to its
own proc
- NOTE: I have absolutely no way to test this on my own, but it should work!
I've tested a bunch of construction/deconstructions with the welding tool, but
again I've probably missed a few things. If there are any problems, please let
me know and I'll fix them asap.
Revision: r3741
Author: johnsonmt88
2012-06-07 03:30:13 +01:00
johnsonmt88@gmail.com
fa65c484cd
Welding tool: Mostly code-related, the players won't notice much.
...
- Welding tool code how has proper comments! Maybe not "proper" but at least I don't lie and say a proc is/does something that it doesn't actually do.
- Welders now start full of fuel instead of some random amount between 10-20
- Someone decided it would be a good idea to set the welding tool's 'on/off' var in a ton of attackby() procs. These objects and turfs shouldnt even touch this variable. This is why people have been noticing their welding being on without the sprite or damagetype and amount reflecting that.
- - I've removed a bunch of these instances but there are so many objects and turfs spread out through the code, there's no way to know if I've got them all (This is the majority of the files)
- - I've created a new proc in welding tools that checks to see if they are turned on or not. "isOn()"
- - Since I'm not sure if I've gotten every instance of this force-var-on, I've set the welding tool to update it's icon every process(). I hate adding checks like this to processes but it's necessary for now.
- Added a setWelding() proc. If you HAVE to turn the welding tool on or off, use this, don't just change the var. In fact, dont even touch the 'welding' var anymore
- Fixes issue 435
While changing the hundreds(literally) of cases of welding tool uses I've
- Changed some :'s (object:varorproc) I've come across into .'s (object.varorproc)
- Added checks to make sure the welding tool is actually on before using it (some attackby()'s didnt have this. Heck, some checked how much fuel you had, but didn't actually USE the fuel)
- Added sanity checks after some do_after()s that were missing them
Added traitor uplink items back to erro's stat tracker
- Added 'random' with the tag "RN"
- Added thermal meson glasses with the tag "TM"
- Reorganized uplinks.dm a little by moving the 'random' item generation to its own proc
- NOTE: I have absolutely no way to test this on my own, but it should work!
I've tested a bunch of construction/deconstructions with the welding tool, but again I've probably missed a few things. If there are any problems, please let me know and I'll fix them asap.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3741 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-04 22:56:11 +00:00
SkyMarshal
58570a0f65
As many bugfixes as I could cram into here.
2012-05-20 14:23:10 -07:00
Miniature
eed87489ca
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-05-15 00:52:14 +09:30
Miniature
773253a5ec
Fixed a mirrored tvalve icon, made mirrored tvalves do initialize_directions properly
2012-05-15 00:51:02 +09:30
SkyMarshal
bdc0de5fd0
Fixes numerous bugs from the Runtimes topic, more sanity checking on pipes and atmos stuff for the new FEA.
2012-05-13 13:52:40 -07:00
SkyMarshal
15d72e3b0e
Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type.
2012-05-11 18:02:30 -07:00
Mloc
c6a29019b2
Added highcap tanks and pumps for Hawk.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2012-04-30 21:18:07 +01:00
Miniature
b45f4cbfd8
Fixed a bug with mirrored tvalves and pipecaps, made it possible to make pipecaps from pipe dispensor and removed insulated pipes from it because they dont do anything sepcial
2012-04-29 04:58:57 +09:30
Miniature
6287aecbeb
Made passive gates toggleable
2012-04-29 04:33:55 +09:30
