LetterJay b2d288d1f8 Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611 ...

[MIRROR] Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value

2017-06-05 23:06:18 -05:00

..

admin

Original mirrored too much.

2017-06-05 07:18:29 -05:00

assembly

…

atmospherics

Lowers portable pump max pressure to 1013.25

2017-05-31 23:14:26 -05:00

awaymissions

Remove a commented out function (#1389)

2017-06-04 09:06:02 -07:00

cargo

rej clean

2017-05-30 15:55:00 -05:00

chatter

…

client

Adds coalesce to world.internet_address

2017-05-29 09:15:12 -05:00

clothing

Fixes #27989 : Riot suits no longer hide jumpsuits (#1379)

2017-06-04 09:09:03 -07:00

crafting

The Crafting Menu now has subcategories! (#1364)

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

detectivework

…

emoji

…

error_handler

…

events

THE DEVIL

2017-06-05 04:35:22 -05:00

fields

If you're gonna make a subsystem do it right

2017-05-23 13:45:27 -05:00

flufftext

Fixes bsa not showing up (#1396)

2017-06-04 09:03:30 -07:00

food_and_drinks

master cleanup

2017-06-05 22:50:31 -05:00

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

Removes the shadowshroom admin message

2017-05-25 08:36:59 -05:00

jobs

Proposal: typed map variables (#1398)

2017-06-04 09:03:38 -07:00

language

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528

2017-05-28 21:49:30 -05:00

library

Fixes library machines not finding book scanners

2017-05-24 03:47:08 -05:00

lighting

…

mapping

…

mentor

…

mining

[READY] Stacks will change item_states and w_class based on how full they are. (#1370)

2017-06-04 09:08:33 -07:00

mob

Refactors the latejoin list

2017-06-04 15:08:35 -05:00

modular_computers

Config shit for cards (#1310)

2017-06-02 21:56:08 -07:00

ninja

…

orbit

…

paperwork

Removes poison pen. (#1295)

2017-06-03 06:39:23 -07:00

power

Makes cable great again

2017-06-05 16:39:37 -05:00

procedural_mapping

Adds repair and lavaland map generator templates for buildmode use

2017-05-31 12:57:22 -05:00

projectiles

Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611

2017-06-05 23:06:18 -05:00

reagents

Gives the pod people's dispenser all the chemicals they could ever want. (#1357)

2017-06-03 06:36:34 -07:00

recycling

Fixes conveyor belts moving things with no gravity

2017-05-22 22:48:09 -05:00

research

It's been a long night

2017-05-30 22:41:22 -05:00

ruins

rej

2017-05-30 16:43:09 -05:00

security_levels

…

server_tools

Original mirrored too much.

2017-06-05 07:18:29 -05:00

shuttle

Refactors the latejoin list

2017-06-04 15:08:35 -05:00

space_transition

…

spells

Refactors explosions

2017-05-24 16:45:00 -05:00

station_goals

Fixes bsa not showing up (#1396)

2017-06-04 09:03:30 -07:00

stock_market

…

surgery

Fixes bsa not showing up (#1396)

2017-06-04 09:03:30 -07:00

telesci

…

tgui

…

tooltip

…

uplink

we have to move forward with grammar fixes (#1397)

2017-06-04 09:04:03 -07:00

vehicles

[MIRROR] refactors how vehicles use offsets + multiseat (#1128)

2017-05-28 15:13:04 -07:00

vore

…

VR

…

zombie

Brains extracted from infectious zombies keep their old species

2017-05-24 16:30:36 -05:00