deathride58 e66e348d5c Merge pull request #6572 from Citadel-Station-13/upstream-merge-37535 ...

[MIRROR] Fixes gas fusion power not being taken into account

2018-04-29 22:33:37 +00:00

..

admin

Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436

2018-04-28 01:36:04 -05:00

antagonists

Merge pull request #6544 from Citadel-Station-13/upstream-merge-37479

2018-04-29 02:25:37 -05:00

assembly

everything but mob stuff

2018-04-23 01:06:17 -05:00

atmospherics

Merge pull request #37535 from cyclowns/fusion-fix

2018-04-29 17:18:30 -05:00

awaymissions

Can't push CTF flag carriers (#37321)

2018-04-22 19:19:32 -05:00

cargo

Merge pull request #6500 from Citadel-Station-13/upstream-merge-37398

2018-04-27 00:09:17 -05:00

chatter

…

client

Adds follow link to admin LOOC messages (#6378)

2018-04-27 07:39:01 -07:00

clothing

Fixes invisible turtleneck alt state

2018-04-29 10:04:52 -05:00

crafting

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

detectivework

Fix grammar when cleaning things with the damp rag

2018-04-29 14:27:51 -05:00

emoji

…

error_handler

Readds dropped #endif (#37174)

2018-04-13 22:10:47 -05:00

events

Makes clogged vents scale, and way less powerful. (#37385)

2018-04-27 13:05:36 -05:00

fields

…

flufftext

everything but mob stuff

2018-04-23 01:06:17 -05:00

food_and_drinks

Merge pull request #37480 from ShizCalev/pineapple-meme

2018-04-27 07:29:39 -05:00

games

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

goonchat

…

holiday

everything but mob stuff

2018-04-23 01:06:17 -05:00

holodeck

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

hydroponics

Merge pull request #6488 from Citadel-Station-13/upstream-merge-37362

2018-04-27 09:18:15 +00:00

integrated_electronics

you can now print tools using the integrated circuit printer again (#37445)

2018-04-27 05:17:42 -05:00

jobs

Merge pull request #6370 from Citadel-Station-13/upstream-merge-37132

2018-04-14 07:44:36 -05:00

keybindings

Merge pull request #6518 from Citadel-Station-13/upstream-merge-37413

2018-04-27 09:36:44 +00:00

language

…

library

everything but mob stuff

2018-04-23 01:06:17 -05:00

lighting

everything but mob stuff

2018-04-23 01:06:17 -05:00

mapping

Merge pull request #6524 from Citadel-Station-13/upstream-merge-37342

2018-04-27 09:39:52 +00:00

mining

Merge pull request #6513 from Citadel-Station-13/upstream-merge-37403

2018-04-27 09:34:49 +00:00

mob

Removes some unused code. (#37449)

2018-04-27 10:33:10 -05:00

modular_computers

fixes obj descs and adds new ones (#37483)

2018-04-27 13:21:08 -05:00

ninja

everything but mob stuff

2018-04-23 01:06:17 -05:00

NTNet

Merge pull request #36693 from kevinz000/patch-471

2018-04-11 05:02:19 -05:00

orbit

…

paperwork

everything but mob stuff

2018-04-23 01:06:17 -05:00

power

Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483

2018-04-29 02:29:44 -05:00

procedural_mapping

everything but mob stuff

2018-04-23 01:06:17 -05:00

projectiles

Makes pacifists able to use .50BMG Soporific Rounds (#37506)

2018-04-29 10:11:42 -05:00

reagents

Re-adds and reworks fusion. (#37384)

2018-04-28 01:01:47 -05:00

recycling

everything but mob stuff

2018-04-23 01:06:17 -05:00

research

Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483

2018-04-29 02:29:44 -05:00

ruins

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

security_levels

…

server_tools

…

shuttle

Fixes jumpToNullSpace (#37442)

2018-04-27 13:05:44 -05:00

spells

Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436)

2018-04-27 07:37:15 -05:00

station_goals

Merge pull request #37233 from KorPhaeron/gps3

2018-04-15 16:01:10 -05:00

stock_market

fixes obj descs and adds new ones (#37483)

2018-04-27 13:21:08 -05:00

surgery

Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373

2018-04-27 09:42:46 +00:00

tgui

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

tooltip

…

unit_tests

…

uplink

desc (#37435)

2018-04-27 02:37:44 -05:00

vehicles

fixes the laws of matter conservation (#37300)

2018-04-20 15:32:32 -05:00

vending

everything but mob stuff

2018-04-23 01:06:17 -05:00

VR

Merge branch 'master' into upstream-merge-36974

2018-04-10 07:48:12 +00:00

zombie

…