LetterJay 254ffca3b7 Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162 ...

[MIRROR] Actually fixes meteors, again

2017-10-29 15:49:40 -04:00

..

admin

Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162

2017-10-29 15:49:40 -04:00

assembly

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

atmospherics

Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791

2017-10-27 02:47:56 -04:00

awaymissions

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

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

cargo

Assmos part 1, #2

2017-10-26 23:12:27 -05:00

chatter

…

client

Update preferences.dm

2017-10-29 01:58:33 -05:00

clothing

Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051

2017-10-29 02:41:44 -04:00

crafting

…

detectivework

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

emoji

…

error_handler

[MIRROR] Hacky temp workaround of byond bug preventing logging of stack overflow runtimes (#3512)

2017-10-21 03:47:34 -05:00

events

Update meteor_wave.dm

2017-10-27 15:32:38 -05:00

fields

…

flufftext

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

food_and_drinks

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

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

games

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

goonchat

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

holiday

Halloween Tweaks

2017-10-26 05:20:53 -05:00

holodeck

Assmos part 1, #2

2017-10-26 23:12:27 -05:00

html_interface

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

hydroponics

Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883

2017-10-23 20:16:51 -04:00

jobs

…

language

…

library

…

lighting

Merge pull request #32137 from MrStonedOne/patch-441

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

mapping

…

mentor

…

mining

Removes duplicate typecaches

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

mob

Merge pull request #3655 from Citadel-Station-13/upstream-merge-32112

2017-10-29 04:20:28 -04:00

modular_computers

…

ninja

…

orbit

Update orbit.dm

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

paperwork

Merge pull request #31931 from vuonojenmustaturska/penfix

2017-10-21 18:53:43 -05:00

power

Merge pull request #32142 from optimumtact/boiwhatarethose

2017-10-27 17:31:19 -05:00

procedural_mapping

Removes duplicate typecaches

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

projectiles

Merge branch 'master' into upstream-merge-31737

2017-10-28 02:20:25 -04:00

reagents

Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864

2017-10-29 04:23:16 -04:00

recycling

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

research

Fixes xenobio sentience giving the wrong name (#32016)

2017-10-24 00:04:33 -05:00

ruins

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

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

security_levels

…

server_tools

…

shuttle

[MIRROR] Shuttle navigation computers ignore the shuttle when placing a new location (#3596)

2017-10-25 20:03:11 -05:00

space_transition

…

spells

Adds spiders to the shapeshift menu! (#31896)

2017-10-22 13:55:07 -05:00

station_goals

Merge branch 'master' into upstream-merge-31737

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

stock_market

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

surgery

Merge branch 'master' into upstream-merge-31737

2017-10-28 02:20:25 -04:00

telesci

…

tgui

…

tooltip

…

uplink

Merge pull request #3585 from Michiyamenotehifunana/CX-sword

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

vehicles

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

2017-10-21 07:17:03 -05: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