deathride58 57d79640f4 Merge pull request #4691 from Citadel-Station-13/upstream-merge-34134 ...

[MIRROR] Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp

2018-01-07 20:30:06 +00:00

..

__DATASTRUCTURES

[MIRROR] Use associative list instead of in (#3710)

2017-10-31 00:43:39 -07:00

__DEFINES

Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp

2018-01-07 11:02:49 -06:00

__HELPERS

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

2018-01-01 14:09:07 -06:00

_globalvars

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

2018-01-01 14:14:06 -06:00

_js

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

_onclick

Update adjacent.dm

2018-01-05 17:25:41 -05:00

citadel

woo

2018-01-01 07:30:50 -06:00

controllers

Adds more observation messages in deadchat (#34075)

2018-01-04 15:16:58 -06:00

datums

Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp

2018-01-07 11:02:49 -06:00

game

priority:critical

2018-01-07 02:08:51 -06:00

modules

Merge pull request #4691 from Citadel-Station-13/upstream-merge-34134

2018-01-07 20:30:06 +00:00

_compile_options.dm

Update _compile_options.dm

2017-11-23 16:37:49 -08:00

world.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00