Armhulen 814dc3f811 fixes a pacifism kill through crushing firelocks! (#37511) ...

* fix!

* ORANGES LOOK AWAY

* thanks maintainer

2018-04-29 10:09:29 -05:00

..

__DEFINES

Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461

2018-04-29 02:24:04 -05:00

__HELPERS

Merge pull request #6503 from Citadel-Station-13/upstream-merge-37371

2018-04-27 00:11:11 -05:00

_globalvars

Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436)

2018-04-27 07:37:15 -05:00

_js

…

_onclick

Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498)

2018-04-27 07:41:31 -07:00

controllers

Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461

2018-04-29 02:24:04 -05:00

datums

Merge pull request #6511 from Citadel-Station-13/upstream-merge-37389

2018-04-29 02:20:25 -05:00

game

fixes a pacifism kill through crushing firelocks! (#37511)

2018-04-29 10:09:29 -05:00

modules

Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483

2018-04-29 02:29:44 -05:00

_compile_options.dm

Merge pull request #37000 from tgstation/KorPhaeron-patch-2

2018-04-11 15:12:55 -05:00

world.dm

…