LetterJay 8f06db65c9 Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534 ...

[MIRROR] Replaced mob spawner vars with outfits

2017-05-30 21:43:31 -05:00

..

admin

41 files changed, original only had 4. SPACES.

2017-05-30 14:36:11 -05:00

assembly

…

atmospherics

Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503

2017-05-24 12:34:36 -05:00

awaymissions

Merge branch 'master' into upstream-merge-27534

2017-05-30 16:45:59 -05:00

cargo

rej clean

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

chatter

…

client

…

clothing

Adds some silly new meson failure excuses

2017-05-30 11:12:56 -05:00

crafting

Adds goliath cloak & a recipe (Lavaland PvE primitive item)

2017-05-26 11:14:20 -05:00

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530

2017-05-30 20:49:42 -05:00

fields

…

flufftext

…

food_and_drinks

…

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

Removes the shadowshroom admin message

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

jobs

Update job.dm

2017-05-30 17:07:04 -05: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

…

lighting

…

mapping

…

mentor

…

mining

shit always breaks somehow.

2017-05-30 18:37:28 -05:00

mob

Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534

2017-05-30 21:43:31 -05:00

modular_computers

Ports modular computers to initialize

2017-05-28 08:12:11 -05:00

ninja

…

orbit

…

paperwork

The Syndicate has fired their chemist and hired a replacement. (#1232)

2017-05-27 13:31:29 -07:00

power

Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361

2017-05-30 15:15:51 -05:00

procedural_mapping

…

projectiles

rej clean up

2017-05-30 20:08:53 -05:00

reagents

Refactors explosions

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

recycling

…

research

Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530

2017-05-30 20:49:42 -05:00

ruins

rej

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

security_levels

…

shuttle

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

2017-05-30 15:29:24 -05:00

space_transition

…

spells

Refactors explosions

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

station_goals

…

stock_market

…

surgery

The officer's sabre can be used to remove a lizard's tail.

2017-05-29 11:08:28 -05:00

telesci

…

tgui

…

tooltip

…

uplink

UPDATE: Removes airlock charge from uplink (#1216)

2017-05-27 13:37:45 -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