Ikarrus e811eac22e Resolve Conflicts: ...

icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi

2015-04-22 08:14:05 -06:00

..

admin

Resolve Conflicts:

2015-04-22 08:14:05 -06:00

assembly

Flying animals no longer triggers mines and mousetraps.

2015-04-07 20:20:29 +02:00

awaymissions

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

client

Adds Abduction Mode

2015-04-13 18:40:15 +02:00

clothing

Buffs Deathsquads.

2015-04-18 00:06:17 +01:00

crafting

IED fixes

2015-04-13 07:00:19 -07:00

detectivework

resprites forensic scanner, cargo tagger, and rped

2015-03-22 11:54:26 -05:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.

2015-04-14 13:54:36 +02:00

flufftext

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

food&drinks

Reorganizing the reagents files. Goon chems are no longer in separate files.

2015-04-16 22:07:24 +02:00

holiday

Fixes the meat type of many simple animals

2015-04-11 14:18:32 +02:00

hydroponics

Adding the chemical reactions and recipes for the new recipes.

2015-04-04 19:29:12 +02:00

library

Adds a verb_exclaim var. Fixes #8478.

2015-03-22 18:55:59 +01:00

lighting

Gang v3 has been tested and is now good to go!

2015-04-19 22:26:15 -06:00

mining

Merge pull request #8925 from xxalpha/ripped

2015-04-22 17:49:57 +10:00

mob

Merge pull request #9086 from phil235/BundleFix3

2015-04-22 17:50:39 +10:00

nano

moved process() to datum. made /datum/reagents/ process instead of the containers.

2015-04-07 17:13:59 -07:00

ninja

Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.

2015-04-14 13:54:36 +02:00

paperwork

- Increased pen cost to 60, mostly so you can't be buying one every 5 minutes late round

2015-04-22 08:08:13 -06:00

power

Merge pull request #8967 from phil235/BundleFix1

2015-04-16 18:18:53 +10:00

procedural mapping

Removes 2 commented out lines.

2015-02-15 14:01:45 +00:00

projectiles

Fixed syringes being chambered when stored in a backpack.

2015-04-20 21:05:18 +01:00

reagents

Merge pull request #9095 from phil235/BundleFix4

2015-04-22 08:42:42 -05:00

recycling

Fixes infinite rod via disposals duplication

2015-04-16 09:25:03 -07:00

research

Merge pull request #8925 from xxalpha/ripped

2015-04-22 17:49:57 +10:00

scripting

NTSL Expansion

2015-03-25 16:22:21 -05:00

security levels

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

shuttle

Merge pull request #8581 from MrPerson/lighting_2015

2015-04-12 13:14:32 +02:00

surgery

Adds Abduction Mode

2015-04-13 18:40:15 +02:00

telesci

Effect pooling

2015-03-24 11:44:49 -07:00