skull132 c27866e4af Merge branch 'master' into development ...

# Conflicts:
#	code/_helpers/logging.dm
#	code/modules/mob/living/living.dm

2017-05-25 15:06:32 +03:00

..

hud

Malfunction tweaks (#2425)

2017-05-24 02:54:31 +03:00

adjacent.dm

Bugfix Bonanza + Z-code and stuff. (#1819)

2017-02-22 14:42:49 -05:00

ai.dm

…

click.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

cyborg.dm

Gripper, Nymph and Mob size fixes (#1575)

2017-01-15 20:56:15 +02:00

drag_drop.dm

…

item_attack.dm

Bug fixes (#2447)

2017-05-25 14:42:57 +03:00

observer.dm

…

other_mobs.dm

Spark Fixes (#1764)

2017-02-14 14:37:16 +02:00

rig.dm

…

telekinesis.dm

Code Cleanup: Destroy() fixes part 1 + Misc Fixes (#1933)

2017-03-18 23:06:24 +02:00