kevinz000 5d2f131d07 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26822

2017-05-07 22:22:24 -07:00

..

processing

Update flightpacks.dm

2017-05-04 16:07:53 -07:00

acid.dm

April sync (#360)

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

air.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

assets.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

atoms.dm

rej fixes

2017-04-28 09:03:56 -05:00

augury.dm

April sync (#360)

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

blackbox.dm

manual merge

2017-04-29 11:42:28 -05:00

communications.dm

April sync (#360)

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

dbcore.dm

Update dbcore.dm

2017-04-19 20:39:49 -05:00

disease.dm

April sync (#360)

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

events.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

fire_burning.dm

April sync (#360)

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

garbage.dm

Fixes some edges cases in the garbage controller

2017-04-26 17:44:27 -05:00

icon_smooth.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

inbounds.dm

April sync (#360)

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

ipintel.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

job.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

lighting.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

machines.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

mapping.dm

Merge branch 'master' into upstream-merge-26129

2017-04-29 11:45:37 -05:00

minimap.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

mobs.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

npcpool.dm

Small fix

2017-04-27 09:36:25 -05:00

orbit.dm

April sync (#360)

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

pai.dm

April sync (#360)

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

parallax.dm

April sync (#360)

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

persistence.dm

Adds persistent trophy cases

2017-05-01 17:31:24 -05:00

persistence.dm.rej

Trophy case hotfixes

2017-05-02 14:37:11 -05:00

ping.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

radio.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

religion.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

server_maint.dm

heh.

2017-05-02 09:17:52 -05:00

shuttle.dm

Even admin-called shuttles will be affected by alert level

2017-04-27 16:55:12 -05:00

spacedrift.dm

April sync (#360)

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

squeak.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

stickyban.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

sun.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

tgui.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

throwing.dm

April sync (#360)

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

ticker.dm

Merge pull request #693 from Citadel-Station-13/upstream-merge-26722

2017-05-05 09:33:45 -05:00

time_track.dm

April sync (#360)

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

timer.dm

Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

2017-04-24 18:07:12 -05:00

title.dm

Copies the loaded titlescreen into the rsc (#518)

2017-04-23 01:50:04 -05:00

vote.dm

Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted

2017-05-01 07:24:45 -05:00

weather.dm

April sync (#360)

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