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

Conflicts:
	maps/cyberiad.dmm

2015-03-04 19:34:21 +01:00

..

admin

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

2015-03-04 19:34:21 +01:00

assembly

Bug fixes, update quick create object

2015-03-02 21:20:12 +01:00

awaymissions

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

client

Bug fixes galore

2015-03-01 20:35:07 +01:00

clothing

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

2015-03-04 19:34:21 +01:00

computer3

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

2015-03-04 19:34:21 +01:00

crafting

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

customitems

Custom Item - Telvayne

2015-02-25 12:46:44 -05:00

destilery

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

DetectiveWork

Finally got colored blood working properly

2015-03-03 13:45:46 -05:00

economy

Central Command access rework

2015-03-04 16:36:17 +01:00

events

Merge pull request #493 from Markolie/master

2015-03-03 21:28:22 -05:00

ext_scripts

…

flufftext

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

food

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

games

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

genetics

…

genetics2

…

hydroponics

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

icon generation

…

jungle

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

karma

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

library

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

liquid

…

media

Switch jukebox from WMP to VLC (CROSS PLATFORM, OGG SUPPORT)

2015-02-26 12:46:56 -05:00

mining

Finally got colored blood working properly

2015-03-03 13:45:46 -05:00

mob

Merge pull request #512 from Markolie/master

2015-03-04 10:23:36 -05:00

nano

Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix

2015-03-04 15:09:12 +01:00

organs

Fix blood drip colors

2015-03-04 11:40:26 -05:00

paperwork

Merge pull request #500 from ZomgPonies/blood

2015-03-04 00:24:53 -05:00

power

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

projectiles

Energy Tweaks

2015-03-03 16:00:07 -05:00

reagents

Merge pull request #500 from ZomgPonies/blood

2015-03-04 00:24:53 -05:00

recycling

Finally got colored blood working properly

2015-03-03 13:45:46 -05:00

research

Merge pull request #494 from Fox-McCloud/Cyborg-Balance

2015-03-04 00:15:15 -05:00

scripting

…

security levels

ERT equipment rework

2015-03-03 22:51:54 +01:00

shieldgen

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

shuttles

Central Command access rework

2015-03-04 16:36:17 +01:00

store

Z-level check refactor

2015-02-16 20:33:28 +01:00

supermatter

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

surgery

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

telesci

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

vehicles

Finally got colored blood working properly

2015-03-03 13:45:46 -05:00

virus2

Chemistry Cleanup and Fixes

2015-03-01 16:34:23 -05:00