Zuhayr 7c07240ac9 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites. ...

Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/alien.dm
	code/modules/projectiles/guns/projectile/crossbow.dm
	code/modules/projectiles/guns/projectile/pneumatic.dm
	icons/mob/back.dmi
	maps/tgstation2.dmm

2014-07-21 06:10:45 -04:00

..

admin

Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.

2014-07-21 06:10:45 -04:00

assembly

Shit catches on fire now

2014-07-18 06:32:15 -04:00

awaymissions

Cleaning out old unused code.

2014-07-13 08:10:44 -04:00

client

Added NT Recruiter and Sec Pod Pilot karma jobs

2014-07-13 22:34:06 -04:00

clothing

Merge pull request #305 from SamCroswell/master

2014-07-19 10:40:40 -04:00

customitems

Removed a lot of the useless testing and error logging from the runtime log.

2014-06-16 23:01:41 -04:00

destilery

Reintroducing the dough-based cooking system.

2014-02-01 19:22:22 -05:00

detectivework

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 07:14:16 -05:00

DetectiveWork

Revert the new lighting system.

2014-04-07 23:51:35 +02:00

economy

Fix POS not opening the menu when you slap with your ID and make it not show the [user] attacked the thing with your ID as well.

2014-07-17 05:38:43 -04:00

events

Re-add borers to potential random events

2014-07-20 02:26:42 -04:00

ext_scripts

We use this

2014-05-30 11:22:36 -04:00

flufftext

blocks hallucination on clientless mobs

2014-07-20 05:54:52 -04:00

food

Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.

2014-07-13 09:07:36 -04:00

games

Thrown items can be targeted, has miss chance...

2014-07-16 09:53:34 -04:00

genetics

Replaced Monkeyized() with working method

2014-07-15 15:32:37 +01:00

genetics2

Add some parts of genetics 2.0

2014-04-30 14:14:24 -04:00

hydroponics

Generic attack sounds for all melee weapons

2014-01-22 10:15:43 -05:00

icon generation

…

library

Shit catches on fire now

2014-07-18 06:32:15 -04:00

liquid

First commit of liquid simulation stuff

2014-05-23 14:31:29 -04:00

maps

Garbage collection fixes

2014-02-19 20:24:31 -05:00

media

Moar trying to get the lobby jukebox working.

2014-06-25 07:04:58 -04:00

mining

Modifed faction system to use a list instead. Mobs can belong to multiple factions at once.

2014-07-19 13:26:55 -04:00

mob

Compile fix

2014-07-20 06:03:32 -04:00

nano

Update NanoUI Live Map.

2014-07-19 10:51:01 -04:00

organs

Removing more deprecated virus1 shit

2014-07-18 11:41:46 -04:00

paperwork

Shit catches on fire now

2014-07-18 06:32:15 -04:00

power

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-15 07:22:15 -04:00

projectiles

Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.

2014-07-21 06:10:45 -04:00

reagents

Modifed faction system to use a list instead. Mobs can belong to multiple factions at once.

2014-07-19 13:26:55 -04:00

recycling

Adds supply shuttle docking controllers

2014-06-19 10:13:48 -04:00

research

Modifed faction system to use a list instead. Mobs can belong to multiple factions at once.

2014-07-19 13:26:55 -04:00

scripting

…

security levels

Mutiny Mode

2014-05-15 01:01:54 -04:00

shuttles

Fixes wrong circuit board in labor shuttle console

2014-07-17 00:40:16 -04:00

store

Can't forget Ian

2014-05-26 05:52:08 -04:00

supermatter

Fuck Phoron

2014-07-13 07:31:09 -04:00

surgery

Fix for internal organ surgery

2014-07-16 20:17:50 +01:00

vehicles

Moar work on janicart overhaul

2014-07-13 15:52:59 -04:00

virus2

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-15 07:22:15 -04:00