Zuhayr 38559ab477 Makes forks usable. ...

Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi

2014-06-22 10:58:50 -04:00

..

devices

Less terrible sprite for suit cooling device

2014-06-22 01:46:45 -04:00

robot

Fixes #5195

2014-06-14 22:02:35 -04:00

stacks

Fixes FEA temperature_expose() being used...

2014-06-22 02:03:42 -04:00

weapons

Makes forks usable.

2014-06-22 10:58:50 -04:00

apc_frame.dm

Switching cable coils to stacks

2014-01-21 21:23:26 -05:00

blueprints.dm

Standardize windows.

2014-04-19 19:36:33 -04:00

bodybag.dm

Stasis Bag lock added

2014-06-18 16:20:31 +01:00

candle.dm

…

contraband.dm

Additional Drug Names

2014-01-23 19:26:32 -05:00

crayons.dm

…

flag.dm

4th Nations commit, Finished framework. Rest of gameplay code is within the flag object's attackby and dropped procs.

2014-05-27 01:20:20 -04:00

latexballoon.dm

Fixes FEA temperature_expose() being used...

2014-06-22 02:03:42 -04:00

shooting_range.dm

Garbage collection fixes

2014-02-19 20:24:31 -05:00

toys.dm

Adds paths for therapy dolls

2014-06-18 00:08:33 -04:00

trash.dm

Jay Owen demands that this pull be merged.

2014-02-16 05:42:55 -05:00