CaelAislinn 87838c7cc5 Merge git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/gamemodes/meteor/meteors.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>

2012-02-07 03:28:09 +10:00

..

beast

Just some general cleanup

2011-07-31 21:31:00 +00:00

computer2

Replacing monkie with monkey...

2011-11-28 19:39:22 +00:00

gamemodes

Meteor, ctf, restructuring, ruby and deathmatch game modes should also properly log round types now. Some of these are commented out but I added the required ..() call to them anyway, in case someone decides to uncomment them.

2011-11-01 15:12:28 +00:00

hivebot

TG update: ... -Removed setBruteLoss and setFireLoss since they served no purpose. -Overrided the proc for get[Fire/Brute]Loss and adjust[Fire/Brute]Loss for humans to use the total damage proc. -Removed redundant checks aka setBruteLoss(max(getBruteLoss(), 0) since the adjust brute proc already prevents it from going negative. -Commented out the UpdateDamage() procs contents as it did nothing. If problems arise we might have to investigate. Soon I will remove the proc entierly.

2011-12-26 20:14:44 +02:00

mining

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

optics

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

pda2

MOAR BUGFIXES

2012-02-05 21:56:12 -07:00

spacecraft

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

_debug.dm

bones and dismemberment

2012-01-08 20:05:54 -05:00

ai_lockdown.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

airtunnel.dm

Cleaned up:

2011-08-20 04:30:37 +00:00

assemblies.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

BrokenInhands.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

carpetsplosion.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

dna.dm

HoS got an armored greatcoat instead of what he's got before.

2010-10-01 18:22:07 +00:00

filter_control.dm

Moved some of the old pipe files into unused.

2011-08-22 10:59:54 +00:00

game_kit.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

heater.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

musicplayer.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

newcombatsystem.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

pipe_filter.dm

Moved some of the old pipe files into unused.

2011-08-22 10:59:54 +00:00

pipe.dm

Moved some of the old pipe files into unused.

2011-08-22 10:59:54 +00:00

siphs.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

toilets.dm

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2012-02-04 22:36:42 +10:00

traps.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

travel.dm

Engineering got a new machine that spawns/feeds the singularity.

2011-02-09 06:07:32 +00:00

Ultralight.dm

re-adding fixed ul + new helper proc (get_opposite())

2012-01-05 15:37:02 +10:00

vehicle.dm

Cleaned up:

2011-08-20 04:30:37 +00:00