Zuhayr 9e71180e1b Merge conflict resolution, using BEF.

2013-06-05 14:22:04 +09:30

..

devices

Merge conflict resolution, using BEF.

2013-06-05 14:22:04 +09:30

robot

UNadded robotic hands and feet because there was no point in doing this in the first place.

2013-05-31 22:32:39 -04:00

stacks

Renamed bruise pack back to gauze.

2013-05-22 14:05:53 +04:00

weapons

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-05-31 22:58:01 -05:00

apc_frame.dm

…

blueprints.dm

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

bodybag.dm

Added stasis bag.

2013-05-19 07:48:43 +02:00

candle.dm

…

contraband.dm

…

crayons.dm

…

latexballoon.dm

…

shooting_range.dm

…

tk_grab.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-06-04 13:47:26 +04:00

toys.dm

fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me.

2013-05-02 02:00:04 -07:00

trash.dm

…