LetterJay 3635cd9c71 Merge pull request #6445 from Citadel-Station-13/upstream-merge-37239 ...

[MIRROR] fixes fuckup in expressconsole preventing packs being ordered when credits are low

2018-04-22 02:32:38 -05:00

..

admin

Adds round id to server ban messages (#37114)

2018-04-12 11:47:08 -05:00

antagonists

Merge pull request #37229 from vuonojenmustaturska/centcommission

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

assembly

things with stuff (#6233)

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

atmospherics

Allows passive gates to be touched in unpowered areas

2018-04-15 12:41:28 -05:00

awaymissions

things with stuff (#6233)

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

cargo

fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239)

2018-04-16 19:14:08 -05:00

chatter

…

client

Merge pull request #6334 from Citadel-Station-13/upstream-merge-36858

2018-04-12 07:06:08 -05:00

clothing

sucessfully fixes some grammar (#37095)

2018-04-14 08:12:34 -05:00

crafting

things with stuff (#6233)

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

detectivework

Detective Scanner Fixes (#36915)

2018-04-09 13:05:30 -05:00

emoji

…

error_handler

Readds dropped #endif (#37174)

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

events

Reduces aurora caelus weight to that of meteors

2018-04-13 09:02:28 -05:00

fields

…

flufftext

…

food_and_drinks

blacklist his grace from being deep-fried

2018-04-15 12:41:19 -05:00

games

things with stuff (#6233)

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

goonchat

…

holiday

Finishes overflow roles (#37053)

2018-04-09 05:10:14 -05:00

holodeck

things with stuff (#6233)

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

hydroponics

things with stuff (#6233)

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

integrated_electronics

Reorganised component controls (#37054)

2018-04-15 04:31:16 -05:00

jobs

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

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

keybindings

…

language

…

library

things with stuff (#6233)

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

lighting

…

mapping

Updates baseturf helpers to the new baseturf system (#37154)

2018-04-13 07:58:37 -05:00

mining

Changes ore-burning math to avoid decimals (and raise RNG) (#37005)

2018-04-12 06:37:33 -05:00

mob

Merge pull request #6383 from Citadel-Station-13/upstream-merge-37113

2018-04-16 03:05:00 +00:00

modular_computers

things with stuff (#6233)

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

ninja

…

NTNet

Merge pull request #36693 from kevinz000/patch-471

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

orbit

…

paperwork

Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788

2018-04-10 07:20:33 +00:00

power

oof

2018-04-11 14:59:54 -05:00

procedural_mapping

…

projectiles

Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful (#36670)

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

reagents

zoinks

2018-04-14 10:57:55 -05:00

recycling

Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122

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

research

Fixes bluespace cookie centcom exploit

2018-04-15 12:38:26 -05:00

ruins

things with stuff (#6233)

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

security_levels

…

server_tools

…

shuttle

fixes borgs being able to send the ferry

2018-04-15 12:39:52 -05:00

spells

things with stuff (#6233)

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

station_goals

Merge pull request #37233 from KorPhaeron/gps3

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

stock_market

things with stuff (#6233)

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

surgery

Forcing the human liver to actually do its job v2 (#37032)

2018-04-11 09:33:49 -05:00

telesci

…

tgui

things with stuff (#6233)

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

tooltip

…

unit_tests

…

uplink

Provides more control over uplink surplus chances. (#36983)

2018-04-11 05:16:32 -05:00

vehicles

things with stuff (#6233)

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

vending

things with stuff (#6233)

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

VR

Merge branch 'master' into upstream-merge-36974

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

zombie

…