LetterJay fe9c47650f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27495

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

..

__DATASTRUCTURES

…

__DEFINES

Makes global master vars static

2017-05-22 22:12:58 -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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27495

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

citadel

Fixed femcum creating decal with semen reagent

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

controllers

Merge pull request #1137 from Citadel-Station-13/upstream-merge-27541

2017-05-23 16:47:32 -05:00

datums

Merge branch 'master' into upstream-merge-27324

2017-05-23 07:17:45 -05:00

game

rej cleanup

2017-05-24 08:08:33 -05:00

modules

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442

2017-05-24 08:06:53 -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