mwerezak 56ccd4303b Merges taser and stun baton effects ...

Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm

2014-07-31 16:21:22 -04:00

..

__HELPERS

Merge pull request #5832 from Baystation12/master

2014-07-29 18:37:19 +04:00

_onclick

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00

ATMOSPHERICS

integrate XGM into the code

2014-07-22 19:52:12 +01:00

controllers

Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics

2014-07-26 15:45:26 +09:30

datums

Merge pull request #5832 from Baystation12/master

2014-07-29 18:37:19 +04:00

defines

integrate XGM into the code

2014-07-22 19:52:12 +01:00

FEA

…

game

Merges taser and stun baton effects

2014-07-31 16:21:22 -04:00

js

…

modules

Merges taser and stun baton effects

2014-07-31 16:21:22 -04:00

TriDimension

…

unused

…

WorkInProgress

Adds proximity check to prevent telekinetic taping of doors.

2014-07-30 10:22:50 +02:00

ZAS

integrate XGM into the code

2014-07-22 19:52:12 +01:00

global.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

hub.dm

…

names.dm

…

setup.dm

Merge pull request #5792 from Whitellama/flavourtext

2014-07-28 10:11:02 +09:30

stylesheet.dm

…

world.dm

…