deathride58 792f16ebd6 Merge pull request #3969 from Citadel-Station-13/upstream-merge-32622 ...

[MIRROR] Fix conflicts between helmet/mech HUDs and HUD glasses

2017-11-17 04:49:10 +00:00

..

admin

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

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

assembly

Prevents proximity sensors from beeping when off. (#32783)

2017-11-16 17:10:11 -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

Fix conflicts between helmet/mech HUDs and HUD glasses

2017-11-16 15:39:15 -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

Removed unused HTML tags (#32787)

2017-11-16 17:08:51 -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

combines the missed microwave PR

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

games

512 forward compatibility merge

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

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

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

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

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

integrated_electronics

Merge pull request #3979 from Citadel-Station-13/upstream-merge-32791

2017-11-17 02:02:18 +00:00

jobs

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

2017-11-13 03:16:01 -06: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 #3969 from Citadel-Station-13/upstream-merge-32622

2017-11-17 04:49:10 +00:00

modular_computers

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

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

ninja

Fixes energy katana dash toggle

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

orbit

Update orbit.dm

2017-10-21 07:27:52 -05:00

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

Removes duplicate typecaches

2017-10-23 08:25:30 -05:00

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

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 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

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

Fix conflicts between helmet/mech HUDs and HUD glasses

2017-11-16 15:39:15 -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 branch 'master' into upstream-merge-31176

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

vore

Wait shit what am i doing - fixes voreverbs proper

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

VR

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

zombie

Merge branch 'master' into upstream-merge-31737

2017-10-21 07:18:14 -05:00