Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi

2017-01-31 17:44:38 +01:00

..

hud

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-11 23:11:29 +01:00

_defines.dm

Revert "Merge pull request #4739 from monster860/vg-parallax"

2016-07-28 15:48:27 -07:00

adjacent.dm

…

ai.dm

Prevents AI units from clicking on things they can't see

2016-12-06 13:13:46 +01:00

click_override.dm

Power Gloves Sound Fix

2016-10-11 11:51:59 -04:00

click.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-31 17:44:38 +01:00

cyborg.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

drag_drop.dm

…

item_attack.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-09 22:00:31 +01:00

observer.dm

Adds multi-mob warning to admin click shortcuts

2016-07-28 17:02:46 -04:00

other_mobs.dm

Adds in Stun Gloves

2017-01-16 19:11:03 -05:00

overmind.dm

…

rig.dm

Compiles now

2016-08-23 18:03:48 -07:00

telekinesis.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00