LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 ...

# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm

2017-12-29 01:34:17 -06:00

..

processing

Adds Additional Electronic_Assembly Designs (#33466)

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

acid.dm

[DNM] Fixes the codebase (#2556)

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

air.dm

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

2017-12-16 13:08: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

Merge pull request #31947 from AnturK/yarr

2017-11-13 03:19:38 -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

[DNM] Fixes the codebase (#2556)

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

garbage.dm

Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

icon_smooth.dm

[DNM] Fixes the codebase (#2556)

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

idlenpcpool.dm

expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)

2017-10-19 04:57:49 -05:00

inbounds.dm

[DNM] Fixes the codebase (#2556)

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

input.dm

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

2017-12-16 13:08: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

Revises the_station_areas list

2017-11-24 14:12:53 -06:00

minimap.dm

Configuration datum refactor

2017-09-28 21:37:53 -05:00

mobs.dm

Player Z-tracking, again

2017-12-14 17:35:35 -06:00

npcpool.dm

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

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

orbit.dm

[DNM] Fixes the codebase (#2556)

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

overlays.dm

adds a parent level subsystem initialized var (#33456)

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

pai.dm

512 forward compatibility merge

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

parallax.dm

Merge pull request #33881 from AnturK/walls-have-eyes

2017-12-29 00:28:18 -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

JSON feedback

2017-11-17 01:44:12 -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

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

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

server_maint.dm

Adds server tools version to feedback (#33244)

2017-12-05 03:23:15 -06:00

shuttle.dm

dock() re-organization

2017-12-18 21:23:58 -06:00

spacedrift.dm

[DNM] Fixes the codebase (#2556)

2017-08-30 00:08:40 -07: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

Make SStgui actually read the html from the disk at runtime (#31464)

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

throwing.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

ticker.dm

Merge branch 'master' into upstream-merge-33504

2017-12-26 06:08:12 -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