LetterJay fc3ed3716d Merge pull request #7187 from Citadel-Station-13/upstream-merge-38576 ...

[MIRROR] Fixes alternative method of removing legcuffs.

2018-06-24 15:06:21 -05:00

..

admin

[MIRROR] Admin Kicks now prompt the admin to avoid accidental kicking (#7191)

2018-06-19 14:51:14 -07:00

antagonists

[MIRROR] Transit space refactor (#7130)

2018-06-18 11:51:02 -07:00

assembly

[MIRROR] fixes anomaly cores being flamable (#7207)

2018-06-20 22:40:54 -07:00

atmospherics

[MIRROR] Fixes HE pipes not respecting layering (#7223)

2018-06-22 00:16:50 -07:00

awaymissions

Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533)

2018-06-18 09:37:48 -05:00

cargo

Advanced foam extinguisers (#38270)

2018-06-18 09:38:07 -05:00

chatter

…

client

prevents the vast majority of IC in LOOC cases

2018-06-17 04:49:19 -04:00

clothing

Fixes a merge conflict

2018-06-19 07:30:52 -04:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

[MIRROR] Transit space refactor (#7130)

2018-06-18 11:51:02 -07:00

fields

…

flufftext

…

food_and_drinks

[MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094)

2018-06-15 02:46:40 -07:00

games

…

goonchat

Merge pull request #38382 from AutomaticFrenzy/patch/squash-no-markup

2018-06-11 22:29:36 -05:00

holiday

…

holodeck

[MIRROR] Turf grammar omnibus (#7104)

2018-06-13 19:31:29 -07:00

hydroponics

[MIRROR] [s] Fixes exploit where botany trays can be refilled at no cost. (#7081)

2018-06-13 20:25:08 -07:00

integrated_electronics

adds missing /'s at the starts of some obj instances (#7169)

2018-06-18 11:53:33 -07:00

jobs

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

keybindings

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:12:07 -05:00

language

Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00

library

Merge pull request #38360 from ShizCalev/key-cleanup

2018-06-11 22:29:27 -05:00

lighting

AI Multicamera mode (#37695)

2018-05-31 22:41:48 -05:00

mapping

[MIRROR] Transit space refactor (#7130)

2018-06-18 11:51:02 -07:00

mining

Merge pull request #7171 from Citadel-Station-13/upstream-merge-38552

2018-06-18 22:00:13 -05:00

mob

Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode

2018-06-18 13:16:06 -05:00

modular_computers

Refactor machinery to default to being anchored

2018-06-01 11:28:19 -05:00

ninja

Standardizes and cleans up some admin messages & logging

2018-05-31 22:41:31 -05:00

NTNet

Refactor machinery to default to being anchored

2018-06-01 11:28:19 -05:00

orbit

…

paperwork

[MIRROR] You can see what other people eat or drink (#7101)

2018-06-13 20:31:38 -07:00

power

Cleans up supermatter related varedits (#38540)

2018-06-18 09:38:16 -05:00

procedural_mapping

…

projectiles

[MIRROR] Fixes null bullets from being fired after they're deleted (#7102)

2018-06-15 02:48:48 -07:00

reagents

adds missing /'s at the starts of some obj instances (#7169)

2018-06-18 11:53:33 -07:00

recycling

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

research

Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360

2018-06-12 07:41:10 -05:00

ruins

Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders

2018-06-16 15:50:27 -05:00

security_levels

Refactor machinery to default to being anchored

2018-06-01 11:28:19 -05:00

shuttle

Makes a thing use its macro (#38556)

2018-06-18 19:16:43 -05:00

spells

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

station_goals

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

surgery

Merge pull request #38576 from AnturK/runtimeL

2018-06-19 09:19:15 -05:00

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

[MIRROR] [s] Fixes syndicate sentience exploit (#7021)

2018-06-05 23:14:48 -07:00

vehicles

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

vending

Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533)

2018-06-18 09:37:48 -05:00

VR

Refactor machinery to default to being anchored

2018-06-01 11:28:19 -05:00

zombie

…