LetterJay 822f15f4ae Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494 ...

[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again

2017-10-10 22:32:52 -04:00

..

antagonists

Merge pull request #31294 from YPOQ/sciencetoolfix

2017-10-05 06:49:54 -05:00

components

Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399)

2017-10-10 03:11:50 -05:00

diseases

Diseases will now cure if species is changed (#31495)

2017-10-10 12:41:42 -05:00

helper_datums

Update getrev.dm

2017-10-01 02:39:07 -05:00

martial

Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

2017-10-10 13:28:38 -05:00

ruins

…

status_effects

Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887

2017-10-04 19:06:02 -04:00

weather

ismecha define

2017-10-02 01:04:53 -05:00

wires

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

action.dm

Merge branch 'master' into upstream-merge-31222

2017-10-04 21:50:07 -04:00

ai_laws.dm

Merge branch 'master' into upstream-merge-31140

2017-10-01 02:53:18 -04:00

beam.dm

…

browser.dm

Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

2017-10-10 13:28:38 -05:00

callback.dm

…

cinematic.dm

…

dash_weapon.dm

Ports dash weapons to the dash datum

2017-10-03 18:11:42 -05:00

datacore.dm

…

datum.dm

…

datumvars.dm

…

dna.dm

Fixes flavor_text and changeling genitals

2017-10-03 02:25:53 +02:00

dog_fashion.dm

…

emotes.dm

Emotes now shatter 80% less immersions (#31240)

2017-10-05 15:11:28 -05:00

explosion.dm

Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

2017-10-10 13:28:38 -05:00

forced_movement.dm

Update forced_movement.dm

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

holocall.dm

…

hud.dm

…

map_config.dm

Merge pull request #2973 from Citadel-Station-13/upstream-merge-31084

2017-09-30 15:18:26 -04:00

martial.dm

…

mind.dm

Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494

2017-10-10 22:32:52 -04:00

mutable_appearance.dm

…

mutations.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

outfit.dm

…

progressbar.dm

…

recipe.dm

…

riding.dm

…

ruins.dm

…

shuttles.dm

…

soullink.dm

…

spawners_menu.dm

…

verbs.dm

…

votablemap.dm

…