LetterJay 29de038837 Merge pull request #2498 from Citadel-Station-13/upstream-merge-30162 ...

[MIRROR] Gives plasmamen hallucinations when taking blackpowder

2017-08-28 08:54:01 -05:00

..

__DATASTRUCTURES

…

__DEFINES

Cleaned up environment_smash vars with bitflag defines (#2515)

2017-08-27 05:55:07 -07:00

__HELPERS

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

_globalvars

Holoparasite prompts now have a "Never For This Round" option

2017-08-26 11:07:20 -05:00

_js

…

_onclick

here we go again (#2456)

2017-08-24 19:24:25 -07:00

citadel

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

controllers

here we go again (#2456)

2017-08-24 19:24:25 -07:00

datums

Merge pull request #2494 from Citadel-Station-13/upstream-merge-30183

2017-08-28 08:45:16 -05:00

game

Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173

2017-08-28 08:46:53 -05:00

modules

Merge pull request #2498 from Citadel-Station-13/upstream-merge-30162

2017-08-28 08:54:01 -05:00

_compile_options.dm

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00

world.dm

Update world.dm

2017-08-16 19:40:40 -05:00

world.dm.rej

Moves most of world.dm

2017-08-16 17:51:33 -05:00