Zuhayr 1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

..

devices

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

2014-09-01 22:03:29 +09:30

robot

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

stacks

Fixes #5879

2014-09-01 22:45:37 +09:30

weapons

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

apc_frame.dm

…

blueprints.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

bodybag.dm

Fixes bodybags not being able to be put back...

2014-05-22 16:44:26 -04:00

contraband.dm

…

crayons.dm

…

latexballoon.dm

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

shooting_range.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

toys.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

trash.dm

…