skull132 22c7748336 Merge branch 'master' into development ...

# Conflicts:
#	code/game/machinery/computer/shuttle.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/objects/items/weapons/weaponry.dm
#	code/modules/admin/admin_attack_log.dm
#	code/modules/admin/admin_verbs.dm

2017-05-27 20:11:54 +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

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-07 17:56:27 +01:00

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

Letting skull touch logging is now strictly haram (#2476)

2017-05-27 18:56:22 +03:00

observer.dm

Adds the moved event.

2016-01-18 20:16:48 +01:00

other_mobs.dm

Spark Fixes (#1764)

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

rig.dm

Replacing hardcoded key/name checks in rig admin alert with key_name_admin().

2015-08-24 16:44:17 +09:30

telekinesis.dm

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

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