deathride58 a8783e5d1f Merge branch 'master' into upstream-merge-32823

2017-11-18 06:06:14 +00:00

..

admin

Replaces a bunch of mob loops with hopefully better ones

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

assembly

Prevents proximity sensors from beeping when off. (#32783)

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

atmospherics

Merge branch 'master' into upstream-merge-32823

2017-11-18 06:06:14 +00:00

awaymissions

Replaces a bunch of mob loops with hopefully better ones

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

cargo

…

chatter

…

client

RPD ui improvements

2017-11-17 18:03:56 -06:00

clothing

Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! (#3993)

2017-11-17 19:02:40 -08:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786

2017-11-18 05:29:32 +00:00

fields

…

flufftext

Replaces a bunch of mob loops with hopefully better ones

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

food_and_drinks

combines the missed microwave PR

2017-11-15 10:31:41 -06:00

games

…

goonchat

…

holiday

…

holodeck

…

html_interface

…

hydroponics

Fixes hydroponics not properly dealing with fluorine (#32813)

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

integrated_electronics

[MIRROR] Remove shocker circuit (#3983)

2017-11-17 00:24:50 -08:00

jobs

…

language

…

library

…

lighting

…

mapping

…

mentor

…

mining

…

mob

Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786

2017-11-18 05:29:32 +00:00

modular_computers

…

ninja

…

orbit

…

paperwork

…

power

Replaces a bunch of mob loops with hopefully better ones

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

procedural_mapping

…

projectiles

…

reagents

Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183

2017-11-15 15:00:46 -06:00

recycling

…

research

Replaces a bunch of mob loops with hopefully better ones

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

ruins

…

security_levels

…

server_tools

…

shuttle

Replaces a bunch of mob loops with hopefully better ones

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

space_transition

…

spells

…

station_goals

…

stock_market

…

surgery

Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786

2017-11-18 05:29:32 +00:00

telesci

…

tgui

…

tooltip

…

uplink

…

vehicles

…

vore

…

VR

…

zombie

…