LetterJay 37085ee10e Merge pull request #3930 from Citadel-Station-13/upstream-merge-32723 ...

[MIRROR] Makes cryoxadone heal clone damage again

2017-11-15 10:40:13 -06:00

..

admin

Merge branch 'master' into upstream-merge-32280

2017-11-15 10:21:04 -06:00

assembly

Merge branch 'master' into upstream-merge-32161

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

atmospherics

Merge pull request #3942 from Citadel-Station-13/upstream-merge-32607

2017-11-14 15:57:06 -06:00

awaymissions

Merge pull request #31947 from AnturK/yarr

2017-11-13 03:19:38 -06:00

cargo

Merge pull request #31947 from AnturK/yarr

2017-11-13 03:19:38 -06:00

chatter

…

client

it works 👍

2017-11-13 17:00:26 -05:00

clothing

Merge pull request #31947 from AnturK/yarr

2017-11-13 03:19:38 -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 #3914 from Citadel-Station-13/upstream-merge-31947

2017-11-13 11:52:40 -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

reeeeEEEEEEEEEEEEEEE

2017-11-13 22:55:18 -05:00

holiday

Makes false alarm use more explicit in event code.

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

holodeck

Add off switch to holodeck (#32327)

2017-11-03 15:55:03 -05:00

html_interface

…

hydroponics

…

integrated_electronics

[READY]integrated circuitry port+upgrade.

2017-11-14 05:00:48 -06:00

jobs

Fixes chaplain not getting his weapon on spawn (#32658)

2017-11-13 03:16:01 -06:00

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 #3713 from Citadel-Station-13/upstream-merge-32277

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

modular_computers

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

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

ninja

Fixes energy katana dash toggle

2017-11-04 19:39:48 -05:00

orbit

…

paperwork

Update clipboard.dm

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

power

Alt clicking additions (#32607)

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

procedural_mapping

…

projectiles

Merge pull request #32553 from ExcessiveUseOfCobblestone/ihategoofxray

2017-11-13 03:17:24 -06:00

reagents

Merge pull request #3930 from Citadel-Station-13/upstream-merge-32723

2017-11-15 10:40:13 -06:00

recycling

Merge branch 'master' into upstream-merge-32435

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

research

[READY]integrated circuitry port+upgrade.

2017-11-14 05:00:48 -06:00

ruins

…

security_levels

…

server_tools

…

shuttle

Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176

2017-11-14 15:58:20 -06:00

space_transition

…

spells

Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176

2017-11-14 15:58:20 -06:00

station_goals

Little change. More the same

2017-11-06 08:46:39 -06:00

stock_market

…

surgery

Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176

2017-11-14 15:58:20 -06:00

telesci

…

tgui

Update tgui.dm

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

tooltip

…

uplink

…

vehicles

Merge branch 'master' into upstream-merge-31176

2017-11-09 03:24:38 -06:00

vore

…

VR

…

zombie

…