SamCroswell 75b2220e3e Merge Conflic Fix ...

Conflicts:
	icons/obj/gun.dmi

2015-02-27 15:52:26 -05:00

..

admin

Fix mentors seeing MSAY

2015-02-26 21:41:59 -05:00

assembly

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

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, bot proces controller update

2015-02-24 01:40:43 +01:00

clothing

Merge pull request #415 from ZomgPonies/superhero

2015-02-26 00:59:37 +01:00

computer3

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

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

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

economy

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

events

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

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

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

mining

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

mob

Merge Conflic Fix

2015-02-27 15:52:26 -05:00

nano

Standardize mutations

2015-02-22 19:04:43 +01:00

organs

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

paperwork

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

power

vg Garbage Collector

2015-02-23 17:18:38 -05:00

projectiles

Laser Additions and Taser Nerf

2015-02-25 23:34:42 -05:00

reagents

Re-add nymph code

2015-02-25 22:26:38 +01:00

recycling

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

research

Laser Additions and Taser Nerf

2015-02-25 23:34:42 -05:00

scripting

…

security levels

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

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

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

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

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

virus2

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