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

..

__HELPERS

helpers: fix move_contents_to() not moving air

2014-07-12 22:14:51 -04:00

_hooks

Removing even more unneeded test messages

2014-06-17 00:06:53 -04:00

_onclick

Turns movable chairs on click

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

ATMOSPHERICS

Derp

2014-05-28 09:09:49 -04:00

controllers

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

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

datums

Fixes teleporting while buckled

2014-07-13 06:47:28 -04:00

defines

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

FEA

…

game

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

js

…

modules

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

TriDimension

…

unused

shuttle_controller now uses a shuttle datum

2014-06-23 11:07:58 -04:00

WorkInProgress

part 3 of fixing #5521

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

ZAS

atmos: make fires more destructive

2014-06-24 06:48:08 -04:00

ZAS - oldbs12

Fixes human internal organs list

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

ZAS - vg

…

global.dm

Various minor

2014-06-26 23:48:14 +09:30

hub.dm

…

names.dm

…

setup.dm

Fixes #5532 and increases the time required for organs to become infected from wounds

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

stylesheet.dm

TC use count appears on round end

2014-05-30 20:28:35 +02:00

test.dm

Running tests and cleaning out useless debug verbs/procs.

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

world.dm

Trying to make jukeboxes start playing before roundstart.

2014-06-25 06:14:46 -04:00