kevinz000 0e0928df26 Merge branch 'master' into fusion_2

2018-09-03 11:17:45 -07:00

..

admin

Merge pull request #7489 from Citadel-Station-13/nanites

2018-09-03 13:47:28 -04:00

antagonists

Merge pull request #7489 from Citadel-Station-13/nanites

2018-09-03 13:47:28 -04:00

assembly

Merge pull request #7489 from Citadel-Station-13/nanites

2018-09-03 13:47:28 -04:00

atmospherics

work damnit, work.

2018-09-03 10:43:49 -07:00

awaymissions

New Alien Lavaland Ruin (#7455)

2018-08-23 00:26:32 -07:00

cargo

Improves cargo shuttle/firefighting foam descs (#38927)

2018-07-06 09:42:33 -05:00

chatter

…

client

Fixes Cit_toggles by sanitizing it with less autism

2018-08-31 03:11:41 -05:00

clothing

Fixes Fedoras having armor values (#7521)

2018-08-31 12:13:50 -07:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

…

fields

…

flufftext

Nanites port from /tg/station, original coder XDTM

2018-08-23 01:16:32 -07:00

food_and_drinks

Upstream fix mirror spree (#7362)

2018-07-20 03:40:39 -07:00

games

…

goonchat

…

holiday

…

holodeck

…

hydroponics

Merge pull request #7340 from Citadel-Station-13/upstream-merge-38908

2018-07-06 01:34:50 -04:00

integrated_electronics

Nanites port from /tg/station, original coder XDTM

2018-08-23 01:16:32 -07:00

jobs

Nanites port from /tg/station, original coder XDTM

2018-08-23 01:16:32 -07:00

keybindings

…

language

…

library

oops

2018-08-23 11:58:09 -05:00

lighting

…

mapping

Photography Update

2018-07-20 15:26:13 -07:00

mining

Sliding Puzzle

2018-08-07 04:44:12 -07:00

mob

Merge pull request #7489 from Citadel-Station-13/nanites

2018-09-03 13:47:28 -04:00

modular_computers

…

ninja

Merge pull request #6945 from ElPresidentePoole/master

2018-08-17 16:55:28 -04:00

NTNet

…

orbit

…

paperwork

Photography Update

2018-07-20 15:26:13 -07:00

photography

Update camera.dm

2018-08-16 13:06:58 -07:00

power

Merge pull request #7173 from Citadel-Station-13/kevinz000-patch-11

2018-07-06 01:37:42 -04:00

procedural_mapping

…

projectiles

Merge branch 'master' into fusion_2

2018-09-03 11:17:45 -07:00

reagents

Merge pull request #7489 from Citadel-Station-13/nanites

2018-09-03 13:47:28 -04:00

recycling

…

research

Merge pull request #7489 from Citadel-Station-13/nanites

2018-09-03 13:47:28 -04:00

ruins

Update puzzle.dm

2018-08-07 04:46:41 -07:00

security_levels

…

shuttle

Upstream fix mirror spree (#7362)

2018-07-20 03:40:39 -07:00

spells

…

station_goals

…

surgery

Merge pull request #7489 from Citadel-Station-13/nanites

2018-09-03 13:47:28 -04:00

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

Upstream fix mirror spree (#7362)

2018-07-20 03:40:39 -07:00

vehicles

…

vending

Update _vending.dm

2018-08-20 14:57:31 -07:00

VR

…

zombie

…