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

..

SDQL2

Defines math, take 2

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

adminhelp.dm

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

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

adminjump.dm

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

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

adminpm.dm

Fixes ahelp trimming (#33268)

2017-12-05 14:27:16 -06:00

adminsay.dm

JSON feedback

2017-11-17 01:44:12 -06:00

ak47s.dm

Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)

2017-09-16 04:29:22 -05:00

atmosdebug.dm

removes silly garbage defines

2017-12-19 08:02:18 -06:00

bluespacearty.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

BrokenInhands.dm

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

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

buildmode.dm

Add a safety check to buildmode, also fix a bug with corner selection (#32009)

2017-10-27 04:51:58 -05:00

cinematic.dm

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

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

deadsay.dm

JSON feedback

2017-11-17 01:44:12 -06:00

debug.dm

Replace explicit z-level checks with defines

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

diagnostics.dm

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

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

fps.dm

JSON feedback

2017-11-17 01:44:12 -06:00

getlogs.dm

JSON feedback

2017-11-17 01:44:12 -06:00

individual_logging.dm

512 forward compatibility merge

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

machine_upgrade.dm

Merge pull request #33320 from AutomaticFrenzy/patch/component-ratings

2017-12-10 14:08:21 -06:00

manipulate_organs.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

map_template_loadverb.dm

Changes a bunch of hrefs to the proper defines

2017-05-02 02:20:07 -05:00

mapping.dm

Merge pull request #33714 from lzimann/icon

2017-12-21 19:27:23 -06:00

maprotation.dm

April sync (#360)

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

massmodvar.dm

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

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

modifyvariables.dm

Callback security and usr (#33599)

2017-12-18 21:41:33 -06:00

one_click_antag.dm

Replace explicit z-level checks with defines

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

onlyone.dm

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

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

panicbunker.dm

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

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

playsound.dm

Defines math, take 2

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

possess.dm

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

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

pray.dm

Update pray.dm

2017-11-17 23:36:00 -05:00

randomverbs.dm

Makes it clear that command reports are IC. (#33949)

2017-12-31 02:28:25 -06:00

reestablish_db_connection.dm

JSON feedback

2017-11-17 01:44:12 -06:00

tripAI.dm

April sync (#360)

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