phil235 194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor ...

# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm

2016-09-29 01:44:27 +02:00

..

area_copy.dm

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

2016-09-27 22:33:08 +02:00

areas.dm

Random dirtiness refactor and turf grammar standardization (#20551)

2016-09-25 10:52:42 +13:00

computer_funcs.dm

…

computer.dm

Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.

2016-09-27 19:58:27 +02:00

holo_effect.dm

Fixes holodeck animals bleeding.

2016-07-08 19:28:21 +02:00

items.dm

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02:00

turfs.dm

Random dirtiness refactor and turf grammar standardization (#20551)

2016-09-25 10:52:42 +13:00