LetterJay 79d6f42dfd conflicts

2017-10-28 01:16:26 -05:00

..

admin

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

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

assembly

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

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

atmospherics

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

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

awaymissions

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

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

cargo

…

chatter

…

client

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

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

clothing

conflicts

2017-10-28 01:16:26 -05: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

[MIRROR] Fixes various spelling and grammar errors. (#3436)

2017-10-21 07:10:23 -05:00

fields

expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)

2017-10-19 04:57:49 -05:00

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

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

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

holodeck

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

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

html_interface

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

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

hydroponics

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

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

jobs

…

language

…

library

…

lighting

Merge pull request #3374 from Citadel-Station-13/upstream-merge-31635

2017-10-14 10:20:36 -04:00

mapping

makes loaded templates call air_update_turf() on bordering turfs (#31738)

2017-10-15 19:34:33 -05:00

mentor

…

mining

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

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

mob

Merge branch 'master' into upstream-merge-31737

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

modular_computers

Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers

2017-10-14 18:48:13 -05:00

ninja

Removes a bunch of sleeps/spawns and makes a few booleans defines

2017-10-14 18:53:48 -05:00

orbit

…

paperwork

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

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

power

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

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

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-31737

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

reagents

Merge branch 'master' into upstream-merge-31737

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

recycling

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

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

research

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

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

ruins

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

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

security_levels

…

server_tools

…

shuttle

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

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

space_transition

…

spells

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

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

conflicts

2017-10-28 01:16:26 -05:00

telesci

…

tgui

Fixes AI visiblity checks (#31819)

2017-10-19 05:42:52 -05:00

tooltip

…

uplink

readds guardians to the uplink (#31616)

2017-10-14 15:19:19 -05:00

vehicles

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

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

vore

Medihound Fixes (#3462)

2017-10-21 06:15:50 -05: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