LetterJay f610a6110b Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597 ...

[MIRROR] Fixes stimulum decay

2017-11-13 11:45:00 -06:00

..

admin

Merge branch 'master' into upstream-merge-32247

2017-11-12 23:09:10 -06:00

assembly

Merge branch 'master' into upstream-merge-32161

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

atmospherics

Refactor of base machinery a tiny bit more. DONE (#32546)

2017-11-12 13:19:23 -06:00

awaymissions

Merge branch 'master' into upstream-merge-32161

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

cargo

…

chatter

…

client

…

clothing

Merge branch 'master' into upstream-merge-32161

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

crafting

Merge branch 'master' into upstream-merge-32161

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

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559

2017-11-13 11:42:53 -06:00

fields

…

flufftext

…

food_and_drinks

Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161

2017-11-12 23:06:55 -06:00

games

…

goonchat

Merge pull request #32585 from Qbopper/turnitdown

2017-11-12 12:52:31 -06:00

holiday

Makes false alarm use more explicit in event code.

2017-11-11 14:36:36 -06:00

holodeck

…

html_interface

…

hydroponics

…

jobs

…

language

…

library

…

lighting

…

mapping

Fixes some cases where changeturf were called incorrectly (#32584)

2017-11-11 14:32:13 -06:00

mentor

…

mining

Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161

2017-11-12 23:06:55 -06:00

mob

Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161

2017-11-12 23:06:55 -06:00

modular_computers

Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546

2017-11-13 11:44:46 -06:00

ninja

…

orbit

…

paperwork

Update clipboard.dm

2017-11-12 13:17:59 -06:00

power

Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546

2017-11-13 11:44:46 -06:00

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-32161

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

reagents

Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597

2017-11-13 11:45:00 -06:00

recycling

Merge branch 'master' into upstream-merge-32435

2017-11-13 11:30:06 -06:00

research

Update autolathe_designs.dm

2017-11-12 15:41:25 -06:00

ruins

…

security_levels

…

server_tools

…

shuttle

Merge branch 'master' into upstream-merge-32161

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

space_transition

…

spells

Merge pull request #32577 from PKPenguin321/patch-13

2017-11-11 14:32:04 -06:00

station_goals

…

stock_market

…

surgery

fixes spelling and stuff (#32531)

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

telesci

…

tgui

Update tgui.dm

2017-11-12 13:18:42 -06:00

tooltip

…

uplink

…

vehicles

…

vore

…

VR

…

zombie

…