diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm
index 4e9790aa9f8..7607339dea3 100644
--- a/code/defines/obj/clothing/head.dm
+++ b/code/defines/obj/clothing/head.dm
@@ -183,6 +183,13 @@
icon_state = "hoscap"
flags = FPRINT | TABLEPASS | SUITSPACE | HEADCOVERSEYES
+/obj/item/clothing/head/helmet/that
+ name = "Sturdy Top hat"
+ desc = "An amish looking helmet"
+ icon_state = "tophat"
+ item_state = "that"
+ flags = FPRINT|TABLEPASS|HEADSPACE
+
diff --git a/code/game/objects/closets/wardrobe.dm b/code/game/objects/closets/wardrobe.dm
index 2e6d59fb3f6..80224cf2790 100644
--- a/code/game/objects/closets/wardrobe.dm
+++ b/code/game/objects/closets/wardrobe.dm
@@ -70,6 +70,9 @@
new /obj/item/clothing/shoes/black( src )
new /obj/item/clothing/shoes/black( src )
new /obj/item/clothing/shoes/black( src )
+ new /obj/item/clothing/head/that( src )
+ new /obj/item/clothing/head/that( src )
+ new /obj/item/clothing/head/that( src )
return
/obj/closet/wardrobe/chaplain_black/New()
new /obj/item/clothing/under/rank/chaplain( src )
diff --git a/icons/changelog.html b/icons/changelog.html
index 82643b64085..38923fb6ebf 100644
--- a/icons/changelog.html
+++ b/icons/changelog.html
@@ -45,6 +45,46 @@ Stuff which is in development and not yet visible to players or just code relate
(is. code improvements for expandability, etc.) should not be listed here. They
should be listed in the changelog upon commit tho. Thanks. -->
+15 March 2011, International Day Against Police Brutality
+
+ - Errorage updated:
+
+ - Autolathe deconstruction fixed.
+ - Atmos Entrance fixed.
+ - AI no longer gibs themselves if they click on the singularity.
+ - Fixed all the issues I knew of about storage items.
+ - Redesigned Assembly line and surrounding maintenance shafts.
+ - Redesigned Tech storage. (Map by Veyveyr)
+
+
+ - TLE updated:
+
+ - Forum account activation added. Use the 'Activate Forum Account' verb.
+
+
+ - Neo updated:
+
+ - New R&D Item: The 'Bag of holding'.
+ - Getting someone out of the cloner now leaves damage, which can only be fixed in the cryo tube.
+ - New reagent: Clonexadone, for use with the cryo tube.
+ - Fixed using syringes on plants.
+
+
+ - Constanta updated:
+
+ - Added queueing to fabricator.
+
+
+ - Rastaf0 updated:
+
+ - Air alarms upgraded.
+ - Fixed problem with AI clicking on mulebot.
+ - Airlock controller (as in EVA) now react to commands faster.
+ - Fixed toxins mixing airlocks.
+
+
+
+
6 March 2011, Errorage's birthday
- Neo updated:
diff --git a/maps/tgstation.2.0.3.dmm b/maps/tgstation.2.0.3.dmm
index 54fbb9c2c22..e76c645bb48 100644
--- a/maps/tgstation.2.0.3.dmm
+++ b/maps/tgstation.2.0.3.dmm
@@ -1242,7 +1242,7 @@
"axT" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/chapel/office)
"axU" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/chapel/office)
"axV" = (/turf/simulated/wall,/area/chapel/main)
-"axW" = (/obj/machinery/door/airlock/maintenance{name = "Chapel Maintenance"; req_access_txt = "12"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
+"axW" = (/obj/machinery/door/airlock/maintenance{name = "Chapel Maintenance"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/chapel/main)
"axX" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/chapel/main)
"axY" = (/obj/stool/chair{dir = 8},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/shuttle/floor,/area/shuttle/arrival/station)
"axZ" = (/obj/stool/chair{dir = 8},/obj/landmark{name = "JoinLate"},/turf/simulated/shuttle/floor,/area/shuttle/arrival/station)
@@ -1295,7 +1295,7 @@
"ayU" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"ayV" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/obj/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"ayW" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
-"ayX" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/maintenance/fsmaint)
+"ayX" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"ayY" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 10; icon_state = "intact-r-f"; initialize_directions = 10; level = 1; name = "pipe"},/obj/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"ayZ" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/door/airlock/engineering{icon_state = "door_closed"; locked = 0; name = "Starboard Auxiliary Solar Access"; req_access_txt = "10"},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
"aza" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 9; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
@@ -1369,7 +1369,7 @@
"aAq" = (/obj/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 4; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"aAr" = (/obj/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/chapel/office)
"aAs" = (/obj/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 9; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/chapel/office)
-"aAt" = (/obj/machinery/door/airlock/maintenance{name = "Crematorium Maintenance"; req_access_txt = "27;12"},/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
+"aAt" = (/obj/machinery/door/airlock/maintenance{name = "Crematorium Maintenance"; req_access_txt = "27;12"},/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/chapel/office)
"aAu" = (/obj/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/chapel/office)
"aAv" = (/obj/machinery/disposal,/obj/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
"aAw" = (/obj/stool/chair,/obj/landmark/start{name = "Chaplain"},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
@@ -1484,7 +1484,7 @@
"aCB" = (/obj/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/library)
"aCC" = (/obj/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/wall/r_wall,/area/library)
"aCD" = (/obj/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/wall,/area/library)
-"aCE" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor{icon_state = "dark"},/area/maintenance/fsmaint)
+"aCE" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"aCF" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/hydroponics)
"aCG" = (/obj/table{icon_state = "tabledir"; dir = 4},/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/paper/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
"aCH" = (/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
@@ -1496,7 +1496,7 @@
"aCN" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/crew_quarters/theatre)
"aCO" = (/turf/simulated/wall,/area/crew_quarters/theatre)
"aCP" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/crew_quarters/theatre)
-"aCQ" = (/obj/machinery/door/airlock/maintenance{name = "Theatre Maintenance"; req_access_txt = "46;12"},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor,/area/crew_quarters/theatre)
+"aCQ" = (/obj/machinery/door/airlock/maintenance{name = "Theatre Maintenance"; req_access_txt = "46;12"},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/crew_quarters/theatre)
"aCR" = (/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
"aCS" = (/obj/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
"aCT" = (/obj/machinery/door{icon = 'icons/obj/doors/doormorgue.dmi'; name = "Crematorium Access"; req_access_txt = "27"},/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
@@ -2315,7 +2315,7 @@
"aSA" = (/obj/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/wall,/area/hydroponics)
"aSB" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 5; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/storage/auxillary)
"aSC" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 4; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/storage/auxillary)
-"aSD" = (/obj/machinery/door/airlock/maintenance{name = "Emergency Storage"},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 4; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/floor,/area/storage/auxillary)
+"aSD" = (/obj/machinery/door/airlock/maintenance{name = "Emergency Storage"},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 4; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/storage/auxillary)
"aSE" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 10; icon_state = "intact-b-f"; initialize_directions = 10; level = 1; name = "pipe"},/turf/simulated/wall,/area/storage/auxillary)
"aSF" = (/turf/simulated/wall,/area/hallway/primary/starboard)
"aSG" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/starboard)
@@ -2536,7 +2536,7 @@
"aWN" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Diner"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
"aWO" = (/obj/machinery/door/firedoor/border_only,/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/door/airlock/glass{name = "Diner"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
"aWP" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/maintenance/maintcentral)
-"aWQ" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/maintenance/maintcentral)
+"aWQ" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/disposalpipe/segment{dir = 1},/turf/simulated/floor/plating,/area/maintenance/maintcentral)
"aWR" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 6; icon_state = "intact-r-f"; initialize_directions = 6; level = 1; name = "pipe"},/turf/simulated/wall,/area/maintenance/maintcentral)
"aWS" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/maintenance/maintcentral)
"aWT" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/wall/r_wall,/area/medical/chemistry)
@@ -3329,7 +3329,7 @@
"bma" = (/obj/table{icon_state = "tabledir"; dir = 5},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/weapon/reagent_containers/food/condiment/saltshaker,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
"bmb" = (/obj/table{icon_state = "tabledir"; dir = 9},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
"bmc" = (/obj/table{icon_state = "tabledir"; dir = 5},/obj/item/weapon/reagent_containers/food/condiment/peppermill,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
-"bmd" = (/obj/table/reinforced{dir = 8; icon_state = "reinf_tabledir"},/obj/item/clothing/head/that,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
+"bmd" = (/obj/table/reinforced{dir = 8; icon_state = "reinf_tabledir"},/obj/item/clothing/head/helmet/that,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
"bme" = (/obj/table/reinforced{dir = 9; icon_state = "reinf_tabledir"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/weapon/gun/shotgun,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
"bmf" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/weapon/storage/firstaid/o2{pixel_x = 0; pixel_y = 5},/obj/item/weapon/storage/firstaid/o2{pixel_x = -3; pixel_y = 2},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
"bmg" = (/obj/table{icon_state = "table_vertical"; dir = 4},/obj/item/weapon/gun/syringe{pixel_y = 3},/obj/item/weapon/gun/syringe,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
@@ -4220,7 +4220,7 @@
"bDh" = (/obj/rack{dir = 8},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/turf/simulated/floor,/area/atmos)
"bDi" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/atmos)
"bDj" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/atmos)
-"bDk" = (/obj/table{dir = 9; icon_state = "tabledir"},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor,/area/atmos)
+"bDk" = (/obj/table{dir = 9; icon_state = "tabledir"},/turf/simulated/floor,/area/atmos)
"bDl" = (/obj/table{dir = 1; icon_state = "tabledir"},/obj/item/clothing/head/helmet/welding,/obj/item/clothing/head/helmet/welding,/turf/simulated/floor,/area/atmos)
"bDm" = (/obj/table{dir = 5; icon_state = "tabledir"},/obj/item/weapon/storage/utilitybelt,/turf/simulated/floor,/area/atmos)
"bDn" = (/obj/machinery/atmospherics/binary/pump{dir = 1; icon_state = "intact_off"; name = "Mix to Distro"; on = 0},/turf/simulated/floor,/area/atmos)
@@ -4274,7 +4274,7 @@
"bEj" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor,/area/atmos)
"bEk" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor,/area/atmos)
"bEl" = (/obj/machinery/portable_atmospherics/canister/air,/obj/window/reinforced{dir = 4},/turf/simulated/floor,/area/atmos)
-"bEm" = (/obj/table{icon_state = "tabledir"; dir = 8},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor,/area/atmos)
+"bEm" = (/obj/table{icon_state = "tabledir"; dir = 8},/turf/simulated/floor,/area/atmos)
"bEn" = (/turf/simulated/wall,/area/atmos)
"bEo" = (/obj/table{icon_state = "tabledir"; dir = 4},/obj/item/weapon/cigbutt,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/atmos)
"bEp" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/obj/window/reinforced,/turf/simulated/floor,/area/atmos)
@@ -4332,9 +4332,9 @@
"bFp" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor,/area/atmos)
"bFq" = (/obj/machinery/light/small,/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor,/area/atmos)
"bFr" = (/obj/machinery/dispenser{pltanks = 0},/turf/simulated/floor,/area/atmos)
-"bFs" = (/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/weapon/paper{desc = ""; info = "Metal is for creating new empty cans.
The Metal Foam grenades are for hull-breach sealing. Once fired off, a crowbar will be needed to make a passage through the metal foam."; name = "Atmos Supplies"},/turf/simulated/floor,/area/atmos)
-"bFt" = (/obj/table{dir = 2; icon_state = "tabledir"},/obj/item/weapon/chem_grenade/metalfoam,/obj/item/weapon/chem_grenade/metalfoam,/obj/item/weapon/chem_grenade/metalfoam,/turf/simulated/floor,/area/atmos)
-"bFu" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/weapon/chem_grenade/metalfoam,/obj/item/weapon/chem_grenade/metalfoam,/turf/simulated/floor,/area/atmos)
+"bFs" = (/obj/table{icon_state = "tabledir"; dir = 10},/turf/simulated/floor,/area/atmos)
+"bFt" = (/obj/table{dir = 2; icon_state = "tabledir"},/obj/item/weapon/paper{desc = ""; info = "We gave you new tools to play with! Now we're taking them away, as you abused them too much! Next time be more responsible!"; name = "You fuckers!"},/turf/simulated/floor,/area/atmos)
+"bFu" = (/obj/table{icon_state = "tabledir"; dir = 6},/turf/simulated/floor,/area/atmos)
"bFv" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Access"; req_access_txt = "24"},/turf/simulated/floor,/area/atmos)
"bFw" = (/obj/machinery/atmospherics/pipe/manifold{color = "yellow"; dir = 8; icon_state = "manifold-y"; level = 2},/turf/simulated/floor,/area/atmos)
"bFx" = (/obj/machinery/atmospherics/pipe/manifold{color = "yellow"; icon_state = "manifold-y"; level = 2},/turf/simulated/floor,/area/atmos)