deathride58 d8e1562fcf Merge pull request #3995 from deathride58/manualsyncsreeEEEE ...

Manual map syncs + manual mirrors of missed upstream map PRs

2017-11-20 05:12:06 +00:00

..

admin

Merge pull request #3995 from deathride58/manualsyncsreeEEEE

2017-11-20 05:12:06 +00: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

Merge pull request #31947 from AnturK/yarr

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

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

Merge branch 'master' into upstream-merge-32161

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

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

Fix runtimes when stacking pizza boxes (#32831)

2017-11-18 13:51:01 -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

Fixes inconsistencies w/ energy descriptions

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

integrated_electronics

Merge pull request #4009 from Citadel-Station-13/upstream-merge-32788

2017-11-19 05:16:15 +00: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 #32871 from AnturK/orbitclean

2017-11-19 17:13:08 -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 inconsistencies w/ energy descriptions

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

orbit

Merge pull request #32871 from AnturK/orbitclean

2017-11-19 17:13:08 -06:00

paperwork

Update clipboard.dm

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

power

Update cell.dm

2017-11-18 23:31:32 -05:00

procedural_mapping

…

projectiles

Merge pull request #32871 from AnturK/orbitclean

2017-11-19 17:13:08 -06:00

reagents

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

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

recycling

manual map syncs + manual missed pr mirrors

2017-11-17 21:34:49 -05:00

research

Fixes inconsistencies w/ energy descriptions

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

ruins

Fixes whiteship ruin board swap (#32869)

2017-11-19 21:04:11 -06:00

security_levels

…

server_tools

…

shuttle

Merge pull request #32886 from ShizCalev/to_chat

2017-11-19 22:26:28 -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 #3971 from Citadel-Station-13/upstream-merge-32786

2017-11-18 05:29:32 +00: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

…