ccomp5950 27765f799f Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev ...

Conflict resolution.

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm

2015-01-06 12:36:28 -05:00

..

dead

Fixes #5801

2014-12-24 22:00:31 +10:30

living

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

2015-01-06 12:36:28 -05:00

new_player

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

death.dm

Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs.

2014-12-24 16:06:00 +10:30

emote.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

hear_say.dm

Merge branch 'languages' of https://github.com/Zuhayr/Baystation12 into dev

2014-12-13 23:13:40 +10:30

holder.dm

Bunch of diona nymph tweaks/fixes.

2014-12-09 20:52:41 +10:30

inventory.dm

…

language.dm

Merge pull request #7581 from Baystation12/dev-freeze

2014-12-30 18:53:20 +10:30

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Overhauls SSD mechanic.

2014-12-27 09:16:50 -08:00

mob_grab.dm

…

mob_helpers.dm

Fixes dead join/leave message format.

2014-12-11 22:10:22 +01:00

mob_movement.dm

More cargo train fixes

2015-01-03 01:27:10 +13:00

mob_transformation_simple.dm

…

mob.dm

Hardsuit powersink module now uses CELLRATE properly

2014-12-29 20:40:57 +01:00

say.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…