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

..

area

Area tags for embassies

2014-06-24 12:01:05 +09:30

dna

Fixing other people's fuckuups

2014-06-26 07:31:21 -04:00

gamemodes

Missed a linebreak.

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

jobs

Oops

2014-06-27 18:24:07 -04:00

machinery

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

magic

…

mecha

No combat punch for non-lethal gygax

2014-06-29 11:58:59 -04:00

objects

removes sharpness from forks

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

structure

Running tests and cleaning out useless debug verbs/procs.

2014-07-13 05:32:40 -04:00

turfs

Stops buckled mobs from slipping (for now)

2014-07-13 06:48:17 -04:00

vehicles

…

verbs

Running tests and cleaning out useless debug verbs/procs.

2014-07-13 05:32:40 -04:00

asteroid.dm

…

atoms_movable.dm

Updates l_move_time to use world.time

2014-06-20 12:12:31 -04:00

atoms.dm

Re-enables organ infections, adds wound infection

2014-06-20 12:14:19 -04:00

communications.dm

BS12 Hooks

2014-05-22 23:56:35 +02:00

json.dm

…

response_team.dm

Moar Event stuff

2014-06-21 07:12:55 -04:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Disabled smoothwall for now.

2014-03-24 00:00:20 +01:00

socket_talk.dm

Code for new bots allowing admins to PM Players via IRC and vice versa.

2014-05-12 04:45:13 -04:00

sound.dm

Nerf on sound distance.

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

supplyshuttle.dm

Makes the cargo console force launch command more obvious

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