LetterJay 97757d2c87 Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559 ...

[MIRROR] Makes false alarm use more explicit in event code.

2017-11-13 11:42:53 -06:00

..

admin

Merge branch 'master' into upstream-merge-32247

2017-11-12 23:09:10 -06:00

assembly

Merge branch 'master' into upstream-merge-32161

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

atmospherics

Assmos tweaks/minor additions. (#32400)

2017-11-10 01:31:16 -06:00

awaymissions

Merge branch 'master' into upstream-merge-32161

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

cargo

Fix a few syntactic aberrations (#32284)

2017-11-02 04:21:51 -05:00

chatter

…

client

Scale fullscreen overlays to the view size

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

clothing

Merge branch 'master' into upstream-merge-32161

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

crafting

Merge branch 'master' into upstream-merge-32161

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

detectivework

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

emoji

…

error_handler

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

events

Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559

2017-11-13 11:42:53 -06:00

fields

Nerfs peaceborg chain bucklestun (#32251)

2017-10-31 17:40:03 -05:00

flufftext

Merge pull request #32266 from AnturK/halalert

2017-11-01 21:37:57 -05:00

food_and_drinks

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

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

games

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

goonchat

Makes isbanned have an arg for only checking real bans (#32248)

2017-10-31 15:10:15 -05:00

holiday

Makes false alarm use more explicit in event code.

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

holodeck

Add off switch to holodeck (#32327)

2017-11-03 15:55:03 -05:00

html_interface

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

hydroponics

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

jobs

NERF EVERYTHING

2017-10-30 15:01:37 +08:00

language

…

library

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

lighting

Merge pull request #32137 from MrStonedOne/patch-441

2017-10-27 17:28:52 -05:00

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 #3673 from Citadel-Station-13/upstream-merge-32161

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

modular_computers

Merge branch 'master' into upstream-merge-32161

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

ninja

Fixes energy katana dash toggle

2017-11-04 19:39:48 -05:00

orbit

…

paperwork

Update clipboard.dm

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

power

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

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

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-32161

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

reagents

Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582

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

recycling

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

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

research

Update autolathe_designs.dm

2017-11-12 15:41:25 -06:00

ruins

Fix a few syntactic aberrations (#32284)

2017-11-02 04:21:51 -05:00

security_levels

…

server_tools

Delete nudge.py

2017-10-30 01:48:48 -05:00

shuttle

Merge branch 'master' into upstream-merge-32161

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

space_transition

…

spells

Merge pull request #32577 from PKPenguin321/patch-13

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

station_goals

Little change. More the same

2017-11-06 08:46:39 -06:00

stock_market

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

surgery

fixes spelling and stuff (#32531)

2017-11-09 11:04:50 -06:00

telesci

…

tgui

Update tgui.dm

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

tooltip

…

uplink

Merge pull request #3585 from Michiyamenotehifunana/CX-sword

2017-10-29 03:56:27 -04:00

vehicles

Merge pull request #32381 from AnturK/ridingdatumsneveragain

2017-11-04 13:08:19 -05:00

vore

Wait shit what am i doing - fixes voreverbs proper

2017-10-26 14:31:55 -04:00

VR

…

zombie

…