TheDZDandGitHub 6d280e52de Merge pull request #5375 from Fox-McCloud/formal-captain ...

Formal Captain Update

2016-08-10 18:12:09 -04:00

..

__DEFINES

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-10 14:16:42 -07:00

__HELPERS

Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."

2016-08-08 23:26:51 -04:00

_DATASTRUCTURES

…

_globalvars

Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."

2016-08-08 23:26:51 -04:00

_onclick

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

ATMOSPHERICS

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

controllers

Iiiiit's merge conflict time!

2016-08-07 23:42:02 -07:00

datums

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-10 14:16:42 -07:00

defines

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

game

Merge pull request #5375 from Fox-McCloud/formal-captain

2016-08-10 18:12:09 -04:00

js

…

LINDA

Merge pull request #5333 from Alexshreds/gasfix

2016-08-10 17:33:19 -04:00

modules

Merge pull request #5375 from Fox-McCloud/formal-captain

2016-08-10 18:12:09 -04:00

_compile_options.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

hub.dm

…

world.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00