TechnoAlchemist e2a6dac71f Merge branch 'master' of https://github.com/tgstation/-tg-station into realkinkystuff ...

fixes conflicts probably

# Conflicts:
#	icons/obj/items.dmi

2016-04-28 12:03:31 -07:00

..

camera

…

dead

Show all HUDs at once

2016-04-16 15:26:50 -05:00

living

Merge branch 'master' of https://github.com/tgstation/-tg-station into realkinkystuff

2016-04-28 12:03:31 -07:00

new_player

Merge pull request #16225 from Ricotez/ghostlooks

2016-03-26 21:03:44 -05:00

death.dm

…

interactive.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

inventory.dm

…

login.dm

Adds a priority system for client.color effects

2016-04-07 21:55:31 +01:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

…

mob_grab.dm

reverts most of goof's grab nerf

2016-04-05 17:19:10 -07:00

mob_helpers.dm

Fixes

2016-04-15 14:40:32 -07:00

mob_movement.dm

reverts most of goof's grab nerf

2016-04-05 17:19:10 -07:00

mob_transformation_simple.dm

Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation

2016-04-01 01:32:59 -06:00

mob.dm

walls can't stop the law

2016-04-19 10:31:19 -04:00

say_readme.dm

…

say.dm

Ignore Buffs

2016-04-02 10:59:59 -05:00

transform_procs.dm

…

update_icons.dm

…