LetterJay d200bff9f4 spaces. spaces caused the file to conflict.

2017-05-22 11:26:47 -05:00

..

__DATASTRUCTURES

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

__DEFINES

Merge pull request #1046 from Citadel-Station-13/upstream-merge-27292

2017-05-18 23:46:08 -04:00

__HELPERS

[MIRROR] People can be cloned from heads or brains (#919)

2017-05-18 09:49:26 -05:00

_globalvars

[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)

2017-05-18 09:37:30 -05:00

_js

April sync (#360)

2017-04-13 23:37:00 -05:00

_onclick

Fixes buttons under doors.

2017-05-20 11:34:52 -05:00

citadel

Update cit_arousal.dm (#1027)

2017-05-18 08:38:46 -05:00

controllers

[READY]Peacekeeper cyborg projectile dampening fields, attempt three

2017-05-18 16:36:50 -05:00

datums

Merge pull request #1049 from Citadel-Station-13/upstream-merge-27340

2017-05-18 23:46:41 -04:00

game

spaces. spaces caused the file to conflict.

2017-05-22 11:26:47 -05:00

modules

Decentralized and Vastly Improved Gang Influence System

2017-05-20 18:37:48 -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

[MIRROR] MC Runlevels (#988)

2017-05-18 12:42:43 -05:00