KorPhaeron d4240c5378 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis ...

# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi

2016-05-31 12:03:01 -05:00

..

effects

Merge pull request #17962 from coiax/admin-logging

2016-05-30 11:00:14 +12:00

items

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis

2016-05-31 12:03:01 -05:00

structures

Merge pull request #17936 from MMMiracles/ruin_stuff

2016-05-31 15:58:12 +12:00

buckling.dm

…

empulse.dm

t&a

2016-04-20 16:38:55 -04:00

explosion.dm

…

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

objs.dm

…

radiation.dm

…

structures.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

weapons.dm

…