unknown cc770f80b7 Merge branch 'master' of git://github.com/Baystation12/Baystation12 ...

Conflicts:
	icons/obj/items.dmi - Resolved

2012-05-10 15:53:38 +03:00

..

weapons

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

2012-05-10 15:53:38 +03:00

apc_frame.dm

…

blueprints.dm

…

candle.dm

Reverts throwing and cigarette code for fear of trout. Also updates object paths.

2012-04-21 17:09:29 +01:00

clothing.dm

TG: Disposal and welding helmet exploit fixes:

2012-05-01 20:13:51 +01:00

food.dm

TG: !!! The insane crashing has FINALLY been fixed !!!

2012-04-24 21:34:00 +01:00

helper_procs.dm

Final commit of the examine/damage overhaul.

2012-03-29 20:44:10 -07:00

item.dm

TG: (Might very possibly be broken. Didn't port most of the stuff due to it having been rewritten. - Erthilo)

2012-05-06 22:53:39 +01:00

robot_items.dm

TG: Fixing dem runtimes:

2012-05-02 23:58:53 +01:00

robot_parts.dm

TG: Added Spacevines to the random events. Added a spawn space-vines option to the

2012-04-23 21:07:55 +01:00

shock_kit.dm

A large amount of groundwork for /tg/ code. Comes with some gameplay changes.

2012-03-26 03:16:01 +01:00

tk_grab.dm

TG: Modified TK to be more effective and polished. You can use the TK grab to

2012-04-25 22:22:05 +01:00

trash.dm

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

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