Fox McCloud 238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage ...

# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm

2019-09-21 12:40:07 -04:00

..

processing

Kills off Object and Fast Object Processes

2019-04-23 23:53:40 -04:00

tickets

Autoreply confirmation alert logic fix (#12350)

2019-09-18 19:28:42 -07:00

acid.dm

next-we-melt-the-memories-that-are

2019-09-09 16:20:04 -04:00

afk.dm

SQL version change, coding semantic

2019-07-14 13:05:59 +02:00

air.dm

Adds airlock spawners

2019-04-27 21:41:36 +01:00

alarm.dm

returning parent value

2019-04-24 01:11:42 -04:00

assets.dm

returning parent value

2019-04-24 01:11:42 -04:00

atoms.dm

returning parent value

2019-04-24 01:11:42 -04:00

chat.dm

Port TG's chat subsystem

2019-07-25 17:50:47 -04:00

events.dm

Sanitize all inputs

2019-07-14 09:35:12 -07:00

fires.dm

first-we-burn-away-the-world-that-was

2019-09-09 14:48:29 -04:00

garbage.dm

Refactors Spawners/Tendrils

2019-09-07 20:02:53 -04:00

holiday.dm

returning parent value

2019-04-24 01:11:42 -04:00

icon_smooth.dm

returning parent value

2019-04-24 01:11:42 -04:00

idlenpcpool.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00

input.dm

Fix typing indicators not showing

2019-07-25 04:37:24 -04:00

ipintel.dm

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

jobs.dm

Fix an antag rolling exploit

2019-06-01 23:13:13 +01:00

lighting.dm

Lighting fixes

2019-04-27 01:08:17 +02:00

machinery.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00

mapping.dm

The Ending of an Era. The Turning of the Page (#12342)

2019-09-20 17:58:50 -07:00

medals.dm

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

mobs.dm

limit the amount of monkeys spawned from monkey cubes

2019-09-14 21:18:45 -04:00

nano_mob_hunter.dm

…

nanoui.dm

…

nightshift.dm

SSticker

2019-04-30 16:47:47 +01:00

npcpool.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00

overlays.dm

…

parallax.dm

Fix style

2019-08-13 16:32:31 -07:00

radio.dm

SScommunications

2019-04-21 20:12:14 +01:00

shuttles.dm

SSticker

2019-04-30 16:47:47 +01:00

spacedrift.dm

…

sun.dm

…

throwing.dm

thrown objects now phase through the thrower instead of hitting them (#12323)

2019-09-17 13:52:02 -07:00

ticker.dm

Round start delay works properly again

2019-08-28 19:20:44 -04:00

timer.dm

Timer Subsystem Update

2019-03-31 00:19:35 -04:00

vote.dm

SSticker

2019-04-30 16:47:47 +01:00

weather.dm

returning parent value

2019-04-24 01:11:42 -04:00