Tastyfish 317760a7de Merge remote-tracking branch 'upstream/master' into path_cleanups ...

Conflicts:
	code/modules/examine/descriptions/atmospherics.dm

2015-11-24 18:05:01 -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

Spoopy

2015-10-29 12:32:38 -04:00

customitems

Merge pull request #2292 from tigercat2000/fancy

2015-10-06 18:49:08 -04:00

destilery

…

detective_work

Remove spaces from module files

2015-09-27 07:32:07 +02:00

economy

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2015-10-28 19:02:27 -04:00

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

Garbage Collect Everything

2015-10-13 20:23:26 -04:00

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

SQL update

2015-09-23 06:13:42 +02:00

library

Fixes

2015-09-23 06:22:00 +02:00

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

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

2015-11-24 18:05:01 -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

Removes the Rest of Pooled Objects

2015-10-08 14:18:40 -04:00

power

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

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

procedural_mapping

Remove spaces from module files

2015-09-27 07:32:07 +02:00

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

Reduces Round-start Atmos Processing: Full Charge Disposals

2015-10-17 19:53:21 -04:00

research

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

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

scripting

Telecomms Refactor & CodeMirror

2015-10-28 17:23:22 -07:00

security_levels

Remove spaces from module files

2015-09-27 07:32:07 +02:00

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

Remove spaces from module files

2015-09-27 07:32:07 +02:00

store

…

surgery

surgeryize me cap'n

2015-10-14 07:05:49 -04:00

telesci

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

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

tram

…

vehicle

-tg- pull refactor

2015-10-10 11:15:52 -07:00

virus2

Virus prob adjustment

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