LetterJay 5829f56727 Merge pull request #2531 from Citadel-Station-13/upstream-merge-30176 ...

[MIRROR] Adds more round id tracking

2017-09-06 21:31:28 -05:00

..

admin

Merge branch 'master' into upstream-merge-30176

2017-09-06 17:43:07 -05:00

assembly

clean up

2017-08-28 10:34:31 -05:00

atmospherics

clean up

2017-08-28 10:34:31 -05:00

awaymissions

Cleans up more paper fluff varedits. (#30418)

2017-09-06 18:42:43 -05:00

cargo

Merge branch 'master' into upstream-merge-29866

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

chatter

Fixes sounds for toy nuke, red button, and talking action figures (#2475)

2017-08-24 18:31:24 -07:00

client

Merge branch 'master' into upstream-merge-30176

2017-09-06 17:43:07 -05:00

clothing

Merge pull request #2443 from Citadel-Station-13/upstream-merge-30027

2017-09-06 09:22:44 -05:00

crafting

clean up

2017-08-28 10:34:31 -05:00

detectivework

here we go again (#2456)

2017-08-24 19:24:25 -07:00

emoji

…

error_handler

…

events

Update radiation_storm.dm

2017-09-04 03:12:51 -05:00

fields

clean up

2017-08-28 10:34:31 -05:00

flufftext

Prevents hallucinations revealing people's identity

2017-09-02 05:33:55 -05:00

food_and_drinks

line endings ree

2017-08-29 19:57:58 -07:00

games

here we go again (#2456)

2017-08-24 19:24:25 -07:00

goonchat

clean up

2017-08-28 10:34:31 -05:00

holiday

here we go again (#2456)

2017-08-24 19:24:25 -07:00

holodeck

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

html_interface

here we go again (#2456)

2017-08-24 19:24:25 -07:00

hydroponics

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

jobs

Merge branch 'master' into upstream-merge-29105

2017-09-02 07:11:32 -05:00

language

here we go again (#2456)

2017-08-24 19:24:25 -07:00

library

Merge branch 'master' into upstream-merge-30176

2017-09-06 17:43:07 -05:00

lighting

[MIRROR] Adds defines for mouse_opacity (#2381)

2017-08-21 20:29:37 -07:00

mapping

Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it

2017-08-29 17:10:59 -05:00

mentor

…

mining

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

mob

Adds "shiny" variants of lavaland mobs (#30416)

2017-09-06 19:15:25 -05:00

modular_computers

Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004

2017-09-06 09:15:11 -05:00

ninja

commit

2017-09-01 09:52:29 -05:00

orbit

…

paperwork

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

power

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

procedural_mapping

Removes the suppose-to-be unused shuttle wall path

2017-08-28 02:20:45 -05:00

projectiles

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

reagents

Merge branch 'master' into upstream-merge-29866

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

recycling

sync

2017-08-29 09:41:11 -07:00

research

Revert "[MIRROR] Port material containers to datum components" (#2597)

2017-09-04 09:07:40 -05:00

ruins

Cleans up more paper fluff varedits. (#30418)

2017-09-06 18:42:43 -05:00

security_levels

…

server_tools

…

shuttle

initial commit

2017-09-05 16:17:50 -05:00

space_transition

…

spells

Merge branch 'master' into upstream-merge-30203

2017-08-29 20:05:42 -07:00

station_goals

here we go again (#2456)

2017-08-24 19:24:25 -07:00

stock_market

here we go again (#2456)

2017-08-24 19:24:25 -07:00

surgery

Quick sync (#2587)

2017-09-04 04:38:49 -05:00

telesci

here we go again (#2456)

2017-08-24 19:24:25 -07:00

tgui

…

tooltip

…

uplink

Decreases hacked ai module cost (#2557)

2017-09-04 04:14:48 -05:00

vehicles

here we go again (#2456)

2017-08-24 19:24:25 -07:00

vore

Fixes prey digestion noises and loop (#2616)

2017-09-05 12:53:35 -05:00

VR

…

zombie

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00