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

This PR comments out the non-edible one and replaces any reference of it to the edible one.

Conflicts:
	code/defines/obj/weapon.dm
	maps/tgstation2.dmm

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

..

admin

Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.

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

assembly

HurrDurr

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

awaymissions

Cleaning out old unused code.

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

client

Fix Change UI verb

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

clothing

Replacing civilian with support department. Still need to make changes on MySQL schema.

2014-06-26 19:42:14 -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

…

detectivework

…

DetectiveWork

…

economy

The death of assistants. Long live civilians!

2014-06-27 17:57:18 -04:00

events

Fixes human internal organs list

2014-07-13 08:51:55 -04:00

ext_scripts

We use this

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

flufftext

…

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

genetics

…

genetics2

…

hydroponics

…

icon generation

…

library

…

liquid

First commit of liquid simulation stuff

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

maps

…

media

Moar trying to get the lobby jukebox working.

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

mining

Reapplied scanners to map, stopped braces working on drill turfs with no resources.

2014-07-13 08:45:03 -04:00

mob

adjusts examine for w_class 1 yankability

2014-07-13 09:02:33 -04:00

nano

This change to nanomanager optimizes the sending of nanoui assets to clients.

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

organs

Fixes germ levels going below zero

2014-07-13 08:53:53 -04:00

paperwork

Removes Impedrezene from the Paralysis Pen

2014-06-08 18:30:56 -04:00

power

fixes #5449

2014-07-13 08:59:25 -04:00

projectiles

added empty gun noises

2014-06-29 16:43:56 -04:00

reagents

Fixes human internal organs list

2014-07-13 08:51:55 -04:00

recycling

Adds supply shuttle docking controllers

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

research

Fixes #5410 and possibly #5399

2014-07-12 22:02:35 -04:00

scripting

…

security levels

…

shuttles

Shuttle now can only be late when arriving

2014-07-13 07:12:30 -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

Fixes human internal organs list

2014-07-13 08:51:55 -04:00

vehicles

Fixes in wheelchair and different handling of movement

2014-07-13 06:52:38 -04:00

virus2

Fixes human internal organs list

2014-07-13 08:51:55 -04:00