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

Conflicts:
	code/game/objects/items/devices/transfer_valve.dm

2014-08-17 17:50:07 -07:00

..

devices

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

2014-08-17 17:50:07 -07:00

robot

Merge branch 'master' into dev

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

stacks

fixes building more than 1 grille per turf

2014-08-16 22:48:13 +02:00

weapons

Merge pull request #5994 from GinjaNinja32/shards

2014-08-14 22:55:39 +04:00

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

candle.dm

…

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

Merge pull request #5277 from Jarcolr/dev

2014-06-20 09:02:03 +04:00

trash.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00