cib f13a961a65 Merge branch 'cib' of github.com:CIB/Baystation12 ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/organ/organ.dm
	code/setup.dm

2012-08-06 13:36:26 -07:00

..

weapons

Merge branch 'cib' of github.com:CIB/Baystation12

2012-08-06 13:36:26 -07:00

apc_frame.dm

Removed a duplicate proc. Pimped out the Blueprints.

2012-06-13 17:05:43 -07:00

blueprints.dm

Fuck it, good enough for now.

2012-06-13 17:28:03 -07:00

candle.dm

Working UL

2012-06-18 15:02:34 -07:00

clothing.dm

TG: Labcoat buttons are no longer toggle-able while stunned, unconscious or dead.

2012-06-07 01:29:58 +01:00

food.dm

Removed a duplicate proc. Pimped out the Blueprints.

2012-06-13 17:05:43 -07:00

helper_procs.dm

More while loop stuff, removed shitloads of unnecessary curly brackets in the map reader, fixed ED-209 projectiles

2012-06-22 14:10:48 -07:00

item.dm

Partially fixed the double definition of BROKEN, renamed organ definitions

2012-07-13 23:42:05 +03:00

robot_items.dm

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

robot_parts.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +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

Various fixes for bans and mutations.

2012-06-03 03:40:26 +01:00

trash.dm

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

2012-05-31 15:09:35 +01:00