CitadelStationBot 93c19d0e4b Replaces parentcommit with originmastercommit

2017-05-26 14:41:35 -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

mind over matter

2017-05-24 08:30:23 -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 #1138 from Citadel-Station-13/upstream-merge-27545

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

modules

Merge pull request #1166 from Citadel-Station-13/upstream-merge-27599

2017-05-25 09:42:13 -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

World > SSticker

2017-05-22 12:31:05 -05:00