LetterJay 11b558c367 Merge branch 'master' into upstream-merge-31093

2017-10-01 00:50:26 -04:00

..

admin

[s] Fixes config reading exploit

2017-09-30 09:45:13 -05:00

assembly

…

atmospherics

Alt-clicking descriptions when examining

2017-09-28 21:51:53 -05:00

awaymissions

DisplayTimeText mk2

2017-09-24 18:59:57 -05:00

cargo

[MIRROR] Adds some new plushies (#2866)

2017-09-22 22:31:07 -05:00

chatter

…

client

Merge pull request #2583 from deathride58/screenshake

2017-09-24 11:34:50 -04:00

clothing

Merge branch 'master' into upstream-merge-29741

2017-09-30 13:35:47 -04:00

crafting

[MIRROR] Ammo cleanup (#2643)

2017-09-22 22:30:44 -05:00

detectivework

Fixes evidence bag not respecting inventory

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

emoji

…

error_handler

DisplayTimeText mk2

2017-09-24 18:59:57 -05:00

events

Removes a call to datum/New()

2017-09-29 15:59:19 -05:00

fields

[READY]Refactors timestops to use fields (#30858)

2017-09-28 21:46:34 -05:00

flufftext

…

food_and_drinks

Merge pull request #31064 from YPOQ/silverfriedfoods

2017-09-28 21:55:42 -05:00

games

Alt-clicking descriptions when examining

2017-09-28 21:51:53 -05:00

goonchat

Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow

2017-09-28 16:02:31 -05:00

holiday

[MIRROR] New squeaky datum and plushes (#2847)

2017-09-22 19:43:56 -05:00

holodeck

…

html_interface

…

hydroponics

[MIRROR] Cleaned up some decimal values. (#2797)

2017-09-18 01:45:39 -05:00

jobs

Update security.dm

2017-09-25 11:56:55 -05:00

language

…

library

[MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)

2017-09-22 23:35:22 -05:00

lighting

…

mapping

…

mentor

…

mining

Alt-clicking descriptions when examining

2017-09-28 21:51:53 -05:00

mob

Merge branch 'master' into upstream-merge-31044

2017-09-30 14:53:08 -04:00

modular_computers

Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988

2017-09-30 12:57:52 -04:00

ninja

Merge pull request #31074 from pubby/ninjaoutfit

2017-09-28 21:53:05 -05:00

orbit

…

paperwork

Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988

2017-09-30 12:57:52 -04:00

power

Merge branch 'master' into upstream-merge-29741

2017-09-30 13:35:47 -04:00

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-31093

2017-10-01 00:50:26 -04:00

reagents

Merge pull request #31064 from YPOQ/silverfriedfoods

2017-09-28 21:55:42 -05:00

recycling

[MIRROR] Various grammar fixes (#2842)

2017-09-17 22:35:51 -05:00

research

[READY]Refactors timestops to use fields (#30858)

2017-09-28 21:46:34 -05:00

ruins

(Ready) Clockwork Cult Rework: Proof-of-concept

2017-09-26 15:22:09 -05:00

security_levels

Readds alert level sounds (#2920)

2017-09-24 21:21:33 -05:00

server_tools

…

shuttle

Advanced camera consoles use a list for z lock rather than a single z level (#30661)

2017-09-28 10:44:12 -05:00

space_transition

…

spells

Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow

2017-09-28 16:02:31 -05:00

station_goals

…

stock_market

DisplayTimeText mk2

2017-09-24 18:59:57 -05:00

surgery

Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110)

2017-09-28 22:00:16 -05:00

telesci

…

tgui

…

tooltip

Strip propriety macros from tooltips (#31113)

2017-09-30 08:03:28 -05:00

uplink

Wave 3 of guns

2017-09-27 23:08:36 +08:00

vehicles

…

vore

Ashdrake noms (#2868)

2017-09-21 06:29:08 -05:00

VR

…

zombie

[MIRROR] Zombies now stay dead if they suicide (#2914)

2017-09-23 05:54:36 -05:00