Jordan Brown 7fe11dc952 Merge pull request #37993 from DaxDupont/more-juice ...

Adds two saferChems for vent clogs.

2018-05-25 10:54:20 -05:00

..

admin

Merge pull request #6642 from Citadel-Station-13/upstream-merge-37623

2018-05-23 22:26:22 -05:00

antagonists

Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582

2018-05-23 07:46:26 -05:00

assembly

Removes a couple thousand empty lists (#38000)

2018-05-23 21:15:41 -05:00

atmospherics

Fixes digital valves not working for silicons (#37969)

2018-05-22 22:12:14 -05:00

awaymissions

Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582

2018-05-23 07:46:26 -05:00

cargo

Merge branch 'master' into upstream-merge-37597

2018-05-22 07:21:53 -05:00

chatter

…

client

Merge pull request #6830 from Citadel-Station-13/upstream-merge-37943

2018-05-22 02:27:55 +00:00

clothing

Fixes reactive repulse armour (#37999)

2018-05-23 21:00:10 -05:00

crafting

replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2

2018-05-02 13:14:43 -05:00

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #37993 from DaxDupont/more-juice

2018-05-25 10:54:20 -05:00

fields

…

flufftext

…

food_and_drinks

Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598

2018-05-23 22:26:44 -05:00

games

…

goonchat

Merge pull request #37934 from AutomaticFrenzy/patch/ssping

2018-05-21 16:40:29 -05:00

holiday

…

holodeck

…

hydroponics

Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486

2018-05-22 07:18:34 -05:00

integrated_electronics

Merge pull request #37972 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-1

2018-05-21 16:43:42 -05:00

jobs

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:11:16 -05:00

keybindings

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:12:07 -05:00

language

Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00

library

…

lighting

…

mapping

…

mining

Merge pull request #6857 from Citadel-Station-13/upstream-merge-37951

2018-05-25 02:35:43 -05:00

mob

Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448

2018-05-24 11:58:57 -05:00

modular_computers

Merge branch 'master' into upstream-merge-37529

2018-05-22 08:02:46 -05:00

ninja

Merge branch 'master' into upstream-merge-37486

2018-05-21 11:59:57 -05:00

NTNet

…

orbit

…

paperwork

Update photocopier.dm

2018-05-22 07:56:25 -05:00

power

Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448

2018-05-24 11:58:57 -05:00

procedural_mapping

…

projectiles

Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582

2018-05-23 07:46:26 -05:00

reagents

Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598

2018-05-23 22:26:44 -05:00

recycling

…

research

Merge pull request #6862 from Citadel-Station-13/upstream-merge-38020

2018-05-25 02:35:58 -05:00

ruins

…

security_levels

…

shuttle

…

spells

Fixes mimery blockade showing up under spell tab (#38004)

2018-05-23 19:44:16 -05:00

station_goals

…

stock_market

…

surgery

Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582

2018-05-23 07:46:26 -05:00

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

…

vehicles

…

vending

Merge branch 'master' into upstream-merge-37598

2018-05-23 07:44:52 -05:00

VR

Adds a sprite for the "quit vr" action button (#37994)

2018-05-23 21:18:54 -05:00

zombie

[MIRROR] Replaced body zone magic strings with defines (#6004)

2018-03-19 21:18:57 -05:00