SamCroswell 8477d382a7 Merge conflict Fix ...

Conflicts:
	icons/mob/suit.dmi

2015-03-08 20:38:07 -04:00

..

admin

Merge conflict Fix

2015-03-08 20:38:07 -04:00

assembly

Bug fixes, update quick create object

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

awaymissions

Insulated Gloves Fix

2015-03-08 19:12:35 -04:00

client

Adds Plasmaman to Karma Shop

2015-03-05 14:35:17 -05:00

clothing

Merge conflict Fix

2015-03-08 20:38:07 -04: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

Superhero update

2015-03-05 15:53:15 -05:00

ext_scripts

…

flufftext

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +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

Crayons and Gloves

2015-03-06 21:40:57 -05:00

karma

Adds Plasmaman to Karma Shop

2015-03-05 14:35:17 -05: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

Crayons and Gloves

2015-03-06 21:40:57 -05:00

mob

Merge pull request #539 from ZomgPonies/plasma

2015-03-08 20:31:44 -04:00

nano

Merge pull request #528 from TheDZD/nano_pai

2015-03-08 13:23:05 -04:00

organs

Fix blood drip colors

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

paperwork

Merge pull request #529 from Fox-McCloud/Crayons

2015-03-08 13:24:05 -04: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

Frost Oil Fix

2015-03-04 20:56:14 -05:00

recycling

ArtVend

2015-03-07 03:26:45 -05:00

research

Merge pull request #523 from Fox-McCloud/Syndi-Channel-Fix

2015-03-06 12:55:24 -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