Erthilo 8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi

2012-05-31 15:09:35 +01:00

..

area

…

asteroid

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

events

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

gamemodes

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

jobs

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

machinery

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

magic

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

mecha

Optimized HUD images.

2012-05-30 01:37:52 -06:00

objects

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

player

…

vehicles

Fixes some FEA stuff, for a general improvement to how well the system runs.

2012-05-11 18:19:00 -07:00

verbs

Missed a list of AI verbs. Engineering jumpsuit whitespace eliminated. Half fixes holopads. You can use them, you can't move. Nutriment made less ridiculously healing. Player Mute OOC name change to be more clear. More AI camera fix. Small Tajaran examine text fix.

2012-05-20 20:09:23 +01:00

algorithm.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

atom_procs.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

cellautomata.dm

TG: Added a new logging system that can be used for various things in the game (such

2012-05-29 01:45:03 +01:00

chemistry.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

communications.dm

- power monitor: a remote monitoring device to send network data to a console

2012-05-20 22:18:26 +10:00

dna_mutations.dm

…

dna.dm

Cleanup of all the update_clothing() calls.

2012-05-27 20:43:52 +02:00

hud.dm

More HUD changes: https://dl.dropbox.com/u/4911517/ShareX/2012-05/2012-05-28_20-40-50.png

2012-05-28 20:41:05 +01:00

json.dm

More Breakroom things, and a second Json fix.

2012-05-11 18:47:00 +01:00

landmarks.dm

…

master_controller.dm

Comments out mining secret rooms.

2012-05-16 19:33:01 +01:00

prisonshuttle.dm

…

response_team.dm

Merge github.com:Baystation12/Baystation12

2012-05-29 13:43:20 +02:00

shuttle_engines.dm

Actually fixes pod windows this time.

2012-05-16 13:38:36 +01:00

skincmd.dm

…

smoothwall.dm

TG: r-walls now use smoothwall.dm stuff properly.

2012-05-01 23:39:37 +01:00

sound.dm

…

specops_shuttle.dm

Fixes ERT shuttle bug.

2012-04-25 21:24:18 +01:00

status.dm

…

step_triggers.dm

TG: Prototype for transit escape shuttle/pods. If there are any bugs, ping doohl on

2012-04-30 02:18:55 +01:00

supplyshuttle.dm

TG: Sanitized a large number of input()s.

2012-05-26 00:09:56 +01:00

syndicate_shuttle.dm

…

syndicate_specops_shuttle.dm

TG: Adds a message to corpses that have had their ghosts leave the server/become

2012-04-29 19:01:43 +01:00

throwing.dm

Adds logging for throwing living mobs and throwing items that hit living mobs.

2012-05-12 17:24:05 +01:00

topic.dm

Emergency fix: Forgot to set "admins" if there are none, in the thing NT calls when someone asks him.

2012-05-16 22:51:27 -07:00

turf.dm

Revert "All objects leaving the boundaries of a Z level will now be deleted"

2012-05-30 20:23:25 +03:00

vote.dm

Added Crew Transfer Shuttle to the restart vote.

2012-05-24 23:00:47 +02:00