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

Conflicts:
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/items/weapons/uplinks.dm

2011-12-29 10:08:58 -07:00

..

ATMOSPHERICS

…

datums

Revert SkyMarshal's last commits since they don't even compile, which means they weren't tested.

2011-12-29 15:15:51 -08:00

defines

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

2011-12-29 10:08:58 -07:00

FEA

…

game

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

2011-12-29 10:08:58 -07:00

js

…

modules

Merge remote-tracking branch 'upstream/master'

2011-12-29 08:38:42 -05:00

unused

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

WorkInProgress

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

2011-12-29 10:08:58 -07:00

names.dm

…

setup.dm

Added a new slurring variable, and set it up in the right places

2011-12-10 14:25:49 +02:00

stylesheet.dm

…