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

# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm

2018-01-02 05:16:13 -06:00

..

processing

Update networks.dm

2017-12-17 17:51:28 -06:00

acid.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

air.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

assets.dm

[DNM] Fixes the codebase (#2556)

2017-08-30 00:08:40 -07:00

atoms.dm

adds a parent level subsystem initialized var (#33456)

2017-12-13 21:11:51 -06:00

augury.dm

Meteors can now qdel normally (#30970)

2017-09-23 23:35:14 -05:00

blackbox.dm

Adds random seed feedback (#33708)

2017-12-25 19:05:36 -06:00

communications.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

dbcore.dm

fixes spelling and stuff (#32531)

2017-11-09 11:04:50 -06:00

disease.dm

Merge pull request #33072 from AnturK/ibelievedinyoukornowlook

2017-11-27 08:25:55 -06:00

events.dm

Cleans up unused code

2017-11-20 10:14:32 -06:00

explosion.dm

[DNM] Fixes the codebase (#2556)

2017-08-30 00:08:40 -07:00

fire_burning.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

garbage.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

icon_smooth.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

idlenpcpool.dm

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

2018-01-02 04:37:36 -06:00

inbounds.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

input.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

ipintel.dm

[DNM] Fixes the codebase (#2556)

2017-08-30 00:08:40 -07:00

job.dm

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

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

language.dm

[DNM] Fixes the codebase (#2556)

2017-08-30 00:08:40 -07:00

lighting.dm

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

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

machines.dm

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

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

mapping.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

minimap.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

mobs.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

npcpool.dm

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

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

orbit.dm

Update orbit.dm

2017-12-17 17:51:20 -06:00

overlays.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

pai.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

parallax.dm

Merge branch 'master' into upstream-merge-33537

2017-12-30 13:14:48 -06:00

persistence.dm

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

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

ping.dm

[DNM] Fixes the codebase (#2556)

2017-08-30 00:08:40 -07:00

radiation.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

radio.dm

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

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

religion.dm

[DNM] Fixes the codebase (#2556)

2017-08-30 00:08:40 -07:00

research.dm

Merge branch 'master' into upstream-merge-33537

2017-12-30 13:14:48 -06:00

server_maint.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

shuttle.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

spacedrift.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

squeak.dm

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

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

stickyban.dm

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

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

sun.dm

[DNM] Fixes the codebase (#2556)

2017-08-30 00:08:40 -07:00

tgui.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00

throwing.dm

Merge branch 'master' into upstream-merge-33537

2017-12-30 13:14:48 -06:00

ticker.dm

Merge branch 'master' into upstream-merge-33537

2017-12-30 13:14:48 -06:00

time_track.dm

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

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

timer.dm

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

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

title.dm

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

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

traumas.dm

Brain Traumas

2017-12-06 12:05:20 -06:00

vote.dm

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

weather.dm

Add a proc to check if a weather type is affecting an area (#33373)

2017-12-09 01:36:40 -06:00