Jordan Brown 1ee84bb7d2 Merge pull request #38580 from Hyacinth-OR/pinkscarf ...

Adds a pink scarf

2018-06-19 09:49:28 -05:00

..

admin

Dsay now shows admin rank instead of ADMIN (#38555)

2018-06-18 19:17:55 -05:00

antagonists

[MIRROR] Transit space refactor (#7130)

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

assembly

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

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

atmospherics

Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496

2018-06-18 10:09:20 -05: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

Merge pull request #38580 from Hyacinth-OR/pinkscarf

2018-06-19 09:49:28 -05: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

…

language

…

library

Merge pull request #38360 from ShizCalev/key-cleanup

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

lighting

…

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

…

ninja

…

NTNet

…

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

…

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

…

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

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

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

vehicles

…

vending

Merge pull request #38580 from Hyacinth-OR/pinkscarf

2018-06-19 09:49:28 -05:00

VR

…

zombie

…