LetterJay cd06b77e01 Delete preferences_savefile.dm.rej

2017-06-19 20:54:04 -05:00

..

admin

Makes vv log show intended change instead of result (#1575)

2017-06-17 13:30:45 -07:00

assembly

…

atmospherics

Merge pull request #1639 from Citadel-Station-13/upstream-merge-28503

2017-06-17 10:06:14 -05:00

awaymissions

Fixes basic spiderlings becoming ice spiders

2017-06-10 12:22:48 -05:00

cargo

Fixes 28154: Accidental cargo exploit edition. (#1471)

2017-06-17 13:37:43 -07:00

chatter

…

client

Delete preferences_savefile.dm.rej

2017-06-19 20:54:04 -05:00

clothing

Merge branch 'master' into upstream-merge-28046

2017-06-14 13:10:37 -05:00

crafting

Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115

2017-06-10 09:01:25 -05:00

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync

2017-06-14 06:41:01 -05:00

fields

Fixes projectile fields blocking clicks

2017-06-06 07:15:12 -05:00

flufftext

Fixes a to_chat runtime, adds macro for sending images (#1591)

2017-06-17 13:26:42 -07:00

food_and_drinks

Adds onions

2017-06-16 16:22:38 -05:00

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

Adds onions

2017-06-16 16:22:38 -05:00

jobs

Weaponizes station charters (#1449)

2017-06-13 13:47:17 -07:00

language

…

library

…

lighting

Fix some things assuming lighting corners existed (#1642)

2017-06-17 13:17:21 -07:00

mapping

upstream-merge-27951

2017-06-11 02:11:34 -05:00

mentor

…

mining

adds proper gibtonite detonation timing (#1462)

2017-06-17 13:32:35 -07:00

mob

Tablets with IDs in them now show the ID's name on examine

2017-06-17 16:56:48 -05:00

modular_computers

upstream-merge-27951

2017-06-11 02:11:34 -05:00

ninja

up to upstream-merge-27868

2017-06-11 00:04:00 -05:00

orbit

…

paperwork

Fixes various bugs with photos and photo copying.

2017-06-17 07:37:31 -05:00

power

Merge pull request #1632 from Citadel-Station-13/upstream-merge-28466

2017-06-17 10:03:54 -05:00

procedural_mapping

Fixes badmin repair mapgen module for real this time (#1604)

2017-06-17 13:29:10 -07:00

projectiles

Merge pull request #1455 from Citadel-Station-13/upstream-merge-28125

2017-06-14 08:53:52 -05:00

reagents

Merge pull request #1634 from Citadel-Station-13/upstream-merge-28414

2017-06-17 10:04:59 -05:00

recycling

…

research

Removes tech requirement from flashes

2017-06-16 16:25:44 -05:00

ruins

Merge branch 'master' into upstream-merge-28046

2017-06-14 13:10:37 -05:00

security_levels

…

server_tools

Fixes ExportService running even when not using TGS3

2017-06-15 21:01:05 -05:00

shuttle

Refactors the latejoin list

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

space_transition

…

spells

upstream-merge-27951

2017-06-11 02:11:34 -05:00

station_goals

Fixes bsa not showing up (#1396)

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

stock_market

…

surgery

Vomit fix

2017-06-16 15:19:26 -05:00

telesci

…

tgui

…

tooltip

…

uplink

Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145

2017-06-14 08:58:35 -05:00

vehicles

…

vore

…

VR

…

zombie

…