LetterJay 168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311

2018-01-01 07:00:34 -06:00

..

actions

oops

2017-12-27 07:08:26 -06:00

antagonists

Monkeymode fixes (#33796)

2017-12-29 10:08:17 -06:00

brain_damage

save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00

components

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

2018-01-01 07:00:34 -06:00

diseases

also syncs a bunch of shit

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

helper_datums

Adds round ID to Show Server Revision (#33723)

2017-12-22 10:43:37 -06:00

looping_sounds

Merge pull request #33613 from Armhulen/patch-32

2017-12-17 20:22:00 -06:00

martial

save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00

mutations

save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00

ruins

…

status_effects

Merge pull request #33580 from Xhuis/defenses_balancing

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

weather

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

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

wires

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

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

action.dm

Merge branch 'master' into upstream-merge-33783

2017-12-29 06:49:47 -06:00

ai_laws.dm

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

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

beam.dm

Defines math, take 2

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

browser.dm

…

callback.dm

Callback security and usr (#33599)

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

cinematic.dm

…

dash_weapon.dm

Defines math, take 2

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

datacore.dm

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

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

datum.dm

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

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

datumvars.dm

Merge branch 'master' into upstream-merge-31727

2017-12-10 21:51:51 +00:00

dna.dm

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

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

dog_fashion.dm

…

emotes.dm

also syncs a bunch of shit

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

explosion.dm

Explosions now cause camera shake based on distance (#33570)

2017-12-31 02:32:41 -06:00

forced_movement.dm

…

holocall.dm

…

hud.dm

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

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

map_config.dm

…

martial.dm

…

mind.dm

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

mutable_appearance.dm

…

mutations.dm

[Ready Again]Refactors disabilities into lists, allowing for independent disability sources

2017-12-18 15:19:53 -06:00

outfit.dm

…

position_point_vector.dm

oops

2017-12-27 07:08:26 -06:00

profiling.dm

…

progressbar.dm

Defines math, take 2

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

radiation_wave.dm

Defines math, take 2

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

recipe.dm

…

ruins.dm

…

saymode.dm

[READY] Monkey mode overhaul

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

shuttles.dm

Adds disco inferno shuttle. (#33230)

2017-12-05 03:22:40 -06:00

soullink.dm

…

spawners_menu.dm

…

verbs.dm

…

votablemap.dm

…

weakrefs.dm

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

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

world_topic.dm

…