SkyMarshal 1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.

2012-02-08 12:13:03 -07:00

..

clothing

Organs:

2011-10-08 10:38:01 +00:00

weapons

Merge branch 'master' of github.com:Baystation12/Baystation12

2012-02-08 12:13:03 -07:00

apc_frame.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1057 316c924e-a436-60f5-8080-3fe189b3f50e

2011-02-18 03:23:40 +00:00

blueprints.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

candle.dm

Fix for the Cloner creation issue, it was missing the "Please add some cables" line. Unless I got confused as to the problem, should work now.

2011-09-20 18:27:23 +00:00

clothing.dm

Added pink labcoat.

2012-01-11 22:21:26 -07:00

food.dm

Moved around some stuff in R&D. (Change by Blaank)

2011-09-24 04:24:39 +00:00

helper_procs.dm

A Big Kitchen Update.

2011-04-13 14:27:29 +00:00

item.dm

Fixed a bug with the wardrobe, changed a lot of strings and added a seal for the wardrobe, allowing people to check whether a wardrobe has been opened before or not.

2012-02-08 19:15:10 +01:00

robot_items.dm

RCDs now make plating instead of full floors.

2012-01-25 13:55:09 -07:00

robot_parts.dm

(GIVE POLYBLUE COMMIT ALREADY) Headrevs can no longer be borged, and revs who get borged are dereved.

2011-12-04 19:55:01 +00:00

shock_kit.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

tk_grab.dm

Anything that used the updateappearance proc will no longer update hair/beards. The things that use it are DNA changes, Cloned mobs, Changlings. The proc was runtiming due code on lines 234 and 246, I looked into it a bit but don't currently know how to fix it. The proc is currently commented out so at least the skin color/body updates properly.

2011-11-04 12:14:39 +00:00

trash.dm

Massively improved trashbags. PICK UP EVERYTHING! Fixed issue 209.

2011-11-26 15:58:50 +00:00