CitadelStationBot bdd4f9d17f Allows explorer webbings to hold marker beacons (#1219)

2017-06-02 21:35:41 -07:00

..

__DATASTRUCTURES

…

__DEFINES

Merge branch 'master' into upstream-merge-27454

2017-05-30 23:48:25 -05:00

__HELPERS

Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361

2017-05-30 15:15:51 -05:00

_globalvars

Refactors explosions

2017-05-24 16:45:00 -05:00

_js

…

_onclick

Moves attack chain proc from global to obj/item

2017-05-26 11:12:09 -05:00

citadel

EHHH

2017-05-28 15:49:22 -05:00

controllers

Merge branch 'master' into upstream-merge-27454

2017-05-30 23:48:25 -05:00

datums

Fixes martial arts resetting on cloning. (#1338)

2017-06-02 21:21:47 -07:00

game

Allows explorer webbings to hold marker beacons (#1219)

2017-06-02 21:35:41 -07:00

modules

Buffs nitrous oxide (#1339)

2017-06-02 21:22:08 -07:00

_compile_options.dm

Wizards are now at least 30 years old. Apprentices are 17 to 29. (#978)

2017-05-18 12:05:55 -05:00

world.dm

Update world.dm

2017-05-31 02:10:31 -05:00