Iamgoofball 078e4a09b1 Grammar fixes on trig circuits (#32791) ...

* Grammar fixes on trig circuits

* Update trig.dm

2017-11-16 18:36:36 -06:00

..

admin

Fix Create Object/Turf/Mob all having the same title (#32747)

2017-11-15 19:06:51 -06:00

assembly

Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

atmospherics

New vent and scrubber sprites (#32742)

2017-11-15 19:09:21 -06:00

awaymissions

Merge pull request #31947 from AnturK/yarr

2017-11-13 03:19:38 -06:00

cargo

Merge pull request #31947 from AnturK/yarr

2017-11-13 03:19:38 -06:00

chatter

…

client

Merge branch 'master' into upstream-merge-32757

2017-11-15 13:01:55 -06:00

clothing

Merge branch 'master' into upstream-merge-32183

2017-11-15 10:22:40 -06:00

crafting

Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947

2017-11-13 11:52:40 -06:00

fields

…

flufftext

…

food_and_drinks

combines the missed microwave PR

2017-11-15 10:31:41 -06:00

games

…

goonchat

reeeeEEEEEEEEEEEEEEE

2017-11-13 22:55:18 -05:00

holiday

Makes false alarm use more explicit in event code.

2017-11-11 14:36:36 -06:00

holodeck

…

html_interface

…

hydroponics

Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482

2017-11-15 11:13:56 -06:00

integrated_electronics

Grammar fixes on trig circuits (#32791)

2017-11-16 18:36:36 -06:00

jobs

Fixes chaplain not getting his weapon on spawn (#32658)

2017-11-13 03:16:01 -06:00

language

…

library

…

lighting

…

mapping

Fixes some cases where changeturf were called incorrectly (#32584)

2017-11-11 14:32:13 -06:00

mentor

…

mining

Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161

2017-11-12 23:06:55 -06:00

mob

Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183

2017-11-15 15:00:46 -06:00

modular_computers

Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546

2017-11-13 11:44:46 -06:00

ninja

…

orbit

…

paperwork

Update clipboard.dm

2017-11-12 13:17:59 -06:00

power

Merge pull request #3944 from Citadel-Station-13/upstream-merge-32714

2017-11-15 10:40:59 -06:00

procedural_mapping

…

projectiles

Minor speedups to movement: First Blood Part 2

2017-11-14 15:00:45 -06:00

reagents

Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183

2017-11-15 15:00:46 -06:00

recycling

Merge branch 'master' into upstream-merge-32435

2017-11-13 11:30:06 -06:00

research

[READY]integrated circuitry port+upgrade.

2017-11-14 05:00:48 -06:00

ruins

…

security_levels

…

server_tools

…

shuttle

Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176

2017-11-14 15:58:20 -06:00

space_transition

…

spells

Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176

2017-11-14 15:58:20 -06:00

station_goals

…

stock_market

…

surgery

Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176

2017-11-14 15:58:20 -06:00

telesci

…

tgui

Update tgui.dm

2017-11-12 13:18:42 -06:00

tooltip

…

uplink

…

vehicles

Merge branch 'master' into upstream-merge-31176

2017-11-09 03:24:38 -06:00

vore

…

VR

…

zombie

…