Albert Iordache 604f7c417d Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master ...

Conflicts:
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi

2012-05-29 08:50:58 +03:00

..

weapons

Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master

2012-05-29 08:50:58 +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

Surgeons spawn with scrubs, Emergency Physicians spawn with first responder jackets.

2012-05-28 20:42:15 +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

Fixes for forcing no hair/face hair. Shuffles checks around for Pick Up Verb.

2012-05-20 21:37:10 +01:00

robot_items.dm

TG: Fixing dem runtimes:

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

robot_parts.dm

TG: Sanitized a large number of input()s.

2012-05-26 00:09:56 +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

…