LetterJay 290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916

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

[READY] Monkey mode overhaul

2017-12-15 18:35:52 -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

…

clockcult.dm

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

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

combat.dm

…

components.dm

Merge pull request #33550 from ninjanomnom/instanceless-component-dupe

2017-12-21 00:51:02 -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

…

hud.dm

…

integrated_electronics.dm

More integrated circuit fixes and code improvements

2017-11-26 04:56:44 -06:00

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

Merge pull request #31947 from AnturK/yarr

2017-11-13 03:19:38 -06:00

maps.dm

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

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

[Ready]Brain Trauma additions

2017-12-17 11:11:10 -06:00

monkeys.dm

…

networks.dm

Merge branch 'master' into upstream-merge-32624

2017-12-04 17:12:53 -05:00

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

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

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

sight.dm

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

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

sound.dm

Reverts sound range and falloff so as to not carry as far (#33259)

2017-12-05 15:41:36 -06:00

stat_tracking.dm

…

stat.dm

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

status_effects.dm

…

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

Adds a multitool_act and a proper check on tool_check (#32640)

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

typeids.dm

…

voreconstants.dm

…

vv.dm

…

wall_dents.dm

…

wires.dm

…