LetterJay 9f52f1cea2 Merge pull request #1737 from Citadel-Station-13/upstream-merge-28486 ...

[MIRROR] Stamina projectiles no longer set off grenades and flamethrowers

2017-06-22 19:21:30 -05:00

..

admin

another huge sync

2017-06-21 18:00:00 -05:00

assembly

Ports Goonchat

2017-06-08 16:27:56 -05:00

atmospherics

Freezers and heaters now drop the correct materials (Fixes #28560)

2017-06-19 21:27:30 -05:00

awaymissions

Fixes basic spiderlings becoming ice spiders

2017-06-10 12:22:48 -05:00

cargo

Remember to test your PRs, kids! - Rebalances matter cartridge cost redux (#1652)

2017-06-20 07:59:04 -07:00

chatter

…

client

another huge sync

2017-06-21 18:00:00 -05:00

clothing

another huge sync

2017-06-21 18:00:00 -05:00

crafting

Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115

2017-06-10 09:01:25 -05:00

detectivework

…

emoji

Ports Goonchat

2017-06-08 16:27:56 -05:00

error_handler

…

events

Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync

2017-06-14 06:41:01 -05:00

fields

Fixes projectile fields blocking clicks

2017-06-06 07:15:12 -05:00

flufftext

another huge sync

2017-06-21 18:00:00 -05:00

food_and_drinks

Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00

games

…

goonchat

fixes looc

2017-06-20 01:25:48 -05:00

holiday

…

holodeck

…

html_interface

…

hydroponics

Bonfires light up in lavaland atmos

2017-06-19 08:53:41 -05:00

jobs

Dufflebag => Dufflebag

2017-06-19 16:42:05 -05:00

language

another huge sync

2017-06-21 18:00:00 -05:00

library

Chisel messages will be below objects

2017-06-19 22:07:23 -05:00

lighting

Fix some things assuming lighting corners existed (#1642)

2017-06-17 13:17:21 -07:00

mapping

upstream-merge-27951

2017-06-11 02:11:34 -05:00

mentor

…

mining

Dufflebag => Dufflebag

2017-06-19 16:42:05 -05:00

mob

Stamina projectiles no longer set off grenades and flamethrowers

2017-06-22 11:00:13 -05:00

modular_computers

Minor telecom code cleanup (#1691)

2017-06-20 07:58:53 -07:00

ninja

up to upstream-merge-27868

2017-06-11 00:04:00 -05:00

orbit

…

paperwork

Fixes spriteless empty paperbins

2017-06-22 10:58:57 -05:00

power

Freezers and heaters now drop the correct materials (Fixes #28560)

2017-06-19 21:27:30 -05:00

procedural_mapping

Fixes badmin repair mapgen module for real this time (#1604)

2017-06-17 13:29:10 -07:00

projectiles

another huge sync

2017-06-21 18:00:00 -05:00

reagents

Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00

recycling

Ports Goonchat

2017-06-08 16:27:56 -05:00

research

another huge sync

2017-06-21 18:00:00 -05:00

ruins

Merge branch 'master' into upstream-merge-28046

2017-06-14 13:10:37 -05:00

security_levels

…

server_tools

another huge sync

2017-06-21 18:00:00 -05:00

shuttle

…

space_transition

…

spells

upstream-merge-27951

2017-06-11 02:11:34 -05:00

station_goals

…

stock_market

Ports Goonchat

2017-06-08 16:27:56 -05:00

surgery

another huge sync

2017-06-21 18:00:00 -05:00

telesci

…

tgui

…

tooltip

…

uplink

another huge sync

2017-06-21 18:00:00 -05:00

vehicles

…

vore

Removed vore sound falloff

2017-06-21 07:27:54 -05:00

VR

…

zombie

Reduces the size of the zombie revival flavor text (Fixes #28568)

2017-06-19 19:53:44 -05:00