Erthilo edd6f3ad88 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/door.dm
	code/game/objects/transfer_valve.dm
	code/game/turf.dm
	code/modules/clothing/gloves.dm
	maps/tgstation.2.0.8.dmm

2012-06-19 22:09:30 +01:00

..

alien

Working UL

2012-06-18 15:02:34 -07:00

closets

TG: - Only humans can now use the toggle lock verbs on closets.

2012-06-07 03:31:37 +01:00

devices

Shitload of bugfixes.

2012-06-18 21:18:26 -07:00

items

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-19 22:09:30 +01:00

radio

Removed security channel from HoP headset.

2012-06-19 17:36:57 +09:30

secstorage

TG: - Some unneeded text() -s removed from storage and secstorage code.

2012-06-07 01:50:12 +01:00

stacks

Shitload of bugfixes.

2012-06-18 21:18:26 -07:00

storage

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-08 20:19:27 +01:00

tanks

Fixed and cleaned up ZAS. Added some better sanity to explosion locations.

2012-06-04 14:56:28 -07:00

biomass.dm

…

blood.dm

Working UL

2012-06-18 15:02:34 -07:00

bodybag.dm

Shortened MAX_NAME_LEN to 32. Change some MAX_MESSAGE_LEN's to MAX_NAME_LEN's

2012-06-02 22:53:19 +01:00

bombspawner.dm

…

cleaner.dm

…

closets.dm

TG: Welding tool: Mostly code-related, the players won't notice much.

2012-06-07 03:30:13 +01:00

contraband.dm

some missing contraband changes (increased BS12 poster %)

2012-06-17 20:41:58 +10:00

displaycase.dm

…

door_assembly.dm

TG: Sieve stuff, this is a stupidly big commit, I'm sorry, I really am.

2012-06-19 21:37:44 +01:00

effect_system.dm

Working UL

2012-06-18 15:02:34 -07:00

electricchair.dm

…

empulse.dm

…

explosion.dm

Lots of fixes.

2012-06-19 00:24:10 -07:00

gibs.dm

TG: Readded detective work, with much bugfixing and optimizations.

2012-06-05 01:29:35 +01:00

glowshroom.dm

Working UL

2012-06-18 15:02:34 -07:00

grille.dm

TG: There's a metric assload of stuff here, mostly in preparation to my massive

2012-06-02 19:46:18 +01:00

items.dm

TG: Sieve stuff, this is a stupidly big commit, I'm sorry, I really am.

2012-06-19 21:37:44 +01:00

kitchen.dm

…

lamarr.dm

…

mineral_doors.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-19 22:09:30 +01:00

new_year.dm

TG: There's a metric assload of stuff here, mostly in preparation to my massive

2012-06-02 19:46:18 +01:00

noticeboard.dm

…

object_procs.dm

…

portals.dm

…

shooting_range.dm

Removed a duplicate proc. Pimped out the Blueprints.

2012-06-13 17:05:43 -07:00

sign_decals.dm

…

stool.dm

ZAS fixes.

2012-06-09 00:55:00 -07:00

structures.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-19 22:09:30 +01:00

tables_racks.dm

TG: Welding tool: Mostly code-related, the players won't notice much.

2012-06-07 03:30:13 +01:00

tank.dm

…

toys.dm

…

transfer_valve.dm

TG: Sieve stuff, this is a stupidly big commit, I'm sorry, I really am.

2012-06-19 21:37:44 +01:00

uplinks.dm

TG: Welding tool: Mostly code-related, the players won't notice much.

2012-06-07 03:30:13 +01:00

washing_machine.dm

…

watercloset.dm

TG: Updated toilets. You can now crowbar open the cistern and hide stuff in there.

2012-06-14 17:46:43 +01:00

weapons.dm

TG: There's a metric assload of stuff here, mostly in preparation to my massive

2012-06-02 19:46:18 +01:00

windoor_assembly.dm

TG: Welding tool: Mostly code-related, the players won't notice much.

2012-06-07 03:30:13 +01:00

window.dm

More changes for ZAS. Firelocks work properly, and rebuilding zones occurs at the proper times.

2012-06-07 13:43:55 -07:00