Mark9013100 a2c8e3ee10 Minor edits to the sec lockers ...

Conflicts:
	maps/colony-1.dmm

2015-10-11 00:45:22 -04:00

..

effects

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

items

Merges f-card box and evidence bag box

2015-10-11 00:41:46 -04:00

random

…

structures

Minor edits to the sec lockers

2015-10-11 00:45:22 -04:00

buckling.dm

Fixes beds occasionally buckling in odd directions

2015-09-19 15:27:24 +02:00

empulse.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

…

explosion.dm

Multi-Z.

2015-08-30 14:15:20 -07:00

items.dm

Updates blob

2015-10-05 18:10:16 +03:00

objs.dm

Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums.

2015-09-08 08:32:09 +02:00

structures.dm

Updates blob

2015-10-05 18:10:16 +03:00

weapons.dm

…