LetterJay 0e9f17b14a Merge pull request #1181 from Citadel-Station-13/upstream-merge-27582 ...

[MIRROR] [s] Fixes hiding the nuke disk on the arrivals shuttle

2017-05-26 23:25:15 -05:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #1138 from Citadel-Station-13/upstream-merge-27545

2017-05-25 09:43:50 -05:00

__HELPERS

Merge pull request #1115 from Citadel-Station-13/upstream-merge-27527

2017-05-23 10:13:51 -05:00

_globalvars

rej cleanup/commit

2017-05-22 16:59:39 -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

update blackbox.dm

2017-05-26 12:02:26 -05:00

datums

Replaces parentcommit with originmastercommit

2017-05-26 14:41:35 -05:00

game

Merge pull request #1182 from Citadel-Station-13/upstream-merge-27627

2017-05-26 23:24:08 -05:00

modules

Merge pull request #1181 from Citadel-Station-13/upstream-merge-27582

2017-05-26 23:25:15 -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

Fixes pre-round-start logs

2017-05-26 19:41:20 -05:00