Jordan Brown c36f144d9e Merge pull request #35792 from DaedalusGame/bitconnect ...

Fixes multiserver mining formula

2018-02-19 22:09:55 -06:00

..

admin

[MIRROR] Adds a space on check antag between name and role (#5589)

2018-02-19 10:22:47 -06:00

antagonists

[MIRROR] Extensive surgery additions (#5590)

2018-02-19 10:48:11 -06:00

assembly

…

atmospherics

[MIRROR] Fixes some tool interactions (#5555)

2018-02-17 17:46:46 -06:00

awaymissions

Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673

2018-02-17 20:44:57 +00:00

cargo

Update packs.dm

2018-02-18 18:32:00 -05:00

chatter

…

client

…

clothing

Flightsuit Armor adjustments (#5515)

2018-02-17 18:05:26 -06:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

Removes unnused random event

2018-02-18 11:33:03 -06:00

fields

[MIRROR] Fixed overlapping timestop behavior (#5591)

2018-02-19 10:22:59 -06:00

flufftext

…

food_and_drinks

[MIRROR] Fixes immersion, fried eggs now no longer requires boiled eggs (#5582)

2018-02-18 19:52:54 -06:00

games

Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431

2018-02-16 14:27:26 +00:00

goonchat

…

holiday

…

holodeck

…

hydroponics

…

integrated_electronics

Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668

2018-02-17 19:29:50 +00:00

jobs

[MIRROR] Extensive surgery additions (#5590)

2018-02-19 10:48:11 -06:00

keybindings

…

language

…

library

…

lighting

…

mapping

Citadel'd Maps from #5523 (#5551)

2018-02-17 18:04:28 -06:00

mining

[MIRROR] Sheet icon fixes (#5585)

2018-02-19 10:21:32 -06:00

mob

[MIRROR] Extensive surgery additions (#5590)

2018-02-19 10:48:11 -06:00

modular_computers

…

ninja

Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668

2018-02-17 19:29:50 +00:00

NTNet

…

orbit

…

paperwork

[MIRROR] Deletes a redundant double proc definition in paper bins (#5586)

2018-02-19 10:21:47 -06:00

power

Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668

2018-02-17 19:29:50 +00:00

procedural_mapping

…

projectiles

[READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams. (#35344)

2018-02-18 11:34:29 -06:00

reagents

[MIRROR] Extensive surgery additions (#5590)

2018-02-19 10:48:11 -06:00

recycling

…

research

Merge pull request #35792 from DaedalusGame/bitconnect

2018-02-19 22:09:55 -06:00

ruins

…

security_levels

…

server_tools

…

shuttle

…

spells

Removes abstract shotgun from Summon Guns list (#35736)

2018-02-17 10:05:38 -06:00

station_goals

…

stock_market

…

surgery

[MIRROR] Extensive surgery additions (#5590)

2018-02-19 10:48:11 -06:00

telesci

…

tgui

…

tooltip

…

unit_tests

…

uplink

[MIRROR] Extensive surgery additions (#5590)

2018-02-19 10:48:11 -06:00

vehicles

Fixes bicycle riding

2018-02-18 11:34:21 -06:00

vore

fixes travis

2018-02-17 18:10:21 -06:00

VR

…

zombie

…