CitadelStationBot 4eb5a9bf21 Mapped active shieldgens

2017-05-31 08:56:07 -05: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

Fixed femcum creating decal with semen reagent

2017-05-22 16:12:20 +03:00

controllers

Merge branch 'master' into upstream-merge-27454

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

datums

Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534

2017-05-30 21:43:31 -05:00

game

Mapped active shieldgens

2017-05-31 08:56:07 -05:00

modules

Merge pull request #1214 from Citadel-Station-13/upstream-merge-27677

2017-05-31 01:53:38 -05: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