Markolie 354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/machinery/rechargestation.dm

2015-02-09 16:15:00 +01:00

..

camera

…

dead

HUD wording fix

2015-01-30 16:53:36 +01:00

living

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2015-02-09 16:15:00 +01:00

new_player

Disability fixes

2015-02-08 14:20:57 +01:00

spirit

Confirmation screen for become mask

2014-10-21 22:29:23 +01:00

abilities.dm

Properly Removes Slime Person Ventcrawl

2014-12-10 21:45:05 -05:00

death.dm

…

emote.dm

…

holder.dm

…

inventory.dm

Hardsuit equip time reversion

2014-10-18 01:46:28 +01:00

language.dm

Bot fixes, disease runtime fix, vending menu fix

2014-12-02 19:46:34 +01:00

login.dm

Comment removed

2015-02-06 15:22:37 +01:00

logout.dm

Comment removed

2015-02-06 15:22:37 +01:00

mob_cleanup.dm

…

mob_defines.dm

Out of Time

2015-02-03 01:12:00 -05:00

mob_grab.dm

…

mob_helpers.dm

Use station_name proc where possible, mapfix

2015-01-21 23:37:05 +01:00

mob_movement.dm

Out of Time

2015-02-03 01:12:00 -05:00

mob_transformation_simple.dm

…

mob.dm

Accessory overhaul

2015-02-08 14:29:10 +01:00

say.dm

Language Fixes

2015-01-28 09:14:11 -05:00

transform_procs.dm

Add AI latejoining, fix Ofitser again, blob damages pods

2015-02-05 14:58:12 +01:00

update_icons.dm

…