deathride58 8a75e55b42 Merge branch 'upstream-merge-33213' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33213

2017-12-04 16:54:32 -05:00

..

admin

Merge pull request #33217 from tgstation/Cyberboss-patch-3

2017-12-03 16:07:30 -06:00

assembly

Merge pull request #33192 from Robustin/SavioroftheUniverse

2017-12-02 09:43:25 -06:00

atmospherics

Moves pipe meter sprites (#33122)

2017-11-28 06:28:31 -06:00

awaymissions

Updates some item drops to use drop_location()

2017-11-24 12:59:33 -06:00

cargo

Merge pull request #4152 from Citadel-Station-13/upstream-merge-33134

2017-11-30 04:46:25 +00:00

chatter

…

client

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

clothing

Update hud.dm

2017-11-28 22:24:00 -05:00

crafting

Merge pull request #32891 from CosmicScientist/bolas

2017-11-24 14:06:10 -06:00

detectivework

…

emoji

…

error_handler

…

events

Cleans up a double assignment (#33048)

2017-11-24 22:29:53 -06:00

fields

…

flufftext

A few investigate_log and message_admin fixes

2017-11-24 22:42:01 -06:00

food_and_drinks

butterdogs (#33002)

2017-11-25 15:35:21 -06:00

games

…

goonchat

reeeeEEEEEEEEEEEEEEE

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

holiday

…

holodeck

…

html_interface

…

hydroponics

Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994

2017-11-25 05:53:16 +00:00

integrated_electronics

IC fixes (#33215)

2017-12-04 04:53:12 -06:00

jobs

…

language

…

library

Cleans up some qdel(src)'s in Initialize()

2017-11-26 20:15:18 -06:00

lighting

…

mapping

Cleans up some qdel(src)'s in Initialize()

2017-11-26 20:15:18 -06:00

mentor

…

mining

Clean up some loc assignments (#33157)

2017-12-02 09:44:20 -06:00

mob

Merge branch 'upstream-merge-33213' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33213

2017-12-04 16:54:32 -05:00

modular_computers

[READY]NTnet refactor, assimilates exonet

2017-11-22 15:52:54 -06:00

ninja

…

NTNet

[READY]NTnet refactor, assimilates exonet

2017-11-22 15:52:54 -06:00

orbit

…

paperwork

…

power

Merge branch 'master' into upstream-merge-33213

2017-12-04 21:39:30 +00:00

procedural_mapping

…

projectiles

fixes ricochets not resetting range

2017-11-28 06:28:47 -06:00

reagents

Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090

2017-11-27 03:11:42 +00:00

recycling

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

research

Merge branch 'master' into upstream-merge-33213

2017-12-04 21:39:30 +00:00

ruins

Refactor chasm paths to be more sane (#32701)

2017-11-22 03:30:49 -06:00

security_levels

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

server_tools

…

shuttle

Fixed a rare custom shuttle docker client crash (#33086)

2017-11-27 11:46:32 -06:00

space_transition

…

spells

Fixes Lord Singuloth hungering for more than he should

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

station_goals

…

stock_market

…

surgery

Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

2017-11-22 18:42:34 -06:00

telesci

…

tgui

…

tooltip

…

uplink

Update uplink_item.dm

2017-11-25 00:50:45 -05:00

vehicles

…

vore

…

VR

…

zombie

fix zombie reanimation (#33049)

2017-11-24 22:36:30 -06:00