Aurorablade 08736da14c yet more conflict fixes.

2015-11-24 21:33:23 -05:00

..

admin

Admin Virus2 Creator

2015-11-06 07:57:32 -08:00

alarm

…

assembly

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

atmos_automation

Circuit Board Repathing and Swarmer Fixes

2015-11-06 21:21:36 -05:00

awaymissions

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

client

Fix occupations menu formatting

2015-11-07 09:47:52 -08:00

clothing

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

computer3

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

crafting

…

customitems

…

destilery

…

detective_work

…

economy

…

events

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

examine

Merge remote-tracking branch 'upstream/master' into path_cleanups

2015-11-24 18:05:01 -05:00

ext_scripts

…

fish

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

flufftext

removes shadow thing

2015-11-14 14:34:07 -05:00

food

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

games

…

garbage_collection

…

holiday

…

hydroponics

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

jungle

Updates Panther Sprite

2015-11-18 02:00:09 -05:00

karma

…

library

…

lighting

Make placing floor plating on space actually update lighting correctly

2015-11-12 22:42:16 -05:00

liquid

…

media

Made jukebox volume update work more reliably when buffering is slow

2015-11-14 22:29:49 -05:00

mining

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

mob

yet more conflict fixes.

2015-11-24 21:33:23 -05:00

nano

Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

2015-11-11 16:51:44 -08:00

ninja

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

organs

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

paperwork

Cleaned up species code, remove naked requirement

2015-11-18 11:55:30 -05:00

pooling

…

power

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

procedural_mapping

…

projectiles

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

reagents

Merge remote-tracking branch 'upstream/master' into path_cleanups

2015-11-24 18:05:01 -05:00

recycling

…

research

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

scripting

…

security_levels

…

shieldgen

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

shuttles

Circuit Board Repathing and Swarmer Fixes

2015-11-06 21:21:36 -05:00

space_transition

…

store

…

surgery

…

telesci

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

tram

…

vehicle

…

virus2

Virus prob adjustment

2015-11-16 01:46:55 -05:00