LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 ...

# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm

2017-12-29 01:34:17 -06:00

..

actions

oops

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

antagonists

oops

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

brain_damage

save point - a lot of shit to fix

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

components

oops

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

diseases

save point - a lot of shit to fix

2017-12-27 07:03:40 -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

fixes spelling and stuff (#32531)

2017-11-09 11:04:50 -06:00

status_effects

Defines math, take 2

2017-12-17 10:02:43 -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

[READY]Clownborgs - ADMIN SPAWN ONLY

2017-12-22 10:58:13 -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

Cleans up unused code

2017-11-20 10:14:32 -06:00

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

Ghosts can *spin and *flip

2017-12-25 17:11:29 -06:00

explosion.dm

Defines math, take 2

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

forced_movement.dm

Update forced_movement.dm

2017-10-01 14:43:06 -05:00

holocall.dm

Holorecord disks.

2017-12-04 05:14:13 -06:00

hud.dm

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

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

map_config.dm

Fixes allow_custom_shuttles default

2017-10-30 15:21:11 -05:00

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

Merge pull request #31074 from pubby/ninjaoutfit

2017-09-28 21:53:05 -05:00

position_point_vector.dm

oops

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

profiling.dm

Line by line profiling system

2017-10-27 13:10:21 -05:00

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

Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

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

Adds round ID to status topic (#32976)

2017-11-22 12:41:44 -06:00