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

# Conflicts:
#	code/controllers/subsystem/idlenpcpool.dm

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

..

_readme.dm

…

_tick.dm

…

access.dm

…

admin.dm

Immovable rod abuse, smite and event trigger. (#33681)

2017-12-21 00:11:20 -06:00

antagonists.dm

also syncs a bunch of shit

2017-12-29 04:12:43 -06:00

atmospherics.dm

Merge pull request #33622 from duncathan/assert_gas

2017-12-20 00:14:13 -06:00

atom_hud.dm

[Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)

2017-12-18 20:29:37 -06:00

callbacks.dm

…

cinematics.dm

…

citadel_defines.dm

…

cleaning.dm

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

clockcult.dm

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

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

combat.dm

…

components.dm

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

configuration.dm

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

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

construction.dm

Airlock Construction Update

2017-12-10 15:23:34 -06:00

contracts.dm

…

cult.dm

…

diseases.dm

…

DNA.dm

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

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

events.dm

…

flags.dm

Merge pull request #33306 from coiax/replace-clean-flag-with-component

2017-12-23 08:36:37 -06:00

food.dm

…

forensics.dm

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

hud.dm

…

integrated_electronics.dm

…

inventory.dm

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

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

is_helpers.dm

Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more

2017-12-06 16:37:15 -06:00

jobs.dm

…

language.dm

…

layers.dm

…

lighting.dm

…

logging.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

machines.dm

…

maps.dm

…

maths.dm

Defines math, take 2

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

MC.dm

…

menu.dm

…

misc.dm

Fixes RND

2017-12-22 00:58:46 -08:00

mobs.dm

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

2018-01-01 14:14:06 -06:00

monkeys.dm

…

networks.dm

…

pinpointers.dm

…

pipe_construction.dm

…

preferences.dm

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

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

profile.dm

…

qdel.dm

…

radiation.dm

…

radio.dm

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

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

reagents.dm

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

research.dm

Fixes RND

2017-12-22 00:58:46 -08:00

robots.dm

…

role_preferences.dm

…

say.dm

[READY] Monkey mode overhaul

2017-12-15 18:35:52 -06:00

server_tools.config.dm

Create server_tools.config.dm

2017-12-18 16:42:17 -06:00

server_tools.dm

Update server_tools.dm

2017-12-18 17:31:07 -06:00

shuttles.dm

dock() re-organization

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

sight.dm

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

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

sound.dm

…

stat_tracking.dm

…

stat.dm

Merge branch 'master' into upstream-merge-33663

2017-12-30 13:29:36 -06:00

status_effects.dm

Merge pull request #33580 from Xhuis/defenses_balancing

2017-12-30 16:59:07 -06:00

subsystems.dm

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

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

tgui.dm

…

time.dm

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

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

tools.dm

…

turf_flags.dm

turns the baseturf var into a part time list (#33705)

2017-12-25 19:11:06 -06:00

typeids.dm

…

voreconstants.dm

…

vv.dm

…

wall_dents.dm

…

wires.dm

…