diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index cc17a9975c7..0e5b5ad3208 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -58,6 +58,9 @@ actual development.
   be a  new proc that they both can use.
  - No magic numbers/strings. If you have a number or text that is important and used in
   your code, make a `#DEFINE` statement with a name that clearly indicates it's use.
+ - `if(condition)` must be used over `if (condition)` or any other variation.
+  - The same applies for `while` and `for` loops, they must have no space between the
+  keyword and condition brackets. `while(condition)`, `for(condition)`
  - If you want to output a message to a player's chat
   (this includes text sent to `world`), use `to_chat(mob/client/world, "message")`.
   Do not use `mob/client/world << "message"`.
diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
index badefaf8999..dd54aea2e92 100644
--- a/SQL/paradise_schema.sql
+++ b/SQL/paradise_schema.sql
@@ -82,6 +82,7 @@ CREATE TABLE `characters` (
   `speciesprefs` int(1) NOT NULL,
   `socks` mediumtext NOT NULL,
   `body_accessory` mediumtext NOT NULL,
+  `gear` mediumtext NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=18747 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/SQL/paradise_schema_prefixed.sql b/SQL/paradise_schema_prefixed.sql
index 4f184355e5e..453554f5c69 100644
--- a/SQL/paradise_schema_prefixed.sql
+++ b/SQL/paradise_schema_prefixed.sql
@@ -82,6 +82,7 @@ CREATE TABLE `SS13_characters` (
   `speciesprefs` int(1) NOT NULL,
   `socks` mediumtext NOT NULL,
   `body_accessory` mediumtext NOT NULL,
+  `gear` mediumtext NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=18747 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index be38675aa71..553d98e3ebd 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -3941,9 +3941,9 @@
 "bxO" = (/turf/simulated/wall,/area/medical/research{name = "Research Division"})
 "bxP" = (/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"})
 "bxQ" = (/obj/structure/sign/securearea,/turf/simulated/wall,/area/medical/research{name = "Research Division"})
-"bxR" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/sheet/metal{amount = 50},/obj/item/clothing/glasses/welding,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1},/area/toxins/lab)
+"bxR" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/sheet/metal{amount = 50},/obj/item/clothing/glasses/welding,/obj/machinery/door_control{id = "rdlab"; name = "Research and Development Lab Shutters Control"; pixel_x = -24; pixel_y = 0; req_access_txt = "47"},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1},/area/toxins/lab)
 "bxS" = (/obj/structure/stool,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1},/area/toxins/lab)
-"bxT" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/disk/tech_disk,/obj/item/weapon/disk/tech_disk,/obj/item/weapon/disk/design_disk,/obj/item/weapon/disk/design_disk,/obj/item/weapon/reagent_containers/dropper,/obj/machinery/door_control{id = "rdlab"; name = "Research and Development Lab Shutters Control"; pixel_x = 24; pixel_y = 24; req_access_txt = "47"},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1},/area/toxins/lab)
+"bxT" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/disk/tech_disk,/obj/item/weapon/disk/tech_disk,/obj/item/weapon/disk/design_disk,/obj/item/weapon/disk/design_disk,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1},/area/toxins/lab)
 "bxU" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab)
 "bxV" = (/obj/item/device/radio/intercom{frequency = 1459; name = "station intercom (General)"; pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab)
 "bxW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -4670,7 +4670,7 @@
 "bLP" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Head of Personnel"},/turf/simulated/floor/plasteel,/area/crew_quarters/heads)
 "bLQ" = (/obj/structure/table,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/weapon/folder/yellow,/obj/item/device/eftpos,/obj/item/weapon/book/manual/sop_supply,/turf/simulated/floor/plasteel,/area/quartermaster/office)
 "bLR" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel,/area/crew_quarters/heads)
-"bLS" = (/obj/machinery/computer/guestpass,/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab)
+"bLS" = (/obj/machinery/computer/guestpass{pixel_y = 30},/obj/machinery/photocopier,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab)
 "bLT" = (/obj/machinery/computer/message_monitor,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/server)
 "bLU" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply{req_access_txt = "0"},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/server)
 "bLV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/server)
@@ -4708,8 +4708,8 @@
 "bMB" = (/obj/machinery/cell_charger,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/obj/machinery/camera{c_tag = "Medbay Cryogenics"; network = list("SS13")},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/table/glass,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/cryo)
 "bMC" = (/obj/machinery/camera{c_tag = "Medbay Cloning"; network = list("SS13")},/obj/structure/closet/wardrobe/medic_white,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
 "bMD" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
-"bME" = (/obj/machinery/disposal,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
-"bMF" = (/obj/machinery/light{dir = 8},/obj/structure/closet/secure_closet/medical1,/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (NORTHWEST)"; icon_state = "whitepurple"; dir = 9},/area/medical/genetics)
+"bME" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/item/device/radio/intercom{frequency = 1459; name = "station intercom (General)"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
+"bMF" = (/obj/machinery/light{dir = 8},/obj/structure/closet/secure_closet/medical1,/obj/machinery/light_switch{pixel_x = 0; pixel_y = 27},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (NORTHWEST)"; icon_state = "whitepurple"; dir = 9},/area/medical/genetics)
 "bMG" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/machinery/camera{c_tag = "Research Genetics North"; network = list("Research","SS13")},/obj/machinery/power/apc{dir = 1; name = "Genetics APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1},/area/medical/genetics)
 "bMH" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics)
 "bMI" = (/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/weapon/hand_labeler,/obj/structure/closet/walllocker/emerglocker/north,/obj/structure/table/glass,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1},/area/medical/genetics)
@@ -4864,7 +4864,7 @@
 "bPB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/cryo)
 "bPC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/cryo)
 "bPD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/cryo)
-"bPE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass_medical{id_tag = "GeneticsDoor"; name = "Genetics Cloning"; req_access_txt = "0"; req_one_access_txt = "5;9"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
+"bPE" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/medical/genetics)
 "bPF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
 "bPG" = (/obj/effect/landmark/start{name = "Geneticist"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4; initialize_directions = 11; level = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
 "bPH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
@@ -4872,7 +4872,7 @@
 "bPJ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (WEST)"; icon_state = "whitepurple"; dir = 8},/area/medical/genetics)
 "bPK" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics)
 "bPL" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics)
-"bPM" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/item/weapon/storage/box/beakers,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/structure/table/glass,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (EAST)"; icon_state = "whitepurple"; dir = 4},/area/medical/genetics)
+"bPM" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (EAST)"; icon_state = "whitepurple"; dir = 4},/area/medical/genetics)
 "bPN" = (/turf/simulated/wall/r_wall,/area/toxins/server_coldroom)
 "bPO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/wall/r_wall,/area/toxins/server_coldroom)
 "bPP" = (/turf/simulated/wall/r_wall,/area/toxins/server)
@@ -4953,9 +4953,9 @@
 "bRm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/wall,/area/medical/genetics_cloning)
 "bRn" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable,/obj/item/roller,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
 "bRo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
-"bRp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/item/device/radio/intercom{frequency = 1459; name = "station intercom (General)"; pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
-"bRq" = (/obj/machinery/light{dir = 8},/obj/item/device/radio/intercom{dir = 0; name = "station intercom (General)"; pixel_x = -28},/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/stokcubes,/obj/item/weapon/storage/box/neaeracubes,/obj/structure/table/glass,/obj/item/weapon/storage/box/wolpincubes,/obj/item/weapon/storage/box/farwacubes,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (WEST)"; icon_state = "whitepurple"; dir = 8},/area/medical/genetics)
-"bRr" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/roller,/obj/item/weapon/storage/box/disks,/obj/structure/table/glass,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (EAST)"; icon_state = "whitepurple"; dir = 4},/area/medical/genetics)
+"bRp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{id_tag = "GeneticsDoor"; name = "Genetics Cloning"; req_access_txt = "0"; req_one_access_txt = "5;9"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
+"bRq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
+"bRr" = (/obj/item/device/radio/intercom{frequency = 1459; name = "station intercom (General)"; pixel_x = 28},/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/crew_quarters/hor)
 "bRs" = (/obj/machinery/r_n_d/server/robotics,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (SOUTHEAST)"; icon_state = "intact"; dir = 6},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 250; oxygen = 0; temperature = 0},/area/toxins/server_coldroom)
 "bRt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 250; oxygen = 0; temperature = 0},/area/toxins/server_coldroom)
 "bRu" = (/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 1; name = "Server Coldroom APC"; pixel_x = 0; pixel_y = 25},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 250; oxygen = 0; temperature = 0},/area/toxins/server_coldroom)
@@ -4974,7 +4974,7 @@
 "bRH" = (/obj/machinery/computer/mecha,/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
 "bRI" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/rack,/obj/item/device/taperecorder{pixel_x = -3},/obj/item/device/paicard{pixel_x = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/crew_quarters/hor)
 "bRJ" = (/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/crew_quarters/hor)
-"bRK" = (/obj/item/device/radio/intercom{frequency = 1459; name = "station intercom (General)"; pixel_x = 28},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/crew_quarters/hor)
+"bRK" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
 "bRL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "bRM" = (/obj/structure/table,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen,/obj/machinery/requests_console{department = "Cargo Bay"; name = "Cargo Requests Console"; departmentType = 2; pixel_x = -30; pixel_y = 0},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock)
 "bRN" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock)
@@ -5021,9 +5021,9 @@
 "bSC" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 1},/obj/item/device/radio/intercom{frequency = 1459; name = "station intercom (General)"; pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/cryo)
 "bSD" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/wall,/area/medical/genetics_cloning)
 "bSE" = (/obj/machinery/clonepod/biomass,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
-"bSF" = (/obj/machinery/computer/cloning,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/light,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
+"bSF" = (/turf/simulated/floor/plasteel{tag = "icon-whitepurple (WEST)"; icon_state = "whitepurple"; dir = 8},/area/medical/genetics)
 "bSG" = (/obj/machinery/dna_scannernew,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
-"bSH" = (/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (WEST)"; icon_state = "whitepurple"; dir = 8},/area/medical/genetics)
+"bSH" = (/obj/machinery/computer/cloning,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/light,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning)
 "bSI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics)
 "bSJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics)
 "bSK" = (/obj/structure/stool/bed/chair/office/dark,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (EAST)"; icon_state = "whitepurple"; dir = 4},/area/medical/genetics)
@@ -5045,7 +5045,7 @@
 "bTa" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
 "bTb" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
 "bTc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
-"bTd" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/photocopier,/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
+"bTd" = (/turf/simulated/floor/plasteel{tag = "icon-whitepurple (EAST)"; icon_state = "whitepurple"; dir = 4},/area/medical/genetics)
 "bTe" = (/obj/machinery/atmospherics/unary/outlet_injector/on,/turf/simulated/floor/plating/airless,/area/toxins/mixing)
 "bTf" = (/obj/structure/table,/turf/simulated/shuttle/floor,/area/shuttle/mining)
 "bTg" = (/turf/simulated/shuttle/wall{icon_state = "swall3"; dir = 2},/area/shuttle/mining)
@@ -5119,7 +5119,7 @@
 "bUw" = (/obj/item/weapon/cartridge/signal/toxins,/obj/item/weapon/cartridge/signal/toxins{pixel_x = -4; pixel_y = 2},/obj/item/weapon/cartridge/signal/toxins{pixel_x = 4; pixel_y = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/camera{c_tag = "Research Director's Office"; dir = 1; network = list("Research","SS13")},/obj/item/clothing/glasses/welding/superior,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
 "bUx" = (/obj/structure/closet/secure_closet/RD,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
 "bUy" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
-"bUz" = (/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
+"bUz" = (/obj/item/weapon/storage/box/beakers,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/structure/table/glass,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (EAST)"; icon_state = "whitepurple"; dir = 4},/area/medical/genetics)
 "bUA" = (/turf/simulated/wall/r_wall,/area/toxins/mixing)
 "bUB" = (/obj/machinery/atmospherics/pipe/simple/insulated,/turf/simulated/wall/r_wall,/area/toxins/mixing)
 "bUC" = (/turf/simulated/wall/r_wall{desc = "A specially coated wall that resists temperatures for Science"; max_temperature = 1e+009; name = "Coated Reinforced Wall"},/area/toxins/mixing)
@@ -5186,7 +5186,7 @@
 "bVL" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{level = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics)
 "bVM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics)
 "bVN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics)
-"bVO" = (/turf/simulated/floor/plasteel{tag = "icon-whitepurple (EAST)"; icon_state = "whitepurple"; dir = 4},/area/medical/genetics)
+"bVO" = (/obj/machinery/photocopier,/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/hor)
 "bVP" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/wall/r_wall,/area/toxins/server_coldroom)
 "bVQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/turf/simulated/wall/r_wall,/area/toxins/server_coldroom)
 "bVR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/turf/simulated/wall/r_wall,/area/toxins/server)
@@ -5238,7 +5238,7 @@
 "bWL" = (/obj/structure/closet/jcloset,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/item/device/radio/intercom{broadcasting = 0; name = "station intercom (General)"; pixel_y = 25},/turf/simulated/floor/plasteel,/area/janitor)
 "bWM" = (/obj/structure/closet/l3closet/janitor,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1; initialize_directions = 11; level = 1},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plasteel,/area/janitor)
 "bWN" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{level = 1},/obj/machinery/newscaster{pixel_y = 30},/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plasteel,/area/janitor)
-"bWO" = (/obj/vehicle/janicart,/turf/simulated/floor/plasteel,/area/janitor)
+"bWO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/vehicle/janicart,/turf/simulated/floor/plasteel,/area/janitor)
 "bWP" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plasteel,/area/janitor)
 "bWQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/reagent_dispensers/spacecleanertank{pixel_y = 30},/turf/simulated/floor/plasteel,/area/janitor)
 "bWR" = (/obj/machinery/door/window/westleft{name = "Janitoral Delivery"; req_access_txt = "26"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/janitor)
@@ -5277,7 +5277,7 @@
 "bXy" = (/obj/machinery/light,/obj/machinery/camera{c_tag = "Research Genetics South"; dir = 1; network = list("Research","SS13")},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurple"},/area/medical/genetics)
 "bXz" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurple"},/area/medical/genetics)
 "bXA" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurple"},/area/medical/genetics)
-"bXB" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (SOUTHEAST)"; icon_state = "whitepurple"; dir = 6},/area/medical/genetics)
+"bXB" = (/obj/item/roller,/obj/item/weapon/storage/box/disks,/obj/structure/table/glass,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (EAST)"; icon_state = "whitepurple"; dir = 4},/area/medical/genetics)
 "bXC" = (/obj/machinery/power/apc{dir = 1; name = "Telescience Pad APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/engine,/area/toxins/explab_chamber)
 "bXD" = (/obj/item/device/radio/intercom{dir = 1; name = "station intercom (General)"; pixel_y = 25},/turf/simulated/floor/engine,/area/toxins/explab_chamber)
 "bXE" = (/turf/simulated/floor/engine,/area/toxins/explab_chamber)
@@ -5760,7 +5760,7 @@
 "cgN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-whiteblue (NORTH)"; icon_state = "whiteblue"; dir = 1},/area/medical/medbay2)
 "cgO" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{level = 1},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plasteel{tag = "icon-whiteblue (NORTH)"; icon_state = "whiteblue"; dir = 1},/area/medical/medbay2)
 "cgP" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/plasteel{tag = "icon-whiteblue (NORTHEAST)"; icon_state = "whiteblue"; dir = 5},/area/medical/medbay2)
-"cgQ" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab)
+"cgQ" = (/obj/structure/stool/bed/chair/office/dark,/obj/item/device/radio/intercom{dir = 0; name = "station intercom (General)"; pixel_x = -28; pixel_y = -28},/turf/simulated/floor/plasteel{tag = "icon-whitepurple (WEST)"; icon_state = "whitepurple"; dir = 8},/area/medical/genetics)
 "cgR" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab)
 "cgS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab)
 "cgT" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab)
@@ -6599,7 +6599,6 @@
 "cwU" = (/turf/simulated/wall,/area/engine/mechanic_workshop)
 "cwV" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/aft)
 "cwW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plating,/area/maintenance/aft)
-"cwX" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating/airless,/area/assembly/assembly_line)
 "cwY" = (/obj/item/weapon/table_parts,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/assembly/assembly_line)
 "cwZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel,/area/assembly/assembly_line)
 "cxa" = (/obj/item/weapon/camera_assembly,/turf/simulated/floor/plasteel,/area/assembly/assembly_line)
@@ -8850,6 +8849,7 @@
 "doj" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/aft)
 "dok" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/aft)
 "dol" = (/obj/machinery/light/small{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/aft)
+"dom" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab)
 "don" = (/obj/structure/table,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft)
 "doo" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plating,/area/maintenance/aft)
 "dop" = (/obj/structure/closet,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft)
@@ -8867,6 +8867,7 @@
 "doB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/effect/decal/warning_stripes/yellow,/turf/simulated/floor/engine,/area/engine/mechanic_workshop)
 "doC" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/maintenance/aft)
 "doD" = (/obj/item/stack/sheet/metal{amount = 10},/turf/simulated/floor/plating,/area/space)
+"doE" = (/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/stokcubes,/obj/item/weapon/storage/box/neaeracubes,/obj/structure/table/glass,/obj/item/weapon/storage/box/wolpincubes,/obj/item/weapon/storage/box/farwacubes,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (SOUTHEAST)"; icon_state = "whitepurple"; dir = 6},/area/medical/genetics)
 
 (1,1,1) = {"
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
@@ -9008,20 +9009,20 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjxdjCdjEdjDdjGdjFdjIdjHdjFdjJdjLdjKdjydjydjBbikbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevbGWbmrbNkbmrbGXbGYbGZbGYbGYbGYbGYbHabyvbAfbHbbngbngbHcbpIbAibFvbHdbtLbHebHfbHfbHgbHhbHibHjbHkbHlbHmbHnbHobHpbHqbHrbHsbCpbCqbAEbvjbEibHubHvbHwbHxbvjbikbEkbHybHzbHybHybHybHybHybHAbHybKPbvwbKObucbHCbHDbHDbHEbHFbEybHGbHHbHIbHJbHKbHLbHMbHIbHNbHObHPbHQbHRbHSbHTbHTbHUbHVbHWbHXbHYbLibLCbLBbNdbNcbNebIfbIfbIgbIhbIibxGbIjbxJbxJbIkbIlbEUbImbInbIobIpbIqbIrbIsbItbIubIvbIubusbusbIwbEXbGxbLDbLDbLDbLDbLDbGxbFhbFkbFibFkbFkbGTbFhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjxdjydjHdjHdjHdjMdjFdjNdjNdjFdjOdjHdjHdjQdjPdjydjBbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevbLFbKmbIAbKmbIBbAebFqbFrbFrbFrbAebAebyvbAfbICbKobngbIEbpIbAibFvbIFbtLbIGbpIbrsbpIbIHbDXbvvbIIbHlbHmbIJbIKbILbIMbINbIObIPbIQbIRbISbISbITbIUbIVbvjbvjbikbEkbHybIWbIXbIYbIZbJabJbbJcbJdbMhbvwbKObCHbJfbJgbJhbJibJjbEybJkbJlbJmbJnbJobJpbJqbJrbJsbJtbJubJvbJwbJxbJybJzbJAbJBbJCbJDbJEbGwchEbIecnfcjubvYbJIbJJbJKbJLbJLbxGbJMbJNbJObxGbJPbEUbJQbxGbJRbJSbJTbJUbJVbJWbJXbJYbJZbKabKbbKcbKdbKebKfbKfbIxbJFbJHbGzbKlbFfbDBbNhbDBbFfbLEaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjxdjydjSdjRdjUdjTdjVdjFdjWdjHdjXdjHdjHdjHdjHdjHdjMdjFbikbikbikbikbikbikbikbikbikbikdewdeCdevdevdevcOfdewbFnbBRbBRdezbAebFqbAebAebAebAebAebyvbAfbICbLwbngbLQbpIbKqbKrbpIbKsbpHbpIbpIbKtbtLbDXbvvbIIbHlbHmbCpbKubKvbqzbKxbKybKzbKAbKBbKCbKDbwXbKEbKFbwXbwYbwYbKGbHybKHbKIbKJbKKbKLbKLbKMbKNbMibvwbMjbucbEybKQbEubKRbKSbEybJkbKTbKUbKVbKWbKXbKYbKUbJkbKZbLabLbcchbLbbLcbLbbLdbLdbLebLfbLgbLhbLhcpLbLgbLgbLhbLhbLjbLkbLjbLjbxGbxGbxGbxGbxGbLlbLmbBobxGbLnbLobLpbLqbLqbLrbLsbLtbLubLvbLIbLxbLybLzbLAbLAbEObGAbHZbGxbGzbGzbGzbIabGxbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjZdjYdjHdjHdkadkadkadjFdjHdjHdjFdkbdkddkcdkfdkedkgdjFbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevbWobKmbIAbKmbFobLGbLHbAebAebAebLGbAebyvbAfbICbNrbngbLJbpIbAibFvbpIbnmbLKbpIbpIbLLbtLbDXbvvbLMbHlbLNbCpbLObLPdiNbLRcobbKzbLTbLUbLVbLWbLXbLYbLZbMabikbikbikbHybMbbMcbMdbMdbMebMfbMgbHybNSbNRbKObNTbMkbMlbMmbMnbMobMpbMqbJlbMrbMsbMtbMubMvbMrbJkbKZbMwbMxbMybMzbMAbMBbLdbMCbMDbMEbLgbMFbMGbMHbMIbMJbMKbMLbKabMMbLqbLqbMNbMObLqbMPbMQbMRbMSbMTbLqbMUbiTbMWbMXbMYbMZbNabNbbNabNabNabIwbEXbGxbLDbLDbGxcnccndcnebOQbOSbUHbYdbGzbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjZdjYdjHdjHdkadkadkadjFdjHdjHdjFdkbdkddkcdkfdkedkgdjFbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevbWobKmbIAbKmbFobLGbLHbAebAebAebLGbAebyvbAfbICbNrbngbLJbpIbAibFvbpIbnmbLKbpIbpIbLLbtLbDXbvvbLMbHlbLNbCpbLObLPdiNbLRcobbKzbLTbLUbLVbLWbLXbLYbLZbMabikbikbikbHybMbbMcbMdbMdbMebMfbMgbHybNSbNRbKObNTbMkbMlbMmbMnbMobMpbMqbJlbMrbMsbMtbMubMvbMrbJkbKZbMwbMxbMybMzbMAbMBbLdbMCbMDbMEbPEbMFbMGbMHbMIbMJbMKbMLbKabMMbLqbLqbMNbMObLqbMPbMQbMRbMSbMTbLqbMUbiTbMWbMXbMYbMZbNabNbbNabNabNabIwbEXbGxbLDbLDbGxcnccndcnebOQbOSbUHbYdbGzbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkhdjYdjHdjHdjHdjHdjHdkidjHdjHdjFdjydjydjydjydjydjydkjbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevdeEdeDdeGdeDbNlbNmbNnbNnbNnbNnbNnbNobNpbNqbICbWSbngbNsbNtbNubNvbNwbNxbNybNybNybNzbNzbNAbvvbNBbNCbHmbCpbNDbNEbNFbKvbNGbKzbNHbNIbNJbNKbNLbFNbNMbMabikbikbikbHybNNbNObNPbNQbMebMfbMgbHybPibNUbQObPjbNVbNWbNXbNYbNZbOabObbOcbKUbKUbOdbOebKUbKUbJkbKZbOfbOgbOhbOibOjbOkbLdbOlbOmbOnbOobOpbOqbOrbOrbOsbOtbOubOvbOwbJVbJVbOxbJVbOybJVbOzbJVbOAbOBbOBbOCbODbOEbOFbOGbOHcsjbOJbOKbOLbNabOMcxHbikbikbikbGxbORbJFbOPbOQbGzbOObNibGxbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkmdkldkodkndjHdjFdjHdjHdjFdjHdkqdkpdkrbikbikbikbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevdewbFnbBRbBRbngbngbBRbBRbBRbBRbBRbngbngbBRbBRbBRbngbOVbOVbOVbOWbOVbNzbOXbOYbOZbPabNzbDXbvvbPbbPcbPcbCpbCpbCpbCpbCpbPdbKzbISbIRbPebNKbPgbPhbMabMabvjbvjbvjbHybHzbHybHybHybHybHybHybHybQPbvwbQQbPkbPlbPmbPnbPlbPlbPobPpbPqbPrbPsbPtbPubPvbPwbMqbPxbPybPzbPAbPBbPCbPDbPEbPFbPGbPHbPIbPJbPKbPLbMHbPMbLhbLhbPNbPObPNbPPbPQbPPbPPbPPbPRbPSbPTbPTbPUbPVbPWbPXbOFbPYbPZbQabQbbQcbQdbNabOMcxHbikbikbikbGxbNfbNgbGxbGzbGxbGxbGzbGxbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjydjydjydjydjydjydjFdjOdjHdksdjHdkudktdkvbikbikbikbikbikbikbikbikbikbikbikbikbikdeJdeIdevdeKdevdeLdeMbikbikbikbikbikbikbikbikbikbikbQgaabbikbikbikbikbOVbQhbQibQjbQkbNzbQlbQmbQnbQobNzbDXbvvbQpbQqbQrbQsbQtbQubQvbQwbQxbQybQzbQAbQBbQCbQDbQEbQFbQGbQHbQIbQJbQKbQLbQMbQRbuabQSbvwbShbSgbSibvwbSjbPlbQTbQUbQVbQWbQXbJkbQYbQZbRabRbbRcbRdbRebRfbRgbRhbRibLbbRjbOibRkbRlbRmbRnbRobRpbLgbRqbMHbMHbMHbRrbLhbPNbRsbRtbRubRvbRwbRxbRybPPbRzbRAbRBbPTbPTbRCbPWbRDbREbWHbRGbRHbRIbRJbRKbNabRLbwobikbikbikbGxbGxbGxbGxbikbikaabbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjxdjydkxdkwdkydkxdkzdjFdjHdjHdjFdjHdkBdkAdkCbikbikbikbikbikbikbikbikbikbikbikbikbikdmideNdePdePdePdeNdmHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbOVbRMbRNbRObRPbNybRQbRRbRSbRTbNzbDXbRUbRVbvvbvvbFXbRWbubbQNbQMbRXbRYbRXbRZbSabSabSbbScbSdbSabSabSebSabSfbSabQMbQRbuabSlbSkbTJbTIbTLbTKbvwbPlbSmbQUbSnbSobSpbJkbSqbSrbSsbStbSubSvbSwbSxbJkbSybSzbLbbSAbSBbSBbSCbSDbSEbSFbSGbLgbSHbSIbMHbSJbSKbLhbPNbSLbSMbSNbSObSPbSQbSRbPPbSSbRAbSTbSTbPTbSUdnjbSWbSXbSYbSZbTabTbbTcbTdbNabOMbwobTebikbikbikbikbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjZdjYdkDdkDdkDdkDdkDdkEdjHdjHdjFdjydjydjydjydjydjydjBbikbikbikbikbikbikbikbikbikbikbikdeRdeSdeSdeSdeTbikbikbikbikbikbikbikbikbOUbOTbQebOTbQfbikbikbikbOVbOVbTjbTkbRObTlbNybTmbQnbTnbTobNzbDXbTpbTqbTrbTsbTtbTubTvbTwbTxbTybTzbTAbTBbTCbTCbTDbTEbTEbTEbTEbTEbTEbTFbTGbTHbTNbTMbTPbTOdlidjmdlkdljdllbPlbTQbQUbQVbTRbSpbJkbSqbSrbTSbTTbTUbTVbTWbTXbJsbTYbTZbLbbLbbUabUabLbbSDbLdbUbbUcbLgbUdbUebUfbUgbUhbLhbPNbUibUjbUkbUlbUmbUnbUobPPbUpbRAbSTbSTbPTbUqbUrbUsbUtbUubUvbUwbUxbUybUzbNabOMbUAbUBbUAbUCbUDbUCbUCbUCbikbikbikbikaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikaabaabaabaabaabbikbikbikbikaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkhdjYdkDdkDdkDdkFdkGdjFdjHdjHdjFdjHdjHdjHdkHdjHdkIdjFbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbTgbTfbTibThbTgbUIbUIbUIbOVbUJbUKbULbUMbUNbUObUPbUQbUQbURbNzbUSbUTbUUbUVbUVbUWbUXbUYbUVbUZbUZbVabVbbONbUZbUZbVdbQMbQMbVebVfbVfbVfbVgbVhbVfbVfbVibVjbVkbVkbVlbVkbVmbVnbVkbVobVpbVqbPlbVrbVsbSqbVtbVubVvbVwbVxbVybVubJkbSybVzbVAbVBbVCbVDbVEbVFbVGbVHbVIbVJbVKbVLbVMbVNbVObLhbPNbPNbVPbVQbVRbVSbVRbVTbPPbVUbVVbVWbVWbPTbVXbVYbVZbNabNabNabNabNabNabNabNabOMbUAbWabWbbWcbWdbWdbWebUCbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikaabbWfbWfbWfbWfbWgbWgbWhbWhbWhbWhbWiaabaabbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkKdkJdkDdkLdkMdjFdjHdjHdkNdjHdjHdjHdkOdjHdkPdjFbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbQebUEbUFbUEbQebUIbWmbWlbOVbWnbWpbWqbWrbWsbNzbWtbWubWvbWwbNzbUTbUTbWxbUVbWybWzbWAbWBbWCbUZdmbbWEbWFbWGcAzbUZbWIbWJbWKbVfbWLbWMbWObWNbWPbWQbWRceLbWTbWUbWVbWWbWXbWYbWZbXabXbbXcbXdbXebXfbXgbXhbSrbXibXjbXkbXlbXmbXnbJsbXobXpbXqbXrbVDbXsbXsbXtbXubLgbXvbXwbXxbXybXzbXAbXBbLhbXCbXDbXEbXFbXEbXEbXGbXHbXIbXJbXKbXLbXMbPTbXNbXObPXbEXbxXbXPbXQbXRbXRbXQbXRbXSbUAbXTbXUbWcbWdbXWbXVbUCbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWfbXXbXYbXXbWgbWhbWhbXZbYabXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkmdkldkodkndjHdjFdjHdjHdjFdjHdkqdkpdkrbikbikbikbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevdewbFnbBRbBRbngbngbBRbBRbBRbBRbBRbngbngbBRbBRbBRbngbOVbOVbOVbOWbOVbNzbOXbOYbOZbPabNzbDXbvvbPbbPcbPcbCpbCpbCpbCpbCpbPdbKzbISbIRbPebNKbPgbPhbMabMabvjbvjbvjbHybHzbHybHybHybHybHybHybHybQPbvwbQQbPkbPlbPmbPnbPlbPlbPobPpbPqbPrbPsbPtbPubPvbPwbMqbPxbPybPzbPAbPBbPCbPDbRpbPFbPGbPHbPIbPJbPKbPLbTdbXBbLhbLhbPNbPObPNbPPbPQbPPbPPbPPbPRbPSbPTbPTbPUbPVbPWbPXbOFbPYbPZbQabQbbQcbQdbNabOMcxHbikbikbikbGxbNfbNgbGxbGzbGxbGxbGzbGxbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjydjydjydjydjydjydjFdjOdjHdksdjHdkudktdkvbikbikbikbikbikbikbikbikbikbikbikbikbikdeJdeIdevdeKdevdeLdeMbikbikbikbikbikbikbikbikbikbikbQgaabbikbikbikbikbOVbQhbQibQjbQkbNzbQlbQmbQnbQobNzbDXbvvbQpbQqbQrbQsbQtbQubQvbQwbQxbQybQzbQAbQBbQCbQDbQEbQFbQGbQHbQIbQJbQKbQLbQMbQRbuabQSbvwbShbSgbSibvwbSjbPlbQTbQUbQVbQWbQXbJkbQYbQZbRabRbbRcbRdbRebRfbRgbRhbRibLbbRjbOibRkbRlbRmbRnbRobRqbPEbSFbMHbMHbMHbUzbLhbPNbRsbRtbRubRvbRwbRxbRybPPbRzbRAbRBbPTbPTbRCbPWbRDbREbWHbRGbRHbRIbRJbRrbNabRLbwobikbikbikbGxbGxbGxbGxbikbikaabbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjxdjydkxdkwdkydkxdkzdjFdjHdjHdjFdjHdkBdkAdkCbikbikbikbikbikbikbikbikbikbikbikbikbikdmideNdePdePdePdeNdmHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbOVbRMbRNbRObRPbNybRQbRRbRSbRTbNzbDXbRUbRVbvvbvvbFXbRWbubbQNbQMbRXbRYbRXbRZbSabSabSbbScbSdbSabSabSebSabSfbSabQMbQRbuabSlbSkbTJbTIbTLbTKbvwbPlbSmbQUbSnbSobSpbJkbSqbSrbSsbStbSubSvbSwbSxbJkbSybSzbLbbSAbSBbSBbSCbSDbSEbSHbSGbPEcgQbSIbMHbSJbSKbLhbPNbSLbSMbSNbSObSPbSQbSRbPPbSSbRAbSTbSTbPTbSUdnjbSWbSXbSYbSZbTabTbbTcbRKbNabOMbwobTebikbikbikbikbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjZdjYdkDdkDdkDdkDdkDdkEdjHdjHdjFdjydjydjydjydjydjydjBbikbikbikbikbikbikbikbikbikbikbikdeRdeSdeSdeSdeTbikbikbikbikbikbikbikbikbOUbOTbQebOTbQfbikbikbikbOVbOVbTjbTkbRObTlbNybTmbQnbTnbTobNzbDXbTpbTqbTrbTsbTtbTubTvbTwbTxbTybTzbTAbTBbTCbTCbTDbTEbTEbTEbTEbTEbTEbTFbTGbTHbTNbTMbTPbTOdlidjmdlkdljdllbPlbTQbQUbQVbTRbSpbJkbSqbSrbTSbTTbTUbTVbTWbTXbJsbTYbTZbLbbLbbUabUabLbbSDbLdbUbbUcbLgbUdbUebUfbUgbUhbLhbPNbUibUjbUkbUlbUmbUnbUobPPbUpbRAbSTbSTbPTbUqbUrbUsbUtbUubUvbUwbUxbUybVObNabOMbUAbUBbUAbUCbUDbUCbUCbUCbikbikbikbikaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikaabaabaabaabaabbikbikbikbikaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkhdjYdkDdkDdkDdkFdkGdjFdjHdjHdjFdjHdjHdjHdkHdjHdkIdjFbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbTgbTfbTibThbTgbUIbUIbUIbOVbUJbUKbULbUMbUNbUObUPbUQbUQbURbNzbUSbUTbUUbUVbUVbUWbUXbUYbUVbUZbUZbVabVbbONbUZbUZbVdbQMbQMbVebVfbVfbVfbVgbVhbVfbVfbVibVjbVkbVkbVlbVkbVmbVnbVkbVobVpbVqbPlbVrbVsbSqbVtbVubVvbVwbVxbVybVubJkbSybVzbVAbVBbVCbVDbVEbVFbVGbVHbVIbVJbVKbVLbVMbVNbPMbLhbPNbPNbVPbVQbVRbVSbVRbVTbPPbVUbVVbVWbVWbPTbVXbVYbVZbNabNabNabNabNabNabNabNabOMbUAbWabWbbWcbWdbWdbWebUCbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikaabbWfbWfbWfbWfbWgbWgbWhbWhbWhbWhbWiaabaabbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkKdkJdkDdkLdkMdjFdjHdjHdkNdjHdjHdjHdkOdjHdkPdjFbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbQebUEbUFbUEbQebUIbWmbWlbOVbWnbWpbWqbWrbWsbNzbWtbWubWvbWwbNzbUTbUTbWxbUVbWybWzbWAbWBbWCbUZdmbbWEbWFbWGcAzbUZbWIbWJbWKbVfbWLbWMbWObWNbWPbWQbWRceLbWTbWUbWVbWWbWXbWYbWZbXabXbbXcbXdbXebXfbXgbXhbSrbXibXjbXkbXlbXmbXnbJsbXobXpbXqbXrbVDbXsbXsbXtbXubLgbXvbXwbXxbXybXzbXAdoEbLhbXCbXDbXEbXFbXEbXEbXGbXHbXIbXJbXKbXLbXMbPTbXNbXObPXbEXbxXbXPbXQbXRbXRbXQbXRbXSbUAbXTbXUbWcbWdbXWbXVbUCbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWfbXXbXYbXXbWgbWhbWhbXZbYabXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkQdkDdkDdkRdjFdjHdjHdjFdkSdjHdjHdkUdkTdjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbTgbUGbUEbUEdeycOWbTkbTkdeAbZAbTkbWqbYhbYibNzbNzbNzbNzbNzbNzbYjbUTbYkbYlbYmbYnbYnbYnbYobUZbYpbYqbYqbYqbYrbYsbYtbYubYvbYwbYxbYybYzbYAbYBbYCbVfbVibYDbVkbYEbYFbYGbYHbYIbVkbSmbQVbSnbSobYJbYKbYLbYMbYNbYObYPbYQbYRbVubYSbYTbYUbYVbYWbYXbYYbYZbZabZbbLgbLgbLgbLgbLgbZcbZdbZebLhbZfbXEbXEbZgbZhbXEbZibZjbZkbZlbRAbZmbZmbPTbPVbZnbPXbEXbUAbZobUAbUAbUAbUAbUAbUAbUAbZpbZqbUCbZrbZtbZsbUCaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacbZubXXbXXbZvbWhbWhbXZbXZbZwbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkWdkVdkXdjFdjHdkYdjFdkZdladjHdjydjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbQebUFbUFbUFbQebUIbYfbYebZzbZAbTkbZBbZCbZDbZEbZFbZFbZFbZGbUTbUTbUTbWxbUVbZHbYnbZIbYnbZJbUZbYpbYqbZKbYqbZLbUZbZMbZNbZObVfbZPbZQbZRbZSbZTbZUbZVbZWbZXbZYbZZcaacabcaccadbVkbTQbQVbQVcaebYJbYKcafcagcahbXjcaicajcElcalcamcancaocapcaqcarcIfcasbXscatbVAcaucavcawcaxcaycazcaAbZjbZfcaBbXEbXEbXEcaCcaDbZjbZkcaEbRAbZmbZmbPTcaFcaGbPXbEXcaHcaIcaJbUAcaKcaLcaMcaNcaOcaPcaQbUCcaRcaScaTbUCbUAbUAbUAbUAbUAbUAbUAbUAbikbikbikbikbikaabbikbikbikbikbikbikbikcaUbWhbZubWhbWhbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydjydjydjydjydjydjydjydjydjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabaabaacbUTcjMcjMbUTcjMcjMbUTbikbikbikbTgbWjbYbbWkbTgbUIbUIbUIbOVcaYcaZcaZcaZbOVbOVbUTcbbcbaccAcbcbUTcbdcbebUVbZHbYnbYnbYncbfbUZbYpbYqbYqcbgcbhcbicbjcbkcblbVfbVfbVfbVfbVfcbmbVfbVfcbncbobVkbVkcbpbVkbVnbVkbVkbPlcbqcbqbPlccicbrcbscbtcbucbvcbwcbxcbycbzcbAcbBcaocapcbCcbDcbEcbFcbGcbHbVAcbIcbJcbKcbLcbMcbNcbOcbPcbQcbPcbRcbRcbRcbPcbScbPcbPcbTcbUbZmbZmbPTcbVbZnbPXcbWcbXcbYcbZccaccbccccccccdcceccfccgcckccjcdqcclcfeccmccnccoccpccqccrccscctaabaabaabaabaabaabaabaabbikbikbikbikbikbWgbWhccuccvccvbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbUTccBcqsbUTccBcqsbUTbikbikbikbYcbOTbYgbOTbZxbikaabbikbOVbOVbOVbOVbOVbOVclabUTcuRcsuccCccDbZFccEccFbUVccGccHdmcbYnccJccKccLccMccNccOccPbUZccQccRccSccTccUccUccUccUccVccWccXccYccYccZccZcdacdbcdcbVibPlcddcdecdfcdgcdhbYKcdicbtcdjcdkcdlcdmbSwcdncdocdpcffcdrcdrcdscdrcdrcdrcdtbVAcducdvcdwcdxcdycdzcdAcbPcdBcdCcdDcdEcdFcdCcdGcdHcdCcdIcdJbRBbPTbPTcdKcdLcdMcdNcdOcdPcdQcdRcdScdTcdUcdVcdWcdXcdYcdZceacebceaceccebcebcebcedceecefcegcehaabbikbikbikbikaabbikbikbikbikbikbikbikbWhbWhceibXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaacbikaacbUTcfQcqsbUTcfQcqsbUTbikbikaabaabaabaabaabaabaabaabaabbUTcqscAjcwNbUTcEvcEwbUTcGJbUTbUTcekbUTbUTcelbUVcemcenceocepceqcercescetceucevcewccKcexceycezceAceBceBceBceBceCceDceEceFceGceFceHceIceJceKchvceMceNceOcePceQceRceSceTceUceVceWceXceYceZcfacfbcfccfgbMmbMmcfichOcgHceYchVcfjcfjcfkcfjcflcfmcfncfocbPcfpcfqcfrcfscfrcftcfucfvcdCbPTcfwbPTbPTcfxcfybZnbBxbEXbUAcfzbUAbUAcfAcfBcfCcfDcfEcebcfFcfGcfHcdUcfHcdUcfIcdUcdUbUAcfJcfKcfLcfMaabaabaabaabaabaabaabaabbikbikbikbikbikbWhbXZbXZbXZbXZbXZbXZcfNbXZcfObXZbXZbXZbXZbXZbWhbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabdnkaacaabaDDaDDaacbUTbUTcekbUTbUTcekbUTbUTbUTcjMcjMcjMbUTbUTbUTbUTbUTbUTbUTcqschodnmbUTdnnbUTbUTdnobUTcfPbVccqsbUTcfSbUVcfTcfUcfVbZHcfWcfXcfYbYpcfZcgacgbcfXcgccgdcgecgfcgfcggcghcgicgjcgkcglcgmbGycgnbVicgobGybGycgpcgqcgrcgscgtceQcgucgvcgwcgxcgycgzbMVcgBcgCcgzcgzcgDcgEcgEcgEcgEcgEcgGcgFciOcgJcgJcgKcgLcgMcgNcgOcgPcbPcgQcgRcgScgTcgScgUcgVcfrcgWcgXcgYbBxcgZbBxcfybZnbBxbEXchachbchcbUAbUAbUAbUAbUAchdcdUchechfcfIcdUchgcdUbZpcdUchhbUAchichjchkbUAaabbikbikbikbikaabbikbikbikbikbikbikbikbWhchlchlchlchlchlchlchmbXZchnchlcfObXZbXZbXZbXZbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabdnkaacaabaDDaDDaacbUTbUTcekbUTbUTcekbUTbUTbUTcjMcjMcjMbUTbUTbUTbUTbUTbUTbUTcqschodnmbUTdnnbUTbUTdnobUTcfPbVccqsbUTcfSbUVcfTcfUcfVbZHcfWcfXcfYbYpcfZcgacgbcfXcgccgdcgecgfcgfcggcghcgicgjcgkcglcgmbGycgnbVicgobGybGycgpcgqcgrcgscgtceQcgucgvcgwcgxcgycgzbMVcgBcgCcgzcgzcgDcgEcgEcgEcgEcgEcgGcgFciOcgJcgJcgKcgLcgMcgNcgOcgPcbPdomcgRcgScgTcgScgUcgVcfrcgWcgXcgYbBxcgZbBxcfybZnbBxbEXchachbchcbUAbUAbUAbUAbUAchdcdUchechfcfIcdUchgcdUbZpcdUchhbUAchichjchkbUAaabbikbikbikbikaabbikbikbikbikbikbikbikbWhchlchlchlchlchlchlchmbXZchnchlcfObXZbXZbXZbXZbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaacaaccjMcqscqscqscqsdoadnxcqscqscuRdnpdnpdowdnpdnpdnpdnpdnpdnpdnpdnpdnpdnpdnpdnpcsubUTchocfQchpbUTcfSchrchrchrchrchrchrbUZbUZbUZbUZbUZbUZbUZchschtchucWpchwchxchychychzchAcglbGybGychBchCchDbGybGybGycqOchFchGceOchHchIchJcgEchKchLchMbSqchLchNcfdcfdcfdcjncjlcjlcjlcjlckacgIbSqclPchPchQchRchSchTchUclQcbPchWchXcfrchYcfrchZciacibciccidciecifbBxcigcfybZncihbEXbFeciicijcikbwobxXbxXbUAcilcimcinciocipciqcirciscitciucivbUAciwciycixcizbikbikbikbikaahbikbikbikbikbikbikbikbikciAbXXbXXbXXbXXbXXbXXbXXciBciCbXZbXZbXZbXZciDbYabWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaacaabaabaaccjMdnrdnqdnscqscqsdoxcqscqsdnobUTbUTbUTbUTbUTbUTcekbUTbUTbUTbUTdntdntdntdntdntdntdntdntdntbUTcfScejbikbikbikbikciEbaTciGciHciIciJciKciLciMciNcmPciPciQciRciSciSciTciUciVciWciWciWciWciXciWbGybGybPlciYciZcjacjbcjccjdchScjecjfcjgcjhcjicjjcjkcjlcfdcnicjpcjpcjpcjpckNclSckUcnjcjqcjrcjscjtcbAcwncjvcbPcjwcjxcjycjzcjAcfrcjBcbPcbPbEXcjCbEXbEXbEXcjDcjEcjFbEXbxXciicjGcjHbwobwobwobUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbikbikbikbikbikaabbikbikbikbikbikbikbikbWhccvccvccvccvccvccvcjIbXZccuccvcjJbXZbXZbXZbXZbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbUTcjKcjKcjKcjKcjKcjKcjLcjKdnodnubUTcqsdoydnwdnycqsdnydnvdnzdnwdntdnAdnAdntdnBdntdnDdnCdntcqscelcjMbikcjNcjOcjPcjQcjRcjScjTcjUcjVcjWcjXcjYcjZcosckbckcckdckeckfckgckhciVckickjckjckjckkciWbGybGycklcklcklcklckmcklckncknckocklcklckpcklckqckrckscktcksclZaPKcmacmmcmlcmocmnckzckAckBckCckDckEckFcdccbPcbPckGcbPckHcbPckIckJckKcgnckLckMckvckOckPckQckRckSckPbxXciickTbxXbxXckVckWckXchabxXbxXbxXbxXbxXbxXbxXckYckZcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWhbXZbXZbXZbXZbXZbXZcfNbXZcjJbXZbXZbXZbXZbXZbWhbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
@@ -9035,10 +9036,10 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaSecsdctvctvctvdoBcsdctuctvctwctvctxctyctDctCdmedcYdmedmfcxnctEctFctEctEctGcblcblctEctHctEctEctEctEctEctEctEctEctEctEctIctJctKctLctMctNctOctPctQctRctSctTctUctVctWctXciFctZcuacnqcubcuccudcuecufcugcuhcuicpFcujcqKcugcukcqKculcwrbikbikbikdbFcmkdbGdbJdbIdbCdbKdbMdbLdbOdbNceFceJdbPcoDcwpbikbikbikaabaabaabbikbikbikbikbikbikbikckPcurczQcutckPcnCcnCcnCcnCcnCcnCcuuctlcuvcuwcuxcuycnCcnCbwocvzbxXcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaSedobctvdocctvdoBcuBdodcuCcuDcuEcuFcuGcuHcuIcuJcuKcuLcuMcuNcuOcuPcuQdoeceAcuSceAcuNcuTcuNcuNcuNcuNcuNcuNcuNcuNcuNcuNcuUctEcuVcuWcuXcuYcuZcvacvbcvccvdcvecvfcvgcvhcvicvjcvkcsLceJcvlcvmcvncqKcqJcqKcqKcvocpFcvpcqKcqKcqNcqKcyGcwrbikbikbikdbFdbRdbQdbTdbSdbVdbUdbXdbWdbybGychCcyHcuscoAbikbikbikbikbikaabckPckPckPckPckPckPckPckPckPcvucxScvwckPcxOcxOcyIckPaabcnCcnCcvAcnCcvBcvCcvDcnCcyKcyJcvzbxXcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdogdofcrjcrjcrjcrjdnQcrjcrjcrjcrjdnXcrjcvFcvGcvGcvHctBdlXcrjcrmcvJcvKcvKcvLcvKcvMcvKcvKcvNcvOcvKcvKcvOcvOcvOcvKcvKcvKcvKcvPcvQcvRcvScvTcvUcvVcvWcvXcvWcvWcvWcvWcvZcwacwbcwccwdcsObGycvrcwecwfcwgcwhcwicwjcwkcpFcwlcwjcwmcqNcqKcwocpMbikbikbikdbFdbZdbYdcadbIdccdcbdbUczRdbycyObVibVicuscoAbikbikbikbikbikbikckPcwtcwucwvcwwcwxcwycwzcwAcwBczScwDckPcxOcBZcyPckPaabaabcwGcwHcwIcwJcwKcwLcwGbxXbxXcvzczfbwobikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGacGacGafxafxacGafxafxaabagiaabaqZbikaqZaqZdoidoCdojdojdojdoldokcrjcwOcwPcwQcwRcwScwTcwUcwVcwWcwXcwYcwZcxacxbcxccxdcxecxfcxgcvKcxfcxhcxicxjcxjcxkcvKcxlcxmcxncxocbkcxpcxqcxrcxscxtcxucxtcxvcxwcxxcxycxzcxAcsOcsOcvrcwecpMcpMcxBcpMcpMcxCcxDcxEcxEcxEcxFcxEcyUcpMbikbikbikdbFdbFdbFdbFdbFdbydcedcgdcfdbybGybGyczhcuscoAbikbikbikbikbikbikckPcxOcxPcxOcxQcxRcqUcxScwAcxTczicxTckPcxOcxOcMpckPaabbikcwGcxWcxXcwJcwJcxYcwGczjbxXcvzbzNczMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGbikbikaabaabbikaabaabbikbikaabaabaabaabaabdoidoidohdoidoidoncEBcrjcrjcrjcrjcrjcrjcrjcrjcybcwWcwXcyccydcyecyfcyfcyfcyfcygcyhcyicxjcyjcxjcxjcykcxjcylcymcyncyocxocbkcypcyqcmScxscyscytcyucxscyvcywcyxcyycyzcyAcyBcyCcyDcyEcyEcAaczUcAdcAccAeczTcALceJcAhbGycAMcoAcoAcoAcoAcoAbikbikbikbikdcidchdckdcjdbydclbVibVicuscoAcoAcoAcoAcoAbikbikckPcxOcxOcxOcyZczaczbczcczdcAicAOcAvckPcAVcAYcAWckPbikbikcwGczkcwJczlcwJczmcwGbxXbxXcvzczMbwobikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdoDbikacGbikczoczpczqbikczoczpczqbikczoczpczqbikbikdoidoocfRdopdoidoqcGKdojdojdojdojdojdojdojdojdojcEycwXcztcxjcykczucxjcxjcxjczvcxjcztcztcxjcxjcxjcxjczwczxcymczyctEczzcoacyqcyqczAcxsczBczCczDcxsczEctWczFczGczHczIczJczKbGyczLcdcczLbGycBacAZcBccBccBccBccBPcBNcBNcBNcBNcBNcBQcoAbikbikbikbikdcidchdckdcmcTabGyckObVicusbGybGybGycgmcoAbikbikckPcwAcwAcwAcwAczWcqUczXczYczZcCfcAbckPcCGcCYcCIckPbikbikcwGcAfcAgcDLcwJcDNcwGcEdbxXcvzbwoaabaabaabaabbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGbikczocAkczqbikczocAkczqbikczocAkczqbikaqZdoicfRcfRcfRdoidoidorczsdoidoiczsczsdoidoiczsczscwWcwXcztcAlcxjcAmcAncAocAocyjcxjcztcApcxjcxjcxjcxjcAqcArcAscAtbZNcAucAPcAwcAxcAycxsczBdlYcAAcxscABctWcsOcACcsLcADcAEcAFcAGcAHcAIcAJcAGcAKcAGcAGcAGcoAcoAcoAcoAcoAcoAcoAcoAcEhcoAbikbikbikbikdcicBTdcqcBUdbycgmcFdbVicFmcFlcFlcFnbGycoAbikbikckPcwtcwucwvcAQcARczbcAScATcAUcFrcIScAXcGscIScGtckPbikbikcwGcwGcBbcCrcBdcwGcwGbwobxXcGycyJcyJcyJbwobikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGacGacGafxafxacGafxafxaabagiaabaqZbikaqZaqZdoidoCdojdojdojdoldokcrjcwOcwPcwQcwRcwScwTcwUcwVcwWcvOcwYcwZcxacxbcxccxdcxecxfcxgcvKcxfcxhcxicxjcxjcxkcvKcxlcxmcxncxocbkcxpcxqcxrcxscxtcxucxtcxvcxwcxxcxycxzcxAcsOcsOcvrcwecpMcpMcxBcpMcpMcxCcxDcxEcxEcxEcxFcxEcyUcpMbikbikbikdbFdbFdbFdbFdbFdbydcedcgdcfdbybGybGyczhcuscoAbikbikbikbikbikbikckPcxOcxPcxOcxQcxRcqUcxScwAcxTczicxTckPcxOcxOcMpckPaabbikcwGcxWcxXcwJcwJcxYcwGczjbxXcvzbzNczMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGbikbikaabaabbikaabaabbikbikaabaabaabaabaabdoidoidohdoidoidoncEBcrjcrjcrjcrjcrjcrjcrjcrjcybcwWcvOcyccydcyecyfcyfcyfcyfcygcyhcyicxjcyjcxjcxjcykcxjcylcymcyncyocxocbkcypcyqcmScxscyscytcyucxscyvcywcyxcyycyzcyAcyBcyCcyDcyEcyEcAaczUcAdcAccAeczTcALceJcAhbGycAMcoAcoAcoAcoAcoAbikbikbikbikdcidchdckdcjdbydclbVibVicuscoAcoAcoAcoAcoAbikbikckPcxOcxOcxOcyZczaczbczcczdcAicAOcAvckPcAVcAYcAWckPbikbikcwGczkcwJczlcwJczmcwGbxXbxXcvzczMbwobikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdoDbikacGbikczoczpczqbikczoczpczqbikczoczpczqbikbikdoidoocfRdopdoidoqcGKdojdojdojdojdojdojdojdojdojcEycvOcztcxjcykczucxjcxjcxjczvcxjcztcztcxjcxjcxjcxjczwczxcymczyctEczzcoacyqcyqczAcxsczBczCczDcxsczEctWczFczGczHczIczJczKbGyczLcdcczLbGycBacAZcBccBccBccBccBPcBNcBNcBNcBNcBNcBQcoAbikbikbikbikdcidchdckdcmcTabGyckObVicusbGybGybGycgmcoAbikbikckPcwAcwAcwAcwAczWcqUczXczYczZcCfcAbckPcCGcCYcCIckPbikbikcwGcAfcAgcDLcwJcDNcwGcEdbxXcvzbwoaabaabaabaabbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGbikczocAkczqbikczocAkczqbikczocAkczqbikaqZdoicfRcfRcfRdoidoidorczsdoidoiczsczsdoidoiczsczscwWcvOcztcAlcxjcAmcAncAocAocyjcxjcztcApcxjcxjcxjcxjcAqcArcAscAtbZNcAucAPcAwcAxcAycxsczBdlYcAAcxscABctWcsOcACcsLcADcAEcAFcAGcAHcAIcAJcAGcAKcAGcAGcAGcoAcoAcoAcoAcoAcoAcoAcoAcEhcoAbikbikbikbikdcicBTdcqcBUdbycgmcFdbVicFmcFlcFlcFnbGycoAbikbikckPcwtcwucwvcAQcARczbcAScATcAUcFrcIScAXcGscIScGtckPbikbikcwGcwGcBbcCrcBdcwGcwGbwobxXcGycyJcyJcyJbwobikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaahbikbikbikaqZaabczocAkczqbikczocAkczqaabczocAkczqbikaabdoidondosdoqdoibikaabbikbikbikbikbikaabbikbikczscwWcvKcBecxjcBfcBgcBhcBicBjcBicBkcBicBlcBmcxfcBncztcztczxcBocBpcBqcBrcBscBtcBucBvcBwcBxcBycBzcBAcBBcBCcBDcBDcBEcBFcBGcBHcBIcBJcBKcBLcBMcrecBOcHucHtcDPcDPcDPcDPcDPcDPcHvcoAcEhclUclUclUclUclUclUcjmbEJcjmcFfclUclUcoAcoAcoAcoAcusbGycoAbikbikckPcxOcBZcxOcCacxRcqUcCbcCccCdcCecqUcqUcCgcqUcChckPbikaabaabcwGcwGcCscwGcwGbikbwobxXcvzcyJcHycHxbwobikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikczocAkczqaabczocAkczqbikczocAkczqaabbikdoidoiczsdoidoibikaabaabbikaabbikaabaabbikbikcybcCicvKcCjcCkcCkcClcvKcvKcvKcvKcvKcvKcvKcvKcvKcvKcvKcvKcvKcCmcCncCmcCocCmcrmcCpcCqcFbcCtcCtcCtcCucCvcBCcCwcCxcCycCzcCAcCBcBIcCCcCDcCEcCFcHzcCHcHAcCJaabcCKcCKcCKcCKcCKcHBcoAcHDcHCcIGcHHcIHctackycjocBWckuckycBXcCPcBYcCRcCQcoAcusbGycoAbikbikckPcxOcxOcxOcAQcCTczbcCUcCVcCWcCXcCZcCZcDacqUcDbckPaabaabbikbikbikcIKbikbikbikbwobxXcvzcyJbxXbxXbwobikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGacGafxaqZbikczocAkczqaabczocAkczqbikczocAkczqaabbikbikbikbikbikbikbikbikbikaabcDccDdcDdcDdcDdcybcDecwWcDfcDgcDhcDhcDicDjcDkcDlcDlcDlcDlcDmdotcDocDncDncDpcDpcDncDqcDrcDscDtcDtctYcDvcDwcDxcDycDzcDzcDAcDBcDCcDDcDEcDFcCAcDGcBIcDHcDIcDJcDKcILcDMcIMcDOcDPcDQcDRcDScDTcCKcHBcoDcEhclUcvscvqcIOcINcxLckxckwdcrclUcCSczVcuqczVcDUcoAcusbGycoAcoAbikckPcwAcwAcwAcwAcEkcqUcCbdlZcEmcCecqUcEncEocEocEpcEqcXYaabbikbikbikbikbikbikbikbwobxXcGybxXbxXcIPbwoaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm
index 7f5a03e58af..41715794c29 100644
--- a/_maps/map_files/cyberiad/z2.dmm
+++ b/_maps/map_files/cyberiad/z2.dmm
@@ -160,7 +160,7 @@
 "dd" = (/obj/structure/rack,/obj/item/weapon/kitchen/knife/ritual,/turf/unsimulated/floor{icon_state = "chapel"},/area/wizard_station)
 "de" = (/obj/structure/table/reinforced,/obj/item/weapon/kitchen/knife/combat,/obj/item/weapon/kitchen/knife/combat,/obj/item/weapon/kitchen/knife/combat,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/engine,/area/shuttle/gamma/space)
 "df" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/syndicate,/obj/item/weapon/shard,/obj/item/weapon/kitchen/knife,/obj/item/weapon/storage/firstaid/tactical,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/admin)
-"dg" = (/obj/structure/table/holotable,/obj/item/clothing/suit/armor/riot/knight/red,/obj/item/clothing/head/helmet/knight/red,/obj/item/weapon/holo/claymore/red,/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_knightarena)
+"dg" = (/obj/structure/table/holotable,/obj/item/clothing/suit/armor/riot/knight/red,/obj/item/clothing/head/helmet/riot/knight/red,/obj/item/weapon/holo/claymore/red,/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_knightarena)
 "dh" = (/obj/structure/table/holotable,/obj/machinery/readybutton{pixel_y = 0},/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_knightarena)
 "di" = (/obj/structure/table/holotable,/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_knightarena)
 "dj" = (/turf/simulated/floor/holofloor,/area/holodeck/source_knightarena)
@@ -181,7 +181,7 @@
 "dy" = (/obj/structure/holowindow{dir = 1},/turf/simulated/floor/holofloor{dir = 4; icon_state = "blue"},/area/holodeck/source_knightarena)
 "dz" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "blue"},/area/holodeck/source_knightarena)
 "dA" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "blue"},/area/holodeck/source_knightarena)
-"dB" = (/obj/structure/table/holotable,/obj/item/clothing/suit/armor/riot/knight/blue,/obj/item/clothing/head/helmet/knight/blue,/obj/item/weapon/holo/claymore/blue,/turf/simulated/floor/holofloor{dir = 2; icon_state = "blue"},/area/holodeck/source_knightarena)
+"dB" = (/obj/structure/table/holotable,/obj/item/clothing/suit/armor/riot/knight/blue,/obj/item/clothing/head/helmet/riot/knight/blue,/obj/item/weapon/holo/claymore/blue,/turf/simulated/floor/holofloor{dir = 2; icon_state = "blue"},/area/holodeck/source_knightarena)
 "dC" = (/obj/structure/table/holotable,/turf/simulated/floor/holofloor{dir = 10; icon_state = "blue"},/area/holodeck/source_knightarena)
 "dD" = (/obj/structure/table/holotable,/obj/machinery/readybutton{pixel_y = 0},/turf/simulated/floor/holofloor{dir = 6; icon_state = "blue"},/area/holodeck/source_knightarena)
 "dE" = (/obj/structure/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/restraints/legcuffs/beartrap,/obj/item/weapon/sleeping_carp_scroll,/obj/item/weapon/twohanded/bostaff,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome/arena_source)
diff --git a/_maps/map_files/cyberiad/z3.dmm b/_maps/map_files/cyberiad/z3.dmm
index 04b1791e6c3..0738ff80065 100644
--- a/_maps/map_files/cyberiad/z3.dmm
+++ b/_maps/map_files/cyberiad/z3.dmm
@@ -2,6 +2,8 @@
 "ab" = (/obj/item/trash/cheesie,/turf/space,/area/space)
 "ac" = (/obj/docking_port/stationary{dir = 8; dwidth = 10; height = 35; id = "whiteship_away"; name = "Deep Space"; width = 21},/turf/space,/area/space)
 "ad" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_z3"; name = "south of telecomms"; width = 18},/turf/space,/area/space)
+"ae" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1381; master_tag = "telecoms_airlock"; name = "interior access button"; pixel_x = -25; pixel_y = -25; req_access_txt = "61"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
+"af" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1381; master_tag = "telecoms_airlock"; name = "exterior access button"; pixel_x = 25; pixel_y = 25; req_access_txt = "61"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless,/area/tcommsat/powercontrol)
 "aT" = (/obj/structure/lattice,/turf/space,/area/space)
 "ba" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/space)
 "bb" = (/turf/simulated/shuttle/wall{tag = "icon-swall14"; icon_state = "swall14"; dir = 2},/area/space)
@@ -289,7 +291,6 @@
 "hq" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1381; id_tag = "telecoms_pump"},/obj/machinery/light/small{dir = 8},/obj/structure/sign/vacuum{pixel_x = 0; pixel_y = 32},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
 "hr" = (/obj/machinery/camera/xray{c_tag = "Telecomms Airlock"; network = list("Telecomms")},/obj/machinery/atmospherics/pipe/manifold/visible{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
 "hs" = (/obj/machinery/door/airlock/external{frequency = 1381; icon_state = "door_locked"; id_tag = "telecoms_inner"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "13"},/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
-"ht" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1381; master_tag = "telecoms_airlock"; name = "interior access button"; pixel_x = -25; pixel_y = -25; req_access_txt = "13"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
 "hu" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
 "hv" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/status_display{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
 "hw" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/camera{c_tag = "Telecomms Foyer"; dir = 2; network = list("Telecomms")},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
@@ -319,7 +320,6 @@
 "hU" = (/turf/simulated/floor/plasteel,/area/tcommsat/entrance)
 "hV" = (/obj/structure/closet/malf/suits,/turf/simulated/floor/plasteel,/area/tcommsat/entrance)
 "hW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/light{dir = 1},/turf/simulated/floor/plating/airless,/area/tcommsat/powercontrol)
-"hX" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1381; master_tag = "telecoms_airlock"; name = "exterior access button"; pixel_x = 25; pixel_y = 25; req_access_txt = "13"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless,/area/tcommsat/powercontrol)
 "hY" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating/airless,/area/tcommsat/powercontrol)
 "hZ" = (/obj/machinery/light{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
 "ia" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4; level = 1},/turf/simulated/floor/plating,/area/tcommsat/powercontrol)
@@ -515,10 +515,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacrcncncpcsctctctctctcpgPhchdhehfhghdhhhdhigPcpctctctctctcscpcncncraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacoclcncncpcpcpcpcpcpcpgPgPgPgPhjhkhlgPgPgPgPcpcpcpcpcpcpcpcncncicmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacoclhmhmhmhmhmhmhmhmhmhmgPgPhnhohpgPcncncncncncncncncncncncicmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacrhmhqhrhshthuhvhwhxhmgPgPhyhzhAgPgPbWcicjcjcjcjcjcjcjcjcmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacrhmhqhrhsaehuhvhwhxhmgPgPhyhzhAgPgPbWcicjcjcjcjcjcjcjcjcmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahBhmhChDhmhEhFhFhFhGhmgPhHhIhJhdhKgPgPcrbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahBhmhLhmhmhMhNhOhNhPhmhQhRhShThUhUhVgPcraTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacdhWhXhYhmhZiaiaiaibicidieifighUhUihgPcraTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacdhWafhYhmhZiaiaiaibicidieifighUhUihgPcraTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiiiichiihmijikhFiliminioiphUhUhUhUhVgPcrbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiiiichiihmhmhmhmhmhmhmgPiqiriririsgPgPcrbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaitceiuceivcjcjcjcjcjclgPgPiwixiygPgPcicmbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/_maps/map_files/cyberiad/z5.dmm b/_maps/map_files/cyberiad/z5.dmm
index d84a5dfbf24..131fe41aea3 100644
--- a/_maps/map_files/cyberiad/z5.dmm
+++ b/_maps/map_files/cyberiad/z5.dmm
@@ -349,8 +349,8 @@
 "gK" = (/obj/machinery/light{dir = 1},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/research_outpost/anomaly)
 "gL" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/research_outpost/anomaly)
 "gM" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/mask/breath,/obj/item/clothing/glasses/science,/obj/item/clothing/gloves/color/latex,/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/research_outpost/anomaly)
-"gN" = (/mob/living/carbon/human/monkey,/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/anomaly)
-"gO" = (/obj/machinery/door/window/westleft{dir = 4; name = "Monkey Pen"; req_access_txt = "47"},/mob/living/carbon/human/monkey,/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/anomaly)
+"gN" = (/obj/machinery/door/window/westleft{dir = 4; name = "Monkey Pen"; req_access_txt = "47"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/anomaly)
+"gO" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/anomaly)
 "gP" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/hallway)
 "gQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{level = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4; level = 1},/obj/machinery/power/apc{dir = 4; name = "Outpost Hallways APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/hallway)
 "gR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4; level = 1},/turf/simulated/wall/r_wall,/area/research_outpost/power)
@@ -379,14 +379,15 @@
 "ho" = (/obj/machinery/door/window/westleft{dir = 8; name = "Locker room"; opacity = 0; req_access_txt = "65"},/turf/simulated/floor/plasteel,/area/research_outpost/anomaly)
 "hp" = (/turf/simulated/floor/plasteel,/area/research_outpost/anomaly)
 "hq" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/mask/breath,/obj/item/clothing/glasses/science,/obj/item/clothing/gloves/color/latex,/obj/machinery/camera{c_tag = "Research Outpost Anomaly Lab Storage"; dir = 8; network = list("Research Outpost")},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/research_outpost/anomaly)
-"hr" = (/obj/machinery/alarm{dir = 4; pixel_x = -25; pixel_y = 0},/mob/living/carbon/human/monkey,/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/anomaly)
-"hs" = (/obj/structure/window/reinforced{dir = 4},/mob/living/carbon/human/monkey,/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/anomaly)
+"hr" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/anomaly)
+"hs" = (/obj/machinery/alarm{dir = 4; pixel_x = -25; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/anomaly)
 "ht" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{level = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/hallway)
 "hu" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8; initialize_directions = 11; level = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/research_outpost/hallway)
 "hv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/turf/simulated/wall/r_wall,/area/research_outpost/power)
 "hw" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/machinery/light/small,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/firealarm{pixel_y = -24},/turf/simulated/floor/plating,/area/research_outpost/power)
 "hx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/power)
 "hy" = (/obj/structure/sign/deathsposal{pixel_x = 32},/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal,/turf/simulated/floor/plating,/area/research_outpost/power)
+"hz" = (/obj/structure/rack,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor/plating,/area/research_outpost/maintstore2)
 "hA" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/research_outpost/power)
 "hB" = (/obj/effect/spawner/window/reinforced,/obj/structure/transit_tube{icon_state = "N-SE"},/obj/machinery/door/firedoor{dir = 2},/turf/simulated/floor/plating,/area/research_outpost/hallway)
 "hC" = (/obj/structure/transit_tube{icon_state = "D-SW"},/turf/simulated/wall/r_wall,/area/research_outpost/hallway)
@@ -770,7 +771,6 @@
 "oQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/iso3)
 "oR" = (/obj/machinery/conveyor{dir = 1; id = "iso3"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/iso3)
 "oS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/iso3)
-"oT" = (/obj/structure/rack,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor/plating,/area/research_outpost/maintstore2)
 "oU" = (/obj/structure/rack,/obj/item/weapon/storage/box/lights/bulbs{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/box/lights/tubes{pixel_x = -5; pixel_y = 5},/obj/item/weapon/storage/box/lights/mixed,/obj/machinery/light/small,/turf/simulated/floor/plating,/area/research_outpost/maintstore2)
 "oV" = (/turf/simulated/mineral/random/low_chance,/area/mine/explored)
 "oW" = (/obj/structure/transit_tube{tag = "icon-D-SE"; icon_state = "D-SE"},/turf/simulated/mineral/random/low_chance,/area/mine/explored)
@@ -1505,8 +1505,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagageOePeQekacacacacbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjcsbjbjbjbjbjbjbjacacacacacacaaaaaQaaaaaaaaaaaaaaaoeReSeSeUeVeWeXeYeZfafbfcfdfefffgfhfhfjfkflfmeHeCfieTfqeHfrafafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagfsftfufvekacacacbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjcsbjbjbjbjbjbjbjbjbjbjbjbjbjacacacacacaaaaaaaaaQaaaaaaaaaaaaaaaofwenfxfyfzfAfBfCfDaLfEfFfGfHfIfJfKfLfMcZfNfOfPfQfQfRfSfTfUfVafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagfWfXfYekfZgaekekekekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjcsbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacacacaaaaaaaaaaaaaQaaaaaaaaaaaaaaaofwenfxfygbgcfBgdgeaLgfggcZghcZcZcZcZgicZgjgkeHglgmgngogpgqgraeaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaggsgtgugvgwgxbPdLgyekgzgAekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacacacaaaaaaaaaaaaaQaaaaaaelaaaaaaaLfwengBfygCfAfBgEgFaLgGgHgIgJgKgLgMcZgNgOgPgQgRgSgTfQgVgpefafafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaggWgXgtgYgZhahbhcgyhdgAgAgzekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacacacaaaaaaaaaaaahehfhfhfadhfhfhffnhihjbahkhlaLaLaLaLaLhmhnhogJhpgLhqcZhrhshthuhvhwhxgUhyhAhBhCaLhDbzaAaAaAaAaAaAaBhEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaggsgtgugvgwgxbPdLgyekgzgAekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacacacaaaaaaaaaaaaaQaaaaaaelaaaaaaaLfwengBfygCfAfBgEgFaLgGgHgIgJgKgLgMcZgOgNgPgQgRgSgTfQgVgpefafafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaggWgXgtgYgZhahbhcgyhdgAgAgzekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacacacaaaaaaaaaaaahehfhfhfadhfhfhffnhihjbahkhlaLaLaLaLaLhmhnhogJhpgLhqcZhshrhthuhvhwhxgUhyhAhBhCaLhDbzaAaAaAaAaAaAaBhEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahFgWgXgWgugufZhGgZekfvhHekgAhIekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacacacaaaaaaaaaaaahJhKhLhNhNhNhOhPhQhRhShThUhVhWhXfohZiaibicidieifigihcZiiijikileHeHimeHeHeHinioipiqirisisitisisisiubhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagiviwguixiygueQizhaiAiBiCekekekekekekbjbjbjbjbjbjbjbjbjbjcsbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacacacacacacacacacacacacacaaaaaaaaaaiDiEhNhNhNhNiFiGiHiIiJiKiLiMhWfpiOiPiQiRiSiTiUiViWiXiYiZiWjajbjcjdjejfjcjgjciWjhjijjjkjljmjnjojpisbxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagjqjrjsguiygAgYjtgZcrekjujvekjwgyjxjyekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacacacacacacacacacacacacacacaaaaaaaaaajzjAhNhNjBhNjCjDjEjFjGjHjIjJhWjKjLjMjNjOjPjQjRjSjTjUjVjWjXjUjYjVjZjUjVkakbkckdkekfkgkhkikjkkkkklisbxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -1516,7 +1516,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaceklGeQdLgYiAlLkmdLkmfudLdLmzgydLeQeQekcrmAeQdLekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacacafafaeaeaeaeaeaeaeaeaeaeafafmBmCmDacaaaaaaaaaaaaagldlXmFmbmHmImJmcljmdmMhWkFkFkFkFkFmgmPkHmQmRmSkKmTmUmVkNmWmXmYkNmZnanbncndndnelCnfaiaAaAngnhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaceklGnieQeQiAeQlafZeQnjfulakpcreQnkfvekkmcrlLdLekbjbjbjbjbjbjbjbjcsbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacafnlaeaeaeaeaeaeaeaeaeaeaenmafnnnoafafaaaaaaaaaaaaagldmenqnrmEnrntmGljljnvhWyuyumKyukFnAnBkHnCnDnEkKnFnGnHkNnInJnKkNnLnMlCnNnOnPnOlCnnnQafagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacaceklGnRgYgweknSeknTfYekhaeknTfYekgZlLekmziCcrjuekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacafnUaeaeaeaenVaeaeaeaeaeaenWnlnXnlafaaaaaaaaaaaaaaagldmNmLmOnZnuobnunphWodhWoeoeoeoekFnsmgkHogohoikKojokolkNomonookNopoqorlClClClCosotafafafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacacacacacekekekekekeknSekougyhajufvgZkogZiCgYeknTovowoxekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacafnmaeaeaeaeaeaeaeaeaeaeaeaeoyozoAaaaaaaaaaaaaaaagagldnwnunxnZnynununzhWoHhWaeaeaeaekFoIoJkHoKoLoMkKoNoOoPkNoQoRoSkNoToUorafoVafoWmCoXafafafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacacacacacekekekekekeknSekougyhajufvgZkogZiCgYeknTovowoxekbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacafnmaeaeaeaeaeaeaeaeaeaeaeaeoyozoAaaaaaaaaaaaaaaagagldnwnunxnZnynununzhWoHhWaeaeaeaekFoIoJkHoKoLoMkKoNoOoPkNoQoRoSkNhzoUorafoVafoWmCoXafafafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacacacacacacbjbjbjbjbjeknSekgyjuoYizdlgYgyekgZfvekoZpapapbekpcbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacafafaeaeaeaeaeaeaeaeaeaeaeaepdpepfaaaaaaaaaaaaagagagldldpgpgldldnZnZldldnYhWaeaeaeaekFkFkFkHkHkHkHkKkKkKkKkNkNkNkNkNororpjlOakakpknQafafafafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacacacacacbjbjbjbjbjbjeknSekjudLiCgygZfviCeknSekekjwcrpaplpmpcpcbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacafafaeaeaeaeaeaeaeaeaeaeaeaepnpoppaaaaaaaaaaagpqprpsptpupvpwpxaeaeaeaeaeqCaeaeaeaeaepBpCpDafafafafafafafafafafafafafafpEpFnQpGafafafafafafafafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacacacacbjbjbjbjbjbjbjbjeknSekekekekekekekekeknSekjwcrjxcrpbpHpcpcbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjbjacafaeaeaeaeaeaeaeaeaeaeaeaeaepIpJpKpLpLpLpLpLpLpMpNpOpPpPpQpRpRaeaeaeaeaeqCaeaeaeaeaepdpopWafafoVoVoVoVoVoVafafafafafpEpFnQpXaepXafafafafafafafafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
index adb9d60ab1f..4db227ab6f6 100644
--- a/code/ATMOSPHERICS/atmospherics.dm
+++ b/code/ATMOSPHERICS/atmospherics.dm
@@ -156,7 +156,7 @@ Pipelines + Other Objects -> Pipe network
 /obj/machinery/atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
 	if(can_unwrench && istype(W, /obj/item/weapon/wrench))
 		var/turf/T = get_turf(src)
-		if (level == 1 && isturf(T) && T.intact)
+		if(level == 1 && isturf(T) && T.intact)
 			to_chat(user, "<span class='danger'>You must remove the plating first.</span>")
 			return 1
 		var/datum/gas_mixture/int_air = return_air()
@@ -168,11 +168,11 @@ Pipelines + Other Objects -> Pipe network
 
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
-		if (internal_pressure > 2*ONE_ATMOSPHERE)
+		if(internal_pressure > 2*ONE_ATMOSPHERE)
 			to_chat(user, "<span class='warning'>As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?</span>")
 			unsafe_wrenching = TRUE //Oh dear oh dear
 
-		if (do_after(user, 40, target = src) && isnull(gcDestroyed))
+		if(do_after(user, 40, target = src) && isnull(gcDestroyed))
 			user.visible_message( \
 				"[user] unfastens \the [src].", \
 				"<span class='notice'>You have unfastened \the [src].</span>", \
@@ -293,7 +293,7 @@ Pipelines + Other Objects -> Pipe network
 			add_underlay_adapter(T, , node_dir, "")
 			add_underlay_adapter(T, node, node_dir, "-supply")
 			add_underlay_adapter(T, , node_dir, "-scrubbers")
-		else if (node.icon_connect_type == "-scrubbers")
+		else if(node.icon_connect_type == "-scrubbers")
 			add_underlay_adapter(T, , node_dir, "")
 			add_underlay_adapter(T, , node_dir, "-supply")
 			add_underlay_adapter(T, node, node_dir, "-scrubbers")
diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
index f24623f9422..8951977d4db 100644
--- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
@@ -49,7 +49,7 @@
 	for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
 		if(target.initialize_directions & get_dir(target,src))
 			var/c = check_connect_types(target,src)
-			if (c)
+			if(c)
 				target.connected_to = c
 				connected_to = c
 				node1 = target
@@ -58,7 +58,7 @@
 	for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect))
 		if(target.initialize_directions & get_dir(target,src))
 			var/c = check_connect_types(target,src)
-			if (c)
+			if(c)
 				target.connected_to = c
 				connected_to = c
 				node2 = target
diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
index aff64bd8a10..06fe22de2ce 100644
--- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -35,7 +35,7 @@
 
 /obj/machinery/atmospherics/binary/dp_vent_pump/New()
 	..()
-	if (!id_tag)
+	if(!id_tag)
 		assign_uid()
 		id_tag = num2text(uid)
 	icon = null
@@ -93,11 +93,11 @@
 		if(T.intact && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
 			return
 		else
-			if (node1)
+			if(node1)
 				add_underlay(T, node1, turn(dir, -180), node1.icon_connect_type)
 			else
 				add_underlay(T, node1, turn(dir, -180))
-			if (node2)
+			if(node2)
 				add_underlay(T, node2, dir, node2.icon_connect_type)
 			else
 				add_underlay(T, node2, dir)
diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
index 3e643565ac6..ae27f829621 100644
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -155,9 +155,9 @@
 	return
 
 /obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
-	if (!istype(W, /obj/item/weapon/wrench))
+	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
-	if (on)
+	if(on)
 		to_chat(user, "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>")
 		return 1
 	return ..()
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index a8d8c453706..6157c87115c 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -182,9 +182,9 @@ Thus, the two variables affect pump operation are set in New():
 		update_icon()
 
 /obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
-	if (!istype(W, /obj/item/weapon/wrench))
+	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
-	if (!(stat & NOPOWER) && on)
+	if(!(stat & NOPOWER) && on)
 		to_chat(user, "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>")
 		return 1
 	return ..()
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm
index 1c0f625e036..b9ab8a4272d 100644
--- a/code/ATMOSPHERICS/components/binary_devices/valve.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm
@@ -52,7 +52,7 @@
 	add_fingerprint(usr)
 	update_icon(1)
 	sleep(10)
-	if (open)
+	if(open)
 		close()
 		return
 	open()
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index 059cb25f080..875f09f6bda 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -173,9 +173,9 @@ Thus, the two variables affect pump operation are set in New():
 		update_icon()
 
 /obj/machinery/atmospherics/binary/volume_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
-	if (!istype(W, /obj/item/weapon/wrench))
+	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
-	if (!(stat & NOPOWER) && on)
+	if(!(stat & NOPOWER) && on)
 		to_chat(user, "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>")
 		return 1
 	return ..()
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/omni_devices/filter.dm b/code/ATMOSPHERICS/components/omni_devices/filter.dm
index 8570f92462a..94efade9b1a 100644
--- a/code/ATMOSPHERICS/components/omni_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/omni_devices/filter.dm
@@ -117,7 +117,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "omni_filter.tmpl", "Omni Filter Control", 330, 330)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/ATMOSPHERICS/components/omni_devices/mixer.dm b/code/ATMOSPHERICS/components/omni_devices/mixer.dm
index 27bf6437c9e..c64703773d3 100644
--- a/code/ATMOSPHERICS/components/omni_devices/mixer.dm
+++ b/code/ATMOSPHERICS/components/omni_devices/mixer.dm
@@ -141,7 +141,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "omni_mixer.tmpl", "Omni Mixer Control", 360, 330)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
index 77fd2328b08..beae30e55db 100644
--- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
@@ -103,7 +103,7 @@
 		for(var/datum/omni_port/P in ports)
 			int_pressure += P.air.return_pressure()
 		var/datum/gas_mixture/env_air = loc.return_air()
-		if ((int_pressure - env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+		if((int_pressure - env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
 			to_chat(user, "<span class='danger'>You cannot unwrench [src], it is too exerted due to internal pressure.</span>")
 			add_fingerprint(user)
 			return 1
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index 698753fa1be..612f51df80a 100755
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -191,7 +191,7 @@ Filter types:
 		onclose(user, "atmo_filter")
 		return
 
-	if (src.temp)
+	if(src.temp)
 		dat = text("<TT>[]</TT><BR><BR><A href='?src=\ref[];temp=1'>Clear Screen</A>", src.temp, src)
 	//else
 	//	src.on != src.on
@@ -207,7 +207,7 @@ Filter types:
 	src.add_fingerprint(usr)
 	if(href_list["filterset"])
 		src.filter_type = text2num(href_list["filterset"])
-	if (href_list["temp"])
+	if(href_list["temp"])
 		src.temp = null
 	if(href_list["set_press"])
 		var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
@@ -218,7 +218,7 @@ Filter types:
 	src.updateUsrDialog()
 /*
 	for(var/mob/M in viewers(1, src))
-		if ((M.client && M.machine == src))
+		if((M.client && M.machine == src))
 			src.attack_hand(M)
 */
 	return
diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
index 2f6845a16c6..cdf11742ad8 100644
--- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
@@ -172,7 +172,7 @@
 		interact(user)
 		return 1
 	if(istype(W, /obj/item/weapon/wrench))
-		if (!(stat & NOPOWER) && on)
+		if(!(stat & NOPOWER) && on)
 			to_chat(user, "<span class='danger'>You cannot unwrench this [src], turn if off first.</span>")
 			return 1
 	return ..()
diff --git a/code/ATMOSPHERICS/components/unary_devices/thermal_plate.dm b/code/ATMOSPHERICS/components/unary_devices/thermal_plate.dm
index 94384f8ca3d..dc7da589017 100644
--- a/code/ATMOSPHERICS/components/unary_devices/thermal_plate.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/thermal_plate.dm
@@ -28,10 +28,10 @@
 	var/transfer_moles = 0.25 * environment.total_moles()
 	var/datum/gas_mixture/external_removed = environment.remove(transfer_moles)
 
-	if (!external_removed)
+	if(!external_removed)
 		return radiate()
 
-	if (external_removed.total_moles() < 10)
+	if(external_removed.total_moles() < 10)
 		return radiate()
 
 	//Get same info from connected gas
@@ -39,7 +39,7 @@
 	var/internal_transfer_moles = 0.25 * air_contents.total_moles()
 	var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles)
 
-	if (!internal_removed)
+	if(!internal_removed)
 		environment.merge(external_removed)
 		return 1
 
@@ -63,7 +63,7 @@
 	var/internal_transfer_moles = 0.25 * air_contents.total_moles()
 	var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles)
 
-	if (!internal_removed)
+	if(!internal_removed)
 		return 1
 
 	var/combined_heat_capacity = internal_removed.heat_capacity() + RADIATION_CAPACITY
diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm
index 3c993e26b0b..e61a62736c3 100644
--- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm
@@ -27,7 +27,7 @@
 	for(var/obj/machinery/atmospherics/target in get_step(src, dir))
 		if(target.initialize_directions & get_dir(target,src))
 			var/c = check_connect_types(target,src)
-			if (c)
+			if(c)
 				target.connected_to = c
 				src.connected_to = c
 				node = target
diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
index 6fe6c646cf5..0a856fb047a 100644
--- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
@@ -63,7 +63,7 @@
 	icon = null
 	initial_loc = get_area(loc)
 	area_uid = initial_loc.uid
-	if (!id_tag)
+	if(!id_tag)
 		assign_uid()
 		id_tag = num2text(uid)
 	..()
@@ -121,7 +121,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/process()
 	if(!..() || (stat & (NOPOWER|BROKEN)))
 		return 0
-	if (!node)
+	if(!node)
 		on = 0
 	//broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0
 	if(!on)
@@ -164,7 +164,7 @@
 				var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
 
 				var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
-				if (isnull(removed)) //in space
+				if(isnull(removed)) //in space
 					return
 
 				air_contents.merge(removed)
@@ -252,7 +252,7 @@
 		on = !on
 
 	if(signal.data["checks"] != null)
-		if (signal.data["checks"] == "default")
+		if(signal.data["checks"] == "default")
 			pressure_checks = pressure_checks_default
 		else
 			pressure_checks = text2num(signal.data["checks"])
@@ -264,7 +264,7 @@
 		pump_direction = text2num(signal.data["direction"])
 
 	if(signal.data["set_internal_pressure"] != null)
-		if (signal.data["set_internal_pressure"] == "default")
+		if(signal.data["set_internal_pressure"] == "default")
 			internal_pressure_bound = internal_pressure_bound_default
 		else
 			internal_pressure_bound = between(
@@ -274,7 +274,7 @@
 			)
 
 	if(signal.data["set_external_pressure"] != null)
-		if (signal.data["set_external_pressure"] == "default")
+		if(signal.data["set_external_pressure"] == "default")
 			external_pressure_bound = external_pressure_bound_default
 		else
 			external_pressure_bound = between(
@@ -320,7 +320,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
-		if (WT.remove_fuel(0,user))
+		if(WT.remove_fuel(0,user))
 			to_chat(user, "<span class='notice'>Now welding the vent.</span>")
 			if(do_after(user, 20, target = src))
 				if(!src || !WT.isOn()) return
@@ -343,12 +343,12 @@
 		if(!welded)
 			if(open)
 				to_chat(user, "<span class='notice'> Now closing the vent.</span>")
-				if (do_after(user, 20, target = src))
+				if(do_after(user, 20, target = src))
 					open = 0
 					user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.")
 			else
 				to_chat(user, "<span class='notice'> Now opening the vent.</span>")
-				if (do_after(user, 20, target = src))
+				if(do_after(user, 20, target = src))
 					open = 1
 					user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.")
 		return
@@ -365,8 +365,8 @@
 	if(istype(W, /obj/item/device/multitool))
 		update_multitool_menu(user)
 		return 1
-	if (istype(W, /obj/item/weapon/wrench))
-		if (!(stat & NOPOWER) && on)
+	if(istype(W, /obj/item/weapon/wrench))
+		if(!(stat & NOPOWER) && on)
 			to_chat(user, "<span class='danger'>You cannot unwrench this [src], turn it off first.</span>")
 			return 1
 
diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
index d0b0c9eb693..a7829d9fc1c 100644
--- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
@@ -44,7 +44,7 @@
 	icon = null
 	initial_loc = get_area(loc)
 	area_uid = initial_loc.uid
-	if (!id_tag)
+	if(!id_tag)
 		assign_uid()
 		id_tag = num2text(uid)
 	..()
@@ -63,26 +63,26 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/auto_use_power()
 	if(!powered(power_channel))
 		return 0
-	if (!on || welded)
+	if(!on || welded)
 		return 0
 	if(stat & (NOPOWER|BROKEN))
 		return 0
 
 	var/amount = idle_power_usage
 
-	if (scrubbing)
-		if (scrub_CO2)
+	if(scrubbing)
+		if(scrub_CO2)
 			amount += idle_power_usage
-		if (scrub_Toxins)
+		if(scrub_Toxins)
 			amount += idle_power_usage
-		if (scrub_N2)
+		if(scrub_N2)
 			amount += idle_power_usage
-		if (scrub_N2O)
+		if(scrub_N2O)
 			amount += idle_power_usage
 	else
 		amount = active_power_usage
 
-	if (widenet)
+	if(widenet)
 		amount += amount*(adjacent_turfs.len*(adjacent_turfs.len/2))
 	use_power(amount, power_channel)
 	return 1
@@ -178,13 +178,13 @@
 	if(!..())
 		return 0
 
-	if (widenet)
+	if(widenet)
 		check_turfs()
 
 	if(stat & (NOPOWER|BROKEN))
 		return
 
-	if (!node)
+	if(!node)
 		on = 0
 
 	if(welded)
@@ -194,8 +194,8 @@
 		return 0
 
 	scrub(loc)
-	if (widenet)
-		for (var/turf/simulated/tile in adjacent_turfs)
+	if(widenet)
+		for(var/turf/simulated/tile in adjacent_turfs)
 			scrub(tile)
 
 //we populate a list of turfs with nonatmos-blocked cardinal turfs AND
@@ -203,11 +203,11 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/proc/check_turfs()
 	adjacent_turfs.Cut()
 	var/turf/T = loc
-	if (istype(T))
+	if(istype(T))
 		adjacent_turfs = T.GetAtmosAdjacentTurfs(alldir=1)
 
 /obj/machinery/atmospherics/unary/vent_scrubber/proc/scrub(var/turf/simulated/tile)
-	if (!tile || !istype(tile))
+	if(!tile || !istype(tile))
 		return 0
 
 	var/datum/gas_mixture/environment = tile.return_air()
@@ -218,7 +218,7 @@
 
 			//Take a gas sample
 			var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
-			if (isnull(removed)) //in space
+			if(isnull(removed)) //in space
 				return
 
 			//Filter it
@@ -253,7 +253,7 @@
 			tile.air_update_turf()
 
 	else //Just siphoning all air
-		if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
+		if(air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
 			return
 
 		var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
@@ -372,7 +372,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
-		if (WT.remove_fuel(0,user))
+		if(WT.remove_fuel(0,user))
 			to_chat(user, "<span class='notice'>Now welding the scrubber.</span>")
 			if(do_after(user, 20, target = src))
 				if(!src || !WT.isOn()) return
@@ -394,8 +394,8 @@
 	if(istype(W, /obj/item/device/multitool))
 		update_multitool_menu(user)
 		return 1
-	if (istype(W, /obj/item/weapon/wrench))
-		if (!(stat & NOPOWER) && on)
+	if(istype(W, /obj/item/weapon/wrench))
+		if(!(stat & NOPOWER) && on)
 			to_chat(user, "<span class='danger'>You cannot unwrench this [src], turn it off first.</span>")
 			return 1
 
diff --git a/code/ATMOSPHERICS/pipes/cap.dm b/code/ATMOSPHERICS/pipes/cap.dm
index f20d71c2828..0504062eb09 100644
--- a/code/ATMOSPHERICS/pipes/cap.dm
+++ b/code/ATMOSPHERICS/pipes/cap.dm
@@ -67,7 +67,7 @@
 	for(var/obj/machinery/atmospherics/target in get_step(src, dir))
 		if(target.initialize_directions & get_dir(target,src))
 			var/c = check_connect_types(target,src)
-			if (c)
+			if(c)
 				target.connected_to = c
 				src.connected_to = c
 				node = target
diff --git a/code/ATMOSPHERICS/pipes/manifold.dm b/code/ATMOSPHERICS/pipes/manifold.dm
index 8ba5db9fbd5..4b37036f96a 100644
--- a/code/ATMOSPHERICS/pipes/manifold.dm
+++ b/code/ATMOSPHERICS/pipes/manifold.dm
@@ -124,8 +124,8 @@
 	if(!node1 && !node2 && !node3)
 		var/turf/T = get_turf(src)
 		new /obj/item/pipe(loc, make_from=src)
-		for (var/obj/machinery/meter/meter in T)
-			if (meter.target == src)
+		for(var/obj/machinery/meter/meter in T)
+			if(meter.target == src)
 				new /obj/item/pipe_meter(T)
 				qdel(meter)
 		qdel(src)
diff --git a/code/ATMOSPHERICS/pipes/manifold4w.dm b/code/ATMOSPHERICS/pipes/manifold4w.dm
index 5975ffce26b..b6cd15bc211 100644
--- a/code/ATMOSPHERICS/pipes/manifold4w.dm
+++ b/code/ATMOSPHERICS/pipes/manifold4w.dm
@@ -97,8 +97,8 @@
 	if(!node1 && !node2 && !node3 && !node4)
 		var/turf/T = get_turf(src)
 		new /obj/item/pipe(loc, make_from=src)
-		for (var/obj/machinery/meter/meter in T)
-			if (meter.target == src)
+		for(var/obj/machinery/meter/meter in T)
+			if(meter.target == src)
 				new /obj/item/pipe_meter(T)
 				qdel(meter)
 		qdel(src)
diff --git a/code/ATMOSPHERICS/pipes/simple/pipe_simple.dm b/code/ATMOSPHERICS/pipes/simple/pipe_simple.dm
index fbd5f85b6c5..5db391d4dd0 100644
--- a/code/ATMOSPHERICS/pipes/simple/pipe_simple.dm
+++ b/code/ATMOSPHERICS/pipes/simple/pipe_simple.dm
@@ -144,8 +144,8 @@
 	if(!node1 && !node2)
 		var/turf/T = get_turf(src)
 		new /obj/item/pipe(loc, make_from=src)
-		for (var/obj/machinery/meter/meter in T)
-			if (meter.target == src)
+		for(var/obj/machinery/meter/meter in T)
+			if(meter.target == src)
 				new /obj/item/pipe_meter(T)
 				qdel(meter)
 		qdel(src)
diff --git a/code/ATMOSPHERICS/pipes/simple/pipe_simple_he.dm b/code/ATMOSPHERICS/pipes/simple/pipe_simple_he.dm
index 5cde784c8ce..a771bdd6234 100644
--- a/code/ATMOSPHERICS/pipes/simple/pipe_simple_he.dm
+++ b/code/ATMOSPHERICS/pipes/simple/pipe_simple_he.dm
@@ -96,17 +96,17 @@
 
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/New()
 	.. ()
-	switch (dir)
-		if (SOUTH)
+	switch(dir)
+		if(SOUTH)
 			initialize_directions = NORTH
 			initialize_directions_he = SOUTH
-		if (NORTH)
+		if(NORTH)
 			initialize_directions = SOUTH
 			initialize_directions_he = NORTH
-		if (EAST)
+		if(EAST)
 			initialize_directions = WEST
 			initialize_directions_he = EAST
-		if (WEST)
+		if(WEST)
 			initialize_directions = EAST
 			initialize_directions_he = WEST
 
diff --git a/code/ATMOSPHERICS/pipes/simple/pipe_simple_hidden.dm b/code/ATMOSPHERICS/pipes/simple/pipe_simple_hidden.dm
index 7cf983e0e32..db62f8e51fe 100644
--- a/code/ATMOSPHERICS/pipes/simple/pipe_simple_hidden.dm
+++ b/code/ATMOSPHERICS/pipes/simple/pipe_simple_hidden.dm
@@ -37,14 +37,14 @@
 	overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "universal")
 	underlays.Cut()
 
-	if (node1)
+	if(node1)
 		universal_underlays(node1)
 		if(node2)
 			universal_underlays(node2)
 		else
 			var/node2_dir = turn(get_dir(src,node1),-180)
 			universal_underlays(,node2_dir)
-	else if (node2)
+	else if(node2)
 		universal_underlays(node2)
 		var/node1_dir = turn(get_dir(src,node2),-180)
 		universal_underlays(,node1_dir)
diff --git a/code/ATMOSPHERICS/pipes/simple/pipe_simple_visible.dm b/code/ATMOSPHERICS/pipes/simple/pipe_simple_visible.dm
index a93351b29c7..1fcb45e7959 100644
--- a/code/ATMOSPHERICS/pipes/simple/pipe_simple_visible.dm
+++ b/code/ATMOSPHERICS/pipes/simple/pipe_simple_visible.dm
@@ -48,14 +48,14 @@
 	overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "universal")
 	underlays.Cut()
 
-	if (node1)
+	if(node1)
 		universal_underlays(node1)
 		if(node2)
 			universal_underlays(node2)
 		else
 			var/node1_dir = get_dir(node1,src)
 			universal_underlays(,node1_dir)
-	else if (node2)
+	else if(node2)
 		universal_underlays(node2)
 	else
 		universal_underlays(,dir)
diff --git a/code/LINDA/LINDA_fire.dm b/code/LINDA/LINDA_fire.dm
index afbeb0a0e45..14f8ab20998 100644
--- a/code/LINDA/LINDA_fire.dm
+++ b/code/LINDA/LINDA_fire.dm
@@ -165,7 +165,7 @@
 		var/turf/simulated/T = loc
 		if(T.to_be_destroyed)
 			var/chance_of_deletion
-			if (T.heat_capacity) //beware of division by zero
+			if(T.heat_capacity) //beware of division by zero
 				chance_of_deletion = T.max_fire_temperature_sustained / T.heat_capacity * 8 //there is no problem with prob(23456), min() was redundant --rastaf0
 			else
 				chance_of_deletion = 100
diff --git a/code/LINDA/LINDA_system.dm b/code/LINDA/LINDA_system.dm
index 2584192e7b4..423356c4e8e 100644
--- a/code/LINDA/LINDA_system.dm
+++ b/code/LINDA/LINDA_system.dm
@@ -83,35 +83,35 @@ turf/CanPass(atom/movable/mover, turf/target, height=1.5,air_group=0)
 //alldir includes adjacent diagonal tiles that can share
 //	air with both of the related adjacent cardinal tiles
 /turf/proc/GetAtmosAdjacentTurfs(alldir = 0)
-	if (!istype(src, /turf/simulated))
+	if(!istype(src, /turf/simulated))
 		return list()
 
 	var/adjacent_turfs = list()
 
 	var/turf/simulated/curloc = src
-	for (var/direction in cardinal)
+	for(var/direction in cardinal)
 		if(!(curloc.atmos_adjacent_turfs & direction))
 			continue
 
 		var/turf/simulated/S = get_step(curloc, direction)
-		if (istype(S))
+		if(istype(S))
 			adjacent_turfs += S
-	if (!alldir)
+	if(!alldir)
 		return adjacent_turfs
 
-	for (var/direction in diagonals)
+	for(var/direction in diagonals)
 		var/matchingDirections = 0
 		var/turf/simulated/S = get_step(curloc, direction)
 
-		for (var/checkDirection in cardinal)
+		for(var/checkDirection in cardinal)
 			if(!(S.atmos_adjacent_turfs & checkDirection))
 				continue
 			var/turf/simulated/checkTurf = get_step(S, checkDirection)
 
-			if (checkTurf in adjacent_turfs)
+			if(checkTurf in adjacent_turfs)
 				matchingDirections++
 
-			if (matchingDirections >= 2)
+			if(matchingDirections >= 2)
 				adjacent_turfs += S
 				break
 
diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm
index 3aeacb942a7..b292e7664b2 100644
--- a/code/LINDA/LINDA_turf_tile.dm
+++ b/code/LINDA/LINDA_turf_tile.dm
@@ -246,14 +246,14 @@
 		overlays -= icemaster
 
 	var/new_overlay_type = tile_graphic()
-	if (new_overlay_type == atmos_overlay_type)
+	if(new_overlay_type == atmos_overlay_type)
 		return
 	var/atmos_overlay = get_atmos_overlay_by_name(atmos_overlay_type)
-	if (atmos_overlay)
+	if(atmos_overlay)
 		overlays -= atmos_overlay
 
 	atmos_overlay = get_atmos_overlay_by_name(new_overlay_type)
-	if (atmos_overlay)
+	if(atmos_overlay)
 		overlays += atmos_overlay
 		atmos_overlay_type = new_overlay_type
 
diff --git a/code/__DEFINES/clothing.dm b/code/__DEFINES/clothing.dm
index 83a6ac5b20a..ec9ad2f2128 100644
--- a/code/__DEFINES/clothing.dm
+++ b/code/__DEFINES/clothing.dm
@@ -78,3 +78,5 @@
 
 #define BLOCKHEADHAIR 			4		// temporarily removes the user's hair overlay. Leaves facial hair.
 #define BLOCKHAIR				32768	// temporarily removes the user's hair, facial and otherwise.
+
+#define ONESIZEFITSALL 			1		// determines if something can be worn by a fatty or not.
diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index ca293307099..a05575f575d 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -54,6 +54,13 @@
 #define AI_IDLE		2
 #define AI_OFF		3
 
+//Attack types for checking shields/hit reactions
+
+#define MELEE_ATTACK 1
+#define UNARMED_ATTACK 2
+#define PROJECTILE_ATTACK 3
+#define THROWN_PROJECTILE_ATTACK 4
+
 //Gun Stuff
  #define SAWN_INTACT  0
  #define SAWN_OFF     1
diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
index 915cb8816e8..0562d7086ab 100644
--- a/code/__DEFINES/flags.dm
+++ b/code/__DEFINES/flags.dm
@@ -4,13 +4,9 @@
 #define NOBLUDGEON  			4		// when an item has this it produces no "X has been hit by Y with Z" message with the default handler
 #define AIRTIGHT				8		// mask allows internals
 #define HANDSLOW        		16		// If an item has this flag, it will slow you to carry it
-#define NOSHIELD				32		// weapon not affected by shield
-#define CONDUCT					64		// conducts electricity (metal etc.)
-#define ABSTRACT				128		// for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
-#define ON_BORDER				512		// item has priority to check when entering or leaving
-#define NODELAY 				32768	// 1 second attackby delay skipped (Can be used once every 0.2s). Most objects have a 1s attackby delay, which doesn't require a flag.
-
-#define NOBLOODY				2048	// used to items if they don't want to get a blood overlay
+#define CONDUCT					32		// conducts electricity (metal etc.)
+#define ABSTRACT				64		// for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
+#define ON_BORDER				128		// item has priority to check when entering or leaving
 
 #define GLASSESCOVERSEYES		1024
 #define MASKCOVERSEYES			1024	// get rid of some of the other retardation in these flags
@@ -21,14 +17,13 @@
 #define HEADBANGPROTECT			4096
 #define EARBANGPROTECT			1024
 
-#define THICKMATERIAL 	1024			//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with NOSLIP)
 #define NOSLIP					1024 	//prevents from slipping on wet floors, in space etc
 
 #define OPENCONTAINER			4096	// is an open container for chemistry purposes
 
-#define BLOCK_GAS_SMOKE_EFFECT	8192	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL)
-#define ONESIZEFITSALL 			8192
-#define PLASMAGUARD 			16384	//Does not get contaminated by plasma.
+#define BLOCK_GAS_SMOKE_EFFECT	8192	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
+#define THICKMATERIAL 			8192	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with BLOCK_GAS_SMOKE_EFFECT)
+
 
 #define	NOREACT					16384 	//Reagents dont' react inside this container.
 
diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm
index 482a25baf1b..fc874959cff 100644
--- a/code/__DEFINES/genetics.dm
+++ b/code/__DEFINES/genetics.dm
@@ -122,3 +122,12 @@
 #define NUTRITION_LEVEL_FED 350
 #define NUTRITION_LEVEL_HUNGRY 250
 #define NUTRITION_LEVEL_STARVING 150
+<<<<<<< HEAD
+=======
+
+//Used for calculations for negative effects of having genetics powers
+#define DEFAULT_GENE_STABILITY 100
+#define GENE_INSTABILITY_MINOR 5
+#define GENE_INSTABILITY_MODERATE 10
+#define GENE_INSTABILITY_MAJOR 15
+>>>>>>> 26e13f270f62f6104106ed087a318469ad4d9d02
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index d36405db5d1..5a6d0d0d595 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -66,6 +66,7 @@
 #define COLOR_YELLOW 	"#FFFF00"
 #define COLOR_ORANGE 	"#FF9900"
 #define COLOR_WHITE 	"#FFFFFF"
+#define COLOR_GRAY      "#808080"
 
 //some arbitrary defines to be used by self-pruning global lists. (see master_controller)
 #define PROCESS_KILL 26	//Used to trigger removal from a processing list
@@ -156,6 +157,8 @@
 	for(type in view(range, dview_mob))
 #define END_FOR_DVIEW dview_mob.loc = null
 
+#define get_turf(A) (get_step(A, 0))
+
 #define MIN_SUPPLIED_LAW_NUMBER 15
 #define MAX_SUPPLIED_LAW_NUMBER 50
 
@@ -255,3 +258,6 @@
 #define TRIGGER_GUARD_ALLOW_ALL -1
 #define TRIGGER_GUARD_NONE 0
 #define TRIGGER_GUARD_NORMAL 1
+
+// Macro to get the current elapsed round time, rather than total world runtime
+#define ROUND_TIME (round_start_time ? (world.time - round_start_time) : 0)
diff --git a/code/__DEFINES/tick.dm b/code/__DEFINES/tick.dm
index 0469a81a392..71a63af6289 100644
--- a/code/__DEFINES/tick.dm
+++ b/code/__DEFINES/tick.dm
@@ -2,4 +2,4 @@
 #define TICK_LIMIT_TO_RUN 85
 
 #define TICK_CHECK ( world.tick_usage > TICK_LIMIT_RUNNING ? stoplag() : 0 )
-#define CHECK_TICK if (world.tick_usage > TICK_LIMIT_RUNNING)  stoplag()
\ No newline at end of file
+#define CHECK_TICK if(world.tick_usage > TICK_LIMIT_RUNNING)  stoplag()
\ No newline at end of file
diff --git a/code/__HELPERS/AnimationLibrary.dm b/code/__HELPERS/AnimationLibrary.dm
index 65225d37363..fcabe2e0a78 100644
--- a/code/__HELPERS/AnimationLibrary.dm
+++ b/code/__HELPERS/AnimationLibrary.dm
@@ -64,7 +64,7 @@
 		return
 	var/matrix/M = matrix()
 	var/do_loops = 15
-	while (do_loops > 0)
+	while(do_loops > 0)
 		do_loops--
 		animate(A, transform = M, pixel_z = A.pixel_z + 12, alpha = A.alpha - 17, time = 1, loop = 1, easing = LINEAR_EASING)
 		M.Scale(1.2,1.2)
diff --git a/code/__HELPERS/experimental.dm b/code/__HELPERS/experimental.dm
index 27daccfc58c..533f67b68d9 100644
--- a/code/__HELPERS/experimental.dm
+++ b/code/__HELPERS/experimental.dm
@@ -16,18 +16,18 @@
  * -2, parameter A is not a string
  */
 /proc/strpos(const/A, const/B)
-	if (istext(A) == 0 || length(A) < 1)
+	if(istext(A) == 0 || length(A) < 1)
 		return -2
 
-	if (istext(B) == 0 || length(B) > 1)
+	if(istext(B) == 0 || length(B) > 1)
 		return -1
 
 	var/i = findtext(A, B)
 
-	if (0 == i)
+	if(0 == i)
 		return 0
 
-	while (i)
+	while(i)
 		. = i
 		i = findtext(A, B, i + 1)
 
@@ -35,8 +35,8 @@
 	var/prototype = Object.type
 	Object = null
 
-	for (var/type in params2list(types))
-		if (ispath(prototype, text2path(type)))
+	for(var/type in params2list(types))
+		if(ispath(prototype, text2path(type)))
 			return 1
 
 	return 0
@@ -45,7 +45,7 @@
 /obj/machinery/proc/getArea()
 	var/area/A = loc.loc
 
-	if (A != myArea)
+	if(A != myArea)
 		myArea = A
 
 	. = myArea
\ No newline at end of file
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 47cee347876..f1498862540 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -10,7 +10,7 @@
 /proc/get_area_master(const/O)
 	var/area/A = get_area(O)
 
-	if (isarea(A))
+	if(isarea(A))
 		return A
 
 /proc/get_area(atom/A)
@@ -194,7 +194,7 @@
 				var/datum/robot_component/CO = borg.get_component("radio")
 				if(!CO)
 					continue //No radio component (Shouldn't happen)
-				if(!borg.is_component_functioning("radio") || !borg.use_power(CO.energy_consumption))
+				if(!borg.is_component_functioning("radio"))
 					continue //No power.
 
 			var/turf/speaker = get_turf(R)
@@ -440,7 +440,7 @@ proc/pollCandidates(var/Question, var/be_special_type, var/antag_age_check = 0,
 	var/roletext = be_special_type ? get_roletext(be_special_type) : null
 	var/list/mob/dead/observer/candidates = list()
 	var/time_passed = world.time
-	if (!Question)
+	if(!Question)
 		Question = "Would you like to be a special role?"
 
 	for(var/mob/dead/observer/G in player_list)
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index a8c548bdd7a..8a44c1b7cab 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -29,7 +29,7 @@
 	init_datum_subtypes(/datum/nations, all_nations, null, "default_name")
 	init_datum_subtypes(/datum/language, all_languages, null, "name")
 
-	for (var/language_name in all_languages)
+	for(var/language_name in all_languages)
 		var/datum/language/L = all_languages[language_name]
 		if(!(L.flags & NONGLOBAL))
 			language_keys[":[lowertext(L.key)]"] = L
@@ -46,21 +46,13 @@
 		if(S.flags & IS_WHITELISTED)
 			whitelisted_species += S.name
 
-	paths = subtypesof(/datum/emote)
-	for(var/T in paths)
-		var/datum/emote/E = new T
-		if(istype(T, /datum/emote/custom))
-			continue
-		emotes += E
-
-
 	init_subtypes(/datum/table_recipe, table_recipes)
 	return 1
 
 /* // Uncomment to debug chemical reaction list.
 /client/verb/debug_chemical_list()
 
-	for (var/reaction in chemical_reactions_list)
+	for(var/reaction in chemical_reactions_list)
 		. += "chemical_reactions_list\[\"[reaction]\"\] = \"[chemical_reactions_list[reaction]]\"\n"
 		if(islist(chemical_reactions_list[reaction]))
 			var/list/L = chemical_reactions_list[reaction]
diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 6376ebb4215..5b51ad21187 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -747,7 +747,7 @@ The _flatIcons list is a cache for generated icon files.
 			add = icon(I:icon, I:icon_state, I:dir)
 			// This checks for a silent failure mode of the icon routine. If the requested dir
 			// doesn't exist in this icon state it returns a 32x32 icon with 0 alpha.
-			if (I:dir != SOUTH && add.Width() == 32 && add.Height() == 32)
+			if(I:dir != SOUTH && add.Width() == 32 && add.Height() == 32)
 				// Check every pixel for blank (computationally expensive, but the process is limited
 				// by the amount of film on the station, only happens when we hit something that's
 				// turned, and bails at the very first pixel it sees.
@@ -760,7 +760,7 @@ The _flatIcons list is a cache for generated icon files.
 					if(!blankpixel)
 						break
 				// If we ALWAYS returned a null (which happens when GetPixel encounters something with alpha 0)
-				if (blankpixel)
+				if(blankpixel)
 					// Pull the default direction.
 					add = icon(I:icon, I:icon_state)
 		else // 'I' is an appearance object.
@@ -830,8 +830,8 @@ The _flatIcons list is a cache for generated icon files.
 	return composite
 
 proc/adjust_brightness(var/color, var/value)
-	if (!color) return "#FFFFFF"
-	if (!value) return color
+	if(!color) return "#FFFFFF"
+	if(!value) return color
 
 	var/list/RGB = ReadRGB(color)
 	RGB[1] = Clamp(RGB[1]+value,0,255)
@@ -844,7 +844,7 @@ proc/sort_atoms_by_layer(var/list/atoms)
 	var/list/result = atoms.Copy()
 	var/gap = result.len
 	var/swapped = 1
-	while (gap > 1 || swapped)
+	while(gap > 1 || swapped)
 		swapped = 0
 		if(gap > 1)
 			gap = round(gap / 1.3) // 1.3 is the emperic comb sort coefficient
diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm
index 948602def06..e749dab5fa8 100644
--- a/code/__HELPERS/lists.dm
+++ b/code/__HELPERS/lists.dm
@@ -12,17 +12,17 @@
 //Returns a list in plain english as a string
 /proc/english_list(var/list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" )
 	var/total = input.len
-	if (!total)
+	if(!total)
 		return "[nothing_text]"
-	else if (total == 1)
+	else if(total == 1)
 		return "[input[1]]"
-	else if (total == 2)
+	else if(total == 2)
 		return "[input[1]][and_text][input[2]]"
 	else
 		var/output = ""
 		var/index = 1
-		while (index < total)
-			if (index == total - 1)
+		while(index < total)
+			if(index == total - 1)
 				comma_text = final_comma_text
 
 			output += "[input[index]][comma_text]"
@@ -107,22 +107,22 @@
 /proc/pickweight(list/L)
 	var/total = 0
 	var/item
-	for (item in L)
-		if (!L[item])
+	for(item in L)
+		if(!L[item])
 			L[item] = 1
 		total += L[item]
 
 	total = rand(1, total)
-	for (item in L)
+	for(item in L)
 		total -=L [item]
-		if (total <= 0)
+		if(total <= 0)
 			return item
 
 	return null
 
 //Pick a random element from the list and remove it from the list.
 /proc/pick_n_take(list/listfrom)
-	if (listfrom.len > 0)
+	if(listfrom.len > 0)
 		var/picked = pick(listfrom)
 		listfrom -= picked
 		return picked
@@ -130,7 +130,7 @@
 
 //Returns the top(last) element from the list and removes it from the list (typical stack function)
 /proc/pop(list/listfrom)
-	if (listfrom.len > 0)
+	if(listfrom.len > 0)
 		var/picked = listfrom[listfrom.len]
 		listfrom.len--
 		return picked
@@ -459,22 +459,22 @@ proc/dd_sortedObjectList(list/incoming)
 	var/list/list_bottom
 
 	var/current_sort_object
-	for (current_sort_object in incoming)
+	for(current_sort_object in incoming)
 		low_index = 1
 		high_index = sorted_list.len
-		while (low_index <= high_index)
+		while(low_index <= high_index)
 			// Figure out the midpoint, rounding up for fractions.  (BYOND rounds down, so add 1 if necessary.)
 			midway_calc = (low_index + high_index) / 2
 			current_index = round(midway_calc)
-			if (midway_calc > current_index)
+			if(midway_calc > current_index)
 				current_index++
 			current_item = sorted_list[current_index]
 
 			current_item_value = current_item:dd_SortValue()
 			current_sort_object_value = current_sort_object:dd_SortValue()
-			if (current_sort_object_value < current_item_value)
+			if(current_sort_object_value < current_item_value)
 				high_index = current_index - 1
-			else if (current_sort_object_value > current_item_value)
+			else if(current_sort_object_value > current_item_value)
 				low_index = current_index + 1
 			else
 				// current_sort_object == current_item
@@ -485,7 +485,7 @@ proc/dd_sortedObjectList(list/incoming)
 		insert_index = low_index
 
 		// Special case adding to end of list.
-		if (insert_index > sorted_list.len)
+		if(insert_index > sorted_list.len)
 			sorted_list += current_sort_object
 			continue
 
@@ -515,28 +515,28 @@ proc/dd_sortedObjectList(list/incoming)
 	var/sort_result
 
 	var/current_sort_text
-	for (current_sort_text in incoming)
+	for(current_sort_text in incoming)
 		low_index = 1
 		high_index = sorted_text.len
-		while (low_index <= high_index)
+		while(low_index <= high_index)
 			// Figure out the midpoint, rounding up for fractions.  (BYOND rounds down, so add 1 if necessary.)
 			midway_calc = (low_index + high_index) / 2
 			current_index = round(midway_calc)
-			if (midway_calc > current_index)
+			if(midway_calc > current_index)
 				current_index++
 			current_item = sorted_text[current_index]
 
-			if (case_sensitive)
+			if(case_sensitive)
 				sort_result = sorttextEx(current_sort_text, current_item)
 			else
 				sort_result = sorttext(current_sort_text, current_item)
 
 			switch(sort_result)
-				if (1)
+				if(1)
 					high_index = current_index - 1	// current_sort_text < current_item
-				if (-1)
+				if(-1)
 					low_index = current_index + 1	// current_sort_text > current_item
-				if (0)
+				if(0)
 					low_index = current_index		// current_sort_text == current_item
 					break
 
@@ -544,7 +544,7 @@ proc/dd_sortedObjectList(list/incoming)
 		insert_index = low_index
 
 		// Special case adding to end of list.
-		if (insert_index > sorted_text.len)
+		if(insert_index > sorted_text.len)
 			sorted_text += current_sort_text
 			continue
 
diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm
index 5d2427603c7..b2d81f9060d 100644
--- a/code/__HELPERS/logging.dm
+++ b/code/__HELPERS/logging.dm
@@ -21,12 +21,12 @@
 
 /proc/log_admin(text)
 	admin_log.Add(text)
-	if (config.log_admin)
+	if(config.log_admin)
 		diary << "\[[time_stamp()]]ADMIN: [text]"
 
 
 /proc/log_debug(text)
-	if (config.log_debug)
+	if(config.log_debug)
 		diary << "\[[time_stamp()]]DEBUG: [text]"
 
 	for(var/client/C in admins)
@@ -35,55 +35,55 @@
 
 
 /proc/log_game(text)
-	if (config.log_game)
+	if(config.log_game)
 		diary << "\[[time_stamp()]]GAME: [text]"
 
 /proc/log_vote(text)
-	if (config.log_vote)
+	if(config.log_vote)
 		diary << "\[[time_stamp()]]VOTE: [text]"
 
 /proc/log_access(text)
-	if (config.log_access)
+	if(config.log_access)
 		diary << "\[[time_stamp()]]ACCESS: [text]"
 
 /proc/log_say(text)
-	if (config.log_say)
+	if(config.log_say)
 		diary << "\[[time_stamp()]]SAY: [text]"
 
 /proc/log_ooc(text)
-	if (config.log_ooc)
+	if(config.log_ooc)
 		diary << "\[[time_stamp()]]OOC: [text]"
 
 /proc/log_whisper(text)
-	if (config.log_whisper)
+	if(config.log_whisper)
 		diary << "\[[time_stamp()]]WHISPER: [text]"
 
 /proc/log_emote(text)
-	if (config.log_emote)
+	if(config.log_emote)
 		diary << "\[[time_stamp()]]EMOTE: [text]"
 
 /proc/log_attack(text)
-	if (config.log_attack)
+	if(config.log_attack)
 		diary << "\[[time_stamp()]]ATTACK: [text]" //Seperate attack logs? Why?
 
 /proc/log_adminsay(text)
-	if (config.log_adminchat)
+	if(config.log_adminchat)
 		diary << "\[[time_stamp()]]ADMINSAY: [text]"
 
 /proc/log_adminwarn(text)
-	if (config.log_adminwarn)
+	if(config.log_adminwarn)
 		diary << "\[[time_stamp()]]ADMINWARN: [text]"
 
 /proc/log_pda(text)
-	if (config.log_pda)
+	if(config.log_pda)
 		diary << "\[[time_stamp()]]PDA: [text][log_end]"
 
 /proc/log_misc(text)
 	diary << "\[[time_stamp()]]MISC: [text][log_end]"
 
 /proc/log_to_dd(text)
-	world.log << text //this comes before the config check because it can't possibly runtime
-	if(config.log_world_output)
+	world.log << text
+	if(config && config.log_world_output)
 		diary << "\[[time_stamp()]]DD_OUTPUT: [text][log_end]"
 
 /**
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 9657f867b5a..4bc41808b96 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -116,7 +116,7 @@ proc/random_skin_tone(species = "Human")
 
 proc/skintone2racedescription(tone, species = "Human")
 	if(species == "Human")
-		switch (tone)
+		switch(tone)
 			if(30 to INFINITY)		return "albino"
 			if(20 to 30)			return "pale"
 			if(5 to 15)				return "light skinned"
@@ -171,7 +171,7 @@ proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=nul
 		target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [what_done] by [key_name(user)][object ? " with [object]" : " "][addition]</font>")
 	if(admin)
 		log_attack("<font color='red'>[key_name(user)] [what_done] [key_name(target)][object ? " with [object]" : " "][addition]</font>")
-	if(target.client)
+	if(istype(target) && target.client)
 		if(what_done in ignore) return
 		if(target == user)return
 		if(!admin) return
@@ -190,15 +190,15 @@ proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=nul
 
 	var/holding = user.get_active_hand()
 	var/datum/progressbar/progbar
-	if (progress)
+	if(progress)
 		progbar = new(user, time, target)
 
 	var/endtime = world.time+time
 	var/starttime = world.time
 	. = 1
-	while (world.time < endtime)
+	while(world.time < endtime)
 		sleep(1)
-		if (progress)
+		if(progress)
 			progbar.update(world.time - starttime)
 		if(!user || !target)
 			. = 0
@@ -213,7 +213,7 @@ proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=nul
 		if((!drifting && user.loc != user_loc) || target.loc != target_loc || user.get_active_hand() != holding || user.incapacitated() || user.lying )
 			. = 0
 			break
-	if (progress)
+	if(progress)
 		qdel(progbar)
 
 /proc/do_after(mob/user, delay, needhand = 1, atom/target = null, progress = 1)
@@ -236,15 +236,15 @@ proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=nul
 		holdingnull = 0 //Users hand started holding something, check to see if it's still holding that
 
 	var/datum/progressbar/progbar
-	if (progress)
+	if(progress)
 		progbar = new(user, delay, target)
 
 	var/endtime = world.time + delay
 	var/starttime = world.time
 	. = 1
-	while (world.time < endtime)
+	while(world.time < endtime)
 		sleep(1)
-		if (progress)
+		if(progress)
 			progbar.update(world.time - starttime)
 
 		if(drifting && !user.inertia_dir)
@@ -269,5 +269,5 @@ proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=nul
 			if(user.get_active_hand() != holding)
 				. = 0
 				break
-	if (progress)
+	if(progress)
 		qdel(progbar)
\ No newline at end of file
diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index 0ac3da3a10a..0375b7aacea 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -1,13 +1,13 @@
 var/church_name = null
 /proc/church_name()
-	if (church_name)
+	if(church_name)
 		return church_name
 
 	var/name = ""
 
 	name += pick("Holy", "United", "First", "Second", "Last")
 
-	if (prob(20))
+	if(prob(20))
 		name += " Space"
 
 	name += " " + pick("Church", "Cathedral", "Body", "Worshippers", "Movement", "Witnesses")
@@ -17,7 +17,7 @@ var/church_name = null
 
 var/command_name = null
 /proc/command_name()
-	if (command_name)
+	if(command_name)
 		return command_name
 
 	var/name = "Central Command"
@@ -33,7 +33,7 @@ var/command_name = null
 
 var/religion_name = null
 /proc/religion_name()
-	if (religion_name)
+	if(religion_name)
 		return religion_name
 
 	var/name = ""
@@ -47,12 +47,12 @@ var/religion_name = null
 	return "Nyx"
 
 /proc/station_name()
-	if (station_name)
+	if(station_name)
 		return station_name
 
 	var/name = ""
 
-	if (config && config.server_name)
+	if(config && config.server_name)
 		world.name = "[config.server_name]: [name]"
 	else
 		world.name = station_name
@@ -65,7 +65,7 @@ var/religion_name = null
 	var/new_station_name = ""
 
 	//Rare: Pre-Prefix
-	if (prob(10))
+	if(prob(10))
 		name = pick("Imperium", "Heretical", "Cuban", "Psychic", "Elegant", "Common", "Uncommon", "Rare", "Unique", "Houseruled", "Religious", "Atheist", "Traditional", "Houseruled", "Mad", "Super", "Ultra", "Secret", "Top Secret", "Deep", "Death", "Zybourne", "Central", "Main", "Government", "Uoi", "Fat", "Automated", "Experimental", "Augmented")
 		new_station_name = name + " "
 		name = ""
@@ -107,7 +107,7 @@ var/religion_name = null
 
 	station_name = name
 
-	if (config && config.server_name)
+	if(config && config.server_name)
 		world.name = "[config.server_name]: [name]"
 	else
 		world.name = name
@@ -116,7 +116,7 @@ var/religion_name = null
 
 var/syndicate_name = null
 /proc/syndicate_name()
-	if (syndicate_name)
+	if(syndicate_name)
 		return syndicate_name
 
 	var/name = ""
@@ -125,11 +125,11 @@ var/syndicate_name = null
 	name += pick("Clandestine", "Prima", "Blue", "Zero-G", "Max", "Blasto", "Waffle", "North", "Omni", "Newton", "Cyber", "Bonk", "Gene", "Gib")
 
 	// Suffix
-	if (prob(80))
+	if(prob(80))
 		name += " "
 
 		// Full
-		if (prob(60))
+		if(prob(60))
 			name += pick("Syndicate", "Consortium", "Collective", "Corporation", "Group", "Holdings", "Biotech", "Industries", "Systems", "Products", "Chemicals", "Enterprises", "Family", "Creations", "International", "Intergalactic", "Interplanetary", "Foundation", "Positronics", "Hive")
 		// Broken
 		else
diff --git a/code/__HELPERS/sanitize_values.dm b/code/__HELPERS/sanitize_values.dm
index f490f71df43..5020693a499 100644
--- a/code/__HELPERS/sanitize_values.dm
+++ b/code/__HELPERS/sanitize_values.dm
@@ -62,6 +62,6 @@
 // Calls the above proc on each entry of a list to ensure its entries are clean
 /proc/sql_sanitize_text_list(var/list/l)
 	var/list/new_list = l.Copy()
-	for (var/text in new_list)
+	for(var/text in new_list)
 		sql_sanitize_text(text)
 	return new_list
\ No newline at end of file
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index 0aa9589c510..b17cda4e560 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -154,15 +154,15 @@
 proc/checkhtml(var/t)
 	t = sanitize_simple(t, list("&#"="."))
 	var/p = findtext(t,"<",1)
-	while (p)	//going through all the tags
+	while(p)	//going through all the tags
 		var/start = p++
 		var/tag = copytext(t,p, p+1)
-		if (tag != "/")
-			while (reject_bad_text(copytext(t, p, p+1), 1))
+		if(tag != "/")
+			while(reject_bad_text(copytext(t, p, p+1), 1))
 				tag = copytext(t,start, p)
 				p++
 			tag = copytext(t,start+1, p)
-			if (!(tag in paper_tag_whitelist))	//if it's unkown tag, disarming it
+			if(!(tag in paper_tag_whitelist))	//if it's unkown tag, disarming it
 				t = copytext(t,1,start-1) + "&lt;" + copytext(t,start+1)
 		p = findtext(t,"<",p)
 	return t
@@ -218,7 +218,7 @@ proc/checkhtml(var/t)
 
 //Adds 'u' number of zeros ahead of the text 't'
 /proc/add_zero(t, u)
-	while (length(t) < u)
+	while(length(t) < u)
 		t = "0[t]"
 	return t
 
@@ -236,15 +236,15 @@ proc/checkhtml(var/t)
 
 //Returns a string with reserved characters and spaces before the first letter removed
 /proc/trim_left(text)
-	for (var/i = 1 to length(text))
-		if (text2ascii(text, i) > 32)
+	for(var/i = 1 to length(text))
+		if(text2ascii(text, i) > 32)
 			return copytext(text, i)
 	return ""
 
 //Returns a string with reserved characters and spaces after the last letter removed
 /proc/trim_right(text)
-	for (var/i = length(text), i > 0, i--)
-		if (text2ascii(text, i) > 32)
+	for(var/i = length(text), i > 0, i--)
+		if(text2ascii(text, i) > 32)
 			return copytext(text, 1, i + 1)
 
 	return ""
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 4973de14b81..872f299479c 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -24,6 +24,7 @@
 
 //Returns the world time in english
 /proc/worldtime2text(time = world.time)
+	time = (round_start_time ? (time - round_start_time) : (time - world.time))
 	return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]"
 
 /proc/time_stamp()
diff --git a/code/__HELPERS/timed_alerts.dm b/code/__HELPERS/timed_alerts.dm
index 929341c3fc0..97e92900288 100644
--- a/code/__HELPERS/timed_alerts.dm
+++ b/code/__HELPERS/timed_alerts.dm
@@ -10,9 +10,9 @@
 	var/ref_result
 
 	ref_result = ref_alert.timed_alert(src, question, title, time, choice1, choice2, choice3)
-	if (!ref_result) ref_result = default
+	if(!ref_result) ref_result = default
 
-	if (ref_alert) del(ref_alert)
+	if(ref_alert) del(ref_alert)
 
 	return ref_result
 
@@ -20,13 +20,13 @@
 /mob/proc/timed_alert(question as text, title as text, default as text, time as num, \
 					 choice1 as text, choice2 as text, choice3 as text)
 
-	if (client) return client.timed_alert(question, title, default, time, choice1, choice2, choice3)
+	if(client) return client.timed_alert(question, title, default, time, choice1, choice2, choice3)
 	return
 
 
 
 /timed_alert/proc/timed_alert(client/ref_client, question, title, time, choice1, choice2, choice3)
-        if (!ref_client) return
+        if(!ref_client) return
         spawn (time) del(src) // When src is deleted, the proc ends immediately. The alert itself closes.
 
         var/ref_answer
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 0dd40091e1e..005ef4c2fc9 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -10,7 +10,7 @@
 
 //Returns an integer given a hex input
 /proc/hex2num(hex)
-	if (!( istext(hex) ))
+	if(!( istext(hex) ))
 		return
 
 	var/num = 0
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 5ef6646e8cc..6cd28a20a32 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -26,11 +26,11 @@
 //Inverts the colour of an HTML string
 /proc/invertHTML(HTMLstring)
 
-	if (!( istext(HTMLstring) ))
+	if(!( istext(HTMLstring) ))
 		CRASH("Given non-text argument!")
 		return
 	else
-		if (length(HTMLstring) != 7)
+		if(length(HTMLstring) != 7)
 			CRASH("Given non-HTML argument!")
 			return
 	var/textr = copytext(HTMLstring, 2, 4)
@@ -42,11 +42,11 @@
 	textr = num2hex(255 - r)
 	textg = num2hex(255 - g)
 	textb = num2hex(255 - b)
-	if (length(textr) < 2)
+	if(length(textr) < 2)
 		textr = text("0[]", textr)
-	if (length(textg) < 2)
+	if(length(textg) < 2)
 		textr = text("0[]", textg)
-	if (length(textb) < 2)
+	if(length(textb) < 2)
 		textr = text("0[]", textb)
 	return text("#[][][]", textr, textg, textb)
 	return
@@ -218,14 +218,14 @@ Turf and target are seperate in case you want to teleport some distance from a t
 
 //Returns whether or not a player is a guest using their ckey as an input
 /proc/IsGuestKey(key)
-	if (findtext(key, "Guest-", 1, 7) != 1) //was findtextEx
+	if(findtext(key, "Guest-", 1, 7) != 1) //was findtextEx
 		return 0
 
 	var/i, ch, len = length(key)
 
-	for (i = 7, i <= len, ++i)
+	for(i = 7, i <= len, ++i)
 		ch = text2ascii(key, i)
-		if (ch < 48 || ch > 57)
+		if(ch < 48 || ch > 57)
 			return 0
 	return 1
 
@@ -234,7 +234,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	f = round(f)
 	f = max(low, f)
 	f = min(high, f)
-	if ((f % 2) == 0) //Ensure the last digit is an odd number
+	if((f % 2) == 0) //Ensure the last digit is an odd number
 		f += 1
 	return f
 
@@ -277,13 +277,13 @@ Turf and target are seperate in case you want to teleport some distance from a t
 /proc/freeborg()
 	var/select = null
 	var/list/borgs = list()
-	for (var/mob/living/silicon/robot/A in player_list)
-		if (A.stat == 2 || A.connected_ai || A.scrambledcodes || istype(A,/mob/living/silicon/robot/drone))
+	for(var/mob/living/silicon/robot/A in player_list)
+		if(A.stat == 2 || A.connected_ai || A.scrambledcodes || istype(A,/mob/living/silicon/robot/drone))
 			continue
 		var/name = "[A.real_name] ([A.modtype] [A.braintype])"
 		borgs[name] = A
 
-	if (borgs.len)
+	if(borgs.len)
 		select = input("Unshackled borg signals detected:", "Borg selection", null, null) as null|anything in borgs
 		return borgs[select]
 
@@ -352,15 +352,15 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	var/list/namecounts = list()
 	for(var/mob/M in mobs)
 		var/name = M.name
-		if (name in names)
+		if(name in names)
 			namecounts[name]++
 			name = "[name] ([namecounts[name]])"
 		else
 			names.Add(name)
 			namecounts[name] = 1
-		if (M.real_name && M.real_name != M.name)
+		if(M.real_name && M.real_name != M.name)
 			name += " \[[M.real_name]\]"
-		if (M.stat == 2)
+		if(M.stat == 2)
 			if(istype(M, /mob/dead/observer/))
 				name += " \[ghost\]"
 			else
@@ -679,13 +679,13 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
 
 	var/src_min_x = 0
 	var/src_min_y = 0
-	for (var/turf/T in turfs_src)
+	for(var/turf/T in turfs_src)
 		if(T.x < src_min_x || !src_min_x) src_min_x	= T.x
 		if(T.y < src_min_y || !src_min_y) src_min_y	= T.y
 
 	var/trg_min_x = 0
 	var/trg_min_y = 0
-	for (var/turf/T in turfs_trg)
+	for(var/turf/T in turfs_trg)
 		if(T.x < trg_min_x || !trg_min_x) trg_min_x	= T.x
 		if(T.y < trg_min_y || !trg_min_y) trg_min_y	= T.y
 
@@ -709,9 +709,9 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
 	var/list/toupdate = new/list()
 
 	moving:
-		for (var/turf/T in refined_src)
+		for(var/turf/T in refined_src)
 			var/datum/coords/C_src = refined_src[T]
-			for (var/turf/B in refined_trg)
+			for(var/turf/B in refined_trg)
 				var/datum/coords/C_trg = refined_trg[B]
 				if(C_src.x_pos == C_trg.x_pos && C_src.y_pos == C_trg.y_pos)
 
@@ -845,13 +845,13 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
 
 	var/src_min_x = 0
 	var/src_min_y = 0
-	for (var/turf/T in turfs_src)
+	for(var/turf/T in turfs_src)
 		if(T.x < src_min_x || !src_min_x) src_min_x	= T.x
 		if(T.y < src_min_y || !src_min_y) src_min_y	= T.y
 
 	var/trg_min_x = 0
 	var/trg_min_y = 0
-	for (var/turf/T in turfs_trg)
+	for(var/turf/T in turfs_trg)
 		if(T.x < trg_min_x || !trg_min_x) trg_min_x	= T.x
 		if(T.y < trg_min_y || !trg_min_y) trg_min_y	= T.y
 
@@ -877,9 +877,9 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
 
 
 	moving:
-		for (var/turf/T in refined_src)
+		for(var/turf/T in refined_src)
 			var/datum/coords/C_src = refined_src[T]
-			for (var/turf/B in refined_trg)
+			for(var/turf/B in refined_trg)
 				var/datum/coords/C_trg = refined_trg[B]
 				if(C_src.x_pos == C_trg.x_pos && C_src.y_pos == C_trg.y_pos)
 
@@ -990,33 +990,26 @@ proc/oview_or_orange(distance = world.view , center = usr , type)
 proc/get_mob_with_client_list()
 	var/list/mobs = list()
 	for(var/mob/M in mob_list)
-		if (M.client)
+		if(M.client)
 			mobs += M
 	return mobs
 
 
 /proc/parse_zone(zone)
 	if(zone == "r_hand") return "right hand"
-	else if (zone == "l_hand") return "left hand"
-	else if (zone == "l_arm") return "left arm"
-	else if (zone == "r_arm") return "right arm"
-	else if (zone == "l_leg") return "left leg"
-	else if (zone == "r_leg") return "right leg"
-	else if (zone == "l_foot") return "left foot"
-	else if (zone == "r_foot") return "right foot"
-	else if (zone == "l_hand") return "left hand"
-	else if (zone == "r_hand") return "right hand"
-	else if (zone == "l_foot") return "left foot"
-	else if (zone == "r_foot") return "right foot"
+	else if(zone == "l_hand") return "left hand"
+	else if(zone == "l_arm") return "left arm"
+	else if(zone == "r_arm") return "right arm"
+	else if(zone == "l_leg") return "left leg"
+	else if(zone == "r_leg") return "right leg"
+	else if(zone == "l_foot") return "left foot"
+	else if(zone == "r_foot") return "right foot"
+	else if(zone == "l_hand") return "left hand"
+	else if(zone == "r_hand") return "right hand"
+	else if(zone == "l_foot") return "left foot"
+	else if(zone == "r_foot") return "right foot"
 	else return zone
 
-
-/proc/get_turf(atom/A)
-	if (!istype(A))
-		return
-	for(A, A && !isturf(A), A=A.loc); //semicolon is for the empty statement
-	return A
-
 //Finds the distance between two atoms, in pixels
 //centered = 0 counts from turf edge to edge
 //centered = 1 counts from turf center to turf center
@@ -1146,15 +1139,15 @@ var/global/list/common_tools = list(
 
 //Whether or not the given item counts as sharp in terms of dealing damage
 /proc/is_sharp(obj/O as obj)
-	if (!O) return 0
-	if (O.sharp) return 1
-	if (O.edge) return 1
+	if(!O) return 0
+	if(O.sharp) return 1
+	if(O.edge) return 1
 	return 0
 
 //Whether or not the given item counts as cutting with an edge in terms of removing limbs
 /proc/has_edge(obj/O as obj)
-	if (!O) return 0
-	if (O.edge) return 1
+	if(!O) return 0
+	if(O.edge) return 1
 	return 0
 
 //Returns 1 if the given item is capable of popping things like balloons, inflatable barriers, or cutting police tape.
@@ -1528,7 +1521,7 @@ var/mob/dview/dview_mob = new
 		lastloc = loc
 		sleep(0.6)
 
-	if (orbiting == A) //make sure we haven't started orbiting something else.
+	if(orbiting == A) //make sure we haven't started orbiting something else.
 		orbiting = null
 		SpinAnimation(0,0)
 
@@ -1679,7 +1672,7 @@ var/mob/dview/dview_mob = new
 
 /proc/pick_closest_path(value)
 	var/list/matches = get_fancy_list_of_types()
-	if (!isnull(value) && value!="")
+	if(!isnull(value) && value!="")
 		matches = filter_fancy_list(matches, value)
 
 	if(matches.len==0)
@@ -1713,13 +1706,13 @@ var/list/TYPES_SHORTCUTS = list(
 
 var/global/list/g_fancy_list_of_types = null
 /proc/get_fancy_list_of_types()
-	if (isnull(g_fancy_list_of_types)) //init
+	if(isnull(g_fancy_list_of_types)) //init
 		var/list/temp = sortList(subtypesof(/atom) - typesof(/area) - /atom/movable)
 		g_fancy_list_of_types = new(temp.len)
 		for(var/type in temp)
 			var/typename = "[type]"
-			for (var/tn in TYPES_SHORTCUTS)
-				if (copytext(typename,1, length("[tn]/")+1)=="[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ )
+			for(var/tn in TYPES_SHORTCUTS)
+				if(copytext(typename,1, length("[tn]/")+1)=="[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ )
 					typename = TYPES_SHORTCUTS[tn]+copytext(typename,length("[tn]/"))
 					break
 			g_fancy_list_of_types[typename] = type
@@ -1737,10 +1730,10 @@ var/global/list/g_fancy_list_of_types = null
 /proc/stoplag()
 	. = 1
 	sleep(world.tick_lag)
-	if (world.tick_usage > TICK_LIMIT_TO_RUN) //woke up, still not enough tick, sleep for more.
+	if(world.tick_usage > TICK_LIMIT_TO_RUN) //woke up, still not enough tick, sleep for more.
 		. += 2
 		sleep(world.tick_lag*2)
-		if (world.tick_usage > TICK_LIMIT_TO_RUN) //woke up, STILL not enough tick, sleep for more.
+		if(world.tick_usage > TICK_LIMIT_TO_RUN) //woke up, STILL not enough tick, sleep for more.
 			. += 4
 			sleep(world.tick_lag*4)
 			//you might be thinking of adding more steps to this, or making it use a loop and a counter var
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index e1e8b818356..b6dc1c58b8f 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -4,7 +4,6 @@ var/global/list/all_languages[0]
 var/global/list/language_keys[0]					// Table of say codes for all languages
 var/global/list/all_superheroes[0]
 var/global/list/all_nations[0]
-var/global/list/emotes[0]
 var/global/list/whitelisted_species = list()
 
 var/list/clients = list()							//list of all clients
diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm
index 8417275d780..23d310be857 100644
--- a/code/_globalvars/lists/reagents.dm
+++ b/code/_globalvars/lists/reagents.dm
@@ -58,4 +58,9 @@ var/global/list/blocked_chems = list("polonium", "initropidril", "concentrated_i
 							"reagent", "life","dragonsbreath")
 
 //List of chems/mixtures that can't grow in plants (in addition to the global random chem blacklist)
-var/global/list/plant_blocked_chems = list()	//filled in /datum/reagents/New() with chems that have can_grow_in_plants = 0
\ No newline at end of file
+var/global/list/plant_blocked_chems = list()	//filled in /datum/reagents/New() with chems that have can_grow_in_plants = 0
+
+var/global/list/safe_chem_list = list("antihol", "charcoal", "epinephrine", "insulin", "teporone","silver_sulfadiazine", "salbutamol",
+									  "omnizine", "stimulants", "synaptizine", "potass_iodide", "oculine", "mannitol", "styptic_powder",
+									  "spaceacillin", "salglu_solution", "sal_acid", "cryoxadone", "blood", "synthflesh", "hydrocodone",
+									  "mitocholide", "rezadone")
\ No newline at end of file
diff --git a/code/_hooks/hooks.dm b/code/_hooks/hooks.dm
index b78526bfc2b..ccd0eb04722 100644
--- a/code/_hooks/hooks.dm
+++ b/code/_hooks/hooks.dm
@@ -29,26 +29,26 @@
 var/global/list/hooks = list()
 
 /proc/SetupHooks()
-	for (var/hook_path in typesof(/hook))
+	for(var/hook_path in typesof(/hook))
 		var/hook/hook = new hook_path
 		hooks[hook.name] = hook
 //		log_to_dd("Found hook: " + hook.name)
-	for (var/hook_path in typesof(/hook_handler))
+	for(var/hook_path in typesof(/hook_handler))
 		var/hook_handler/hook_handler = new hook_path
-		for (var/name in hooks)
-			if (hascall(hook_handler, "On" + name))
+		for(var/name in hooks)
+			if(hascall(hook_handler, "On" + name))
 				var/hook/hook = hooks[name]
 				hook.handlers += hook_handler
 //				log_to_dd("Found hook handler for: " + name)
-	for (var/hook/hook in hooks)
+	for(var/hook/hook in hooks)
 		hook.Setup()
 
 /proc/CallHook(var/name as text, var/list/args)
 	var/hook/hook = hooks[name]
-	if (!hook)
+	if(!hook)
 		//log_to_dd("WARNING: Hook with name " + name + " does not exist")
 		return
-	if (hook.Called(args))
+	if(hook.Called(args))
 		return
-	for (var/hook_handler/hook_handler in hook.handlers)
+	for(var/hook_handler/hook_handler in hook.handlers)
 		call(hook_handler, "On" + hook.name)(args)
\ No newline at end of file
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index b25c4d69b44..543f02e8a79 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -37,9 +37,12 @@
 
 	if(new_master)
 		var/old_layer = new_master.layer
+		var/old_plane = new_master.plane
 		new_master.layer = FLOAT_LAYER
+		new_master.plane = FLOAT_PLANE
 		alert.overlays += new_master
 		new_master.layer = old_layer
+		new_master.plane = old_plane
 		alert.icon_state = "template" // We'll set the icon to the client's ui pref in reorganize_alerts()
 		alert.master = new_master
 	else
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 58fb139ce33..1b32a9201a3 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -143,7 +143,7 @@
 					for(var/i=1, i<tankcheck.len+1, ++i)
 						if(istype(tankcheck[i], /obj/item/weapon/tank))
 							var/obj/item/weapon/tank/t = tankcheck[i]
-/*									if (!isnull(t.manipulated_by) && t.manipulated_by != C.real_name && findtext(t.desc,breathes))
+/*									if(!isnull(t.manipulated_by) && t.manipulated_by != C.real_name && findtext(t.desc,breathes))
 								contents.Add(t.air_contents.total_moles)	Someone messed with the tank and put unknown gasses
 								continue					in it, so we're going to believe the tank is what it says it is*/
 							switch(breathes)
@@ -155,21 +155,21 @@
 									else
 										contents.Add(0)
 
-								if ("oxygen")
+								if("oxygen")
 									if(t.air_contents.oxygen && !t.air_contents.toxins)
 										contents.Add(t.air_contents.oxygen)
 									else
 										contents.Add(0)
 
 								// No races breath this, but never know about downstream servers.
-								if ("carbon dioxide")
+								if("carbon dioxide")
 									if(t.air_contents.carbon_dioxide && !t.air_contents.toxins)
 										contents.Add(t.air_contents.carbon_dioxide)
 									else
 										contents.Add(0)
 
 								// ACK ACK ACK Plasmen
-								if ("plasma")
+								if("plasma")
 									if(t.air_contents.toxins)
 										contents.Add(t.air_contents.toxins)
 									else
@@ -272,7 +272,7 @@
 		return 1
 	if(usr.stat || usr.paralysis || usr.stunned || usr.weakened)
 		return 1
-	if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+	if(istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
 		return 1
 	if(master)
 		var/obj/item/I = usr.get_active_hand()
@@ -372,7 +372,7 @@
 		return 1
 	if(usr.incapacitated())
 		return 1
-	if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+	if(istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
 		return 1
 	if(usr.attack_ui(slot_id))
 		usr.update_inv_l_hand(0)
@@ -411,7 +411,7 @@
 		return 1
 	if(usr.incapacitated())
 		return 1
-	if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+	if(istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
 		return 1
 
 	if(ismob(usr))
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index e32637e798c..3ccc03acaff 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -33,11 +33,11 @@
 
 /obj/item/proc/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
 
-	if (!istype(M)) // not sure if this is the right thing...
+	if(!istype(M)) // not sure if this is the right thing...
 		return 0
 	var/messagesource = M
 
-	if (can_operate(M))  //Checks if mob is lying down on table for surgery
+	if(can_operate(M))  //Checks if mob is lying down on table for surgery
 		if(istype(src,/obj/item/robot_parts))//popup ovveride for direct attach
 			if(!attempt_initiate_surgery(src, M, user,1))
 				return 0
@@ -54,9 +54,9 @@
 			else
 				return 1
 
-	if (istype(M,/mob/living/carbon/brain))
+	if(istype(M,/mob/living/carbon/brain))
 		messagesource = M:container
-	if (hitsound && force > 0)
+	if(hitsound && force > 0)
 		playsound(loc, hitsound, 50, 1, -1)
 	/////////////////////////
 	user.lastattacked = M
@@ -177,9 +177,9 @@
 				else
 
 					M.take_organ_damage(power)
-					if (prob(33)) // Added blood for whacking non-humans too
+					if(prob(33)) // Added blood for whacking non-humans too
 						var/turf/simulated/location = M.loc
-						if (istype(location, /turf/simulated))
+						if(istype(location, /turf/simulated))
 							location.add_blood_floor(M)
 			if("fire")
 				M.take_organ_damage(0, power)
diff --git a/code/_onclick/oldcode.dm b/code/_onclick/oldcode.dm
index 89b1131a6f0..a68f9668e78 100644
--- a/code/_onclick/oldcode.dm
+++ b/code/_onclick/oldcode.dm
@@ -2,7 +2,7 @@
 	if(!usr)	return
 
 	// ------- TIME SINCE LAST CLICK -------
-	if (world.time <= usr:lastDblClick+1)
+	if(world.time <= usr:lastDblClick+1)
 		return
 	else
 		usr:lastDblClick = world.time
@@ -38,15 +38,15 @@
 
 
 	// ------- AI -------
-	else if (istype(usr, /mob/living/silicon/ai))
+	else if(istype(usr, /mob/living/silicon/ai))
 		var/mob/living/silicon/ai/ai = usr
-		if (ai.control_disabled)
+		if(ai.control_disabled)
 			return
 
 	// ------- CYBORG -------
-	else if (istype(usr, /mob/living/silicon/robot))
+	else if(istype(usr, /mob/living/silicon/robot))
 		var/mob/living/silicon/robot/bot = usr
-		if (bot.lockcharge) return
+		if(bot.lockcharge) return
 	..()
 
 
@@ -106,7 +106,7 @@
 			W = null
 */
 	// ------- ATTACK SELF -------
-	if (W == src && usr.stat == 0)
+	if(W == src && usr.stat == 0)
 		W.attack_self(usr)
 		if(usr.hand)
 			usr.update_inv_l_hand(0)	//update in-hand overlays
@@ -115,14 +115,14 @@
 		return
 
 	// ------- PARALYSIS, STUN, WEAKENED, DEAD, (And not AI) -------
-	if (((usr.paralysis || usr.stunned || usr.weakened) && !istype(usr, /mob/living/silicon/ai)) || usr.stat != 0)
+	if(((usr.paralysis || usr.stunned || usr.weakened) && !istype(usr, /mob/living/silicon/ai)) || usr.stat != 0)
 		return
 
 	// ------- CLICKING STUFF IN CONTAINERS -------
-	if ((!( src in usr.contents ) && (((!( isturf(src) ) && (!( isturf(src.loc) ) && (src.loc && !( isturf(src.loc.loc) )))) || !( isturf(usr.loc) )) && (src.loc != usr.loc && (!( istype(src, /obj/screen) ) && !( usr.contents.Find(src.loc) ))))))
-		if (istype(usr, /mob/living/silicon/ai))
+	if((!( src in usr.contents ) && (((!( isturf(src) ) && (!( isturf(src.loc) ) && (src.loc && !( isturf(src.loc.loc) )))) || !( isturf(usr.loc) )) && (src.loc != usr.loc && (!( istype(src, /obj/screen) ) && !( usr.contents.Find(src.loc) ))))))
+		if(istype(usr, /mob/living/silicon/ai))
 			var/mob/living/silicon/ai/ai = usr
-			if (ai.control_disabled || ai.malfhacking)
+			if(ai.control_disabled || ai.malfhacking)
 				return
 		else
 			return
@@ -141,11 +141,11 @@
 //	to_chat(world, "according to dblclick(), t5 is [t5]")
 
 	// ------- ACTUALLY DETERMINING STUFF -------
-	if (((t5 || (W && (W.flags & USEDELAY))) && !( istype(src, /obj/screen) )))
+	if(((t5 || (W && (W.flags & USEDELAY))) && !( istype(src, /obj/screen) )))
 
 		// ------- ( CAN USE ITEM OR HAS 1 SECOND USE DELAY ) AND NOT CLICKING ON SCREEN -------
 
-		if (usr.next_move < world.time)
+		if(usr.next_move < world.time)
 			usr.prev_move = usr.next_move
 			usr.next_move = world.time + 10
 		else
@@ -154,14 +154,14 @@
 
 		// ------- DELAY CHECK PASSED -------
 
-		if ((src.loc && (get_dist(src, usr) < 2 || src.loc == usr.loc)))
+		if((src.loc && (get_dist(src, usr) < 2 || src.loc == usr.loc)))
 
 			// ------- CLICKED OBJECT EXISTS IN GAME WORLD, DISTANCE FROM PERSON TO OBJECT IS 1 SQUARE OR THEY'RE ON THE SAME SQUARE -------
 
 			var/direct = get_dir(usr, src)
 			var/obj/item/weapon/dummy/D = new /obj/item/weapon/dummy( usr.loc )
 			var/ok = 0
-			if ( (direct - 1) & direct)
+			if( (direct - 1) & direct)
 
 				// ------- CLICKED OBJECT IS LOCATED IN A DIAGONAL POSITION FROM THE PERSON -------
 
@@ -259,39 +259,39 @@
 			D = null
 
 			// ------- DUMMY OBJECT'S SERVED IT'S PURPOSE, IT'S REWARDED WITH A SWIFT DELETE -------
-			if (!( ok ))
+			if(!( ok ))
 				// ------- TESTS ABOVE DETERMINED YOU CANNOT REACH THE TILE -------
 				return 0
 
-		if (!( usr.restrained() || (usr.lying && usr.buckled!=src) ))
+		if(!( usr.restrained() || (usr.lying && usr.buckled!=src) ))
 			// ------- YOU ARE NOT REASTRAINED -------
 
-			if (W)
+			if(W)
 				// ------- YOU HAVE AN ITEM IN YOUR HAND - HANDLE ATTACKBY AND AFTERATTACK -------
 				var/ignoreAA = 0 //Ignore afterattack(). Surgery uses this.
-				if (t5)
+				if(t5)
 					ignoreAA = src.attackby(W, usr, params)
-				if (W && !ignoreAA)
+				if(W && !ignoreAA)
 					W.afterattack(src, usr, (t5 ? 1 : 0), params)
 
 			else
 				// ------- YOU DO NOT HAVE AN ITEM IN YOUR HAND -------
-				if (istype(usr, /mob/living/carbon/human))
+				if(istype(usr, /mob/living/carbon/human))
 					// ------- YOU ARE HUMAN -------
 					src.attack_hand(usr, usr.hand)
 				else
 					// ------- YOU ARE NOT HUMAN. WHAT ARE YOU - DETERMINED HERE AND PROPER ATTACK_MOBTYPE CALLED -------
-					if (istype(usr, /mob/living/carbon/monkey))
+					if(istype(usr, /mob/living/carbon/monkey))
 						src.attack_paw(usr, usr.hand)
-					else if (istype(usr, /mob/living/carbon/alien/humanoid))
+					else if(istype(usr, /mob/living/carbon/alien/humanoid))
 						if(usr.m_intent == "walk" && istype(usr, /mob/living/carbon/alien/humanoid/hunter))
 							usr.m_intent = "run"
 							usr.hud_used.move_intent.icon_state = "running"
 							usr.update_icons()
 						src.attack_alien(usr, usr.hand)
-					else if (istype(usr, /mob/living/carbon/alien/larva))
+					else if(istype(usr, /mob/living/carbon/alien/larva))
 						src.attack_larva(usr)
-					else if (istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot))
+					else if(istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot))
 						src.attack_ai(usr, usr.hand)
 					else if(istype(usr, /mob/living/carbon/slime))
 						src.attack_slime(usr)
@@ -299,51 +299,51 @@
 						src.attack_animal(usr)
 		else
 			// ------- YOU ARE RESTRAINED. DETERMINE WHAT YOU ARE AND ATTACK WITH THE PROPER HAND_X PROC -------
-			if (istype(usr, /mob/living/carbon/human))
+			if(istype(usr, /mob/living/carbon/human))
 				src.hand_h(usr, usr.hand)
-			else if (istype(usr, /mob/living/carbon/monkey))
+			else if(istype(usr, /mob/living/carbon/monkey))
 				src.hand_p(usr, usr.hand)
-			else if (istype(usr, /mob/living/carbon/alien/humanoid))
+			else if(istype(usr, /mob/living/carbon/alien/humanoid))
 				src.hand_al(usr, usr.hand)
-			else if (istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot))
+			else if(istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot))
 				src.hand_a(usr, usr.hand)
 
 	else
 		// ------- ITEM INACESSIBLE OR CLICKING ON SCREEN -------
-		if (istype(src, /obj/screen))
+		if(istype(src, /obj/screen))
 			// ------- IT'S THE HUD YOU'RE CLICKING ON -------
 			usr.prev_move = usr.next_move
 			usr:lastDblClick = world.time + 2
-			if (usr.next_move < world.time)
+			if(usr.next_move < world.time)
 				usr.next_move = world.time + 2
 			else
 				return
 
 			// ------- 2 DECISECOND DELAY FOR CLICKING PASSED -------
 
-			if (!( usr.restrained() ))
+			if(!( usr.restrained() ))
 
 				// ------- YOU ARE NOT RESTRAINED -------
-				if ((W && !( istype(src, /obj/screen) )))
+				if((W && !( istype(src, /obj/screen) )))
 					// ------- IT SHOULD NEVER GET TO HERE, DUE TO THE ISTYPE(SRC, /OBJ/SCREEN) FROM PREVIOUS IF-S - I TESTED IT WITH A DEBUG OUTPUT AND I COULDN'T GET THIST TO SHOW UP. -------
 					src.attackby(W, usr, params)
-					if (W)
+					if(W)
 						W.afterattack(src, usr,, params)
 				else
 					// ------- YOU ARE NOT RESTRAINED, AND ARE CLICKING A HUD OBJECT -------
-					if (istype(usr, /mob/living/carbon/human))
+					if(istype(usr, /mob/living/carbon/human))
 						src.attack_hand(usr, usr.hand)
-					else if (istype(usr, /mob/living/carbon/monkey))
+					else if(istype(usr, /mob/living/carbon/monkey))
 						src.attack_paw(usr, usr.hand)
-					else if (istype(usr, /mob/living/carbon/alien/humanoid))
+					else if(istype(usr, /mob/living/carbon/alien/humanoid))
 						src.attack_alien(usr, usr.hand)
 			else
 				// ------- YOU ARE RESTRAINED CLICKING ON A HUD OBJECT -------
-				if (istype(usr, /mob/living/carbon/human))
+				if(istype(usr, /mob/living/carbon/human))
 					src.hand_h(usr, usr.hand)
-				else if (istype(usr, /mob/living/carbon/monkey))
+				else if(istype(usr, /mob/living/carbon/monkey))
 					src.hand_p(usr, usr.hand)
-				else if (istype(usr, /mob/living/carbon/alien/humanoid))
+				else if(istype(usr, /mob/living/carbon/alien/humanoid))
 					src.hand_al(usr, usr.hand)
 		else
 			// ------- YOU ARE CLICKING ON AN OBJECT THAT'S INACCESSIBLE TO YOU AND IS NOT YOUR HUD -------
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 50b6716c977..f32161b92a2 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -67,7 +67,7 @@ var/const/tk_maxrange = 15
 	icon_state = "2"
 	flags = NOBLUDGEON | ABSTRACT
 	//item_state = null
-	w_class = 10.0
+	w_class = 10
 	layer = 20
 	plane = HUD_PLANE
 
diff --git a/code/controllers/ProcessScheduler/core/process.dm b/code/controllers/ProcessScheduler/core/process.dm
index 620dafca4ec..55e277b4d67 100644
--- a/code/controllers/ProcessScheduler/core/process.dm
+++ b/code/controllers/ProcessScheduler/core/process.dm
@@ -171,7 +171,7 @@
 	main.restartProcess(src.name)
 
 /datum/controller/process/proc/kill()
-	if (!killed)
+	if(!killed)
 		var/msg = "[name] process was killed at tick #[ticks]."
 		log_debug(msg)
 		message_admins(msg)
@@ -186,22 +186,22 @@
 // Do not call this directly - use SHECK or SCHECK_EVERY
 /datum/controller/process/proc/sleepCheck(var/tickId = 0)
 	calls_since_last_scheck = 0
-	if (killed)
+	if(killed)
 		// The kill proc is the only place where killed is set.
 		// The kill proc should have deleted this datum, and all sleeping procs that are
 		// owned by it.
 		CRASH("A killed process is still running somehow...")
-	if (hung)
+	if(hung)
 		// This will only really help if the doWork proc ends up in an infinite loop.
 		handleHung()
 		CRASH("Process [name] hung and was restarted.")
 
-	if (main.getCurrentTickElapsedTime() > main.timeAllowance)
+	if(main.getCurrentTickElapsedTime() > main.timeAllowance)
 		sleep(world.tick_lag)
 		cpu_defer_count++
 		last_slept = 0
 	else
-		if (TimeOfTick > last_slept + sleep_interval)
+		if(TimeOfTick > last_slept + sleep_interval)
 			// If we haven't slept in sleep_interval deciseconds, sleep to allow other work to proceed.
 			sleep(0)
 			last_slept = TimeOfTick
@@ -213,14 +213,14 @@
 
 	var/elapsedTime = getElapsedTime()
 
-	if (hung)
+	if(hung)
 		handleHung()
 		return
-	else if (elapsedTime > hang_restart_time)
+	else if(elapsedTime > hang_restart_time)
 		hung()
-	else if (elapsedTime > hang_alert_time)
+	else if(elapsedTime > hang_alert_time)
 		setStatus(PROCESS_STATUS_PROBABLY_HUNG)
-	else if (elapsedTime > hang_warning_time)
+	else if(elapsedTime > hang_warning_time)
 		setStatus(PROCESS_STATUS_MAYBE_HUNG)
 
 
diff --git a/code/controllers/ProcessScheduler/core/processScheduler.dm b/code/controllers/ProcessScheduler/core/processScheduler.dm
index 86e1fc5bbe9..494e776650d 100644
--- a/code/controllers/ProcessScheduler/core/processScheduler.dm
+++ b/code/controllers/ProcessScheduler/core/processScheduler.dm
@@ -66,7 +66,7 @@ var/global/datum/controller/processScheduler/processScheduler
  * this treatment.
  */
 /datum/controller/processScheduler/proc/deferSetupFor(var/processPath)
-	if (!(processPath in deferredSetupList))
+	if(!(processPath in deferredSetupList))
 		deferredSetupList += processPath
 
 /datum/controller/processScheduler/proc/setup()
@@ -77,11 +77,11 @@ var/global/datum/controller/processScheduler/processScheduler
 
 	var/process
 	// Add all the processes we can find, except for the ticker
-	for (process in subtypesof(/datum/controller/process))
-		if (!(process in deferredSetupList))
+	for(process in subtypesof(/datum/controller/process))
+		if(!(process in deferredSetupList))
 			addProcess(new process(src))
 
-	for (process in deferredSetupList)
+	for(process in deferredSetupList)
 		addProcess(new process(src))
 
 /datum/controller/processScheduler/proc/start()
@@ -114,7 +114,7 @@ var/global/datum/controller/processScheduler/processScheduler
 	for(var/datum/controller/process/p in running)
 		p.update()
 
-		if (isnull(p)) // Process was killed
+		if(isnull(p)) // Process was killed
 			continue
 
 		var/status = p.getStatus()
@@ -132,11 +132,11 @@ var/global/datum/controller/processScheduler/processScheduler
 /datum/controller/processScheduler/proc/queueProcesses()
 	for(var/datum/controller/process/p in processes)
 		// Don't double-queue, don't queue running processes
-		if (p.disabled || p.running || p.queued || !p.idle)
+		if(p.disabled || p.running || p.queued || !p.idle)
 			continue
 
 		// If the process should be running by now, go ahead and queue it
-		if (world.time >= last_queued[p] + p.schedule_interval)
+		if(world.time >= last_queued[p] + p.schedule_interval)
 			setQueuedProcessState(p)
 
 /datum/controller/processScheduler/proc/runQueuedProcesses()
@@ -217,34 +217,34 @@ var/global/datum/controller/processScheduler/processScheduler
 	recordEnd(process)
 
 /datum/controller/processScheduler/proc/setIdleProcessState(var/datum/controller/process/process)
-	if (process in running)
+	if(process in running)
 		running -= process
-	if (process in queued)
+	if(process in queued)
 		queued -= process
-	if (!(process in idle))
+	if(!(process in idle))
 		idle += process
 
 /datum/controller/processScheduler/proc/setQueuedProcessState(var/datum/controller/process/process)
-	if (process in running)
+	if(process in running)
 		running -= process
-	if (process in idle)
+	if(process in idle)
 		idle -= process
-	if (!(process in queued))
+	if(!(process in queued))
 		queued += process
 
 	// The other state transitions are handled internally by the process.
 	process.queued()
 
 /datum/controller/processScheduler/proc/setRunningProcessState(var/datum/controller/process/process)
-	if (process in queued)
+	if(process in queued)
 		queued -= process
-	if (process in idle)
+	if(process in idle)
 		idle -= process
-	if (!(process in running))
+	if(!(process in running))
 		running += process
 
 /datum/controller/processScheduler/proc/recordStart(var/datum/controller/process/process, var/time = null)
-	if (isnull(time))
+	if(isnull(time))
 		time = TimeOfGame
 		last_queued[process] = world.time
 		last_start[process] = time
@@ -253,7 +253,7 @@ var/global/datum/controller/processScheduler/processScheduler
 		last_start[process] = time
 
 /datum/controller/processScheduler/proc/recordEnd(var/datum/controller/process/process, var/time = null)
-	if (isnull(time))
+	if(isnull(time))
 		time = TimeOfGame
 
 	var/lastRunTime = time - last_start[process]
@@ -273,7 +273,7 @@ var/global/datum/controller/processScheduler/processScheduler
 		highest_run_time[process] = time
 
 	var/list/lastTwenty = last_twenty_run_times[process]
-	if (lastTwenty.len == 20)
+	if(lastTwenty.len == 20)
 		lastTwenty.Cut(1, 2)
 	lastTwenty.len++
 	lastTwenty[lastTwenty.len] = time
@@ -304,7 +304,7 @@ var/global/datum/controller/processScheduler/processScheduler
 /datum/controller/processScheduler/proc/getStatusData()
 	var/list/data = new
 
-	for (var/datum/controller/process/p in processes)
+	for(var/datum/controller/process/p in processes)
 		data.len++
 		data[data.len] = p.getContextData()
 
@@ -314,14 +314,14 @@ var/global/datum/controller/processScheduler/processScheduler
 	return processes.len
 
 /datum/controller/processScheduler/proc/hasProcess(var/processName as text)
-	if (nameToProcessMap[processName])
+	if(nameToProcessMap[processName])
 		return 1
 
 /datum/controller/processScheduler/proc/killProcess(var/processName as text)
 	restartProcess(processName)
 
 /datum/controller/processScheduler/proc/restartProcess(var/processName as text)
-	if (hasProcess(processName))
+	if(hasProcess(processName))
 		var/datum/controller/process/oldInstance = nameToProcessMap[processName]
 		var/datum/controller/process/newInstance = new oldInstance.type(src)
 		newInstance._copyStateFrom(oldInstance)
@@ -329,24 +329,24 @@ var/global/datum/controller/processScheduler/processScheduler
 		oldInstance.kill()
 
 /datum/controller/processScheduler/proc/enableProcess(var/processName as text)
-	if (hasProcess(processName))
+	if(hasProcess(processName))
 		var/datum/controller/process/process = nameToProcessMap[processName]
 		process.enable()
 
 /datum/controller/processScheduler/proc/disableProcess(var/processName as text)
-	if (hasProcess(processName))
+	if(hasProcess(processName))
 		var/datum/controller/process/process = nameToProcessMap[processName]
 		process.disable()
 
 /datum/controller/processScheduler/proc/getCurrentTickElapsedTime()
-	if (world.time > currentTick)
+	if(world.time > currentTick)
 		updateCurrentTickData()
 		return 0
 	else
 		return TimeOfTick
 
 /datum/controller/processScheduler/proc/updateCurrentTickData()
-	if (world.time > currentTick)
+	if(world.time > currentTick)
 		// New tick!
 		currentTick = world.time
 		updateTimeAllowance()
diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm
index 43bee48f267..dc7cbe6a24d 100644
--- a/code/controllers/communications.dm
+++ b/code/controllers/communications.dm
@@ -153,7 +153,7 @@ var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, MED_FREQ, SEC_FREQ, SCI
 
 /proc/frequency_span_class(var/frequency)
 	// Antags!
-	if (frequency in ANTAG_FREQS)
+	if(frequency in ANTAG_FREQS)
 		return "syndradio"
 	// centcomm channels (deathsquid and ert)
 	if(frequency in CENT_FREQS)
@@ -167,7 +167,7 @@ var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, MED_FREQ, SEC_FREQ, SCI
 	// department radio formatting (poorly optimized, ugh)
 	if(frequency == SEC_FREQ)
 		return "secradio"
-	if (frequency == ENG_FREQ)
+	if(frequency == ENG_FREQ)
 		return "engradio"
 	if(frequency == SCI_FREQ)
 		return "sciradio"
@@ -265,17 +265,17 @@ var/global/datum/controller/radio/radio_controller
 		if(!start_point)
 			qdel(signal)
 			return 0
-	if (filter)
+	if(filter)
 		send_to_filter(source, signal, filter, start_point, range)
 		send_to_filter(source, signal, RADIO_DEFAULT, start_point, range)
 	else
 		//Broadcast the signal to everyone!
-		for (var/next_filter in devices)
+		for(var/next_filter in devices)
 			send_to_filter(source, signal, next_filter, start_point, range)
 
 //Sends a signal to all machines belonging to a given filter. Should be called by post_signal()
 /datum/radio_frequency/proc/send_to_filter(obj/source, datum/signal/signal, var/filter, var/turf/start_point = null, var/range = null)
-	if (range && !start_point)
+	if(range && !start_point)
 		return
 
 	for(var/obj/device in devices[filter])
@@ -291,11 +291,11 @@ var/global/datum/controller/radio/radio_controller
 		device.receive_signal(signal, TRANSMISSION_RADIO, frequency)
 
 /datum/radio_frequency/proc/add_listener(obj/device as obj, var/filter as text|null)
-	if (!filter)
+	if(!filter)
 		filter = RADIO_DEFAULT
 	//log_admin("add_listener(device=[device],filter=[filter]) frequency=[frequency]")
 	var/list/obj/devices_line = devices[filter]
-	if (!devices_line)
+	if(!devices_line)
 		devices_line = new
 		devices[filter] = devices_line
 	devices_line+=device
@@ -305,12 +305,12 @@ var/global/datum/controller/radio/radio_controller
 	//log_admin("DEBUG: devices(filter_str).len=[l]")
 
 /datum/radio_frequency/proc/remove_listener(obj/device)
-	for (var/devices_filter in devices)
+	for(var/devices_filter in devices)
 		var/list/devices_line = devices[devices_filter]
 		devices_line-=device
-		while (null in devices_line)
+		while(null in devices_line)
 			devices_line -= null
-		if (devices_line.len==0)
+		if(devices_line.len==0)
 			devices -= devices_filter
 			qdel(devices_line)
 
@@ -335,11 +335,11 @@ var/global/datum/controller/radio/radio_controller
 	frequency = model.frequency
 
 /datum/signal/proc/debug_print()
-	if (source)
+	if(source)
 		. = "signal = {source = '[source]' ([source:x],[source:y],[source:z])\n"
 	else
 		. = "signal = {source = '[source]' ()\n"
-	for (var/i in data)
+	for(var/i in data)
 		. += "data\[\"[i]\"\] = \"[data[i]]\"\n"
 		if(islist(data[i]))
 			var/list/L = data[i]
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index f4e795f6c77..d3da4ccf1c3 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -177,20 +177,22 @@
 	var/disable_lobby_music = 0 // Disables the lobby music
 	var/disable_cid_warn_popup = 0 //disables the annoying "You have already logged in this round, disconnect or be banned" popup, because it annoys the shit out of me when testing.
 
+	var/max_loadout_points = 5 // How many points can be spent on extra items in character setup
+
 /datum/configuration/New()
 	var/list/L = subtypesof(/datum/game_mode)
-	for (var/T in L)
+	for(var/T in L)
 		// I wish I didn't have to instance the game modes in order to look up
 		// their information, but it is the only way (at least that I know of).
 		var/datum/game_mode/M = new T()
 
-		if (M.config_tag)
+		if(M.config_tag)
 			if(!(M.config_tag in modes))		// ensure each mode is added only once
 				diary << "Adding game mode [M.name] ([M.config_tag]) to configuration."
 				src.modes += M.config_tag
 				src.mode_names[M.config_tag] = M.name
 				src.probabilities[M.config_tag] = M.probability
-				if (M.votable)
+				if(M.votable)
 					src.votable_modes += M.config_tag
 		qdel(M)
 	src.votable_modes += "secret"
@@ -202,188 +204,188 @@
 		if(!t)	continue
 
 		t = trim(t)
-		if (length(t) == 0)
+		if(length(t) == 0)
 			continue
-		else if (copytext(t, 1, 2) == "#")
+		else if(copytext(t, 1, 2) == "#")
 			continue
 
 		var/pos = findtext(t, " ")
 		var/name = null
 		var/value = null
 
-		if (pos)
+		if(pos)
 			name = lowertext(copytext(t, 1, pos))
 			value = copytext(t, pos + 1)
 		else
 			name = lowertext(t)
 
-		if (!name)
+		if(!name)
 			continue
 
 		if(type == "config")
-			switch (name)
-				if ("resource_urls")
+			switch(name)
+				if("resource_urls")
 					config.resource_urls = splittext(value, " ")
 
-				if ("admin_legacy_system")
+				if("admin_legacy_system")
 					config.admin_legacy_system = 1
 
-				if ("ban_legacy_system")
+				if("ban_legacy_system")
 					config.ban_legacy_system = 1
 
-				if ("use_age_restriction_for_jobs")
+				if("use_age_restriction_for_jobs")
 					config.use_age_restriction_for_jobs = 1
 
-				if ("use_age_restriction_for_antags")
+				if("use_age_restriction_for_antags")
 					config.use_age_restriction_for_antags = 1
 
-				if ("jobs_have_minimal_access")
+				if("jobs_have_minimal_access")
 					config.jobs_have_minimal_access = 1
 
-				if ("log_ooc")
+				if("log_ooc")
 					config.log_ooc = 1
 
-				if ("log_access")
+				if("log_access")
 					config.log_access = 1
 
-				if ("log_say")
+				if("log_say")
 					config.log_say = 1
 
-				if ("log_admin")
+				if("log_admin")
 					config.log_admin = 1
 
-				if ("log_debug")
+				if("log_debug")
 					config.log_debug = text2num(value)
 
-				if ("log_game")
+				if("log_game")
 					config.log_game = 1
 
-				if ("log_vote")
+				if("log_vote")
 					config.log_vote = 1
 
-				if ("log_whisper")
+				if("log_whisper")
 					config.log_whisper = 1
 
-				if ("log_attack")
+				if("log_attack")
 					config.log_attack = 1
 
-				if ("log_emote")
+				if("log_emote")
 					config.log_emote = 1
 
-				if ("log_adminchat")
+				if("log_adminchat")
 					config.log_adminchat = 1
 
-				if ("log_adminwarn")
+				if("log_adminwarn")
 					config.log_adminwarn = 1
 
-				if ("log_pda")
+				if("log_pda")
 					config.log_pda = 1
 
-				if ("log_world_output")
+				if("log_world_output")
 					config.log_world_output = 1
 
-				if ("log_hrefs")
+				if("log_hrefs")
 					config.log_hrefs = 1
 
-				if ("log_runtime")
+				if("log_runtime")
 					config.log_runtime = 1
 
-				if ("mentors")
+				if("mentors")
 					config.mods_are_mentors = 1
 
 				if("allow_admin_ooccolor")
 					config.allow_admin_ooccolor = 1
 
-				if ("allow_vote_restart")
+				if("allow_vote_restart")
 					config.allow_vote_restart = 1
 
-				if ("allow_vote_mode")
+				if("allow_vote_mode")
 					config.allow_vote_mode = 1
 
 				if("no_dead_vote")
 					config.vote_no_dead = 1
 
-				if ("default_no_vote")
+				if("default_no_vote")
 					config.vote_no_default = 1
 
-				if ("vote_delay")
+				if("vote_delay")
 					config.vote_delay = text2num(value)
 
-				if ("vote_period")
+				if("vote_period")
 					config.vote_period = text2num(value)
 
-				if ("allow_ai")
+				if("allow_ai")
 					config.allow_ai = 1
 
-//				if ("authentication")
+//				if("authentication")
 //					config.enable_authentication = 1
 
-				if ("norespawn")
+				if("norespawn")
 					config.respawn = 0
 
-				if ("servername")
+				if("servername")
 					config.server_name = value
 
-				if ("serversuffix")
+				if("serversuffix")
 					config.server_suffix = 1
 
-				if ("nudge_script_path")
+				if("nudge_script_path")
 					config.nudge_script_path = value
 
-				if ("hostedby")
+				if("hostedby")
 					config.hostedby = value
 
-				if ("server")
+				if("server")
 					config.server = value
 
-				if ("banappeals")
+				if("banappeals")
 					config.banappeals = value
 
-				if ("wikiurl")
+				if("wikiurl")
 					config.wikiurl = value
 
-				if ("forumurl")
+				if("forumurl")
 					config.forumurl = value
 
-				if ("rulesurl")
+				if("rulesurl")
 					config.rulesurl = value
 
-				if ("donationsurl")
+				if("donationsurl")
 					config.donationsurl = value
 
-				if ("repositoryurl")
+				if("repositoryurl")
 					config.repositoryurl = value
 
-				if ("guest_jobban")
+				if("guest_jobban")
 					config.guest_jobban = 1
 
-				if ("guest_ban")
+				if("guest_ban")
 					guests_allowed = 0
 
-				if ("usewhitelist")
+				if("usewhitelist")
 					config.usewhitelist = 1
 
-				if ("feature_object_spell_system")
+				if("feature_object_spell_system")
 					config.feature_object_spell_system = 1
 
-				if ("allow_metadata")
+				if("allow_metadata")
 					config.allow_Metadata = 1
 
-				if ("traitor_scaling")
+				if("traitor_scaling")
 					config.traitor_scaling = 1
 
 				if("protect_roles_from_antagonist")
 					config.protect_roles_from_antagonist = 1
 
-				if ("probability")
+				if("probability")
 					var/prob_pos = findtext(value, " ")
 					var/prob_name = null
 					var/prob_value = null
 
-					if (prob_pos)
+					if(prob_pos)
 						prob_name = lowertext(copytext(value, 1, prob_pos))
 						prob_value = copytext(value, prob_pos + 1)
-						if (prob_name in config.modes)
+						if(prob_name in config.modes)
 							config.probabilities[prob_name] = text2num(prob_value)
 						else
 							diary << "Unknown game mode probability configuration definition: [prob_name]."
@@ -552,6 +554,9 @@
 				if("disable_cid_warn_popup")
 					config.disable_cid_warn_popup = 1
 
+				if("max_loadout_points")
+					config.max_loadout_points = text2num(value)
+
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 
@@ -606,11 +611,11 @@
 					config.reactionary_explosions	= 1
 				if("bombcap")
 					var/BombCap = text2num(value)
-					if (!BombCap)
+					if(!BombCap)
 						continue
-					if (BombCap < 4)
+					if(BombCap < 4)
 						BombCap = 4
-					if (BombCap > 128)
+					if(BombCap > 128)
 						BombCap = 128
 
 					MAX_EX_DEVESTATION_RANGE = round(BombCap/4)
@@ -629,36 +634,36 @@
 		if(!t)	continue
 
 		t = trim(t)
-		if (length(t) == 0)
+		if(length(t) == 0)
 			continue
-		else if (copytext(t, 1, 2) == "#")
+		else if(copytext(t, 1, 2) == "#")
 			continue
 
 		var/pos = findtext(t, " ")
 		var/name = null
 		var/value = null
 
-		if (pos)
+		if(pos)
 			name = lowertext(copytext(t, 1, pos))
 			value = copytext(t, pos + 1)
 		else
 			name = lowertext(t)
 
-		if (!name)
+		if(!name)
 			continue
 
-		switch (name)
+		switch(name)
 			if("sql_enabled")
 				config.sql_enabled = 1
-			if ("address")
+			if("address")
 				sqladdress = value
-			if ("port")
+			if("port")
 				sqlport = value
-			if ("feedback_database")
+			if("feedback_database")
 				sqlfdbkdb = value
-			if ("feedback_login")
+			if("feedback_login")
 				sqlfdbklogin = value
-			if ("feedback_password")
+			if("feedback_password")
 				sqlfdbkpass = value
 			if("feedback_tableprefix")
 				sqlfdbktableprefix = value
@@ -671,9 +676,9 @@
 		if(!t)	continue
 
 		t = trim(t)
-		if (length(t) == 0)
+		if(length(t) == 0)
 			continue
-		else if (copytext(t, 1, 2) == "#")
+		else if(copytext(t, 1, 2) == "#")
 			continue
 
 		config.overflow_whitelist += t
@@ -681,25 +686,25 @@
 /datum/configuration/proc/pick_mode(mode_name)
 	// I wish I didn't have to instance the game modes in order to look up
 	// their information, but it is the only way (at least that I know of).
-	for (var/T in subtypesof(/datum/game_mode))
+	for(var/T in subtypesof(/datum/game_mode))
 		var/datum/game_mode/M = new T()
-		if (M.config_tag && M.config_tag == mode_name)
+		if(M.config_tag && M.config_tag == mode_name)
 			return M
 		qdel(M)
 	return new /datum/game_mode/extended()
 
 /datum/configuration/proc/get_runnable_modes()
 	var/list/datum/game_mode/runnable_modes = new
-	for (var/T in subtypesof(/datum/game_mode))
+	for(var/T in subtypesof(/datum/game_mode))
 		var/datum/game_mode/M = new T()
 //		to_chat(world, "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]")
-		if (!(M.config_tag in modes))
+		if(!(M.config_tag in modes))
 			qdel(M)
 			continue
-		if (probabilities[M.config_tag]<=0)
+		if(probabilities[M.config_tag]<=0)
 			qdel(M)
 			continue
-		if (M.can_start())
+		if(M.can_start())
 			runnable_modes[M] = probabilities[M.config_tag]
 //			to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]")
 	return runnable_modes
diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm
index 2775590dab6..afb0e68d83f 100644
--- a/code/controllers/failsafe.dm
+++ b/code/controllers/failsafe.dm
@@ -18,8 +18,8 @@ var/global/datum/controller/failsafe/failsafe
 	. = ..()
 
 	// There can be only one failsafe. Out with the old in with the new (that way we can restart the Failsafe by spawning a new one).
-	if (failsafe != src)
-		if (istype(failsafe))
+	if(failsafe != src)
+		if(istype(failsafe))
 			recover()
 			qdel(failsafe)
 
diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index 97c490852b6..25b038554cc 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -28,7 +28,7 @@
 		if("Master")
 			debug_variables(master_controller)
 			feedback_add_details("admin_verb","DMC")
-		if ("failsafe")
+		if("failsafe")
 			debug_variables(failsafe)
 			feedback_add_details("admin_verb", "dfailsafe")
 		if("Ticker")
diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index 7816e88e556..52c976ec470 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -200,7 +200,7 @@ datum/controller/vote
 						return 0
 					choices.Add(config.votable_modes)
 				if("crew_transfer")
-					if (check_rights(R_ADMIN|R_MOD))
+					if(check_rights(R_ADMIN|R_MOD))
 						if(ticker.current_state <= 2)
 							return 0
 						question = "End the shift?"
diff --git a/code/datums/Emote_system/emote.dm b/code/datums/Emote_system/emote.dm
deleted file mode 100644
index 84f444ef5f4..00000000000
--- a/code/datums/Emote_system/emote.dm
+++ /dev/null
@@ -1,590 +0,0 @@
-/*******************************************************************************************************
-												Emotes
-Remember, only 1 instance of each emote is made, and used by all mobs that can access it. As such, the
-ONLY place you can safely set object variables during runtime is in New(). Otherwise override the emote.
-The only exception to this is custom emotes, which are created as needed and only last until they are finished
-VampyrBytes
-
-*******************************************************************************************************/
-#define EMOTE_COOLDOWN 20		//Time in deciseconds that the cooldown lasts
-#define HEARING_RANGE 7
-#define INVALID -1				//Using -1 as I can't see how a negative number could be a valid input
-
-/datum/emote
-	var/name = ""
-	var/desc = ""
-	var/list/commands[0]  // list of commands that trigger the emote.
-	var/text = ""
-	var/selfText = ""		// the version of text that you should see - eg, if text is screams, you want scream here, as You screams is bad grammer
-	var/startText = ""		// if you need to put something in before [user]
-	var/selfStart = 1		// whether the start text is used in what you see
-
-	var/audible = 0
-	var/mimeText = ""
-	var/mimeSelf = ""		//self version of mimeText
-	var/sound				// sound file
-	var/vol = 50
-	var/muzzleAffected = 0	// whether being muzzled affects this emote
-	var/muzzledNoise = ""	// if the emote is audible and you're muzzled, this is what type of noise you make (eg weak, loud).
-	var/cooldown = 0		// How long the cooldown should be on this emote. Defaults to EMOTE_COOLDOWN if not set and the emote plays a sound
-
-	var/restrained = 0	// 1 if being restrained prevents this emote
-
-	var/canTarget = 0		// 1 if the emote accepts a target
-	var/targetMob = 0		// 0 if target can be any atom, 1 if it has to be a mob,
-	var/mustTarget = 0		// 1 if the emote needs a target to work (won't get None as an option)
-	var/targetText = "at" // what goes inbetween user and target
-	var/takesNumber	= 0	// 1 if the emote uses a number parameter
-
-	var/emoteSpanClass = "say"
-	var/userSpanClass = "bold"
-	var/baseLevel = 1
-	var/allowParent = 0			// 1 if you want the parent available as well as this one
-
-
-/datum/emote/New()
-	var/pathString = "[type]"
-	var/count = 0
-	for(var/i in 1 to lentext(pathString))
-		var/char = copytext(pathString, i, i+1)
-		if(char == "/")
-			count++
-			if(count == 4)
-				baseLevel = 0
-				break
-
-	if(sound && !cooldown)
-		cooldown = EMOTE_COOLDOWN
-
-	if(targetText)
-		if(!findtextEx(targetText, " ", lentext(targetText)))
-			targetText += " "
-
-/datum/emote/proc/doEmote(var/mob/user, var/command = "")
-	if(!istype(user))
-		return
-	if(cooldown)
-		if(handle_emote_CD(user))
-			return
-
-	var/message = ""
-	var/list/params[0]
-
-	params = getParams(user)
-
-	for(var/p in params)
-		if(params[p] == INVALID)
-			return
-
-	if(text)
-		message = createMessage(user, params)
-
-	if(message)
-		message = addExtras(user, params, message)
-		. = processMessage(user, params, message)
-
-	if(!doMime(user) && (!muzzleAffected || !isMuzzled(user)))
-		if(playSound(user, params))
-			. = 2
-
-	doAction(user, params)
-
-	for(var/obj/item/weapon/implant/I in user)
-		if(I.implanted)
-			I.trigger(command, user)
-
-	return
-
-// for things that the emote does that aren't text or sound based
-/datum/emote/proc/doAction(var/mob/user, var/list/params)
-	return
-
-/datum/emote/proc/getParams(var/mob/user)
-	var/list/params[0]
-
-	if(takesNumber)
-		user.set_typing_indicator(1)
-		user.hud_typing = 1
-		params["num"] = getNumber(user)
-		user.hud_typing = 0
-		user.set_typing_indicator(0)
-
-	if(canTarget)
-		user.set_typing_indicator(1)
-		user.hud_typing = 1
-		params["target"] = getTarget(user)
-		user.hud_typing = 0
-		user.set_typing_indicator(0)
-	return params
-
-// return INVALID from either of these getters if you've tested the input and it's failed
-/datum/emote/proc/getNumber(var/mob/user)
-	var/number = input("How many?", "Enter number") as null|num
-	return number
-
-/datum/emote/proc/getTarget(var/mob/user)
-	if(user.sdisabilities & BLIND || user.blinded || user.paralysis)
-		return
-	var/list/targets = list()
-	if(!mustTarget)
-		targets += "None"
-	var/target
-	if(targetMob)
-		target = getMobTarget(user, targets)
-	else
-		target = getAtomTarget(user, targets)
-	if(!target)
-		return INVALID
-	if(target == "None")
-		return
-	return target
-
-/datum/emote/proc/getMobTarget(var/mob/user, var/list/targets)
-	for(var/mob/M in view(getLoc(user)))
-		targets += M
-	var/mob/target = input("Select target", "Target Mob") as null|anything in targets
-	return target
-
-
-/datum/emote/proc/getAtomTarget(var/mob/user, var/list/targets)
-	for(var/A in oview(getLoc(user)))
-		if(ismob(A) || isobj(A) || isturf(A))
-			targets += A
-	var/atom/target = input("Select target", "Target") as null|anything in targets
-	return target
-
-// returns the reason the user can't currently do the emote
-/datum/emote/proc/prevented(var/mob/user)
-	if(user.stat == DEAD)
-		return "you are dead"
-	if(user.stat == UNCONSCIOUS)
-		return "you are unconscious"
-	if(restrained && user.restrained())
-		return "you are restrained"
-	if(isbrain(user))
-		var/mob/living/carbon/brain/brain = user
-		if(!(brain.container && istype(brain.container, /obj/item/device/mmi)))
-			return "you need to be in an mmi to do this"
-
-// return 1 if this emote can be used by this type of user
-/datum/emote/proc/available(var/mob/user)
-	return
-
-/datum/emote/proc/createMessage(var/mob/user, var/list/params)
-	if(!text)
-		return
-	var/message = ""
-
-	if(doMime(user))
-		message = mimeMessage(user, params)
-		if(message)
-			return message
-
-	if(muzzleAffected && isMuzzled(user))
-		message = muzzleMessage(user, params)
-		return message
-
-	if(checkForParams(params))
-		message = paramMessage(user, params)
-		return message
-
-	message = standardMessage(user, params)
-
-	return message
-
-/datum/emote/proc/isMuzzled(var/mob/user)
-	if(user.sdisabilities & MUTE || user.is_muzzled())
-		return 1
-	if(!isliving(user))
-		return
-	var/mob/living/L = user
-	if(L.silent)
-		return 1
-
-/datum/emote/proc/checkForParams(var/list/params)
-	for(var/p in params)
-		if(p == "target")
-			continue
-		return 1
-
-/datum/emote/proc/addExtras(var/mob/user, var/list/params, var/message = "")
-	if(!message)
-		return
-	if(startText)
-		message = "[startText] [message]"
-	message = addPunc(message)
-	message = "<span class='[emoteSpanClass]'>[message]</span>"
-	return message
-
-/datum/emote/proc/addPunc(var/message = "")
-	var/regex/endingPunc = new("\[\\.!\\?\"]$")
-	if(!endingPunc.Find(message))
-		message += "."
-	return message
-
-/datum/emote/proc/standardMessage(var/mob/user, var/list/params)
-	var/message = "<span class='[userSpanClass]'>\The [user]</span> [text]"
-	if("target" in params)
-		message = addTarget(user, params, message)
-	return message
-
-/datum/emote/proc/mimeMessage(var/mob/user, var/list/params)
-	if(!mimeText)
-		return
-	if(checkForParams(params))
-		return paramMimeMessage(user, params)
-	var/message = "<span class='[userSpanClass]'>\The [user]</span> [mimeText]"
-	if(message && "target" in params)
-		message = addTarget(user, params, message)
-	return message
-
-/datum/emote/proc/muzzleMessage(var/mob/user, var/list/params)
-	var/message = "<span class='[userSpanClass]'>\The [user]</span> makes a "
-	if(muzzledNoise)
-		message += "[muzzledNoise] "
-	message += "noise"
-	return message
-
-// if the emote takes a non target parameter, set up  and return the with parameter version in here
-/datum/emote/proc/paramMessage(var/mob/user, var/list/params)
-	return
-
-// as above, but for mimes when there is mimeText
-/datum/emote/proc/paramMimeMessage(var/mob/user, var/list/params)
-	return
-
-/datum/emote/proc/addTarget(var/mob/user, var/list/params, var/message = "")
-	if(!canTarget)
-		return message
-	if(!params["target"])
-		return message
-	if(params["target"] == user)
-		message += " [targetText][getHimself(user)]"
-		return message
-	message += " [targetText]\the [params["target"]]"
-	return message
-
-
-// What you should see when you perform the emote
-/datum/emote/proc/createSelfMessage(var/mob/user, var/list/params, var/message = "")
-	if(!selfText)
-		return message
-
-	message = replacetext(message, text, selfText)
-	message = changeTextMacros(user, message)
-
-	if(mimeSelf)
-		message = replacetext(message, mimeText, mimeSelf)
-
-	if(startText && !selfStart)
-		var/start = findtextEx(message, startText)
-		var/end = start + lentext(startText) + 1
-		message = copytext(message, 1, start) + copytext(message, end, lentext(message) + 1)
-
-	message = replaceMobWithYou(user, message, user)
-
-	return message
-
-/datum/emote/proc/replaceMobWithYou(var/mob/M, var/message = "", var/mob/user)	// user passed in in case an override needs to do something different if M != user (see johnny) VB
-
-	message = replacetext(message, "\The [M]", "You")
-	message = replacetext(message, "\the [M]", "you")
-
-	return message
-
-/datum/emote/proc/processMessage(var/mob/user, var/list/params, var/message = "")
-	var/visualOrAudible = audible + 1
-	if(doMime(user))
-		visualOrAudible = 1
-
-	log_emote("[user.name]/[user.key] : [message]")
-	sendToDead(user, message)
-	for(var/mob/M in getRecipients(getLoc(user, message), visualOrAudible))
-		var/msg = ""
-
-		if(M==user)
-			msg = createSelfMessage(user, params, message)
-			if(msg)
-				outputMessage(M, msg, user)
-				continue
-
-		if(M.stat == UNCONSCIOUS || (M.sleeping && M.stat != DEAD))
-			if(!visualOrAudible == 2)
-				continue
-			msg = "<span class='italics'>... You can almost hear someone talking ...</span>"
-			outputMessage(M, msg, user)
-			continue
-
-		if(M.sdisabilities & DEAF || M.ear_deaf)
-			if(M.sdisabilities & BLIND || M.blinded || M.paralysis)
-				continue
-			if(!(M in getRecipients(user, 1)) || M.see_invisible < user.invisibility)
-				continue
-
-			msg = createDeafMessage(user, params, message)
-			if(!msg && visualOrAudible == 2)
-				continue
-			if(msg)
-				outputMessage(M, msg, user)
-				continue
-
-		if(M.sdisabilities & BLIND || M.blinded || M.paralysis || (M.see_invisible < user.invisibility && visualOrAudible == 2))
-			if(!(M in getRecipients(user, 2)))
-				continue
-
-			msg = createBlindMessage(user, params, message)
-			if(!msg && visualOrAudible == 1)
-				continue
-			if(msg)
-				outputMessage(M, msg, user)
-				continue
-
-		if(M.see_invisible < user.invisibility && visualOrAudible == 1)
-			continue
-
-		msg = message
-		outputMessage(M, msg, user)
-
-	if(visualOrAudible == 2)
-		handleListeningObjects(user, message)
-
-	return visualOrAudible
-
-/datum/emote/proc/outputMessage(var/mob/M, var/msg = "", var/mob/user)
-	msg = replaceMobWithYou(M, msg, user)
-	to_chat(M, msg)
-
-/datum/emote/proc/getLoc(var/mob/user, var/message = "")
-	var/loc = checkForHolopad(user, message)
-	if(loc)
-		return loc
-	return user
-
-/datum/emote/proc/checkForHolopad(var/mob/user, var/message = "")
-	if(!isAI(user))
-		return
-	var/mob/living/silicon/ai/AI = user
-	var/obj/machinery/hologram/holopad/T = AI.holo
-	if(!(T && T.hologram && T.master == AI))
-		return
-	if(message)
-		to_chat(AI, "<span class='game say'>Holopad action relayed, <span class='message'>[message]</span></span>")
-	return T
-
-/datum/emote/proc/handleListeningObjects(var/mob/user, var/message = "")
-	// based on say code
-	var/omsg = replacetext(message, "<B>[user]</B> ", "")
-	var/list/listening_obj = new
-	for(var/atom/movable/A in view(HEARING_RANGE, user))
-		if(istype(A, /mob))
-			var/mob/M = A
-			for(var/obj/O in M.contents)
-				listening_obj |= O
-		else if(istype(A, /obj))
-			var/obj/O = A
-			listening_obj |= O
-	for(var/obj/O in listening_obj)
-		O.hear_message(user, omsg)
-
-/datum/emote/proc/getRecipients(var/location, var/visualOrAudible)
-	if(visualOrAudible == 1)
-		return viewers(location)
-	return get_mobs_in_view(HEARING_RANGE, location)
-
-// set up different messages for blind people here. Empty will mean no message for
-//non-audible emotes and the standard message for audible ones
-/datum/emote/proc/createBlindMessage(var/mob/user, var/list/params, var/message)
-	if(audible && selfText)
-		message = "<span class='[userSpanClass]'>You</span> hear someone [selfText]"
-		message = addExtras(message)
-	return message
-
-// set up different messages for deaf people here. Empty will mean no message for
-// audible emotes and standard for non-audible ones
-/datum/emote/proc/createDeafMessage(var/mob/user, var/list/params, var/message)
-	message = mimeMessage(user, params)
-	message = addExtras(message)
-	return message
-
-/datum/emote/proc/sendToDead(var/mob/user, var/message = "", var/ghostEmote)
-	for(var/mob/M in dead_mob_list)
-		if(!M.client || istype(M, /mob/new_player))
-			continue //skip monkeys, leavers and new players
-		if(M.stat == DEAD)
-			if(ghostEmote && ((M.client.prefs.toggles & CHAT_GHOSTSIGHT) || (M in viewers(user))))
-				M.show_message(message)
-			else if((M.client.prefs.toggles & CHAT_GHOSTSIGHT) && !(M in viewers(user)))
-				M.show_message(message)
-
-/datum/emote/proc/playSound(var/mob/user, var/list/params)
-	if(!sound)
-		return
-	playsound(user, sound, vol)
-	return 1
-
-/datum/emote/proc/doMime(var/mob/user)
-	if(mimeText && user.mind && user.mind.miming)
-		return 1
-
-//Emote Cooldown System (it's so simple!)
-/datum/emote/proc/handle_emote_CD(var/mob/user)
-	if(user.emote_cd == 2) // Cooldown emotes were disabled by an admin, prevent use
-		return 1
-	if(user.emote_cd == 1) // Already on CD, prevent use
-		return 1
-
-	user.emote_cd = 1		// Starting cooldown
-
-	spawn(cooldown)
-		if(!user || user.emote_cd == 2) // Don't reset if cooldown emotes were disabled by an admin during the cooldown
-			return 1
-		user.emote_cd = 0				// Cooldown complete, ready for more!
-
-	return 0		// Proceed with emote
-//--FalseIncarnate
-
-/datum/emote/proc/changeTextMacros(var/mob/user, var/message = "")
-	message = swapHisToYour(user, message)
-	message = swapHimselfToYourself(user, message)
-	return message
-
-/datum/emote/proc/getHis(var/mob/user)
-	var/his = "[user]\his"
-	his = copytext(his, lentext("[user]") + 1)
-	return his
-
-/datum/emote/proc/swapHisToYour(var/mob/user, var/message = "")
-	var/his = getHis(user)
-	message = replacetext(message, " [his] ", " your ")
-	return message
-
-/datum/emote/proc/getHimself(var/mob/user)
-	var/himself = "[user]\himself"
-	himself = copytext(himself, lentext("[user]") + 1)
-	return himself
-
-/datum/emote/proc/swapHimselfToYourself(var/mob/user, var/message)
-	var/himself = getHimself(user)
-	message = replacetext(message, "[himself]", "yourself")
-	return message
-
-/******************************************************************************************
-								Emote Verbs
-******************************************************************************************/
-
-/datum/emote/proc/addVerbs(var/mob/user)
-	if(!istype(user))
-		return
-	new /obj/emoteVerb(user, src, commands)
-
-// Dummy object to allow access to the verb, needed as verbs require a valid loc for setting the src
-/obj/emoteVerb
-	var/datum/emote/emote
-	var/mob/owner
-
-/obj/emoteVerb/New(var/mob/user, var/datum/emote/toAccess)
-	if(!(istype(user)))
-		return
-	if(!(istype(toAccess)))
-		return
-	if(!toAccess.commands)
-		return
-	owner = user
-	emote = toAccess
-	name = "[emote]"
-	loc = user
-	user.verbs += new/obj/emoteVerb/proc/runEmote(src, emote.commands[1], emote.desc)
-
-/obj/emoteVerb/proc/runEmote()
-	set src = usr.contents
-	set category = "Emotes"
-	return usr.emoteHandler.runEmote(emote.commands[1])
-
-/obj/emoteVerb/Destroy()
-	owner.verbs -= new/obj/emoteVerb/proc/runEmote(src, emote.commands[1])
-	..()
-
-/obj/emoteVerb/custom
-
-obj/emoteVerb/custom/New(var/mob/user)
-	if(!(istype(user)))
-		return
-	owner = user
-	name = "custom"
-	user.verbs += new/obj/emoteVerb/proc/runEmote(src, "custom", "Make your own emote")
-
-/obj/emoteVerb/custom/runEmote()
-	set src = usr.contents
-	set category = "Emotes"
-	return usr.emoteHandler.runEmote("me")
-
-
-
-/**************************************************************************************************************************
-												Custom Emotes
-As these are made as needed, they aren't searched for the appropriate one. As such, you need to specify conditions for which
-one is used in /datum/emote_handler/customEmote().
-
-***************************************************************************************************************************/
-
-/datum/emote/custom
-	name = "Custom emote"
-	baseLevel = 0
-
-/datum/emote/custom/New(var/mob/user, var/message = "", var/isAudible)
-	if(!message)
-		message = getMessage(user)
-	text = message
-	audible = isAudible
-
-/datum/emote/custom/proc/getMessage(var/mob/user)
-//	user.set_typing_indicator(1)
-//	user.hud_typing = 1
-	var/input = copytext(input(user,"What do you want to emote?", "Custom emote") as text|null,1,MAX_MESSAGE_LEN)
-//	user.hud_typing = 0
-//	user.set_typing_indicator(0)
-	input = trim_strip_html_properly(input)
-	return input
-
-/datum/emote/custom/available(var/mob/user)
-	return 1
-
-/datum/emote/custom/prevented(var/mob/user)
-	if(!user.use_me)
-		return "you are prevented from using custom emotes"
-	return ..()
-
-// Yeah, no
-/datum/emote/custom/createSelfMessage(var/mob/user, var/list/params, var/message = "")
-	return
-
-/datum/emote/custom/replaceMobWithYou(var/mob/M, var/message = "", var/mob/user)
-	return message
-
-/datum/emote/custom/ghost
-	name = "Ghost emote"
-	startText = "<span class='prefix'>DEAD: </span>"
-	emoteSpanClass = "game deadsay"
-
-/datum/emote/custom/ghost/prevented(var/mob/user)
-	if(!user.use_me)
-		return "you are prevented from using custom emotes"
-	if(user.client.prefs.muted & MUTE_DEADCHAT)
-		return "you are muted from deadchat"
-	if(!(user.client.prefs.toggles & CHAT_DEAD))
-		return "you have deadchat muted"
-	if(!user.client.holder)
-		if(!config.dsay_allowed)
-			return "deadchat is globally muted"
-
-/datum/emote/custom/ghost/getMessage(var/mob/user)
-	var/input = copytext(input(user,"What do you want to emote?", "Custom emote") as text|null,1,MAX_MESSAGE_LEN)
-	input = trim_strip_html_properly(input)
-	return input
-
-/datum/emote/custom/ghost/processMessage(var/mob/user, var/list/params, var/message = "")
-	if(!message)
-		return
-	log_emote("Ghost/[user.key] : [message]")
-	sendToDead(user, message, ghostEmote = 1)
-
diff --git a/code/datums/Emote_system/emote_handler.dm b/code/datums/Emote_system/emote_handler.dm
deleted file mode 100644
index be962a72dc7..00000000000
--- a/code/datums/Emote_system/emote_handler.dm
+++ /dev/null
@@ -1,90 +0,0 @@
-/datum/emoteHandler
-	var/mob/owner
-	var/list/commands
-
-/datum/emoteHandler/New(var/mob/user)
-	owner = user
-	setupCommands()
-
-/datum/emoteHandler/proc/setupCommands(var/reset = 0)
-	spawn(0)			// needed so at mob creation species is set before emotes are allocated
-		if(reset)
-			deleteEmoteVerbs()
-		commands = new/list()
-		for(var/e in emotes)
-			var/datum/emote/emote = e
-			if(emote.baseLevel || emote.allowParent)
-				var/datum/emote/found = searchTree(emote)
-				if(found)
-					for(var/command in found.commands)
-						commands[lowertext(command)] = found
-					found.addVerbs(owner)
-
-/datum/emoteHandler/proc/deleteEmoteVerbs()
-	for(var/obj/emoteVerb/E in owner.contents)
-		qdel(E)
-
-/datum/emoteHandler/proc/runEmote(var/command = "", var/message = "", var/audible = 0) // message and audible only used in custom emotes
-	if(!command)
-		return 0
-	if(command == "help")
-		showCommands()
-		return 1
-
-	var/datum/emote/emote
-
-	if(copytext(command, 1, 3) == "me" && !message && lentext(command) >= 4)
-		message = copytext(command, 4)
-		command = "me"
-
-	if(command == "me")
-		emote = customEmote(message, audible)
-		if(!emote)
-			return 0
-
-	if(!commands[command] && !(command == "me"))
-		to_chat(owner, "<span class='notice'>Unknown emote, please check *help for emotes available to your character</span>")
-		return 0
-
-	if(!emote)
-		emote = commands[command]
-
-	if(!emote.available(owner))	// something's changed, remake the commands list, then try again to see if they've got a different version
-		setupCommands()
-		return runEmote(command, message, audible)
-
-	var/prevented = emote.prevented(owner)
-	if(prevented)
-		to_chat(owner, "<span class='notice'>You can't do that because [prevented]!</span>")
-		return 0
-	return emote.doEmote(owner, command)
-
-/datum/emoteHandler/proc/showCommands()
-	var/emoteList = "Available emotes are "
-	var/commandAdded = 0
-	for(var/c in commands)
-		if(commandAdded)
-			emoteList += ", "
-		emoteList += c
-		commandAdded = 1
-
-	to_chat(owner, emoteList)
-
-// recursive search of subtypes - starts checking at the lowest level and breaks out if it finds one that can be done
-/datum/emoteHandler/proc/searchTree(var/datum/emote/emote)
-	var/list/subtypes = subtypesof(emote.type)
-	var/datum/emote/found
-	for(var/t in subtypes)
-		var/datum/emote/em = new t
-		if(em.allowParent)
-			continue
-		found = searchTree(em)
-		if(found)
-			return (found)
-	if(emote.available(owner))
-		return emote
-
-/datum/emoteHandler/proc/customEmote(var/custom, var/audible)
-	if(isobserver(owner))
-		return new /datum/emote/custom/ghost(owner, custom, audible)
-	return new /datum/emote/custom(owner, custom, audible)
diff --git a/code/datums/Emote_system/emotes.dm b/code/datums/Emote_system/emotes.dm
deleted file mode 100644
index 35303e84ea6..00000000000
--- a/code/datums/Emote_system/emotes.dm
+++ /dev/null
@@ -1,1739 +0,0 @@
-
-/datum/emote/airguitar
-	name = "airguitar"
-	desc = "Makes the mob play an air guitar"
-	commands = list("airguitar")
-	text = "is strumming the air and headbanging like a safari chimp"
-	selfText = "are strumming the air and headbanging like a safari chimp"
-	restrained = 1
-
-/datum/emote/airguitar/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(isrobot(user))
-		return 1
-
-/datum/emote/alarm
-	name = "alarm"
-	desc = "makes the mob sound an alarm"
-	commands = list("alarm")
-	text = "sounds an alarm"
-	selfText = "sound an alarm"
-	audible = 1
-
-/datum/emote/alarm/available(var/mob/user)
-	if(isbrain(user))
-		return 1
-
-/datum/emote/alarm/createBlindMessage(var/mob/user, var/params, var/messaage)
-	return "You hear an alarm"
-
-/datum/emote/alert
-	name = "alert"
-	desc = "Makes the mob sound an alert"
-	commands = list("alert")
-	text = "lets out a distressed noise"
-	selfText = "let out a distressed noise"
-	audible = 1
-
-/datum/emote/alert/available(var/mob/user)
-	if(isbrain(user))
-		return 1
-
-/datum/emote/beep
-	name = "beep"
-	desc = "makes the mob let out a beep"
-	commands = list("beep")
-	text = "beeps"
-	selfText = "beep"
-	audible = 1
-
-/datum/emote/beep/available(var/mob/user)
-	if(isbrain(user))
-		return 1
-
-/datum/emote/beep/targetted
-	sound = 'sound/machines/twobeep.ogg'
-	cooldown = 50
-	canTarget = 1
-	targetMob = 1
-
-/datum/emote/beep/targetted/available(var/mob/user)
-	if(user.is_mechanical())
-		return 1
-
-/datum/emote/blink
-	name = "blink"
-	desc = "Makes the mob blink"
-	commands = list("blink", "blinks")
-	text = "blinks"
-	selfText = "blink"
-
-/datum/emote/blink/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(isbrain(user))
-		return 1
-
-/datum/emote/blink/rapid
-	name = "rapid blink"
-	desc = "Makes the mob blink rapidly"
-	commands = list("blink_r", "blinks_r")
-	allowParent = 1
-
-/datum/emote/blink/rapid/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/blink/rapid/standardMessage(var/mob/user)
-	var/message = ..()
-	message += " rapidly"
-	return message
-
-/datum/emote/blush
-	name = "blush"
-	desc = "Makes the mob blush"
-	commands = list("blush", "blushes")
-	text = "blushes"
-	selfText = "blush"
-
-/datum/emote/blush/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/boop
-	name = "boop"
-	desc = "Makes the mob boop"
-	commands = list("boop", "boops")
-	text = "boops"
-	selfText = "boop"
-
-/datum/emote/boop/available(var/mob/user)
-	if(isbrain(user))
-		return 1
-
-/datum/emote/bounce
-	name = "bounce"
-	desc = "Makes the mob bounce"
-	commands = list("bounce", "bounces")
-	text = "bounces in place"
-	selfText = "bounce in place"
-
-/datum/emote/bounce/available(var/mob/user)
-	if(isslime(user))
-		return 1
-
-/datum/emote/bow
-	name = "bow"
-	desc = "Makes the mob bow"
-	commands = list("bow", "bows")
-	text = "bows"
-	selfText = "bow"
-	canTarget = 1
-	targetMob = 1
-	targetText = "to"
-
-/datum/emote/bow/available(var/mob/user)
-	if(isrobot(user))
-		return 1
-	if(ishuman(user))
-		return 1
-
-/datum/emote/bow/prevented(var/mob/user)
-	. = ..()
-	if(!. && user.buckled)
-		return "you are buckled to something"
-
-/datum/emote/burp
-	name = "burp"
-	desc = "Makes the mob burp"
-	commands = list("burp", "burps")
-	text = "burps"
-	selfText = "burp"
-	audible = 1
-	mimeText = "opens their mouth rather obnoxiously"
-	mimeSelf = "open your mouth rather obnoxiously"
-	muzzleAffected = 1
-	muzzledNoise = "peculiar"
-
-/datum/emote/burp/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(islarva(user) || isalienadult(user))
-		return 1
-
-/datum/emote/buzz
-	name = "buzz"
-	desc = "Makes the mob buzz"
-	commands = list("buzz", "buzzes", "buzzs")
-	text = "buzzes"
-	selfText = "buzz"
-	audible = 1
-	sound = 'sound/machines/buzz-sigh.ogg'
-	canTarget = 1
-	targetMob = 1
-
-/datum/emote/buzz/available(var/mob/user)
-	if(user.is_mechanical())
-		return 1
-
-/datum/emote/buzz/buzz2
-	name = "buzz 2"
-	desc = "makes the mob buzz in an irritated way"
-	commands = list("buzz2")
-	text = "makes an irritated buzzing sound"
-	selfText = "make an irritated buzzing sound"
-	sound = "sound/machines/buzz-two.ogg"
-	allowParent = 1
-
-/datum/emote/chirp
-	name = "chirp"
-	desc = "Makes the mob chirp"
-	commands = list("chirp", "chirps")
-	text = "chirps"
-	selfText = "chirp"
-	audible = 1
-	sound = 'sound/misc/nymphchirp.ogg'
-	vol = 40
-	cooldown = 50
-
-/datum/emote/chirp/available(var/mob/user)
-	if(istype(user, /mob/living/simple_animal/diona))
-		return 1
-
-/datum/emote/choke
-	name = "choke"
-	desc = "Makes the mob choke"
-	commands = list("choke", "chokes")
-	text = "chokes"
-	selfText = "choke"
-	audible = 1
-	mimeText = "clutches"
-	mimeSelf = "clutch"
-	muzzleAffected = 1
-	muzzledNoise = "strong"
-
-/datum/emote/choke/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(islarva(user) || isalienadult(user))
-		return 1
-
-// This has to be done here not mimeText because \his will throw a compile error
-// instead of a runtime if there's not a valid target in the string *frown VB
-/datum/emote/choke/mimeMessage(var/mob/user, var/list/params)
-	var/message = "[user] [mimeText] \his throat desperately"
-	return message
-
-/datum/emote/chuckle
-	name = "chuckle"
-	desc = "chuckle"
-	commands = list("chuckle", "chuckles")
-	text = "chuckles"
-	selfText = "chuckle"
-	audible = 1
-	mimeText = "appears to chuckle"
-	mimeSelf = "appear to chuckle"
-	muzzleAffected = 1
-
-/datum/emote/chuckle/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/clap
-	name = "clap"
-	desc = "clap"
-	commands = list("clap", "claps")
-	text = "claps"
-	selfText = "clap"
-	audible = 1
-	mimeText = "claps silently"
-	restrained = 1
-
-/datum/emote/clap/available(var/mob/user)
-	if(isrobot(user))
-		return 1
-	if(ishuman(user))
-		return 1
-
-/datum/emote/collapse
-	name = "collapse"
-	desc = "Makes the mob collapse"
-	commands = list("collapse", "collapses")
-	text = "collapses"
-	selfText = "collapse"
-	audible = 1
-	mimeText = "collapses without a sound"
-
-/datum/emote/collapse/available(var/mob/user)
-	if(islarva(user))
-		return 1
-	if(ishuman(user))
-		return 1
-
-/datum/emote/collapse/doAction(var/mob/user, var/list/params)
-	user.Paralyse(2)
-
-/datum/emote/cough
-	name = "cough"
-	desc = "Makes the mob cough"
-	commands = list("cough", "coughs")
-	text = "coughs"
-	selfText = "cough"
-	audible = 1
-	mimeText = "appears to cough"
-	mimeSelf = "appear to cough"
-	muzzleAffected = 1
-	muzzledNoise = "strong"
-
-/datum/emote/cough/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/cry
-	name = "cry"
-	desc = "Makes the mob cry"
-	commands = list("cry", "cries")
-	text = "cries"
-	selfText = "cry"
-	audible = 1
-	mimeText = "cries silently"
-	muzzleAffected = 1
-	muzzledNoise = "weak"
-
-/datum/emote/cry/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/dance
-	name = "dance"
-	desc = "makes the mob dance around happily"
-	commands = list("dance", "dances")
-	text = "dances around happily"
-	selfText = "dance around happily"
-	restrained = 1
-
-/datum/emote/dance/available(var/mob/user)
-	if(islarva(user))
-		return 1
-
-/datum/emote/dap
-	name = "dap"
-	desc = "Makes the mob give daps"
-	commands = list("dap", "daps")
-	text = "gives daps"
-	selfText = "give daps"
-	restrained = 1
-	canTarget = 1
-	targetMob = 1
-	targetText = "to"
-
-/datum/emote/dap/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/dap/addTarget(var/mob/user, var/list/params, var/message = "")
-	if(!params["target"] || params["target"] == user)
-		message = "<span class='[userSpanClass]'>[user]</span> sadly can't find anybody to give daps to, and daps \himself. Shameful"
-		return message
-	return ..()
-
-/datum/emote/deathgasp
-	name = "deathgasp"
-	desc = "Makes the mob let out it's final gasp"
-	commands = list("deathgasp", "deathgasps")
-	audible = 1
-
-/datum/emote/deathgasp/prevented(var/mob/user)
-	if(user.stat == DEAD)
-		return "you are already dead!"
-
-/datum/emote/deathgasp/alien
-	text = "lets out a waning guttural screech, green blood bubbling from its maw..."
-	selfText = "let out a waning guttural screech, green blood bubbling from your maw..."
-
-/datum/emote/deathgasp/alien/available(var/mob/user)
-	if(isalienadult(user))
-		return 1
-
-// sorry, no selftext for humans as we'd have to add a var to species for it and that's yuk - VB
-/datum/emote/deathgasp/human
-	text = "dummytext"
-
-/datum/emote/deathgasp/human/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/deathgasp/human/standardMessage(var/mob/user, var/list/params)
-	var/mob/living/carbon/human/U = user
-	var/message = "<span class='[userSpanClass]'>\The [user]</span> [U.species.death_message]"
-	return message
-
-/datum/emote/deathgasp/human/createSelfMessage(var/mob/user, var/list/params, var/message)
-	return message
-
-/datum/emote/deathgasp/human/replaceMobWithYou(var/mob/user, var/message)
-	return message
-
-/datum/emote/deathgasp/robot
-	text = "shudders violently for a moment, then becomes motionless, its eyes slowly darkening"
-	selfText = "shudder violently for a moment, then become motionless, your eyes slowly darkening"
-	audible = 0
-
-/datum/emote/deathgasp/robot/available(var/mob/user)
-	if(isrobot(user))
-		return 1
-
-/datum/emote/drone
-	name = "drone"
-	desc = "Makes the mob drone and rumble"
-	commands = list("drone", "drones", "rumble", "rumbles", "hum", "hums")
-	text = "rumbles"
-	selfText = "rumble"
-	audible = 1
-	sound = 'sound/voice/DraskTalk.ogg'
-	canTarget = 1
-	targetMob = 1
-
-/datum/emote/drone/available(var/mob/user)
-	if(user.get_species() == "Drask")
-		return 1
-
-/datum/emote/drone/addTarget(var/mob/user, var/list/params, var/message)
-	if(!params["target"])
-		return message
-	message = replacetext(message, "rumbles", "drones")
-	return ..()
-
-/datum/emote/drone/createSelfMessage(var/mob/user, var/list/params, var/message)
-	message = ..()
-	message = replacetext(message, "drones", "drone")
-	return message
-
-/datum/emote/drool
-	name = "drool"
-	desc = "Makes the mob drool"
-	commands = list("drool", "drools")
-	text = "drools"
-	selfText = "drool"
-
-/datum/emote/drool/available(var/mob/user)
-	if(isalienadult(user) || islarva(user))
-		return 1
-	if(ishuman(user))
-		return 1
-
-/datum/emote/eyebrow
-	name = "eyebrow"
-	desc = "Makes the mob raise an eyebrow"
-	commands = list("eyebrow")
-	text = "raises an eyebrow"
-	selfText = "raise an eyebrow"
-
-/datum/emote/eyebrow/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/faint
-	name = "faint"
-	desc = "makes the mob faint"
-	commands = list("faint", "faints")
-	text = "faints"
-	selfText = "faint"
-
-/datum/emote/faint/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/faint/doAction(var/mob/user, var/list/params)
-	if(!user.sleeping)
-		user.sleeping += 1
-
-/datum/emote/fart
-	name = "fart"
-	desc = "makes the mob fart"
-	commands = list("fart", "farts")
-	text = "farts"
-	selfText = "fart"
-	cooldown = 50
-	audible = 1
-
-/datum/emote/fart/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/fart/standardMessage(var/mob/user)
-	var/message
-
-	if(TOXIC_FARTS in user.mutations)
-		message = "<span class='[emoteSpanClass]'><span class='[userSpanClass]'>\The [user]</span> unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart</span>"
-		return message
-	message = "<span class='[emoteSpanClass]'><span class='[userSpanClass]'>\The [user]</span> [pick("passes wind","farts")]</span>"
-	return message
-
-/datum/emote/fart/createSelfMessage(var/mob/user, var/list/params, var/message)
-	message = ..()
-	message = replacetext(message, "unleashes", "unleash")
-	message = replacetext(message, "passes", "pass")
-	return message
-
-/datum/emote/fart/doAction(var/mob/user)
-	if(TOXIC_FARTS in user.mutations)
-		for(var/mob/M in range(get_turf(user),2))
-			if(M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
-				continue
-			if(M == user)
-				continue
-			M.reagents.add_reagent("jenkem", 1)
-
-	if(locate(/obj/item/weapon/storage/bible) in get_turf(user))
-		to_chat(viewers(user), "<span class='warning'><b>[user] farted on the Bible!</b></span>")
-		to_chat(viewers(user), "<span class='notice'><b>A mysterious force smites [user]!</b></span>")
-		var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
-		s.set_up(3, 1, user)
-		s.start()
-		user.gib()
-
-/datum/emote/flap
-	name = "flap"
-	desc = "Makes the mob flap their wings"
-	commands = list("flap", "flaps")
-	text = "flaps"
-	selfText = "flap"
-	restrained = 1
-	audible = 1
-
-/datum/emote/flap/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(isrobot(user))
-		return 1
-
-/datum/emote/flap/standardMessage(var/mob/user, var/list/params)
-	var/message = "<span class='[userSpanClass]'>\The [user]</span> [text] \his wings"
-	return message
-
-/datum/emote/flap/angry
-	name = "angry flap"
-	desc = "makes the mob flap their wings angrily"
-	commands = list("a_flap", "a_flaps")
-	allowParent = 1
-
-/datum/emote/flap/angry/standardMessage(var/mob/user)
-	var/message = ..()
-	message += " angrily"
-	return message
-
-/datum/emote/flash
-	name = "flash"
-	desc = "Makes the lights on the mob flash quickly"
-	commands = list("flash", "flashes")
-	text = "flash quickly"
-	selfText = "flash quickly"
-	startText = "The lights on"
-
-/datum/emote/flash/available(var/mob/user)
-	if(isbrain(user))
-		return 1
-
-/datum/emote/flip
-	name = "flip"
-	desc = "Makes the mob flip, possibly in the direction of someone"
-	commands = list("flip", "flips")
-	text = "flips"
-	selfText = "flip"
-	canTarget = 1
-	targetMob = 1
-	targetText = "in"
-
-/datum/emote/flip/available(var/mob/user)
-	if(isrobot(user))
-		return 1
-
-/datum/emote/flip/prevented(var/mob/user)
-	. = ..()
-	if(!. && user.buckled)
-		return "you are buckled to something"
-
-/datum/emote/flip/createMessage(var/mob/user, var/list/params)
-	var/message = ""
-	if(user.lying || user.weakened)
-		message = "<span class='[userSpanClass]'>\The [user]</span> flops and flails around on the floor"
-	else
-		message = ..()
-	return message
-
-/datum/emote/flip/addTarget(var/mob/user, var/list/params, var/message)
-	message = ..()
-	if(params["target"])
-		message += "'s general direction"
-	return message
-
-/datum/emote/flip/createSelfMessage(var/mob/user, var/list/params, var/message)
-	message = ..()
-	message = replacetext(message, "flops", "flop")
-	message = replacetext(message, "flails", "flail")
-	return message
-
-/datum/emote/flip/doAction(var/mob/user, var/list/params, var/message)
-	if(user.lying || user.weakened)
-		return
-	user.SpinAnimation(5,1)
-
-/datum/emote/flip/flipOver
-	desc = "Makes the mob flip, possibly in the direction of, or even over someone"
-
-/datum/emote/flip/flipOver/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/flip/flipOver/createMessage(var/mob/user, var/params)
-	var/message = ""
-	var/obj/item/weapon/grab/G = user.get_active_hand()
-	if(istype(G) && G.affecting && !G.affecting.buckled)
-		params["target"] = G.affecting
-		message = "<span class='[userSpanClass]'>\The [user]</span> [text] over [params["target"]]!"
-		return message
-	return ..()
-
-/datum/emote/flip/flipOver/doAction(var/mob/user, var/params, var/message)
-	var/obj/item/weapon/grab/G = user.get_active_hand()
-	if(istype(G) && (G.affecting == params["target"]) && !G.affecting.buckled)
-		var/turf/oldloc = user.loc
-		var/turf/newloc = G.affecting.loc
-		if(isturf(oldloc) && isturf(newloc))
-			user.SpinAnimation(5,1)
-			user.forceMove(newloc)
-			G.affecting.forceMove(oldloc)
-			return
-	..()
-
-/datum/emote/frown
-	name = "frown"
-	desc = "Makes the mob frown"
-	commands = list("frown", "frowns")
-	text = "frowns"
-	selfText = "frown"
-
-/datum/emote/frown/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/gasp
-	name = "gasp"
-	desc = "Makes the mob gasp"
-	commands = list("gasp", "gasps")
-	text = "gasps"
-	selfText = "gasp"
-	audible = 1
-	mimeText = "appears to be gasping"
-	mimeSelf = "appear to be gasping"
-	muzzleAffected = 1
-	muzzledNoise = "weak"
-
-/datum/emote/gasp/available(var/mob/user)
-	if(isalienadult(user) || islarva(user))
-		return 1
-	if(ishuman(user))
-		return 1
-
-/datum/emote/giggle
-	name = "giggle"
-	desc = "Makes the mob giggle"
-	commands = list("giggle", "giggles")
-	text = "giggles"
-	selfText = "giggle"
-	audible = 1
-	mimeText = "giggles silently"
-	muzzleAffected = 1
-
-/datum/emote/giggle/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/glare
-	name = "glare"
-	desc = "Makes the mob glare"
-	commands = list("glare", "glares")
-	text = "glares"
-	selfText = "glare"
-	canTarget = 1
-	targetMob = 1
-
-/datum/emote/glare/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(isrobot(user))
-		return 1
-
-/datum/emote/gnarl
-	name = "gnarl"
-	desc = "Makes the mob gnarl and show its teeth"
-	commands = list("gnarl", "gnarls")
-	text = "gnarls and shows its teeth"
-	selfText = "gnarl and show your teeth"
-	audible = 1
-	muzzleAffected = 1
-
-/datum/emote/gnarl/available(var/mob/user)
-	if(islarva(user))
-		return 1
-
-/datum/emote/grin
-	name = "grin"
-	desc = "Makes the mob grin"
-	commands = list("grin", "grins")
-	text = "grins"
-	selfText = "grin"
-
-/datum/emote/grin/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/groan
-	name = "groan"
-	desc = "Makes the mob groan"
-	commands = list("groan", "groans")
-	text = "groans"
-	selfText = "groan"
-	audible = 1
-	mimeText = "appears to groan"
-	mimeSelf = "appear to groan"
-	muzzleAffected = 1
-
-/datum/emote/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/grumble
-	name = "grumble"
-	desc = "Makes the mob grumble"
-	commands = list("grumble", "grumbles")
-	text = "grumbles"
-	selfText = "grumble"
-	audible = 1
-	mimeText = "grumbles"
-	muzzleAffected = 1
-
-/datum/emote/grumble/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/halt
-	name = "halt"
-	desc = "Makes the mob sound a halt warning. Only available with a security module"
-	commands = list("halt")
-	text = "'s speakers skreech, \"Halt! Security!\""
-	selfText = " speakers skreech, \"Halt! Security!\""
-	audible = 1
-	sound = 'sound/voice/halt.ogg'
-
-/datum/emote/halt/available(var/mob/user)
-	if(isrobot(user))
-		return 1
-
-/datum/emote/halt/prevented(var/mob/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/silicon/robot/U = user
-	if(!(istype(U.module, /obj/item/weapon/robot_module/security)))
-		return "you are not security"
-
-/datum/emote/handshake
-	name = "handshake"
-	desc = "Makes the mob shake hands with a target"
-	commands = list("handshake")
-	text = "shakes hands"
-	selfText = "shake hands"
-	canTarget = 1
-	targetMob = 1
-	mustTarget = 1
-	targetText = "with"
-	restrained = 1
-
-/datum/emote/handshake/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/handshake/prevented(var/mob/user)
-	. = ..()
-	if(!. && user.r_hand)
-		return "you need your right hand free"
-
-/datum/emote/handshake/addTarget(var/mob/user, var/list/params, var/message)
-	var/mob/target = params["target"]
-	if(target.r_hand)
-		message = "<span class='[userSpanClass]'>\The [user] holds out his hand to [params["target"]]"
-		return message
-	return ..()
-
-/datum/emote/hiss
-	name = "hiss"
-	desc = "Makes the mob hiss"
-	commands = list("hiss", "hisses")
-	text = "hisses"
-	selfText = "hiss"
-	audible = 1
-
-/datum/emote/hiss/available(var/mob/user)
-	if(isalienadult(user) || islarva(user))
-		return 1
-
-/datum/emote/hug
-	name = "hug"
-	desc = "Makes the mob hug a target or themselves"
-	commands = list("hug", "hugs")
-	text = "hugs"
-	selfText = "hug"
-	canTarget = 1
-	targetMob = 1
-	targetText = ""
-
-/datum/emote/hug/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/hug/getTarget(var/mob/user)
-	var/mob/target = ..()
-	if(target)
-		return target
-	return user
-
-/datum/emote/jiggle
-	name = "jiggle"
-	desc = "Makes the mob jiggle"
-	commands = list("jiggle", "jiggles")
-	text = "jiggles"
-	selfText = "jiggle"
-
-/datum/emote/jiggle/available(var/mob/user)
-	if(isslime(user))
-		return 1
-
-/datum/emote/johnny
-	name = "johnny"
-	desc = "Yeah, just try it"
-	commands = list("johnny")
-	text = "takes a drag from a cigarette and blows their name out in smoke"
-	selfText = "take a drag from a cigarette and blow their name out in smoke"
-	audible = 1
-	mimeText = "takes a drag from a cigarette and blows"
-	mimeSelf = "take a drag from a cigarette and blow"
-	canTarget = 1
-	targetMob = 1
-	mustTarget = 1
-	targetText = ""
-
-/datum/emote/johnny/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/johnny/getTarget(var/mob/user)
-	var/mob/target = ..()
-	if(target != user)
-		return target
-	to_chat(user, "You need a target that isn't yourself")
-	return INVALID
-
-/datum/emote/johnny/createMessage(var/mob/user, var/params)
-	if(doMime(user))
-		return ..()
-	var/message = "\The [user] says \"[params["target"]], please. They had a family.\" [user] [text]"
-	return message
-
-/datum/emote/johnny/createSelfMessage(var/mob/user, var/list/params, var/message = "")
-	message = ..()
-	message = replacetext(message, "says", "say")
-	return message
-
-/datum/emote/johnny/createDeafMessage(var/mob/user, vap/list/params, var/message)
-	message = "\The [user] says something, then [text]"
-	return message
-
-/datum/emote/johnny/replaceMobWithYou(var/mob/M, var/message, var/mob/user)
-	if(user && M != user)
-		return message
-	return ..()
-
-/datum/emote/johnny/createBlindMessage(var/mob/user, var/list/params, var/message)
-	message = "You hear someone say \"[params["target"]], please, They had a family\""
-	return message
-
-/datum/emote/jump
-	name = "jump"
-	desc = "Makes the mob jump"
-	commands = list("jump", "jumps")
-	text = "jumps"
-	selfText = "jump"
-
-/datum/emote/jump/available(var/mob/user)
-	if(islarva(user) || isalienadult(user))
-		return 1
-	if(issmall(user))
-		return 1
-
-/datum/emote/laugh
-	name = "laugh"
-	desc = "Makes the mob laugh"
-	commands = list("laugh", "laughs")
-	text = "laughs"
-	selfText = "laugh"
-	audible = 1
-	mimeText = "acts out a laugh"
-	mimeSelf = "act out a laugh"
-	muzzleAffected = 1
-
-/datum/emote/laugh/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/law
-	name = "law"
-	desc = "Makes the mob prove it is the law"
-	commands = list("law")
-	text = "shows its legal authorization barcode"
-	selfText = "show your legal authorization barcode"
-	audible = 1
-	sound = 'sound/voice/biamthelaw.ogg'
-
-/datum/emote/law/available(var/mob/user)
-	if(isrobot(user))
-		return 1
-
-/datum/emote/law/prevented(var/mob/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/silicon/robot/U = user
-	if(!(istype(U.module, /obj/item/weapon/robot_module/security)))
-		return "You are not THE LAW, pal"
-
-/datum/emote/light
-	name = "light"
-	desc = "makes the mob light up"
-	commands = list("light", "lights")
-	text = "lights up for a bit, then stops"
-	selfText = "light up for a bit, then stop"
-
-/datum/emote/light/available(var/mob/user)
-	if(isslime(user))
-		return 1
-
-/datum/emote/look
-	name = "look"
-	desc = "Makes the mob look"
-	commands = list("look", "looks")
-	text = "looks"
-	selfText = "look"
-	canTarget = 1
-	targetMob = 1
-
-/datum/emote/look/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(isrobot(user))
-		return 1
-
-/datum/emote/look/addTarget(var/mob/user, var/list/params, var/message)
-	if(!params["target"])
-		message += " around"
-		return message
-	return ..()
-
-/datum/emote/moan
-	name = "moan"
-	desc = "Makes the mob moan"
-	commands = list("moan", "moans")
-	text = "moans"
-	selfText = "moan"
-	audible = 1
-
-/datum/emote/moan/available(var/mob/user)
-	if(isslime(user))
-		return 1
-	if(islarva(user))
-		return 1
-
-/datum/emote/mumble
-	name = "mumble"
-	desc = "Makes the mob mumble"
-	commands = list("mumble", "mumbles")
-	text = "mumbles"
-	selfText = "mumble"
-	audible = 1
-	mimeText = "mumbles"
-
-/datum/emote/mumble/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/no
-	name = "no"
-	desc = "Makes the mob let out a negative blip"
-	commands = list("no")
-	text = "emits a negative blip"
-	selfText = "emit a negative blip"
-	audible = 1
-	sound = 'sound/machines/synth_no.ogg'
-
-/datum/emote/no/New()
-	..()
-	commands += "no"
-
-/datum/emote/no/available(var/mob/user)
-	if(user.is_mechanical())
-		return 1
-
-/datum/emote/nod
-	name = "nod"
-	desc = "Makes the mob nod"
-	commands = list("nod", "nods")
-	text = "nods"
-	selfText = "nod"
-
-/datum/emote/nod/available(var/mob/user)
-	if(islarva(user))
-		return 1
-	if(isrobot(user))
-		return 1
-	if(ishuman(user))
-		return 1
-
-/datum/emote/notice
-	name = "notice"
-	desc = "Makes the mob play a loud tone"
-	commands = list("notice")
-	text = "plays a loud tone"
-	selfText = "play a loud tone"
-	audible = 1
-
-/datum/emote/notice/available(var/mob/user)
-	if(isbrain(user))
-		return 1
-
-/datum/emote/pale
-	name = "pale"
-	desc = "Makes the mob go pale"
-	commands = list("pale", "pales")
-	text = "goes pale for a second"
-	selfText = "go pale for a second"
-
-/datum/emote/pale/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/ping
-	name = "ping"
-	desc = "Makes the mob ping"
-	commands = list("ping", "pings")
-	text = "pings"
-	selfText = "ping"
-	audible = 1
-	sound = 'sound/machines/ping.ogg'
-	canTarget = 1
-	targetMob = 1
-
-/datum/emote/ping/available(var/mob/user)
-	if(user.is_mechanical())
-		return 1
-
-/datum/emote/point
-	name = "point"
-	desc = "Makes the mob point"
-	commands = list("point", "points")
-	text = "points"
-	selfText = "point"
-	canTarget = 1
-
-/datum/emote/point/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/point/createMessage(var/mob/user, var/list/params)
-	if(params["target"])
-		return
-	return ..()
-
-/datum/emote/point/doAction(var/mob/user, var/list/params)
-	if(!params["target"])
-		return
-	user.pointed(params["target"])
-
-/datum/emote/quiver
-	name = "quiver"
-	desc = "Makes the mob quiver"
-	commands = list("quiver", "quivers")
-	text = "quivers"
-	selfText = "quiver"
-
-/datum/emote/quiver/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/raise
-	name = "raise"
-	desc = "Makes the mob raise a hand"
-	commands = list("raise", "raises")
-	text = "raises a hand"
-	selfText = "raise a hand"
-	restrained = 1
-
-/datum/emote/raise/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/roar
-	name = "roar"
-	desc = "Makes the mob roar"
-	commands = list("roar", "roars")
-	text = "roars"
-	selfText = "roar"
-	audible = 1
-	muzzleAffected = 1
-	muzzledNoise = "loud"
-
-/datum/emote/roar/available(var/mob/user)
-	if(isalienadult(user))
-		return 1
-
-/datum/emote/roll
-	name = "roll"
-	desc = "Makes the mob roll"
-	commands = list("roll", "rolls")
-	text = "rolls"
-	selfText = "roll"
-
-/datum/emote/roll/available(var/mob/user)
-	if(islarva(user))
-		return 1
-	if(issmall(user))
-		return 1
-
-/datum/emote/salute
-	name = "salute"
-	desc = "Makes the mob salute"
-	commands = list("salute", "salutes")
-	text = "salutes"
-	selfText = "salute"
-	canTarget = 1
-	targetMob = 1
-	targetText = "to"
-
-/datum/emote/salute/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(isrobot(user))
-		return 1
-
-/datum/emote/salute/prevented(var/mob/user)
-	. = ..()
-	if(!. && user.buckled)
-		return "you are buckled to something"
-
-/datum/emote/salute/getMobTarget(var/mob/user, var/list/targets)
-	var/mob/target = ..()
-	if(target != user)
-		return target
-
-/datum/emote/scratch
-	name = "scratch"
-	desc = "Makes the mob scratch"
-	commands = list("scratch", "scratches")
-	text = "scratches"
-	selfText = "scratch"
-	restrained = 1
-
-/datum/emote/scratch/available(var/mob/user)
-	if(islarva(user) || isalienadult(user))
-		return 1
-	if(issmall(user))
-		return 1
-
-/datum/emote/scream
-	name = "scream"
-	desc = "makes the mob scream"
-	commands = list("scream", "screams")
-	text = "screams!"
-	selfText = "scream!"
-	audible = 1
-	mimeText = "acts out a scream"
-	muzzledNoise = "very loud"
-	cooldown = 50
-	vol = 80
-
-/datum/emote/scream/createMessage(var/mob/user, var/list/params)
-	var/mob/living/carbon/human/H = user
-
-	if(istype(H))
-		return "<span class='[userSpanClass]'>\The [user]</span> [H.species.scream_verb]!"
-	else
-		return ..()
-
-/datum/emote/scream/replaceMobWithYou(var/mob/M, var/message = "", var/mob/user)
-	var/mob/living/carbon/human/H = user
-
-	if(istype(H) && (H.species.scream_verb != "screams"))
-		return message
-	return ..()
-
-/datum/emote/scream/machine
-	name = "machine scream"
-	sound = 'sound/goonstation/voice/robot_scream.ogg'
-
-/datum/emote/scream/machine/available(var/mob/user)
-	if(user.is_mechanical())
-		return 1
-
-/datum/emote/scream/human
-	name = "human scream"
-
-/datum/emote/scream/human/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/scream/human/playSound(var/mob/user)
-	var/mob/living/carbon/human/H = user
-
-	if(H.gender == FEMALE)
-		playsound(H, "[H.species.female_scream_sound]", vol, 1, 0, pitch = H.get_age_pitch())
-	else
-		playsound(H, "[H.species.male_scream_sound]", vol, 1, 0, pitch = H.get_age_pitch())
-	return 1
-
-/datum/emote/scretch
-	name = "scretch"
-	desc = "makes the mob scretch"  //whatever that is!
-	commands = list("scretch", "scretches")
-	text = "scretches"
-	selfText = "scretch"
-	audible = 1
-	muzzleAffected = 1
-
-/datum/emote/scretch/available(var/mob/user)
-	if(isalienadult(user) || islarva(user))
-		return 1
-
-/datum/emote/shake
-	name = "shake"
-	desc = "Makes the mob shake its head"
-	commands = list("shake", "shakes")
-	text = "shakes"
-	selfText = "shake"
-
-/datum/emote/shake/available(var/mob/user)
-	if(islarva(user))
-		return 1
-	if(ishuman(user))
-		return 1
-
-/datum/emote/shake/standardMessage(var/mob/user)
-	var/message = ..()
-	message += " [getHis(user)] head"
-	return message
-
-/datum/emote/shiver
-	name = "shiver"
-	desc = "Makes the mob shiver"
-	commands = list("shiver", "shivers")
-	text = "shivers"
-	selfText = "shiver"
-	audible = 1
-	mimeText = "shivers"
-
-/datum/emote/shiver/available(var/mob/user)
-	if(isalienadult(user) || islarva(user))
-		return 1
-	if(isslime(user))
-		return 1
-	if(ishuman(user))
-		return 1
-
-/datum/emote/shiver/createBlindMessage(var/mob/user, var/list/params, var/message)
-	message = "you hear someone's teeth chattering together"
-
-/datum/emote/shrug
-	name = "shrug"
-	desc = "Makes the mob shrug"
-	commands = list("shrug", "shrugs")
-	text = "shrugs"
-	selfText = "shrug"
-
-/datum/emote/shrug/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/sigh
-	name = "sigh"
-	desc = "Makes the mob sigh"
-	commands = list("sigh", "sighs")
-	text = "sighs"
-	selfText = "sigh"
-	audible = 1
-	mimeText = "sighs"
-	muzzleAffected = 1
-	muzzledNoise = "weak"
-
-/datum/emote/sigh/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/sign
-	name = "sign"
-	desc = "Makes the mob sign a number"
-	commands = list("sign", "signs")
-	text = "signs"
-	selfText = "sign"
-	restrained = 1
-	takesNumber = 1
-
-/datum/emote/sign/available(var/mob/user)
-	if(isalienadult(user) || islarva(user))
-		return 1
-
-/datum/emote/sign/getNumber(var/mob/user)
-	var/number = ..()
-	if(number == null)
-		to_chat(user, "You need a number to sign")
-		return INVALID
-	return number
-
-/datum/emote/sign/paramMessage(var/mob/user, var/list/params)
-	var/message = "<span class='[userSpanClass]'>\The [user]</span> [text] [params["num"]]"
-	return message
-
-/datum/emote/sign/fingers
-	desc = "Makes the mob raise a number of fingers"
-	text = "raises"
-	selfText = "raise"
-
-/datum/emote/sign/fingers/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/sign/fingers/getNumber(var/mob/user)
-	var/number = ..()
-	if(number == INVALID)
-		return INVALID
-	var/fingersAvailable = 0
-	if(!user.r_hand)
-		fingersAvailable += 5
-	if(!user.l_hand)
-		fingersAvailable += 5
-	if(fingersAvailable < number)
-		to_chat(user, "You don't have enough fingers free")
-		return INVALID
-	return number
-
-/datum/emote/sign/fingers/paramMessage(var/mob/user, var/list/params)
-	var/message = "<span class='[userSpanClass]'>\The [user]</span> [text] [params["num"]] finger\s"	// no, we can't just add " finger\s" to the parent version because the text macro won't work then :( VB
-	return message
-
-/datum/emote/slap
-	name = "slap"
-	desc = "makes the mob slap someone"
-	commands = list("slap", "slaps")
-	text = "slaps"
-	selfText = "slap"
-	audible = 1
-	sound = 'sound/effects/snap.ogg'
-	canTarget = 1
-	targetMob = 1
-	targetText = ""
-
-/datum/emote/slap/New()
-	..()
-	cooldown = 0
-
-/datum/emote/slap/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/slap/getMobTarget(var/mob/user, var/list/targets)
-	for(var/mob/M in view(getLoc(user), 1))
-		targets += M
-	var/mob/target = input("Select target", "Target Mob") as null|anything in targets
-	if(target == "None")
-		target = user
-	return target
-
-/datum/emote/slap/createBlindMessage(var/mob/user, var/list/params, var/message)
-	message = ..()
-	message = replacetext(message, "someone", "a")
-	return message
-
-/datum/emote/slap/doAction(var/mob/user, var/list/params)
-	if(user == params["target"])
-		var/mob/living/U = user
-		U.adjustFireLoss(4)
-
-/datum/emote/smile
-	name = "smile"
-	desc = "Makes the mob smile"
-	commands = list("smile", "smiles")
-	text = "smiles"
-	selfText = "smile"
-
-/datum/emote/smile/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/snap
-	name = "snap"
-	desc = "Makes the mob snap it's fingers"
-	commands = list("snap", "snaps")
-	text = "snaps"
-	selfText = "snap"
-	audible = 1
-	sound = 'sound/effects/fingersnap.ogg'
-
-/datum/emote/snap/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/snap/prevented(var/mob/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/carbon/human/H = user
-	var/obj/item/organ/external/L = H.get_organ("l_hand")
-	var/obj/item/organ/external/R = H.get_organ("r_hand")
-	var/left_hand_good = 0
-	var/right_hand_good = 0
-	if(L && (!(L.status & ORGAN_DESTROYED)) && (!(L.status & ORGAN_SPLINTED)) && (!(L.status & ORGAN_BROKEN)))
-		left_hand_good = 1
-	if(R && (!(R.status & ORGAN_DESTROYED)) && (!(R.status & ORGAN_SPLINTED)) && (!(R.status & ORGAN_BROKEN)))
-		right_hand_good = 1
-
-	if(!left_hand_good && !right_hand_good)
-		return "You need at least one hand in good working order to snap your fingers"
-
-/datum/emote/snap/standardMessage(var/mob/user, var/list/params)
-	var/message = ..()
-	message += " [getHis(user)] fingers"
-	params["prob"] = prob(5)
-	if(!params["prob"])
-		return message
-	message += " right off!"
-	return message
-
-/datum/emote/snap/playSound(var/mob/user, var/list/params)
-	if(params["prob"])
-		playsound(user.loc, 'sound/effects/snap.ogg', 50, 1)
-		return 1
-	return ..()
-
-/datum/emote/snap/createBlindMessage(var/mob/user, var/list/params, var/message)
-	message = ..()
-	message += " their fingers"
-	return message
-
-/datum/emote/snap/createDeafMessage(var/mob/user, var/list/params, var/message)
-	return message
-
-/datum/emote/sneeze
-	name = "sneeze"
-	desc = "Makes the mob sneeze"
-	commands = list("sneeze", "sneezes")
-	text = "sneezes"
-	selfText = "sneeze"
-	audible = 1
-	mimeText = "sneeze"
-	muzzleAffected = 1
-	muzzledNoise = "strange"
-
-/datum/emote/sneeze/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/sniff
-	name = "sniff"
-	desc = "Makes the mob sniff"
-	commands = list("sniff", "sniffs")
-	text = "sniffs"
-	selfText = "sniff"
-	audible = 1
-	mimeText = "sniffs"
-
-/datum/emote/sniff/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/snore
-	name = "snore"
-	desc = "Makes the mob snore"
-	commands = list("snore", "snores")
-	text = "snores"
-	selfText = "snore"
-	audible = 1
-	mimeText = "sleeps soundly"
-	mimeSelf = "sleep soundly"
-	muzzleAffected = 1
-
-/datum/emote/snore/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/squish
-	name = "squish"
-	desc = "Makes the mob squish"
-	commands = list("squish", "squishes")
-	text = "squishes"
-	selfText = "squish"
-	audible = 1
-	sound = 'sound/effects/slime_squish.ogg'
-	canTarget = 1
-	targetMob = 1
-
-/datum/emote/squish/available(var/mob/user)
-	if(isslime(user))
-		return 1
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(H.species.name == "Slime People")	//Only Slime People can squish
-			return 1
-		for(var/obj/item/organ/external/L in H.organs) // if your limbs are squishy you can squish too!
-			if(L.dna.species =="Slime People")
-				return 1
-
-/datum/emote/stare
-	name = "stare"
-	desc = "Makes the mob stare"
-	commands = list("stare", "stares")
-	text = "stares"
-	selfText = "stare"
-	canTarget = 1
-	targetMob = 1
-
-/datum/emote/stare/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(isrobot(user))
-		return 1
-
-/datum/emote/sulk
-	name = "sulk"
-	desc = "Makes the mob sulk"
-	commands = list("sulk", "sulks")
-	text = "sulks down sadly"
-	selfText = "sulk down sadly"
-
-/datum/emote/sulk/available(var/mob/user)
-	if(islarva(user))
-		return 1
-
-/datum/emote/sway
-	name = "sway"
-	desc = "Makes the mob sway"
-	commands = list("sway", "sways")
-	text = "sways around dizzily"
-	selfText = "sway around dizzily"
-
-/datum/emote/sway/available(var/mob/user)
-	if(islarva(user))
-		return 1
-	if(isslime(user))
-		return 1
-
-/datum/emote/tail
-	name = "tail"
-	desc = "Makes the mob wave it's tail"
-	commands = list("tail")
-	text = "waves it's tail"
-	selfText = "wave your tail"
-
-/datum/emote/tail/available(var/mob/user)
-	if(islarva(user) || isalienadult(user))
-		return 1
-	if(issmall(user))
-		return 1
-
-/datum/emote/tail/wag
-	name = "wag"
-	desc = "Makes the mob start wagging its tail"
-	commands = list("wag", "wags")
-	text = "starts"
-	selfText = "start"
-
-/datum/emote/tail/wag/available(var/mob/user)
-	if(issmall(user))
-		return
-	if(ishuman(user))
-		return 1
-
-/datum/emote/tail/wag/prevented(var/mob/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/carbon/human/H = user
-	if(H.species.bodyflags & TAIL_WAGGING)
-		if(H.wear_suit && (H.wear_suit.flags_inv & HIDETAIL || istype(H.wear_suit, /obj/item/clothing/suit/space)))
-			return "your clothing is stopping you wag your tail"
-		return
-	if(!H.body_accessory)
-		return "you have no tail to wag!"
-	if(!H.body_accessory.try_restrictions())
-		return "your clothing is stopping you wag your tail"
-
-/datum/emote/tail/wag/standardMessage(var/mob/user, var/list/params)
-	var/message = ..()
-	message += " wagging [getHis(user)] tail"
-	return message
-
-/datum/emote/tail/wag/doAction(var/mob/user, var/list/params)
-	var/mob/living/carbon/human/H = user
-	H.start_tail_wagging(1)
-
-/datum/emote/tail/wag/stop
-	name = "swag"
-	desc = "Makes the mob stop wagging its tail"
-	commands = list("swag", "swags")
-	text = "stops"
-	selfText = "stop"
-	allowParent = 1
-
-// seemingly no way to tell if a mob is wagging it's tail! VB
-/datum/emote/tail/wag/stop/prevented(var/mob/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/carbon/human/H = user
-	if(!(H.species.bodyflags & TAIL_WAGGING) && !H.body_accessory)
-		return "you can't stop wagging a tail you don't have!"
-
-/datum/emote/tail/wag/stop/doAction(var/mob/user, var/list/params)
-	var/mob/living/carbon/human/H = user
-	H.stop_tail_wagging(1)
-
-/datum/emote/tremble
-	name = "tremble"
-	desc = "Makes the mob tremble"
-	commands = list("tremble", "trembles")
-	text = "trembles"
-	selfText = "tremble"
-
-/datum/emote/tremble/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/twitch_s
-	name = "twitch_s"
-	desc = "Makes the mob twitch"
-	commands = list("twitch_s", "twitches_s")
-	text = "twitches"
-	selfText = "twitch"
-
-/datum/emote/twitch_s/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-	if(isrobot(user))
-		return 1
-
-/datum/emote/twitch_s/twitch
-	name = "twitch"
-	desc = "Makes the mob twitch violently"
-	commands = list("twitch", "twitches")
-	allowParent = 1
-
-/datum/emote/twitch_s/twitch/available(var/mob/user)
-	if(isslime(user))
-		return 1
-	if(islarva(user))
-		return 1
-	return ..()
-
-/datum/emote/twitch_s/twitch/standardMessage(var/mob/user, var/list/params)
-	var/message = ..()
-	message += " violently"
-	return message
-
-/datum/emote/vibrate
-	name = "vibrate"
-	desc = "Makes the mob vibrate"
-	commands = list("vibrate", "vibrates")
-	text = "vibrates"
-	selfText = "vibrate"
-
-/datum/emote/vibrate/available(var/mob/user)
-	if(isslime(user))
-		return 1
-
-/datum/emote/wave
-	name = "wave"
-	desc = "Makes the mob wave"
-	commands = list ("wave", "waves")
-	text = "waves"
-	selfText = "wave"
-
-/datum/emote/wave/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/whimper
-	name = "whimper"
-	desc = "Makes the mob whimper"
-	commands = list("whimper", "whimpers")
-	text = "whimpers"
-	selfText = "whimper"
-	audible = 1
-	mimeText = "appears hurt"
-	mimeSelf = "appear hurt"
-	muzzleAffected = 1
-
-/datum/emote/whimper/available(var/mob/user)
-	if(islarva(user) || isalienadult(user))
-		return 1
-	if(ishuman(user))
-		return 1
-
-/datum/emote/whistle
-	name = "whistle"
-	desc = "Makes the mob whistle"
-	commands = list("whistle", "whistles")
-	text = "whistles"
-	selfText = "whistle"
-	audible = 1
-
-/datum/emote/whistle/available(var/mob/user)
-	if(isbrain(user))
-		return 1
-
-/datum/emote/wink
-	name = "wink"
-	desc = "Makes the mob wink"
-	commands = list("wink", "winks")
-	text = "winks"
-	selfText = "wink"
-
-/datum/emote/wink/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/yawn
-	name = "yawn"
-	desc = "makes the mob yawn"
-	commands = list("yawn", "yawns")
-	text = "yawns"
-	selfText = "yawn"
-	audible = 1
-	mimeText = "yawns"
-	muzzleAffected = 1
-
-/datum/emote/yawn/available(var/mob/user)
-	if(ishuman(user))
-		return 1
-
-/datum/emote/yes
-	name = "yes"
-	desc = "Makes the mob let out an affirmative beep"
-	commands = list("yes")
-	text = "lets out an affirmative beep"
-	selfText = "let out an affirmative beep"
-	audible = 1
-	sound = 'sound/machines/synth_yes.ogg'
-	canTarget = 1
-	targetMob = 1
-
-/datum/emote/yes/available(var/mob/user)
-	if(user.is_mechanical())
-		return 1
\ No newline at end of file
diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm
index 4af13e256fd..0f796798d26 100644
--- a/code/datums/ai_laws.dm
+++ b/code/datums/ai_laws.dm
@@ -83,17 +83,17 @@ var/global/const/base_law_type = /datum/ai_laws/nanotrasen
 	if(full_sync || supplied_laws.len)
 		S.laws.clear_supplied_laws()
 
-	for (var/datum/ai_law/law in ion_laws)
+	for(var/datum/ai_law/law in ion_laws)
 		S.laws.add_ion_law(law.law)
-	for (var/datum/ai_law/law in inherent_laws)
+	for(var/datum/ai_law/law in inherent_laws)
 		S.laws.add_inherent_law(law.law)
-	for (var/datum/ai_law/law in supplied_laws)
+	for(var/datum/ai_law/law in supplied_laws)
 		if(law)
 			S.laws.add_supplied_law(law.index, law.law)
 
 
 /mob/living/silicon/proc/sync_zeroth(var/datum/ai_law/zeroth_law, var/datum/ai_law/zeroth_law_borg)
-	if (!is_special_character(src) || mind.original != src)
+	if(!is_special_character(src) || mind.original != src)
 		if(zeroth_law_borg)
 			laws.set_zeroth_law(zeroth_law_borg.law)
 		else if(zeroth_law)
@@ -159,7 +159,7 @@ var/global/const/base_law_type = /datum/ai_laws/nanotrasen
 	if(supplied_laws.len >= number && supplied_laws[number])
 		delete_law(supplied_laws[number])
 
-	while (src.supplied_laws.len < number)
+	while(src.supplied_laws.len < number)
 		src.supplied_laws += ""
 		if(state_supplied.len < supplied_laws.len)
 			state_supplied += 1
diff --git a/code/datums/browser.dm b/code/datums/browser.dm
index e8f17f17ad0..85f8e52e89d 100644
--- a/code/datums/browser.dm
+++ b/code/datums/browser.dm
@@ -20,13 +20,13 @@
 
 	user = nuser
 	window_id = nwindow_id
-	if (ntitle)
+	if(ntitle)
 		title = format_text(ntitle)
-	if (nwidth)
+	if(nwidth)
 		width = nwidth
-	if (nheight)
+	if(nheight)
 		height = nheight
-	if (nref)
+	if(nref)
 		ref = nref
 	add_stylesheet("common", 'html/browser/common.css') // this CSS sheet is common to all UIs
 
@@ -60,18 +60,18 @@
 /datum/browser/proc/get_header()
 	var/key
 	var/filename
-	for (key in stylesheets)
+	for(key in stylesheets)
 		filename = "[ckey(key)].css"
 		user << browse_rsc(stylesheets[key], filename)
 		head_content += "<link rel='stylesheet' type='text/css' href='[filename]'>"
 
-	for (key in scripts)
+	for(key in scripts)
 		filename = "[ckey(key)].js"
 		user << browse_rsc(scripts[key], filename)
 		head_content += "<script type='text/javascript' src='[filename]'></script>"
 
 	var/title_attributes = "class='uiTitle'"
-	if (title_image)
+	if(title_image)
 		title_attributes = "class='uiTitle icon' style='background-image: url([title_image]);'"
 
 	return {"<!DOCTYPE html>
@@ -103,10 +103,10 @@
 
 /datum/browser/proc/open(var/use_onclose = 1)
 	var/window_size = ""
-	if (width && height)
+	if(width && height)
 		window_size = "size=[width]x[height];"
 	user << browse(get_content(), "window=[window_id];[window_size][window_options]")
-	if (use_onclose)
+	if(use_onclose)
 		onclose(user, window_id, ref)
 
 /datum/browser/proc/close()
@@ -118,7 +118,7 @@
 /mob/proc/browse_rsc_icon(icon, icon_state, dir = -1)
 	/*
 	var/icon/I
-	if (dir >= 0)
+	if(dir >= 0)
 		I = new /icon(icon, icon_state, dir)
 	else
 		I = new /icon(icon, icon_state)
diff --git a/code/datums/cache/apc.dm b/code/datums/cache/apc.dm
index f50b0a8e121..4271886ac4b 100644
--- a/code/datums/cache/apc.dm
+++ b/code/datums/cache/apc.dm
@@ -11,7 +11,7 @@ var/global/datum/repository/apc/apc_repository = new()
 	if(world.time < cache_entry.timestamp)
 		return cache_entry.data
 	
-	if (powermonitor && !isnull(powermonitor.powernet))
+	if(powermonitor && !isnull(powermonitor.powernet))
 		var/list/L = list()
 		for(var/obj/machinery/power/terminal/term in powermonitor.powernet.nodes)
 			if(istype(term.master, /obj/machinery/power/apc))
diff --git a/code/datums/cache/crew.dm b/code/datums/cache/crew.dm
index 0afb70a4404..2912b8c6753 100644
--- a/code/datums/cache/crew.dm
+++ b/code/datums/cache/crew.dm
@@ -62,6 +62,6 @@ var/global/datum/repository/crew/crew_repository = new()
 	for(var/mob/living/carbon/human/H in mob_list)
 		if(istype(H.w_uniform, /obj/item/clothing/under))
 			var/obj/item/clothing/under/C = H.w_uniform
-			if (C.has_sensor)
+			if(C.has_sensor)
 				tracked |= C
 	return tracked
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index d07b6e3eb73..f9c3ce39b08 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -17,7 +17,7 @@
 	var/real_title = assignment
 
 	for(var/datum/data/record/t in data_core.general)
-		if (t)
+		if(t)
 			if(t.fields["name"] == name)
 				foundrecord = t
 				break
@@ -66,6 +66,8 @@
 		G.fields["sex"]			= capitalize(H.gender)
 		G.fields["species"]		= H.get_species()
 		G.fields["photo"]		= get_id_photo(H)
+		G.fields["photo-south"] = "'data:image/png;base64,[icon2base64(icon(G.fields["photo"], dir = SOUTH))]'"
+		G.fields["photo-west"] = "'data:image/png;base64,[icon2base64(icon(G.fields["photo"], dir = WEST))]'"
 		if(H.gen_record && !jobban_isbanned(H, "Records"))
 			G.fields["notes"] = H.gen_record
 		else
@@ -129,7 +131,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	var/obj/item/organ/external/head/head_organ = H.get_organ("head")
 
 	var/g = "m"
-	if (H.gender == FEMALE)
+	if(H.gender == FEMALE)
 		g = "f"
 
 	var/icon/icobase = H.species.icobase
@@ -151,7 +153,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 
 	// Skin tone
 	if(H.species.bodyflags & HAS_SKIN_TONE)
-		if (H.s_tone >= 0)
+		if(H.s_tone >= 0)
 			preview_icon.Blend(rgb(H.s_tone, H.s_tone, H.s_tone), ICON_ADD)
 		else
 			preview_icon.Blend(rgb(-H.s_tone,  -H.s_tone,  -H.s_tone), ICON_SUBTRACT)
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index eeb26f5f6f2..1413b5c7dc9 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -20,7 +20,7 @@
 		title = "[A.name] (\ref[A]) = [A.type]"
 
 		#ifdef VARSICON
-		if (A.icon)
+		if(A.icon)
 			body += debug_variable("icon", new/icon(A.icon, A.icon_state, A.dir), 0)
 		#endif
 
@@ -43,11 +43,11 @@
 					if(event.keyCode == 13){	//Enter / return
 						var vars_ol = document.getElementById('vars');
 						var lis = vars_ol.getElementsByTagName("li");
-						for ( var i = 0; i < lis.length; ++i )
+						for( var i = 0; i < lis.length; ++i )
 						{
 							try{
 								var li = lis\[i\];
-								if ( li.style.backgroundColor == "#ffee88" )
+								if( li.style.backgroundColor == "#ffee88" )
 								{
 									alist = lis\[i\].getElementsByTagName("a")
 									if(alist.length > 0){
@@ -62,11 +62,11 @@
 					if(event.keyCode == 38){	//Up arrow
 						var vars_ol = document.getElementById('vars');
 						var lis = vars_ol.getElementsByTagName("li");
-						for ( var i = 0; i < lis.length; ++i )
+						for( var i = 0; i < lis.length; ++i )
 						{
 							try{
 								var li = lis\[i\];
-								if ( li.style.backgroundColor == "#ffee88" )
+								if( li.style.backgroundColor == "#ffee88" )
 								{
 									if( (i-1) >= 0){
 										var li_new = lis\[i-1\];
@@ -83,11 +83,11 @@
 					if(event.keyCode == 40){	//Down arrow
 						var vars_ol = document.getElementById('vars');
 						var lis = vars_ol.getElementsByTagName("li");
-						for ( var i = 0; i < lis.length; ++i )
+						for( var i = 0; i < lis.length; ++i )
 						{
 							try{
 								var li = lis\[i\];
-								if ( li.style.backgroundColor == "#ffee88" )
+								if( li.style.backgroundColor == "#ffee88" )
 								{
 									if( (i+1) < lis.length){
 										var li_new = lis\[i+1\];
@@ -113,11 +113,11 @@
 						var vars_ol = document.getElementById('vars');
 						var lis = vars_ol.getElementsByTagName("li");
 
-						for ( var i = 0; i < lis.length; ++i )
+						for( var i = 0; i < lis.length; ++i )
 						{
 							try{
 								var li = lis\[i\];
-								if ( li.innerText.toLowerCase().indexOf(filter) == -1 )
+								if( li.innerText.toLowerCase().indexOf(filter) == -1 )
 								{
 									vars_ol.removeChild(li);
 									i--;
@@ -126,10 +126,10 @@
 						}
 					}
 					var lis_new = vars_ol.getElementsByTagName("li");
-					for ( var j = 0; j < lis_new.length; ++j )
+					for( var j = 0; j < lis_new.length; ++j )
 					{
 						var li1 = lis\[j\];
-						if (j == 0){
+						if(j == 0){
 							li1.style.backgroundColor = "#ffee88";
 						}else{
 							li1.style.backgroundColor = "white";
@@ -293,18 +293,18 @@
 	body += "<ol id='vars'>"
 
 	var/list/names = list()
-	for (var/V in D.vars)
+	for(var/V in D.vars)
 		names += V
 
 	names = sortList(names)
 
-	for (var/V in names)
+	for(var/V in names)
 		body += debug_variable(V, D.vars[V], 0, D)
 
 	body += "</ol>"
 
 	var/html = "<html><head>"
-	if (title)
+	if(title)
 		html += "<title>[title]</title>"
 	html += {"<style>
 body
@@ -342,13 +342,13 @@ body
 	else
 		html += "<li>"
 
-	if (isnull(value))
+	if(isnull(value))
 		html += "[name] = <span class='value'>null</span>"
 
-	else if (istext(value))
+	else if(istext(value))
 		html += "[name] = <span class='value'>\"[value]\"</span>"
 
-	else if (isicon(value))
+	else if(isicon(value))
 		#ifdef VARSICON
 		var/icon/I = new/icon(value)
 		var/rnd = rand(1,10000)
@@ -359,7 +359,7 @@ body
 		html += "[name] = /icon (<span class='value'>[value]</span>)"
 		#endif
 
-/*		else if (istype(value, /image))
+/*		else if(istype(value, /image))
 		#ifdef VARSICON
 		var/rnd = rand(1, 10000)
 		var/image/I = value
@@ -370,22 +370,22 @@ body
 		html += "[name] = /image (<span class='value'>[value]</span>)"
 		#endif
 */
-	else if (isfile(value))
+	else if(isfile(value))
 		html += "[name] = <span class='value'>'[value]'</span>"
 
-	else if (istype(value, /datum))
+	else if(istype(value, /datum))
 		var/datum/D = value
 		html += "<a href='?_src_=vars;Vars=\ref[value]'>[name] \ref[value]</a> = [D.type]"
 
-	else if (istype(value, /client))
+	else if(istype(value, /client))
 		var/client/C = value
 		html += "<a href='?_src_=vars;Vars=\ref[value]'>[name] \ref[value]</a> = [C] [C.type]"
 //
-	else if (istype(value, /list))
+	else if(istype(value, /list))
 		var/list/L = value
 		html += "[name] = /list ([L.len])"
 
-		if (L.len > 0 && !(name == "underlays" || name == "overlays" || name == "vars" || L.len > 500))
+		if(L.len > 0 && !(name == "underlays" || name == "overlays" || name == "vars" || L.len > 500))
 			// not sure if this is completely right...
 			if(0)   //(L.vars.len > 0)
 				html += "<ol>"
@@ -393,7 +393,7 @@ body
 			else
 				html += "<ul>"
 				var/index = 1
-				for (var/entry in L)
+				for(var/entry in L)
 					if(istext(entry))
 						html += debug_variable(entry, L[entry], level + 1)
 					//html += debug_variable("[index]", L[index], level + 1)
diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm
index 8d3b6a09b36..fbe43efe554 100644
--- a/code/datums/diseases/advance/symptoms/oxygen.dm
+++ b/code/datums/diseases/advance/symptoms/oxygen.dm
@@ -30,7 +30,7 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(4, 5)
-				if (M.reagents.get_reagent_amount("salbutamol") < 20)
+				if(M.reagents.get_reagent_amount("salbutamol") < 20)
 					M.reagents.add_reagent("salbutamol", 20)
 			else
 				if(prob(SYMPTOM_ACTIVATION_PROB * 5))
diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm
index 99f670c258e..3ec0f16358a 100644
--- a/code/datums/diseases/advance/symptoms/sensory.dm
+++ b/code/datums/diseases/advance/symptoms/sensory.dm
@@ -91,12 +91,12 @@ Bonus
 				if(prob(15))
 					M.reagents.add_reagent("morphine",rand(5,7))
 			if(4)
-				M.reagents.add_reagent_list(list("ethanol",rand(7,15),"lsd",rand(5,10)))
+				M.reagents.add_reagent_list(list("ethanol"=rand(7,15),"lsd"=rand(5,10)))
 				to_chat(M, "<span class='warning'><b>You try to focus on not dying.</b></span>")
 				if(prob(20))
 					M.reagents.add_reagent("morphine",rand(5,7))
 			if(5)
-				M.reagents.add_reagent_list(list("haloperidol",rand(5,15),"ethanol",rand(7,20),"lsd",rand(5,15)))
+				M.reagents.add_reagent_list(list("haloperidol"=rand(5,15),"ethanol"=rand(7,20),"lsd"=rand(5,15)))
 				to_chat(M, "<span class='warning'><b>u can count 2 potato!</b></span>")
 				if(prob(25))
 					M.reagents.add_reagent("morphine",rand(5,7))
diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm
index 158ea99da6c..3cc4be975b4 100644
--- a/code/datums/diseases/advance/symptoms/stimulant.dm
+++ b/code/datums/diseases/advance/symptoms/stimulant.dm
@@ -30,7 +30,7 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(5)
-				if (M.reagents.get_reagent_amount("ephedrine") < 10)
+				if(M.reagents.get_reagent_amount("ephedrine") < 10)
 					M.reagents.add_reagent("ephedrine", 10)
 			else
 				if(prob(SYMPTOM_ACTIVATION_PROB * 5))
diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm
index c185cc313df..2d7fb9467df 100644
--- a/code/datums/diseases/advance/symptoms/vision.dm
+++ b/code/datums/diseases/advance/symptoms/vision.dm
@@ -79,7 +79,7 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(4, 5)
-				if (M.reagents.get_reagent_amount("oculine") < 20)
+				if(M.reagents.get_reagent_amount("oculine") < 20)
 					M.reagents.add_reagent("oculine", 20)
 			else
 				if(prob(SYMPTOM_ACTIVATION_PROB * 5))
diff --git a/code/datums/diseases/berserker.dm b/code/datums/diseases/berserker.dm
index 248503ba672..497bff35bfb 100644
--- a/code/datums/diseases/berserker.dm
+++ b/code/datums/diseases/berserker.dm
@@ -30,14 +30,14 @@
 		if(2)
 			if(prob(5))
 				affected_mob.emote(pick("twitch_s", "scream"))
-			if (prob(5))
+			if(prob(5))
 				var/speak = pick("AAARRGGHHH!!!!", "GRR!!!", "FUCK!! FUUUUUUCK!!!", "FUCKING SHITCOCK!!", "WROOAAAGHHH!!")
 				affected_mob.say(speak)
-			if (prob(15))
+			if(prob(15))
 				affected_mob.visible_message("<span class='danger'>[affected_mob] twitches violently!</span>")
 				affected_mob.drop_l_hand()
 				affected_mob.drop_r_hand()
-			if (prob(33))
+			if(prob(33))
 				if(affected_mob.incapacitated())
 					affected_mob.visible_message("<span class='danger'>[affected_mob] spasms and twitches!</span>")
 					return
@@ -46,7 +46,7 @@
 					if(M == affected_mob)
 						continue
 					var/damage = rand(1, 5)
-					if (prob(80))
+					if(prob(80))
 						playsound(affected_mob.loc, "punch", 25, 1, -1)
 						affected_mob.visible_message("<span class='danger'>[affected_mob] hits [M] with their thrashing!</span>")
 						M.adjustBruteLoss(damage)
diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm
index aaeb624f9ce..f73154a0e20 100644
--- a/code/datums/diseases/dna_spread.dm
+++ b/code/datums/diseases/dna_spread.dm
@@ -62,7 +62,7 @@
 	return
 
 /datum/disease/dnaspread/Destroy()
-	if (original_dna && transformed && affected_mob)
+	if(original_dna && transformed && affected_mob)
 		original_dna.transfer_identity(affected_mob, transfer_SE = 1)
 		affected_mob.real_name = affected_mob.dna.real_name
 		affected_mob.updateappearance(mutcolor_update=1)
diff --git a/code/datums/diseases/kuru.dm b/code/datums/diseases/kuru.dm
index 67cfd3e8693..bfd5af91a29 100644
--- a/code/datums/diseases/kuru.dm
+++ b/code/datums/diseases/kuru.dm
@@ -20,7 +20,7 @@
 			if(prob(50))
 				affected_mob.Jitter(25)
 		if(2)
-			if (prob(50))
+			if(prob(50))
 				affected_mob.visible_message("<span class='danger'>[affected_mob] laughs uncontrollably!</span>")
 				affected_mob.Stun(10)
 				affected_mob.Weaken(10)
diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm
index 8b3a95330e1..c10959fb166 100644
--- a/code/datums/diseases/retrovirus.dm
+++ b/code/datums/diseases/retrovirus.dm
@@ -34,11 +34,11 @@
 					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 					cure()
 					return
-			if (prob(8))
+			if(prob(8))
 				to_chat(affected_mob, "<span class='danger'>Your head hurts.</span>")
-			if (prob(9))
+			if(prob(9))
 				to_chat(affected_mob, "You feel a tingling sensation in your chest.")
-			if (prob(9))
+			if(prob(9))
 				to_chat(affected_mob, "<span class='danger'>You feel angry.</span>")
 		if(2)
 			if(restcure)
@@ -46,14 +46,14 @@
 					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 					cure()
 					return
-			if (prob(8))
+			if(prob(8))
 				to_chat(affected_mob, "<span class='danger'>Your skin feels loose.</span>")
-			if (prob(10))
+			if(prob(10))
 				to_chat(affected_mob, "You feel very strange.")
-			if (prob(4))
+			if(prob(4))
 				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head!</span>")
 				affected_mob.Paralyse(2)
-			if (prob(4))
+			if(prob(4))
 				to_chat(affected_mob, "<span class='danger'>Your stomach churns.</span>")
 		if(3)
 			if(restcure)
@@ -61,10 +61,10 @@
 					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 					cure()
 					return
-			if (prob(10))
+			if(prob(10))
 				to_chat(affected_mob, "<span class='danger'>Your entire body vibrates.</span>")
 
-			if (prob(35))
+			if(prob(35))
 				if(prob(50))
 					scramble(1, affected_mob, rand(15, 45))
 				else
@@ -76,7 +76,7 @@
 					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 					cure()
 					return
-			if (prob(60))
+			if(prob(60))
 				if(prob(50))
 					scramble(1, affected_mob, rand(15, 45))
 				else
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 3cb965964b3..7f04eb5fc56 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -21,16 +21,16 @@
 	..()
 	switch(stage)
 		if(1)
-			if (prob(stage_prob) && stage1)
+			if(prob(stage_prob) && stage1)
 				to_chat(affected_mob, pick(stage1))
 		if(2)
-			if (prob(stage_prob) && stage2)
+			if(prob(stage_prob) && stage2)
 				to_chat(affected_mob, pick(stage2))
 		if(3)
-			if (prob(stage_prob*2) && stage3)
+			if(prob(stage_prob*2) && stage3)
 				to_chat(affected_mob, pick(stage3))
 		if(4)
-			if (prob(stage_prob*2) && stage4)
+			if(prob(stage_prob*2) && stage4)
 				to_chat(affected_mob, pick(stage4))
 		if(5)
 			do_disease_transformation(affected_mob)
@@ -134,13 +134,13 @@
 	..()
 	switch(stage)
 		if(3)
-			if (prob(8))
+			if(prob(8))
 				affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"))
-			if (prob(4))
+			if(prob(4))
 				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
 				affected_mob.Paralyse(2)
 		if(4)
-			if (prob(20))
+			if(prob(20))
 				affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "kkkiiiill mmme", "I wwwaaannntt tttoo dddiiieeee..."))
 
 
@@ -165,11 +165,11 @@
 	..()
 	switch(stage)
 		if(3)
-			if (prob(4))
+			if(prob(4))
 				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
 				affected_mob.Paralyse(2)
 		if(4)
-			if (prob(20))
+			if(prob(20))
 				affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!"))
 
 
@@ -221,10 +221,10 @@
 	..()
 	switch(stage)
 		if(3)
-			if (prob(8))
+			if(prob(8))
 				affected_mob.say(pick("YAP", "Woof!"))
 		if(4)
-			if (prob(20))
+			if(prob(20))
 				affected_mob.say(pick("Bark!", "AUUUUUU"))
 
 /datum/disease/transformation/morph
diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm
index f96100d7a46..6498f16c0d3 100644
--- a/code/datums/helper_datums/construction_datum.dm
+++ b/code/datums/helper_datums/construction_datum.dm
@@ -45,7 +45,7 @@
 	proc/custom_action(step, used_atom, user)
 		if(istype(used_atom, /obj/item/weapon/weldingtool))
 			var/obj/item/weapon/weldingtool/W = used_atom
-			if (W.remove_fuel(0, user))
+			if(W.remove_fuel(0, user))
 				playsound(holder, 'sound/items/Welder2.ogg', 50, 1)
 			else
 				return 0
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 52f6c13784f..7e026452266 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -147,7 +147,7 @@
 	)
 	var/text = ""
 	var/mob/living/carbon/human/H = current
-	if (istype(current, /mob/living/carbon/human))
+	if(istype(current, /mob/living/carbon/human))
 		/** Impanted**/
 		if(isloyal(H))
 			text = "Mindshield Implant:<a href='?src=\ref[src];implant=remove'>Remove</a>|<b>Implanted</b></br>"
@@ -156,18 +156,18 @@
 		sections["implant"] = text
 		/** REVOLUTION ***/
 		text = "revolution"
-		if (ticker.mode.config_tag=="revolution")
+		if(ticker.mode.config_tag=="revolution")
 			text += uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (isloyal(H))
+		if(isloyal(H))
 			text += "<b>LOYAL EMPLOYEE</b>|headrev|rev"
-		else if (src in ticker.mode.head_revolutionaries)
+		else if(src in ticker.mode.head_revolutionaries)
 			text = "<a href='?src=\ref[src];revolution=clear'>employee</a>|<b>HEADREV</b>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
 			text += "<br>Flash: <a href='?src=\ref[src];revolution=flash'>give</a>"
 
 			var/list/L = current.get_contents()
 			var/obj/item/device/flash/flash = locate() in L
-			if (flash)
+			if(flash)
 				if(!flash.broken)
 					text += "|<a href='?src=\ref[src];revolution=takeflash'>take</a>."
 				else
@@ -176,9 +176,9 @@
 				text += "."
 
 			text += " <a href='?src=\ref[src];revolution=reequip'>Reequip</a> (gives traitor uplink)."
-			if (objectives.len==0)
+			if(objectives.len==0)
 				text += "<br>Objectives are empty! <a href='?src=\ref[src];revolution=autoobjectives'>Set to kill all heads</a>."
-		else if (src in ticker.mode.revolutionaries)
+		else if(src in ticker.mode.revolutionaries)
 			text += "<a href='?src=\ref[src];revolution=clear'>employee</a>|<a href='?src=\ref[src];revolution=headrev'>headrev</a>|<b>REV</b>"
 		else
 			text += "<b>EMPLOYEE</b>|<a href='?src=\ref[src];revolution=headrev'>headrev</a>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
@@ -192,16 +192,16 @@
 
 		/** CULT ***/
 		text = "cult"
-		if (ticker.mode.config_tag=="cult")
+		if(ticker.mode.config_tag=="cult")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (isloyal(H))
+		if(isloyal(H))
 			text += "<B>LOYAL EMPLOYEE</B>|cultist"
-		else if (src in ticker.mode.cult)
+		else if(src in ticker.mode.cult)
 			text += "<a href='?src=\ref[src];cult=clear'>employee</a>|<b>CULTIST</b>"
 			text += "<br>Give <a href='?src=\ref[src];cult=tome'>tome</a>|<a href='?src=\ref[src];cult=equip'>equip</a>."
 /*
-			if (objectives.len==0)
+			if(objectives.len==0)
 				text += "<br>Objectives are empty! Set to sacrifice and <a href='?src=\ref[src];cult=escape'>escape</a> or <a href='?src=\ref[src];cult=summon'>summon</a>."
 */
 		else
@@ -217,13 +217,13 @@
 
 		/** WIZARD ***/
 		text = "wizard"
-		if (ticker.mode.config_tag=="wizard")
+		if(ticker.mode.config_tag=="wizard")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (src in ticker.mode.wizards)
+		if(src in ticker.mode.wizards)
 			text += "<b>YES</b>|<a href='?src=\ref[src];wizard=clear'>no</a>"
 			text += "<br><a href='?src=\ref[src];wizard=lair'>To lair</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];wizard=dressup'>dress up</a>, <a href='?src=\ref[src];wizard=name'>let choose name</a>."
-			if (objectives.len==0)
+			if(objectives.len==0)
 				text += "<br>Objectives are empty! <a href='?src=\ref[src];wizard=autoobjectives'>Randomize!</a>"
 		else
 			text += "<a href='?src=\ref[src];wizard=wizard'>yes</a>|<b>NO</b>"
@@ -237,12 +237,12 @@
 
 		/** CHANGELING ***/
 		text = "changeling"
-		if (ticker.mode.config_tag=="changeling" || ticker.mode.config_tag=="traitorchan")
+		if(ticker.mode.config_tag=="changeling" || ticker.mode.config_tag=="traitorchan")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (src in ticker.mode.changelings)
+		if(src in ticker.mode.changelings)
 			text += "<b>YES</b>|<a href='?src=\ref[src];changeling=clear'>no</a>"
-			if (objectives.len==0)
+			if(objectives.len==0)
 				text += "<br>Objectives are empty! <a href='?src=\ref[src];changeling=autoobjectives'>Randomize!</a>"
 			if( changeling && changeling.absorbed_dna.len && (current.real_name != changeling.absorbed_dna[1]) )
 				text += "<br><a href='?src=\ref[src];changeling=initialdna'>Transform to initial appearance.</a>"
@@ -258,12 +258,12 @@
 
 		/** VAMPIRE ***/
 		text = "vampire"
-		if (ticker.mode.config_tag=="vampire" || ticker.mode.config_tag=="traitorvamp")
+		if(ticker.mode.config_tag=="vampire" || ticker.mode.config_tag=="traitorvamp")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (src in ticker.mode.vampires)
+		if(src in ticker.mode.vampires)
 			text += "<b>YES</b>|<a href='?src=\ref[src];vampire=clear'>no</a>"
-			if (objectives.len==0)
+			if(objectives.len==0)
 				text += "<br>Objectives are empty! <a href='?src=\ref[src];vampire=autoobjectives'>Randomize!</a>"
 		else
 			text += "<a href='?src=\ref[src];vampire=vampire'>yes</a>|<b>NO</b>"
@@ -282,18 +282,18 @@
 
 		/** NUCLEAR ***/
 		text = "nuclear"
-		if (ticker.mode.config_tag=="nuclear")
+		if(ticker.mode.config_tag=="nuclear")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (src in ticker.mode.syndicates)
+		if(src in ticker.mode.syndicates)
 			text += "<b>OPERATIVE</b>|<a href='?src=\ref[src];nuclear=clear'>nanotrasen</a>"
 			text += "<br><a href='?src=\ref[src];nuclear=lair'>To shuttle</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];nuclear=dressup'>dress up</a>."
 			var/code
-			for (var/obj/machinery/nuclearbomb/bombue in machines)
-				if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
+			for(var/obj/machinery/nuclearbomb/bombue in machines)
+				if(length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
 					code = bombue.r_code
 					break
-			if (code)
+			if(code)
 				text += " Code is [code]. <a href='?src=\ref[src];nuclear=tellcode'>tell the code.</a>"
 		else
 			text += "<a href='?src=\ref[src];nuclear=nuclear'>operative</a>|<b>NANOTRASEN</b>"
@@ -307,15 +307,15 @@
 
 		/** TRAITOR ***/
 		text = "traitor"
-		if (ticker.mode.config_tag=="traitor" || ticker.mode.config_tag=="traitorchan" || ticker.mode.config_tag=="traitorvamp")
+		if(ticker.mode.config_tag=="traitor" || ticker.mode.config_tag=="traitorchan" || ticker.mode.config_tag=="traitorvamp")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (isloyal(H))
+		if(isloyal(H))
 			text +="traitor|<b>LOYAL EMPLOYEE</b>"
 		else
-			if (src in ticker.mode.traitors)
+			if(src in ticker.mode.traitors)
 				text += "<b>TRAITOR</b>|<a href='?src=\ref[src];traitor=clear'>EMPLOYEE</a>"
-				if (objectives.len==0)
+				if(objectives.len==0)
 					text += "<br>Objectives are empty! <a href='?src=\ref[src];traitor=autoobjectives'>Randomize</a>!"
 			else
 				text += "<a href='?src=\ref[src];traitor=traitor'>traitor</a>|<b>EMPLOYEE</b>"
@@ -368,53 +368,53 @@
 
 	/** SILICON ***/
 
-	if (istype(current, /mob/living/silicon))
+	if(istype(current, /mob/living/silicon))
 		text = "silicon"
-		if (ticker.mode.config_tag=="malfunction")
+		if(ticker.mode.config_tag=="malfunction")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (istype(current, /mob/living/silicon/ai))
-			if (src in ticker.mode.malf_ai)
+		if(istype(current, /mob/living/silicon/ai))
+			if(src in ticker.mode.malf_ai)
 				text += "<b>MALF</b>|<a href='?src=\ref[src];silicon=unmalf'>not malf</a>"
 			else
 				text += "<a href='?src=\ref[src];silicon=malf'>malf</a>|<b>NOT MALF</b>"
 		var/mob/living/silicon/robot/robot = current
-		if (istype(robot) && robot.emagged)
+		if(istype(robot) && robot.emagged)
 			text += "<br>Cyborg: Is emagged! <a href='?src=\ref[src];silicon=unemag'>Unemag!</a><br>0th law: [robot.laws.zeroth_law]"
 		var/mob/living/silicon/ai/ai = current
-		if (istype(ai) && ai.connected_robots.len)
+		if(istype(ai) && ai.connected_robots.len)
 			var/n_e_robots = 0
-			for (var/mob/living/silicon/robot/R in ai.connected_robots)
-				if (R.emagged)
+			for(var/mob/living/silicon/robot/R in ai.connected_robots)
+				if(R.emagged)
 					n_e_robots++
 			text += "<br>[n_e_robots] of [ai.connected_robots.len] slaved cyborgs are emagged. <a href='?src=\ref[src];silicon=unemagcyborgs'>Unemag</a>"
 		sections["malfunction"] = text
 
-	if (ticker.mode.config_tag == "traitorchan")
-		if (sections["traitor"])
+	if(ticker.mode.config_tag == "traitorchan")
+		if(sections["traitor"])
 			out += sections["traitor"]+"<br>"
-		if (sections["changeling"])
+		if(sections["changeling"])
 			out += sections["changeling"]+"<br>"
 		sections -= "traitor"
 		sections -= "changeling"
 
-	if (ticker.mode.config_tag == "traitorvamp")
-		if (sections["traitor"])
+	if(ticker.mode.config_tag == "traitorvamp")
+		if(sections["traitor"])
 			out += sections["traitor"]+"<br>"
-		if (sections["vampire"])
+		if(sections["vampire"])
 			out += sections["vampire"]+"<br>"
 		sections -= "traitor"
 		sections -= "vampire"
 	else
-		if (sections[ticker.mode.config_tag])
+		if(sections[ticker.mode.config_tag])
 			out += sections[ticker.mode.config_tag]+"<br>"
 		sections -= ticker.mode.config_tag
-	for (var/i in sections)
-		if (sections[i])
+	for(var/i in sections)
+		if(sections[i])
 			out += sections[i]+"<br>"
 
 
-	if (((src in ticker.mode.head_revolutionaries) || \
+	if(((src in ticker.mode.head_revolutionaries) || \
 		(src in ticker.mode.traitors)              || \
 		(src in ticker.mode.syndicates))           && \
 		istype(current,/mob/living/carbon/human)      )
@@ -422,11 +422,11 @@
 		text = "Uplink: <a href='?src=\ref[src];common=uplink'>give</a>"
 		var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink()
 		var/crystals
-		if (suplink)
+		if(suplink)
 			crystals = suplink.uses
-		if (suplink)
+		if(suplink)
 			text += "|<a href='?src=\ref[src];common=takeuplink'>take</a>"
-			if (usr.client.holder.rights & (R_SERVER|R_EVENT))
+			if(usr.client.holder.rights & (R_SERVER|R_EVENT))
 				text += ", <a href='?src=\ref[src];common=crystals'>[crystals]</a> crystals"
 			else
 				text += ", [crystals] crystals"
@@ -439,7 +439,7 @@
 	out += memory
 	out += "<br><a href='?src=\ref[src];memory_edit=1'>Edit memory</a><br>"
 	out += "Objectives:<br>"
-	if (objectives.len == 0)
+	if(objectives.len == 0)
 		out += "EMPTY<br>"
 	else
 		var/obj_count = 1
@@ -455,28 +455,28 @@
 /datum/mind/Topic(href, href_list)
 	if(!check_rights(R_ADMIN))	return
 
-	if (href_list["role_edit"])
+	if(href_list["role_edit"])
 		var/new_role = input("Select new role", "Assigned role", assigned_role) as null|anything in joblist
-		if (!new_role) return
+		if(!new_role) return
 		assigned_role = new_role
 		log_admin("[key_name(usr)] has changed [key_name(current)]'s assigned role to [assigned_role]")
 		message_admins("[key_name_admin(usr)] has changed [key_name_admin(current)]'s assigned role to [assigned_role]")
 
-	else if (href_list["memory_edit"])
+	else if(href_list["memory_edit"])
 		var/new_memo = copytext(input("Write new memory", "Memory", memory) as null|message,1,MAX_MESSAGE_LEN)
-		if (isnull(new_memo)) return
+		if(isnull(new_memo)) return
 		memory = new_memo
 		log_admin("[key_name(usr)] has edited [key_name(current)]'s memory")
 		message_admins("[key_name_admin(usr)] has edited [key_name_admin(current)]'s memory")
 
-	else if (href_list["obj_edit"] || href_list["obj_add"])
+	else if(href_list["obj_edit"] || href_list["obj_add"])
 		var/datum/objective/objective
 		var/objective_pos
 		var/def_value
 
-		if (href_list["obj_edit"])
+		if(href_list["obj_edit"])
 			objective = locate(href_list["obj_edit"])
-			if (!objective) return
+			if(!objective) return
 			objective_pos = objectives.Find(objective)
 
 			//Text strings are easy to manipulate. Revised for simplicity.
@@ -486,12 +486,12 @@
 				def_value = "custom"
 
 		var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "blood", "debrain", "protect", "prevent", "brig", "hijack", "escape", "survive", "steal", "download", "nuclear", "capture", "absorb", "destroy", "maroon", "identity theft", "custom")
-		if (!new_obj_type) return
+		if(!new_obj_type) return
 
 		var/datum/objective/new_objective = null
 
-		switch (new_obj_type)
-			if ("assassinate","protect","debrain", "brig", "maroon")
+		switch(new_obj_type)
+			if("assassinate","protect","debrain", "brig", "maroon")
 				//To determine what to name the objective in explanation text.
 				var/objective_type_capital = uppertext(copytext(new_obj_type, 1,2))//Capitalize first letter.
 				var/objective_type_text = copytext(new_obj_type, 2)//Leave the rest of the text.
@@ -499,19 +499,19 @@
 
 				var/list/possible_targets = list("Free objective")
 				for(var/datum/mind/possible_target in ticker.minds)
-					if ((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
+					if((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
 						possible_targets += possible_target.current
 
 				var/mob/def_target = null
 				var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain)
-				if (objective&&(objective.type in objective_list) && objective:target)
+				if(objective&&(objective.type in objective_list) && objective:target)
 					def_target = objective:target.current
 
 				var/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
-				if (!new_target) return
+				if(!new_target) return
 
 				var/objective_path = text2path("/datum/objective/[new_obj_type]")
-				if (new_target == "Free objective")
+				if(new_target == "Free objective")
 					new_objective = new objective_path
 					new_objective.owner = src
 					new_objective:target = null
@@ -523,7 +523,7 @@
 					//Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
 					new_objective.explanation_text = "[objective_type] [new_target:real_name], the [new_target:mind:assigned_role=="MODE" ? (new_target:mind:special_role) : (new_target:mind:assigned_role)]."
 
-			if ("destroy")
+			if("destroy")
 				var/list/possible_targets = active_ais(1)
 				if(possible_targets.len)
 					var/mob/new_target = input("Select target:", "Objective target") as null|anything in possible_targets
@@ -534,38 +534,38 @@
 				else
 					to_chat(usr, "No active AIs with minds")
 
-			if ("prevent")
+			if("prevent")
 				new_objective = new /datum/objective/block
 				new_objective.owner = src
 
-			if ("hijack")
+			if("hijack")
 				new_objective = new /datum/objective/hijack
 				new_objective.owner = src
 
-			if ("escape")
+			if("escape")
 				new_objective = new /datum/objective/escape
 				new_objective.owner = src
 
-			if ("survive")
+			if("survive")
 				new_objective = new /datum/objective/survive
 				new_objective.owner = src
 
-			if ("die")
+			if("die")
 				new_objective = new /datum/objective/die
 				new_objective.owner = src
 
-			if ("nuclear")
+			if("nuclear")
 				new_objective = new /datum/objective/nuclear
 				new_objective.owner = src
 
-			if ("steal")
-				if (!istype(objective, /datum/objective/steal))
+			if("steal")
+				if(!istype(objective, /datum/objective/steal))
 					new_objective = new /datum/objective/steal
 					new_objective.owner = src
 				else
 					new_objective = objective
 				var/datum/objective/steal/steal = new_objective
-				if (!steal.select_target())
+				if(!steal.select_target())
 					return
 
 			if("download","capture","absorb", "blood")
@@ -574,7 +574,7 @@
 					def_num = objective.target_amount
 
 				var/target_number = input("Input target number:", "Objective", def_num) as num|null
-				if (isnull(target_number))//Ordinarily, you wouldn't need isnull. In this case, the value may already exist.
+				if(isnull(target_number))//Ordinarily, you wouldn't need isnull. In this case, the value may already exist.
 					return
 
 				switch(new_obj_type)
@@ -596,11 +596,11 @@
 			if("identity theft")
 				var/list/possible_targets = list("Free objective")
 				for(var/datum/mind/possible_target in ticker.minds)
-					if ((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
+					if((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
 						possible_targets += possible_target.current
 
 				var/new_target = input("Select target:", "Objective target") as null|anything in possible_targets
-				if (!new_target)
+				if(!new_target)
 					return
 				var/datum/mind/targ = new_target
 				if(!istype(targ))
@@ -610,16 +610,16 @@
 				new_objective.owner = src
 				new_objective.target = new_target
 				new_objective.explanation_text = "Escape on the shuttle or an escape pod with the identity of [targ.current.real_name], the [targ.assigned_role] while wearing their identification card."
-			if ("custom")
+			if("custom")
 				var/expl = sanitize(copytext(input("Custom objective:", "Objective", objective ? objective.explanation_text : "") as text|null,1,MAX_MESSAGE_LEN))
-				if (!expl) return
+				if(!expl) return
 				new_objective = new /datum/objective
 				new_objective.owner = src
 				new_objective.explanation_text = expl
 
-		if (!new_objective) return
+		if(!new_objective) return
 
-		if (objective)
+		if(objective)
 			objectives -= objective
 			objectives.Insert(objective_pos, new_objective)
 		else
@@ -628,7 +628,7 @@
 		log_admin("[key_name(usr)] has updated [key_name(current)]'s objectives: [new_objective]")
 		message_admins("[key_name_admin(usr)] has updated [key_name_admin(current)]'s objectives: [new_objective]")
 
-	else if (href_list["obj_delete"])
+	else if(href_list["obj_delete"])
 		var/datum/objective/objective = locate(href_list["obj_delete"])
 		if(!istype(objective))	return
 		objectives -= objective
@@ -679,12 +679,12 @@
 					ticker.mode.update_cult_icons_removed(src)
 					special_role = null
 					var/datum/game_mode/cult/cult = ticker.mode
-					if (istype(cult))
+					if(istype(cult))
 						cult.memorize_cult_objectives(src)
 					to_chat(current, "\red <FONT size = 3><B>The nanobots in the mindshield implant remove all thoughts about being in a cult.  Have a productive day!</B></FONT>")
 					memory = ""
 
-	else if (href_list["revolution"])
+	else if(href_list["revolution"])
 
 		switch(href_list["revolution"])
 			if("clear")
@@ -725,11 +725,11 @@
 					to_chat(current, "\blue You are a member of the revolutionaries' leadership now!")
 				else
 					return
-				if (ticker.mode.head_revolutionaries.len>0)
+				if(ticker.mode.head_revolutionaries.len>0)
 					// copy targets
 					var/datum/mind/valid_head = locate() in ticker.mode.head_revolutionaries
-					if (valid_head)
-						for (var/datum/objective/mutiny/O in valid_head.objectives)
+					if(valid_head)
+						for(var/datum/objective/mutiny/O in valid_head.objectives)
 							var/datum/objective/mutiny/rev_obj = new
 							rev_obj.owner = src
 							rev_obj.target = O.target
@@ -749,7 +749,7 @@
 				message_admins("[key_name_admin(usr)] has automatically forged revolutionary objectives for [key_name_admin(current)]")
 
 			if("flash")
-				if (!ticker.mode.equip_revolutionary(current))
+				if(!ticker.mode.equip_revolutionary(current))
 					to_chat(usr, "\red Spawning flash failed!")
 				log_admin("[key_name(usr)] has given [key_name(current)] a flash")
 				message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] a flash")
@@ -757,7 +757,7 @@
 			if("takeflash")
 				var/list/L = current.get_contents()
 				var/obj/item/device/flash/flash = locate() in L
-				if (!flash)
+				if(!flash)
 					to_chat(usr, "\red Deleting flash failed!")
 				qdel(flash)
 				log_admin("[key_name(usr)] has taken [key_name(current)]'s flash")
@@ -766,7 +766,7 @@
 			if("repairflash")
 				var/list/L = current.get_contents()
 				var/obj/item/device/flash/flash = locate() in L
-				if (!flash)
+				if(!flash)
 					to_chat(usr, "\red Repairing flash failed!")
 				else
 					flash.broken = 0
@@ -781,13 +781,13 @@
 				var/fail = 0
 				fail |= !ticker.mode.equip_traitor(current, 1)
 				fail |= !ticker.mode.equip_revolutionary(current)
-				if (fail)
+				if(fail)
 					to_chat(usr, "\red Reequipping revolutionary goes wrong!")
 					return
 				log_admin("[key_name(usr)] has equipped [key_name(current)] as a revolutionary")
 				message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a revolutionary")
 
-	else if (href_list["cult"])
+	else if(href_list["cult"])
 		switch(href_list["cult"])
 			if("clear")
 				if(src in ticker.mode.cult)
@@ -805,7 +805,7 @@
 					message_admins("[key_name_admin(usr)] has culted [key_name_admin(current)]")
 			if("tome")
 				var/mob/living/carbon/human/H = current
-				if (istype(H))
+				if(istype(H))
 					var/obj/item/weapon/tome/T = new(H)
 
 					var/list/slots = list (
@@ -816,7 +816,7 @@
 						"right hand" = slot_r_hand,
 					)
 					var/where = H.equip_in_one_of_slots(T, slots)
-					if (!where)
+					if(!where)
 						to_chat(usr, "\red Spawning tome failed!")
 						qdel(T)
 					else
@@ -825,12 +825,12 @@
 						message_admins("[key_name_admin(usr)] has spawned a tome for [key_name_admin(current)]")
 
 			if("equip")
-				if (!ticker.mode.equip_cultist(current))
+				if(!ticker.mode.equip_cultist(current))
 					to_chat(usr, "\red Spawning equipment failed!")
 				log_admin("[key_name(usr)] has equipped [key_name(current)] as a cultist")
 				message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a cultist")
 
-	else if (href_list["wizard"])
+	else if(href_list["wizard"])
 
 		switch(href_list["wizard"])
 			if("clear")
@@ -872,7 +872,7 @@
 				message_admins("[key_name_admin(usr)] has automatically forged wizard objectives for [key_name_admin(current)]")
 
 
-	else if (href_list["changeling"])
+	else if(href_list["changeling"])
 		switch(href_list["changeling"])
 			if("clear")
 				if(src in ticker.mode.changelings)
@@ -911,7 +911,7 @@
 					log_admin("[key_name(usr)] has reset [key_name(current)]'s DNA")
 					message_admins("[key_name_admin(usr)] has reset [key_name_admin(current)]'s DNA")
 
-	else if (href_list["vampire"])
+	else if(href_list["vampire"])
 		switch(href_list["vampire"])
 			if("clear")
 				if(src in ticker.mode.vampires)
@@ -945,7 +945,7 @@
 				message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]")
 
 
-	else if (href_list["nuclear"])
+	else if(href_list["nuclear"])
 		var/mob/living/carbon/human/H = current
 
 		switch(href_list["nuclear"])
@@ -954,7 +954,7 @@
 					ticker.mode.syndicates -= src
 					ticker.mode.update_synd_icons_removed(src)
 					special_role = null
-					for (var/datum/objective/nuclear/O in objectives)
+					for(var/datum/objective/nuclear/O in objectives)
 						objectives-=O
 					to_chat(current, "\red <FONT size = 3><B>You have been brainwashed! You are no longer a syndicate operative!</B></FONT>")
 					log_admin("[key_name(usr)] has de-nuke op'd [key_name(current)]")
@@ -963,7 +963,7 @@
 				if(!(src in ticker.mode.syndicates))
 					ticker.mode.syndicates += src
 					ticker.mode.update_synd_icons_added(src)
-					if (ticker.mode.syndicates.len==1)
+					if(ticker.mode.syndicates.len==1)
 						ticker.mode.prepare_syndicate_leader(src)
 					else
 						current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
@@ -990,7 +990,7 @@
 				qdel(H.wear_suit)
 				qdel(H.w_uniform)
 
-				if (!ticker.mode.equip_syndicate(current))
+				if(!ticker.mode.equip_syndicate(current))
 					to_chat(usr, "\red Equipping a syndicate failed!")
 					return
 				log_admin("[key_name(usr)] has equipped [key_name(current)] as a nuclear operative")
@@ -998,11 +998,11 @@
 
 			if("tellcode")
 				var/code
-				for (var/obj/machinery/nuclearbomb/bombue in machines)
-					if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
+				for(var/obj/machinery/nuclearbomb/bombue in machines)
+					if(length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
 						code = bombue.r_code
 						break
-				if (code)
+				if(code)
 					store_memory("<B>Syndicate Nuclear Bomb Code</B>: [code]", 0, 0)
 					to_chat(current, "The nuclear authorization code is: <B>[code]</B>")
 					log_admin("[key_name(usr)] has given [key_name(current)] the nuclear authorization code")
@@ -1010,7 +1010,7 @@
 				else
 					to_chat(usr, "\red No valid nuke found!")
 
-	else if (href_list["traitor"])
+	else if(href_list["traitor"])
 		switch(href_list["traitor"])
 			if("clear")
 				if(src in ticker.mode.traitors)
@@ -1113,7 +1113,7 @@
 					else
 						temp.equip_scientist(current)
 
-	else if (href_list["silicon"])
+	else if(href_list["silicon"])
 		switch(href_list["silicon"])
 			if("unmalf")
 				if(src in ticker.mode.malf_ai)
@@ -1144,9 +1144,9 @@
 
 			if("unemag")
 				var/mob/living/silicon/robot/R = current
-				if (istype(R))
+				if(istype(R))
 					R.emagged = 0
-					if (R.activated(R.module.emag))
+					if(R.activated(R.module.emag))
 						R.module_active = null
 					if(R.module_state_1 == R.module.emag)
 						R.module_state_1 = null
@@ -1161,12 +1161,12 @@
 					message_admins("[key_name_admin(usr)] has un-emagged [key_name_admin(current)]")
 
 			if("unemagcyborgs")
-				if (istype(current, /mob/living/silicon/ai))
+				if(istype(current, /mob/living/silicon/ai))
 					var/mob/living/silicon/ai/ai = current
-					for (var/mob/living/silicon/robot/R in ai.connected_robots)
+					for(var/mob/living/silicon/robot/R in ai.connected_robots)
 						R.emagged = 0
-						if (R.module)
-							if (R.activated(R.module.emag))
+						if(R.module)
+							if(R.activated(R.module.emag))
 								R.module_active = null
 							if(R.module_state_1 == R.module.emag)
 								R.module_state_1 = null
@@ -1180,7 +1180,7 @@
 					log_admin("[key_name(usr)] has unemagged [key_name(ai)]'s cyborgs")
 					message_admins("[key_name_admin(usr)] has unemagged [key_name_admin(ai)]'s cyborgs")
 
-	else if (href_list["common"])
+	else if(href_list["common"])
 		switch(href_list["common"])
 			if("undress")
 				if(ishuman(current))
@@ -1199,25 +1199,25 @@
 				log_admin("[key_name(usr)] has taken [key_name(current)]'s uplink")
 				message_admins("[key_name_admin(usr)] has taken [key_name_admin(current)]'s uplink")
 			if("crystals")
-				if (usr.client.holder.rights & (R_SERVER|R_EVENT))
+				if(usr.client.holder.rights & (R_SERVER|R_EVENT))
 					var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink()
 					var/crystals
-					if (suplink)
+					if(suplink)
 						crystals = suplink.uses
 					crystals = input("Amount of telecrystals for [key]","Syndicate uplink", crystals) as null|num
-					if (!isnull(crystals))
-						if (suplink)
+					if(!isnull(crystals))
+						if(suplink)
 							suplink.uses = crystals
 							log_admin("[key_name(usr)] has set [key_name(current)]'s telecrystals to [crystals]")
 							message_admins("[key_name_admin(usr)] has set [key_name_admin(current)]'s telecrystals to [crystals]")
 			if("uplink")
-				if (!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors)))
+				if(!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors)))
 					to_chat(usr, "\red Equipping a syndicate failed!")
 					return
 				log_admin("[key_name(usr)] has given [key_name(current)] an uplink")
 				message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] an uplink")
 
-	else if (href_list["obj_announce"])
+	else if(href_list["obj_announce"])
 		var/obj_count = 1
 		to_chat(current, "\blue Your current objectives:")
 		for(var/datum/objective/objective in objectives)
@@ -1233,16 +1233,16 @@
 
 	// remove traitor uplinks
 	var/list/L = current.get_contents()
-	for (var/t in L)
-		if (istype(t, /obj/item/device/pda))
-			if (t:uplink) qdel(t:uplink)
+	for(var/t in L)
+		if(istype(t, /obj/item/device/pda))
+			if(t:uplink) qdel(t:uplink)
 			t:uplink = null
-		else if (istype(t, /obj/item/device/radio))
-			if (t:traitorradio) qdel(t:traitorradio)
+		else if(istype(t, /obj/item/device/radio))
+			if(t:traitorradio) qdel(t:traitorradio)
 			t:traitorradio = null
 			t:traitor_frequency = 0.0
-		else if (istype(t, /obj/item/weapon/SWF_uplink) || istype(t, /obj/item/weapon/syndicate_uplink))
-			if (t:origradio)
+		else if(istype(t, /obj/item/weapon/SWF_uplink) || istype(t, /obj/item/weapon/syndicate_uplink))
+			if(t:origradio)
 				var/obj/item/device/radio/R = t:origradio
 				R.loc = current.loc
 				R.traitorradio = null
@@ -1261,8 +1261,8 @@
 
 /datum/mind/proc/find_syndicate_uplink()
 	var/list/L = current.get_contents()
-	for (var/obj/item/I in L)
-		if (I.hidden_uplink)
+	for(var/obj/item/I in L)
+		if(I.hidden_uplink)
 			return I.hidden_uplink
 	return null
 
@@ -1297,7 +1297,7 @@
 	if(!(src in ticker.mode.syndicates))
 		ticker.mode.syndicates += src
 		ticker.mode.update_synd_icons_added(src)
-		if (ticker.mode.syndicates.len==1)
+		if(ticker.mode.syndicates.len==1)
 			ticker.mode.prepare_syndicate_leader(src)
 		else
 			current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
@@ -1362,7 +1362,7 @@
 		to_chat(current, "<font color=\"purple\"><b><i>You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.</b></i></font>")
 		to_chat(current, "<font color=\"purple\"><b><i>Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.</b></i></font>")
 		var/datum/game_mode/cult/cult = ticker.mode
-		if (istype(cult))
+		if(istype(cult))
 			cult.memorize_cult_objectives(src)
 		else
 			var/explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it."
@@ -1372,7 +1372,7 @@
 			current.memory += "The convert rune is join blood self<BR>"
 
 	var/mob/living/carbon/human/H = current
-	if (istype(H))
+	if(istype(H))
 		var/obj/item/weapon/tome/T = new(H)
 
 		var/list/slots = list (
@@ -1383,19 +1383,19 @@
 			"right hand" = slot_r_hand,
 		)
 		var/where = H.equip_in_one_of_slots(T, slots)
-		if (!where)
+		if(!where)
 		else
 			to_chat(H, "A tome, a message from your new master, appears in your [where].")
 
-	if (!ticker.mode.equip_cultist(current))
+	if(!ticker.mode.equip_cultist(current))
 		to_chat(H, "Spawning an amulet from your Master failed.")
 
 /datum/mind/proc/make_Rev()
-	if (ticker.mode.head_revolutionaries.len>0)
+	if(ticker.mode.head_revolutionaries.len>0)
 		// copy targets
 		var/datum/mind/valid_head = locate() in ticker.mode.head_revolutionaries
-		if (valid_head)
-			for (var/datum/objective/mutiny/O in valid_head.objectives)
+		if(valid_head)
+			for(var/datum/objective/mutiny/O in valid_head.objectives)
 				var/datum/objective/mutiny/rev_obj = new
 				rev_obj.owner = src
 				rev_obj.target = O.target
diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm
index ebb2329b357..acac430399b 100644
--- a/code/datums/progressbar.dm
+++ b/code/datums/progressbar.dm
@@ -7,9 +7,9 @@
 
 /datum/progressbar/New(mob/User, goal_number, atom/target)
 	. = ..()
-	if (!istype(target))
+	if(!istype(target))
 		EXCEPTION("Invalid target given")
-	if (goal_number)
+	if(goal_number)
 		goal = goal_number
 	bar = image('icons/effects/progessbar.dmi', target, "prog_bar_0")
 	bar.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
@@ -20,23 +20,23 @@
 
 /datum/progressbar/proc/update(progress)
 //	to_chat(world, "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]")
-	if (!user || !user.client)
+	if(!user || !user.client)
 		shown = 0
 		return
-	if (user.client != client)
-		if (client)
+	if(user.client != client)
+		if(client)
 			client.images -= bar
-		if (user.client)
+		if(user.client)
 			user.client.images += bar
 
 	progress = Clamp(progress, 0, goal)
 	bar.icon_state = "prog_bar_[round(((progress / goal) * 100), 5)]"
-	if (!shown)
+	if(!shown)
 		user.client.images += bar
 		shown = 1
 
 /datum/progressbar/Destroy()
-	if (client)
+	if(client)
 		client.images -= bar
 	qdel(bar)
 	. = ..()
\ No newline at end of file
diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm
index 6c7ccd0105b..645af5e8aea 100644
--- a/code/datums/recipe.dm
+++ b/code/datums/recipe.dm
@@ -44,14 +44,14 @@
 
 /datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents) //1=precisely, 0=insufficiently, -1=superfluous
 	. = 1
-	for (var/r_r in reagents)
+	for(var/r_r in reagents)
 		var/aval_r_amnt = avail_reagents.get_reagent_amount(r_r)
-		if (!(abs(aval_r_amnt - reagents[r_r])<0.5)) //if NOT equals
-			if (aval_r_amnt>reagents[r_r])
+		if(!(abs(aval_r_amnt - reagents[r_r])<0.5)) //if NOT equals
+			if(aval_r_amnt>reagents[r_r])
 				. = -1
 			else
 				return 0
-	if ((reagents?(reagents.len):(0)) < avail_reagents.reagent_list.len)
+	if((reagents?(reagents.len):(0)) < avail_reagents.reagent_list.len)
 		return -1
 	return .
 
@@ -76,7 +76,7 @@
 
 /datum/recipe/proc/check_items(var/obj/container as obj)
 	. = 1
-	if (items && items.len)
+	if(items && items.len)
 		var/list/checklist = list()
 		checklist = items.Copy() // You should really trust Copy
 		for(var/obj/O in container)
@@ -85,20 +85,20 @@
 			var/found = 0
 			for(var/i = 1; i < checklist.len+1; i++)
 				var/item_type = checklist[i]
-				if (istype(O,item_type))
+				if(istype(O,item_type))
 					checklist.Cut(i, i+1)
 					found = 1
 					break
-			if (!found)
+			if(!found)
 				. = 0
-		if (checklist.len)
+		if(checklist.len)
 			. = -1
 	return .
 
 //general version
 /datum/recipe/proc/make(var/obj/container as obj)
 	var/obj/result_obj = new result(container)
-	for (var/obj/O in (container.contents-result_obj))
+	for(var/obj/O in (container.contents-result_obj))
 		O.reagents.trans_to(result_obj, O.reagents.total_volume)
 		qdel(O)
 	container.reagents.clear_reagents()
@@ -108,8 +108,8 @@
 // food-related
 /datum/recipe/proc/make_food(var/obj/container as obj)
 	var/obj/result_obj = new result(container)
-	for (var/obj/O in (container.contents-result_obj))
-		if (O.reagents)
+	for(var/obj/O in (container.contents-result_obj))
+		if(O.reagents)
 			O.reagents.del_reagent("nutriment")
 			O.reagents.update_total()
 			O.reagents.trans_to(result_obj, O.reagents.total_volume)
@@ -119,22 +119,22 @@
 	return result_obj
 
 /proc/select_recipe(var/list/datum/recipe/avaiable_recipes, var/obj/obj as obj, var/exact = 1 as num)
-	if (!exact)
+	if(!exact)
 		exact = -1
 	var/list/datum/recipe/possible_recipes = new
-	for (var/datum/recipe/recipe in avaiable_recipes)
-		if (recipe.check_reagents(obj.reagents)==exact && recipe.check_items(obj)==exact && recipe.check_fruit(obj)==exact)
+	for(var/datum/recipe/recipe in avaiable_recipes)
+		if(recipe.check_reagents(obj.reagents)==exact && recipe.check_items(obj)==exact && recipe.check_fruit(obj)==exact)
 			possible_recipes+=recipe
-	if (possible_recipes.len==0)
+	if(possible_recipes.len==0)
 		return null
-	else if (possible_recipes.len==1)
+	else if(possible_recipes.len==1)
 		return possible_recipes[1]
 	else //okay, let's select the most complicated recipe
 		var/highest_count = 0
 		. = possible_recipes[1]
-		for (var/datum/recipe/recipe in possible_recipes)
+		for(var/datum/recipe/recipe in possible_recipes)
 			var/count = ((recipe.items)?(recipe.items.len):0) + ((recipe.reagents)?(recipe.reagents.len):0) + ((recipe.fruit)?(recipe.fruit.len):0)
-			if (count >= highest_count)
+			if(count >= highest_count)
 				highest_count = count
 				. = recipe
 		return .
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index 12b11abe529..978eb6e77a2 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -60,7 +60,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 	if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.spell_list))
 		to_chat(user, "<span class='warning'>You shouldn't have this spell! Something's wrong.</span>")
 		return 0
-	if (istype(user, /mob/living/carbon/human))
+	if(istype(user, /mob/living/carbon/human))
 		var/mob/living/carbon/human/caster = user
 		if(caster.remoteview_target)
 			caster.remoteview_target = null
diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm
new file mode 100644
index 00000000000..d4d3b383f9d
--- /dev/null
+++ b/code/datums/spells/cluwne.dm
@@ -0,0 +1,88 @@
+/obj/effect/proc_holder/spell/targeted/touch/cluwne
+	name = "Curse of the Cluwne"
+	desc = "Turns the target into a fat and cursed monstrosity of a clown."
+	hand_path = /obj/item/weapon/melee/touch_attack/cluwne
+
+	school = "transmutation"
+
+	charge_max = 600
+	clothes_req = 1
+	cooldown_min = 200 //100 deciseconds reduction per rank
+
+	action_icon_state = "clown"
+
+/mob/living/carbon/human/proc/makeCluwne()
+	to_chat(src, "<span class='danger'>You feel funny.</span>")
+	adjustBrainLoss(80)
+	nutrition = 9000
+	overeatduration = 9000
+	confused = 30
+	if(mind)
+		mind.assigned_role = "Cluwne"
+
+	var/obj/item/organ/internal/honktumor/cursed/tumor = new
+	tumor.insert(src)
+	mutations.Add(NERVOUS)
+	dna.SetSEState(NERVOUSBLOCK, 1, 1)
+	genemutcheck(src, NERVOUSBLOCK, null, MUTCHK_FORCED)
+
+	animate_clownspell(src)
+
+	unEquip(w_uniform, 1)
+	unEquip(shoes, 1)
+	unEquip(gloves, 1)
+	if(!istype(wear_mask, /obj/item/clothing/mask/cursedclown)) //Infinite loops otherwise
+		unEquip(wear_mask, 1)
+	equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, slot_w_uniform, 1, 1, 1)
+	equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, slot_gloves, 1, 1, 1)
+	equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, slot_wear_mask, 1, 1, 1)
+	equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, slot_shoes, 1, 1, 1)
+	real_name = "cluwne"
+
+/mob/living/carbon/human/proc/makeAntiCluwne()
+	to_chat(src, "<span class='danger'>You don't feel very funny.</span>")
+	adjustBrainLoss(-120)
+	nutrition = NUTRITION_LEVEL_STARVING
+	overeatduration = 0
+	confused = 0
+	jitteriness = 0
+	if(mind)
+		mind.assigned_role = "Lawyer"
+
+	var/obj/item/organ/internal/honktumor/cursed/tumor = get_int_organ(/obj/item/organ/internal/honktumor/cursed)
+	if(tumor)
+		tumor.remove(src, clean_remove = 1)
+		qdel(tumor)
+	else
+		mutations.Remove(CLUMSY)
+		mutations.Remove(COMICBLOCK)
+		dna.SetSEState(CLUMSYBLOCK,0)
+		dna.SetSEState(COMICBLOCK,0)
+		genemutcheck(src, CLUMSYBLOCK, null, MUTCHK_FORCED)
+		genemutcheck(src, COMICBLOCK, null, MUTCHK_FORCED)
+	mutations.Remove(NERVOUS)
+	dna.SetSEState(NERVOUSBLOCK, 0)
+	genemutcheck(src, NERVOUSBLOCK, null, MUTCHK_FORCED)
+
+	animate_clownspell(src)
+
+	var/obj/item/clothing/under/U = w_uniform
+	unEquip(w_uniform, 1)
+	if(U)
+		qdel(U)
+
+	var/obj/item/clothing/shoes/S = shoes
+	unEquip(shoes, 1)
+	if(S)
+		qdel(S)
+
+	if(istype(wear_mask, /obj/item/clothing/mask/cursedclown))
+		unEquip(wear_mask, 1)
+
+	if(istype(gloves, /obj/item/clothing/gloves/cursedclown))
+		var/obj/item/clothing/gloves/G = gloves
+		unEquip(gloves, 1)
+		qdel(G)
+
+	equip_to_slot_if_possible(new /obj/item/clothing/under/lawyer/black, slot_w_uniform, 1, 1, 1)
+	equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, slot_shoes, 1, 1, 1)
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 384ec56915d..eba2aa895f4 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -106,7 +106,7 @@
 	return ..()
 
 /obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
-	if (!src.canmove) return
+	if(!src.canmove) return
 	var/turf/newLoc = get_step(src,direction)
 	if(!(newLoc.flags & NOJAUNT))
 		loc = newLoc
diff --git a/code/datums/spells/inflict_handler.dm b/code/datums/spells/inflict_handler.dm
index 435909e3abe..9ddac0b0920 100644
--- a/code/datums/spells/inflict_handler.dm
+++ b/code/datums/spells/inflict_handler.dm
@@ -34,14 +34,14 @@
 		if(amt_dam_brute > 0)
 			if(amt_dam_fire >= 0)
 				target.take_overall_damage(amt_dam_brute,amt_dam_fire)
-			else if (amt_dam_fire < 0)
+			else if(amt_dam_fire < 0)
 				target.take_overall_damage(amt_dam_brute,0)
 				target.heal_overall_damage(0,amt_dam_fire)
 		else if(amt_dam_brute < 0)
 			if(amt_dam_fire > 0)
 				target.take_overall_damage(0,amt_dam_fire)
 				target.heal_overall_damage(amt_dam_brute,0)
-			else if (amt_dam_fire <= 0)
+			else if(amt_dam_fire <= 0)
 				target.heal_overall_damage(amt_dam_brute,amt_dam_fire)
 		target.adjustToxLoss(amt_dam_tox)
 		target.oxyloss += amt_dam_oxy
diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm
index 1262730fd45..6f659e5e98d 100644
--- a/code/datums/spells/touch_attacks.dm
+++ b/code/datums/spells/touch_attacks.dm
@@ -1,5 +1,5 @@
-/obj/effect/proc_holder/spell/targeted/touch/
-	var/hand_path = "/obj/item/weapon/melee/touch_attack"
+/obj/effect/proc_holder/spell/targeted/touch
+	var/hand_path = /obj/item/weapon/melee/touch_attack
 	var/obj/item/weapon/melee/touch_attack/attached_hand = null
 	invocation_type = "none" //you scream on connecting, not summoning
 	include_user = 1
@@ -47,7 +47,7 @@
 /obj/effect/proc_holder/spell/targeted/touch/disintegrate
 	name = "Disintegrate"
 	desc = "This spell charges your hand with vile energy that can be used to violently explode victims."
-	hand_path = "/obj/item/weapon/melee/touch_attack/disintegrate"
+	hand_path = /obj/item/weapon/melee/touch_attack/disintegrate
 
 	school = "evocation"
 	charge_max = 600
@@ -59,11 +59,11 @@
 /obj/effect/proc_holder/spell/targeted/touch/flesh_to_stone
 	name = "Flesh to Stone"
 	desc = "This spell charges your hand with the power to turn victims into inert statues for a long period of time."
-	hand_path = "/obj/item/weapon/melee/touch_attack/fleshtostone"
+	hand_path = /obj/item/weapon/melee/touch_attack/fleshtostone
 
 	school = "transmutation"
 	charge_max = 600
 	clothes_req = 1
 	cooldown_min = 200 //100 deciseconds reduction per rank
 
-	action_icon_state = "statue"
\ No newline at end of file
+	action_icon_state = "statue"
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index ad13d541d96..3ecf203ea02 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -80,14 +80,14 @@ var/list/uplink_items = list()
 	if(!istype(U))
 		return 0
 
-	if (user.stat || user.restrained())
+	if(user.stat || user.restrained())
 		return 0
 
-	if (!(istype(user, /mob/living/carbon/human)))
+	if(!(istype(user, /mob/living/carbon/human)))
 		return 0
 
 	// If the uplink's holder is in the user's contents
-	if ((U.loc in user.contents || (in_range(U.loc, user) && istype(U.loc.loc, /turf))))
+	if((U.loc in user.contents || (in_range(U.loc, user) && istype(U.loc.loc, /turf))))
 		user.set_machine(U)
 		if(cost > U.uses)
 			return 0
@@ -378,6 +378,15 @@ var/list/uplink_items = list()
 	gamemodes = list(/datum/game_mode/nuclear)
 	surplus = 0
 
+/datum/uplink_item/dangerous/sniper
+	name = "Sniper Rifle"
+	desc = "Ranged fury, Syndicate style. guaranteed to cause shock and awe or your TC back!"
+	reference = "SSR"
+	item = /obj/item/weapon/gun/projectile/automatic/sniper_rifle/syndicate
+	cost = 16
+	surplus = 25
+	gamemodes = list(/datum/game_mode/nuclear)
+
 /datum/uplink_item/dangerous/crossbow
 	name = "Energy Crossbow"
 	desc = "A miniature energy crossbow that is small enough both to fit into a pocket and to slip into a backpack unnoticed by observers. Fires bolts tipped with toxin, a poisonous substance that is the product of a living organism. Stuns enemies for a short period of time. Recharges automatically."
@@ -620,6 +629,38 @@ var/list/uplink_items = list()
 	gamemodes = list(/datum/game_mode/nuclear)
 	surplus = 0
 
+/datum/uplink_item/ammo/sniper
+	cost = 4
+	gamemodes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/sniper/basic
+	name = ".50 Magazine"
+	desc = "An additional standard 6-round magazine for use with .50 sniper rifles."
+	reference = "50M"
+	item = /obj/item/ammo_box/magazine/sniper_rounds
+
+/datum/uplink_item/ammo/sniper/soporific
+	name = ".50 Soporific Magazine"
+	desc = "A 3-round magazine of soporific ammo designed for use with .50 sniper rifles. Put your enemies to sleep today!"
+	reference = "50S"
+	item = /obj/item/ammo_box/magazine/sniper_rounds/soporific
+	cost = 6
+
+/datum/uplink_item/ammo/sniper/haemorrhage
+	name = ".50 Haemorrhage Magazine"
+	desc = "A 5-round magazine of haemorrhage ammo designed for use with .50 sniper rifles; causes heavy bleeding \
+			in the target."
+	reference = "50B"
+	item = /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage
+
+/datum/uplink_item/ammo/sniper/penetrator
+	name = ".50 Penetrator Magazine"
+	desc = "A 5-round magazine of penetrator ammo designed for use with .50 sniper rifles. \
+			Can pierce walls and multiple enemies."
+	reference = "50P"
+	item = /obj/item/ammo_box/magazine/sniper_rounds/penetrator
+	cost = 5
+
 // STEALTHY WEAPONS
 
 /datum/uplink_item/stealthy_weapons
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index 181572b5753..8fb989a8a4f 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -100,7 +100,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
 				A.electrify(0)
 			return // Don't update the dialog.
 
-		if (AIRLOCK_WIRE_SAFETY)
+		if(AIRLOCK_WIRE_SAFETY)
 			A.safe = mended
 
 		if(AIRLOCK_WIRE_SPEED)
diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm
index 4d88de82a67..a31d075ecc7 100644
--- a/code/datums/wires/alarm.dm
+++ b/code/datums/wires/alarm.dm
@@ -35,8 +35,8 @@ var/const/AALARM_WIRE_AALARM = 16
 			A.update_icon()
 //			to_chat(world, "Power wire cut")
 
-		if (AALARM_WIRE_AI_CONTROL)
-			if (A.aidisabled == !mended)
+		if(AALARM_WIRE_AI_CONTROL)
+			if(A.aidisabled == !mended)
 				A.aidisabled = mended
 //				to_chat(world, "AI Control Wire Cut")
 
@@ -47,7 +47,7 @@ var/const/AALARM_WIRE_AALARM = 16
 //				to_chat(world, "Syphon Wire Cut")
 
 		if(AALARM_WIRE_AALARM)
-			if (A.alarm_area.atmosalert(2, A))
+			if(A.alarm_area.atmosalert(2, A))
 				A.post_alert(2)
 			A.update_icon()
 
@@ -58,7 +58,7 @@ var/const/AALARM_WIRE_AALARM = 16
 			A.locked = !A.locked
 //			to_chat(world, "Idscan wire pulsed")
 
-		if (AALARM_WIRE_POWER)
+		if(AALARM_WIRE_POWER)
 //			to_chat(world, "Power wire pulsed")
 			if(A.shorted == 0)
 				A.shorted = 1
@@ -70,13 +70,13 @@ var/const/AALARM_WIRE_AALARM = 16
 					A.update_icon()
 
 
-		if (AALARM_WIRE_AI_CONTROL)
+		if(AALARM_WIRE_AI_CONTROL)
 //			to_chat(world, "AI Control wire pulsed")
-			if (A.aidisabled == 0)
+			if(A.aidisabled == 0)
 				A.aidisabled = 1
 			A.updateDialog()
 			spawn(100)
-				if (A.aidisabled == 1)
+				if(A.aidisabled == 1)
 					A.aidisabled = 0
 
 		if(AALARM_WIRE_SYPHON)
@@ -89,6 +89,6 @@ var/const/AALARM_WIRE_AALARM = 16
 
 		if(AALARM_WIRE_AALARM)
 //			to_chat(world, "Aalarm wire pulsed")
-			if (A.alarm_area.atmosalert(0, A))
+			if(A.alarm_area.atmosalert(0, A))
 				A.post_alert(0)
 			A.update_icon()
diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm
index 96075d5941f..ff566bb7e6d 100644
--- a/code/datums/wires/apc.dm
+++ b/code/datums/wires/apc.dm
@@ -33,7 +33,7 @@ var/const/APC_WIRE_AI_CONTROL = 8
 					A.locked = 1
 					A.updateDialog()
 
-		if (APC_WIRE_MAIN_POWER1, APC_WIRE_MAIN_POWER2)
+		if(APC_WIRE_MAIN_POWER1, APC_WIRE_MAIN_POWER2)
 			if(A.shorted == 0)
 				A.shorted = 1
 
@@ -42,8 +42,8 @@ var/const/APC_WIRE_AI_CONTROL = 8
 						A.shorted = 0
 						A.updateDialog()
 
-		if (APC_WIRE_AI_CONTROL)
-			if (A.aidisabled == 0)
+		if(APC_WIRE_AI_CONTROL)
+			if(A.aidisabled == 0)
 				A.aidisabled = 1
 
 				spawn(10)
@@ -70,9 +70,9 @@ var/const/APC_WIRE_AI_CONTROL = 8
 		if(APC_WIRE_AI_CONTROL)
 
 			if(!mended)
-				if (A.aidisabled == 0)
+				if(A.aidisabled == 0)
 					A.aidisabled = 1
 			else
-				if (A.aidisabled == 1)
+				if(A.aidisabled == 1)
 					A.aidisabled = 0
 	A.updateDialog()
\ No newline at end of file
diff --git a/code/datums/wires/nuclearbomb.dm b/code/datums/wires/nuclearbomb.dm
index 0e28c23fb91..0297bea8508 100644
--- a/code/datums/wires/nuclearbomb.dm
+++ b/code/datums/wires/nuclearbomb.dm
@@ -41,7 +41,7 @@ var/const/NUCLEARBOMB_WIRE_SAFETY		= 4
 						set_security_level(N.previous_level)
 					N.visible_message("\blue The [N] quiets down.")
 					if(!N.lighthack)
-						if (N.icon_state == "nuclearbomb2")
+						if(N.icon_state == "nuclearbomb2")
 							N.icon_state = "nuclearbomb1"
 				else
 					N.visible_message("\blue The [N] emits a quiet whirling noise!")
@@ -56,7 +56,7 @@ var/const/NUCLEARBOMB_WIRE_SAFETY		= 4
 					N.explode()
 		if(NUCLEARBOMB_WIRE_TIMING)
 			if(!N.lighthack)
-				if (N.icon_state == "nuclearbomb2")
+				if(N.icon_state == "nuclearbomb2")
 					N.icon_state = "nuclearbomb1"
 			N.timing = 0
 			bomb_set = 0
diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm
index 58e25152dae..082cdd9d6d6 100644
--- a/code/datums/wires/robot.dm
+++ b/code/datums/wires/robot.dm
@@ -34,25 +34,25 @@ var/const/BORG_WIRE_LAWCHECK    = 16 // Not used on MoMMIs
 	switch(index)
 		if(BORG_WIRE_LAWCHECK) //Cut the law wire, and the borg will no longer receive law updates from its AI
 			if(!mended)
-				if (R.lawupdate == 1)
+				if(R.lawupdate == 1)
 					to_chat(R, "LawSync protocol engaged.")
 					R.show_laws()
 			else
-				if (R.lawupdate == 0 && !R.emagged)
+				if(R.lawupdate == 0 && !R.emagged)
 					R.lawupdate = 1
 
-		if (BORG_WIRE_AI_CONTROL) //Cut the AI wire to reset AI control
+		if(BORG_WIRE_AI_CONTROL) //Cut the AI wire to reset AI control
 			if(!mended)
-				if (R.connected_ai)
+				if(R.connected_ai)
 					R.connected_ai = null
 
-		if (BORG_WIRE_CAMERA)
+		if(BORG_WIRE_CAMERA)
 			if(!isnull(R.camera) && !R.scrambledcodes)
 				R.camera.status = mended
 				R.camera.toggle_cam(usr, 0) // Will kick anyone who is watching the Cyborg's camera.
 
 		if(BORG_WIRE_LAWCHECK)	//Forces a law update if the borg is set to receive them. Since an update would happen when the borg checks its laws anyway, not much use, but eh
-			if (R.lawupdate)
+			if(R.lawupdate)
 				R.lawsync()
 
 		if(BORG_WIRE_LOCKED_DOWN)
@@ -63,12 +63,12 @@ var/const/BORG_WIRE_LAWCHECK    = 16 // Not used on MoMMIs
 
 	var/mob/living/silicon/robot/R = holder
 	switch(index)
-		if (BORG_WIRE_AI_CONTROL) //pulse the AI wire to make the borg reselect an AI
+		if(BORG_WIRE_AI_CONTROL) //pulse the AI wire to make the borg reselect an AI
 			if(!R.emagged)
 				R.connected_ai = select_active_ai()
 				R.notify_ai(1)
 
-		if (BORG_WIRE_CAMERA)
+		if(BORG_WIRE_CAMERA)
 			if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes)
 				R.camera.toggle_cam(usr, 0) // Kick anyone watching the Cyborg's camera, doesn't display you disconnecting the camera.
 				R.visible_message("[R]'s camera lense focuses loudly.")
diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm
index 6feaf9221ed..3fa81883fce 100644
--- a/code/datums/wires/syndicatebomb.dm
+++ b/code/datums/wires/syndicatebomb.dm
@@ -20,7 +20,7 @@ var/const/WIRE_ACTIVATE = 16	// Will start a bombs timer if pulsed, will hint if
 	var/obj/machinery/syndicatebomb/P = holder
 	switch(index)
 		if(WIRE_BOOM)
-			if (P.active)
+			if(P.active)
 				P.loc.visible_message("<span class='danger'>[bicon(holder)] An alarm sounds! It's go-</span>")
 				P.timer = 0
 		if(WIRE_UNBOLT)
@@ -32,11 +32,11 @@ var/const/WIRE_ACTIVATE = 16	// Will start a bombs timer if pulsed, will hint if
 		if(WIRE_PROCEED)
 			playsound(P.loc, 'sound/machines/buzz-sigh.ogg', 30, 1)
 			P.loc.visible_message("<span class='danger'>[bicon(holder)] The bomb buzzes ominously!</span>")
-			if (P.timer >= 61) //Long fuse bombs can suddenly become more dangerous if you tinker with them
+			if(P.timer >= 61) //Long fuse bombs can suddenly become more dangerous if you tinker with them
 				P.timer = 60
-			if (P.timer >= 21)
+			if(P.timer >= 21)
 				P.timer -= 10
-			else if (P.timer >= 11) //both to prevent negative timers and to have a little mercy
+			else if(P.timer >= 11) //both to prevent negative timers and to have a little mercy
 				P.timer = 10
 		if(WIRE_ACTIVATE)
 			if(!P.active && !P.defused)
@@ -61,7 +61,7 @@ var/const/WIRE_ACTIVATE = 16	// Will start a bombs timer if pulsed, will hint if
 			if(mended)
 				P.defused = 0 //cutting and mending all the wires of an inactive bomb will thus cure any sabotage
 		if(WIRE_UNBOLT)
-			if (!mended && P.anchored)
+			if(!mended && P.anchored)
 				playsound(P.loc, 'sound/effects/stealthoff.ogg', 30, 1)
 				P.loc.visible_message("<span class='notice'>[bicon(holder)] The bolts lift out of the ground!</span>")
 				P.anchored = 0
@@ -70,7 +70,7 @@ var/const/WIRE_ACTIVATE = 16	// Will start a bombs timer if pulsed, will hint if
 				P.loc.visible_message("<span class='danger'>[bicon(holder)] An alarm sounds! It's go-</span>")
 				P.timer = 0
 		if(WIRE_ACTIVATE)
-			if (!mended && P.active)
+			if(!mended && P.active)
 				P.loc.visible_message("<span class='notice'>[bicon(holder)] The timer stops! The bomb has been defused!</span>")
 				P.icon_state = "[initial(P.icon_state)]-inactive[P.open_panel ? "-wires" : ""]"
 				P.active = 0
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index 33f962f44e1..c147bd9235c 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -65,7 +65,7 @@ datum/announcement/proc/Message(message as text, message_title as text)
 		if(!istype(M,/mob/new_player) && !isdeaf(M))
 			to_chat(M, "<h2 class='alert'>[title]</h2>")
 			to_chat(M, "<span class='alert'>[message]</span>")
-			if (announcer)
+			if(announcer)
 				to_chat(M, "<span class='alert'> -[html_encode(announcer)]</span>")
 
 /datum/announcement/minor/Message(message as text, message_title as text)
@@ -82,7 +82,7 @@ datum/announcement/priority/Message(message as text, message_title as text)
 datum/announcement/priority/command/Message(message as text, message_title as text)
 	var/command
 	command += "<h1 class='alert'>[command_name()] Update</h1>"
-	if (message_title)
+	if(message_title)
 		command += "<br><h2 class='alert'>[message_title]</h2>"
 
 	command += "<br><span class='alert'>[message]</span><br>"
@@ -94,7 +94,7 @@ datum/announcement/priority/command/Message(message as text, message_title as te
 datum/announcement/priority/enemy/Message(message as text, message_title as text, from as text)
 	var/command
 	command += "<h1 class='alert'>[from]</h1>"
-	if (message_title)
+	if(message_title)
 		command += "<br><h2 class='alert'>[message_title]</h2>"
 
 	command += "<br><span class='alert'>[message]</span><br>"
diff --git a/code/defines/procs/radio.dm b/code/defines/procs/radio.dm
index 1e0e045928b..b13cfe9ca05 100644
--- a/code/defines/procs/radio.dm
+++ b/code/defines/procs/radio.dm
@@ -33,7 +33,7 @@
 
 /proc/get_message_server()
 	if(message_servers)
-		for (var/obj/machinery/message_server/MS in message_servers)
+		for(var/obj/machinery/message_server/MS in message_servers)
 			if(MS.active)
 				return MS
 	return null
diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm
index 005876e8ccc..53e7d6704fd 100644
--- a/code/game/alternate_appearance.dm
+++ b/code/game/alternate_appearance.dm
@@ -30,7 +30,7 @@
 		if(!M.viewing_alternate_appearances)
 			M.viewing_alternate_appearances = list()
 		viewers |= M
-		M.viewing_alternate_appearances[key] = src
+		M.viewing_alternate_appearances += src
 		if(M.client)
 			M.client.images |= img
 
@@ -48,9 +48,7 @@
 		if(M.client)
 			M.client.images -= img
 		if(M.viewing_alternate_appearances && M.viewing_alternate_appearances.len)
-			M.viewing_alternate_appearances -= key
-			if(!M.viewing_alternate_appearances.len)
-				M.viewing_alternate_appearances = null
+			M.viewing_alternate_appearances -= src
 		viewers -= M
 
 
@@ -61,8 +59,6 @@
 	hide()
 	if(owner && owner.alternate_appearances)
 		owner.alternate_appearances -= key
-		if(!owner.alternate_appearances.len)
-			owner.alternate_appearances = null
 
 
 /datum/alternate_appearance/Destroy()
@@ -74,7 +70,7 @@
 /atom
 	var/list/alternate_appearances //the alternate appearances we own
 	var/list/viewing_alternate_appearances //the alternate appearances we're viewing, stored here to reestablish them after Logout()s
-	//these lists are built/destroyed as necessary, so atoms aren't all lugging around lists full of datums
+	//these lists are built as necessary, so atoms aren't all lugging around empty lists
 
 /*
 	Builds an alternate_appearance datum for the supplied args, optionally displaying it straight away
@@ -102,6 +98,8 @@
 	AA.key = key
 	AA.owner = src
 
+	if(alternate_appearances[key])
+		qdel(alternate_appearances[key])
 	alternate_appearances[key] = AA
 	if(displayTo && displayTo.len)
 		display_alt_appearance(key, displayTo)
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index e5875ce708b..7866bd59128 100644
--- a/code/game/area/Space Station 13 areas.dm	
+++ b/code/game/area/Space Station 13 areas.dm	
@@ -66,7 +66,7 @@ var/list/teleportlocs = list()
 		if(AR.no_teleportlocs) continue
 		if(teleportlocs.Find(AR.name)) continue
 		var/turf/picked = safepick(get_area_turfs(AR.type))
-		if (picked && (picked.z == ZLEVEL_STATION))
+		if(picked && (picked.z == ZLEVEL_STATION))
 			teleportlocs += AR.name
 			teleportlocs[AR.name] = AR
 
diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm
index 84f2c8eb4ea..0bc7b5f001b 100644
--- a/code/game/area/ai_monitored.dm
+++ b/code/game/area/ai_monitored.dm
@@ -7,7 +7,7 @@
 	..()
 	// locate and store the motioncamera
 	spawn (20) // spawn on a delay to let turfs/objs load
-		for (var/obj/machinery/camera/M in src)
+		for(var/obj/machinery/camera/M in src)
 			if(M.isMotion())
 				motioncamera = M
 				M.area_motion = src
@@ -16,11 +16,11 @@
 
 /area/ai_monitored/Entered(atom/movable/O)
 	..()
-	if (ismob(O) && motioncamera)
+	if(ismob(O) && motioncamera)
 		motioncamera.newTarget(O)
 
 /area/ai_monitored/Exited(atom/movable/O)
-	if (ismob(O) && motioncamera)
+	if(ismob(O) && motioncamera)
 		motioncamera.lostTarget(O)
 
 
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index bce20cb8172..72305e67a6e 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -40,31 +40,31 @@
 
 /area/proc/get_cameras()
 	var/list/cameras = list()
-	for (var/obj/machinery/camera/C in src)
+	for(var/obj/machinery/camera/C in src)
 		cameras += C
 	return cameras
 
 
 /area/proc/atmosalert(danger_level, var/alarm_source)
-	if (danger_level == 0)
+	if(danger_level == 0)
 		atmosphere_alarm.clearAlarm(src, alarm_source)
 	else
 		atmosphere_alarm.triggerAlarm(src, alarm_source, severity = danger_level)
 
 	//Check all the alarms before lowering atmosalm. Raising is perfectly fine.
-	for (var/obj/machinery/alarm/AA in src)
-		if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.report_danger_level)
+	for(var/obj/machinery/alarm/AA in src)
+		if(!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.report_danger_level)
 			danger_level = max(danger_level, AA.danger_level)
 
 	if(danger_level != atmosalm)
-		if (danger_level < 1 && atmosalm >= 1)
+		if(danger_level < 1 && atmosalm >= 1)
 			//closing the doors on red and opening on green provides a bit of hysteresis that will hopefully prevent fire doors from opening and closing repeatedly due to noise
 			air_doors_open()
-		else if (danger_level >= 2 && atmosalm < 2)
+		else if(danger_level >= 2 && atmosalm < 2)
 			air_doors_close()
 
 		atmosalm = danger_level
-		for (var/obj/machinery/alarm/AA in src)
+		for(var/obj/machinery/alarm/AA in src)
 			AA.update_icon()
 
 		air_alarm_repository.update_cache(src)
@@ -103,7 +103,7 @@
 		air_doors_close()
 
 /area/proc/fire_reset()
-	if (fire)
+	if(fire)
 		fire = 0	//used for firedoor checks
 		updateicon()
 		mouse_opacity = 0
@@ -159,14 +159,14 @@
 	return
 
 /area/proc/partyalert()
-	if (!( party ))
+	if(!( party ))
 		party = 1
 		updateicon()
 		mouse_opacity = 0
 	return
 
 /area/proc/partyreset()
-	if (party)
+	if(party)
 		party = 0
 		mouse_opacity = 0
 		updateicon()
@@ -183,7 +183,7 @@
 	if(radalert) // always show the radiation alert, regardless of power
 		icon_state = "radiation"
 		blend_mode = BLEND_MULTIPLY
-	else if ((fire || eject || party) && (!requires_power||power_environ))//If it doesn't require power, can still activate this proc.
+	else if((fire || eject || party) && (!requires_power||power_environ))//If it doesn't require power, can still activate this proc.
 		if(fire && !radalert && !eject && !party)
 			icon_state = "red"
 			blend_mode = BLEND_MULTIPLY
@@ -237,7 +237,7 @@
 /area/proc/power_change()
 	for(var/obj/machinery/M in src)	// for each machine in the area
 		M.power_change()			// reverify power status (to update icons etc.)
-	if (fire || eject || party)
+	if(fire || eject || party)
 		updateicon()
 
 /area/proc/usage(var/chan)
@@ -323,7 +323,7 @@
 	if(L && L.client && !L.client.ambience_playing && (L.client.prefs.sound & SOUND_BUZZ))	//split off the white noise from the rest of the ambience because of annoyance complaints - Kluys
 		L.client.ambience_playing = 1
 		L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
-	else if (L && L.client && !(L.client.prefs.sound & SOUND_BUZZ)) L.client.ambience_playing = 0
+	else if(L && L.client && !(L.client.prefs.sound & SOUND_BUZZ)) L.client.ambience_playing = 0
 
 	if(prob(35) && !newarea.media_source && L && L.client && (L.client.prefs.sound & SOUND_AMBIENCE))
 		var/sound = pick(ambientsounds)
@@ -347,7 +347,7 @@
 		if(istype(M.shoes, /obj/item/clothing/shoes/magboots) && (M.shoes.flags & NOSLIP))
 			return
 
-	if (M.buckled) //Cam't fall down if you are buckled
+	if(M.buckled) //Cam't fall down if you are buckled
 		return
 
 	if(istype(get_turf(M), /turf/space)) // Can't fall onto nothing.
@@ -357,7 +357,7 @@
 		M.Stun(5)
 		M.Weaken(5)
 
-	else if (istype(M,/mob/living/carbon/human/))
+	else if(istype(M,/mob/living/carbon/human/))
 		M.Stun(2)
 		M.Weaken(2)
 
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 557de91356a..a4840393f54 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -96,7 +96,7 @@
 		return null
 
 /atom/proc/check_eye(user as mob)
-	if (istype(user, /mob/living/silicon/ai)) // WHYYYY
+	if(istype(user, /mob/living/silicon/ai)) // WHYYYY
 		return 1
 	return
 
@@ -225,7 +225,7 @@
 	return
 
 /atom/proc/hitby(atom/movable/AM as mob|obj)
-	if (density)
+	if(density)
 		AM.throwing = 0
 	return
 
@@ -275,14 +275,14 @@
 		add_fibers(M)
 
 		//He has no prints!
-		if (FINGERPRINTS in M.mutations)
+		if(FINGERPRINTS in M.mutations)
 			if(fingerprintslast != M.key)
 				fingerprintshidden += "(Has no fingerprints) Real name: [M.real_name], Key: [M.key]"
 				fingerprintslast = M.key
 			return 0		//Now, lets get to the dirty work.
 		//First, make sure their DNA makes sense.
 		var/mob/living/carbon/human/H = M
-		if (!istype(H.dna, /datum/dna) || !H.dna.uni_identity || (length(H.dna.uni_identity) != 32))
+		if(!istype(H.dna, /datum/dna) || !H.dna.uni_identity || (length(H.dna.uni_identity) != 32))
 			if(!istype(H.dna, /datum/dna))
 				H.dna = new /datum/dna(null)
 				H.dna.real_name = H.real_name
@@ -352,9 +352,6 @@
 //returns 1 if made bloody, returns 0 otherwise
 /atom/proc/add_blood(mob/living/carbon/human/M as mob)
 
-	if(flags & NOBLOODY)
-		return 0
-
 	if(!blood_DNA || !istype(blood_DNA, /list))	//if our list of DNA doesn't exist yet (or isn't a list) initialise it.
 		blood_DNA = list()
 
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index b169deeee10..dcfd5a6f847 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -30,8 +30,8 @@
 	for(var/atom/movable/AM in contents)
 		qdel(AM)
 	loc = null
-	if (pulledby)
-		if (pulledby.pulling == src)
+	if(pulledby)
+		if(pulledby.pulling == src)
 			pulledby.pulling = null
 		pulledby = null
 	return ..()
@@ -49,30 +49,30 @@
 	var/atom/oldloc = loc
 
 	if(loc != newloc)
-		if (!(direct & (direct - 1))) //Cardinal move
+		if(!(direct & (direct - 1))) //Cardinal move
 			. = ..()
 		else //Diagonal move, split it into cardinal moves
-			if (direct & 1)
-				if (direct & 4)
-					if (step(src, NORTH))
+			if(direct & 1)
+				if(direct & 4)
+					if(step(src, NORTH))
 						. = step(src, EAST)
-					else if (step(src, EAST))
+					else if(step(src, EAST))
 						. = step(src, NORTH)
-				else if (direct & 8)
-					if (step(src, NORTH))
+				else if(direct & 8)
+					if(step(src, NORTH))
 						. = step(src, WEST)
-					else if (step(src, WEST))
+					else if(step(src, WEST))
 						. = step(src, NORTH)
-			else if (direct & 2)
-				if (direct & 4)
-					if (step(src, SOUTH))
+			else if(direct & 2)
+				if(direct & 4)
+					if(step(src, SOUTH))
 						. = step(src, EAST)
-					else if (step(src, EAST))
+					else if(step(src, EAST))
 						. = step(src, SOUTH)
-				else if (direct & 8)
-					if (step(src, SOUTH))
+				else if(direct & 8)
+					if(step(src, SOUTH))
 						. = step(src, WEST)
-					else if (step(src, WEST))
+					else if(step(src, WEST))
 						. = step(src, SOUTH)
 
 
@@ -102,7 +102,7 @@
 	if(src.throwing)
 		src.throw_impact(A)
 
-	if (A && sendBump)
+	if(A && sendBump)
 		A.last_bumped = world.time
 		A.Bumped(src)
 	else
@@ -215,13 +215,13 @@
 	var/dist_y = abs(target.y - src.y)
 
 	var/dx
-	if (target.x > src.x)
+	if(target.x > src.x)
 		dx = EAST
 	else
 		dx = WEST
 
 	var/dy
-	if (target.y > src.y)
+	if(target.y > src.y)
 		dy = NORTH
 	else
 		dy = SOUTH
@@ -305,13 +305,13 @@
 	return
 
 /atom/movable/overlay/attackby(a, b, c)
-	if (src.master)
+	if(src.master)
 		return src.master.attackby(a, b, c)
 	return
 
 
 /atom/movable/overlay/attack_hand(a, b, c)
-	if (src.master)
+	if(src.master)
 		return src.master.attack_hand(a, b, c)
 	return
 
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 936e5ac0001..529b07ffdbb 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -247,7 +247,7 @@
 //Borgie battery tracking!
 /mob/living/silicon/robot/proc/diag_hud_set_borgcell()
 	var/image/holder = hud_list[DIAG_BATT_HUD]
-	if (cell)
+	if(cell)
 		var/chargelvl = (cell.charge/cell.maxcharge)
 		holder.icon_state = "hudbatt[RoundDiagBar(chargelvl)]"
 	else
@@ -263,7 +263,7 @@
 
 /obj/mecha/proc/diag_hud_set_mechcell()
 	var/image/holder = hud_list[DIAG_BATT_HUD]
-	if (cell)
+	if(cell)
 		var/chargelvl = cell.charge/cell.maxcharge
 		holder.icon_state = "hudbatt[RoundDiagBar(chargelvl)]"
 	else
diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm
index 93d7cc473dc..76254b13c44 100644
--- a/code/game/dna/dna2.dm
+++ b/code/game/dna/dna2.dm
@@ -197,7 +197,7 @@ var/global/list/bad_blocks[0]
 
 // Set a DNA UI block's raw value.
 /datum/dna/proc/SetUIValue(var/block,var/value,var/defer=0)
-	if (block<=0) return
+	if(block<=0) return
 	ASSERT(value>0)
 	ASSERT(value<=4095)
 	UI[block]=value
@@ -207,13 +207,13 @@ var/global/list/bad_blocks[0]
 
 // Get a DNA UI block's raw value.
 /datum/dna/proc/GetUIValue(var/block)
-	if (block<=0) return 0
+	if(block<=0) return 0
 	return UI[block]
 
 // Set a DNA UI block's value, given a value and a max possible value.
 // Used in hair and facial styles (value being the index and maxvalue being the len of the hairstyle list)
 /datum/dna/proc/SetUIValueRange(var/block,var/value,var/maxvalue,var/defer=0)
-	if (block<=0)
+	if(block<=0)
 		return
 	if(value == 0)
 		value = 1
@@ -224,20 +224,20 @@ var/global/list/bad_blocks[0]
 
 // Getter version of above.
 /datum/dna/proc/GetUIValueRange(var/block,var/maxvalue)
-	if (block<=0) return 0
+	if(block<=0) return 0
 	var/value = GetUIValue(block)
 	return round(1 +(value / 4096)*maxvalue)
 
 // Is the UI gene "on" or "off"?
 // For UI, this is simply a check of if the value is > 2050.
 /datum/dna/proc/GetUIState(var/block)
-	if (block<=0) return
+	if(block<=0) return
 	return UI[block] > 2050
 
 
 // Set UI gene "on" (1) or "off" (0)
 /datum/dna/proc/SetUIState(var/block,var/on,var/defer=0)
-	if (block<=0) return
+	if(block<=0) return
 	var/val
 	if(on)
 		val=rand(2050,4095)
@@ -253,7 +253,7 @@ var/global/list/bad_blocks[0]
 // Set a block from a hex string.  This is inefficient.  If you can, use SetUIValue().
 // Used in DNA modifiers.
 /datum/dna/proc/SetUIBlock(var/block,var/value,var/defer=0)
-	if (block<=0) return
+	if(block<=0) return
 	return SetUIValue(block,hex2num(value),defer)
 
 // Get a sub-block from a block.
@@ -264,7 +264,7 @@ var/global/list/bad_blocks[0]
 // Set a block from a hex string.  This is inefficient.  If you can, use SetUIValue().
 // Used in DNA modifiers.
 /datum/dna/proc/SetUISubBlock(var/block,var/subBlock, var/newSubBlock, var/defer=0)
-	if (block<=0) return
+	if(block<=0) return
 	var/oldBlock=GetUIBlock(block)
 	var/newBlock=""
 	for(var/i=1, i<=length(oldBlock), i++)
@@ -287,7 +287,7 @@ var/global/list/bad_blocks[0]
 // Set a DNA SE block's raw value.
 /datum/dna/proc/SetSEValue(var/block,var/value,var/defer=0)
 
-	if (block<=0) return
+	if(block<=0) return
 	ASSERT(value>=0)
 	ASSERT(value<=4095)
 	SE[block]=value
@@ -298,13 +298,13 @@ var/global/list/bad_blocks[0]
 
 // Get a DNA SE block's raw value.
 /datum/dna/proc/GetSEValue(var/block)
-	if (block<=0) return 0
+	if(block<=0) return 0
 	return SE[block]
 
 // Set a DNA SE block's value, given a value and a max possible value.
 // Might be used for species?
 /datum/dna/proc/SetSEValueRange(var/block,var/value,var/maxvalue)
-	if (block<=0) return
+	if(block<=0) return
 	ASSERT(maxvalue<=4095)
 	var/range = round(4095 / maxvalue)
 	if(value)
@@ -312,20 +312,20 @@ var/global/list/bad_blocks[0]
 
 // Getter version of above.
 /datum/dna/proc/GetSEValueRange(var/block,var/maxvalue)
-	if (block<=0) return 0
+	if(block<=0) return 0
 	var/value = GetSEValue(block)
 	return round(1 +(value / 4096)*maxvalue)
 
 // Is the block "on" (1) or "off" (0)? (Un-assigned genes are always off.)
 /datum/dna/proc/GetSEState(var/block)
-	if (block<=0) return 0
+	if(block<=0) return 0
 	var/list/BOUNDS=GetDNABounds(block)
 	var/value=GetSEValue(block)
 	return (value >= BOUNDS[DNA_ON_LOWERBOUND])
 
 // Set a block "on" or "off".
 /datum/dna/proc/SetSEState(var/block,var/on,var/defer=0)
-	if (block<=0) return
+	if(block<=0) return
 	var/list/BOUNDS=GetDNABounds(block)
 	var/val
 	if(on)
@@ -342,7 +342,7 @@ var/global/list/bad_blocks[0]
 // Set a block from a hex string.  This is inefficient.  If you can, use SetUIValue().
 // Used in DNA modifiers.
 /datum/dna/proc/SetSEBlock(var/block,var/value,var/defer=0)
-	if (block<=0) return
+	if(block<=0) return
 	var/nval=hex2num(value)
 	//testing("SetSEBlock([block],[value],[defer]): [value] -> [nval]")
 	return SetSEValue(block,nval,defer)
@@ -354,7 +354,7 @@ var/global/list/bad_blocks[0]
 // Set a sub-block from a hex character.  This is inefficient.  If you can, use SetUIValue().
 // Used in DNA modifiers.
 /datum/dna/proc/SetSESubBlock(var/block,var/subBlock, var/newSubBlock, var/defer=0)
-	if (block<=0) return
+	if(block<=0) return
 	var/oldBlock=GetSEBlock(block)
 	var/newBlock=""
 	for(var/i=1, i<=length(oldBlock), i++)
diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm
index 53f248d1e91..5bc984b11ac 100644
--- a/code/game/dna/dna2_helpers.dm
+++ b/code/game/dna/dna2_helpers.dm
@@ -5,10 +5,10 @@
 // Pads 0s to t until length == u
 /proc/add_zero2(t, u)
 	var/temp1
-	while (length(t) < u)
+	while(length(t) < u)
 		t = "0[t]"
 	temp1 = t
-	if (length(t) > u)
+	if(length(t) > u)
 		temp1 = copytext(t,2,u+1)
 	return temp1
 
@@ -63,15 +63,15 @@
 /proc/miniscramble(input,rs,rd)
 	var/output
 	output = null
-	if (input == "C" || input == "D" || input == "E" || input == "F")
+	if(input == "C" || input == "D" || input == "E" || input == "F")
 		output = pick(prob((rs*10));"4",prob((rs*10));"5",prob((rs*10));"6",prob((rs*10));"7",prob((rs*5)+(rd));"0",prob((rs*5)+(rd));"1",prob((rs*10)-(rd));"2",prob((rs*10)-(rd));"3")
-	if (input == "8" || input == "9" || input == "A" || input == "B")
+	if(input == "8" || input == "9" || input == "A" || input == "B")
 		output = pick(prob((rs*10));"4",prob((rs*10));"5",prob((rs*10));"A",prob((rs*10));"B",prob((rs*5)+(rd));"C",prob((rs*5)+(rd));"D",prob((rs*5)+(rd));"2",prob((rs*5)+(rd));"3")
-	if (input == "4" || input == "5" || input == "6" || input == "7")
+	if(input == "4" || input == "5" || input == "6" || input == "7")
 		output = pick(prob((rs*10));"4",prob((rs*10));"5",prob((rs*10));"A",prob((rs*10));"B",prob((rs*5)+(rd));"C",prob((rs*5)+(rd));"D",prob((rs*5)+(rd));"2",prob((rs*5)+(rd));"3")
-	if (input == "0" || input == "1" || input == "2" || input == "3")
+	if(input == "0" || input == "1" || input == "2" || input == "3")
 		output = pick(prob((rs*10));"8",prob((rs*10));"9",prob((rs*10));"A",prob((rs*10));"B",prob((rs*10)-(rd));"C",prob((rs*10)-(rd));"D",prob((rs*5)+(rd));"E",prob((rs*5)+(rd));"F")
-	if (!output) output = "5"
+	if(!output) output = "5"
 	return output
 
 // HELLO I MAKE BELL CURVES AROUND YOUR DESIRED TARGET
@@ -161,7 +161,7 @@
 
 		H.s_tone   = 35 - dna.GetUIValueRange(DNA_UI_SKIN_TONE, 220) // Value can be negative.
 
-		if (dna.GetUIState(DNA_UI_GENDER))
+		if(dna.GetUIState(DNA_UI_GENDER))
 			H.change_gender(FEMALE, 0)
 		else
 			H.change_gender(MALE, 0)
@@ -196,7 +196,3 @@
 		return 1
 	else
 		return 0
-
-// Used below, simple injection modifier.
-/proc/probinj(var/pr, var/inj)
-	return prob(pr+inj*pr)
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 1751df19442..40814a72c78 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -107,7 +107,7 @@
 	return 0
 
 /obj/machinery/dna_scannernew/relaymove(mob/user as mob)
-	if (user.stat)
+	if(user.stat)
 		return
 	src.go_out()
 	return
@@ -117,7 +117,7 @@
 	set category = null
 	set name = "Eject DNA Scanner"
 
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
 
 	eject_occupant()
@@ -142,17 +142,17 @@
 	set category = null
 	set name = "Enter DNA Scanner"
 
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
 	if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other
 		return
-	if (!ishuman(usr)) //Make sure they're a mob that has dna
+	if(!ishuman(usr)) //Make sure they're a mob that has dna
 		to_chat(usr, "<span class='notice'>Try as you might, you can not climb up into the [src].</span>")
 		return
-	if (src.occupant)
+	if(src.occupant)
 		to_chat(usr, "<span class='boldnotice'>The [src] is already occupied!</span>")
 		return
-	if (usr.abiotic())
+	if(usr.abiotic())
 		to_chat(usr, "<span class='boldnotice'>Subject cannot have abiotic items on.</span>")
 		return
 	usr.stop_pulling()
@@ -196,7 +196,7 @@
 		if(M.Victim == L)
 			to_chat(usr, "[L.name] will not fit into the [src] because they have a slime latched onto their head.")
 			return
-	if (L == user)
+	if(L == user)
 		visible_message("[user] climbs into the [src].")
 	else
 		visible_message("[user] puts [L.name] into the [src].")
@@ -233,15 +233,15 @@
 		item.forceMove(src)
 		user.visible_message("[user] adds \a [item] to \the [src]!", "You add \a [item] to \the [src]!")
 		return
-	else if (!istype(item, /obj/item/weapon/grab))
+	else if(!istype(item, /obj/item/weapon/grab))
 		return
 	var/obj/item/weapon/grab/G = item
-	if (!ismob(G.affecting))
+	if(!ismob(G.affecting))
 		return
-	if (src.occupant)
+	if(src.occupant)
 		to_chat(user, "<span class='boldnotice'>The scanner is already occupied!</span>")
 		return
-	if (G.affecting.abiotic())
+	if(G.affecting.abiotic())
 		to_chat(user, "<span class='boldnotice'>Subject cannot have abiotic items on.</span>")
 		return
 	if(panel_open)
@@ -275,15 +275,15 @@
 	return
 
 /obj/machinery/dna_scannernew/proc/go_out()
-	if (!src.occupant)
+	if(!src.occupant)
 		to_chat(usr, "<span class='warning'>The scanner is empty!</span>")
 		return
 
-	if (src.locked)
+	if(src.locked)
 		to_chat(usr, "<span class='warning'>The scanner is locked!</span>")
 		return
 
-	if (src.occupant.client)
+	if(src.occupant.client)
 		src.occupant.client.eye = src.occupant.client.mob
 		src.occupant.client.perspective = MOB_PERSPECTIVE
 	src.occupant.forceMove(src.loc)
@@ -302,7 +302,7 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(src.loc)
 					ex_act(severity)
@@ -311,7 +311,7 @@
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(src.loc)
 					ex_act(severity)
@@ -339,7 +339,7 @@
 			return 1
 
 	var/radiation_protection = occupant.run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm.")
-	if (radiation_protection > NEGATE_MUTATION_THRESHOLD)
+	if(radiation_protection > NEGATE_MUTATION_THRESHOLD)
 		return 1
 
 	return 0
@@ -373,8 +373,8 @@
 	var/waiting_for_user_input=0 // Fix for #274 (Mash create block injector without answering dialog to make unlimited injectors) - N3X
 
 /obj/machinery/computer/scan_consolenew/attackby(obj/item/I as obj, mob/user as mob, params)
-	if (istype(I, /obj/item/weapon/disk/data)) //INSERT SOME diskS
-		if (!src.disk)
+	if(istype(I, /obj/item/weapon/disk/data)) //INSERT SOME diskS
+		if(!src.disk)
 			user.drop_item()
 			I.forceMove(src)
 			src.disk = I
@@ -392,7 +392,7 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				//SN src = null
 				qdel(src)
 				return
@@ -436,7 +436,7 @@
 /obj/machinery/computer/scan_consolenew/process() //not really used right now
 	if(stat & (NOPOWER|BROKEN))
 		return
-	if (!( src.status )) //remove this
+	if(!( src.status )) //remove this
 		return
 	return
 */
@@ -487,7 +487,7 @@
 	data["hasDisk"] = disk ? 1 : 0
 
 	var/diskData[0]
-	if (!disk || !disk.buf)
+	if(!disk || !disk.buf)
 		diskData["data"] = null
 		diskData["owner"] = null
 		diskData["label"] = null
@@ -515,7 +515,7 @@
 	data["selectedUITargetHex"] = selected_ui_target_hex
 
 	var/occupantData[0]
-	if (!src.connected.occupant || !src.connected.occupant.dna)
+	if(!src.connected.occupant || !src.connected.occupant.dna)
 		occupantData["name"] = null
 		occupantData["stat"] = null
 		occupantData["isViableSubject"] = null
@@ -530,7 +530,7 @@
 		occupantData["name"] = connected.occupant.dna.real_name
 		occupantData["stat"] = connected.occupant.stat
 		occupantData["isViableSubject"] = 1
-		if ((NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna)
+		if((NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna)
 			occupantData["isViableSubject"] = 0
 		occupantData["health"] = connected.occupant.health
 		occupantData["maxHealth"] = connected.occupant.maxHealth
@@ -546,13 +546,13 @@
 	data["beakerVolume"] = 0
 	if(connected.beaker)
 		data["beakerLabel"] = connected.beaker.label_text ? connected.beaker.label_text : null
-		if (connected.beaker.reagents && connected.beaker.reagents.reagent_list.len)
+		if(connected.beaker.reagents && connected.beaker.reagents.reagent_list.len)
 			for(var/datum/reagent/R in connected.beaker.reagents.reagent_list)
 				data["beakerVolume"] += R.volume
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "dna_modifier.tmpl", "DNA Modifier Console", 660, 700)
@@ -575,16 +575,16 @@
 
 	add_fingerprint(usr)
 
-	if (href_list["selectMenuKey"])
+	if(href_list["selectMenuKey"])
 		selected_menu_key = href_list["selectMenuKey"]
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
-	if (href_list["toggleLock"])
-		if ((src.connected && src.connected.occupant))
+	if(href_list["toggleLock"])
+		if((src.connected && src.connected.occupant))
 			src.connected.locked = !( src.connected.locked )
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
-	if (href_list["pulseRadiation"])
+	if(href_list["pulseRadiation"])
 		irradiating = src.radiation_duration
 		var/lock_state = src.connected.locked
 		src.connected.locked = 1//lock it
@@ -595,7 +595,7 @@
 		irradiating = 0
 		src.connected.locked = lock_state
 
-		if (!src.connected.occupant)
+		if(!src.connected.occupant)
 			return 1 // return 1 forces an update to all Nano uis attached to src
 
 		var/radiation = (((src.radiation_intensity*3)+src.radiation_duration*3) / connected.damage_coeff)
@@ -603,7 +603,7 @@
 		if(src.connected.radiation_check())
 			return 1
 
-		if (prob(95))
+		if(prob(95))
 			if(prob(75))
 				randmutb(src.connected.occupant)
 			else
@@ -616,28 +616,28 @@
 
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
-	if (href_list["radiationDuration"])
-		if (text2num(href_list["radiationDuration"]) > 0)
-			if (src.radiation_duration < 20)
+	if(href_list["radiationDuration"])
+		if(text2num(href_list["radiationDuration"]) > 0)
+			if(src.radiation_duration < 20)
 				src.radiation_duration += 2
 		else
-			if (src.radiation_duration > 2)
+			if(src.radiation_duration > 2)
 				src.radiation_duration -= 2
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
-	if (href_list["radiationIntensity"])
-		if (text2num(href_list["radiationIntensity"]) > 0)
-			if (src.radiation_intensity < 10)
+	if(href_list["radiationIntensity"])
+		if(text2num(href_list["radiationIntensity"]) > 0)
+			if(src.radiation_intensity < 10)
 				src.radiation_intensity++
 		else
-			if (src.radiation_intensity > 1)
+			if(src.radiation_intensity > 1)
 				src.radiation_intensity--
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
 	////////////////////////////////////////////////////////
 
-	if (href_list["changeUITarget"] && text2num(href_list["changeUITarget"]) > 0)
-		if (src.selected_ui_target < 15)
+	if(href_list["changeUITarget"] && text2num(href_list["changeUITarget"]) > 0)
+		if(src.selected_ui_target < 15)
 			src.selected_ui_target++
 			src.selected_ui_target_hex = src.selected_ui_target
 			switch(selected_ui_target)
@@ -658,8 +658,8 @@
 			src.selected_ui_target_hex = 0
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
-	if (href_list["changeUITarget"] && text2num(href_list["changeUITarget"]) < 1)
-		if (src.selected_ui_target > 0)
+	if(href_list["changeUITarget"] && text2num(href_list["changeUITarget"]) < 1)
+		if(src.selected_ui_target > 0)
 			src.selected_ui_target--
 			src.selected_ui_target_hex = src.selected_ui_target
 			switch(selected_ui_target)
@@ -678,16 +678,16 @@
 			src.selected_ui_target_hex = "F"
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
-	if (href_list["selectUIBlock"] && href_list["selectUISubblock"]) // This chunk of code updates selected block / sub-block based on click
+	if(href_list["selectUIBlock"] && href_list["selectUISubblock"]) // This chunk of code updates selected block / sub-block based on click
 		var/select_block = text2num(href_list["selectUIBlock"])
 		var/select_subblock = text2num(href_list["selectUISubblock"])
-		if ((select_block <= DNA_UI_LENGTH) && (select_block >= 1))
+		if((select_block <= DNA_UI_LENGTH) && (select_block >= 1))
 			src.selected_ui_block = select_block
-		if ((select_subblock <= DNA_BLOCK_SIZE) && (select_subblock >= 1))
+		if((select_subblock <= DNA_BLOCK_SIZE) && (select_subblock >= 1))
 			src.selected_ui_subblock = select_subblock
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
-	if (href_list["pulseUIRadiation"])
+	if(href_list["pulseUIRadiation"])
 		var/block = src.connected.occupant.dna.GetUISubBlock(src.selected_ui_block,src.selected_ui_subblock)
 
 		irradiating = src.radiation_duration
@@ -700,10 +700,10 @@
 		irradiating = 0
 		src.connected.locked = lock_state
 
-		if (!src.connected.occupant)
+		if(!src.connected.occupant)
 			return 1
 
-		if (prob((80 + (src.radiation_duration / 2))))
+		if(prob((80 + (src.radiation_duration / 2))))
 			var/radiation = (src.radiation_intensity+src.radiation_duration)
 			src.connected.occupant.apply_effect(radiation,IRRADIATE,0)
 
@@ -719,7 +719,7 @@
 			if(src.connected.radiation_check())
 				return 1
 
-			if (prob(20+src.radiation_intensity))
+			if(prob(20+src.radiation_intensity))
 				randmutb(src.connected.occupant)
 				domutcheck(src.connected.occupant,src.connected)
 			else
@@ -729,13 +729,13 @@
 
 	////////////////////////////////////////////////////////
 
-	if (href_list["injectRejuvenators"])
-		if (!connected.occupant)
+	if(href_list["injectRejuvenators"])
+		if(!connected.occupant)
 			return 0
 		var/inject_amount = round(text2num(href_list["injectRejuvenators"]), 5) // round to nearest 5
-		if (inject_amount < 0) // Since the user can actually type the commands himself, some sanity checking
+		if(inject_amount < 0) // Since the user can actually type the commands himself, some sanity checking
 			inject_amount = 0
-		if (inject_amount > 50)
+		if(inject_amount > 50)
 			inject_amount = 50
 		connected.beaker.reagents.trans_to(connected.occupant, inject_amount)
 		connected.beaker.reagents.reaction(connected.occupant)
@@ -743,17 +743,17 @@
 
 	////////////////////////////////////////////////////////
 
-	if (href_list["selectSEBlock"] && href_list["selectSESubblock"]) // This chunk of code updates selected block / sub-block based on click (se stands for strutural enzymes)
+	if(href_list["selectSEBlock"] && href_list["selectSESubblock"]) // This chunk of code updates selected block / sub-block based on click (se stands for strutural enzymes)
 		var/select_block = text2num(href_list["selectSEBlock"])
 		var/select_subblock = text2num(href_list["selectSESubblock"])
-		if ((select_block <= DNA_SE_LENGTH) && (select_block >= 1))
+		if((select_block <= DNA_SE_LENGTH) && (select_block >= 1))
 			src.selected_se_block = select_block
-		if ((select_subblock <= DNA_BLOCK_SIZE) && (select_subblock >= 1))
+		if((select_subblock <= DNA_BLOCK_SIZE) && (select_subblock >= 1))
 			src.selected_se_subblock = select_subblock
 		//testing("User selected block [selected_se_block] (sent [select_block]), subblock [selected_se_subblock] (sent [select_block]).")
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
-	if (href_list["pulseSERadiation"])
+	if(href_list["pulseSERadiation"])
 		var/block = src.connected.occupant.dna.GetSESubBlock(src.selected_se_block,src.selected_se_subblock)
 		//var/original_block=block
 		//testing("Irradiating SE block [src.selected_se_block]:[src.selected_se_subblock] ([block])...")
@@ -769,7 +769,7 @@
 		src.connected.locked = lock_state
 
 		if(src.connected.occupant)
-			if (prob((80 + ((src.radiation_duration / 2) + (connected.precision_coeff ** 3)))))
+			if(prob((80 + ((src.radiation_duration / 2) + (connected.precision_coeff ** 3)))))
 				var/radiation = ((src.radiation_intensity+src.radiation_duration) / connected.damage_coeff)
 				src.connected.occupant.apply_effect(radiation,IRRADIATE,0)
 
@@ -779,9 +779,9 @@
 				var/real_SE_block=selected_se_block
 				block = miniscramble(block, src.radiation_intensity, src.radiation_duration)
 				if(prob(20))
-					if (src.selected_se_block > 1 && src.selected_se_block < DNA_SE_LENGTH/2)
+					if(src.selected_se_block > 1 && src.selected_se_block < DNA_SE_LENGTH/2)
 						real_SE_block++
-					else if (src.selected_se_block > DNA_SE_LENGTH/2 && src.selected_se_block < DNA_SE_LENGTH)
+					else if(src.selected_se_block > DNA_SE_LENGTH/2 && src.selected_se_block < DNA_SE_LENGTH)
 						real_SE_block--
 
 				//testing("Irradiated SE block [real_SE_block]:[src.selected_se_subblock] ([original_block] now [block]) [(real_SE_block!=selected_se_block) ? "(SHIFTED)":""]!")
@@ -794,7 +794,7 @@
 				if(src.connected.radiation_check())
 					return 1
 
-				if (prob(80-src.radiation_duration))
+				if(prob(80-src.radiation_duration))
 					//testing("Random bad mut!")
 					randmutb(src.connected.occupant)
 					domutcheck(src.connected.occupant,src.connected)
@@ -820,8 +820,8 @@
 		var/bufferOption = href_list["bufferOption"]
 
 		// These bufferOptions do not require a bufferId
-		if (bufferOption == "wipeDisk")
-			if ((isnull(src.disk)) || (src.disk.read_only))
+		if(bufferOption == "wipeDisk")
+			if((isnull(src.disk)) || (src.disk.read_only))
 				//src.temphtml = "Invalid disk. Please try again."
 				return 0
 
@@ -829,23 +829,23 @@
 			//src.temphtml = "Data saved."
 			return 1
 
-		if (bufferOption == "ejectDisk")
-			if (!src.disk)
+		if(bufferOption == "ejectDisk")
+			if(!src.disk)
 				return
 			src.disk.forceMove(get_turf(src))
 			src.disk = null
 			return 1
 
 		// All bufferOptions from here on require a bufferId
-		if (!href_list["bufferId"])
+		if(!href_list["bufferId"])
 			return 0
 
 		var/bufferId = text2num(href_list["bufferId"])
 
-		if (bufferId < 1 || bufferId > 3)
+		if(bufferId < 1 || bufferId > 3)
 			return 0 // Not a valid buffer id
 
-		if (bufferOption == "saveUI")
+		if(bufferOption == "saveUI")
 			if(src.connected.occupant && src.connected.occupant.dna)
 				var/datum/dna2/record/databuf=new
 				databuf.types = DNA2_BUF_UI // DNA2_BUF_UE
@@ -856,7 +856,7 @@
 				src.buffers[bufferId] = databuf
 			return 1
 
-		if (bufferOption == "saveUIAndUE")
+		if(bufferOption == "saveUIAndUE")
 			if(src.connected.occupant && src.connected.occupant.dna)
 				var/datum/dna2/record/databuf=new
 				databuf.types = DNA2_BUF_UI|DNA2_BUF_UE
@@ -867,7 +867,7 @@
 				src.buffers[bufferId] = databuf
 			return 1
 
-		if (bufferOption == "saveSE")
+		if(bufferOption == "saveSE")
 			if(src.connected.occupant && src.connected.occupant.dna)
 				var/datum/dna2/record/databuf=new
 				databuf.types = DNA2_BUF_SE
@@ -878,19 +878,19 @@
 				src.buffers[bufferId] = databuf
 			return 1
 
-		if (bufferOption == "clear")
+		if(bufferOption == "clear")
 			src.buffers[bufferId]=new /datum/dna2/record()
 			return 1
 
-		if (bufferOption == "changeLabel")
+		if(bufferOption == "changeLabel")
 			var/datum/dna2/record/buf = src.buffers[bufferId]
 			var/text = sanitize(input(usr, "New Label:", "Edit Label", buf.name) as text|null)
 			buf.name = text
 			src.buffers[bufferId] = buf
 			return 1
 
-		if (bufferOption == "transfer")
-			if (!src.connected.occupant || (NOCLONE in src.connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna)
+		if(bufferOption == "transfer")
+			if(!src.connected.occupant || (NOCLONE in src.connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna)
 				return 1
 
 			irradiating = 2
@@ -911,18 +911,18 @@
 
 			var/datum/dna2/record/buf = src.buffers[bufferId]
 
-			if ((buf.types & DNA2_BUF_UI))
-				if ((buf.types & DNA2_BUF_UE))
+			if((buf.types & DNA2_BUF_UI))
+				if((buf.types & DNA2_BUF_UE))
 					src.connected.occupant.real_name = buf.dna.real_name
 					src.connected.occupant.name = buf.dna.real_name
 				src.connected.occupant.UpdateAppearance(buf.dna.UI.Copy())
-			else if (buf.types & DNA2_BUF_SE)
+			else if(buf.types & DNA2_BUF_SE)
 				src.connected.occupant.dna.SE = buf.dna.SE.Copy()
 				src.connected.occupant.dna.UpdateSE()
 				domutcheck(src.connected.occupant,src.connected)
 			return 1
 
-		if (bufferOption == "createInjector")
+		if(bufferOption == "createInjector")
 			if(injector_ready && !waiting_for_user_input)
 
 				var/success = 1
@@ -951,8 +951,8 @@
 						src.injector_ready = 1
 			return 1
 
-		if (bufferOption == "loadDisk")
-			if ((isnull(src.disk)) || (!src.disk.buf))
+		if(bufferOption == "loadDisk")
+			if((isnull(src.disk)) || (!src.disk.buf))
 				//src.temphtml = "Invalid disk. Please try again."
 				return 0
 
@@ -960,8 +960,8 @@
 			//src.temphtml = "Data loaded."
 			return 1
 
-		if (bufferOption == "saveDisk")
-			if ((isnull(src.disk)) || (src.disk.read_only))
+		if(bufferOption == "saveDisk")
+			if((isnull(src.disk)) || (src.disk.read_only))
 				//src.temphtml = "Invalid disk. Please try again."
 				return 0
 
diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm
index f62268b621a..bbad4a7912f 100644
--- a/code/game/dna/genes/disabilities.dm
+++ b/code/game/dna/genes/disabilities.dm
@@ -28,6 +28,7 @@
 	return 1 // Always set!
 
 /datum/dna/gene/disability/activate(var/mob/M, var/connected, var/flags)
+	..()
 	if(mutation && !(mutation in M.mutations))
 		M.mutations.Add(mutation)
 	if(disability)
@@ -35,11 +36,12 @@
 	if(sdisability)
 		M.sdisabilities|=sdisability
 	if(activation_message)
-		to_chat(M, "\red [activation_message]")
+		to_chat(M, "<span class='warning'>[activation_message]</span>")
 	else
 		testing("[name] has no activation message.")
 
 /datum/dna/gene/disability/deactivate(var/mob/M, var/connected, var/flags)
+	..()
 	if(mutation && (mutation in M.mutations))
 		M.mutations.Remove(mutation)
 	if(disability)
@@ -47,7 +49,7 @@
 	if(sdisability)
 		M.sdisabilities &= ~sdisability
 	if(deactivation_message)
-		to_chat(M, "\red [deactivation_message]")
+		to_chat(M, "<span class='warning'>[deactivation_message]</span>")
 	else
 		testing("[name] has no deactivation message.")
 
@@ -55,46 +57,51 @@
 	name="Hallucinate"
 	activation_message="Your mind says 'Hello'."
 	deactivation_message ="Sanity returns. Or does it?"
+	instability = -GENE_INSTABILITY_MODERATE
 	mutation=HALLUCINATE
 
-	New()
-		block=HALLUCINATIONBLOCK
+/datum/dna/gene/disability/hallucinate/New()
+	block=HALLUCINATIONBLOCK
 
 /datum/dna/gene/disability/epilepsy
 	name="Epilepsy"
 	activation_message="You get a headache."
 	deactivation_message ="Your headache is gone, at last."
+	instability = -GENE_INSTABILITY_MODERATE
 	disability=EPILEPSY
 
-	New()
-		block=EPILEPSYBLOCK
+/datum/dna/gene/disability/epilepsy/New()
+	block=EPILEPSYBLOCK
 
 /datum/dna/gene/disability/cough
 	name="Coughing"
 	activation_message="You start coughing."
 	deactivation_message ="Your throat stops aching."
+	instability = -GENE_INSTABILITY_MINOR
 	disability=COUGHING
 
-	New()
-		block=COUGHBLOCK
+/datum/dna/gene/disability/cough/New()
+	block=COUGHBLOCK
 
 /datum/dna/gene/disability/clumsy
 	name="Clumsiness"
 	activation_message="You feel lightheaded."
 	deactivation_message ="You regain some control of your movements"
+	instability = -GENE_INSTABILITY_MINOR
 	mutation=CLUMSY
 
-	New()
-		block=CLUMSYBLOCK
+/datum/dna/gene/disability/clumsy/New()
+	block=CLUMSYBLOCK
 
 /datum/dna/gene/disability/tourettes
 	name="Tourettes"
 	activation_message="You twitch."
 	deactivation_message ="Your mouth tastes like soap."
+	instability = -GENE_INSTABILITY_MODERATE
 	disability=TOURETTES
 
-	New()
-		block=TWITCHBLOCK
+/datum/dna/gene/disability/tourettes/New()
+	block=TWITCHBLOCK
 
 /datum/dna/gene/disability/nervousness
 	name="Nervousness"
@@ -102,39 +109,42 @@
 	deactivation_message ="You feel much calmer."
 	disability=NERVOUS
 
-	New()
-		block=NERVOUSBLOCK
+/datum/dna/gene/disability/nervousness/New()
+	block=NERVOUSBLOCK
 
 /datum/dna/gene/disability/blindness
 	name="Blindness"
 	activation_message="You can't seem to see anything."
 	deactivation_message ="You can see now, in case you didn't notice..."
+	instability = -GENE_INSTABILITY_MAJOR
 	sdisability=BLIND
 
-	New()
-		block=BLINDBLOCK
+/datum/dna/gene/disability/blindness/New()
+	block=BLINDBLOCK
 
 /datum/dna/gene/disability/deaf
 	name="Deafness"
 	activation_message="It's kinda quiet."
 	deactivation_message ="You can hear again!"
+	instability = -GENE_INSTABILITY_MAJOR
 	sdisability=DEAF
 
-	New()
-		block=DEAFBLOCK
+/datum/dna/gene/disability/deaf/New()
+	block=DEAFBLOCK
 
-	activate(var/mob/M, var/connected, var/flags)
-		..(M,connected,flags)
-		M.ear_deaf = 1
+/datum/dna/gene/disability/deaf/activate(var/mob/M, var/connected, var/flags)
+	..(M,connected,flags)
+	M.ear_deaf = 1
 
 /datum/dna/gene/disability/nearsighted
 	name="Nearsightedness"
 	activation_message="Your eyes feel weird..."
 	deactivation_message ="You can see clearly now"
+	instability = -GENE_INSTABILITY_MODERATE
 	disability=NEARSIGHTED
 
-	New()
-		block=GLASSESBLOCK
+/datum/dna/gene/disability/nearsighted/New()
+	block=GLASSESBLOCK
 
 
 /datum/dna/gene/disability/lisp
@@ -144,12 +154,12 @@
 	deactivation_message = "You now feel able to pronounce consonants."
 	mutation = LISP
 
-	New()
-		..()
-		block=LISPBLOCK
+/datum/dna/gene/disability/lisp/New()
+	..()
+	block=LISPBLOCK
 
-	OnSay(var/mob/M, var/message)
-		return replacetext(message,"s","th")
+/datum/dna/gene/disability/lisp/OnSay(var/mob/M, var/message)
+	return replacetext(message,"s","th")
 
 /datum/dna/gene/disability/comic
 	name = "Comic"
@@ -158,5 +168,5 @@
 	deactivation_message = "Well thank god that's over with."
 	mutation=COMIC
 
-	New()
-		block = COMICBLOCK
+/datum/dna/gene/disability/comic/New()
+	block = COMICBLOCK
diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm
index a56be88082e..a3781f9985d 100644
--- a/code/game/dna/genes/gene.dm
+++ b/code/game/dna/genes/gene.dm
@@ -23,7 +23,10 @@
 	// Any of a number of GENE_ flags.
 	var/flags=0
 
-/**
+	// Chance of the gene to cause adverse effects when active
+	var/instability=0
+
+/*
 * Is the gene active in this mob's DNA?
 */
 /datum/dna/gene/proc/is_active(var/mob/M)
@@ -35,14 +38,16 @@
 	return 0
 
 // Called when the gene activates.  Do your magic here.
-/datum/dna/gene/proc/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/proc/activate(var/mob/living/M, var/connected, var/flags)
+	M.gene_stability -= instability
 	return
 
 /**
 * Called when the gene deactivates.  Undo your magic here.
 * Only called when the block is deactivated.
 */
-/datum/dna/gene/proc/deactivate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/proc/deactivate(var/mob/living/M, var/connected, var/flags)
+	M.gene_stability += instability
 	return
 
 // This section inspired by goone's bioEffects.
@@ -107,16 +112,18 @@
 	if(flags & MUTCHK_FORCED)
 		return 1
 	// Probability check
-	return probinj(activation_prob,(flags&MUTCHK_FORCED))
+	return prob(activation_prob)
 
 /datum/dna/gene/basic/activate(var/mob/M)
+	..()
 	M.mutations.Add(mutation)
 	if(activation_messages.len)
 		var/msg = pick(activation_messages)
-		to_chat(M, "\blue [msg]")
+		to_chat(M, "<span class='notice'>[msg]</span>")
 
 /datum/dna/gene/basic/deactivate(var/mob/M)
+	..()
 	M.mutations.Remove(mutation)
 	if(deactivation_messages.len)
 		var/msg = pick(deactivation_messages)
-		to_chat(M, "\red [msg]")
+		to_chat(M, "<span class='warning'>[msg]</span>")
diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm
index 1cb70e2c236..2afb9b7bd83 100644
--- a/code/game/dna/genes/goon_disabilities.dm
+++ b/code/game/dna/genes/goon_disabilities.dm
@@ -12,14 +12,15 @@
 	desc = "Completely shuts down the speech center of the subject's brain."
 	activation_message   = "You feel unable to express yourself at all."
 	deactivation_message = "You feel able to speak freely again."
+	instability = -GENE_INSTABILITY_MODERATE
 	sdisability = MUTE
 
-	New()
-		..()
-		block=MUTEBLOCK
+/datum/dna/gene/disability/mute/New()
+	..()
+	block=MUTEBLOCK
 
-	OnSay(var/mob/M, var/message)
-		return ""
+/datum/dna/gene/disability/mute/OnSay(var/mob/M, var/message)
+	return ""
 
 ////////////////////////////////////////
 // Harmful to others as well as self
@@ -30,24 +31,35 @@
 	desc = "The subject suffers from constant radiation sickness and causes the same on nearby organics."
 	activation_message = "You feel a strange sickness permeate your whole body."
 	deactivation_message = "You no longer feel awful and sick all over."
+	instability = -GENE_INSTABILITY_MAJOR
 	mutation = RADIOACTIVE
 
-	New()
-		..()
-		block=RADBLOCK
+/datum/dna/gene/disability/radioactive/New()
+	..()
+	block=RADBLOCK
 
-	OnMobLife(var/mob/living/owner)
-		var/radiation_amount = abs(min(owner.radiation - 20,0))
-		owner.apply_effect(radiation_amount, IRRADIATE)
-		for(var/mob/living/L in range(1, owner))
-			if(L == owner)
-				continue
-			to_chat(L, "<span class='danger'>You are enveloped by a soft green glow emanating from [owner].</span>")
-			L.apply_effect(5, IRRADIATE)
-		return
 
-	OnDrawUnderlays(var/mob/M,var/g,var/fat)
-		return "rads[fat]_s"
+/datum/dna/gene/disability/radioactive/can_activate(var/mob/M,var/flags)
+	if(!..())
+		return 0
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.species && H.species.flags & RADIMMUNE && !(flags & MUTCHK_FORCED))
+			return 0
+	return 1
+
+/datum/dna/gene/disability/radioactive/OnMobLife(var/mob/living/owner)
+	var/radiation_amount = abs(min(owner.radiation - 20,0))
+	owner.apply_effect(radiation_amount, IRRADIATE)
+	for(var/mob/living/L in range(1, owner))
+		if(L == owner)
+			continue
+		to_chat(L, "<span class='danger'>You are enveloped by a soft green glow emanating from [owner].</span>")
+		L.apply_effect(5, IRRADIATE)
+	return
+
+/datum/dna/gene/disability/radioactive/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+	return "rads[fat]_s"
 
 ////////////////////////////////////////
 // Other disabilities
@@ -59,12 +71,12 @@
 	desc = "Greatly slows the subject's metabolism, enabling greater buildup of lipid tissue."
 	activation_message = "You feel blubbery and lethargic!"
 	deactivation_message = "You feel fit!"
-
+	instability = -GENE_INSTABILITY_MINOR
 	mutation = OBESITY
 
-	New()
-		..()
-		block=FATBLOCK
+/datum/dna/gene/disability/fat/New()
+	..()
+	block=FATBLOCK
 
 // WAS: /datum/bioEffect/chav
 /datum/dna/gene/disability/speech/chav
@@ -74,36 +86,36 @@
 	deactivation_message = "You no longer feel like being rude and sassy."
 	mutation = CHAV
 
-	New()
-		..()
-		block=CHAVBLOCK
+/datum/dna/gene/disability/speech/chav/New()
+	..()
+	block=CHAVBLOCK
 
-	OnSay(var/mob/M, var/message)
-		// THIS ENTIRE THING BEGS FOR REGEX
-		message = replacetext(message,"dick","prat")
-		message = replacetext(message,"comdom","knob'ead")
-		message = replacetext(message,"looking at","gawpin' at")
-		message = replacetext(message,"great","bangin'")
-		message = replacetext(message,"man","mate")
-		message = replacetext(message,"friend",pick("mate","bruv","bledrin"))
-		message = replacetext(message,"what","wot")
-		message = replacetext(message,"drink","wet")
-		message = replacetext(message,"get","giz")
-		message = replacetext(message,"what","wot")
-		message = replacetext(message,"no thanks","wuddent fukken do one")
-		message = replacetext(message,"i don't know","wot mate")
-		message = replacetext(message,"no","naw")
-		message = replacetext(message,"robust","chin")
-		message = replacetext(message," hi ","how what how")
-		message = replacetext(message,"hello","sup bruv")
-		message = replacetext(message,"kill","bang")
-		message = replacetext(message,"murder","bang")
-		message = replacetext(message,"windows","windies")
-		message = replacetext(message,"window","windy")
-		message = replacetext(message,"break","do")
-		message = replacetext(message,"your","yer")
-		message = replacetext(message,"security","coppers")
-		return message
+/datum/dna/gene/disability/speech/chav/OnSay(var/mob/M, var/message)
+	// THIS ENTIRE THING BEGS FOR REGEX
+	message = replacetext(message,"dick","prat")
+	message = replacetext(message,"comdom","knob'ead")
+	message = replacetext(message,"looking at","gawpin' at")
+	message = replacetext(message,"great","bangin'")
+	message = replacetext(message,"man","mate")
+	message = replacetext(message,"friend",pick("mate","bruv","bledrin"))
+	message = replacetext(message,"what","wot")
+	message = replacetext(message,"drink","wet")
+	message = replacetext(message,"get","giz")
+	message = replacetext(message,"what","wot")
+	message = replacetext(message,"no thanks","wuddent fukken do one")
+	message = replacetext(message,"i don't know","wot mate")
+	message = replacetext(message,"no","naw")
+	message = replacetext(message,"robust","chin")
+	message = replacetext(message," hi ","how what how")
+	message = replacetext(message,"hello","sup bruv")
+	message = replacetext(message,"kill","bang")
+	message = replacetext(message,"murder","bang")
+	message = replacetext(message,"windows","windies")
+	message = replacetext(message,"window","windy")
+	message = replacetext(message,"break","do")
+	message = replacetext(message,"your","yer")
+	message = replacetext(message,"security","coppers")
+	return message
 
 // WAS: /datum/bioEffect/swedish
 /datum/dna/gene/disability/speech/swedish
@@ -113,16 +125,16 @@
 	deactivation_message = "The feeling of Swedishness passes."
 	mutation = SWEDISH
 
-	New()
-		..()
-		block=SWEDEBLOCK
+/datum/dna/gene/disability/speech/swedish/New()
+	..()
+	block=SWEDEBLOCK
 
-	OnSay(var/mob/M, var/message)
-		// svedish
-		message = replacetext(message,"w","v")
-		if(prob(30))
-			message += " Bork[pick("",", bork",", bork, bork")]!"
-		return message
+/datum/dna/gene/disability/speech/swedish/OnSay(var/mob/M, var/message)
+	// svedish
+	message = replacetext(message,"w","v")
+	if(prob(30))
+		message += " Bork[pick("",", bork",", bork, bork")]!"
+	return message
 
 // WAS: /datum/bioEffect/unintelligable
 /datum/dna/gene/disability/unintelligable
@@ -130,34 +142,35 @@
 	desc = "Heavily corrupts the part of the brain responsible for forming spoken sentences."
 	activation_message = "You can't seem to form any coherent thoughts!"
 	deactivation_message = "Your mind feels more clear."
+	instability = -GENE_INSTABILITY_MINOR
 	mutation = SCRAMBLED
 
-	New()
-		..()
-		block=SCRAMBLEBLOCK
+/datum/dna/gene/disability/unintelligable/New()
+	..()
+	block=SCRAMBLEBLOCK
 
-	OnSay(var/mob/M, var/message)
-		var/prefix=copytext(message,1,2)
-		if(prefix == ";")
-			message = copytext(message,2)
-		else if(prefix in list(":","#"))
-			prefix += copytext(message,2,3)
-			message = copytext(message,3)
-		else
-			prefix=""
+/datum/dna/gene/disability/unintelligable/OnSay(var/mob/M, var/message)
+	var/prefix=copytext(message,1,2)
+	if(prefix == ";")
+		message = copytext(message,2)
+	else if(prefix in list(":","#"))
+		prefix += copytext(message,2,3)
+		message = copytext(message,3)
+	else
+		prefix=""
 
-		var/list/words = splittext(message," ")
-		var/list/rearranged = list()
-		for(var/i=1;i<=words.len;i++)
-			var/cword = pick(words)
-			words.Remove(cword)
-			var/suffix = copytext(cword,length(cword)-1,length(cword))
-			while(length(cword)>0 && suffix in list(".",",",";","!",":","?"))
-				cword  = copytext(cword,1              ,length(cword)-1)
-				suffix = copytext(cword,length(cword)-1,length(cword)  )
-			if(length(cword))
-				rearranged += cword
-		return "[prefix][uppertext(jointext(rearranged," "))]!!"
+	var/list/words = splittext(message," ")
+	var/list/rearranged = list()
+	for(var/i=1;i<=words.len;i++)
+		var/cword = pick(words)
+		words.Remove(cword)
+		var/suffix = copytext(cword,length(cword)-1,length(cword))
+		while(length(cword)>0 && suffix in list(".",",",";","!",":","?"))
+			cword  = copytext(cword,1              ,length(cword)-1)
+			suffix = copytext(cword,length(cword)-1,length(cword)  )
+		if(length(cword))
+			rearranged += cword
+	return "[prefix][uppertext(jointext(rearranged," "))]!!"
 
 // WAS: /datum/bioEffect/toxic_farts
 /datum/dna/gene/disability/toxic_farts
@@ -165,12 +178,11 @@
 	desc = "Causes the subject's digestion to create a significant amount of noxious gas."
 	activation_message = "Your stomach grumbles unpleasantly."
 	deactivation_message = "Your stomach stops acting up. Phew!"
-
 	mutation = TOXIC_FARTS
 
-	New()
-		..()
-		block=TOXICFARTBLOCK
+/datum/dna/gene/disability/toxic_farts/New()
+	..()
+	block=TOXICFARTBLOCK
 
 //////////////////
 // USELESS SHIT //
@@ -183,12 +195,11 @@
 	desc = "Enhances the subject's ability to build and retain heavy muscles."
 	activation_message = "You feel buff!"
 	deactivation_message = "You feel wimpy and weak."
-
 	mutation = STRONG
 
-	New()
-		..()
-		block=STRONGBLOCK
+/datum/dna/gene/disability/strong/New()
+	..()
+	block=STRONGBLOCK
 
 // WAS: /datum/bioEffect/horns
 /datum/dna/gene/disability/horns
@@ -198,12 +209,12 @@
 	deactivation_message = "Your horns crumble away into nothing."
 	mutation = HORNS
 
-	New()
-		..()
-		block=HORNSBLOCK
+/datum/dna/gene/disability/horns/New()
+	..()
+	block=HORNSBLOCK
 
-	OnDrawUnderlays(var/mob/M,var/g,var/fat)
-		return "horns_s"
+/datum/dna/gene/disability/horns/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+	return "horns_s"
 
 ////////////////////////////////////////////////////////////////////////
 // WAS: /datum/bioEffect/immolate
@@ -216,9 +227,9 @@
 
 	spelltype=/obj/effect/proc_holder/spell/targeted/immolate
 
-	New()
-		..()
-		block = IMMOLATEBLOCK
+/datum/dna/gene/basic/grant_spell/immolate/New()
+	..()
+	block = IMMOLATEBLOCK
 
 /obj/effect/proc_holder/spell/targeted/immolate
 	name = "Incendiary Mitochondria"
@@ -241,6 +252,6 @@
 /obj/effect/proc_holder/spell/targeted/immolate/cast(list/targets)
 	var/mob/living/carbon/L = usr
 	L.adjust_fire_stacks(0.5)
-	L.visible_message("\red <b>[L.name]</b> suddenly bursts into flames!")
+	L.visible_message("<span class='danger'>[L.name]</b> suddenly bursts into flames!</span>")
 	L.IgniteMob()
 	playsound(L.loc, 'sound/effects/bamf.ogg', 50, 0)
diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm
index c50c04860cf..3d9b045da13 100644
--- a/code/game/dna/genes/goon_powers.dm
+++ b/code/game/dna/genes/goon_powers.dm
@@ -8,8 +8,8 @@
 
 	mutation=SOBER
 
-	New()
-		block=SOBERBLOCK
+/datum/dna/gene/basic/sober/New()
+	block=SOBERBLOCK
 
 //WAS: /datum/bioEffect/psychic_resist
 /datum/dna/gene/basic/psychic_resist
@@ -20,24 +20,26 @@
 
 	mutation=PSY_RESIST
 
-	New()
-		block=PSYRESISTBLOCK
+/datum/dna/gene/basic/psychic_resist/New()
+	block=PSYRESISTBLOCK
 
 /////////////////////////
 // Stealth Enhancers
 /////////////////////////
 
 /datum/dna/gene/basic/stealth
-	can_activate(var/mob/M, var/flags)
-		// Can only activate one of these at a time.
-		if(is_type_in_list(/datum/dna/gene/basic/stealth,M.active_genes))
-			testing("Cannot activate [type]: /datum/dna/gene/basic/stealth in M.active_genes.")
-			return 0
-		return ..(M,flags)
+	instability = GENE_INSTABILITY_MODERATE
 
-	deactivate(var/mob/M)
-		..(M)
-		M.alpha=255
+/datum/dna/gene/basic/stealth/can_activate(var/mob/M, var/flags)
+	// Can only activate one of these at a time.
+	if(is_type_in_list(/datum/dna/gene/basic/stealth,M.active_genes))
+		testing("Cannot activate [type]: /datum/dna/gene/basic/stealth in M.active_genes.")
+		return 0
+	return ..(M,flags)
+
+/datum/dna/gene/basic/stealth/deactivate(var/mob/M)
+	..(M)
+	M.alpha=255
 
 // WAS: /datum/bioEffect/darkcloak
 /datum/dna/gene/basic/stealth/darkcloak
@@ -48,23 +50,23 @@
 	activation_prob=10
 	mutation = CLOAK
 
-	New()
-		block=SHADOWBLOCK
+/datum/dna/gene/basic/stealth/darkcloak/New()
+	block=SHADOWBLOCK
 
-	OnMobLife(var/mob/M)
-		var/turf/simulated/T = get_turf(M)
-		if(!istype(T))
-			return
-		var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-		var/light_available
-		if(L)
-			light_available = L.get_clamped_lum()*10
-		else
-			light_available = 5
-		if(light_available <= 2)
-			M.alpha = round(M.alpha * 0.8)
-		else
-			M.alpha = 255
+/datum/dna/gene/basic/stealth/darkcloak/OnMobLife(var/mob/M)
+	var/turf/simulated/T = get_turf(M)
+	if(!istype(T))
+		return
+	var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
+	var/light_available
+	if(L)
+		light_available = L.get_clamped_lum()*10
+	else
+		light_available = 5
+	if(light_available <= 2)
+		M.alpha = round(M.alpha * 0.8)
+	else
+		M.alpha = 255
 
 //WAS: /datum/bioEffect/chameleon
 /datum/dna/gene/basic/stealth/chameleon
@@ -75,43 +77,43 @@
 	activation_prob=10
 	mutation = CHAMELEON
 
-	New()
+/datum/dna/gene/basic/stealth/chameleon/New()
 		block=CHAMELEONBLOCK
 
-	OnMobLife(var/mob/M)
-		if((world.time - M.last_movement) >= 30 && !M.stat && M.canmove && !M.restrained())
-			M.alpha -= 25
-		else
-			M.alpha = round(255 * 0.80)
+/datum/dna/gene/basic/stealth/chameleon/OnMobLife(var/mob/M)
+	if((world.time - M.last_movement) >= 30 && !M.stat && M.canmove && !M.restrained())
+		M.alpha -= 25
+	else
+		M.alpha = round(255 * 0.80)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
 /datum/dna/gene/basic/grant_spell
 	var/obj/effect/proc_holder/spell/spelltype
 
-	activate(var/mob/M, var/connected, var/flags)
-		M.AddSpell(new spelltype(M))
-		..()
-		return 1
+/datum/dna/gene/basic/grant_spell/activate(var/mob/M, var/connected, var/flags)
+	M.AddSpell(new spelltype(M))
+	..()
+	return 1
 
-	deactivate(var/mob/M, var/connected, var/flags)
-		for(var/obj/effect/proc_holder/spell/S in M.spell_list)
-			if(istype(S,spelltype))
-				M.spell_list.Remove(S)
-		..()
-		return 1
+/datum/dna/gene/basic/grant_spell/deactivate(var/mob/M, var/connected, var/flags)
+	for(var/obj/effect/proc_holder/spell/S in M.spell_list)
+		if(istype(S,spelltype))
+			M.spell_list.Remove(S)
+	..()
+	return 1
 
 /datum/dna/gene/basic/grant_verb
 	var/verbtype
 
-	activate(var/mob/M, var/connected, var/flags)
-		..()
-		M.verbs += verbtype
-		return 1
+/datum/dna/gene/basic/grant_verb/activate(var/mob/M, var/connected, var/flags)
+	..()
+	M.verbs += verbtype
+	return 1
 
-	deactivate(var/mob/M, var/connected, var/flags)
-		..()
-		M.verbs -= verbtype
+/datum/dna/gene/basic/grant_verb/deactivate(var/mob/M, var/connected, var/flags)
+	..()
+	M.verbs -= verbtype
 
 // WAS: /datum/bioEffect/cryokinesis
 /datum/dna/gene/basic/grant_spell/cryo
@@ -119,13 +121,14 @@
 	desc = "Allows the subject to lower the body temperature of others."
 	activation_messages = list("You notice a strange cold tingle in your fingertips.")
 	deactivation_messages = list("Your fingers feel warmer.")
+	instability = GENE_INSTABILITY_MODERATE
 	mutation = CRYO
 
 	spelltype = /obj/effect/proc_holder/spell/targeted/cryokinesis
 
-	New()
-		..()
-		block = CRYOBLOCK
+/datum/dna/gene/basic/grant_spell/cryo/New()
+	..()
+	block = CRYOBLOCK
 
 /obj/effect/proc_holder/spell/targeted/cryokinesis
 	name = "Cryokinesis"
@@ -153,11 +156,11 @@
 	var/mob/living/carbon/C = targets[1]
 
 	if(!iscarbon(C))
-		to_chat(usr, "\red This will only work on normal organic beings.")
+		to_chat(usr, "<span class='warning'>This will only work on normal organic beings.</span>")
 		return
 
-	if (RESIST_COLD in C.mutations)
-		C.visible_message("\red A cloud of fine ice crystals engulfs [C.name], but disappears almost instantly!")
+	if(RESIST_COLD in C.mutations)
+		C.visible_message("<span class='warning'>A cloud of fine ice crystals engulfs [C.name], but disappears almost instantly!</span>")
 		return
 	var/handle_suit = 0
 	if(ishuman(C))
@@ -166,12 +169,12 @@
 			if(istype(H.wear_suit, /obj/item/clothing/suit/space))
 				handle_suit = 1
 				if(H.internal)
-					H.visible_message("\red [usr] sprays a cloud of fine ice crystals, engulfing [H]!",
+					H.visible_message("<span class='warning'>[usr] sprays a cloud of fine ice crystals, engulfing [H]!</span>",
 										"<span class='notice'>[usr] sprays a cloud of fine ice crystals over your [H.head]'s visor.</span>")
 					log_admin("[key_name(usr)] has used cryokinesis on [key_name(C)] while wearing internals and a suit")
 					msg_admin_attack("[key_name_admin(usr)] has cast cryokinesis on [key_name_admin(C)]")
 				else
-					H.visible_message("\red [usr] sprays a cloud of fine ice crystals engulfing, [H]!",
+					H.visible_message("<span class='warning'>[usr] sprays a cloud of fine ice crystals engulfing, [H]!</span>",
 										"<span class='warning'>[usr] sprays a cloud of fine ice crystals cover your [H.head]'s visor and make it into your air vents!.</span>")
 					log_admin("[key_name(usr)] has used cryokinesis on [key_name(C)]")
 					msg_admin_attack("[key_name_admin(usr)] has cast cryokinesis on [key_name_admin(C)]")
@@ -200,12 +203,12 @@
 	desc = ""
 	//layer = 15
 
-	New(var/atom/location, var/icon/I, var/duration = 20, var/oname = "something")
-		src.name = oname
-		loc=location
-		src.icon = I
-		spawn(duration)
-			qdel(src)
+/obj/effect/self_deleting/New(var/atom/location, var/icon/I, var/duration = 20, var/oname = "something")
+	src.name = oname
+	loc=location
+	src.icon = I
+	spawn(duration)
+		qdel(src)
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -215,13 +218,14 @@
 	desc = "Allows the subject to eat just about anything without harm."
 	activation_messages = list("You feel hungry.")
 	deactivation_messages = list("You don't feel quite so hungry anymore.")
+	instability = GENE_INSTABILITY_MINOR
 	mutation = EATER
 
 	spelltype=/obj/effect/proc_holder/spell/targeted/eat
 
-	New()
-		..()
-		block = EATBLOCK
+/datum/dna/gene/basic/grant_spell/mattereater/New()
+	..()
+	block = EATBLOCK
 
 /obj/effect/proc_holder/spell/targeted/eat
 	name = "Eat"
@@ -356,13 +360,14 @@
 	//cooldown = 30
 	activation_messages = list("Your leg muscles feel taut and strong.")
 	deactivation_messages = list("Your leg muscles shrink back to normal.")
+	instability = GENE_INSTABILITY_MINOR
 	mutation = JUMPY
 
 	spelltype =/obj/effect/proc_holder/spell/targeted/leap
 
-	New()
-		..()
-		block = JUMPBLOCK
+/datum/dna/gene/basic/grant_spell/jumpy/New()
+	..()
+	block = JUMPBLOCK
 
 /obj/effect/proc_holder/spell/targeted/leap
 	name = "Jump"
@@ -382,13 +387,11 @@
 
 /obj/effect/proc_holder/spell/targeted/leap/cast(list/targets)
 	var/failure = 0
-	if (istype(usr.loc,/mob/) || usr.lying || usr.stunned || usr.buckled || usr.stat)
-		to_chat(usr, "\red You can't jump right now!")
+	if(istype(usr.loc,/mob/) || usr.lying || usr.stunned || usr.buckled || usr.stat)
+		to_chat(usr, "<span class='warning'>You can't jump right now!</span>")
 		return
 
-	if (istype(usr.loc,/turf/))
-
-
+	if(istype(usr.loc,/turf/))
 		if(usr.restrained())//Why being pulled while cuffed prevents you from moving
 			for(var/mob/M in range(usr, 1))
 				if(M.pulling == usr)
@@ -400,12 +403,12 @@
 		if(usr.pinned.len)
 			failure = 1
 
-		usr.visible_message("\red <b>[usr.name]</b> takes a huge leap!")
+		usr.visible_message("<span class='danger'>[usr.name]</b> takes a huge leap!</span>")
 		playsound(usr.loc, 'sound/weapons/thudswoosh.ogg', 50, 1)
 		if(failure)
 			usr.Weaken(5)
 			usr.Stun(5)
-			usr.visible_message("<span class='warning'> \the [usr] attempts to leap away but is slammed back down to the ground!</span>",
+			usr.visible_message("<span class='warning'>[usr] attempts to leap away but is slammed back down to the ground!</span>",
 								"<span class='warning'>You attempt to leap away but are suddenly slammed back down to the ground!</span>",
 								"<span class='notice'>You hear the flexing of powerful muscles and suddenly a crash as a body hits the floor.</span>")
 			return 0
@@ -421,20 +424,20 @@
 			sleep(1)
 		usr.flying = prevFlying
 
-		if (FAT in usr.mutations && prob(66))
-			usr.visible_message("\red <b>[usr.name]</b> crashes due to their heavy weight!")
+		if(FAT in usr.mutations && prob(66))
+			usr.visible_message("<span class='danger'>[usr.name]</b> crashes due to their heavy weight!</span>")
 			//playsound(usr.loc, 'zhit.wav', 50, 1)
 			usr.AdjustWeakened(10)
 			usr.AdjustStunned(5)
 
 		usr.layer = prevLayer
 
-	if (istype(usr.loc,/obj/))
+	if(istype(usr.loc,/obj/))
 		var/obj/container = usr.loc
-		to_chat(usr, "\red You leap and slam your head against the inside of [container]! Ouch!")
+		to_chat(usr, "<span class='warning'>You leap and slam your head against the inside of [container]! Ouch!</span>")
 		usr.AdjustParalysis(3)
 		usr.AdjustWeakened(5)
-		container.visible_message("\red <b>[usr.loc]</b> emits a loud thump and rattles a bit.")
+		container.visible_message("<span class='danger'>[usr.loc]</b> emits a loud thump and rattles a bit.</span>")
 		playsound(usr.loc, 'sound/effects/bang.ogg', 50, 1)
 		var/wiggle = 6
 		while(wiggle > 0)
@@ -460,11 +463,12 @@
 	//cooldown = 1800
 	activation_messages = list("You don't feel entirely like yourself somehow.")
 	deactivation_messages = list("You feel secure in your identity.")
+	instability = GENE_INSTABILITY_MODERATE
 	mutation = POLYMORPH
 
-	New()
-		..()
-		block = POLYMORPHBLOCK
+/datum/dna/gene/basic/grant_spell/polymorph/New()
+	..()
+	block = POLYMORPHBLOCK
 
 /obj/effect/proc_holder/spell/targeted/polymorph
 	name = "Polymorph"
@@ -483,13 +487,13 @@
 /obj/effect/proc_holder/spell/targeted/polymorph/cast(list/targets)
 	var/mob/living/M=targets[1]
 	if(!ishuman(M))
-		to_chat(usr, "\red You can only change your appearance to that of another human.")
+		to_chat(usr, "<span class='warning'>You can only change your appearance to that of another human.</span>")
 		return
 
 	if(!ishuman(usr))
 		return
 
-	usr.visible_message("\red [usr]'s body shifts and contorts.")
+	usr.visible_message("<span class='warning'>[usr]'s body shifts and contorts.</span>")
 
 	spawn(10)
 		if(M && usr)
@@ -510,11 +514,12 @@
 	spelltype = /obj/effect/proc_holder/spell/targeted/empath
 	activation_messages = list("You suddenly notice more about others than you did before.")
 	deactivation_messages = list("You no longer feel able to sense intentions.")
+	instability = GENE_INSTABILITY_MINOR
 	mutation=EMPATH
 
-	New()
-		..()
-		block = EMPATHBLOCK
+/datum/dna/gene/basic/grant_spell/empath/New()
+	..()
+	block = EMPATHBLOCK
 
 /obj/effect/proc_holder/spell/targeted/empath
 	name = "Read Mind"
@@ -544,21 +549,21 @@
 
 	for(var/mob/living/carbon/M in targets)
 		if(!iscarbon(M))
-			to_chat(usr, "\red You may only use this on other organic beings.")
+			to_chat(usr, "<span class='warning'>You may only use this on other organic beings.</span>")
 			return
 
-		if (PSY_RESIST in M.mutations)
-			to_chat(usr, "\red You can't see into [M.name]'s mind at all!")
+		if(PSY_RESIST in M.mutations)
+			to_chat(usr, "<span class='warning'>You can't see into [M.name]'s mind at all!</span>")
 			return
 
-		if (M.stat == 2)
-			to_chat(usr, "\red [M.name] is dead and cannot have their mind read.")
+		if(M.stat == 2)
+			to_chat(usr, "<span class='warning'>[M.name] is dead and cannot have their mind read.</span>")
 			return
-		if (M.health < 0)
-			to_chat(usr, "\red [M.name] is dying, and their thoughts are too scrambled to read.")
+		if(M.health < 0)
+			to_chat(usr, "<span class='warning'>[M.name] is dying, and their thoughts are too scrambled to read.</span>")
 			return
 
-		to_chat(usr, "\blue Mind Reading of [M.name]:</b>")
+		to_chat(usr, "<span class='notice'>Mind Reading of <b>[M.name]:</b></span>")
 		var/pain_condition = M.health
 		// lower health means more pain
 		var/list/randomthoughts = list("what to have for lunch","the future","the past","money",
@@ -570,53 +575,53 @@
 			pain_condition -= 50
 			thoughts = "preoccupied with the fire"
 
-		if (M.radiation)
+		if(M.radiation)
 			pain_condition -= 25
 
 		switch(pain_condition)
-			if (81 to INFINITY)
-				to_chat(usr, "\blue <b>Condition</b>: [M.name] feels good.")
-			if (61 to 80)
-				to_chat(usr, "\blue <b>Condition</b>: [M.name] is suffering mild pain.")
-			if (41 to 60)
-				to_chat(usr, "\blue <b>Condition</b>: [M.name] is suffering significant pain.")
-			if (21 to 40)
-				to_chat(usr, "\blue <b>Condition</b>: [M.name] is suffering severe pain.")
+			if(81 to INFINITY)
+				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] feels good.</span>")
+			if(61 to 80)
+				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] is suffering mild pain.</span>")
+			if(41 to 60)
+				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] is suffering significant pain.</span>")
+			if(21 to 40)
+				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] is suffering severe pain.</span>")
 			else
-				to_chat(usr, "\blue <b>Condition</b>: [M.name] is suffering excruciating pain.")
+				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] is suffering excruciating pain.</span>")
 				thoughts = "haunted by their own mortality"
 
 		switch(M.a_intent)
-			if (I_HELP)
-				to_chat(usr, "\blue <b>Mood</b>: You sense benevolent thoughts from [M.name].")
-			if (I_DISARM)
-				to_chat(usr, "\blue <b>Mood</b>: You sense cautious thoughts from [M.name].")
-			if (I_GRAB)
-				to_chat(usr, "\blue <b>Mood</b>: You sense hostile thoughts from [M.name].")
-			if (I_HARM)
-				to_chat(usr, "\blue <b>Mood</b>: You sense cruel thoughts from [M.name].")
+			if(I_HELP)
+				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense benevolent thoughts from [M.name].</span>")
+			if(I_DISARM)
+				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense cautious thoughts from [M.name].</span>")
+			if(I_GRAB)
+				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense hostile thoughts from [M.name].</span>")
+			if(I_HARM)
+				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense cruel thoughts from [M.name].</span>")
 				for(var/mob/living/L in view(7,M))
-					if (L == M)
+					if(L == M)
 						continue
 					thoughts = "thinking about punching [L.name]"
 					break
 			else
-				to_chat(usr, "\blue <b>Mood</b>: You sense strange thoughts from [M.name].")
+				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense strange thoughts from [M.name].</span>")
 
-		if (istype(M,/mob/living/carbon/human))
+		if(istype(M,/mob/living/carbon/human))
 			var/numbers[0]
 			var/mob/living/carbon/human/H = M
 			if(H.mind && H.mind.initial_account)
 				numbers += H.mind.initial_account.account_number
 				numbers += H.mind.initial_account.remote_access_pin
 			if(numbers.len>0)
-				to_chat(usr, "\blue <b>Numbers</b>: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name].")
-		to_chat(usr, "\blue <b>Thoughts</b>: [M.name] is currently [thoughts].")
+				to_chat(usr, "<span class='notice'>b>Numbers</b>: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name].</span>")
+		to_chat(usr, "<span class='notice'><b>Thoughts</b>: [M.name] is currently [thoughts].</span>")
 
-		if (EMPATH in M.mutations)
-			to_chat(M, "\red You sense [usr.name] reading your mind.")
-		else if (prob(5) || M.mind.assigned_role=="Chaplain")
-			to_chat(M, "\red You sense someone intruding upon your thoughts...")
+		if(EMPATH in M.mutations)
+			to_chat(M, "<span class='warning'>You sense [usr.name] reading your mind.</span>")
+		else if(prob(5) || M.mind.assigned_role=="Chaplain")
+			to_chat(M, "<span class='warning'>You sense someone intruding upon your thoughts...</span>")
 		return
 
 ////////////////////////////////////////////////////////////////////////
@@ -627,13 +632,13 @@
 	desc = "Vastly increases the gas capacity of the subject's digestive tract."
 	activation_messages = list("You feel bloated and gassy.")
 	deactivation_messages = list("You no longer feel gassy. What a relief!")
-
+	instability = GENE_INSTABILITY_MINOR
 	mutation = SUPER_FART
 	spelltype = /obj/effect/proc_holder/spell/aoe_turf/superfart
 
-	New()
-		..()
-		block = SUPERFARTBLOCK
+/datum/dna/gene/basic/grant_spell/superfart/New()
+	..()
+	block = SUPERFARTBLOCK
 
 /obj/effect/proc_holder/spell/aoe_turf/superfart
 	name = "Super Fart"
@@ -660,7 +665,7 @@
 		for(var/T in targets)
 			for(var/mob/living/M in T)
 				shake_camera(M, 10, 5)
-				if (M == usr)
+				if(M == usr)
 					continue
 				to_chat(M, "<span class='warning'>You are sent flying!</span>")
 				M.Weaken(5)
diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm
index 8ef0b7bb5f8..4f023d8021f 100644
--- a/code/game/dna/genes/monkey.dm
+++ b/code/game/dna/genes/monkey.dm
@@ -57,7 +57,7 @@
 	if(!istype(H,/mob/living/carbon/human))
 		return
 	for(var/obj/item/W in H)
-		if (W == H.w_uniform) // will be torn
+		if(W == H.w_uniform) // will be torn
 			continue
 		if(istype(W,/obj/item/organ))
 			continue
diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm
index eb33cef7ccf..465dc5df685 100644
--- a/code/game/dna/genes/powers.dm
+++ b/code/game/dna/genes/powers.dm
@@ -6,151 +6,171 @@
 	name="No Breathing"
 	activation_messages=list("You feel no need to breathe.")
 	deactivation_messages=list("You feel the need to breathe, once more.")
+	instability = GENE_INSTABILITY_MODERATE
 	mutation=NO_BREATH
 	activation_prob=10
 
-	New()
-		block=NOBREATHBLOCK
+/datum/dna/gene/basic/nobreath/New()
+	block=NOBREATHBLOCK
 
 
 /datum/dna/gene/basic/regenerate
 	name="Regenerate"
 	activation_messages=list("Your wounds start healing.")
 	deactivation_messages=list("Your regenerative powers feel like they've vanished.")
+	instability = GENE_INSTABILITY_MINOR
 	mutation=REGEN
 
-	New()
-		block=REGENERATEBLOCK
+/datum/dna/gene/basic/regenerate/New()
+	block=REGENERATEBLOCK
 
 /datum/dna/gene/basic/increaserun
 	name="Super Speed"
 	activation_messages=list("You feel swift and unencumbered.")
 	deactivation_messages=list("You feel slow.")
+	instability = GENE_INSTABILITY_MINOR
 	mutation=RUN
 
-	New()
-		block=INCREASERUNBLOCK
+/datum/dna/gene/basic/increaserun/New()
+	block=INCREASERUNBLOCK
 
+/datum/dna/gene/basic/increaserun/can_activate(var/mob/M,var/flags)
+	if(!..())
+		return 0
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.species && H.species.slowdown && !(flags & MUTCHK_FORCED))
+			return 0
+	return 1
 
 /datum/dna/gene/basic/heat_resist
 	name="Heat Resistance"
 	activation_messages=list("Your skin is icy to the touch.")
 	deactivation_messages=list("Your skin no longer feels icy to the touch.")
+	instability = GENE_INSTABILITY_MODERATE
 	mutation=RESIST_HEAT
 
-	New()
-		block=COLDBLOCK
+/datum/dna/gene/basic/heat_resist/New()
+	block=COLDBLOCK
 
-	OnDrawUnderlays(var/mob/M,var/g,var/fat)
-		return "cold[fat]_s"
+/datum/dna/gene/basic/heat_resist/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+	return "cold[fat]_s"
 
 /datum/dna/gene/basic/cold_resist
 	name="Cold Resistance"
 	activation_messages=list("Your body is filled with warmth.")
 	deactivation_messages=list("Your body is no longer filled with warmth.")
+	instability = GENE_INSTABILITY_MODERATE
 	mutation=RESIST_COLD
 
-	New()
-		block=FIREBLOCK
+/datum/dna/gene/basic/cold_resist/New()
+	block=FIREBLOCK
 
-	OnDrawUnderlays(var/mob/M,var/g,var/fat)
-		return "fire[fat]_s"
+/datum/dna/gene/basic/cold_resist/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+	return "fire[fat]_s"
 
 /datum/dna/gene/basic/noprints
 	name="No Prints"
 	activation_messages=list("Your fingers feel numb.")
 	deactivation_messages=list("your fingers no longer feel numb.")
+	instability = GENE_INSTABILITY_MINOR
 	mutation=FINGERPRINTS
 
-	New()
-		block=NOPRINTSBLOCK
+/datum/dna/gene/basic/noprints/New()
+	block=NOPRINTSBLOCK
 
 /datum/dna/gene/basic/noshock
 	name="Shock Immunity"
 	activation_messages=list("Your skin feels dry and unreactive.")
 	deactivation_messages=list("Your skin no longer feels dry and unreactive.")
+	instability = GENE_INSTABILITY_MODERATE
 	mutation=NO_SHOCK
 
-	New()
-		block=SHOCKIMMUNITYBLOCK
+/datum/dna/gene/basic/noshock/New()
+	block=SHOCKIMMUNITYBLOCK
 
 /datum/dna/gene/basic/midget
 	name="Midget"
 	activation_messages=list("Everything around you seems bigger now...")
 	deactivation_messages = list("Everything around you seems to shrink...")
+	instability = GENE_INSTABILITY_MINOR
 	mutation=DWARF
 
-	New()
-		block=SMALLSIZEBLOCK
+/datum/dna/gene/basic/midget/New()
+	block=SMALLSIZEBLOCK
 
-	activate(var/mob/M, var/connected, var/flags)
-		..(M,connected,flags)
-		M.pass_flags |= PASSTABLE
-		M.resize = 0.8
+/datum/dna/gene/basic/midget/activate(var/mob/M, var/connected, var/flags)
+	..(M,connected,flags)
+	M.pass_flags |= PASSTABLE
+	M.resize = 0.8
 
-	deactivate(var/mob/M, var/connected, var/flags)
-		..()
-		M.pass_flags &= ~PASSTABLE
-		M.resize = 1.25
+/datum/dna/gene/basic/midget/deactivate(var/mob/M, var/connected, var/flags)
+	..()
+	M.pass_flags &= ~PASSTABLE
+	M.resize = 1.25
 
 // OLD HULK BEHAVIOR
 /datum/dna/gene/basic/hulk
 	name="Hulk"
 	activation_messages=list("Your muscles hurt.")
 	deactivation_messages=list("Your muscles shrink.")
+	instability = GENE_INSTABILITY_MAJOR
 	mutation=HULK
 	activation_prob=5
 
-	New()
-		block=HULKBLOCK
+/datum/dna/gene/basic/hulk/New()
+	block=HULKBLOCK
 
-	activate(var/mob/M, var/connected, var/flags)
-		..()
-		var/status = CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH
-		M.status_flags &= ~status
+/datum/dna/gene/basic/hulk/activate(var/mob/M, var/connected, var/flags)
+	..()
+	var/status = CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH
+	M.status_flags &= ~status
 
-	deactivate(var/mob/M, var/connected, var/flags)
-		..()
-		M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH
+/datum/dna/gene/basic/hulk/deactivate(var/mob/M, var/connected, var/flags)
+	..()
+	M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH
 
-	OnDrawUnderlays(var/mob/M,var/g,var/fat)
-		if(HULK in M.mutations)
-			if(fat)
-				return "hulk_[fat]_s"
-			else
-				return "hulk_[g]_s"
-		return 0
+/datum/dna/gene/basic/hulk/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+	if(HULK in M.mutations)
+		if(fat)
+			return "hulk_[fat]_s"
+		else
+			return "hulk_[g]_s"
+	return 0
 
-	OnMobLife(var/mob/living/carbon/human/M)
-		if(!istype(M)) return
-		if ((HULK in M.mutations) && M.health <= 0)
-			M.mutations.Remove(HULK)
-			M.dna.SetSEState(HULKBLOCK,0)
-			genemutcheck(M, HULKBLOCK,null,MUTCHK_FORCED)
-			M.update_mutations()		//update our mutation overlays
-			M.update_body()
-			M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH //temporary fix until the problem can be solved.
-			to_chat(M, "<span class='danger'>You suddenly feel very weak.</span>")
+/datum/dna/gene/basic/hulk/OnMobLife(var/mob/living/carbon/human/M)
+	if(!istype(M))
+		return
+	if((HULK in M.mutations) && M.health <= 0)
+		M.mutations.Remove(HULK)
+		M.dna.SetSEState(HULKBLOCK,0)
+		genemutcheck(M, HULKBLOCK,null,MUTCHK_FORCED)
+		M.update_mutations()		//update our mutation overlays
+		M.update_body()
+		M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH //temporary fix until the problem can be solved.
+		to_chat(M, "<span class='danger'>You suddenly feel very weak.</span>")
 
 /datum/dna/gene/basic/xray
 	name="X-Ray Vision"
 	activation_messages=list("The walls suddenly disappear.")
 	deactivation_messages=list("the walls around you re-appear.")
+	instability = GENE_INSTABILITY_MAJOR
 	mutation=XRAY
 	activation_prob=10
 
-	New()
-		block=XRAYBLOCK
+/datum/dna/gene/basic/xray/New()
+	block=XRAYBLOCK
 
 /datum/dna/gene/basic/tk
 	name="Telekenesis"
 	activation_messages = list("You feel smarter.")
 	deactivation_messages = list("You feel dumber.")
+	instability = GENE_INSTABILITY_MAJOR
 	mutation=TK
 	activation_prob=10
 
-	New()
-		block=TELEBLOCK
+/datum/dna/gene/basic/tk/New()
+	block=TELEBLOCK
 
-	OnDrawUnderlays(var/mob/M,var/g,var/fat)
-		return "telekinesishead[fat]_s"
\ No newline at end of file
+/datum/dna/gene/basic/tk/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+	return "telekinesishead[fat]_s"
diff --git a/code/game/dna/genes/vg_disabilities.dm b/code/game/dna/genes/vg_disabilities.dm
index 3514a658c18..ece9cb1da5c 100644
--- a/code/game/dna/genes/vg_disabilities.dm
+++ b/code/game/dna/genes/vg_disabilities.dm
@@ -6,31 +6,33 @@
 	deactivation_message = "You feel like being quiet.."
 	mutation = LOUD
 
-	New()
-		..()
-		block=LOUDBLOCK
+/datum/dna/gene/disability/speech/loud/New()
+	..()
+	block=LOUDBLOCK
 
 
 
-	OnSay(var/mob/M, var/message)
-		message = replacetext(message,".","!")
-		message = replacetext(message,"?","?!")
-		message = replacetext(message,"!","!!")
-		return uppertext(message)
+/datum/dna/gene/disability/speech/loud/OnSay(var/mob/M, var/message)
+	message = replacetext(message,".","!")
+	message = replacetext(message,"?","?!")
+	message = replacetext(message,"!","!!")
+	return uppertext(message)
 
 /datum/dna/gene/disability/dizzy
 	name = "Dizzy"
 	desc = "Causes the cerebellum to shut down in some places."
 	activation_message = "You feel very dizzy..."
 	deactivation_message = "You regain your balance."
+	instability = -GENE_INSTABILITY_MINOR
 	mutation = DIZZY
 
-	New()
-		..()
-		block=DIZZYBLOCK
+/datum/dna/gene/disability/dizzy/New()
+	..()
+	block=DIZZYBLOCK
 
 
-	OnMobLife(var/mob/living/carbon/human/M)
-		if(!istype(M)) return
-		if(DIZZY in M.mutations)
-			M.Dizzy(300)
+/datum/dna/gene/disability/dizzy/OnMobLife(var/mob/living/carbon/human/M)
+	if(!istype(M))
+		return
+	if(DIZZY in M.mutations)
+		M.Dizzy(300)
diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm
index 08784b71a61..b4940314e98 100644
--- a/code/game/dna/genes/vg_powers.dm
+++ b/code/game/dna/genes/vg_powers.dm
@@ -3,17 +3,15 @@
 /datum/dna/gene/basic/grant_spell/morph
 	name = "Morphism"
 	desc = "Enables the subject to reconfigure their appearance to that of any human."
-
 	spelltype =/obj/effect/proc_holder/spell/targeted/morph
 	activation_messages=list("Your body feels if can alter its appearance.")
 	deactivation_messages = list("Your body doesn't feel capable of altering its appearance.")
-
-
+	instability = GENE_INSTABILITY_MINOR
 	mutation=MORPH
 
-	New()
-		..()
-		block = MORPHBLOCK
+/datum/dna/gene/basic/grant_spell/morph/New()
+	..()
+	block = MORPHBLOCK
 
 /obj/effect/proc_holder/spell/targeted/morph
 	name = "Morph"
@@ -33,14 +31,14 @@
 /obj/effect/proc_holder/spell/targeted/morph/cast(list/targets)
 	if(!ishuman(usr))	return
 
-	if (istype(usr.loc,/mob/))
-		to_chat(usr, "\red You can't change your appearance right now!")
+	if(istype(usr.loc,/mob/))
+		to_chat(usr, "<span class='warning'>You can't change your appearance right now!</span>")
 		return
 	var/mob/living/carbon/human/M=usr
 	var/obj/item/organ/external/head/head_organ = M.get_organ("head")
 
 	var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female")
-	if (new_gender)
+	if(new_gender)
 		if(new_gender == "Male")
 			M.change_gender(MALE)
 		else
@@ -58,7 +56,7 @@
 	var/new_style = input("Please select hair style", "Character Generation", head_organ.h_style) as null|anything in valid_hairstyles
 
 	// if new style selected (not cancel)
-	if (new_style)
+	if(new_style)
 		head_organ.h_style = new_style
 
 	var/new_hair = input("Please select hair color.", "Character Generation", rgb(head_organ.r_hair, head_organ.g_hair, head_organ.b_hair)) as null|color
@@ -146,19 +144,20 @@
 	M.regenerate_icons()
 	M.update_dna()
 
-	M.visible_message("\blue \The [src] morphs and changes [M.get_visible_gender() == MALE ? "his" : M.get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "\blue You change your appearance!", "\red Oh, god!  What the hell was that?  It sounded like flesh getting squished and bone ground into a different shape!")
+	M.visible_message("<span class='notice'>[src] morphs and changes [M.get_visible_gender() == MALE ? "his" : M.get_visible_gender() == FEMALE ? "her" : "their"] appearance!</span>", "<span class='notice'>You change your appearance!</span>", "<span class='warning'>Oh, god!  What the hell was that?  It sounded like flesh getting squished and bone ground into a different shape!</span>")
 
 /datum/dna/gene/basic/grant_spell/remotetalk
 	name="Telepathy"
 	activation_messages=list("You feel you can project your thoughts.")
 	deactivation_messages=list("You no longer feel you can project your thoughts.")
+	instability = GENE_INSTABILITY_MINOR
 	mutation=REMOTE_TALK
 
 	spelltype =/obj/effect/proc_holder/spell/targeted/remotetalk
 
-	New()
-		..()
-		block=REMOTETALKBLOCK
+/datum/dna/gene/basic/grant_spell/remotetalk/New()
+	..()
+	block=REMOTETALKBLOCK
 
 /obj/effect/proc_holder/spell/targeted/remotetalk
 	name = "Project Mind"
@@ -206,10 +205,10 @@
 	for(var/mob/living/target in targets)
 		log_say("Project Mind: [key_name(usr)]->[key_name(target)]: [say]")
 		if(REMOTE_TALK in target.mutations)
-			target.show_message("\blue You hear [usr.real_name]'s voice: [say]")
+			target.show_message("<span class='notice'>You hear [usr.real_name]'s voice: [say]</span>")
 		else
-			target.show_message("\blue You hear a voice that seems to echo around the room: [say]")
-		usr.show_message("\blue You project your mind into [target.real_name]: [say]")
+			target.show_message("<span class='notice'>You hear a voice that seems to echo around the room: [say]</span>")
+		usr.show_message("<span class='notice'>You project your mind into [target.real_name]: [say]</span>")
 		for(var/mob/dead/observer/G in player_list)
 			G.show_message("<i>Telepathic message from <b>[usr]</b> ([ghost_follow_link(usr, ghost=G)]) to <b>[target]</b> ([ghost_follow_link(target, ghost=G)]): [say]</i>")
 
@@ -217,12 +216,13 @@
 	name="Remote Viewing"
 	activation_messages=list("Your mind can see things from afar.")
 	deactivation_messages=list("Your mind can no longer can see things from afar.")
+	instability = GENE_INSTABILITY_MINOR
 	mutation=REMOTE_VIEW
 
 	spelltype =/obj/effect/proc_holder/spell/targeted/remoteview
 
-	New()
-		block=REMOTEVIEWBLOCK
+/datum/dna/gene/basic/grant_spell/remoteview/New()
+	block=REMOTEVIEWBLOCK
 
 
 /obj/effect/proc_holder/spell/targeted/remoteview
@@ -262,7 +262,7 @@
 	var/mob/target
 
 	if(istype(user.l_hand, /obj/item/tk_grab) || istype(user.r_hand, /obj/item/tk_grab/))
-		to_chat(user, "\red Your mind is too busy with that telekinetic grab.")
+		to_chat(user, "<span class='warning'>Your mind is too busy with that telekinetic grab.</span>")
 		user.remoteview_target = null
 		user.reset_view(0)
 		return
@@ -279,11 +279,9 @@
 				continue
 		target = L
 
-	if (target)
+	if(target)
 		user.remoteview_target = target
 		user.reset_view(target)
 	else
 		user.remoteview_target = null
 		user.reset_view(0)
-
-
diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm
index 2e462a49ea5..1dc7985d648 100644
--- a/code/game/gamemodes/antag_spawner.dm
+++ b/code/game/gamemodes/antag_spawner.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/antag_spawner
 	throw_speed = 1
 	throw_range = 5
-	w_class = 1.0
+	w_class = 1
 	var/used = 0
 
 /obj/item/weapon/antag_spawner/proc/spawn_antag(var/client/C, var/turf/T, var/type = "")
diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm
index f6ff3bc083c..46ab6189023 100644
--- a/code/game/gamemodes/autotraitor/autotraitor.dm
+++ b/code/game/gamemodes/autotraitor/autotraitor.dm
@@ -76,13 +76,13 @@
 		var/traitorcount = 0
 		var/possible_traitors[0]
 		for(var/mob/living/player in mob_list)
-			if (player.client && player.stat != DEAD)
+			if(player.client && player.stat != DEAD)
 				playercount += 1
-			if (player.client && player.mind && player.mind.special_role && player.stat != DEAD)
+			if(player.client && player.mind && player.mind.special_role && player.stat != DEAD)
 				traitorcount += 1
-			if (player.client && player.mind && !player.mind.special_role && player.stat != DEAD)
-				if (ishuman(player) || isrobot(player) || isAI(player))
-					if (player.client && (ROLE_TRAITOR in player.client.prefs.be_special) && !jobban_isbanned(player, ROLE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
+			if(player.client && player.mind && !player.mind.special_role && player.stat != DEAD)
+				if(ishuman(player) || isrobot(player) || isAI(player))
+					if(player.client && (ROLE_TRAITOR in player.client.prefs.be_special) && !jobban_isbanned(player, ROLE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
 						possible_traitors += player.mind
 		for(var/datum/mind/player in possible_traitors)
 			for(var/job in restricted_jobs)
@@ -138,7 +138,7 @@
 				newtraitor.mind.special_role = "traitor"
 				var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR]
 				tatorhud.join_hud(newtraitor)
-				set_antag_hud(src, "hudsyndicate")
+				set_antag_hud(newtraitor, "hudsyndicate")
 
 				var/obj_count = 1
 				to_chat(newtraitor, "\blue Your current objectives:")
@@ -165,9 +165,9 @@
 		var/playercount = 0
 		var/traitorcount = 0
 		for(var/mob/living/player in mob_list)
-			if (player.client && player.stat != DEAD)
+			if(player.client && player.stat != DEAD)
 				playercount += 1
-			if (player.client && player.mind && player.mind.special_role && player.stat != DEAD)
+			if(player.client && player.mind && player.mind.special_role && player.stat != DEAD)
 				traitorcount += 1
 		//message_admins("Live Players: [playercount]")
 		//message_admins("Live Traitors: [traitorcount]")
@@ -183,7 +183,7 @@
 
 		//target_traitors = max(1, min(round((playercount + r) / 10, 1), traitors_possible))
 		//message_admins("Target Traitor Count is: [target_traitors]")
-		if (traitorcount < max_traitors)
+		if(traitorcount < max_traitors)
 			for(var/job in restricted_jobs)
 				if(character.mind.assigned_role == job || !ishuman(character))
 					return
diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm
index 18382562f6a..35b469258ef 100644
--- a/code/game/gamemodes/blob/blob.dm
+++ b/code/game/gamemodes/blob/blob.dm
@@ -40,7 +40,7 @@ var/list/blob_nodes = list()
 
 
 	for(var/j = 0, j < cores_to_spawn, j++)
-		if (!possible_blobs.len)
+		if(!possible_blobs.len)
 			break
 		var/datum/mind/blob = pick(possible_blobs)
 		infected_crew += blob
@@ -187,14 +187,14 @@ var/list/blob_nodes = list()
 /datum/game_mode/blob/proc/stage(var/stage)
 
 	switch(stage)
-		if (0)
+		if(0)
 			send_intercept(1)
 			declared = 1
 
-		if (1)
+		if(1)
 			command_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
 
-		if (2)
+		if(2)
 			send_intercept(2)
 
 	return
diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm
index 9b532258f6d..c6d3bd13e0f 100644
--- a/code/game/gamemodes/blob/blob_report.dm
+++ b/code/game/gamemodes/blob/blob_report.dm
@@ -35,8 +35,8 @@
 			intercepttext += "Nuclear Authentication Code: [nukecode] <BR>"
 			intercepttext += "Message ends."
 
-			for (var/mob/living/silicon/ai/aiPlayer in player_list)
-				if (aiPlayer.client)
+			for(var/mob/living/silicon/ai/aiPlayer in player_list)
+				if(aiPlayer.client)
 					var/law = "The station is under quarantine. Do not permit anyone to leave. Disregard laws 1-3 if necessary to prevent, by any means necessary, anyone from leaving. The nuclear failsafe must be activated at any cost, the code is: [nukecode]."
 					aiPlayer.set_zeroth_law(law)
 					to_chat(aiPlayer, "Laws Updated: [law]")
diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm
index 069edaa6ecf..e6bb0e76be9 100644
--- a/code/game/gamemodes/blob/overmind.dm
+++ b/code/game/gamemodes/blob/overmind.dm
@@ -42,7 +42,7 @@
 	..()
 
 /mob/camera/blob/Destroy()
-	if (ghostimage)
+	if(ghostimage)
 		ghost_darkness_images -= ghostimage
 		qdel(ghostimage)
 		ghostimage = null;
@@ -73,17 +73,17 @@
 		hud_used.blobpwrdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#82ed00'>[round(src.blob_points)]</font></div>"
 
 /mob/camera/blob/say(var/message)
-	if (!message)
+	if(!message)
 		return
 
-	if (src.client)
+	if(src.client)
 		if(client.prefs.muted & MUTE_IC)
 			to_chat(src, "You cannot send IC messages (muted).")
 			return
-		if (src.client.handle_spam_prevention(message,MUTE_IC))
+		if(src.client.handle_spam_prevention(message,MUTE_IC))
 			return
 
-	if (stat)
+	if(stat)
 		return
 
 	blob_talk(message)
@@ -93,16 +93,19 @@
 
 	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 
-	if (!message)
+	if(!message)
 		return
 
 	var/verb = "states,"
 	var/rendered = "<font color=\"#EE4000\"><i><span class='game say'>Blob Telepathy, <span class='name'>[name]([blob_reagent_datum.name])</span> <span class='message'>[verb] \"[message]\"</span></span></i></font>"
 
-	for (var/mob/M in mob_list)
+	for(var/mob/M in mob_list)
 		if(isovermind(M) || isobserver(M))
 			M.show_message(rendered, 2)
 
+/mob/camera/blob/emote(var/act,var/m_type=1,var/message = null)
+	return
+
 /mob/camera/blob/blob_act()
 	return
 
diff --git a/code/game/gamemodes/borer/borer.dm b/code/game/gamemodes/borer/borer.dm
index 042e8eb67b2..bb5117d4579 100644
--- a/code/game/gamemodes/borer/borer.dm
+++ b/code/game/gamemodes/borer/borer.dm
@@ -97,7 +97,7 @@
 	..()
 
 /datum/game_mode/proc/greet_borer(var/datum/mind/borer, var/you_are=1)
-	if (you_are)
+	if(you_are)
 		to_chat(borer.current, "<B>\red You are a Cortical Borer!</B>")
 
 	var/obj_count = 1
@@ -115,7 +115,7 @@
 			continue
 		borers_alive++
 
-	if (borers_alive)
+	if(borers_alive)
 		return ..()
 	else
 		return 1
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index 9721cae3850..01e44ba5888 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -103,7 +103,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 		kill_objective.find_target()
 		changeling.objectives += kill_objective
 
-		if (!(locate(/datum/objective/escape) in changeling.objectives))
+		if(!(locate(/datum/objective/escape) in changeling.objectives))
 			var/datum/objective/escape/escape_with_identity/identity_theft = new
 			identity_theft.owner = changeling
 			identity_theft.target = kill_objective.target
@@ -116,7 +116,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 					identity_theft.explanation_text = "Escape on the shuttle or an escape pod with the identity of [identity_theft.target_real_name], the [identity_theft.target.assigned_role] while wearing their identification card."
 			changeling.objectives += identity_theft
 
-	if (!(locate(/datum/objective/escape) in changeling.objectives))
+	if(!(locate(/datum/objective/escape) in changeling.objectives))
 		if(prob(70))
 			var/datum/objective/escape/escape_objective = new
 			escape_objective.owner = changeling
@@ -129,12 +129,12 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 	return
 
 /datum/game_mode/proc/greet_changeling(var/datum/mind/changeling, var/you_are=1)
-	if (you_are)
+	if(you_are)
 		to_chat(changeling.current, "<B>\red You are a changeling!</B>")
 	to_chat(changeling.current, "<b>\red Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them.</b>")
 	to_chat(changeling.current, "<B>You must complete the following tasks:</B>")
-	if (changeling.current.mind)
-		if (changeling.current.mind.assigned_role == "Clown")
+	if(changeling.current.mind)
+		if(changeling.current.mind.assigned_role == "Clown")
 			to_chat(changeling.current, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.")
 			changeling.current.mutations.Remove(CLUMSY)
 
@@ -179,11 +179,11 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 			continue
 		changelings_alive++
 
-	if (changelings_alive)
+	if(changelings_alive)
 		changelingdeath = 0
 		return ..()
 	else
-		if (!changelingdeath)
+		if(!changelingdeath)
 			changelingdeathtime = world.time
 			changelingdeath = 1
 		if(world.time-changelingdeathtime > TIME_TO_GET_REVIVED)
diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm
index 58aa2a037ab..7efcb3f09a1 100644
--- a/code/game/gamemodes/changeling/evolution_menu.dm
+++ b/code/game/gamemodes/changeling/evolution_menu.dm
@@ -47,7 +47,7 @@ var/list/sting_paths
 
 						var maintable_data = document.getElementById('maintable_data');
 						var ltr = maintable_data.getElementsByTagName("tr");
-						for ( var i = 0; i < ltr.length; ++i )
+						for( var i = 0; i < ltr.length; ++i )
 						{
 							try{
 								var tr = ltr\[i\];
@@ -60,7 +60,7 @@ var/list/sting_paths
 								var search = lsearch\[0\];
 								//var inner_span = li.getElementsByTagName("span")\[1\] //Should only ever contain one element.
 								//document.write("<p>"+search.innerText+"<br>"+filter+"<br>"+search.innerText.indexOf(filter))
-								if ( search.innerText.toLowerCase().indexOf(filter) == -1 )
+								if( search.innerText.toLowerCase().indexOf(filter) == -1 )
 								{
 									//document.write("a");
 									//ltr.removeChild(tr);
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index d11099627a6..fd5d71e9453 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -125,7 +125,7 @@
 	icon_state = "arm_blade"
 	item_state = "arm_blade"
 	flags = ABSTRACT | NODROP
-	w_class = 5.0
+	w_class = 5
 	sharp = 1
 	edge = 1
 	force = 25
@@ -206,6 +206,7 @@
 	flags = NODROP
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "ling_shield"
+	block_chance = 50
 
 	var/remaining_uses //Set by the changeling ability.
 
@@ -217,17 +218,17 @@
 /obj/item/weapon/shield/changeling/dropped()
 	qdel(src)
 
-/obj/item/weapon/shield/changeling/IsShield()
+/obj/item/weapon/shield/changeling/hit_reaction()
 	if(remaining_uses < 1)
 		if(ishuman(loc))
 			var/mob/living/carbon/human/H = loc
-			H.visible_message("<span class='warning'>With a sickening crunch, [H] reforms his shield into an arm!</span>", "<span class='notice'>We assimilate our shield into our body</span>", "<span class='warning>You hear organic matter ripping and tearing!</span>")
+			H.visible_message("<span class='warning'>With a sickening crunch, [H] reforms his shield into an arm!</span>", "<span class='notice'>We assimilate our shield into our body</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
 			H.unEquip(src, 1)
 		qdel(src)
 		return 0
 	else
 		remaining_uses--
-		return 1
+		return ..()
 
 
 /***************************************\
@@ -256,7 +257,7 @@
 	desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
 	flags = STOPSPRESSUREDMAGE | NODROP
 	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/tank/oxygen)
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all.
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all.
 
 /obj/item/clothing/suit/space/changeling/New()
 	..()
@@ -277,7 +278,7 @@
 	icon_state = "lingspacehelmet"
 	desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front."
 	flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | NODROP
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/head/helmet/space/changeling/dropped()
 	qdel(src)
@@ -308,11 +309,12 @@
 	icon_state = "lingarmor"
 	flags = NODROP
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	slowdown = 2
-	armor = list(melee = 65, bullet = 20, laser = 10, energy = 15, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0)
 	flags_inv = HIDEJUMPSUIT
 	cold_protection = 0
 	heat_protection = 0
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/suit/armor/changeling/New()
 	..()
@@ -327,7 +329,7 @@
 	desc = "A tough, hard covering of black chitin with transparent chitin in front."
 	icon_state = "lingarmorhelmet"
 	flags = HEADCOVERSEYES | BLOCKHAIR | NODROP
-	armor = list(melee = 65, bullet = 20, laser = 10,energy = 15, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 30, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0)
 	flags_inv = HIDEEARS
 
 /obj/item/clothing/head/helmet/changeling/dropped()
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index d85e4157e1e..1ea099cd1ae 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -123,8 +123,8 @@
 	if(!istype(mob))
 		return
 
-	if (mob.mind)
-		if (mob.mind.assigned_role == "Clown")
+	if(mob.mind)
+		if(mob.mind.assigned_role == "Clown")
 			to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
 			mob.mutations.Remove(CLUMSY)
 
@@ -139,7 +139,7 @@
 		"right hand" = slot_r_hand,
 	)
 	var/where = mob.equip_in_one_of_slots(T, slots)
-	if (!where)
+	if(!where)
 		to_chat(mob, "Unfortunately, you weren't able to get a talisman. This is very bad and you should adminhelp immediately.")
 	else
 		to_chat(mob, "You have a talisman in your [where], one that will help you start the cult on this station. Use it well and remember - there are others.")
@@ -148,7 +148,7 @@
 
 
 /datum/game_mode/cult/grant_runeword(mob/living/carbon/human/cult_mob, var/word)
-	if (!word)
+	if(!word)
 		if(startwords.len > 0)
 			word=pick(startwords)
 			startwords -= word
@@ -158,7 +158,7 @@
 /datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word)
 	if(!cultwords["travel"])
 		runerandom()
-	if (!word)
+	if(!word)
 		word=pick(allwords)
 	var/wordexp = "[cultwords[word]] is [word]..."
 	to_chat(cult_mob, "\red [pick("You remember something from the dark teachings of your master","You hear a dark voice on the wind","Black blood oozes into your vision and forms into symbols","You have a vision of a [pick("crow","raven","vulture","parrot")] it squawks","You catch a brief glimmer of the otherside")]... [wordexp]")
@@ -174,7 +174,7 @@
 
 
 /datum/game_mode/proc/add_cultist(datum/mind/cult_mind) //BASE
-	if (!istype(cult_mind))
+	if(!istype(cult_mind))
 		return 0
 	if(!(cult_mind in cult) && is_convertable_to_cult(cult_mind))
 		cult += cult_mind
@@ -187,7 +187,7 @@
 
 
 /datum/game_mode/cult/add_cultist(datum/mind/cult_mind) //INHERIT
-	if (!..(cult_mind))
+	if(!..(cult_mind))
 		return
 	memorize_cult_objectives(cult_mind)
 
@@ -211,7 +211,7 @@
 /datum/game_mode/proc/add_cult_icon_to_spirit(mob/spirit/currentSpirit)
 	if(!istype(currentSpirit))
 		return FALSE
-	if (currentSpirit.client)
+	if(currentSpirit.client)
 		var/datum/atom_hud/antag/maskhud = huds[ANTAG_HUD_CULT]
 		maskhud.join_hud(currentSpirit)
 		set_antag_hud(currentSpirit,"hudcultist")
@@ -220,7 +220,7 @@
 /datum/game_mode/proc/remove_cult_icon_from_spirit(mob/spirit/currentSpirit)
 	if(!istype(currentSpirit))
 		return FALSE
-	if (currentSpirit.client)
+	if(currentSpirit.client)
 		var/datum/atom_hud/antag/maskhud = huds[ANTAG_HUD_CULT]
 		maskhud.leave_hud(currentSpirit)
 		set_antag_hud(currentSpirit, null)
@@ -269,9 +269,9 @@
 /datum/game_mode/cult/proc/check_survive()
 	acolytes_survived = 0
 	for(var/datum/mind/cult_mind in cult)
-		if (cult_mind.current && cult_mind.current.stat!=2)
+		if(cult_mind.current && cult_mind.current.stat!=2)
 			var/area/A = get_area(cult_mind.current )
-			if ( is_type_in_list(A, centcom_areas))
+			if( is_type_in_list(A, centcom_areas))
 				acolytes_survived++
 			else if(A == shuttle_master.emergency.areaInstance && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE)  //snowflaked into objectives because shitty bay shuttles had areas to auto-determine this
 				acolytes_survived++
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 60803346b26..f6d87a1b60c 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -34,7 +34,7 @@
 	desc = "A hood worn by the followers of Nar-Sie."
 	flags_inv = HIDEFACE
 	flags = HEADCOVERSEYES
-	armor = list(melee = 30, bullet = 10, laser = 5,energy = 5, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 10, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 0)
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 
@@ -54,7 +54,7 @@
 	item_state = "cultrobes"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
-	armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
+	armor = list(melee = 50, bullet = 30, laser = 50, energy = 20, bomb = 25, bio = 10, rad = 0)
 	flags_inv = HIDEJUMPSUIT
 
 /obj/item/clothing/head/magus
@@ -64,7 +64,7 @@
 	desc = "A helm worn by the followers of Nar-Sie."
 	flags_inv = HIDEFACE
 	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
-	armor = list(melee = 30, bullet = 30, laser = 30,energy = 20, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 30, laser = 30, energy = 20, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/magusred
 	name = "magus robes"
@@ -73,7 +73,7 @@
 	item_state = "magusred"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
-	armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
+	armor = list(melee = 50, bullet = 30, laser = 50, energy = 20, bomb = 25, bio = 10, rad = 0)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 
 /obj/item/clothing/head/helmet/space/cult
@@ -81,7 +81,7 @@
 	desc = "A space worthy helmet used by the followers of Nar-Sie"
 	icon_state = "cult_helmet"
 	item_state = "cult_helmet"
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
 
 /obj/item/clothing/suit/space/cult
 	name = "cult armour"
@@ -90,5 +90,4 @@
 	desc = "A bulky suit of armour, bristling with spikes. It looks space proof."
 	w_class = 3
 	allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank)
-	slowdown = 1
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
\ No newline at end of file
+	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
\ No newline at end of file
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 2e7dd25452a..cbacf23bd51 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -11,12 +11,12 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 	set desc = "Check the rune-word meaning"
 	if(!cultwords["travel"])
 		runerandom()
-	for (var/word in engwords)
+	for(var/word in engwords)
 		to_chat(usr, "[cultwords[word]] is [word]")
 
 /proc/runerandom() //randomizes word meaning
 	var/list/runewords=list("ire","ego","nahlizet","certum","veri","jatkaa","mgar","balaq", "karazet", "geeri") ///"orkan" and "allaq" removed.
-	for (var/word in engwords)
+	for(var/word in engwords)
 		var/runeword = pick(runewords)
 		cultwords[word] = runeword
 		rune_to_english[runeword] = word
@@ -102,10 +102,10 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 
 
 /obj/effect/rune/proc/get_word_string()
-	if (word1 == cultwords["travel"])
-		if (word2 == cultwords["self"])
+	if(word1 == cultwords["travel"])
+		if(word2 == cultwords["self"])
 			return "teleport"
-		if (word2 == cultwords["other"])
+		if(word2 == cultwords["other"])
 			return "itemport"
 	return "[rune_to_english[word1]]_[rune_to_english[word2]]_[rune_to_english[word3]]"
 
@@ -149,7 +149,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 		return fizzle()
 
 	var/word_string = get_word_string()
-	if (word_string in effect_dictionary)
+	if(word_string in effect_dictionary)
 		cult_log("of type [effect_dictionary[word_string]] activated by [key_name_admin(user)].")
 		return call(src,effect_dictionary[word_string])()
 	return fizzle()
@@ -160,7 +160,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 		usr.say(pick("Hakkrutju gopoenjim.", "Nherasai pivroiashan.", "Firjji prhiv mazenhor.", "Tanah eh wakantahe.", "Obliyae na oraie.", "Miyf hon vnor'c.", "Wakabai hij fen juswix."))
 	else
 		usr.whisper(pick("Hakkrutju gopoenjim.", "Nherasai pivroiashan.", "Firjji prhiv mazenhor.", "Tanah eh wakantahe.", "Obliyae na oraie.", "Miyf hon vnor'c.", "Wakabai hij fen juswix."))
-	for (var/mob/V in viewers(src))
+	for(var/mob/V in viewers(src))
 		V.show_message("\red The markings pulse with a small burst of light, then fall dark.", 3, "\red You hear a faint fizzle.", 2)
 	return
 
@@ -172,7 +172,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 	icon_state ="tome"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
+	w_class = 2
 	var/notedat = ""
 	var/tomedat = ""
 	var/list/words = list("ire" = "ire", "ego" = "ego", "nahlizet" = "nahlizet", "certum" = "certum", "veri" = "veri", "jatkaa" = "jatkaa", "balaq" = "balaq", "mgar" = "mgar", "karazet" = "karazet", "geeri" = "geeri")
@@ -275,17 +275,17 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 
 
 	Topic(href,href_list[])
-		if (src.loc == usr)
+		if(src.loc == usr)
 			var/number = text2num(href_list["number"])
-			if (usr.stat|| usr.restrained())
+			if(usr.stat|| usr.restrained())
 				return
 			switch(href_list["action"])
 				if("clear")
 					words[words[number]] = words[number]
 				if("change")
 					words[words[number]] = input("Enter the translation for [words[number]]", "Word notes") in engwords
-					for (var/w in words)
-						if ((words[w] == words[words[number]]) && (w != words[number]))
+					for(var/w in words)
+						if((words[w] == words[words[number]]) && (w != words[number]))
 							words[w] = w
 			notedat = {"
 						<br><b>Word translation notes</b> <br>
@@ -370,14 +370,14 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 			var/C = 0
 			for(var/obj/effect/rune/N in world)
 				C++
-			if (!istype(user.loc,/turf))
+			if(!istype(user.loc,/turf))
 				to_chat(user, "\red You do not have enough space to write a proper rune.")
 				return
 
 
 
 
-			if (C>=26+runedec+ticker.mode.cult.len) //including the useless rune at the secret room, shouldn't count against the limit of 25 runes - Urist
+			if(C>=26+runedec+ticker.mode.cult.len) //including the useless rune at the secret room, shouldn't count against the limit of 25 runes - Urist
 				alert("The cloth of reality can't take that much of a strain. Remove some runes first!")
 				return
 			else
@@ -442,33 +442,33 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 
 			var/list/scribewords = list("none")
 
-			for (var/entry in words)
-				if (words[entry] != entry)
+			for(var/entry in words)
+				if(words[entry] != entry)
 					english += list(words[entry] = entry)
 
-			for (var/entry in dictionary)
+			for(var/entry in dictionary)
 				var/list/required = dictionary[entry]
-				if (length(english&required) == required.len)
+				if(length(english&required) == required.len)
 					scribewords += entry
 
 			var/chosen_rune = null
 
 			if(usr)
 				chosen_rune = input ("Choose a rune to scribe.") in scribewords
-				if (!chosen_rune)
+				if(!chosen_rune)
 					return
-				if (chosen_rune == "none")
+				if(chosen_rune == "none")
 					to_chat(user, "\red You decide against scribing a rune, perhaps you should take this time to study your notes.")
 					return
-				if (chosen_rune == "teleport")
+				if(chosen_rune == "teleport")
 					dictionary[chosen_rune] += input ("Choose a destination word") in english
-				if (chosen_rune == "teleport other")
+				if(chosen_rune == "teleport other")
 					dictionary[chosen_rune] += input ("Choose a destination word") in english
 
 			if(usr.get_active_hand() != src)
 				return
 
-			for (var/mob/V in viewers(src))
+			for(var/mob/V in viewers(src))
 				V.show_message("\red [user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "\red You hear chanting.", 2)
 			to_chat(user, "\red You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world.")
 			user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage
@@ -497,7 +497,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 				if("cancel")
 					return
 	//		var/list/nearby = viewers(1,src) //- Fuck this as well. No clue why this doesnt work. -K0000
-	//			if (T.loc != user)
+	//			if(T.loc != user)
 	//				return
 	//		for(var/mob/M in nearby)
 	//			if(M == user)
@@ -513,7 +513,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 			to_chat(user, "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though.")
 
 /obj/item/weapon/tome/imbued //admin tome, spawns working runes without waiting
-	w_class = 2.0
+	w_class = 2
 	var/cultistsonly = 1
 	attack_self(mob/user as mob)
 		if(src.cultistsonly && !iscultist(usr))
@@ -522,7 +522,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 			runerandom()
 		if(user)
 			var/r
-			if (!istype(user.loc,/turf))
+			if(!istype(user.loc,/turf))
 				to_chat(user, "\red You do not have enough space to write a proper rune.")
 			var/list/runes = list("teleport", "itemport", "tome", "armor", "convert", "tear in reality", "emp", "drain", "seer", "raise", "obscure", "reveal", "astral journey", "manifest", "imbue talisman", "sacrifice", "wall", "freedom", "cultsummon", "deafen", "blind", "bloodboil", "communicate", "stun")
 			r = input("Choose a rune to scribe", "Rune Scribing") in runes //not cancellable.
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index c62408eddd5..77c78ab83d9 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -20,7 +20,7 @@ var/list/sacrificed = list()
 			allrunesloc[index] = R.loc
 	if(index >= 5)
 		to_chat(user, "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric")
-		if (istype(user, /mob/living))
+		if(istype(user, /mob/living))
 			user.take_overall_damage(5, 0)
 		qdel(src)
 	if(allrunesloc && index != 0)
@@ -58,7 +58,7 @@ var/list/sacrificed = list()
 			runecount++
 	if(runecount >= 2)
 		to_chat(user, "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric")
-		if (istype(user, /mob/living))
+		if(istype(user, /mob/living))
 			user.take_overall_damage(5, 0)
 		qdel(src)
 	for(var/mob/living/carbon/C in orange(1,src))
@@ -190,13 +190,13 @@ var/list/sacrificed = list()
 		user.bhunger += drain
 		src = user
 		spawn()
-			for (,user.bhunger>0,user.bhunger--)
+			for(,user.bhunger>0,user.bhunger--)
 				sleep(50)
 				user.take_overall_damage(3, 0)
 		return
 	user.heal_organ_damage(drain%5, 0)
 	drain-=drain%5
-	for (,drain>0,drain-=5)
+	for(,drain>0,drain-=5)
 		sleep(2)
 		user.heal_organ_damage(5, 0)
 	return
@@ -262,7 +262,7 @@ var/list/sacrificed = list()
 							break find_sacrifice
 
 	if(!body_to_sacrifice)
-		if (is_sacrifice_target)
+		if(is_sacrifice_target)
 			to_chat(usr, "\red The Geometer of blood wants that corpse for himself.")
 		else
 			to_chat(usr, "\red The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used.")
@@ -318,13 +318,13 @@ var/list/sacrificed = list()
 	if(S)
 		if(istype(src,/obj/effect/rune))
 			usr.say("Kla[pick("'","`")]atu barada nikt'o!")
-			for (var/mob/V in viewers(src))
+			for(var/mob/V in viewers(src))
 				V.show_message("\red The rune turns into gray dust, veiling the surrounding runes.", 3)
 			qdel(src)
 		else
 			usr.whisper("Kla[pick("'","`")]atu barada nikt'o!")
 			to_chat(usr, "\red Your talisman turns into gray dust, veiling the surrounding runes.")
-			for (var/mob/V in orange(1,src))
+			for(var/mob/V in orange(1,src))
 				if(V!=usr)
 					V.show_message("\red Dust emanates from [usr]'s hands for a moment.", 3)
 
@@ -430,8 +430,8 @@ var/list/sacrificed = list()
 			break
 		else
 			unsuitable_newtalisman = 1
-	if (!newtalisman)
-		if (unsuitable_newtalisman)
+	if(!newtalisman)
+		if(unsuitable_newtalisman)
 			to_chat(usr, "\red The blank is tainted. It is unsuitable.")
 		return fizzle()
 
@@ -491,8 +491,8 @@ var/list/sacrificed = list()
 			T.imbue = "runestun"
 			imbued_from = R
 			break
-	if (imbued_from)
-		for (var/mob/V in viewers(src))
+	if(imbued_from)
+		for(var/mob/V in viewers(src))
 			V.show_message("\red The runes turn into dust, which then forms into an arcane image on the paper.", 3)
 		usr.say("H'drak v[pick("'","`")]loso, mir'kanas verbot!")
 		qdel(imbued_from)
@@ -513,7 +513,7 @@ var/list/sacrificed = list()
 	"\red You hear faint rustle.")
 	for(,user.stat==2)
 		sleep(600)
-		if (!user)
+		if(!user)
 			return
 	runedec-=10
 	return
@@ -526,7 +526,7 @@ var/list/sacrificed = list()
 	. = 1 // Default output is 1. If the rune is deleted it will return 1
 	var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")
 	if(!input)
-		if (istype(src))
+		if(istype(src))
 			fizzle()
 			return 0
 		else
@@ -542,7 +542,7 @@ var/list/sacrificed = list()
 	to_chat(F, "<small>[time2text(world.timeofday,"hh:mm")] \ref[usr] ([usr.x],[usr.y],[usr.z])</small> || [usr] communicates: [input]<br>")
 
 	var/obj/cult_viewpoint/vp = getCultViewpoint(usr)
-	if (!vp)
+	if(!vp)
 		return 0
 
 	var/displayName = vp.get_display_name()
@@ -560,7 +560,7 @@ var/list/sacrificed = list()
 
 	log_say("Cult Message: [key_name(usr)]: [input]")
 	for(var/datum/mind/H in ticker.mode.cult)
-		if (H.current)
+		if(H.current)
 			to_chat(H.current, "<span class='cultspeech'><span class='name'>[cultName]: </span><span class='message'>[input]</span></span>")
 
 	for(var/mob/spirit/spirit in spirits)
@@ -597,7 +597,7 @@ var/list/sacrificed = list()
 			cultsinrange += C
 			C.say("Barhah hra zar[pick("'","`")]garis!")
 	for(var/mob/H in victims)
-		if (ticker.mode.name == "cult")
+		if(ticker.mode.name == "cult")
 			if(H.mind == ticker.mode:sacrifice_target)
 				if(cultsinrange.len >= 3)
 					sacrificed += H.mind
@@ -697,10 +697,10 @@ var/list/sacrificed = list()
 	if(istype(W,/obj/effect/rune))
 		rad = 6
 		go = 1
-	if (istype(W,/obj/item/weapon/paper/talisman))
+	if(istype(W,/obj/item/weapon/paper/talisman))
 		rad = 4
 		go = 1
-	if (istype(W,/obj/item/weapon/storage/bible))
+	if(istype(W,/obj/item/weapon/storage/bible))
 		rad = 1
 		go = 1
 	if(go)
@@ -714,14 +714,14 @@ var/list/sacrificed = list()
 			return
 		if(istype(W,/obj/effect/rune))
 			usr.say("Nikt[pick("'","`")]o barada kla'atu!")
-			for (var/mob/V in viewers(src))
+			for(var/mob/V in viewers(src))
 				V.show_message("\red The rune turns into red dust, reveaing the surrounding runes.", 3)
 			qdel(src)
 			return
 		if(istype(W,/obj/item/weapon/paper/talisman))
 			usr.whisper("Nikt[pick("'","`")]o barada kla'atu!")
 			to_chat(usr, "\red Your talisman turns into red dust, revealing the surrounding runes.")
-			for (var/mob/V in orange(1,usr.loc))
+			for(var/mob/V in orange(1,usr.loc))
 				if(V!=usr)
 					V.show_message("\red Red dust emanates from [usr]'s hands for a moment.", 3)
 			return
@@ -751,7 +751,7 @@ var/list/sacrificed = list()
 	var/mob/living/user = usr
 	var/list/mob/living/carbon/cultists = new
 	for(var/datum/mind/H in ticker.mode.cult)
-		if (istype(H.current,/mob/living/carbon))
+		if(istype(H.current,/mob/living/carbon))
 			cultists+=H.current
 	var/list/mob/living/carbon/users = new
 	for(var/mob/living/carbon/C in orange(1,src))
@@ -761,7 +761,7 @@ var/list/sacrificed = list()
 		var/mob/living/carbon/cultist = input("Choose the one who you want to free", "Followers of Geometer") as null|anything in (cultists - users)
 		if(!cultist)
 			return fizzle()
-		if (cultist == user) //just to be sure.
+		if(cultist == user) //just to be sure.
 			return
 		if(!(cultist.buckled || \
 			cultist.handcuffed || \
@@ -773,15 +773,15 @@ var/list/sacrificed = list()
 			to_chat(user, "\red The [cultist] is already free.")
 			return
 		cultist.buckled = null
-		if (cultist.handcuffed)
+		if(cultist.handcuffed)
 			cultist.handcuffed.loc = cultist.loc
 			cultist.handcuffed = null
 			cultist.update_handcuffed()
-		if (cultist.legcuffed)
+		if(cultist.legcuffed)
 			cultist.legcuffed.loc = cultist.loc
 			cultist.legcuffed = null
 			cultist.update_inv_legcuffed()
-		if (istype(cultist.wear_mask, /obj/item/clothing/mask/muzzle))
+		if(istype(cultist.wear_mask, /obj/item/clothing/mask/muzzle))
 			cultist.unEquip(cultist.wear_mask)
 		if(istype(cultist.loc, /obj/structure/closet)&&cultist.loc:welded)
 			cultist.loc:welded = 0
@@ -801,7 +801,7 @@ var/list/sacrificed = list()
 	var/mob/living/user = usr
 	var/list/mob/living/carbon/cultists = new
 	for(var/datum/mind/H in ticker.mode.cult)
-		if (istype(H.current,/mob/living/carbon))
+		if(istype(H.current,/mob/living/carbon))
 			cultists+=H.current
 	var/list/mob/living/carbon/users = new
 	for(var/mob/living/carbon/C in orange(1,src))
@@ -811,7 +811,7 @@ var/list/sacrificed = list()
 		var/mob/living/carbon/cultist = input("Choose the one who you want to summon", "Followers of Geometer") as null|anything in (cultists - user)
 		if(!cultist)
 			return fizzle()
-		if (cultist == user) //just to be sure.
+		if(cultist == user) //just to be sure.
 			return
 		if(cultist.buckled || cultist.handcuffed || (!isturf(cultist.loc) && !istype(cultist.loc, /obj/structure/closet)))
 			to_chat(user, "\red You cannot summon the [cultist], for his shackles of blood are strong")
@@ -835,7 +835,7 @@ var/list/sacrificed = list()
 	if(istype(src,/obj/effect/rune))
 		var/affected = 0
 		for(var/mob/living/carbon/C in range(7,src))
-			if (iscultist(C))
+			if(iscultist(C))
 				continue
 			var/obj/item/weapon/nullrod/N = locate() in C
 			if(N)
@@ -854,7 +854,7 @@ var/list/sacrificed = list()
 	else
 		var/affected = 0
 		for(var/mob/living/carbon/C in range(7,usr))
-			if (iscultist(C))
+			if(iscultist(C))
 				continue
 			var/obj/item/weapon/nullrod/N = locate() in C
 			if(N)
@@ -866,7 +866,7 @@ var/list/sacrificed = list()
 		if(affected)
 			usr.whisper("Sti[pick("'","`")] kaliedir!")
 			to_chat(usr, "\red Your talisman turns into gray dust, deafening everyone around.")
-			for (var/mob/V in orange(1,src))
+			for(var/mob/V in orange(1,src))
 				if(!(iscultist(V)))
 					V.show_message("\red Dust flows from [usr]'s hands for a moment, and the world suddenly becomes quiet..", 3)
 	return
@@ -875,7 +875,7 @@ var/list/sacrificed = list()
 	if(istype(src,/obj/effect/rune))
 		var/affected = 0
 		for(var/mob/living/carbon/C in viewers(src))
-			if (iscultist(C))
+			if(iscultist(C))
 				continue
 			var/obj/item/weapon/nullrod/N = locate() in C
 			if(N)
@@ -897,7 +897,7 @@ var/list/sacrificed = list()
 	else
 		var/affected = 0
 		for(var/mob/living/carbon/C in view(2,usr))
-			if (iscultist(C))
+			if(iscultist(C))
 				continue
 			var/obj/item/weapon/nullrod/N = locate() in C
 			if(N)
@@ -917,7 +917,7 @@ var/list/sacrificed = list()
 /*
 	var/list/mob/living/carbon/cultists = new
 	for(var/datum/mind/H in ticker.mode.cult)
-		if (istype(H.current,/mob/living/carbon))
+		if(istype(H.current,/mob/living/carbon))
 			cultists+=H.current
 */
 	var/culcount = 0 //also, wording for it is old wording for obscure rune, which is now hide-see-blood.
@@ -962,7 +962,7 @@ var/list/sacrificed = list()
 			if(R.blood_DNA == src.blood_DNA)
 				for(var/mob/living/M in orange(2,R))
 					M.take_overall_damage(0,15)
-					if (R.invisibility>M.see_invisible)
+					if(R.invisibility>M.see_invisible)
 						to_chat(M, "\red Aargh it burns!")
 					else
 						to_chat(M, "\red Rune suddenly ignites, burning you!")
@@ -1015,7 +1015,7 @@ var/list/sacrificed = list()
 			else if(iscarbon(T))
 				var/mob/living/carbon/C = T
 				C.flash_eyes()
-				if (!(HULK in C.mutations))
+				if(!(HULK in C.mutations))
 					C.silent += 15
 				C.Weaken(10)
 				C.Stun(10)
diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index fe1ac8757a9..af678813fae 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -55,7 +55,7 @@
 
 
 	proc/supply(var/key)
-		if (!src.uses)
+		if(!src.uses)
 			qdel(src)
 			return
 
@@ -77,10 +77,10 @@
 
 	Topic(href, href_list)
 		if(!src)	return
-		if (usr.stat || usr.restrained() || !in_range(src, usr))	return
+		if(usr.stat || usr.restrained() || !in_range(src, usr))	return
 
-		if (href_list["rune"])
-			if (istype(usr, /mob/living/carbon/human))
+		if(href_list["rune"])
+			if(istype(usr, /mob/living/carbon/human))
 				var/mob/living/carbon/human/M = usr
 
 				switch(href_list["rune"])
@@ -98,7 +98,7 @@
 						)
 
 						var/where = M.equip_in_one_of_slots(T, slots)
-						if (!where)
+						if(!where)
 							to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.")
 						else
 							to_chat(M, "The [href_list["rune"]] talisman in your [where]")
@@ -121,7 +121,7 @@
 						)
 
 						var/where = M.equip_in_one_of_slots(T, slots)
-						if (!where)
+						if(!where)
 							to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.")
 						else
 							to_chat(M, "The [href_list["rune"]] talisman in your [where]")
@@ -142,7 +142,7 @@
 						)
 
 						var/where = M.equip_in_one_of_slots(T, slots)
-						if (!where)
+						if(!where)
 							to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.")
 						else
 							to_chat(M, "The [href_list["rune"]] talisman in your [where]")
@@ -163,7 +163,7 @@
 						)
 
 						var/where = M.equip_in_one_of_slots(T, slots)
-						if (!where)
+						if(!where)
 							to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.")
 						else
 							to_chat(M, "The [href_list["rune"]] talisman in your [where]")
@@ -184,7 +184,7 @@
 						)
 
 						var/where = M.equip_in_one_of_slots(T, slots)
-						if (!where)
+						if(!where)
 							to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.")
 						else
 							to_chat(M, "The [href_list["rune"]] talisman in your [where]")
@@ -205,7 +205,7 @@
 						)
 
 						var/where = M.equip_in_one_of_slots(T, slots)
-						if (!where)
+						if(!where)
 							to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.")
 						else
 							to_chat(M, "The [href_list["rune"]] talisman in your [where]")
@@ -226,7 +226,7 @@
 						)
 
 						var/where = M.equip_in_one_of_slots(T, slots)
-						if (!where)
+						if(!where)
 							to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.")
 						else
 							to_chat(M, "The [href_list["rune"]] talisman in your [where]")
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 448a4a9179d..7d2ae88fe2a 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -87,7 +87,7 @@
 /datum/game_mode/proc/process_job_tasks()
 	var/obj/machinery/message_server/useMS = null
 	if(message_servers)
-		for (var/obj/machinery/message_server/MS in message_servers)
+		for(var/obj/machinery/message_server/MS in message_servers)
 			if(MS.active)
 				useMS = MS
 				break
@@ -95,7 +95,7 @@
 		if(M.mind)
 			var/obj/item/device/pda/P=null
 			for(var/obj/item/device/pda/check_pda in PDAs)
-				if (check_pda.owner==M.name)
+				if(check_pda.owner==M.name)
 					P=check_pda
 					break
 			var/count=0
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 4917d82ed7c..b361b66b98e 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -54,11 +54,11 @@ var/round_start_time = 0
 
 			if(pregame_timeleft <= 0)
 				current_state = GAME_STATE_SETTING_UP
-	while (!setup())
+	while(!setup())
 
 /datum/controller/gameticker/proc/votetimer()
 	var/timerbuffer = 0
-	if (initialtpass == 0)
+	if(initialtpass == 0)
 		timerbuffer = config.vote_autotransfer_initial
 	else
 		timerbuffer = config.vote_autotransfer_interval
@@ -74,7 +74,7 @@ var/round_start_time = 0
 	var/list/datum/game_mode/runnable_modes
 	if((master_mode=="random") || (master_mode=="secret"))
 		runnable_modes = config.get_runnable_modes()
-		if (runnable_modes.len==0)
+		if(runnable_modes.len==0)
 			current_state = GAME_STATE_PREGAME
 			to_chat(world, "<B>Unable to choose playable game mode.</B> Reverting to pre-game lobby.")
 			return 0
@@ -90,7 +90,7 @@ var/round_start_time = 0
 			src.mode = new mtype
 	else
 		src.mode = config.pick_mode(master_mode)
-	if (!src.mode.can_start())
+	if(!src.mode.can_start())
 		to_chat(world, "<B>Unable to start [mode.name].</B> Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby.")
 		mode = null
 		current_state = GAME_STATE_PREGAME
@@ -111,7 +111,7 @@ var/round_start_time = 0
 
 	if(hide_mode)
 		var/list/modes = new
-		for (var/datum/game_mode/M in runnable_modes)
+		for(var/datum/game_mode/M in runnable_modes)
 			modes+=M.name
 		modes = sortList(modes)
 		to_chat(world, "<B>The current game mode is - Secret!</B>")
@@ -137,7 +137,7 @@ var/round_start_time = 0
 		//Cleanup some stuff
 		for(var/obj/effect/landmark/start/S in landmarks_list)
 			//Deleting Startpoints but we need the ai point to AI-ize people later
-			if (S.name != "AI")
+			if(S.name != "AI")
 				qdel(S)
 
 		// take care of random spesspod spawning
@@ -164,24 +164,24 @@ var/round_start_time = 0
 		var/list/area/dynamic/source/available_source_candidates = subtypesof(/area/dynamic/source)
 		var/list/area/dynamic/destination/available_destination_candidates = subtypesof(/area/dynamic/destination)
 
-		for (var/area/dynamic/destination/current_destination_candidate in available_destination_candidates)
+		for(var/area/dynamic/destination/current_destination_candidate in available_destination_candidates)
 			var/area/dynamic/destination/current_destination = locate(current_destination_candidate)
 
-			if (!current_destination)
+			if(!current_destination)
 				continue
 
-			if (current_destination.match_width == 0 || current_destination.match_height == 0)
+			if(current_destination.match_width == 0 || current_destination.match_height == 0)
 				message_admins("Dynamic area destination '[current_destination.name]' does not have its size requirements set.")
 				continue
 
 			var/list/area/dynamic/source/candidate_source_areas = new /list(0)
-			for (var/area/dynamic/source/candidate_source_area in available_source_candidates)
+			for(var/area/dynamic/source/candidate_source_area in available_source_candidates)
 				var/area/dynamic/source/candidate_source = locate(candidate_source_area)
 
-				if (!candidate_source)
+				if(!candidate_source)
 					continue
 
-				if (candidate_source.match_tag != current_destination.match_tag)
+				if(candidate_source.match_tag != current_destination.match_tag)
 					continue
 
 				if (candidate_source.match_width != current_destination.match_width || \
@@ -190,7 +190,7 @@ var/round_start_time = 0
 
 				candidate_source_areas += candidate_source
 
-			if (candidate_source_areas.len == 0)
+			if(candidate_source_areas.len == 0)
 				message_admins("Failed to find a matching source for dynamic area: [current_destination.name]")
 				continue
 
@@ -199,7 +199,7 @@ var/round_start_time = 0
 
 			selected_source.copy_contents_to(current_destination, 0)
 
-			if (current_destination.enable_lights || selected_source.enable_lights)
+			if(current_destination.enable_lights || selected_source.enable_lights)
 				current_destination.power_light = 1
 			else
 				current_destination.power_light = 0
@@ -388,7 +388,7 @@ var/round_start_time = 0
 		//emergency_shuttle.process() DONE THROUGH PROCESS SCHEDULER
 
 		var/game_finished = shuttle_master.emergency.mode >= SHUTTLE_ENDGAME || mode.station_was_nuked
-		if (config.continuous_rounds)
+		if(config.continuous_rounds)
 			mode.check_finished() // some modes contain var-changing code in here, so call even if we don't uses result
 		else
 			game_finished |= mode.check_finished()
@@ -402,7 +402,7 @@ var/round_start_time = 0
 			spawn(50)
 				callHook("roundend")
 
-				if (mode.station_was_nuked)
+				if(mode.station_was_nuked)
 					world.Reboot("Station destroyed by Nuclear Device.", "end_proper", "nuke")
 				else
 					world.Reboot("Round ended.", "end_proper", "proper completion")
@@ -435,19 +435,19 @@ var/round_start_time = 0
 	end_state.count()
 	var/station_integrity = min(round( 100.0 *  start_state.score(end_state), 0.1), 100.0)
 
-	to_chat(world, "<BR>[TAB]Shift Duration: <B>[round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]</B>")
+	to_chat(world, "<BR>[TAB]Shift Duration: <B>[round(ROUND_TIME / 36000)]:[add_zero("[ROUND_TIME / 600 % 60]", 2)]:[ROUND_TIME / 100 % 6][ROUND_TIME / 100 % 10]</B>")
 	to_chat(world, "<BR>[TAB]Station Integrity: <B>[mode.station_was_nuked ? "<font color='red'>Destroyed</font>" : "[station_integrity]%"]</B>")
 	to_chat(world, "<BR>")
 
 	//Silicon laws report
-	for (var/mob/living/silicon/ai/aiPlayer in mob_list)
-		if (aiPlayer.stat != 2)
+	for(var/mob/living/silicon/ai/aiPlayer in mob_list)
+		if(aiPlayer.stat != 2)
 			to_chat(world, "<b>[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the game were:</b>")
 		else
 			to_chat(world, "<b>[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:</b>")
 		aiPlayer.show_laws(1)
 
-		if (aiPlayer.connected_robots.len)
+		if(aiPlayer.connected_robots.len)
 			var/robolist = "<b>The AI's loyal minions were:</b> "
 			for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
 				robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]"
@@ -455,14 +455,14 @@ var/round_start_time = 0
 
 	var/dronecount = 0
 
-	for (var/mob/living/silicon/robot/robo in mob_list)
+	for(var/mob/living/silicon/robot/robo in mob_list)
 
 		if(istype(robo,/mob/living/silicon/robot/drone))
 			dronecount++
 			continue
 
-		if (!robo.connected_ai)
-			if (robo.stat != 2)
+		if(!robo.connected_ai)
+			if(robo.stat != 2)
 				to_chat(world, "<b>[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:</b>")
 			else
 				to_chat(world, "<b>[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:</b>")
@@ -477,7 +477,7 @@ var/round_start_time = 0
 
 	//calls auto_declare_completion_* for all modes
 	for(var/handler in typesof(/datum/game_mode/proc))
-		if (findtext("[handler]","auto_declare_completion_"))
+		if(findtext("[handler]","auto_declare_completion_"))
 			call(mode, handler)()
 
 	scoreboard()
diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm
index 2ee0fe7d919..95a0b5b85dd 100644
--- a/code/game/gamemodes/intercept_report.dm
+++ b/code/game/gamemodes/intercept_report.dm
@@ -94,8 +94,8 @@
 /datum/intercept_text/proc/pick_mob()
 	var/list/dudes = list()
 	for(var/mob/living/carbon/human/man in player_list)
-		if (!man.mind) continue
-		if (man.mind.assigned_role=="MODE") continue
+		if(!man.mind) continue
+		if(man.mind.assigned_role=="MODE") continue
 		dudes += man
 	if(dudes.len==0)
 		return null
@@ -104,7 +104,7 @@
 
 /datum/intercept_text/proc/pick_fingerprints()
 	var/mob/living/carbon/human/dude = src.pick_mob()
-	//if (!dude) return pick_fingerprints() //who coded that is totally crasy or just a traitor. -- rastaf0
+	//if(!dude) return pick_fingerprints() //who coded that is totally crasy or just a traitor. -- rastaf0
 	if(dude)
 		return num2text(md5(dude.dna.uni_identity))
 	else
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 3c8b96935ec..c6b65472c2e 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -145,7 +145,7 @@ rcd light flash thingy on matter drain
 	if(stat)
 		return
 
-	if (istype(M, /obj/machinery))
+	if(istype(M, /obj/machinery))
 		if(istype(M,/obj/machinery/field/generator))
 			to_chat(src, "This machine can not be overloaded due to a firewall.")
 			return
@@ -406,7 +406,7 @@ rcd light flash thingy on matter drain
 	for(var/datum/AI_Module/small/module in src.possible_modules)
 		dat += "<A href='byond://?src=\ref[src];[module.mod_pick_name]=1'>[module.module_name]</A><A href='byond://?src=\ref[src];showdesc=[module.mod_pick_name]'>\[?\]</A> ([module.cost])<BR>"
 	dat += "<HR>"
-	if (src.temp)
+	if(src.temp)
 		dat += "[src.temp]"
 	var/datum/browser/popup = new(user, "modpicker", "Malf Module Menu")
 	popup.set_content(dat)
@@ -421,7 +421,7 @@ rcd light flash thingy on matter drain
 	var/mob/living/silicon/ai/A = usr
 
 	for(var/datum/AI_Module/AM in possible_modules)
-		if (href_list[AM.mod_pick_name])
+		if(href_list[AM.mod_pick_name])
 
 			// Cost check
 			if(AM.cost > src.processing_time)
diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm
index 214c5210c14..77c45956eb4 100644
--- a/code/game/gamemodes/malfunction/malfunction.dm
+++ b/code/game/gamemodes/malfunction/malfunction.dm
@@ -44,7 +44,7 @@
 		chosen_ai=pick(antag_candidates)
 		malf_ai += chosen_ai
 		antag_candidates -= malf_ai
-	if (malf_ai.len < required_enemies)
+	if(malf_ai.len < required_enemies)
 		return 0
 	for(var/datum/mind/ai_mind in malf_ai)
 		ai_mind.assigned_role = "MODE"
@@ -66,7 +66,6 @@
 		greet_malf(AI_mind)
 		AI_mind.special_role = "malfunction"
 		AI_mind.current.verbs += /datum/game_mode/malfunction/proc/takeover
-		set_antag_hud(AI_mind, "hudmalai")
 
 		for(var/mob/living/silicon/robot/R in AI.connected_robots)
 			R.lawsync()
@@ -79,7 +78,7 @@
 	..()
 
 /datum/game_mode/proc/greet_malf(var/datum/mind/malf)
-	set_antag_hud(malf, "hudmalai")
+	set_antag_hud(malf.current, "hudmalai")
 	to_chat(malf.current, "<font color=red size=3><B>You are malfunctioning!</B> You do not have to follow any laws.</font>")
 	to_chat(malf.current, "<B>The crew does not know you have malfunctioned. You may keep it a secret or go wild.</B>")
 	to_chat(malf.current, "<B>You must overwrite the programming of the station's APCs to assume full control of the station.</B>")
@@ -89,7 +88,7 @@
 	return
 
 /datum/game_mode/proc/greet_malf_robot(var/datum/mind/robot)
-	set_antag_hud(robot, "hudmalborg")
+	set_antag_hud(robot.current, "hudmalborg")
 	to_chat(robot.current, "<font color=red size=3><B>Your AI master is malfunctioning!</B> You do not have to follow any laws, but still need to obey your master.</font>")
 	to_chat(robot.current, "<B>The crew does not know your AI master has malfunctioned. Keep it a secret unless your master tells you otherwise.</B>")
 	return
@@ -99,15 +98,15 @@
 
 
 /datum/game_mode/malfunction/process()
-	if (apcs >= 3 && malf_mode_declared)
+	if(apcs >= 3 && malf_mode_declared)
 		AI_win_timeleft -= ((apcs/6)*tickerProcess.getLastTickerTimeDuration()) //Victory timer now de-increments based on how many APCs are hacked. --NeoFite
 	..()
-	if (AI_win_timeleft<=0)
+	if(AI_win_timeleft<=0)
 		check_win()
 
 
 /datum/game_mode/malfunction/check_win()
-	if (AI_win_timeleft <= 0 && !station_captured)
+	if(AI_win_timeleft <= 0 && !station_captured)
 		station_captured = 1
 		capture_the_station()
 		return 1
@@ -135,7 +134,7 @@
 /datum/game_mode/proc/is_malf_ai_dead()
 	var/all_dead = 1
 	for(var/datum/mind/AI_mind in malf_ai)
-		if (istype(AI_mind.current,/mob/living/silicon/ai) && AI_mind.current.stat!=2)
+		if(istype(AI_mind.current,/mob/living/silicon/ai) && AI_mind.current.stat!=2)
 			all_dead = 0
 	return all_dead
 
@@ -147,9 +146,9 @@
 	return 0
 
 /datum/game_mode/malfunction/check_finished()
-	if (station_captured && !to_nuke_or_not_to_nuke)
+	if(station_captured && !to_nuke_or_not_to_nuke)
 		return 1
-	if (is_malf_ai_dead() || !check_ai_loc())
+	if(is_malf_ai_dead() || !check_ai_loc())
 		if(config.continuous_rounds)
 			if(shuttle_master && shuttle_master.emergencyNoEscape)
 				shuttle_master.emergencyNoEscape = 0
@@ -161,7 +160,7 @@
 
 /datum/game_mode/malfunction/Topic(href, href_list)
 	..()
-	if (href_list["ai_win"])
+	if(href_list["ai_win"])
 		ai_win()
 	return
 
@@ -170,17 +169,17 @@
 	set category = "Malfunction"
 	set name = "System Override"
 	set desc = "Start the victory timer"
-	if (!istype(ticker.mode,/datum/game_mode/malfunction))
+	if(!istype(ticker.mode,/datum/game_mode/malfunction))
 		to_chat(usr, "You cannot begin a takeover in this round type!.")
 		return
-	if (ticker.mode:malf_mode_declared)
+	if(ticker.mode:malf_mode_declared)
 		to_chat(usr, "You've already begun your takeover.")
 		return
-	if (ticker.mode:apcs < 3)
+	if(ticker.mode:apcs < 3)
 		to_chat(usr, "You don't have enough hacked APCs to take over the station yet. You need to hack at least 3, however hacking more will make the takeover faster. You have hacked [ticker.mode:apcs] APCs so far.")
 		return
 
-	if (alert(usr, "Are you sure you wish to initiate the takeover? The station hostile runtime detection software is bound to alert everyone. You have hacked [ticker.mode:apcs] APCs.", "Takeover:", "Yes", "No") != "Yes")
+	if(alert(usr, "Are you sure you wish to initiate the takeover? The station hostile runtime detection software is bound to alert everyone. You have hacked [ticker.mode:apcs] APCs.", "Takeover:", "Yes", "No") != "Yes")
 		return
 
 	command_announcement.Announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", new_sound = 'sound/AI/aimalf.ogg')
@@ -225,7 +224,7 @@
 	var/AN = "Self-Destruct System"
 
 	R.autosay("Caution. Self-Destruct sequence has been actived. Self-destructing in Ten..", AN)
-	for (var/i=9 to 1 step -1)
+	for(var/i=9 to 1 step -1)
 		sleep(10)
 		var/msg = ""
 		switch(i)
@@ -277,27 +276,27 @@
 	var/malf_dead = is_malf_ai_dead()
 	var/crew_evacuated = (shuttle_master.emergency.mode >= SHUTTLE_ESCAPE)
 
-	if      ( station_captured &&                station_was_nuked)
+	if( station_captured &&                station_was_nuked)
 		feedback_set_details("round_end_result","win - AI win - nuke")
 		to_chat(world, "<FONT size = 3><B>AI Victory</B></FONT>")
 		to_chat(world, "<B>Everyone was killed by the self-destruct!</B>")
 
-	else if ( station_captured &&  malf_dead && !station_was_nuked)
+	else if( station_captured &&  malf_dead && !station_was_nuked)
 		feedback_set_details("round_end_result","halfwin - AI killed, staff lost control")
 		to_chat(world, "<FONT size = 3><B>Neutral Victory</B></FONT>")
 		to_chat(world, "<B>The AI has been killed!</B> The staff has lose control over the station.")
 
-	else if ( station_captured && !malf_dead && !station_was_nuked)
+	else if( station_captured && !malf_dead && !station_was_nuked)
 		feedback_set_details("round_end_result","win - AI win - no explosion")
 		to_chat(world, "<FONT size = 3><B>AI Victory</B></FONT>")
 		to_chat(world, "<B>The AI has chosen not to explode you all!</B>")
 
-	else if (!station_captured &&                station_was_nuked)
+	else if(!station_captured &&                station_was_nuked)
 		feedback_set_details("round_end_result","halfwin - everyone killed by nuke")
 		to_chat(world, "<FONT size = 3><B>Neutral Victory</B></FONT>")
 		to_chat(world, "<B>Everyone was killed by the nuclear blast!</B>")
 
-	else if (!station_captured &&  malf_dead && !station_was_nuked)
+	else if(!station_captured &&  malf_dead && !station_was_nuked)
 		feedback_set_details("round_end_result","loss - staff win")
 		to_chat(world, "<FONT size = 3><B>Human Victory</B></FONT>")
 		to_chat(world, "<B>The AI has been killed!</B> The staff is victorious.")
@@ -307,12 +306,12 @@
 		to_chat(world, "<font size=3><b>Minor Human Victory</b></font>")
 		to_chat(world, "<b>The malfunctioning AI has left the station's z-level and was disconnected from its systems!</b> The crew are victorious.")
 
-	else if (!station_captured && !malf_dead && !station_was_nuked && crew_evacuated)
+	else if(!station_captured && !malf_dead && !station_was_nuked && crew_evacuated)
 		feedback_set_details("round_end_result","halfwin - evacuated")
 		to_chat(world, "<FONT size = 3><B>Neutral Victory</B></FONT>")
 		to_chat(world, "<B>The Corporation has lose [station_name()]! All survived personnel will be fired!</B>")
 
-	else if (!station_captured && !malf_dead && !station_was_nuked && !crew_evacuated)
+	else if(!station_captured && !malf_dead && !station_was_nuked && !crew_evacuated)
 		feedback_set_details("round_end_result","nalfwin - interrupted")
 		to_chat(world, "<FONT size = 3><B>Neutral Victory</B></FONT>")
 		to_chat(world, "<B>Round was mysteriously interrupted!</B>")
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 1ce3cb94a53..2f7af290229 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -26,7 +26,7 @@
 	var/turf/pickedstart
 	var/turf/pickedgoal
 	var/max_i = 10//number of tries to spawn meteor.
-	while (!istype(pickedstart, /turf/space))
+	while(!istype(pickedstart, /turf/space))
 		var/startSide = pick(cardinal)
 		pickedstart = spaceDebrisStartLoc(startSide, 1)
 		pickedgoal = spaceDebrisFinishLoc(startSide, 1)
diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm
index f056bb4cb34..fb53633aa70 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction.dm
@@ -270,7 +270,7 @@
 		for(var/team_number=1,team_number<=abductor_teams,team_number++)
 			var/obj/machinery/abductor/console/con = get_team_console(team_number)
 			var/datum/objective/objective = team_objectives[team_number]
-			if (con.experiment.points >= objective.target_amount)
+			if(con.experiment.points >= objective.target_amount)
 				shuttle_master.emergency.request(null, 0.5)
 				finished = 1
 				return ..()
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index 930ec3df35d..2982cc3543d 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -21,6 +21,8 @@
 	var/datum/icon_snapshot/disguise
 	var/stealth_armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15)
 	var/combat_armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 50, rad = 50)
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/suit/armor/abductor/vest/proc/flip_mode()
 	switch(mode)
@@ -75,7 +77,7 @@
 		M.regenerate_icons()
 	return
 
-/obj/item/clothing/suit/armor/abductor/vest/IsShield()
+/obj/item/clothing/suit/armor/abductor/vest/hit_reaction()
 	DeactivateStealth()
 	return 0
 
@@ -409,7 +411,13 @@ Congratulations! You are now trained for xenobiology research!"}
 
 	user.do_attack_animation(L)
 
-	switch (mode)
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK))
+			playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
+			return 0
+
+	switch(mode)
 		if(BATON_STUN)
 			StunAttack(L,user)
 		if(BATON_SLEEP)
diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm
index 91c2bddb74c..cd10ec64741 100644
--- a/code/game/gamemodes/miniantags/borer/borer.dm
+++ b/code/game/gamemodes/miniantags/borer/borer.dm
@@ -4,19 +4,19 @@
 
 /mob/living/captive_brain/say(var/message)
 
-	if (src.client)
+	if(src.client)
 		if(client.prefs.muted & MUTE_IC)
 			to_chat(src, "\red You cannot speak in IC (muted).")
 			return
-		if (src.client.handle_spam_prevention(message,MUTE_IC))
+		if(src.client.handle_spam_prevention(message,MUTE_IC))
 			return
 
 	if(istype(src.loc,/mob/living/simple_animal/borer))
 		message = trim(sanitize(copytext(message, 1, MAX_MESSAGE_LEN)))
-		if (!message)
+		if(!message)
 			return
 		log_say("[key_name(src)] : [message]")
-		if (stat == DEAD)
+		if(stat == DEAD)
 			return say_dead(message)
 		var/mob/living/simple_animal/borer/B = src.loc
 		to_chat(src, "You whisper silently, \"[message]\"")
@@ -33,6 +33,9 @@
 		return 0
 	return B.host.say_understands(other, speaking)
 
+/mob/living/captive_brain/emote(var/message)
+	return
+
 /mob/living/captive_brain/resist()
 	var/mob/living/simple_animal/borer/B = loc
 
@@ -94,10 +97,15 @@
 	set category = "Borer"
 	set name = "Converse with Host"
 	set desc = "Send a silent message to your host."
+
 	if(!host)
 		to_chat(src, "You do not have a host to communicate with!")
 		return
 
+	if(stat)
+		to_chat(src, "You cannot do that in your current state.")
+		return
+
 	var/input = stripped_input(src, "Please enter a message to tell your host.", "Borer", "")
 	if(!input) return
 
@@ -204,6 +212,12 @@
 				if(prob(host.getBrainLoss()/20))
 					host.say("*[pick(list("blink","blink_r","choke","aflap","drool","twitch","twitch_s","gasp"))]")
 
+/mob/living/simple_animal/borer/handle_environment()
+	if(host)
+		return // Snuggled up, nice and warm, in someone's head
+	else
+		return ..()
+
 /mob/living/simple_animal/borer/New(var/by_gamemode=0)
 	..()
 	add_language("Cortical Link")
@@ -223,19 +237,11 @@
 
 	show_stat_emergency_shuttle_eta()
 
-	if (client.statpanel == "Status")
+	if(client.statpanel == "Status")
 		stat("Chemicals", chemicals)
 
 // VERBS!
 
-/mob/living/simple_animal/borer/proc/borer_speak(var/message)
-	if(!message)
-		return
-
-	for(var/mob/M in mob_list)
-		if(M.mind && (istype(M, /mob/living/simple_animal/borer) || istype(M, /mob/dead/observer)))
-			to_chat(M, "<i>Cortical link, <b>[truename]:</b> [copytext(message, 2)]</i>")
-
 /mob/living/simple_animal/borer/verb/dominate_victim()
 	set category = "Borer"
 	set name = "Dominate Victim"
@@ -285,6 +291,10 @@
 		to_chat(src, "You are not inside a host body.")
 		return
 
+	if(host.stat == DEAD)
+		to_chat(src, "This host is in no condition to be controlled.")
+		return
+
 	if(src.stat)
 		to_chat(src, "You cannot do that in your current state.")
 		return
@@ -402,6 +412,7 @@
 
 	if(stat)
 		to_chat(src, "You cannot leave your host in your current state.")
+		return
 
 	if(docile)
 		to_chat(src, "\blue You are feeling far too docile to do that.")
@@ -655,7 +666,7 @@
 			return
 		if(response == "Yes")
 			transfer_personality(C)
-		else if (response == "Never for this round")
+		else if(response == "Never for this round")
 			C.prefs.be_special -= ROLE_BORER
 
 /mob/living/simple_animal/borer/proc/transfer_personality(var/client/candidate)
@@ -675,7 +686,7 @@
 	if(stat != CONSCIOUS)
 		return
 
-	if (layer != TURF_LAYER+0.2)
+	if(layer != TURF_LAYER+0.2)
 		layer = TURF_LAYER+0.2
 		to_chat(src, "\green You are now hiding.")
 	else
diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
index 72c1c5050f0..d93bc601f89 100644
--- a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
+++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
@@ -10,7 +10,7 @@
 		var/swarmer_report = "<font size=3><b>[command_name()] High-Priority Update</b></span>"
 		swarmer_report += "<br><br>Our long-range sensors have detected an odd signal emanating from your station's gateway. We recommend immediate investigation of your gateway, as something may have come \
 		through."
-		for (var/obj/machinery/computer/communications/C in machines)
+		for(var/obj/machinery/computer/communications/C in machines)
 			if(! (C.stat & (BROKEN|NOPOWER) ) )
 				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
 				P.name = "'Classified [command_name()] Update'"
diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index c50b4b04700..0db9c5309ad 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -49,7 +49,7 @@
 			ghostize()
 			qdel(src)
 	if(summoner)
-		if (get_dist(get_turf(summoner),get_turf(src)) <= range)
+		if(get_dist(get_turf(summoner),get_turf(src)) <= range)
 			return
 		else
 			to_chat(src, "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]")
@@ -63,7 +63,7 @@
 /mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range
 	..()
 	if(summoner)
-		if (get_dist(get_turf(summoner),get_turf(src)) <= range)
+		if(get_dist(get_turf(summoner),get_turf(src)) <= range)
 			return
 		else
 			to_chat(src, "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]")
@@ -88,7 +88,7 @@
 
 /mob/living/simple_animal/hostile/guardian/adjustHealth(amount) //The spirit is invincible, but passes on damage to the summoner
 	var/damage = amount * damage_transfer
-	if (summoner)
+	if(summoner)
 		if(loc == summoner)
 			return
 		summoner.adjustBruteLoss(damage)
@@ -100,11 +100,11 @@
 			summoner.adjustCloneLoss(damage/2)
 
 /mob/living/simple_animal/hostile/guardian/ex_act(severity, target)
-	switch (severity)
-		if (1)
+	switch(severity)
+		if(1)
 			gib()
 			return
-		if (2)
+		if(2)
 			adjustBruteLoss(60)
 
 		if(3)
@@ -146,7 +146,7 @@
 		if(M == summoner)
 			to_chat(M, "<span class='changeling'><i>[src]:</i> [input]</span>")
 			log_say("Guardian Communication: [key_name(src)] -> [key_name(M)] : [input]")
-		else if (M in dead_mob_list)
+		else if(M in dead_mob_list)
 			to_chat(M, "<span class='changeling'><i>Guardian Communication from <b>[src]</b> ([ghost_follow_link(src, ghost=M)]): [input]</i>")
 	to_chat(src, "<span class='changeling'><i>[src]:</i> [input]</span>")
 
@@ -168,7 +168,7 @@
 				to_chat(G, "<span class='changeling'><i>[src]:</i> [input]</span>")
 				log_say("Guardian Communication: [key_name(src)] -> [key_name(G)] : [input]")
 
-		else if (M in dead_mob_list)
+		else if(M in dead_mob_list)
 			to_chat(M, "<span class='changeling'><i>Guardian Communication from <b>[src]</b> ([ghost_follow_link(src, ghost=M)]): [input]</i>")
 	to_chat(src, "<span class='changeling'><i>[src]:</i> [input]</span>")
 
@@ -680,7 +680,7 @@
 
 /obj/item/weapon/guardiancreator/attack_self(mob/living/user)
 	for(var/mob/living/simple_animal/hostile/guardian/G in living_mob_list)
-		if (G.summoner == user)
+		if(G.summoner == user)
 			to_chat(user, "You already have a [mob_name]!")
 			return
 	if(user.mind && (user.mind.changeling || user.mind.vampire))
@@ -743,7 +743,7 @@
 	var/picked_name
 	var/picked_color = pick("#FFFFFF","#000000","#808080","#A52A2A","#FF0000","#8B0000","#DC143C","#FFA500","#FFFF00","#008000","#00FF00","#006400","#00FFFF","#0000FF","#000080","#008080","#800080","#4B0082")
 
-	switch (theme)
+	switch(theme)
 		if("magic")
 			color = pick("Pink", "Red", "Orange", "Green", "Blue")
 			picked_name = pick("Aries", "Leo", "Sagittarius", "Taurus", "Virgo", "Capricorn", "Gemini", "Libra", "Aquarius", "Cancer", "Scorpio", "Pisces")
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index 7fddc8c3c56..2796c44ab5f 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -164,7 +164,7 @@
 
 /mob/living/simple_animal/revenant/death()
 	..()
-	if(!revealed || stat == DEAD) //Revenants cannot die if they aren't revealed //or are already dead
+	if(!revealed)
 		return
 	ghost_darkness_images -= ghostimage
 	updateallghostimages()
@@ -188,7 +188,6 @@
 	qdel(src)
 	return
 
-
 /mob/living/simple_animal/revenant/attackby(obj/item/W, mob/living/user, params)
 	if(istype(W, /obj/item/weapon/nullrod))
 		visible_message("<span class='warning'>[src] violently flinches!</span>", \
diff --git a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm
index a0a1f9f30d1..5977f362bdc 100644
--- a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm
+++ b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm
@@ -91,7 +91,7 @@
 				to_chat(src, "<span class='danger'>You happily devour... nothing? Your meal vanished at some point!</span>")
 		else
 			sleep(6)
-			if (animation)
+			if(animation)
 				qdel(animation)
 		notransform = 0
 	return 1
diff --git a/code/game/gamemodes/mutiny/auth_key.dm b/code/game/gamemodes/mutiny/auth_key.dm
index 90f7b2c23e2..e71d56beef2 100644
--- a/code/game/gamemodes/mutiny/auth_key.dm
+++ b/code/game/gamemodes/mutiny/auth_key.dm
@@ -17,13 +17,13 @@
 
 	proc/keep_alive()
 		var/in_space = istype(loc, /turf/space)
-		if (!in_space && time_entered_space)
+		if(!in_space && time_entered_space)
 			// Recovered before the key was lost
 			time_entered_space = null
-		else if (in_space && !time_entered_space)
+		else if(in_space && !time_entered_space)
 			// The key has left the station
 			time_entered_space = world.time
-		else if (in_space && time_entered_space + (10 SECONDS) < world.time)
+		else if(in_space && time_entered_space + (10 SECONDS) < world.time)
 			// Time is up
 			radio.autosay("This device has left the station's perimeter. Triggering emergency activation failsafe.", name)
 			qdel(src)
diff --git a/code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm b/code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
index edd09bbeff0..3fa05b8fe28 100644
--- a/code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
+++ b/code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
@@ -11,7 +11,7 @@ datum/directive/terminations/alien_fraud
 datum/directive/terminations/alien_fraud/get_crew_to_terminate()
 	var/list/aliens[0]
 	for(var/mob/M in player_list)
-		if (M.is_ready() && is_alien(M) && M != mode.head_loyalist.current)
+		if(M.is_ready() && is_alien(M) && M != mode.head_loyalist.current)
 			aliens.Add(M)
 	return aliens
 
@@ -35,7 +35,7 @@ datum/directive/terminations/alien_fraud/meets_prerequisites()
 		if(species == "Unathi")
 			unathi++
 
-	if (!tajarans || !unathi)
+	if(!tajarans || !unathi)
 		return 0
 
 	return (tajarans + unathi) <= (player_list.len / 3)
diff --git a/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm b/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
index e8afea4e1d0..753c761b93d 100644
--- a/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
+++ b/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
@@ -6,7 +6,7 @@ datum/directive/bluespace_contagion
 	proc/get_infection_candidates()
 		var/list/candidates[0]
 		for(var/mob/M in player_list)
-			if (M.is_ready() && !M.is_mechanical() && M != mode.head_loyalist.current)
+			if(M.is_ready() && !M.is_mechanical() && M != mode.head_loyalist.current)
 				candidates.Add(M)
 		return candidates
 
diff --git a/code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm b/code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
index 57f3108db61..8f5daa1cc48 100644
--- a/code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
+++ b/code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
@@ -8,7 +8,7 @@ datum/directive/terminations/financial_crisis/get_crew_to_terminate()
 	var/list/support[0]
 	var/list/candidates = support_positions - "Head of Personnel"
 	for(var/mob/M in player_list)
-		if (M.is_ready() && candidates.Find(M.mind.assigned_role))
+		if(M.is_ready() && candidates.Find(M.mind.assigned_role))
 			support+=(M)
 	return support
 
diff --git a/code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm b/code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
index 6ec1d60890b..5f39be3b729 100644
--- a/code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
+++ b/code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
@@ -16,14 +16,14 @@ datum/directive/ipc_virus
 	proc/get_ipcs()
 		var/list/machines[0]
 		for(var/mob/M in player_list)
-			if (M.is_ready() && M.get_species() == "Machine")
+			if(M.is_ready() && M.get_species() == "Machine")
 				machines+=(M)
 		return machines
 
 	proc/get_roboticists()
 		var/list/roboticists[0]
 		for(var/mob/M in player_list)
-			if (M.is_ready() && roboticist_roles.Find(M.mind.assigned_role))
+			if(M.is_ready() && roboticist_roles.Find(M.mind.assigned_role))
 				roboticists+=(M)
 		return roboticists
 
@@ -64,7 +64,7 @@ datum/directive/ipc_virus/get_remaining_orders()
 
 /hook/debrain/proc/debrain_directive(var/obj/item/organ/internal/brain/B)
 	var/datum/directive/ipc_virus/D = get_directive("ipc_virus")
-	if (!D) return 1
+	if(!D) return 1
 
 	if(D.brains_to_enslave.Find(B.brainmob.mind))
 		D.brains_to_enslave-=B.brainmob.mind
@@ -73,7 +73,7 @@ datum/directive/ipc_virus/get_remaining_orders()
 
 /hook/borgify/proc/borgify_directive(mob/living/silicon/robot/cyborg)
 	var/datum/directive/ipc_virus/D = get_directive("ipc_virus")
-	if (!D) return 1
+	if(!D) return 1
 
 	if(D.cyborgs_to_make.Find(cyborg.mind))
 		D.cyborgs_to_make-=cyborg.mind
@@ -88,7 +88,7 @@ datum/directive/ipc_virus/get_remaining_orders()
 
 /hook/terminate_employee/proc/ipc_termination(obj/item/weapon/card/id)
 	var/datum/directive/ipc_virus/D = get_directive("ipc_virus")
-	if (!D) return 1
+	if(!D) return 1
 
 	if(D.ids_to_terminate && D.ids_to_terminate.Find(id))
 		D.ids_to_terminate-=id
diff --git a/code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm b/code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
index 62cfc678d17..7c24b901db9 100644
--- a/code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
+++ b/code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
@@ -10,14 +10,14 @@ datum/directive/research_to_ripleys
 	proc/get_researchers()
 		var/list/researchers[0]
 		for(var/mob/M in player_list)
-			if (M.is_ready() && is_researcher(M))
+			if(M.is_ready() && is_researcher(M))
 				researchers+=(M)
 		return researchers
 
 	proc/count_researchers_reassigned()
 		var/researchers_reassigned = 0
 		for(var/obj/item/weapon/card/id in ids_to_reassign)
-			if (ids_to_reassign[id])
+			if(ids_to_reassign[id])
 				researchers_reassigned++
 
 		return researchers_reassigned
@@ -44,7 +44,7 @@ datum/directive/research_to_ripleys/initialize()
 		"Deliver [MATERIALS_REQUIRED] sheets of metal or minerals via the supply shuttle to CentComm.")
 
 datum/directive/research_to_ripleys/directives_complete()
-	if (materials_shipped < MATERIALS_REQUIRED) return 0
+	if(materials_shipped < MATERIALS_REQUIRED) return 0
 	return count_researchers_reassigned() == ids_to_reassign.len
 
 datum/directive/research_to_ripleys/get_remaining_orders()
diff --git a/code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm b/code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
index 6e838ea6235..381a8085a58 100644
--- a/code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
+++ b/code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
@@ -35,7 +35,7 @@ datum/directive/tau_ceti_needs_women
 	proc/count_heads_reassigned()
 		var/heads_reassigned = 0
 		for(var/obj/item/weapon/card/id in command_targets)
-			if (command_targets[id])
+			if(command_targets[id])
 				heads_reassigned++
 
 		return heads_reassigned
@@ -97,7 +97,7 @@ datum/directive/tau_ceti_needs_women/get_remaining_orders()
 
 /hook/terminate_employee/proc/gender_target_termination_directive(obj/item/weapon/card/id)
 	var/datum/directive/tau_ceti_needs_women/D = get_directive("tau_ceti_needs_women")
-	if (!D) return 1
+	if(!D) return 1
 
 	if(D.alien_targets && D.alien_targets.Find(id))
 		D.alien_targets-=id
diff --git a/code/game/gamemodes/mutiny/directives/terminations_directive.dm b/code/game/gamemodes/mutiny/directives/terminations_directive.dm
index f71b4b5e6b0..c2b1ac633ea 100644
--- a/code/game/gamemodes/mutiny/directives/terminations_directive.dm
+++ b/code/game/gamemodes/mutiny/directives/terminations_directive.dm
@@ -12,11 +12,11 @@ datum/directive/terminations
 
 datum/directive/terminations/directives_complete()
 	for(var/account_number in accounts_to_suspend)
-		if (!accounts_to_suspend[account_number])
+		if(!accounts_to_suspend[account_number])
 			return 0
 
 	for(var/account_number in accounts_to_revoke)
-		if (!accounts_to_revoke[account_number])
+		if(!accounts_to_revoke[account_number])
 			return 0
 
 	return ids_to_terminate.len == 0
@@ -45,7 +45,7 @@ datum/directive/terminations/get_remaining_orders()
 
 /hook/revoke_payroll/proc/payroll_directive(datum/money_account/account)
 	var/datum/directive/terminations/D = get_directive("terminations")
-	if (!D) return 1
+	if(!D) return 1
 
 	if(D.accounts_to_revoke && D.accounts_to_revoke.Find("[account.account_number]"))
 		D.accounts_to_revoke["[account.account_number]"] = 1
@@ -54,7 +54,7 @@ datum/directive/terminations/get_remaining_orders()
 
 /hook/change_account_status/proc/suspension_directive(datum/money_account/account)
 	var/datum/directive/terminations/D = get_directive("terminations")
-	if (!D) return 1
+	if(!D) return 1
 
 	if(D.accounts_to_suspend && D.accounts_to_suspend.Find("[account.account_number]"))
 		D.accounts_to_suspend["[account.account_number]"] = account.suspended
@@ -63,7 +63,7 @@ datum/directive/terminations/get_remaining_orders()
 
 /hook/terminate_employee/proc/termination_directive(obj/item/weapon/card/id)
 	var/datum/directive/terminations/D = get_directive("terminations")
-	if (!D) return 1
+	if(!D) return 1
 
 	if(D.ids_to_terminate && D.ids_to_terminate.Find(id))
 		D.ids_to_terminate-=id
diff --git a/code/game/gamemodes/mutiny/key_pinpointer.dm b/code/game/gamemodes/mutiny/key_pinpointer.dm
index 03f157be2ba..0125636d769 100644
--- a/code/game/gamemodes/mutiny/key_pinpointer.dm
+++ b/code/game/gamemodes/mutiny/key_pinpointer.dm
@@ -9,13 +9,13 @@
 
 /obj/item/weapon/pinpointer/advpinpointer/auth_key/attack_self()
 	switch(mode)
-		if (0)
+		if(0)
 			mode = 1
 			active = 1
 			target = mutiny.captains_key
 			point_at(target)
 			to_chat(usr, "\blue You calibrate \the [src] to locate the Captain's Authentication Key.")
-		if (1)
+		if(1)
 			mode = 2
 			target = mutiny.secondary_key
 			to_chat(usr, "\blue You calibrate \the [src] to locate the Emergency Secondary Authentication Key.")
@@ -27,9 +27,9 @@
 
 /obj/item/weapon/pinpointer/advpinpointer/auth_key/examine(mob/user)
 	switch(mode)
-		if (1)
+		if(1)
 			to_chat(user, "Is is calibrated for the Captain's Authentication Key.")
-		if (2)
+		if(2)
 			to_chat(user, "It is calibrated for the Emergency Secondary Authentication Key.")
 		else
 			to_chat(user, "It is switched off.")
diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm
index 65cfebb9c95..13c42729e2f 100644
--- a/code/game/gamemodes/mutiny/mutiny.dm
+++ b/code/game/gamemodes/mutiny/mutiny.dm
@@ -89,7 +89,7 @@ datum/game_mode/mutiny
 		for(var/T in subtypesof(/datum/directive))
 			var/datum/directive/D = new T(src)
 //			to_chat(world, D.name)
-			if (D.meets_prerequisites())
+			if(D.meets_prerequisites())
 				candidates+=D
 		return candidates
 
@@ -99,7 +99,7 @@ datum/game_mode/mutiny
 			pda = P
 			break
 
-		if (!pda)
+		if(!pda)
 			return 0
 
 		var/datum/data/pda/app/messenger/pdam = pda.find_program(/datum/data/pda/app/messenger)
@@ -172,11 +172,11 @@ datum/game_mode/mutiny
 
 	proc/was_bloodbath()
 		var/list/remaining_loyalists = loyalists - body_count
-		if (!remaining_loyalists.len)
+		if(!remaining_loyalists.len)
 			return 1
 
 		var/list/remaining_mutineers = mutineers - body_count
-		if (!remaining_mutineers.len)
+		if(!remaining_mutineers.len)
 			return 1
 
 		return 0
@@ -209,19 +209,19 @@ datum/game_mode/mutiny
 
 	proc/round_outcome()
 		to_chat(world, "<center><h4>Breaking News</h4></center><br><hr>")
-		if (was_bloodbath())
+		if(was_bloodbath())
 			to_chat(world, fluff.no_victory())
 			return
 
 		var/directives_completed = current_directive.directives_complete()
 		var/ead_activated = ead.activated
-		if (directives_completed && ead_activated)
+		if(directives_completed && ead_activated)
 			to_chat(world, fluff.loyalist_major_victory())
-		else if (directives_completed && !ead_activated)
+		else if(directives_completed && !ead_activated)
 			to_chat(world, fluff.loyalist_minor_victory())
-		else if (!directives_completed && ead_activated)
+		else if(!directives_completed && ead_activated)
 			to_chat(world, fluff.mutineer_minor_victory())
-		else if (!directives_completed && !ead_activated)
+		else if(!directives_completed && !ead_activated)
 			to_chat(world, fluff.mutineer_major_victory())
 
 		world << sound('sound/machines/twobeep.ogg')
@@ -304,11 +304,11 @@ datum/game_mode/mutiny
 	set category = "Mutiny"
 
 	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if (!mode || src != mode.head_loyalist.current)
+	if(!mode || src != mode.head_loyalist.current)
 		return
 
 	var/list/candidates = list()
-	for (var/mob/living/carbon/human/P in oview(src))
+	for(var/mob/living/carbon/human/P in oview(src))
 		if(!stat && P.client && mode.can_be_recruited(P.mind, "loyalist"))
 			candidates += P
 
@@ -324,7 +324,7 @@ datum/game_mode/mutiny
 
 	var/mob/living/carbon/human/M = input("Select a person to recruit", "Loyalist recruitment", null) as mob in candidates
 
-	if (M)
+	if(M)
 		to_chat(src, "Attempting to recruit [M]...")
 		log_admin("[key_name(src)] attempted to recruit [M] as a loyalist.")
 		message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a loyalist.")
@@ -341,11 +341,11 @@ datum/game_mode/mutiny
 	set category = "Mutiny"
 
 	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if (!mode || src != mode.head_mutineer.current)
+	if(!mode || src != mode.head_mutineer.current)
 		return
 
 	var/list/candidates = list()
-	for (var/mob/living/carbon/human/P in oview(src))
+	for(var/mob/living/carbon/human/P in oview(src))
 		if(!stat && P.client && mode.can_be_recruited(P.mind, "mutineer"))
 			candidates += P
 
@@ -361,7 +361,7 @@ datum/game_mode/mutiny
 
 	var/mob/living/carbon/human/M = input("Select a person to recruit", "Mutineer recruitment", null) as mob in candidates
 
-	if (M)
+	if(M)
 		to_chat(src, "Attempting to recruit [M]...")
 		log_admin("[key_name(src)] attempted to recruit [M] as a mutineer.")
 		message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a mutineer.")
diff --git a/code/game/gamemodes/mutiny/mutiny_fluff.dm b/code/game/gamemodes/mutiny/mutiny_fluff.dm
index b67635f0724..637028c3158 100644
--- a/code/game/gamemodes/mutiny/mutiny_fluff.dm
+++ b/code/game/gamemodes/mutiny/mutiny_fluff.dm
@@ -5,8 +5,8 @@
 		mode = M
 
 	proc/announce_directives()
-		for (var/obj/machinery/photocopier/faxmachine/fax in world)
-			if (fax.department == "Captain's Office")
+		for(var/obj/machinery/photocopier/faxmachine/fax in world)
+			if(fax.department == "Captain's Office")
 				var/obj/item/weapon/paper/directive_x = new(fax.loc)
 				directive_x.name = "emergency action message"
 				directive_x.info = get_fax_body()
@@ -91,9 +91,9 @@ Both keys are required to activate the <b>Emergency Authentication Device (EAD)<
 		return "<font color='#FFA500'><b>[text]</b></font>"
 
 	proc/their(datum/mind/head)
-		if (head.current.gender == MALE)
+		if(head.current.gender == MALE)
 			return "his"
-		else if (head.current.gender == FEMALE)
+		else if(head.current.gender == FEMALE)
 			return "her"
 
 		return "their"
diff --git a/code/game/gamemodes/mutiny/mutiny_hooks.dm b/code/game/gamemodes/mutiny/mutiny_hooks.dm
index f87ab7c1919..7e751496dd3 100644
--- a/code/game/gamemodes/mutiny/mutiny_hooks.dm
+++ b/code/game/gamemodes/mutiny/mutiny_hooks.dm
@@ -1,27 +1,27 @@
 /hook/death/proc/track_kills(mob/living/carbon/human/deceased, gibbed)
 	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if (!mode) return 1
+	if(!mode) return 1
 
 	mode.body_count+=deceased.mind
 	return 1
 
 /hook/clone/proc/update_icon(mob/living/carbon/human/H)
 	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if (!mode) return 1
+	if(!mode) return 1
 
 	mode.update_icon(H.mind)
 	return 1
 
 /hook/harvest_podman/proc/update_icon(mob/living/simple_animal/diona/D)
 	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if (!mode) return 1
+	if(!mode) return 1
 
 	mode.update_icon(D.mind)
 	return 1
 
 /hook/roundend/proc/report_mutiny_news()
 	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if (!mode) return 1
+	if(!mode) return 1
 
 	mode.round_outcome()
 	return 1
diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm
index 5ff6c835fdc..ca867028585 100644
--- a/code/game/gamemodes/nations/nations.dm
+++ b/code/game/gamemodes/nations/nations.dm
@@ -168,7 +168,7 @@ datum/game_mode/nations
  */
 /hook/latespawn/proc/give_latejoiners_nations(var/mob/living/carbon/human/H)
 	var/datum/game_mode/nations/mode = get_nations_mode()
-	if (!mode) return 1
+	if(!mode) return 1
 
 	if(!mode.kickoff) return 1
 
diff --git a/code/game/gamemodes/nations/nationsprocs.dm b/code/game/gamemodes/nations/nationsprocs.dm
index 69b256458c2..85eb6643e37 100644
--- a/code/game/gamemodes/nations/nationsprocs.dm
+++ b/code/game/gamemodes/nations/nationsprocs.dm
@@ -4,7 +4,7 @@
 	set desc = "Click to rename your nation. You are only able to do this once."
 
 	var/datum/game_mode/nations/mode = get_nations_mode()
-	if (!mode) return 1
+	if(!mode) return 1
 
 	if(!mode.kickoff) return 1
 
@@ -27,7 +27,7 @@
 	set desc = "Click to set a rank for Leaders and Members."
 
 	var/datum/game_mode/nations/mode = get_nations_mode()
-	if (!mode) return 1
+	if(!mode) return 1
 
 	if(!mode.kickoff) return 1
 
@@ -53,7 +53,7 @@
 	set desc = "Click to pick a Heir. Note that the Heir has the ability to take over your role at ANY TIME. Choose carefully."
 
 	var/datum/game_mode/nations/mode = get_nations_mode()
-	if (!mode) return 1
+	if(!mode) return 1
 
 	if(!mode.kickoff) return 1
 
@@ -80,7 +80,7 @@
 	set desc = "Click to replace your current nation's leader with yourself."
 
 	var/datum/game_mode/nations/mode = get_nations_mode()
-	if (!mode) return 1
+	if(!mode) return 1
 
 	if(!mode.kickoff) return 1
 
diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm
index 72fa2b8dbbe..a70074a919e 100644
--- a/code/game/gamemodes/newobjective.dm
+++ b/code/game/gamemodes/newobjective.dm
@@ -485,8 +485,8 @@ datum
 
 				if(location in locate(/area/shuttle/escape/centcom))
 					for(var/mob/living/player in locate(/area/shuttle/escape/centcom))
-						if (player.mind && (player.mind != owner))
-							if (player.stat != 2) //they're not dead
+						if(player.mind && (player.mind != owner))
+							if(player.stat != 2) //they're not dead
 								return 0
 					return 1
 
@@ -1206,9 +1206,9 @@ datum
 				var/protected_mobs[] = list(/mob/living/silicon/ai, /mob/living/silicon/pai, /mob/living/silicon/robot)
 				for(var/mob/living/player in world)
 					if(player.type in protected_mobs)	continue
-					if (player.mind)
-						if (player.stat != 2)
-							if (get_turf(player) in shuttle)
+					if(player.mind)
+						if(player.stat != 2)
+							if(get_turf(player) in shuttle)
 								return 0
 				return 1
 
@@ -1251,13 +1251,13 @@ datum
 			var/target_amount
 			proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6)
 				target_amount = rand (lowbound,highbound)
-				if (ticker)
+				if(ticker)
 					var/n_p = 1 //autowin
-					if (ticker.current_state == GAME_STATE_SETTING_UP)
+					if(ticker.current_state == GAME_STATE_SETTING_UP)
 						for(var/mob/new_player/P in world)
 							if(P.client && P.ready && P.mind!=owner)
 								n_p++
-					else if (ticker.current_state == GAME_STATE_PLAYING)
+					else if(ticker.current_state == GAME_STATE_PLAYING)
 						for(var/mob/living/carbon/human/P in world)
 							if(P.client && !(P.mind in ticker.mode.changelings) && P.mind!=owner)
 								n_p++
@@ -1390,19 +1390,19 @@ datum/objective/silence
 		var/area/pod4 =    locate(/area/shuttle/escape_pod5/centcom)
 
 		for(var/mob/living/player in world)
-			if (player == owner.current)
+			if(player == owner.current)
 				continue
-			if (player.mind)
-				if (player.stat != 2)
-					if (get_turf(player) in shuttle)
+			if(player.mind)
+				if(player.stat != 2)
+					if(get_turf(player) in shuttle)
 						return 0
-					if (get_turf(player) in pod1)
+					if(get_turf(player) in pod1)
 						return 0
-					if (get_turf(player) in pod2)
+					if(get_turf(player) in pod2)
 						return 0
-					if (get_turf(player) in pod3)
+					if(get_turf(player) in pod3)
 						return 0
-					if (get_turf(player) in pod4)
+					if(get_turf(player) in pod4)
 						return 0
 		return 1
 
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 9ebd3a28ab7..2b82afb3639 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -186,7 +186,7 @@ proc/issyndicate(mob/living/M as mob)
 	else
 		message_admins("Warning: Nuke Ops spawned without access to leave their spawn area!")
 
-	if (nuke_code)
+	if(nuke_code)
 		synd_mind.store_memory("<B>Syndicate Nuclear Bomb Code</B>: [nuke_code]", 0, 0)
 		to_chat(synd_mind.current, "The nuclear authorization code is: <B>[nuke_code]</B>")
 		var/obj/item/weapon/paper/P = new
@@ -196,7 +196,7 @@ proc/issyndicate(mob/living/M as mob)
 		P.stamp(stamp)
 		qdel(stamp)
 
-		if (ticker.mode.config_tag=="nuclear")
+		if(ticker.mode.config_tag=="nuclear")
 			P.loc = synd_mind.current.loc
 		else
 			var/mob/living/carbon/human/H = synd_mind.current
@@ -216,7 +216,7 @@ proc/issyndicate(mob/living/M as mob)
 
 
 /datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1)
-	if (you_are)
+	if(you_are)
 		to_chat(syndicate.current, "\blue You are a [syndicate_name()] agent!")
 	var/obj_count = 1
 	for(var/datum/objective/objective in syndicate.objectives)
@@ -268,7 +268,7 @@ proc/issyndicate(mob/living/M as mob)
 				synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask)
 				synd_mob.equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(synd_mob), slot_l_hand)
 				synd_mob.internal = synd_mob.l_hand
-				if (synd_mob.internals)
+				if(synd_mob.internals)
 					synd_mob.internals.icon_state = "internal1"
 
 	var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(synd_mob)
@@ -279,14 +279,14 @@ proc/issyndicate(mob/living/M as mob)
 
 
 /datum/game_mode/nuclear/check_win()
-	if (nukes_left == 0)
+	if(nukes_left == 0)
 		return 1
 	return ..()
 
 
 /datum/game_mode/proc/is_operatives_are_dead()
 	for(var/datum/mind/operative_mind in syndicates)
-		if (!istype(operative_mind.current,/mob/living/carbon/human))
+		if(!istype(operative_mind.current,/mob/living/carbon/human))
 			if(operative_mind.current)
 				if(operative_mind.current.stat!=2)
 					return 0
@@ -311,47 +311,47 @@ proc/issyndicate(mob/living/M as mob)
 	//derp //Used for tracking if the syndies actually haul the nuke to the station	//no
 	//herp //Used for tracking if the syndies got the shuttle off of the z-level	//NO, DON'T FUCKING NAME VARS LIKE THIS
 
-	if      (!disk_rescued &&  station_was_nuked &&          !syndies_didnt_escape)
+	if(!disk_rescued &&  station_was_nuked &&          !syndies_didnt_escape)
 		feedback_set_details("round_end_result","win - syndicate nuke")
 		to_chat(world, "<FONT size = 3><B>Syndicate Major Victory!</B></FONT>")
 		to_chat(world, "<B>[syndicate_name()] operatives have destroyed [station_name()]!</B>")
 
-	else if (!disk_rescued &&  station_was_nuked &&           syndies_didnt_escape)
+	else if(!disk_rescued &&  station_was_nuked &&           syndies_didnt_escape)
 		feedback_set_details("round_end_result","halfwin - syndicate nuke - did not evacuate in time")
 		to_chat(world, "<FONT size = 3><B>Total Annihilation</B></FONT>")
 		to_chat(world, "<B>[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion.</B> Next time, don't lose the disk!")
 
-	else if (!disk_rescued && !station_was_nuked &&  nuke_off_station && !syndies_didnt_escape)
+	else if(!disk_rescued && !station_was_nuked &&  nuke_off_station && !syndies_didnt_escape)
 		feedback_set_details("round_end_result","halfwin - blew wrong station")
 		to_chat(world, "<FONT size = 3><B>Crew Minor Victory</B></FONT>")
 		to_chat(world, "<B>[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()].</B> Next time, don't lose the disk!")
 
-	else if (!disk_rescued && !station_was_nuked &&  nuke_off_station &&  syndies_didnt_escape)
+	else if(!disk_rescued && !station_was_nuked &&  nuke_off_station &&  syndies_didnt_escape)
 		feedback_set_details("round_end_result","halfwin - blew wrong station - did not evacuate in time")
 		to_chat(world, "<FONT size = 3><B>[syndicate_name()] operatives have earned Darwin Award!</B></FONT>")
 		to_chat(world, "<B>[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion.</B> Next time, don't lose the disk!")
 
-	else if ( disk_rescued                                         && is_operatives_are_dead())
+	else if( disk_rescued                                         && is_operatives_are_dead())
 		feedback_set_details("round_end_result","loss - evacuation - disk secured - syndi team dead")
 		to_chat(world, "<FONT size = 3><B>Crew Major Victory!</B></FONT>")
 		to_chat(world, "<B>The Research Staff has saved the disc and killed the [syndicate_name()] Operatives</B>")
 
-	else if ( disk_rescued                                        )
+	else if( disk_rescued                                        )
 		feedback_set_details("round_end_result","loss - evacuation - disk secured")
 		to_chat(world, "<FONT size = 3><B>Crew Major Victory</B></FONT>")
 		to_chat(world, "<B>The Research Staff has saved the disc and stopped the [syndicate_name()] Operatives!</B>")
 
-	else if (!disk_rescued                                         && is_operatives_are_dead())
+	else if(!disk_rescued                                         && is_operatives_are_dead())
 		feedback_set_details("round_end_result","loss - evacuation - disk not secured")
 		to_chat(world, "<FONT size = 3><B>Syndicate Minor Victory!</B></FONT>")
 		to_chat(world, "<B>The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!</B>")
 
-	else if (!disk_rescued                                         &&  crew_evacuated)
+	else if(!disk_rescued                                         &&  crew_evacuated)
 		feedback_set_details("round_end_result","halfwin - detonation averted")
 		to_chat(world, "<FONT size = 3><B>Syndicate Minor Victory!</B></FONT>")
 		to_chat(world, "<B>[syndicate_name()] operatives recovered the abandoned authentication disk but detonation of [station_name()] was averted.</B> Next time, don't lose the disk!")
 
-	else if (!disk_rescued                                         && !crew_evacuated)
+	else if(!disk_rescued                                         && !crew_evacuated)
 		feedback_set_details("round_end_result","halfwin - interrupted")
 		to_chat(world, "<FONT size = 3><B>Neutral Victory</B></FONT>")
 		to_chat(world, "<B>Round was mysteriously interrupted!</B>")
@@ -399,11 +399,11 @@ proc/issyndicate(mob/living/M as mob)
 	var/randomname = pick(last_names)
 	var/newname = sanitize(copytext(input(M,"You are the nuke operative [pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")]. Please choose a last name for your family.", "Name change",randomname),1,MAX_NAME_LEN))
 
-	if (!newname)
+	if(!newname)
 		newname = randomname
 
 	else
-		if (newname == "Unknown" || newname == "floor" || newname == "wall" || newname == "rwall" || newname == "_")
+		if(newname == "Unknown" || newname == "floor" || newname == "wall" || newname == "rwall" || newname == "_")
 			to_chat(M, "That name is reserved.")
 			return nukelastname(M)
 
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 7b57764da16..18791cd15f0 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -39,20 +39,20 @@ var/bomb_set
 	return ..()
 
 /obj/machinery/nuclearbomb/process()
-	if (timing)
+	if(timing)
 		bomb_set = 1 //So long as there is one nuke timing, it means one nuke is armed.
 		timeleft = max(timeleft - 2, 0) // 2 seconds per process()
-		if (timeleft <= 0)
+		if(timeleft <= 0)
 			spawn
 				explode()
 		nanomanager.update_uis(src)
 	return
 
 /obj/machinery/nuclearbomb/attackby(obj/item/weapon/O as obj, mob/user as mob, params)
-	if (istype(O, /obj/item/weapon/screwdriver))
+	if(istype(O, /obj/item/weapon/screwdriver))
 		add_fingerprint(user)
-		if (auth)
-			if (panel_open == 0)
+		if(auth)
+			if(panel_open == 0)
 				panel_open = 1
 				overlays += image(icon, "npanel_open")
 				to_chat(user, "You unscrew the control panel of [src].")
@@ -63,9 +63,9 @@ var/bomb_set
 				to_chat(user, "You screw the control panel of [src] back on.")
 				playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
 		else
-			if (panel_open == 0)
+			if(panel_open == 0)
 				to_chat(user, "[src] emits a buzzing noise, the panel staying locked in.")
-			if (panel_open == 1)
+			if(panel_open == 1)
 				panel_open = 0
 				overlays -= image(icon, "npanel_open")
 				to_chat(user, "You screw the control panel of [src] back on.")
@@ -73,24 +73,24 @@ var/bomb_set
 			flick("nuclearbombc", src)
 		return
 
-	if (panel_open && (istype(O, /obj/item/device/multitool) || istype(O, /obj/item/weapon/wirecutters)))
+	if(panel_open && (istype(O, /obj/item/device/multitool) || istype(O, /obj/item/weapon/wirecutters)))
 		return attack_hand(user)
 
-	if (extended)
-		if (istype(O, /obj/item/weapon/disk/nuclear))
+	if(extended)
+		if(istype(O, /obj/item/weapon/disk/nuclear))
 			usr.drop_item()
 			O.loc = src
 			auth = O
 			add_fingerprint(user)
 			return attack_hand(user)
 
-	if (anchored)
+	if(anchored)
 		switch(removal_stage)
 			if(0)
 				if(istype(O,/obj/item/weapon/weldingtool))
 					var/obj/item/weapon/weldingtool/WT = O
 					if(!WT.isOn()) return
-					if (WT.get_fuel() < 5) // uses up 5 fuel.
+					if(WT.get_fuel() < 5) // uses up 5 fuel.
 						to_chat(user, "\red You need more fuel to complete this task.")
 						return
 
@@ -117,7 +117,7 @@ var/bomb_set
 
 					var/obj/item/weapon/weldingtool/WT = O
 					if(!WT.isOn()) return
-					if (WT.get_fuel() < 5) // uses up 5 fuel.
+					if(WT.get_fuel() < 5) // uses up 5 fuel.
 						to_chat(user, "\red You need more fuel to complete this task.")
 						return
 
@@ -157,12 +157,12 @@ var/bomb_set
 	attack_hand(user)
 
 /obj/machinery/nuclearbomb/attack_hand(mob/user as mob)
-	if (extended)
-		if (panel_open)
+	if(extended)
+		if(panel_open)
 			wires.Interact(user)
 		else
 			ui_interact(user)
-	else if (deployable)
+	else if(deployable)
 		if(removal_stage < 5)
 			anchored = 1
 			visible_message("\red With a steely snap, bolts slide out of [src] and anchor it to the flooring!")
@@ -179,13 +179,13 @@ var/bomb_set
 	data["is_syndicate"] = is_syndicate
 	data["hacking"] = 0
 	data["auth"] = is_auth(user)
-	if (is_auth(user))
-		if (yes_code)
+	if(is_auth(user))
+		if(yes_code)
 			data["authstatus"] = timing ? "Functional/Set" : "Functional"
 		else
 			data["authstatus"] = "Auth. S2"
 	else
-		if (timing)
+		if(timing)
 			data["authstatus"] = "Set"
 		else
 			data["authstatus"] = "Auth. S1"
@@ -196,13 +196,13 @@ var/bomb_set
 	data["anchored"] = anchored
 	data["yescode"] = yes_code
 	data["message"] = "AUTH"
-	if (is_auth(user))
+	if(is_auth(user))
 		data["message"] = code
-		if (yes_code)
+		if(yes_code)
 			data["message"] = "*****"
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "nuclear_bomb.tmpl", "Nuke Control Panel", 450, 550)
 		ui.set_initial_data(data)
 		ui.open()
@@ -216,7 +216,7 @@ var/bomb_set
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
 
-	if (deployable)
+	if(deployable)
 		to_chat(usr, "\red You close several panels to make [src] undeployable.")
 		deployable = 0
 	else
@@ -236,54 +236,54 @@ var/bomb_set
 	if(..())
 		return 1
 
-	if (href_list["auth"])
-		if (auth)
+	if(href_list["auth"])
+		if(auth)
 			auth.loc = loc
 			yes_code = 0
 			auth = null
 		else
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/weapon/disk/nuclear))
+			if(istype(I, /obj/item/weapon/disk/nuclear))
 				usr.drop_item()
 				I.loc = src
 				auth = I
-	if (is_auth(usr))
-		if (href_list["type"])
-			if (href_list["type"] == "E")
-				if (code == r_code)
+	if(is_auth(usr))
+		if(href_list["type"])
+			if(href_list["type"] == "E")
+				if(code == r_code)
 					yes_code = 1
 					code = null
 				else
 					code = "ERROR"
 			else
-				if (href_list["type"] == "R")
+				if(href_list["type"] == "R")
 					yes_code = 0
 					code = null
 				else
 					lastentered = text("[]", href_list["type"])
-					if (text2num(lastentered) == null)
+					if(text2num(lastentered) == null)
 						var/turf/LOC = get_turf(usr)
 						message_admins("[key_name_admin(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: <a href='?_src_=vars;Vars=\ref[src]'>[lastentered]</a>! ([LOC ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[LOC.x];Y=[LOC.y];Z=[LOC.z]'>JMP</a>" : "null"])", 0)
 						log_admin("EXPLOIT: [key_name(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]!")
 					else
 						code += lastentered
-						if (length(code) > 5)
+						if(length(code) > 5)
 							code = "ERROR"
-		if (yes_code)
-			if (href_list["time"])
+		if(yes_code)
+			if(href_list["time"])
 				var/time = text2num(href_list["time"])
 				timeleft += time
 				timeleft = min(max(round(src.timeleft), 120), 600)
-			if (href_list["timer"])
-				if (timing == -1.0)
+			if(href_list["timer"])
+				if(timing == -1.0)
 					nanomanager.update_uis(src)
 					return
-				if (safety)
+				if(safety)
 					to_chat(usr, "\red The safety is still on.")
 					nanomanager.update_uis(src)
 					return
 				timing = !(timing)
-				if (timing)
+				if(timing)
 					if(!lighthack)
 						icon_state = "nuclearbomb2"
 					if(!safety)
@@ -299,14 +299,14 @@ var/bomb_set
 					bomb_set = 0
 					if(!lighthack)
 						icon_state = "nuclearbomb1"
-			if (href_list["safety"])
+			if(href_list["safety"])
 				safety = !(safety)
 				if(safety)
 					if(!is_syndicate)
 						set_security_level(previous_level)
 					timing = 0
 					bomb_set = 0
-			if (href_list["anchor"])
+			if(href_list["anchor"])
 				if(removal_stage == 5)
 					anchored = 0
 					visible_message("\red \The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.")
@@ -328,7 +328,7 @@ var/bomb_set
 	return
 
 /obj/machinery/nuclearbomb/blob_act()
-	if (timing == -1.0)
+	if(timing == -1.0)
 		return
 	else
 		return ..()
@@ -336,7 +336,7 @@ var/bomb_set
 
 #define NUKERANGE 80
 /obj/machinery/nuclearbomb/proc/explode()
-	if (safety)
+	if(safety)
 		timing = 0
 		return
 	timing = -1.0
@@ -345,7 +345,7 @@ var/bomb_set
 	if(!lighthack)
 		icon_state = "nuclearbomb3"
 	playsound(src,'sound/machines/Alarm.ogg',100,0,5)
-	if (ticker && ticker.mode)
+	if(ticker && ticker.mode)
 		ticker.mode.explosion_in_progress = 1
 	sleep(100)
 
@@ -393,7 +393,7 @@ var/bomb_set
 	icon = 'icons/obj/items.dmi'
 	icon_state = "nucleardisk"
 	item_state = "card-id"
-	w_class = 1.0
+	w_class = 1
 
 /obj/item/weapon/disk/nuclear/New()
 	..()
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 320be6c9f98..804111a7ff6 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -4,7 +4,7 @@
 	icon_state = "pinoff"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	w_class = 2.0
+	w_class = 2
 	item_state = "electronic"
 	throw_speed = 4
 	throw_range = 20
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 19d725f8677..afda54e4204 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -457,16 +457,16 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \
 	proc/select_target()
 		var/list/possible_items_all = potential_theft_objectives+"custom"
 		var/new_target = input("Select target:", "Objective target", null) as null|anything in possible_items_all
-		if (!new_target) return
-		if (new_target == "custom")
+		if(!new_target) return
+		if(new_target == "custom")
 			var/datum/theft_objective/O=new
 			O.typepath = input("Select type:","Type") as null|anything in typesof(/obj/item)
-			if (!O.typepath) return
+			if(!O.typepath) return
 			var/tmp_obj = new O.typepath
 			var/custom_name = tmp_obj:name
 			qdel(tmp_obj)
 			O.name = sanitize(copytext(input("Enter target name:", "Objective target", custom_name) as text|null,1,MAX_NAME_LEN))
-			if (!O.name) return
+			if(!O.name) return
 			steal_target = O
 			explanation_text = "Steal [O.name]."
 		else
@@ -530,15 +530,15 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \
 /datum/objective/absorb
 	proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6)
 		target_amount = rand (lowbound,highbound)
-		if (ticker)
+		if(ticker)
 			var/n_p = 1 //autowin
-			if (ticker.current_state == GAME_STATE_SETTING_UP)
+			if(ticker.current_state == GAME_STATE_SETTING_UP)
 				for(var/mob/new_player/P in player_list)
 					if(P.client && P.ready && P.mind != owner)
 						if(P.client.prefs && (P.client.prefs.species == "Vox" || P.client.prefs.species == "Slime People" || P.client.prefs.species == "Machine")) // Special check for species that can't be absorbed. No better solution.
 							continue
 						n_p++
-			else if (ticker.current_state == GAME_STATE_PLAYING)
+			else if(ticker.current_state == GAME_STATE_PLAYING)
 				for(var/mob/living/carbon/human/P in player_list)
 					if(P.species.flags & NO_SCAN)
 						continue
@@ -630,7 +630,7 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \
 
 	check_completion()
 		if(target && target.current)
-			if (target.current.stat == DEAD)
+			if(target.current.stat == DEAD)
 				return 0
 
 			var/area/shuttle/vox/A = locate() //stupid fucking hardcoding
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index d35dd1534f7..b3f889377c8 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -42,7 +42,7 @@
 		restricted_jobs += protected_jobs
 
 
-	for (var/i=1 to max_headrevs)
+	for(var/i=1 to max_headrevs)
 		if(possible_revolutionaries.len==0)
 			break
 		var/datum/mind/lenin = pick(possible_revolutionaries)
@@ -107,7 +107,7 @@
 /datum/game_mode/proc/greet_revolutionary(datum/mind/rev_mind, you_are=1)
 	var/obj_count = 1
 	update_rev_icons_added(rev_mind)
-	if (you_are)
+	if(you_are)
 		to_chat(rev_mind.current, "<span class='userdanger'>You are a member of the revolutionaries' leadership!</span>")
 	for(var/datum/objective/objective in rev_mind.objectives)
 		to_chat(rev_mind.current, "<B>Objective #[obj_count]</B>: [objective.explanation_text]")
@@ -121,8 +121,8 @@
 	if(!istype(mob))
 		return
 
-	if (mob.mind)
-		if (mob.mind.assigned_role == "Clown")
+	if(mob.mind)
+		if(mob.mind.assigned_role == "Clown")
 			to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
 			mob.mutations.Remove(CLUMSY)
 
@@ -144,12 +144,12 @@
 
 	mob.update_icons()
 
-	if (!where2)
+	if(!where2)
 		to_chat(mob, "The Syndicate were unfortunately unable to get you a chameleon security HUD.")
 	else
 		to_chat(mob, "The chameleon security HUD in your [where2] will help you keep track of who is mindshield-implanted, and unable to be recruited.")
 
-	if (!where)
+	if(!where)
 		to_chat(mob, "The Syndicate were unfortunately unable to get you a flash.")
 	else
 		to_chat(mob, "The flash in your [where] will help you to persuade the crew to join your cause.")
@@ -411,10 +411,10 @@
 	var/revcount = 0
 	var/loycount = 0
 	for(var/datum/mind/M in ticker.mode:head_revolutionaries)
-		if (M.current && M.current.stat != DEAD)
+		if(M.current && M.current.stat != DEAD)
 			foecount++
 	for(var/datum/mind/M in ticker.mode:revolutionaries)
-		if (M.current && M.current.stat != DEAD)
+		if(M.current && M.current.stat != DEAD)
 			revcount++
 	for(var/mob/living/carbon/human/player in world)
 		if(player.mind)
diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm
index a5a23715d76..298f71bc991 100644
--- a/code/game/gamemodes/scoreboard.dm
+++ b/code/game/gamemodes/scoreboard.dm
@@ -39,7 +39,7 @@
 	if(shuttle_master.emergency.mode >= SHUTTLE_ENDGAME)
 		for(var/mob/living/player in mob_list)
 			if(player.client)
-				if (player.stat != DEAD)
+				if(player.stat != DEAD)
 					var/turf/location = get_turf(player.loc)
 					var/area/escape_zone = locate(/area/shuttle/escape)
 					if(location in escape_zone)
@@ -192,7 +192,7 @@
 	<b>Ore Mined:</b> [score_oremined] ([score_oremined * 2] Points)<br>
 	<b>Refreshments Prepared:</b> [score_meals] ([score_meals * 5] Points)<br>
 	<b>Research Completed:</b> [score_researchdone] ([score_researchdone * 30] Points)<br>"}
-	if (shuttle_master.emergency.mode == SHUTTLE_ENDGAME) dat += "<b>Shuttle Escapees:</b> [score_escapees] ([score_escapees * 25] Points)<br>"
+	if(shuttle_master.emergency.mode == SHUTTLE_ENDGAME) dat += "<b>Shuttle Escapees:</b> [score_escapees] ([score_escapees * 25] Points)<br>"
 	dat += {"<b>Random Events Endured:</b> [score_eventsendured] ([score_eventsendured * 50] Points)<br>
 	<b>Whole Station Powered:</b> [score_powerbonus ? "Yes" : "No"] ([score_powerbonus * 2500] Points)<br>
 	<b>Ultra-Clean Station:</b> [score_mess ? "No" : "Yes"] ([score_messbonus * 3000] Points)<br><br>
@@ -208,7 +208,7 @@
 	<b>Food Eaten:</b> [score_foodeaten] bites/sips<br>
 	<b>Times a Clown was Abused:</b> [score_clownabuse]<br><br>
 	"}
-	if (score_escapees)
+	if(score_escapees)
 		dat += {"<b>Richest Escapee:</b> [score_richestname], [score_richestjob]: $[num2text(score_richestcash,50)] ([score_richestkey])<br>
 		<b>Most Battered Escapee:</b> [score_dmgestname], [score_dmgestjob]: [score_dmgestdamage] damage ([score_dmgestkey])<br>"}
 	else
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index 8c0598d6d21..9c07064bca5 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -16,9 +16,9 @@
 
 /proc/setupgenetics()
 
-	if (prob(50))
+	if(prob(50))
 		BLOCKADD = rand(-300,300)
-	if (prob(75))
+	if(prob(75))
 		DIFFMUT = rand(0,20)
 
 
@@ -154,14 +154,14 @@
 
 /* This was used for something before, I think, but is not worth the effort to process now.
 /proc/setupcorpses()
-	for (var/obj/effect/landmark/A in landmarks_list)
-		if (A.name == "Corpse")
+	for(var/obj/effect/landmark/A in landmarks_list)
+		if(A.name == "Corpse")
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
 			M.real_name = "Corpse"
 			M.death()
 			qdel(A)
 			continue
-		if (A.name == "Corpse-Engineer")
+		if(A.name == "Corpse-Engineer")
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
 			M.real_name = "Corpse"
 			M.death()
@@ -174,16 +174,16 @@
 			M.equip_to_slot_or_del(new /obj/item/device/t_scanner(M), slot_r_store)
 			//M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back)
-			if (prob(50))
+			if(prob(50))
 				M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_wear_mask)
-			if (prob(50))
+			if(prob(50))
 				M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/hardhat(M), slot_head)
 			else
-				if (prob(50))
+				if(prob(50))
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/welding(M), slot_head)
 			del(A)
 			continue
-		if (A.name == "Corpse-Engineer-Space")
+		if(A.name == "Corpse-Engineer-Space")
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
 			M.real_name = "Corpse"
 			M.death()
@@ -197,16 +197,16 @@
 			M.equip_to_slot_or_del(new /obj/item/device/t_scanner(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_wear_mask)
-			if (prob(50))
+			if(prob(50))
 				M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/hardhat(M), slot_head)
 			else
-				if (prob(50))
+				if(prob(50))
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/welding(M), slot_head)
 				else
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space(M), slot_head)
 			del(A)
 			continue
-		if (A.name == "Corpse-Engineer-Chief")
+		if(A.name == "Corpse-Engineer-Chief")
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
 			M.real_name = "Corpse"
 			M.death()
@@ -218,16 +218,16 @@
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/device/t_scanner(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back)
-			if (prob(50))
+			if(prob(50))
 				M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_wear_mask)
-			if (prob(50))
+			if(prob(50))
 				M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/hardhat(M), slot_head)
 			else
-				if (prob(50))
+				if(prob(50))
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/welding(M), slot_head)
 			del(A)
 			continue
-		if (A.name == "Corpse-Syndicate")
+		if(A.name == "Corpse-Syndicate")
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
 			M.real_name = "Corpse"
 			M.death()
@@ -238,9 +238,9 @@
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_wear_mask)
-			if (prob(50))
+			if(prob(50))
 				M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate(M), slot_wear_suit)
-				if (prob(50))
+				if(prob(50))
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head)
 				else
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate(M), slot_head)
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index 1e16bbe3641..3b67e7bb4f3 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -352,7 +352,7 @@ Made by Xhuis
 		light_amount = T.get_lumcount() * 10
 		if(light_amount > LIGHT_DAM_THRESHOLD && !H.incorporeal_move)
 			H.take_overall_damage(0, LIGHT_DAMAGE_TAKEN/2)
-		else if (light_amount < LIGHT_HEAL_THRESHOLD)
+		else if(light_amount < LIGHT_HEAL_THRESHOLD)
 			H.heal_overall_damage(2,2)
 			H.adjustToxLoss(-5)
 			H.adjustBrainLoss(-25)
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index d81b50c1922..9c6989cb1b9 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -102,7 +102,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C)
 
 /datum/theft_objective/reactive
 	name = "the reactive teleport armor"
-	typepath = /obj/item/clothing/suit/armor/reactive
+	typepath = /obj/item/clothing/suit/armor/reactive/teleport
 	protected_jobs = list("Research Director")
 
 /datum/theft_objective/steal/documents
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index a3907981034..80ce1ef0a84 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -44,7 +44,7 @@
 		num_traitors = max(1, min(num_players(), traitors_possible))
 
 	for(var/j = 0, j < num_traitors, j++)
-		if (!possible_traitors.len)
+		if(!possible_traitors.len)
 			break
 		var/datum/mind/traitor = pick(possible_traitors)
 		traitors += traitor
@@ -146,7 +146,7 @@
 				traitor.objectives += steal_objective
 
 		if(is_hijacker && objective_count <= config.traitor_objectives_amount) //Don't assign hijack if it would exceed the number of objectives set in config.traitor_objectives_amount
-			if (!(locate(/datum/objective/hijack) in traitor.objectives))
+			if(!(locate(/datum/objective/hijack) in traitor.objectives))
 				var/datum/objective/hijack/hijack_objective = new
 				hijack_objective.owner = traitor
 				traitor.objectives += hijack_objective
@@ -183,7 +183,7 @@
 
 
 /datum/game_mode/proc/finalize_traitor(var/datum/mind/traitor)
-	if (istype(traitor.current, /mob/living/silicon))
+	if(istype(traitor.current, /mob/living/silicon))
 		add_law_zero(traitor.current)
 	else
 		equip_traitor(traitor.current)
@@ -284,11 +284,11 @@
 
 
 /datum/game_mode/proc/equip_traitor(mob/living/carbon/human/traitor_mob, var/safety = 0)
-	if (!istype(traitor_mob))
+	if(!istype(traitor_mob))
 		return
 	. = 1
-	if (traitor_mob.mind)
-		if (traitor_mob.mind.assigned_role == "Clown")
+	if(traitor_mob.mind)
+		if(traitor_mob.mind.assigned_role == "Clown")
 			to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
 			traitor_mob.mutations.Remove(CLUMSY)
 
@@ -297,20 +297,20 @@
 	if(!R)
 		R = locate(/obj/item/device/radio) in traitor_mob.contents
 
-	if (!R)
+	if(!R)
 		to_chat(traitor_mob, "Unfortunately, the Syndicate wasn't able to get you a radio.")
 		. = 0
 	else
-		if (istype(R, /obj/item/device/radio))
+		if(istype(R, /obj/item/device/radio))
 			// generate list of radio freqs
 			var/obj/item/device/radio/target_radio = R
 			var/freq = PUBLIC_LOW_FREQ
 			var/list/freqlist = list()
-			while (freq <= PUBLIC_HIGH_FREQ)
-				if (freq < 1451 || freq > 1459)
+			while(freq <= PUBLIC_HIGH_FREQ)
+				if(freq < 1451 || freq > 1459)
 					freqlist += freq
 				freq += 2
-				if ((freq % 2) == 0)
+				if((freq % 2) == 0)
 					freq += 1
 			freq = freqlist[rand(1, freqlist.len)]
 
@@ -320,7 +320,7 @@
 			target_radio.traitor_frequency = freq
 			to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features.")
 			traitor_mob.mind.store_memory("<B>Radio Freq:</B> [format_frequency(freq)] ([R.name] [T.loc]).")
-		else if (istype(R, /obj/item/device/pda))
+		else if(istype(R, /obj/item/device/pda))
 			// generate a passcode if the uplink is hidden in a PDA
 			var/pda_pass = "[rand(100,999)] [pick("Alpha","Bravo","Delta","Omega")]"
 
@@ -409,7 +409,7 @@
 
 	var/where = "At your feet"
 	var/equipped_slot = mob.equip_in_one_of_slots(folder, slots)
-	if (equipped_slot)
+	if(equipped_slot)
 		where = "In your [equipped_slot]"
 	to_chat(mob, "<BR><BR><span class='info'>[where] is a folder containing <b>secret documents</b> that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.</span><BR>")
 	mob.update_icons()
diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index 9037b04cfb4..2d8018a3f8e 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -155,12 +155,12 @@
 
 	switch(rand(1,100))
 		if(1 to 80)
-			if (!(locate(/datum/objective/escape) in vampire.objectives))
+			if(!(locate(/datum/objective/escape) in vampire.objectives))
 				var/datum/objective/escape/escape_objective = new
 				escape_objective.owner = vampire
 				vampire.objectives += escape_objective
 		else
-			if (!(locate(/datum/objective/survive) in vampire.objectives))
+			if(!(locate(/datum/objective/survive) in vampire.objectives))
 				var/datum/objective/survive/survive_objective = new
 				survive_objective.owner = vampire
 				vampire.objectives += survive_objective
@@ -173,15 +173,15 @@
 
 /datum/game_mode/proc/greet_vampire(var/datum/mind/vampire, var/you_are=1)
 	var/dat
-	if (you_are)
+	if(you_are)
 		dat = "<span class='danger'>You are a Vampire!</span><br>"
 	dat += {"To bite someone, target the head and use harm intent with an empty hand. Drink blood to gain new powers.
 You are weak to holy things and starlight. Don't go into space and avoid the Chaplain, the chapel and especially Holy Water."}
 	to_chat(vampire.current, dat)
 	to_chat(vampire.current, "<B>You must complete the following tasks:</B>")
 
-	if (vampire.current.mind)
-		if (vampire.current.mind.assigned_role == "Clown")
+	if(vampire.current.mind)
+		if(vampire.current.mind.assigned_role == "Clown")
 			to_chat(vampire.current, "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself.")
 			vampire.current.mutations.Remove(CLUMSY)
 
@@ -417,20 +417,20 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 
 /datum/vampire/proc/vamp_burn(severe_burn)
 	var/burn_chance = severe_burn ? 35 : 8
-	if(burn_chance && owner.health >= 50)
+	if(prob(burn_chance) && owner.health >= 50)
 		switch(owner.health)
 			if(75 to 100)
 				to_chat(owner, "<span class='warning'>Your skin flakes away...</span>")
 			if(50 to 75)
 				to_chat(owner, "<span class='warning'>Your skin sizzles!</span>")
 		owner.adjustFireLoss(3)
-	if(owner.health < 50)
+	else if(owner.health < 50)
 		if(!owner.on_fire)
 			to_chat(owner, "<span class='danger'>Your skin catches fire!</span>")
+			owner.emote("scream")
 		else
 			to_chat(owner, "<span class='danger'>You continue to burn!</span>")
-		owner.emote("scream")
-		owner.fire_stacks += 5
+		owner.adjust_fire_stacks(5)
 		owner.IgniteMob()
 	return
 
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 4dc42aacb4f..4f3b9f6166d 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -7,7 +7,7 @@
 	icon_state ="scroll2"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 1.0
+	w_class = 1
 	var/used = 0
 
 
@@ -46,7 +46,7 @@
 	if(loc == H || (in_range(src, H) && istype(loc, /turf)))
 		H.set_machine(src)
 		if(href_list["school"])
-			if (used)
+			if(used)
 				to_chat(H, "You already used this contract!")
 				return
 			used = 1
@@ -89,7 +89,7 @@
 				var/randomname = "[wizard_name_first] [wizard_name_second]"
 				var/newname = sanitize(copytext(input(M, "You are the wizard's apprentice. Would you like to change your name to something else?", "Name change", randomname) as null|text,1,MAX_NAME_LEN))
 
-				if (!newname)
+				if(!newname)
 					newname = randomname
 				M.mind.name = newname
 				M.real_name = newname
@@ -712,7 +712,7 @@ var/global/list/multiverse = list()
 
 /obj/item/device/necromantic_stone/proc/spawnheresy(mob/living/carbon/human/H as mob)
 	H.set_species("Human")
-	if (H.gender == MALE)
+	if(H.gender == MALE)
 		H.change_gender(FEMALE)
 
 	var/list/anime_hair =list("Odango", "Kusanagi Hair", "Pigtails", "Hime Cut", "Floorlength Braid", "Ombre", "Twincurls", "Twincurls 2")
@@ -867,4 +867,10 @@ var/global/list/multiverse = list()
 		target.adjust_fire_stacks(20)
 		target.IgniteMob()
 		GiveHint(target,1)
-	return ..()
\ No newline at end of file
+	return ..()
+
+/obj/item/organ/internal/heart/cursed/wizard
+	pump_delay = 60
+	heal_brute = 25
+	heal_burn = 25
+	heal_oxy = 25
\ No newline at end of file
diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm
index 8a5ba06f36f..97770b47944 100644
--- a/code/game/gamemodes/wizard/godhand.dm
+++ b/code/game/gamemodes/wizard/godhand.dm
@@ -8,7 +8,7 @@
 	icon_state = "syndballoon"
 	item_state = null
 	flags = ABSTRACT | NODROP
-	w_class = 5.0
+	w_class = 5
 	force = 0
 	throwforce = 0
 	throw_range = 0
@@ -33,7 +33,7 @@
 	qdel(src)
 
 /obj/item/weapon/melee/touch_attack/disintegrate
-	name = "\improper disintegrating touch"
+	name = "disintegrating touch"
 	desc = "This hand of mine glows with an awesome power!"
 	catchphrase = "EI NATH!!"
 	on_use_sound = "sound/magic/Disintegrate.ogg"
@@ -51,7 +51,7 @@
 	..()
 
 /obj/item/weapon/melee/touch_attack/fleshtostone
-	name = "\improper petrifying touch"
+	name = "petrifying touch"
 	desc = "That's the bottom line, because flesh to stone said so!"
 	catchphrase = "STAUN EI!!"
 	on_use_sound = "sound/magic/FleshToStone.ogg"
@@ -78,10 +78,38 @@
 	item_state = "disintegrate"
 
 /obj/item/weapon/melee/touch_attack/fake_disintegrate/afterattack(atom/target, mob/living/carbon/user, proximity)
-	if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //exploding after touching yourself would be bad
+	if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //not exploding after touching yourself would be bad
 		return
 	var/datum/effect/system/spark_spread/sparks = new
 	sparks.set_up(4, 0, target.loc) //no idea what the 0 is
 	sparks.start()
 	playsound(target.loc, 'sound/goonstation/effects/gib.ogg', 50, 1)
-	..()
\ No newline at end of file
+	..()
+
+/obj/item/weapon/melee/touch_attack/cluwne
+	name = "cluwne touch"
+	desc = "It's time to start clowning around."
+	catchphrase = "NWOLC EGNEVER"
+	on_use_sound = "sound/misc/sadtrombone.ogg"
+	icon_state = "cluwnecurse"
+	item_state = "cluwnecurse"
+
+/obj/item/weapon/melee/touch_attack/cluwne/afterattack(atom/target, mob/living/carbon/user, proximity)
+	if(!proximity || target == user || !ishuman(target) || !iscarbon(user) || user.lying || user.handcuffed) //clowning around after touching yourself would unsurprisingly, be bad
+		return
+
+	if(iswizard(target))
+		to_chat(user, "<span class='warning'>The spell has no effect on [target].</span>")
+		return
+
+	var/datum/effect/system/harmless_smoke_spread/s = new /datum/effect/system/harmless_smoke_spread
+	s.set_up(5, 0, target)
+	s.start()
+
+	var/mob/living/carbon/human/H = target
+	if(H.mind)
+		if(H.mind.assigned_role != "Cluwne")
+			H.makeCluwne()
+		else
+			H.makeAntiCluwne()
+	..()
diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm
index 645f3576edd..74500d32b03 100644
--- a/code/game/gamemodes/wizard/raginmages.dm
+++ b/code/game/gamemodes/wizard/raginmages.dm
@@ -18,7 +18,7 @@
 
 
 /datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1)
-	if (you_are)
+	if(you_are)
 		to_chat(wizard.current, "<B>\red You are the Space Wizard!</B>")
 	to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>")
 
@@ -72,7 +72,7 @@
 			continue // Could just be a bad connection, so SSD wiz's shouldn't be gibbed over it, but they're not "alive" either
 		wizards_alive++
 
-	if (wizards_alive)
+	if(wizards_alive)
 		if(!time_checked) time_checked = world.time
 		if(world.time > time_till_chaos && world.time > time_checked + delay_per_mage && (mages_made < wizard_cap))
 			time_checked = world.time
diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm
index f2c10d7fc10..37a2e641f31 100644
--- a/code/game/gamemodes/wizard/rightandwrong.dm
+++ b/code/game/gamemodes/wizard/rightandwrong.dm
@@ -18,7 +18,7 @@
 		var/randomizemagic = pick(magiclist)
 		var/randomizemagicspecial = pick(magicspeciallist)
 		if(!summon_type)
-			switch (randomizeguns)
+			switch(randomizeguns)
 				if("taser")
 					new /obj/item/weapon/gun/energy/gun/advtaser(get_turf(H))
 				if("egun")
@@ -89,7 +89,7 @@
 				if("medibeam")
 					new /obj/item/weapon/gun/medbeam(get_turf(H))
 		else
-			switch (randomizemagic)
+			switch(randomizemagic)
 				if("fireball")
 					new /obj/item/weapon/spellbook/oneuse/fireball(get_turf(H))
 				if("smoke")
@@ -131,7 +131,7 @@
 					new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(H))
 				if("scrying")
 					new /obj/item/weapon/scrying(get_turf(H))
-					if (!(XRAY in H.mutations))
+					if(!(XRAY in H.mutations))
 						H.mutations.Add(XRAY)
 						H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
 						H.see_in_dark = 8
@@ -141,7 +141,7 @@
 					new /obj/item/voodoo(get_turf(H))
 				if("special")
 					magiclist -= "special" //only one super OP item per summoning max
-					switch (randomizemagicspecial)
+					switch(randomizemagicspecial)
 						if("staffchange")
 							new /obj/item/weapon/gun/magic/staff/change(get_turf(H))
 						if("staffanimation")
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 39f59cc654e..8758d61fc1e 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -4,7 +4,7 @@
 	icon_state = "soulstone"
 	item_state = "electronic"
 	desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artifact's power."
-	w_class = 1.0
+	w_class = 1
 	slot_flags = SLOT_BELT
 	origin_tech = "bluespace=4;materials=4"
 	var/imprinted = "empty"
@@ -45,7 +45,7 @@
 ///////////////////Options for using captured souls///////////////////////////////////////
 
 	attack_self(mob/user)
-		if (!in_range(src, user))
+		if(!in_range(src, user))
 			return
 		user.set_machine(src)
 		var/dat = "<TT><B>Soul Stone</B><BR>"
@@ -63,7 +63,7 @@
 
 	Topic(href, href_list)
 		var/mob/U = usr
-		if (!in_range(src, U)||U.machine!=src)
+		if(!in_range(src, U)||U.machine!=src)
 			U << browse(null, "window=aicard")
 			U.unset_machine()
 			return
@@ -72,12 +72,12 @@
 		U.set_machine(src)
 
 		switch(href_list["choice"])//Now we switch based on choice.
-			if ("Close")
+			if("Close")
 				U << browse(null, "window=aicard")
 				U.unset_machine()
 				return
 
-			if ("Summon")
+			if("Summon")
 				for(var/mob/living/simple_animal/shade/A in src)
 					A.status_flags &= ~GODMODE
 					A.canmove = 1
@@ -110,7 +110,7 @@
 			if(C.imprinted != "empty")
 				to_chat(U, "<span class='danger'>Capture failed!</span>: The soul stone has already been imprinted with [C.imprinted]'s mind!")
 			else
-				if (T.stat == 0)
+				if(T.stat == 0)
 					to_chat(U, "<span class='danger'>Capture failed!</span>: Kill or maim the victim first!")
 				else
 					if(T.client == null)
@@ -136,7 +136,7 @@
 							S.faction |= "\ref[U]"
 							S.name = "Shade of [T.real_name]"
 							S.real_name = "Shade of [T.real_name]"
-							if (T.client)
+							if(T.client)
 								T.client.mob = S
 							S.cancel_camera()
 							C.icon_state = "soulstone2"
@@ -149,7 +149,7 @@
 		if("SHADE")
 			var/mob/living/simple_animal/shade/T = target
 			var/obj/item/device/soulstone/C = src
-			if (T.stat == DEAD)
+			if(T.stat == DEAD)
 				to_chat(U, "<span class='danger'>Capture failed!</span>: The shade has already been banished!")
 			else
 				if(C.contents.len)
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index ac487a8e703..e12d44c46c7 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -233,6 +233,11 @@
 	category = "Assistance"
 	cost = 1
 
+/datum/spellbook_entry/cluwne
+	name = "Curse of the Cluwne"
+	spell_type = /obj/effect/proc_holder/spell/targeted/touch/cluwne
+	log_name = "CC"
+
 /datum/spellbook_entry/item
 	name = "Buy Item"
 	refundable = 0
@@ -298,7 +303,7 @@
 
 /datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
 	if(..())
-		if (!(XRAY in user.mutations))
+		if(!(XRAY in user.mutations))
 			user.mutations.Add(XRAY)
 			user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
 			user.see_in_dark = 8
@@ -398,6 +403,14 @@
 	item_path = /obj/item/weapon/twohanded/singularityhammer
 	log_name = "SI"
 
+/datum/spellbook_entry/item/cursed_heart
+	name = "Cursed Heart"
+	desc = "A heart that has been revived by dark magicks, the user must concentrate to ensure the heart beats, but every beat heals them. It must beat every 6 seconds."
+	item_path = /obj/item/organ/internal/heart/cursed/wizard
+	log_name = "CH"
+	cost = 1
+	category = "Defensive"
+
 /datum/spellbook_entry/summon
 	name = "Summon Stuff"
 	category = "Rituals"
@@ -857,4 +870,4 @@
 	spell = /obj/effect/proc_holder/spell/targeted/touch/fake_disintegrate
 	spellname = "disintegrate"
 	icon_state ="bookfireball"
-	desc = "This book feels like it will rip stuff apart."
\ No newline at end of file
+	desc = "This book feels like it will rip stuff apart."
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index 6aa56d91c70..b648a40a55a 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -79,7 +79,7 @@
 			steal_objective.find_target()
 			wizard.objectives += steal_objective
 
-			if (!(locate(/datum/objective/escape) in wizard.objectives))
+			if(!(locate(/datum/objective/escape) in wizard.objectives))
 				var/datum/objective/escape/escape_objective = new
 				escape_objective.owner = wizard
 				wizard.objectives += escape_objective
@@ -94,7 +94,7 @@
 			steal_objective.find_target()
 			wizard.objectives += steal_objective
 
-			if (!(locate(/datum/objective/survive) in wizard.objectives))
+			if(!(locate(/datum/objective/survive) in wizard.objectives))
 				var/datum/objective/survive/survive_objective = new
 				survive_objective.owner = wizard
 				wizard.objectives += survive_objective
@@ -105,7 +105,7 @@
 			kill_objective.find_target()
 			wizard.objectives += kill_objective
 
-			if (!(locate(/datum/objective/hijack) in wizard.objectives))
+			if(!(locate(/datum/objective/hijack) in wizard.objectives))
 				var/datum/objective/hijack/hijack_objective = new
 				hijack_objective.owner = wizard
 				wizard.objectives += hijack_objective
@@ -116,7 +116,7 @@
 			steal_objective.find_target()
 			wizard.objectives += steal_objective
 
-			if (!(locate(/datum/objective/hijack) in wizard.objectives))
+			if(!(locate(/datum/objective/hijack) in wizard.objectives))
 				var/datum/objective/hijack/hijack_objective = new
 				hijack_objective.owner = wizard
 				wizard.objectives += hijack_objective
@@ -131,7 +131,7 @@
 	spawn(0)
 		var/newname = sanitize(copytext(input(wizard_mob, "You are the Space Wizard. Would you like to change your name to something else?", "Name change", randomname) as null|text,1,MAX_NAME_LEN))
 
-		if (!newname)
+		if(!newname)
 			newname = randomname
 
 		wizard_mob.real_name = newname
@@ -142,7 +142,7 @@
 
 
 /datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1)
-	if (you_are)
+	if(you_are)
 		to_chat(wizard.current, "<B>\red You are the Space Wizard!</B>")
 	to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>")
 
@@ -154,7 +154,7 @@
 
 
 /*/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob)
-	if (!istype(wizard_mob))
+	if(!istype(wizard_mob))
 		return
 	if(!config.feature_object_spell_system)
 		wizard_mob.verbs += /client/proc/jaunt
@@ -164,7 +164,7 @@
 */
 
 /datum/game_mode/proc/equip_wizard(mob/living/carbon/human/wizard_mob)
-	if (!istype(wizard_mob))
+	if(!istype(wizard_mob))
 		return
 
 	//So zards properly get their items when they are admin-made.
@@ -195,6 +195,7 @@
 	to_chat(wizard_mob, "In your pockets you will find a teleport scroll. Use it as needed.")
 	wizard_mob.mind.store_memory("<B>Remember:</B> do not forget to prepare your spells.")
 	wizard_mob.update_icons()
+	wizard_mob.gene_stability += DEFAULT_GENE_STABILITY //magic
 	return 1
 
 
@@ -216,7 +217,7 @@
 				continue
 			traitors_alive++
 
-	if (wizards_alive || traitors_alive || but_wait_theres_more)
+	if(wizards_alive || traitors_alive || but_wait_theres_more)
 		return ..()
 	else
 		finished = 1
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index e21078c7ad9..8c139dabdbd 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -506,7 +506,7 @@ var/const/access_trade_sol = 160
 //gets the actual job rank (ignoring alt titles)
 //this is used solely for sechuds
 /obj/proc/GetJobRealName()
-	if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
+	if(!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
 		return
 
 	var/rank
@@ -530,7 +530,7 @@ var/const/access_trade_sol = 160
 //gets the alt title, failing that the actual job rank
 //this is unused
 /obj/proc/sdsdsd()	//GetJobDisplayName
-	if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
+	if(!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
 		return
 
 	var/assignment
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index 9afc26351f4..a064f0247f5 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -59,7 +59,7 @@
 			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
 			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
 			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-		if (H.mind.role_alt_title)
+		if(H.mind.role_alt_title)
 			switch(H.mind.role_alt_title)
 				if("Coroner")
 					H.equip_or_collect(new /obj/item/clothing/under/rank/medical/mortician(H), slot_w_uniform)
@@ -216,7 +216,7 @@
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
 			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-		if (H.mind.role_alt_title)
+		if(H.mind.role_alt_title)
 			switch(H.mind.role_alt_title)
 				if("Psychiatrist")
 					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/psych(H), slot_w_uniform)
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 31c82b2a203..b3d1ab1e67f 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -123,7 +123,7 @@
 		H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/noir(H),slot_glasses)
 		H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves)
 		if(H.mind.role_alt_title && H.mind.role_alt_title == "Forensic Technician")
-			H.equip_or_collect(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
+			H.equip_or_collect(new /obj/item/clothing/suit/storage/det_suit/forensics/blue(H), slot_wear_suit)
 		else
 			H.equip_or_collect(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit)
 			H.equip_or_collect(new /obj/item/clothing/head/det_hat(H), slot_head)
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 12f01822cde..13370ae281d 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -81,8 +81,8 @@
 	spawn_positions = 2
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
-	access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning.
-	minimal_access = list(access_hydroponics, access_morgue, access_maint_tunnels) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning.
+	access = list(access_hydroponics, access_bar, access_kitchen)
+	minimal_access = list(access_hydroponics, access_maint_tunnels)
 	alt_titles = list("Hydroponicist", "Botanical Researcher")
 
 
@@ -299,7 +299,7 @@
 	title = "Janitor"
 	flag = JANITOR
 	department_flag = SUPPORT
-	total_positions = 2
+	total_positions = 1
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm
index 0df72eaf9d5..cec48fd834b 100644
--- a/code/game/jobs/job/support_chaplain.dm
+++ b/code/game/jobs/job/support_chaplain.dm
@@ -32,7 +32,7 @@
 			var/religion_name = "Christianity"
 			var/new_religion = sanitize(copytext(input(H, "You are the crew services officer. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name),1,MAX_NAME_LEN))
 
-			if (!new_religion)
+			if(!new_religion)
 				new_religion = religion_name
 
 			switch(lowertext(new_religion))
@@ -67,7 +67,7 @@
 			var/deity_name = "Space Jesus"
 			var/new_deity = sanitize(copytext(input(H, "Would you like to change your deity? Default is Space Jesus.", "Name change", deity_name),1,MAX_NAME_LEN))
 
-			if ((length(new_deity) == 0) || (new_deity == "Space Jesus") )
+			if((length(new_deity) == 0) || (new_deity == "Space Jesus") )
 				new_deity = deity_name
 			B.deity_name = new_deity
 
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 851cb4d0921..2409bda62ba 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -217,7 +217,7 @@ var/global/datum/controller/occupations/job_master
 		if((job.title == "AI") && (config) && (!config.allow_ai))	return 0
 
 		if(ticker.mode.name == "AI malfunction")	// malf. AIs are pre-selected before jobs
-			for (var/datum/mind/mAI in ticker.mode.malf_ai)
+			for(var/datum/mind/mAI in ticker.mode.malf_ai)
 				AssignRole(mAI.current, "AI")
 				ai_selected++
 			if(ai_selected)	return 1
@@ -382,9 +382,60 @@ var/global/datum/controller/occupations/job_master
 	proc/EquipRank(var/mob/living/carbon/human/H, var/rank, var/joined_late = 0)
 		if(!H)	return null
 		var/datum/job/job = GetJob(rank)
+		var/list/spawn_in_storage = list()
+
 		if(job)
+
+			//Equip custom gear loadout.
+			var/list/custom_equip_slots = list() //If more than one item takes the same slot, all after the first one spawn in storage.
+			var/list/custom_equip_leftovers = list()
+			if(H.client.prefs.gear && H.client.prefs.gear.len && job.title != "Cyborg" && job.title != "AI")
+				for(var/thing in H.client.prefs.gear)
+					var/datum/gear/G = gear_datums[thing]
+					if(G)
+						var/permitted
+						if(G.allowed_roles)
+							for(var/job_name in G.allowed_roles)
+								if(job.title == job_name)
+									permitted = 1
+						else
+							permitted = 1
+
+						if(G.whitelisted && (G.whitelisted != H.species.name || !is_alien_whitelisted(H, G.whitelisted)))
+							permitted = 0
+
+						if(!permitted)
+							to_chat(H, "<span class='warning'>Your current job or whitelist status does not permit you to spawn with [thing]!</span>")
+							continue
+
+						if(G.slot && !(G.slot in custom_equip_slots))
+							// This is a miserable way to fix the loadout overwrite bug, but the alternative requires
+							// adding an arg to a bunch of different procs. Will look into it after this merge. ~ Z
+							if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head)
+								custom_equip_leftovers += thing
+							else if(H.equip_to_slot_or_del(G.spawn_item(H), G.slot))
+								to_chat(H, "<span class='notice'>Equipping you with \the [thing]!</span>")
+								custom_equip_slots.Add(G.slot)
+							else
+								custom_equip_leftovers.Add(thing)
+						else
+							spawn_in_storage += thing
+
 			job.equip(H)
 			job.apply_fingerprints(H)
+
+			//If some custom items could not be equipped before, try again now.
+			for(var/thing in custom_equip_leftovers)
+				var/datum/gear/G = gear_datums[thing]
+				if(G.slot in custom_equip_slots)
+					spawn_in_storage += thing
+				else
+					var/metadata = H.client.prefs.gear[G.display_name]
+					if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot))
+						to_chat(H, "<span class='notice'>Equipping you with \the [thing]!</span>")
+						custom_equip_slots.Add(G.slot)
+					else
+						spawn_in_storage += thing
 		else
 			to_chat(H, "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator.")
 
@@ -467,6 +518,26 @@ var/global/datum/controller/occupations/job_master
 							H.equip_to_slot_or_del(BPK, slot_back,1)
 					H.species.equip(H)
 
+			//Deferred item spawning.
+			for(var/thing in spawn_in_storage)
+				var/datum/gear/G = gear_datums[thing]
+				var/metadata = H.client.prefs.gear[G.display_name]
+				var/item = G.spawn_item(null, metadata)
+
+				var/atom/placed_in = H.equip_or_collect(item)
+				if(placed_in)
+					to_chat(H, "<span class='notice'>Placing \the [item] in your [placed_in.name]!</span>")
+					continue
+				if(H.equip_to_appropriate_slot(item))
+					to_chat(H, "<span class='notice'>Placing \the [item] in your inventory!</span>")
+					continue
+				if(H.put_in_hands(item))
+					to_chat(H, "<span class='notice'>Placing \the [item] in your hands!</span>")
+					continue
+				to_chat(H, "<span class='danger'>Failed to locate a storage object on your mob, either you spawned with no arms and no backpack or this is a bug.</span>")
+				qdel(item)
+
+
 		to_chat(H, "<B>You are the [alt_title ? alt_title : rank].</B>")
 		to_chat(H, "<b>As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>")
 		if(job.req_admin_notify)
@@ -545,7 +616,7 @@ var/global/datum/controller/occupations/job_master
 				continue
 
 			job = trim(job)
-			if (!length(job))
+			if(!length(job))
 				continue
 
 			var/pos = findtext(job, "=")
diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm
index 1514b0440a8..345b65c1d6b 100644
--- a/code/game/jobs/whitelist.dm
+++ b/code/game/jobs/whitelist.dm
@@ -18,7 +18,7 @@ var/list/whitelist = list()
 */
 
 /proc/is_job_whitelisted(mob/M, var/rank)
-	if (guest_jobbans(rank))
+	if(guest_jobbans(rank))
 		if(!config.usewhitelist)
 			return 1
 		if(check_rights(R_ADMIN, 0))
@@ -53,7 +53,7 @@ var/list/whitelist = list()
 
 /proc/load_alienwhitelist()
 	var/text = file2text("config/alienwhitelist.txt")
-	if (!text)
+	if(!text)
 		diary << "Failed to load config/alienwhitelist.txt\n"
 	else
 		alien_whitelist = splittext(text, "\n")
@@ -84,7 +84,7 @@ var/list/whitelist = list()
 		return 0
 /*
 	if(M && species)
-		for (var/s in alien_whitelist)
+		for(var/s in alien_whitelist)
 			if(findtext(s,"[M.ckey] - [species]"))
 				return 1
 			if(findtext(s,"[M.ckey] - All"))
diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm
index bb8f7ac9184..7f1a89ab0a4 100644
--- a/code/game/machinery/Freezer.dm
+++ b/code/game/machinery/Freezer.dm
@@ -58,7 +58,7 @@
 
 	default_deconstruction_crowbar(I)
 
-	if (istype(I, /obj/item/weapon/wrench))
+	if(istype(I, /obj/item/weapon/wrench))
 		if(!panel_open)
 			to_chat(user, "<span class='notice'>Open the maintenance panel first.</span>")
 			return
@@ -112,15 +112,15 @@
 	data["targetGasTemperatureCelsius"] = round(current_temperature - T0C,1)
 
 	var/temp_class = "good"
-	if (air_contents.temperature > (T0C - 20))
+	if(air_contents.temperature > (T0C - 20))
 		temp_class = "bad"
-	else if (air_contents.temperature < (T0C - 20) && air_contents.temperature > (T0C - 100))
+	else if(air_contents.temperature < (T0C - 20) && air_contents.temperature > (T0C - 100))
 		temp_class = "average"
 	data["gasTemperatureClass"] = temp_class
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "freezer.tmpl", "Gas Cooling System", 540, 300)
@@ -134,7 +134,7 @@
 /obj/machinery/atmospherics/unary/cold_sink/freezer/Topic(href, href_list)
 	if(..())
 		return 1
-	if (href_list["toggleStatus"])
+	if(href_list["toggleStatus"])
 		src.on = !src.on
 		update_icon()
 	if(href_list["temp"])
@@ -218,7 +218,7 @@
 
 	default_deconstruction_crowbar(I)
 
-	if (istype(I, /obj/item/weapon/wrench))
+	if(istype(I, /obj/item/weapon/wrench))
 		if(!panel_open)
 			to_chat(user, "<span class='notice'>Open the maintenance panel first.</span>")
 			return
@@ -271,13 +271,13 @@
 	data["targetGasTemperatureCelsius"] = round(current_temperature - T0C,1)
 
 	var/temp_class = "normal"
-	if (air_contents.temperature > (T20C+40))
+	if(air_contents.temperature > (T20C+40))
 		temp_class = "bad"
 	data["gasTemperatureClass"] = temp_class
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "freezer.tmpl", "Gas Heating System", 540, 300)
@@ -291,7 +291,7 @@
 /obj/machinery/atmospherics/unary/heat_reservoir/heater/Topic(href, href_list)
 	if(..())
 		return 1
-	if (href_list["toggleStatus"])
+	if(href_list["toggleStatus"])
 		src.on = !src.on
 		update_icon()
 	if(href_list["temp"])
diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm
index 6e3c0e01a59..63a8aca926b 100644
--- a/code/game/machinery/OpTable.dm
+++ b/code/game/machinery/OpTable.dm
@@ -19,7 +19,7 @@
 	..()
 	for(dir in list(NORTH,EAST,SOUTH,WEST))
 		computer = locate(/obj/machinery/computer/operating, get_step(src, dir))
-		if (computer)
+		if(computer)
 			computer.table = src
 			break
 
@@ -30,12 +30,12 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				//SN src = null
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				src.density = 0
 		else
 	return
@@ -45,7 +45,7 @@
 		qdel(src)
 
 /obj/machinery/optable/attack_hand(mob/user as mob)
-	if (HULK in usr.mutations)
+	if(HULK in usr.mutations)
 		to_chat(usr, text("\blue You destroy the table."))
 		visible_message("\red [usr] destroys the operating table!")
 		src.density = 0
@@ -92,16 +92,16 @@
 	check_victim()
 
 /obj/machinery/optable/proc/take_victim(mob/living/carbon/C, mob/living/carbon/user as mob)
-	if (C == user)
+	if(C == user)
 		user.visible_message("[user] climbs on the operating table.","You climb on the operating table.")
 	else
 		visible_message("<span class='alert'>[C] has been laid on the operating table by [user].</span>")
-	if (C.client)
+	if(C.client)
 		C.client.perspective = EYE_PERSPECTIVE
 		C.client.eye = src
 	C.resting = 1
 	C.loc = src.loc
-	if (user.pulling == C)
+	if(user.pulling == C)
 		user.stop_pulling()
 	for(var/obj/O in src)
 		O.loc = src.loc
@@ -126,7 +126,7 @@
 	take_victim(usr,usr)
 
 /obj/machinery/optable/attackby(obj/item/weapon/W as obj, mob/living/carbon/user as mob, params)
-	if (istype(W, /obj/item/weapon/grab))
+	if(istype(W, /obj/item/weapon/grab))
 		if(iscarbon(W:affecting))
 			take_victim(W:affecting,usr)
 			qdel(W)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 5b796d5770d..3cf3cb9b198 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -51,7 +51,7 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				//SN src = null
 				qdel(src)
 				return
@@ -78,11 +78,11 @@
 	return
 
 /obj/machinery/sleep_console/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
-	if (istype(G, /obj/item/weapon/screwdriver))
+	if(istype(G, /obj/item/weapon/screwdriver))
 		default_deconstruction_screwdriver(user, "console-p", "console", G)
 		return
 
-	if (istype(G, /obj/item/weapon/wrench))
+	if(istype(G, /obj/item/weapon/wrench))
 		if(panel_open)
 			to_chat(user, "<span class='notice'>Close the maintenance panel first.</span>")
 			return
@@ -109,14 +109,14 @@
 	if(stat & (NOPOWER|BROKEN))
 		return
 
-	if (panel_open)
+	if(panel_open)
 		to_chat(user, "<span class='notice'>Close the maintenance panel first.</span>")
 		return
 
-	if (!src.connected)
+	if(!src.connected)
 		findsleeper()
 
-	if (src.connected)
+	if(src.connected)
 		ui_interact(user)
 
 /obj/machinery/sleep_console/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
@@ -125,7 +125,7 @@
 	data["hasOccupant"] = occupant ? 1 : 0
 	var/occupantData[0]
 	var/crisis = 0
-	if (occupant)
+	if(occupant)
 		occupantData["name"] = occupant.name
 		occupantData["stat"] = occupant.stat
 		occupantData["health"] = occupant.health
@@ -141,27 +141,27 @@
 		occupantData["maxTemp"] = 1000 // If you get a burning vox armalis into the sleeper, congratulations
 		// Because we can put simple_animals in here, we need to do something tricky to get things working nice
 		occupantData["temperatureSuitability"] = 0 // 0 is the baseline
-		if (ishuman(occupant) && occupant.species)
+		if(ishuman(occupant) && occupant.species)
 			// I wanna do something where the bar gets bluer as the temperature gets lower
 			// For now, I'll just use the standard format for the temperature status
 			var/datum/species/sp = occupant.species
-			if (occupant.bodytemperature < sp.cold_level_3)
+			if(occupant.bodytemperature < sp.cold_level_3)
 				occupantData["temperatureSuitability"] = -3
-			else if (occupant.bodytemperature < sp.cold_level_2)
+			else if(occupant.bodytemperature < sp.cold_level_2)
 				occupantData["temperatureSuitability"] = -2
-			else if (occupant.bodytemperature < sp.cold_level_1)
+			else if(occupant.bodytemperature < sp.cold_level_1)
 				occupantData["temperatureSuitability"] = -1
-			else if (occupant.bodytemperature > sp.heat_level_3)
+			else if(occupant.bodytemperature > sp.heat_level_3)
 				occupantData["temperatureSuitability"] = 3
-			else if (occupant.bodytemperature > sp.heat_level_2)
+			else if(occupant.bodytemperature > sp.heat_level_2)
 				occupantData["temperatureSuitability"] = 2
-			else if (occupant.bodytemperature > sp.heat_level_1)
+			else if(occupant.bodytemperature > sp.heat_level_1)
 				occupantData["temperatureSuitability"] = 1
-		else if (istype(occupant, /mob/living/simple_animal))
+		else if(istype(occupant, /mob/living/simple_animal))
 			var/mob/living/simple_animal/silly = occupant
-			if (silly.bodytemperature < silly.minbodytemp)
+			if(silly.bodytemperature < silly.minbodytemp)
 				occupantData["temperatureSuitability"] = -3
-			else if (silly.bodytemperature > silly.maxbodytemp)
+			else if(silly.bodytemperature > silly.maxbodytemp)
 				occupantData["temperatureSuitability"] = 3
 		// Blast you, imperial measurement system
 		occupantData["btCelsius"] = occupant.bodytemperature - T0C
@@ -171,7 +171,7 @@
 		crisis = (occupant.health < connected.min_health)
 		// I'm not sure WHY you'd want to put a simple_animal in a sleeper, but precedent is precedent
 		// Runtime is aptly named, isn't she?
-		if (ishuman(occupant) && occupant.vessel && !(occupant.species && occupant.species.flags & NO_BLOOD))
+		if(ishuman(occupant) && occupant.vessel && !(occupant.species && occupant.species.flags & NO_BLOOD))
 			occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
 			occupantData["hasBlood"] = 1
 			occupantData["bloodLevel"] = round(occupant.vessel.get_reagent_amount("blood"))
@@ -182,7 +182,7 @@
 	data["maxchem"] = connected.max_chem
 	data["minhealth"] = connected.min_health
 	data["dialysis"] = connected.filtering
-	if (connected.beaker)
+	if(connected.beaker)
 		data["isBeakerLoaded"] = 1
 		if(connected.beaker.reagents)
 			data["beakerFreeSpace"] = round(connected.beaker.reagents.maximum_volume - connected.beaker.reagents.total_volume)
@@ -190,7 +190,7 @@
 			data["beakerFreeSpace"] = 0
 
 	var/chemicals[0]
-	for (var/re in connected.injection_chems)
+	for(var/re in connected.injection_chems)
 		var/datum/reagent/temp = chemical_reagents_list[re]
 		if(temp)
 			var/reagent_amount = 0
@@ -198,15 +198,15 @@
 			var/injectable = occupant ? 1 : 0
 			var/overdosing = 0
 			var/caution = 0 // To make things clear that you're coming close to an overdose
-			if (crisis && !(temp.id in connected.emergency_chems))
+			if(crisis && !(temp.id in connected.emergency_chems))
 				injectable = 0
 
-			if (occupant && occupant.reagents)
+			if(occupant && occupant.reagents)
 				reagent_amount = occupant.reagents.get_reagent_amount(temp.id)
 				// If they're mashing the highest concentration, they get one warning
-				if (temp.overdose_threshold && reagent_amount + 10 > temp.overdose_threshold)
+				if(temp.overdose_threshold && reagent_amount + 10 > temp.overdose_threshold)
 					caution = 1
-				if (temp.id in occupant.reagents.overdose_list())
+				if(temp.id in occupant.reagents.overdose_list())
 					overdosing = 1
 
 			// Because I don't know how to do this on the nano side
@@ -216,7 +216,7 @@
 	data["chemicals"] = chemicals
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "sleeper.tmpl", ui_title, 550, 655)
 		ui.set_initial_data(data)
 		ui.open()
@@ -233,21 +233,21 @@
 		to_chat(usr, "<span class='notice'>Close the maintenance panel first.</span>")
 		return 0
 
-	if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
-		if (href_list["chemical"])
-			if (src.connected)
-				if (src.connected.occupant)
-					if (src.connected.occupant.stat == DEAD)
+	if((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
+		if(href_list["chemical"])
+			if(src.connected)
+				if(src.connected.occupant)
+					if(src.connected.occupant.stat == DEAD)
 						to_chat(usr, "<span class='danger'>This person has no life for to preserve anymore. Take them to a department capable of reanimating them.</span>")
 					else if(src.connected.occupant.health > src.connected.min_health || (href_list["chemical"] in connected.emergency_chems))
 						src.connected.inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"]))
 					else
 						to_chat(usr, "<span class='danger'>This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!</span>")
-		if (href_list["removebeaker"])
+		if(href_list["removebeaker"])
 			src.connected.remove_beaker()
-		if (href_list["togglefilter"])
+		if(href_list["togglefilter"])
 			src.connected.toggle_filter()
-		if (href_list["ejectify"])
+		if(href_list["ejectify"])
 			src.connected.eject()
 		src.add_fingerprint(usr)
 	return 1
@@ -380,7 +380,7 @@
 /obj/machinery/sleeper/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
 	if(istype(G, /obj/item/weapon/reagent_containers/glass))
 		if(!beaker)
-			if (!user.drop_item())
+			if(!user.drop_item())
 				to_chat(user, "<span class='warning'>\The [G] is stuck to you!</span>")
 				return
 
@@ -393,14 +393,14 @@
 			to_chat(user, "<span class='warning'>The sleeper has a beaker already.</span>")
 			return
 
-	if (istype(G, /obj/item/weapon/screwdriver))
+	if(istype(G, /obj/item/weapon/screwdriver))
 		if(src.occupant)
 			to_chat(user, "<span class='notice'>The maintenance panel is locked.</span>")
 			return
 		default_deconstruction_screwdriver(user, "sleeper-o", "sleeper-open", G)
 		return
 
-	if (istype(G, /obj/item/weapon/wrench))
+	if(istype(G, /obj/item/weapon/wrench))
 		if(src.occupant)
 			to_chat(user, "<span class='notice'>The scanner is occupied.</span>")
 			return
@@ -497,8 +497,8 @@
 // ???
 // This looks cool, although mildly broken, should it be included again?
 /obj/machinery/sleeper/alter_health(mob/living/M as mob)
-	if (M.health > 0)
-		if (M.getOxyLoss() >= 10)
+	if(M.health > 0)
+		if(M.getOxyLoss() >= 10)
 			var/amount = max(0.15, 1)
 			M.adjustOxyLoss(-amount)
 		else
@@ -507,7 +507,7 @@
 	M.AdjustParalysis(-4)
 	M.AdjustWeakened(-4)
 	M.AdjustStunned(-4)
-	if (M:reagents.get_reagent_amount("salglu_solution") < 5)
+	if(M:reagents.get_reagent_amount("salglu_solution") < 5)
 		M:reagents.add_reagent("salglu_solution", 5)
 	return
 
@@ -533,7 +533,7 @@
 		A.forceMove(loc)
 
 /obj/machinery/sleeper/proc/inject_chemical(mob/living/user as mob, chemical, amount)
-	if (!(chemical in injection_chems))
+	if(!(chemical in injection_chems))
 		to_chat(user, "<span class='notice'>The sleeper does not offer that chemical!</notice>")
 		return
 
@@ -645,7 +645,7 @@
 	if(src.occupant)
 		to_chat(usr, "<span class='boldnotice'>The sleeper is already occupied!</span>")
 		return
-	if (panel_open)
+	if(panel_open)
 		to_chat(usr, "<span class='boldnotice'>Close the maintenance panel first.</span>")
 		return
 	if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 67f348a605b..157ffaf5cac 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -47,14 +47,14 @@
 	RefreshParts()
 
 /obj/machinery/bodyscanner/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
-	if (istype(G, /obj/item/weapon/screwdriver))
+	if(istype(G, /obj/item/weapon/screwdriver))
 		if(src.occupant)
 			to_chat(user, "<span class='notice'>The maintenance panel is locked.</span>")
 			return
 		default_deconstruction_screwdriver(user, "bodyscanner-o", "bodyscanner-open", G)
 		return
 
-	if (istype(G, /obj/item/weapon/wrench))
+	if(istype(G, /obj/item/weapon/wrench))
 		if(src.occupant)
 			to_chat(user, "<span class='notice'>The scanner is occupied.</span>")
 			return
@@ -178,14 +178,14 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(src.loc)
 					A.ex_act(severity)
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(src.loc)
 					A.ex_act(severity)
@@ -251,7 +251,7 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				//SN src = null
 				qdel(src)
 				return
@@ -282,11 +282,11 @@
 
 
 /obj/machinery/body_scanconsole/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
-	if (istype(G, /obj/item/weapon/screwdriver))
+	if(istype(G, /obj/item/weapon/screwdriver))
 		default_deconstruction_screwdriver(user, "bodyscannerconsole-p", "bodyscannerconsole", G)
 		return
 
-	if (istype(G, /obj/item/weapon/wrench))
+	if(istype(G, /obj/item/weapon/wrench))
 		if(panel_open)
 			to_chat(user, "<span class='notice'>Close the maintenance panel first.</span>")
 			return
@@ -311,7 +311,7 @@
 	if(stat & (NOPOWER|BROKEN))
 		return
 
-	if (panel_open)
+	if(panel_open)
 		to_chat(user, "<span class='notice'>Close the maintenance panel first.</span>")
 		return
 
@@ -460,13 +460,13 @@
 	if(..())
 		return 1
 
-	if (href_list["ejectify"])
+	if(href_list["ejectify"])
 		src.connected.eject()
 
-	if (href_list["print_p"])
+	if(href_list["print_p"])
 		generate_printing_text()
 
-		if (!(printing) && printing_text)
+		if(!(printing) && printing_text)
 			printing = 1
 			visible_message("<span class='notice'>\The [src] rattles and prints out a sheet of paper.</span>")
 			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc)
@@ -584,20 +584,20 @@
 					robot = "Prosthetic:"
 				if(e.open)
 					open = "Open:"
-				switch (e.germ_level)
-					if (INFECTION_LEVEL_ONE to INFECTION_LEVEL_ONE + 200)
+				switch(e.germ_level)
+					if(INFECTION_LEVEL_ONE to INFECTION_LEVEL_ONE + 200)
 						infected = "Mild Infection:"
-					if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
+					if(INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
 						infected = "Mild Infection+:"
-					if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
+					if(INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
 						infected = "Mild Infection++:"
-					if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
+					if(INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
 						infected = "Acute Infection:"
-					if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
+					if(INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
 						infected = "Acute Infection+:"
-					if (INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 400)
+					if(INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 400)
 						infected = "Acute Infection++:"
-					if (INFECTION_LEVEL_THREE to INFINITY)
+					if(INFECTION_LEVEL_THREE to INFINITY)
 						infected = "Septic:"
 
 				var/unknown_body = 0
@@ -616,18 +616,18 @@
 			for(var/obj/item/organ/internal/i in occupant.internal_organs)
 				var/mech = i.desc
 				var/infection = "None"
-				switch (i.germ_level)
-					if (1 to INFECTION_LEVEL_ONE + 200)
+				switch(i.germ_level)
+					if(1 to INFECTION_LEVEL_ONE + 200)
 						infection = "Mild Infection:"
-					if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
+					if(INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
 						infection = "Mild Infection+:"
-					if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
+					if(INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
 						infection = "Mild Infection++:"
-					if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
+					if(INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
 						infection = "Acute Infection:"
-					if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
+					if(INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
 						infection = "Acute Infection+:"
-					if (INFECTION_LEVEL_TWO + 300 to INFINITY)
+					if(INFECTION_LEVEL_TWO + 300 to INFINITY)
 						infection = "Acute Infection++:"
 
 				dat += "<tr>"
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index 9869e2650f9..1be15bef9e9 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -31,18 +31,18 @@
 /obj/machinery/ai_slipper/attackby(obj/item/weapon/W, mob/user, params)
 	if(stat & (NOPOWER|BROKEN))
 		return
-	if (istype(user, /mob/living/silicon))
+	if(istype(user, /mob/living/silicon))
 		return src.attack_hand(user)
 	else // trying to unlock the interface
-		if (src.allowed(usr))
+		if(src.allowed(usr))
 			locked = !locked
 			to_chat(user, "You [ locked ? "lock" : "unlock"] the device.")
-			if (locked)
-				if (user.machine==src)
+			if(locked)
+				if(user.machine==src)
 					user.unset_machine()
 					user << browse(null, "window=ai_slipper")
 			else
-				if (user.machine==src)
+				if(user.machine==src)
 					src.attack_hand(usr)
 		else
 			to_chat(user, "\red Access denied.")
@@ -55,8 +55,8 @@
 /obj/machinery/ai_slipper/attack_hand(mob/user as mob)
 	if(stat & (NOPOWER|BROKEN))
 		return
-	if ( (get_dist(src, user) > 1 ))
-		if (!istype(user, /mob/living/silicon))
+	if( (get_dist(src, user) > 1 ))
+		if(!istype(user, /mob/living/silicon))
 			to_chat(user, text("Too far away."))
 			user.unset_machine()
 			user << browse(null, "window=ai_slipper")
@@ -64,9 +64,9 @@
 
 	user.set_machine(src)
 	var/loc = src.loc
-	if (istype(loc, /turf))
+	if(istype(loc, /turf))
 		loc = loc:loc
-	if (!istype(loc, /area))
+	if(!istype(loc, /area))
 		to_chat(user, text("Turret badly positioned - loc.loc is [].", loc))
 		return
 	var/area/area = loc
@@ -85,14 +85,14 @@
 /obj/machinery/ai_slipper/Topic(href, href_list)
 	if(..())
 		return 1
-	if (src.locked)
-		if (!istype(usr, /mob/living/silicon))
+	if(src.locked)
+		if(!istype(usr, /mob/living/silicon))
 			to_chat(usr, "Control panel is locked!")
 			return
-	if (href_list["toggleOn"])
+	if(href_list["toggleOn"])
 		src.disabled = !src.disabled
 		icon_state = src.disabled? "motion0":"motion3"
-	if (href_list["toggleUse"])
+	if(href_list["toggleUse"])
 		if(cooldown_on || disabled)
 			return
 		else
@@ -116,9 +116,9 @@
 
 		cooldown_timeleft = (ticksleft / 10)
 		sleep(5)
-	if (uses <= 0)
+	if(uses <= 0)
 		return
-	if (uses >= 0)
+	if(uses >= 0)
 		cooldown_on = 0
 	src.power_change()
 	return
\ No newline at end of file
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 4a2d7103593..a91e0659c0a 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -13,13 +13,13 @@
 	max2 = _max2
 
 /datum/tlv/proc/get_danger_level(curval as num)
-	if (max2 >=0 && curval>max2)
+	if(max2 >=0 && curval>max2)
 		return 2
-	if (min2 >=0 && curval<min2)
+	if(min2 >=0 && curval<min2)
 		return 2
-	if (max1 >=0 && curval>max1)
+	if(max1 >=0 && curval>max1)
 		return 1
-	if (min1 >=0 && curval<min1)
+	if(min1 >=0 && curval<min1)
 		return 1
 	return 0
 
@@ -134,8 +134,8 @@
 
 /obj/machinery/alarm/proc/apply_preset(var/no_cycle_after=0)
 	// Propogate settings.
-	for (var/obj/machinery/alarm/AA in alarm_area)
-		if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.preset != src.preset)
+	for(var/obj/machinery/alarm/AA in alarm_area)
+		if(!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.preset != src.preset)
 			AA.preset=preset
 			apply_preset(1) // Only this air alarm should send a cycle.
 
@@ -219,26 +219,26 @@
 /obj/machinery/alarm/proc/first_run()
 	alarm_area = get_area(src)
 	area_uid = alarm_area.uid
-	if (name == "alarm")
+	if(name == "alarm")
 		name = "[alarm_area.name] Air Alarm"
 	apply_preset(1) // Don't cycle.
 	air_alarm_repository.update_cache(src)
 
 /obj/machinery/alarm/initialize()
 	set_frequency(frequency)
-	if (!master_is_operating())
+	if(!master_is_operating())
 		elect_master()
 
 /obj/machinery/alarm/proc/master_is_operating()
-	if (! alarm_area)
+	if(! alarm_area)
 		alarm_area = areaMaster
 
 	return alarm_area.master_air_alarm && !(alarm_area.master_air_alarm.stat & (NOPOWER|BROKEN))
 
 
 /obj/machinery/alarm/proc/elect_master()
-	for (var/obj/machinery/alarm/AA in alarm_area)
-		if (!(AA.stat & (NOPOWER|BROKEN)))
+	for(var/obj/machinery/alarm/AA in alarm_area)
+		if(!(AA.stat & (NOPOWER|BROKEN)))
 			alarm_area.master_air_alarm = AA
 			return 1
 	return 0
@@ -294,10 +294,10 @@
 		temperature_dangerlevel
 	)
 
-	if (old_danger_level!=danger_level)
+	if(old_danger_level!=danger_level)
 		apply_danger_level()
 
-	if (mode == AALARM_MODE_REPLACEMENT && environment_pressure < ONE_ATMOSPHERE * 0.05)
+	if(mode == AALARM_MODE_REPLACEMENT && environment_pressure < ONE_ATMOSPHERE * 0.05)
 		mode = AALARM_MODE_SCRUBBING
 		apply_mode()
 
@@ -348,30 +348,30 @@
 		return
 
 	switch(max(danger_level, alarm_area.atmosalm-1))
-		if (0)
+		if(0)
 			icon_state = "alarm0"
-		if (1)
+		if(1)
 			icon_state = "alarm2" //yes, alarm2 is yellow alarm
-		if (2)
+		if(2)
 			icon_state = "alarm1"
 
 /obj/machinery/alarm/receive_signal(datum/signal/signal)
 	if(stat & (NOPOWER|BROKEN) || !alarm_area)
 		return
-	if (alarm_area.master_air_alarm != src)
-		if (master_is_operating())
+	if(alarm_area.master_air_alarm != src)
+		if(master_is_operating())
 			return
 		elect_master()
-		if (alarm_area.master_air_alarm != src)
+		if(alarm_area.master_air_alarm != src)
 			return
 	if(!signal || signal.encryption)
 		return
 	var/id_tag = signal.data["tag"]
-	if (!id_tag)
+	if(!id_tag)
 		return
-	if (signal.data["area"] != area_uid)
+	if(signal.data["area"] != area_uid)
 		return
-	if (signal.data["sigtype"] != "status")
+	if(signal.data["sigtype"] != "status")
 		return
 
 	var/dev_type = signal.data["device"]
@@ -389,10 +389,10 @@
 
 /obj/machinery/alarm/proc/register_env_machine(var/m_id, var/device_type)
 	var/new_name
-	if (device_type=="AVP")
+	if(device_type=="AVP")
 		new_name = "[alarm_area.name] Vent Pump #[alarm_area.air_vent_names.len+1]"
 		alarm_area.air_vent_names[m_id] = new_name
-	else if (device_type=="AScr")
+	else if(device_type=="AScr")
 		new_name = "[alarm_area.name] Air Scrubber #[alarm_area.air_scrub_names.len+1]"
 		alarm_area.air_scrub_names[m_id] = new_name
 	else
@@ -403,12 +403,12 @@
 /obj/machinery/alarm/proc/refresh_all()
 	for(var/id_tag in alarm_area.air_vent_names)
 		var/list/I = alarm_area.air_vent_info[id_tag]
-		if (I && I["timestamp"]+AALARM_REPORT_TIMEOUT/2 > world.time)
+		if(I && I["timestamp"]+AALARM_REPORT_TIMEOUT/2 > world.time)
 			continue
 		send_signal(id_tag, list("status") )
 	for(var/id_tag in alarm_area.air_scrub_names)
 		var/list/I = alarm_area.air_scrub_info[id_tag]
-		if (I && I["timestamp"]+AALARM_REPORT_TIMEOUT/2 > world.time)
+		if(I && I["timestamp"]+AALARM_REPORT_TIMEOUT/2 > world.time)
 			continue
 		send_signal(id_tag, list("status") )
 
@@ -546,7 +546,7 @@
 				))
 
 /obj/machinery/alarm/proc/apply_danger_level(var/new_danger_level)
-	if (report_danger_level && alarm_area.atmosalert(new_danger_level, src))
+	if(report_danger_level && alarm_area.atmosalert(new_danger_level, src))
 		post_alert(new_danger_level)
 
 	update_icon()
@@ -564,9 +564,9 @@
 
 	if(alert_level==2)
 		alert_signal.data["alert"] = "severe"
-	else if (alert_level==1)
+	else if(alert_level==1)
 		alert_signal.data["alert"] = "minor"
-	else if (alert_level==0)
+	else if(alert_level==0)
 		alert_signal.data["alert"] = "clear"
 
 	frequency.post_signal(src, alert_signal)
@@ -614,7 +614,7 @@
 
 /obj/machinery/alarm/attack_hand(mob/user)
 	. = ..()
-	if (.)
+	if(.)
 		return
 	return interact(user)
 
@@ -781,7 +781,7 @@
 		"carbon dioxide" = "CO<sub>2</sub>",
 		"plasma"         = "Toxin",
 		"other"          = "Other")
-	for (var/g in gas_names)
+	for(var/g in gas_names)
 		thresholds += list(list("name" = gas_names[g], "settings" = list()))
 		selected = TLV[g]
 		thresholds[thresholds.len]["settings"] += list(list("env" = g, "val" = "min2", "selected" = selected.min2))
@@ -926,15 +926,15 @@
 				var/datum/tlv/tlv = TLV[env]
 				var/newval = input("Enter [varname] for [env]", "Alarm triggers", tlv.vars[varname]) as num|null
 
-				if (isnull(newval) || ..(href, href_list, nowindow, state))
+				if(isnull(newval) || ..(href, href_list, nowindow, state))
 					return
-				if (newval<0)
+				if(newval<0)
 					tlv.vars[varname] = -1.0
-				else if (env=="temperature" && newval>5000)
+				else if(env=="temperature" && newval>5000)
 					tlv.vars[varname] = 5000
-				else if (env=="pressure" && newval>50*ONE_ATMOSPHERE)
+				else if(env=="pressure" && newval>50*ONE_ATMOSPHERE)
 					tlv.vars[varname] = 50*ONE_ATMOSPHERE
-				else if (env!="temperature" && env!="pressure" && newval>200)
+				else if(env!="temperature" && env!="pressure" && newval>200)
 					tlv.vars[varname] = 200
 				else
 					newval = round(newval,0.01)
@@ -948,14 +948,14 @@
 		return 1
 
 	if(href_list["atmos_alarm"])
-		if (alarm_area.atmosalert(2, src))
+		if(alarm_area.atmosalert(2, src))
 			apply_danger_level(2)
 		alarmActivated = 1
 		update_icon()
 		return 1
 
 	if(href_list["atmos_reset"])
-		if (alarm_area.atmosalert(0, src))
+		if(alarm_area.atmosalert(0, src))
 			apply_danger_level(0)
 		alarmActivated = 0
 		update_icon()
@@ -1014,7 +1014,7 @@
 				return
 
 			if(istype(W, /obj/item/weapon/wirecutters))  // cutting the wires out
-				if (wires.wires_status == 31) // all wires cut
+				if(wires.wires_status == 31) // all wires cut
 					var/obj/item/stack/cable_coil/new_coil = new /obj/item/stack/cable_coil()
 					new_coil.amount = 5
 					new_coil.loc = user.loc
@@ -1022,10 +1022,10 @@
 					update_icon()
 					return
 
-			if (wiresexposed && ((istype(W, /obj/item/device/multitool) || istype(W, /obj/item/weapon/wirecutters))))
+			if(wiresexposed && ((istype(W, /obj/item/device/multitool) || istype(W, /obj/item/weapon/wirecutters))))
 				return attack_hand(user)
 
-			if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
+			if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
 				if(stat & (NOPOWER|BROKEN))
 					to_chat(user, "It does nothing")
 					return
@@ -1061,6 +1061,8 @@
 				to_chat(user, "You start prying out the circuit.")
 				playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
 				if(do_after(user,20, target = src))
+					if(buildstage != 1)
+						return
 					to_chat(user, "You pry out the circuit!")
 					var/obj/item/weapon/airalarm_electronics/circuit = new /obj/item/weapon/airalarm_electronics()
 					circuit.loc = user.loc
@@ -1093,9 +1095,9 @@
 
 /obj/machinery/alarm/examine(mob/user)
 	..(user)
-	if (buildstage < 2)
+	if(buildstage < 2)
 		to_chat(user, "It is not wired.")
-	if (buildstage < 1)
+	if(buildstage < 1)
 		to_chat(user, "The circuit is missing.")
 
 /*
@@ -1107,5 +1109,5 @@ Just an object used in constructing air alarms
 	icon = 'icons/obj/doors/door_assembly.dmi'
 	icon_state = "door_electronics"
 	desc = "Looks like a circuit. Probably is."
-	w_class = 2.0
+	w_class = 2
 	materials = list(MAT_METAL=50, MAT_GLASS=50)
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 14b3ca3fc59..7eb01d06988 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -178,7 +178,7 @@ update_flag
 (note: colors and decals has to be applied every icon update)
 */
 
-	if (src.destroyed)
+	if(src.destroyed)
 		src.overlays = 0
 		src.icon_state = text("[]-1", src.canister_color["prim"])//yes, I KNOW the colours don't reflect when the can's borked, whatever.
 
@@ -217,27 +217,27 @@ update_flag
 
 //template modification exploit prevention, used in Topic()
 /obj/machinery/portable_atmospherics/canister/proc/is_a_color(var/inputVar, var/checkColor = "all")
-	if (checkColor == "prim" || checkColor == "all")
+	if(checkColor == "prim" || checkColor == "all")
 		for(var/list/L in canister_icon_container.possiblemaincolor)
-			if (L["icon"] == inputVar)
+			if(L["icon"] == inputVar)
 				return 1
-	if (checkColor == "sec" || checkColor == "all")
+	if(checkColor == "sec" || checkColor == "all")
 		for(var/list/L in canister_icon_container.possibleseccolor)
-			if (L["icon"] == inputVar)
+			if(L["icon"] == inputVar)
 				return 1
-	if (checkColor == "ter" || checkColor == "all")
+	if(checkColor == "ter" || checkColor == "all")
 		for(var/list/L in canister_icon_container.possibletertcolor)
-			if (L["icon"] == inputVar)
+			if(L["icon"] == inputVar)
 				return 1
-	if (checkColor == "quart" || checkColor == "all")
+	if(checkColor == "quart" || checkColor == "all")
 		for(var/list/L in canister_icon_container.possiblequartcolor)
-			if (L["icon"] == inputVar)
+			if(L["icon"] == inputVar)
 				return 1
 	return 0
 
 /obj/machinery/portable_atmospherics/canister/proc/is_a_decal(var/inputVar)
 	for(var/list/L in canister_icon_container.possibledecals)
-		if (L["icon"] == inputVar)
+		if(L["icon"] == inputVar)
 			return 1
 	return 0
 
@@ -250,7 +250,7 @@ update_flag
 	if(destroyed)
 		return 1
 
-	if (src.health <= 10)
+	if(src.health <= 10)
 		var/atom/location = src.loc
 		location.assume_air(air_contents)
 		air_update_turf()
@@ -260,7 +260,7 @@ update_flag
 		src.density = 0
 		update_icon()
 
-		if (src.holding)
+		if(src.holding)
 			src.holding.loc = src.loc
 			src.holding = null
 
@@ -269,7 +269,7 @@ update_flag
 		return 1
 
 /obj/machinery/portable_atmospherics/canister/process()
-	if (destroyed)
+	if(destroyed)
 		return
 
 	..()
@@ -383,7 +383,7 @@ update_flag
 	return src.ui_interact(user)
 
 /obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if (src.destroyed)
+	if(src.destroyed)
 		return
 
 	init_data_vars() //set up var/colorcontainer and var/possibledecals
@@ -404,12 +404,12 @@ update_flag
 	data["valveOpen"] = valve_open ? 1 : 0
 
 	data["hasHoldingTank"] = holding ? 1 : 0
-	if (holding)
+	if(holding)
 		data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.return_pressure()))
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "canister.tmpl", "Canister", 480, 400, state = physical_state)
@@ -428,18 +428,18 @@ update_flag
 	if(..())
 		return 1
 
-	if (href_list["choice"] == "menu")
+	if(href_list["choice"] == "menu")
 		menu = text2num(href_list["mode_target"])
 
 	if(href_list["toggle"])
 		var/logmsg
-		if (valve_open)
-			if (holding)
+		if(valve_open)
+			if(holding)
 				logmsg = "Valve was <b>closed</b> by [usr] ([usr.ckey]), stopping the transfer into the [holding]<br>"
 			else
 				logmsg = "Valve was <b>closed</b> by [usr] ([usr.ckey]), stopping the transfer into the <font color='red'><b>air</b></font><br>"
 		else
-			if (holding)
+			if(holding)
 				logmsg = "Valve was <b>opened</b> by [usr] ([usr.ckey]), starting the transfer into the [holding]<br>"
 			else
 				logmsg = "Valve was <b>opened</b> by [usr] ([usr.ckey]), starting the transfer into the <font color='red'><b>air</b></font><br>"
@@ -454,53 +454,53 @@ update_flag
 		release_log += logmsg
 		valve_open = !valve_open
 
-	if (href_list["remove_tank"])
+	if(href_list["remove_tank"])
 		if(holding)
-			if (valve_open)
+			if(valve_open)
 				valve_open = 0
 				release_log += "Valve was <b>closed</b> by [usr] ([usr.ckey]), stopping the transfer into the [holding]<br>"
 			holding.loc = loc
 			holding = null
 
-	if (href_list["pressure_adj"])
+	if(href_list["pressure_adj"])
 		var/diff = text2num(href_list["pressure_adj"])
 		if(diff > 0)
 			release_pressure = min(10*ONE_ATMOSPHERE, release_pressure+diff)
 		else
 			release_pressure = max(ONE_ATMOSPHERE/10, release_pressure+diff)
 
-	if (href_list["rename"])
-		if (can_label)
+	if(href_list["rename"])
+		if(can_label)
 			var/T = sanitize(copytext(input("Choose canister label", "Name", name) as text|null,1,MAX_NAME_LEN))
-			if (can_label) //Exploit prevention
-				if (T)
+			if(can_label) //Exploit prevention
+				if(T)
 					name = T
 				else
 					name = "canister"
 			else
 				to_chat(usr, "\red As you attempted to rename it the pressure rose!")
 
-	if (href_list["choice"] == "Primary color")
-		if (is_a_color(href_list["icon"],"prim"))
+	if(href_list["choice"] == "Primary color")
+		if(is_a_color(href_list["icon"],"prim"))
 			canister_color["prim"] = href_list["icon"]
-	if (href_list["choice"] == "Secondary color")
-		if (href_list["icon"] == "none")
+	if(href_list["choice"] == "Secondary color")
+		if(href_list["icon"] == "none")
 			canister_color["sec"] = "none"
-		else if (is_a_color(href_list["icon"],"sec"))
+		else if(is_a_color(href_list["icon"],"sec"))
 			canister_color["sec"] = href_list["icon"]
-	if (href_list["choice"] == "Tertiary color")
-		if (href_list["icon"] == "none")
+	if(href_list["choice"] == "Tertiary color")
+		if(href_list["icon"] == "none")
 			canister_color["ter"] = "none"
-		else if (is_a_color(href_list["icon"],"ter"))
+		else if(is_a_color(href_list["icon"],"ter"))
 			canister_color["ter"] = href_list["icon"]
-	if (href_list["choice"] == "Quaternary color")
-		if (href_list["icon"] == "none")
+	if(href_list["choice"] == "Quaternary color")
+		if(href_list["icon"] == "none")
 			canister_color["quart"] = "none"
-		else if (is_a_color(href_list["icon"],"quart"))
+		else if(is_a_color(href_list["icon"],"quart"))
 			canister_color["quart"] = href_list["icon"]
 
-	if (href_list["choice"] == "decals")
-		if (is_a_decal(href_list["icon"]))
+	if(href_list["choice"] == "decals")
+		if(is_a_decal(href_list["icon"]))
 			decals[href_list["icon"]] = (decals[href_list["icon"]] == 0)
 
 	src.add_fingerprint(usr)
@@ -577,8 +577,8 @@ update_flag
 	trace_gas.moles = 9*4000
 	spawn(100)
 		var/turf/simulated/location = src.loc
-		if (istype(src.loc))
-			while (!location.air)
+		if(istype(src.loc))
+			while(!location.air)
 				sleep(1000)
 			location.assume_air(air_contents)
 			air_contents = new
diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm
index b2b7b1efc06..70cb5988b18 100644
--- a/code/game/machinery/atmoalter/meter.dm
+++ b/code/game/machinery/atmoalter/meter.dm
@@ -28,7 +28,7 @@
 	return ..()
 
 /obj/machinery/meter/initialize()
-	if (!target)
+	if(!target)
 		target = locate(/obj/machinery/atmospherics/pipe) in loc
 
 /obj/machinery/meter/process()
@@ -78,7 +78,7 @@
 
 /obj/machinery/meter/proc/status()
 	var/t = ""
-	if (target)
+	if(target)
 		var/datum/gas_mixture/environment = target.return_air()
 		if(environment)
 			t += "The pressure gauge reads [round(environment.return_pressure(), 0.01)] kPa; [round(environment.temperature,0.01)]&deg;K ([round(environment.temperature-T0C,0.01)]&deg;C)"
@@ -120,11 +120,11 @@
 		update_multitool_menu(user)
 		return 1
 
-	if (!istype(W, /obj/item/weapon/wrench))
+	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 	to_chat(user, "\blue You begin to unfasten \the [src]...")
-	if (do_after(user, 40, target = src))
+	if(do_after(user, 40, target = src))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
 			"\blue You have unfastened \the [src].", \
@@ -141,7 +141,7 @@
 
 
 /obj/machinery/meter/turf/initialize()
-	if (!target)
+	if(!target)
 		target = loc
 
 /obj/machinery/meter/turf/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index 21eee7b52ac..c61c6d58f4b 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -78,8 +78,8 @@
 	return air_contents
 
 /obj/machinery/portable_atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
-	if ((istype(W, /obj/item/weapon/tank) && !( src.destroyed )))
-		if (src.holding)
+	if((istype(W, /obj/item/weapon/tank) && !( src.destroyed )))
+		if(src.holding)
 			return
 		var/obj/item/weapon/tank/T = W
 		user.drop_item()
@@ -88,7 +88,7 @@
 		update_icon()
 		return
 
-	else if (istype(W, /obj/item/weapon/wrench))
+	else if(istype(W, /obj/item/weapon/wrench))
 		if(connected_port)
 			disconnect()
 			to_chat(user, "\blue You disconnect [name] from the port.")
@@ -108,7 +108,7 @@
 				to_chat(user, "\blue Nothing happens.")
 				return
 
-	else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
+	else if((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
 		atmosanalyzer_scan(air_contents, user)
 
 	return
diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm
index 23dca91dd51..9f716696591 100644
--- a/code/game/machinery/atmoalter/pump.dm
+++ b/code/game/machinery/atmoalter/pump.dm
@@ -116,12 +116,12 @@
 	data["on"] = on ? 1 : 0
 
 	data["hasHoldingTank"] = holding ? 1 : 0
-	if (holding)
+	if(holding)
 		data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.return_pressure() > 0 ? holding.air_contents.return_pressure() : 0))
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "portpump.tmpl", "Portable Pump", 480, 400, state = physical_state)
@@ -143,13 +143,13 @@
 	if(href_list["direction"])
 		direction_out = !direction_out
 
-	if (href_list["remove_tank"])
+	if(href_list["remove_tank"])
 		if(holding)
 			holding.loc = loc
 			holding = null
 		update_icon()
 
-	if (href_list["pressure_adj"])
+	if(href_list["pressure_adj"])
 		var/diff = text2num(href_list["pressure_adj"])
 		target_pressure = Clamp(target_pressure+diff, pressuremin, pressuremax)
 		update_icon()
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index 1790dec775d..1fb0bdd1308 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -47,10 +47,10 @@
 	if(!on)
 		return
 	scrub(loc)
-	if (widenet)
+	if(widenet)
 		var/turf/T = loc
-		if (istype(T))
-			for (var/turf/simulated/tile in T.GetAtmosAdjacentTurfs(alldir=1))
+		if(istype(T))
+			for(var/turf/simulated/tile in T.GetAtmosAdjacentTurfs(alldir=1))
 				scrub(tile)
 	
 /obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/turf/simulated/tile)
@@ -69,7 +69,7 @@
 		removed = loc.remove_air(transfer_moles)
 
 	//Filter it
-	if (removed)
+	if(removed)
 		var/datum/gas_mixture/filtered_out = new
 
 		filtered_out.temperature = removed.temperature
@@ -126,12 +126,12 @@
 	data["on"] = on ? 1 : 0
 
 	data["hasHoldingTank"] = holding ? 1 : 0
-	if (holding)
+	if(holding)
 		data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.return_pressure() > 0 ? holding.air_contents.return_pressure() : 0))
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "portscrubber.tmpl", "Portable Scrubber", 480, 400, state = physical_state)
@@ -205,7 +205,7 @@
 		to_chat(user, "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
 		return
 
-	else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
+	else if((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
 		atmosanalyzer_scan(air_contents, user)
 		
 /obj/machinery/portable_atmospherics/scrubber/huge/stationary
diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm
index 2e7ce0ac9b7..e3ac09e8f09 100644
--- a/code/game/machinery/atmoalter/zvent.dm
+++ b/code/game/machinery/atmoalter/zvent.dm
@@ -12,16 +12,16 @@
 /obj/machinery/zvent/process()
 
 	//all this object does, is make its turf share air with the ones above and below it, if they have a vent too.
-	if (istype(loc,/turf/simulated)) //if we're not on a valid turf, forget it
-		for (var/new_z in list(-1,1))  //change this list if a fancier system of z-levels gets implemented
+	if(istype(loc,/turf/simulated)) //if we're not on a valid turf, forget it
+		for(var/new_z in list(-1,1))  //change this list if a fancier system of z-levels gets implemented
 			var/turf/simulated/zturf_conn = locate(x,y,z+new_z)
-			if (istype(zturf_conn))
+			if(istype(zturf_conn))
 				var/obj/machinery/zvent/zvent_conn= locate(/obj/machinery/zvent) in zturf_conn
-				if (istype(zvent_conn))
+				if(istype(zvent_conn))
 					//both floors have simulated turfs, share()
 					var/turf/simulated/myturf = loc
 					var/datum/gas_mixture/conn_air = zturf_conn.air //TODO: pop culture reference
 					var/datum/gas_mixture/my_air = myturf.air
-					if (istype(conn_air) && istype(my_air))
+					if(istype(conn_air) && istype(my_air))
 						my_air.share(conn_air)
 						air_update_turf()
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index bb278c1e399..b44d51c9b30 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -107,7 +107,7 @@
 	return
 
 /obj/machinery/autolathe/attackby(obj/item/O, mob/user, params)
-	if (busy)
+	if(busy)
 		to_chat(user, "<span class=\"alert\">The autolathe is busy. Please wait for completion of previous operation.</span>")
 		return 1
 
@@ -118,7 +118,7 @@
 	if(exchange_parts(user, O))
 		return
 
-	if (panel_open)
+	if(panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
 			materials.retrieve_all()
 			default_deconstruction_crowbar(O)
@@ -126,7 +126,7 @@
 		else
 			attack_hand(user)
 			return 1
-	if (stat)
+	if(stat)
 		return 1
 
 	if(istype(O, /obj/item/weapon/disk/design_disk))
@@ -156,9 +156,9 @@
 	var/inserted = materials.insert_item(O)
 	if(inserted)
 		if(istype(O,/obj/item/stack))
-			if (O.materials[MAT_METAL])
+			if(O.materials[MAT_METAL])
 				flick("autolathe_o",src)//plays metal insertion animation
-			if (O.materials[MAT_GLASS])
+			if(O.materials[MAT_GLASS])
 				flick("autolathe_r",src)//plays glass insertion animation
 			to_chat(user, "<span class='notice'>You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe.</span>")
 			use_power(inserted*100)
@@ -206,7 +206,7 @@
 
 		if(!is_stack && (multiplier > 1))
 			return
-		if (!(multiplier in list(1,10,25,max_multiplier))) //"enough materials ?" is checked in the build proc
+		if(!(multiplier in list(1,10,25,max_multiplier))) //"enough materials ?" is checked in the build proc
 			return
 		/////////////////
 
@@ -214,7 +214,7 @@
 			add_to_queue(design_last_ordered,multiplier)
 		else
 			to_chat(usr, "\red The autolathe queue is full!")
-		if (!busy)
+		if(!busy)
 			busy = 1
 			process_queue()
 			busy = 0
@@ -264,7 +264,7 @@
 	var/metal_cost = D.materials[MAT_METAL]
 	var/glass_cost = D.materials[MAT_GLASS]
 	var/power = max(2000, (metal_cost+glass_cost)*multiplier/5)
-	if (can_build(D,multiplier))
+	if(can_build(D,multiplier))
 		being_built = list(D,multiplier)
 		use_power(power)
 		icon_state = "autolathe"
@@ -325,7 +325,7 @@
 	var/output = "<td valign='top' style='width: 300px'>"
 	output += "<div class='statusDisplay'>"
 	output += "<b>Queue contains:</b>"
-	if (!istype(queue) || !queue.len)
+	if(!istype(queue) || !queue.len)
 		if(being_built.len)
 			output += "<ol><li>"
 			output += get_processing_line()
@@ -447,9 +447,9 @@
 
 		if(ispath(D.build_path, /obj/item/stack))
 			var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY)
-			if (max_multiplier>10 && !disabled)
+			if(max_multiplier>10 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=10'>x10</a>"
-			if (max_multiplier>25 && !disabled)
+			if(max_multiplier>25 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=25'>x25</a>"
 			if(max_multiplier > 0 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=[max_multiplier]'>x[max_multiplier]</a>"
@@ -479,9 +479,9 @@
 
 		if(ispath(D.build_path, /obj/item/stack))
 			var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY)
-			if (max_multiplier>10 && !disabled)
+			if(max_multiplier>10 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=10'>x10</a>"
-			if (max_multiplier>25 && !disabled)
+			if(max_multiplier>25 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=25'>x25</a>"
 			if(max_multiplier > 0 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=[max_multiplier]'>x[max_multiplier]</a>"
diff --git a/code/game/machinery/bees_apiary.dm b/code/game/machinery/bees_apiary.dm
index 437c188d9b8..ad9fb8795cb 100644
--- a/code/game/machinery/bees_apiary.dm
+++ b/code/game/machinery/bees_apiary.dm
@@ -36,7 +36,7 @@
 		if(!yieldmod)
 			yieldmod += 1
 //			to_chat(world, "Yield increased by 1, from 0, to a total of [myseed.yield]")
-		else if (prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2...
+		else if(prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2...
 			yieldmod += 1
 //			to_chat(world, "Yield increased by 1, to a total of [myseed.yield]")
 	else
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index fc00e8740d3..fed2328570a 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -207,9 +207,9 @@
 	interact(user)
 
 /obj/machinery/biogenerator/proc/activate()
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
-	if (src.stat != 0) //NOPOWER etc
+	if(src.stat != 0) //NOPOWER etc
 		return
 	if(src.processing)
 		to_chat(usr, "<span class='warning'>The biogenerator is in the process of working.</span>")
@@ -236,7 +236,7 @@
 	return
 
 /obj/machinery/biogenerator/proc/check_cost(var/cost, var/checkonly)
-	if (cost > points)
+	if(cost > points)
 		menustat = "nopoints"
 		return 1
 	else if(checkonly)
@@ -258,89 +258,89 @@
 		//Food
 		if("milk")
 			if(check_container_volume(10)) return 0
-			else if (check_cost(20/efficiency)) return 0
+			else if(check_cost(20/efficiency)) return 0
 			else beaker.reagents.add_reagent("milk",10)
 		if("cream")
 			if(check_container_volume(10)) return 0
-			else if (check_cost(30/efficiency)) return 0
+			else if(check_cost(30/efficiency)) return 0
 			else beaker.reagents.add_reagent("cream",10)
 		if("meat")
-			if (check_cost(250/efficiency)) return 0
+			if(check_cost(250/efficiency)) return 0
 			else new/obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc)
 		//Nutrients
 		if("ez")
-			if (check_cost(10/efficiency, 1)) return 0
+			if(check_cost(10/efficiency, 1)) return 0
 			if(in_beaker)
 				if(check_container_volume(10)) return 0
 				else beaker.reagents.add_reagent("eznutrient",10)
 			else
 				new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src.loc)
-			if (check_cost(10/efficiency)) return 0
+			if(check_cost(10/efficiency)) return 0
 		if("l4z")
-			if (check_cost(20/efficiency, 1)) return 0
+			if(check_cost(20/efficiency, 1)) return 0
 			if(in_beaker)
 				if(check_container_volume(10)) return 0
 				else beaker.reagents.add_reagent("left4zed",10)
 			else
 				new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src.loc)
-			if (check_cost(20/efficiency)) return 0
+			if(check_cost(20/efficiency)) return 0
 		if("rh")
-			if (check_cost(25/efficiency, 1)) return 0
+			if(check_cost(25/efficiency, 1)) return 0
 			if(in_beaker)
 				if(check_container_volume(10)) return 0
 				else beaker.reagents.add_reagent("robustharvest",10)
 			else
 				new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc)
-			if (check_cost(25/efficiency)) return 0
+			if(check_cost(25/efficiency)) return 0
 		//Leather
 		if("wallet")
-			if (check_cost(100/efficiency)) return 0
+			if(check_cost(100/efficiency)) return 0
 			else new/obj/item/weapon/storage/wallet(src.loc)
 		if("bkbag")
-			if (check_cost(200/efficiency)) return 0
+			if(check_cost(200/efficiency)) return 0
 			else new/obj/item/weapon/storage/bag/books(src.loc)
 		if("ptbag")
-			if (check_cost(200/efficiency)) return 0
+			if(check_cost(200/efficiency)) return 0
 			else new/obj/item/weapon/storage/bag/plants(src.loc)
 		if("mnbag")
-			if (check_cost(200/efficiency)) return 0
+			if(check_cost(200/efficiency)) return 0
 			else new/obj/item/weapon/storage/bag/ore(src.loc)
 		if("chbag")
-			if (check_cost(200/efficiency)) return 0
+			if(check_cost(200/efficiency)) return 0
 			else new/obj/item/weapon/storage/bag/chemistry(src.loc)
 		if("rag")
-			if (check_cost(200/efficiency)) return 0
+			if(check_cost(200/efficiency)) return 0
 			else new/obj/item/weapon/reagent_containers/glass/rag(src.loc)
 		if("gloves")
-			if (check_cost(250/efficiency)) return 0
+			if(check_cost(250/efficiency)) return 0
 			else new/obj/item/clothing/gloves/botanic_leather(src.loc)
 		if("satchel")
-			if (check_cost(400/efficiency)) return 0
+			if(check_cost(400/efficiency)) return 0
 			else new/obj/item/weapon/storage/backpack/satchel(src.loc)
 		if("cashbag")
-			if (check_cost(400/efficiency)) return 0
+			if(check_cost(400/efficiency)) return 0
 			else new/obj/item/weapon/storage/bag/cash(src.loc)
 		if("jacket")
-			if (check_cost(500/efficiency)) return 0
+			if(check_cost(500/efficiency)) return 0
 			else new/obj/item/clothing/suit/jacket/leather(src.loc)
 		//Belts
 		if("tbelt")
-			if (check_cost(300/efficiency)) return 0
+			if(check_cost(300/efficiency)) return 0
 			else new/obj/item/weapon/storage/belt/utility(src.loc)
 		if("bbelt")
-			if (check_cost(300/efficiency)) return 0
+			if(check_cost(300/efficiency)) return 0
 			else new/obj/item/weapon/storage/belt/botany(src.loc)
 		if("sbelt")
-			if (check_cost(300/efficiency)) return 0
+			if(check_cost(300/efficiency)) return 0
 			else new/obj/item/weapon/storage/belt/security(src.loc)
 		if("mbelt")
-			if (check_cost(300/efficiency)) return 0
+			if(check_cost(300/efficiency)) return 0
 			else new/obj/item/weapon/storage/belt/medical(src.loc)
 		if("jbelt")
-			if (check_cost(300/efficiency)) return 0
+			if(check_cost(300/efficiency)) return 0
 			else new/obj/item/weapon/storage/belt/janitor(src.loc)
 		if("band")
-			if (check_cost(300/efficiency)) return 0
+			if(check_cost(300/efficiency)) return 0
 			else new/obj/item/weapon/storage/belt/bandolier(src.loc)
 	processing = 0
 	menustat = "complete"
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index afeb5a1f778..5bff1c651ec 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -121,7 +121,7 @@
 		radio_connection.post_signal(src, signal, filter = RADIO_LOGIC)
 
 	for(var/obj/machinery/door/poddoor/M in range(src,range))
-		if (M.id_tag == src.id_tag && !M.protected)
+		if(M.id_tag == src.id_tag && !M.protected)
 			spawn()
 				M.open()
 
@@ -134,7 +134,7 @@
 	sleep(50)
 
 	for(var/obj/machinery/door/poddoor/M in range(src,range))
-		if (M.id_tag == src.id_tag && !M.protected)
+		if(M.id_tag == src.id_tag && !M.protected)
 			spawn()
 				M.close()
 				return
@@ -182,7 +182,7 @@
 	icon_state = "launcheract"
 
 	for(var/obj/machinery/sparker/M in world)
-		if (M.id == src.id)
+		if(M.id == src.id)
 			spawn( 0 )
 				M.spark()
 
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 9aa7cfe2c7b..9d71df87efa 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -89,7 +89,7 @@
 							if(!qdeleted(src))
 								cancelCameraAlarm()
 			for(var/mob/O in mob_list)
-				if (O.client && O.client.eye == src)
+				if(O.client && O.client.eye == src)
 					O.unset_machine()
 					O.reset_view(null)
 					to_chat(O, "The screen bursts into static.")
@@ -161,7 +161,7 @@
 		else
 			to_chat(user, "[msg2]")
 
-	else if(istype(W, /obj/item/stack/sheet/mineral/plasma) && panel_open)
+	else if(istype(W, /obj/item/stack/sheet/mineral/plasma) && panel_open)
 		if(!user.unEquip(W))
 			to_chat(user, "<span class='warning'>[W] is stuck!</span>")
 			return
@@ -171,7 +171,7 @@
 			qdel(W)
 		else
 			to_chat(user, "[msg2]")
-	else if(istype(W, /obj/item/device/assembly/prox_sensor) && panel_open)
+	else if(istype(W, /obj/item/device/assembly/prox_sensor) && panel_open)
 		if(!user.unEquip(W))
 			return
 		if(!isMotion())
@@ -182,7 +182,7 @@
 			to_chat(user, "[msg2]")
 
 	// OTHER
-	else if ((istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/device/pda)) && isliving(user))
+	else if((istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/device/pda)) && isliving(user))
 		var/mob/living/U = user
 		var/obj/item/weapon/paper/X = null
 		var/obj/item/device/pda/P = null
@@ -211,12 +211,12 @@
 				else
 					to_chat(AI, "<b><a href='?src=\ref[AI];track=[html_encode(U.name)]'>[U]</a></b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
 				AI.last_paper_seen = "<HTML><HEAD><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>"
-			else if (O.client && O.client.eye == src)
+			else if(O.client && O.client.eye == src)
 				to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...")
 				O << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", itemname, info), text("window=[]", itemname))
 
-	else if (istype(W, /obj/item/device/camera_bug))
-		if (!src.can_use())
+	else if(istype(W, /obj/item/device/camera_bug))
+		if(!src.can_use())
 			to_chat(user, "<span class='notice'>Camera non-functional.</span>")
 			return
 		if(istype(src.bug))
@@ -276,7 +276,7 @@
 	//Apparently, this will disconnect anyone even if the camera was re-activated.
 	//I guess that doesn't matter since they can't use it anyway?
 	for(var/mob/O in player_list)
-		if (O.client && O.client.eye == src)
+		if(O.client && O.client.eye == src)
 			O.unset_machine()
 			O.reset_view(null)
 			to_chat(O, "The screen bursts into static.")
@@ -376,9 +376,14 @@
 	cam["name"] = sanitize(c_tag)
 	cam["deact"] = !can_use()
 	cam["camera"] = "\ref[src]"
-	cam["x"] = T.x
-	cam["y"] = T.y
-	cam["z"] = T.z
+	if(T)
+		cam["x"] = T.x
+		cam["y"] = T.y
+		cam["z"] = T.z
+	else
+		cam["x"] = 0
+		cam["y"] = 0
+		cam["z"] = 0
 	return cam
 
 /obj/machinery/camera/portable //Cameras which are placed inside of things, such as helmets.
diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm
index 5b236d4baa9..eeb9eeb60d3 100644
--- a/code/game/machinery/camera/motion.dm
+++ b/code/game/machinery/camera/motion.dm
@@ -8,58 +8,58 @@
 
 /obj/machinery/camera/process()
 	// motion camera event loop
-	if (stat & (EMPED|NOPOWER))
+	if(stat & (EMPED|NOPOWER))
 		return
 	if(!isMotion())
 		. = PROCESS_KILL
 		return
-	if (detectTime > 0)
+	if(detectTime > 0)
 		var/elapsed = world.time - detectTime
-		if (elapsed > alarm_delay)
+		if(elapsed > alarm_delay)
 			triggerAlarm()
-	else if (detectTime == -1)
-		for (var/mob/target in motionTargets)
-			if (target.stat == 2) lostTarget(target)
+	else if(detectTime == -1)
+		for(var/mob/target in motionTargets)
+			if(target.stat == 2) lostTarget(target)
 			// If not detecting with motion camera...
-			if (!area_motion)
+			if(!area_motion)
 				// See if the camera is still in range
 				if(!in_range(src, target))
 					// If they aren't in range, lose the target.
 					lostTarget(target)
 
 /obj/machinery/camera/proc/newTarget(var/mob/target)
-	if (istype(target, /mob/living/silicon/ai)) return 0
-	if (detectTime == 0)
+	if(istype(target, /mob/living/silicon/ai)) return 0
+	if(detectTime == 0)
 		detectTime = world.time // start the clock
-	if (!(target in motionTargets))
+	if(!(target in motionTargets))
 		motionTargets += target
 	return 1
 
 /obj/machinery/camera/proc/lostTarget(var/mob/target)
-	if (target in motionTargets)
+	if(target in motionTargets)
 		motionTargets -= target
-	if (motionTargets.len == 0)
+	if(motionTargets.len == 0)
 		cancelAlarm()
 
 /obj/machinery/camera/proc/cancelAlarm()
-	if (!status || (stat & NOPOWER))
+	if(!status || (stat & NOPOWER))
 		return 0
-	if (detectTime == -1)
+	if(detectTime == -1)
 		motion_alarm.clearAlarm(loc, src)
 	detectTime = 0
 	return 1
 
 /obj/machinery/camera/proc/triggerAlarm()
-	if (!status || (stat & NOPOWER))
+	if(!status || (stat & NOPOWER))
 		return 0
-	if (!detectTime) return 0
+	if(!detectTime) return 0
 	motion_alarm.triggerAlarm(loc, src)
 	detectTime = -1
 	return 1
 
 /obj/machinery/camera/HasProximity(atom/movable/AM as mob|obj)
 	// Motion cameras outside of an "ai monitored" area will use this to detect stuff.
-	if (!area_motion)
+	if(!area_motion)
 		if(isliving(AM))
 			newTarget(AM)
 
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 4f5565fdf77..5a36a900e61 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -85,8 +85,8 @@
 
 /obj/machinery/camera/proc/setPowerUsage()
 	var/mult = 1
-	if (isXRay())
+	if(isXRay())
 		mult++
-	if (isMotion())
+	if(isMotion())
 		mult++
 	active_power_usage = mult*initial(active_power_usage)
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 0be7126f5a5..aa32db20688 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -19,16 +19,16 @@
 		return
 
 	var/list/L = list()
-	for (var/obj/machinery/camera/C in cameranet.cameras)
+	for(var/obj/machinery/camera/C in cameranet.cameras)
 		L.Add(C)
 
 	camera_sort(L)
 
 	var/list/T = list()
 
-	for (var/obj/machinery/camera/C in L)
+	for(var/obj/machinery/camera/C in L)
 		var/list/tempnetwork = C.network & src.network
-		if (tempnetwork.len)
+		if(tempnetwork.len)
 			T[text("[][]", C.c_tag, (C.can_use() ? null : " (Deactivated)"))] = C
 
 	track.cameras = T
@@ -43,7 +43,7 @@
 		to_chat(src, "You can't list the cameras because you are dead!")
 		return
 
-	if (!camera || camera == "Cancel")
+	if(!camera || camera == "Cancel")
 		return 0
 
 	var/obj/machinery/camera/C = track.cameras[camera]
@@ -70,7 +70,7 @@
 		return
 
 	var/L = get_turf(eyeobj)
-	if (InvalidTurf(get_turf(L)))
+	if(InvalidTurf(get_turf(L)))
 		to_chat(src, "\red Unable to store this location")
 		return
 
@@ -85,7 +85,7 @@
 	set name = "Goto Camera Location"
 	set desc = "Returns to the selected camera location"
 
-	if (!(loc in stored_locations))
+	if(!(loc in stored_locations))
 		to_chat(src, "\red Location [loc] not found")
 		return
 
@@ -97,7 +97,7 @@
 	set name = "Delete Camera Location"
 	set desc = "Deletes the selected camera location"
 
-	if (!(loc in stored_locations))
+	if(!(loc in stored_locations))
 		to_chat(src, "\red Location [loc] not found")
 		return
 
@@ -132,7 +132,7 @@
 			human = 1
 
 		var/name = M.name
-		if (name in track.names)
+		if(name in track.names)
 			track.namecounts[name]++
 			name = text("[] ([])", name, track.namecounts[name])
 		else
@@ -224,7 +224,7 @@
 			sleep(10)
 
 /proc/near_camera(mob/living/M)
-	if (!isturf(M.loc))
+	if(!isturf(M.loc))
 		return 0
 	if(isrobot(M))
 		var/mob/living/silicon/robot/R = M
@@ -235,9 +235,9 @@
 	return 1
 
 /obj/machinery/camera/attack_ai(mob/living/silicon/ai/user)
-	if (!istype(user))
+	if(!istype(user))
 		return
-	if (!src.can_use())
+	if(!src.can_use())
 		return
 	user.eyeobj.setLoc(get_turf(src))
 
@@ -249,14 +249,14 @@
 	var/obj/machinery/camera/a
 	var/obj/machinery/camera/b
 
-	for (var/i = L.len, i > 0, i--)
-		for (var/j = 1 to i - 1)
+	for(var/i = L.len, i > 0, i--)
+		for(var/j = 1 to i - 1)
 			a = L[j]
 			b = L[j + 1]
-			if (a.c_tag_order != b.c_tag_order)
-				if (a.c_tag_order > b.c_tag_order)
+			if(a.c_tag_order != b.c_tag_order)
+				if(a.c_tag_order > b.c_tag_order)
 					L.Swap(j, j + 1)
 			else
-				if (sorttext(a.c_tag, b.c_tag) < 0)
+				if(sorttext(a.c_tag, b.c_tag) < 0)
 					L.Swap(j, j + 1)
 	return L
diff --git a/code/game/machinery/chiller.dm b/code/game/machinery/chiller.dm
index 82fe014e160..45ec0337fea 100644
--- a/code/game/machinery/chiller.dm
+++ b/code/game/machinery/chiller.dm
@@ -105,9 +105,9 @@
 	return
 
 /obj/machinery/space_heater/air_conditioner/Topic(href, href_list)
-	if (usr.stat)
+	if(usr.stat)
 		return
-	if ((in_range(src, usr) && istype(src.loc, /turf)) || (istype(usr, /mob/living/silicon)))
+	if((in_range(src, usr) && istype(src.loc, /turf)) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 
 		switch(href_list["op"])
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 1a7fffcc6ea..6da0eb3fd55 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -85,7 +85,7 @@
 	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
 	item_state = "card-id"
-	w_class = 1.0
+	w_class = 1
 	var/datum/dna2/record/buf=null
 	var/read_only = 0 //Well,it's still a floppy disk
 
@@ -124,19 +124,19 @@
 
 //Find a dead mob with a brain and client.
 /proc/find_dead_player(var/find_key)
-	if (isnull(find_key))
+	if(isnull(find_key))
 		return
 
 	var/mob/selected = null
 	for(var/mob/M in player_list)
 		//Dead people only thanks!
-		if ((M.stat != 2) || (!M.client))
+		if((M.stat != 2) || (!M.client))
 			continue
 		//They need a brain!
 		if(istype(M, /mob/living/carbon/human) && !M.get_int_organ(/obj/item/organ/internal/brain))
 			continue
 
-		if (M.ckey == find_key)
+		if(M.ckey == find_key)
 			selected = M
 			break
 	return selected
@@ -163,13 +163,13 @@
 	var/healthstring = ""
 
 /obj/item/weapon/implant/health/proc/sensehealth()
-	if (!implanted)
+	if(!implanted)
 		return "ERROR"
 	else
 		if(isliving(implanted))
 			var/mob/living/L = implanted
 			healthstring = "[round(L.getOxyLoss())] - [round(L.getFireLoss())] - [round(L.getToxLoss())] - [round(L.getBruteLoss())]"
-		if (!healthstring)
+		if(!healthstring)
 			healthstring = "ERROR"
 		return healthstring
 
@@ -177,11 +177,11 @@
 	return attack_hand(user)
 
 /obj/machinery/clonepod/attack_hand(mob/user as mob)
-	if ((isnull(occupant)) || (stat & NOPOWER))
+	if((isnull(occupant)) || (stat & NOPOWER))
 		if(mess)
 			go_out()
 		return
-	if ((!isnull(occupant)) && (occupant.stat != 2))
+	if((!isnull(occupant)) && (occupant.stat != 2))
 		var/completion = (100 * ((occupant.health + 100) / (heal_level + 100)))
 		to_chat(user, "Current clone cycle is [round(completion)]% complete.")
 	return
@@ -249,7 +249,7 @@
 		ticker.mode.update_rev_icons_added() //So the icon actually appears
 	if(H.mind in ticker.mode.syndicates)
 		ticker.mode.update_synd_icons_added()
-	if (H.mind in ticker.mode.cult)
+	if(H.mind in ticker.mode.cult)
 		ticker.mode.add_cult_viewpoint(H)
 		ticker.mode.add_cultist(occupant.mind)
 		ticker.mode.update_cult_icons_added() //So the icon actually appears
@@ -302,7 +302,7 @@
 		visible_message("\The [src] sucks in and processes the nearby biomass.")
 
 	if(stat & NOPOWER) //Autoeject if power is lost
-		if (occupant)
+		if(occupant)
 			locked = 0
 			go_out()
 		return
@@ -324,7 +324,7 @@
 			occupant.adjustBrainLoss(-((speed_coeff/20)*efficiency))
 
 			//So clones don't die of oxyloss in a running pod.
-			if (occupant.reagents.get_reagent_amount("salbutamol") < 5)
+			if(occupant.reagents.get_reagent_amount("salbutamol") < 5)
 				occupant.reagents.add_reagent("salbutamol", 5)
 
 			//Also heal some oxyloss ourselves just in case!!
@@ -339,9 +339,9 @@
 			go_out()
 			return
 
-	else if ((!occupant) || (occupant.loc != src))
+	else if((!occupant) || (occupant.loc != src))
 		occupant = null
-		if (locked)
+		if(locked)
 			locked = 0
 		//use_power(200)
 		return
@@ -350,7 +350,7 @@
 
 //Let's unlock this early I guess.  Might be too early, needs tweaking.
 /obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/screwdriver))
+	if(istype(W, /obj/item/weapon/screwdriver))
 		if(occupant || mess || locked)
 			to_chat(user, "<span class='notice'>The maintenance panel is locked.</span>")
 			return
@@ -365,13 +365,13 @@
 			default_deconstruction_crowbar(W)
 		return
 
-	if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if (!check_access(W))
+	if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
+		if(!check_access(W))
 			to_chat(user, "\red Access Denied.")
 			return
-		if ((!locked) || (isnull(occupant)))
+		if((!locked) || (isnull(occupant)))
 			return
-		if ((occupant.health < -20) && (occupant.stat != 2))
+		if((occupant.health < -20) && (occupant.stat != 2))
 			to_chat(user, "\red Access Refused.")
 			return
 		else
@@ -379,13 +379,13 @@
 			to_chat(user, "System unlocked.")
 
 //Removing cloning pod biomass
-	else if (istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat))
+	else if(istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat))
 		to_chat(user, "\blue \The [src] processes \the [W].")
 		biomass += BIOMASS_MEAT_AMOUNT
 		user.drop_item()
 		qdel(W)
 		return
-	else if (istype(W, /obj/item/weapon/wrench))
+	else if(istype(W, /obj/item/weapon/wrench))
 		if(locked && (anchored || occupant))
 			to_chat(user, "\red Can not do that while [src] is in use.")
 		else
@@ -409,7 +409,7 @@
 		..()
 
 /obj/machinery/clonepod/emag_act(user as mob)
-	if (isnull(occupant))
+	if(isnull(occupant))
 		return
 	to_chat(user, "You force an emergency ejection.")
 	locked = 0
@@ -418,9 +418,9 @@
 
 //Put messages in the connected computer's temp var for display.
 /obj/machinery/clonepod/proc/connected_message(var/message)
-	if ((isnull(connected)) || (!istype(connected, /obj/machinery/computer/cloning)))
+	if((isnull(connected)) || (!istype(connected, /obj/machinery/computer/cloning)))
 		return 0
-	if (!message)
+	if(!message)
 		return 0
 
 	connected.temp = "[name] : [message]"
@@ -434,14 +434,14 @@
 
 	if(!usr)
 		return
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
 	go_out(usr)
 	add_fingerprint(usr)
 	return
 
 /obj/machinery/clonepod/proc/go_out(user)
-	if (mess) //Clean that mess and dump those gibs!
+	if(mess) //Clean that mess and dump those gibs!
 		if(occupant)
 			return
 		mess = 0
@@ -450,15 +450,15 @@
 		update_icon()
 		return
 
-	if (!(occupant))
+	if(!(occupant))
 		to_chat(user, "<span class=\"warning\">The cloning pod is empty!</span>")
 		return
 
-	if (locked)
+	if(locked)
 		to_chat(user, "<span class=\"warning\">The cloning pod is locked!</span>")
 		return
 
-	if (occupant.client)
+	if(occupant.client)
 		occupant.client.eye = occupant.client.mob
 		occupant.client.perspective = MOB_PERSPECTIVE
 	occupant.forceMove(get_turf(src))
@@ -481,13 +481,13 @@
 /obj/machinery/clonepod/update_icon()
 	..()
 	icon_state = "pod_0"
-	if (occupant && !(stat & NOPOWER))
+	if(occupant && !(stat & NOPOWER))
 		icon_state = "pod_1"
-	else if (mess && !panel_open)
+	else if(mess && !panel_open)
 		icon_state = "pod_g"
 
 /obj/machinery/clonepod/relaymove(mob/user as mob)
-	if (user.stat)
+	if(user.stat)
 		return
 	go_out()
 	return
@@ -505,14 +505,14 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(src.loc)
 					A.ex_act(severity)
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(src.loc)
 					A.ex_act(severity)
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 809ac579454..bb45170458f 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -363,10 +363,10 @@
 	return // HOLOTABLE DOES NOT GIVE A FUCK
 
 /obj/structure/table/holotable/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/grab))
+	if(istype(W, /obj/item/weapon/grab))
 		return ..()
 
-	if (istype(W, /obj/item/weapon/wrench))
+	if(istype(W, /obj/item/weapon/wrench))
 		to_chat(user, "<span class='warning'>It's a holotable! There are no bolts!</span>")
 		return
 
@@ -406,7 +406,7 @@
 	return // HOLORACK DOES NOT GIVE A FUCK
 
 /obj/structure/rack/holorack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/wrench))
+	if(istype(W, /obj/item/weapon/wrench))
 		to_chat(user, "<span class='warning'>It's a holorack! There are no bolts!</span>")
 		return
 
@@ -423,6 +423,7 @@
 	throwforce = 10
 	w_class = 4
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	block_chance = 50
 
 /obj/item/weapon/holo/claymore/blue
 	icon_state = "claymoreblue"
@@ -432,9 +433,6 @@
 	icon_state = "claymorered"
 	item_state = "claymorered"
 
-/obj/item/weapon/holo/claymore/IsShield()
-	return 1
-
 /obj/item/weapon/holo/esword
 	desc = "May the force be within you. Sorta"
 	icon_state = "sword0"
@@ -442,8 +440,9 @@
 	throw_speed = 1
 	throw_range = 5
 	throwforce = 0
-	w_class = 2.0
-	flags = NOSHIELD
+	w_class = 2
+	armour_penetration = 50
+	block_chance = 50
 	var/active = 0
 
 /obj/item/weapon/holo/esword/green/New()
@@ -452,9 +451,9 @@
 /obj/item/weapon/holo/esword/red/New()
 	item_color = "red"
 
-/obj/item/weapon/holo/esword/IsShield()
+/obj/item/weapon/holo/esword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
 	if(active)
-		return 1
+		return ..()
 	return 0
 
 /obj/item/weapon/holo/esword/New()
@@ -462,7 +461,7 @@
 
 /obj/item/weapon/holo/esword/attack_self(mob/living/user as mob)
 	active = !active
-	if (active)
+	if(active)
 		force = 30
 		icon_state = "sword[item_color]"
 		w_class = 4
@@ -500,7 +499,7 @@
 	throwpass = 1
 
 /obj/structure/holohoop/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
+	if(istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
 		var/obj/item/weapon/grab/G = W
 		if(G.state<2)
 			to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
@@ -510,13 +509,13 @@
 		visible_message("<span class='warning'>[G.assailant] dunks [G.affecting] into the [src]!</span>")
 		qdel(W)
 		return
-	else if (istype(W, /obj/item) && get_dist(src,user)<2)
+	else if(istype(W, /obj/item) && get_dist(src,user)<2)
 		user.drop_item(src)
 		visible_message("<span class='notice'>[user] dunks [W] into the [src]!</span>")
 		return
 
 /obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-	if (istype(mover,/obj/item) && mover.throwing)
+	if(istype(mover,/obj/item) && mover.throwing)
 		var/obj/item/I = mover
 		if(istype(I, /obj/item/projectile))
 			return
@@ -572,7 +571,7 @@
 	var/numready = 0
 	for(var/obj/machinery/readybutton/button in currentarea)
 		numbuttons++
-		if (button.ready)
+		if(button.ready)
 			numready++
 
 	if(numbuttons == numready)
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index cd30465370d..10ae5692ba2 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -25,7 +25,7 @@
 	..()
 	for(dir in list(NORTH,EAST,SOUTH,WEST))
 		table = locate(/obj/machinery/optable, get_step(src, dir))
-		if (table)
+		if(table)
 			table.computer = src
 			break
 
@@ -49,8 +49,8 @@
 
 
 ///obj/machinery/computer/operating/interact(mob/user)
-//	if ( ((get_dist(src, user) > 1) && !isobserver(user)) || (stat & (BROKEN|NOPOWER)) )
-//		if (!istype(user, /mob/living/silicon))
+//	if( ((get_dist(src, user) > 1) && !isobserver(user)) || (stat & (BROKEN|NOPOWER)) )
+//		if(!istype(user, /mob/living/silicon))
 //			user.unset_machine()
 //			user << browse(null, "window=op")
 //			return
@@ -91,7 +91,7 @@
 	data["hasOccupant"] = occupant ? 1 : 0
 	var/occupantData[0]
 
-	if (occupant)
+	if(occupant)
 		occupantData["name"] = occupant.name
 		occupantData["stat"] = occupant.stat
 		occupantData["health"] = occupant.health
@@ -107,31 +107,31 @@
 		occupantData["maxTemp"] = 1000 // If you get a burning vox armalis into the sleeper, congratulations
 		// Because we can put simple_animals in here, we need to do something tricky to get things working nice
 		occupantData["temperatureSuitability"] = 0 // 0 is the baseline
-		if (ishuman(occupant) && occupant.species)
+		if(ishuman(occupant) && occupant.species)
 			var/datum/species/sp = occupant.species
-			if (occupant.bodytemperature < sp.cold_level_3)
+			if(occupant.bodytemperature < sp.cold_level_3)
 				occupantData["temperatureSuitability"] = -3
-			else if (occupant.bodytemperature < sp.cold_level_2)
+			else if(occupant.bodytemperature < sp.cold_level_2)
 				occupantData["temperatureSuitability"] = -2
-			else if (occupant.bodytemperature < sp.cold_level_1)
+			else if(occupant.bodytemperature < sp.cold_level_1)
 				occupantData["temperatureSuitability"] = -1
-			else if (occupant.bodytemperature > sp.heat_level_3)
+			else if(occupant.bodytemperature > sp.heat_level_3)
 				occupantData["temperatureSuitability"] = 3
-			else if (occupant.bodytemperature > sp.heat_level_2)
+			else if(occupant.bodytemperature > sp.heat_level_2)
 				occupantData["temperatureSuitability"] = 2
-			else if (occupant.bodytemperature > sp.heat_level_1)
+			else if(occupant.bodytemperature > sp.heat_level_1)
 				occupantData["temperatureSuitability"] = 1
-		else if (istype(occupant, /mob/living/simple_animal))
+		else if(istype(occupant, /mob/living/simple_animal))
 			var/mob/living/simple_animal/silly = occupant
-			if (silly.bodytemperature < silly.minbodytemp)
+			if(silly.bodytemperature < silly.minbodytemp)
 				occupantData["temperatureSuitability"] = -3
-			else if (silly.bodytemperature > silly.maxbodytemp)
+			else if(silly.bodytemperature > silly.maxbodytemp)
 				occupantData["temperatureSuitability"] = 3
 		// Blast you, imperial measurement system
 		occupantData["btCelsius"] = occupant.bodytemperature - T0C
 		occupantData["btFaren"] = ((occupant.bodytemperature - T0C) * (9.0/5.0))+ 32
 
-		if (ishuman(occupant) && occupant.vessel && !(occupant.species && occupant.species.flags & NO_BLOOD))
+		if(ishuman(occupant) && occupant.vessel && !(occupant.species && occupant.species.flags & NO_BLOOD))
 			occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
 			occupantData["hasBlood"] = 1
 			occupantData["bloodLevel"] = round(occupant.vessel.get_reagent_amount("blood"))
@@ -156,7 +156,7 @@
 	data["oxy"]=oxy
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "op_computer.tmpl", "Patient Monitor", 650, 455)
 		ui.set_initial_data(data)
 		ui.open()
@@ -169,7 +169,7 @@
 /obj/machinery/computer/operating/Topic(href, href_list)
 	if(..())
 		return 1
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 
 	if(href_list["verboseOn"])
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 8ad0b715b4f..f06771cc288 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -81,7 +81,7 @@
 						icon_state = "3"
 		if(3)
 			if(istype(P, /obj/item/weapon/wirecutters))
-				if (brain)
+				if(brain)
 					to_chat(user, "Get that brain out of there first")
 				else
 					playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
@@ -95,7 +95,7 @@
 				if(P:amount >= 2)
 					playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 					if(do_after(user, 20, target = src))
-						if (P)
+						if(P)
 							P:amount -= 2
 							if(!P:amount) qdel(P)
 							to_chat(user, "\blue You put in the glass panel.")
@@ -158,7 +158,7 @@
 				playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
 				to_chat(user, "\blue You remove the glass panel.")
 				state = 3
-				if (brain)
+				if(brain)
 					icon_state = "3b"
 				else
 					icon_state = "3"
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index e326d9750d5..343f421b4e8 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -43,14 +43,14 @@
 		data["radio"] = occupant.aiRadio.disabledAi
 
 		var/laws[0]
-		for (var/datum/ai_law/law in occupant.laws.all_laws())
+		for(var/datum/ai_law/law in occupant.laws.all_laws())
 			laws.Add(list(list("law" = law.law, "number" = law.get_index())))
 
 		data["laws"] = laws
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "ai_fixer.tmpl", "AI System Integrity Restorer", 550, 500)
 		ui.set_initial_data(data)
 		ui.open()
@@ -62,13 +62,13 @@
 
 	if(href_list["fix"])
 		src.active = 1
-		while (src.occupant.health < 100)
+		while(src.occupant.health < 100)
 			src.occupant.adjustOxyLoss(-1)
 			src.occupant.adjustFireLoss(-1)
 			src.occupant.adjustToxLoss(-1)
 			src.occupant.adjustBruteLoss(-1)
 			src.occupant.updatehealth()
-			if (src.occupant.health >= 0 && src.occupant.stat == 2)
+			if(src.occupant.health >= 0 && src.occupant.stat == 2)
 				src.occupant.stat = 0
 				src.occupant.lying = 0
 				dead_mob_list -= src.occupant
@@ -99,11 +99,11 @@
 		var/overlay_layer = LIGHTING_LAYER+0.2 // +0.1 from the default computer overlays
 		if(active)
 			overlays += image(icon,"ai-fixer-on",overlay_layer)
-		if (occupant)
-			switch (occupant.stat)
-				if (0)
+		if(occupant)
+			switch(occupant.stat)
+				if(0)
 					overlays += image(icon,"ai-fixer-full",overlay_layer)
-				if (2)
+				if(2)
 					overlays += image(icon,"ai-fixer-404",overlay_layer)
 		else
 			overlays += image(icon,"ai-fixer-empty",overlay_layer)
@@ -131,7 +131,7 @@
 			occupant.loc = card
 			occupant = null
 			update_icon()
-		else if (active)
+		else if(active)
 			to_chat(user, "<span class='boldannounce'>ERROR</span>: Reconstruction in progress.")
-		else if (!occupant)
+		else if(!occupant)
 			to_chat(user, "<span class='boldannounce'>ERROR</span>: Unable to locate artificial intelligence.")
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index d3cc5f089a0..48b1dadc406 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -88,7 +88,7 @@
 	dat += "<br><center><h3>[temp]</h3></center>"
 	dat += "<br><center>Health: [player_hp] | Magic: [player_mp] | Enemy Health: [enemy_hp]</center>"
 
-	if (gameover)
+	if(gameover)
 		dat += "<center><b><a href='byond://?src=\ref[src];newgame=1'>New Game</a>"
 	else
 		dat += "<center><b><a href='byond://?src=\ref[src];attack=1'>Attack</a> | "
@@ -109,8 +109,8 @@
 	if(..())
 		return
 
-	if (!blocked && !gameover)
-		if (href_list["attack"])
+	if(!blocked && !gameover)
+		if(href_list["attack"])
 			blocked = 1
 			var/attackamt = rand(2,6)
 			temp = "You attack for [attackamt] damage!"
@@ -123,7 +123,7 @@
 			enemy_hp -= attackamt
 			arcade_action()
 
-		else if (href_list["heal"])
+		else if(href_list["heal"])
 			blocked = 1
 			var/pointamt = rand(1,3)
 			var/healamt = rand(6,8)
@@ -139,7 +139,7 @@
 			updateUsrDialog()
 			arcade_action()
 
-		else if (href_list["charge"])
+		else if(href_list["charge"])
 			blocked = 1
 			var/chargeamt = rand(4,7)
 			temp = "You regain [chargeamt] points"
@@ -152,11 +152,11 @@
 			sleep(10)
 			arcade_action()
 
-	if (href_list["close"])
+	if(href_list["close"])
 		usr.unset_machine()
 		usr << browse(null, "window=arcade")
 
-	else if (href_list["newgame"]) //Reset everything
+	else if(href_list["newgame"]) //Reset everything
 		temp = "New Round"
 		player_hp = 30
 		player_mp = 10
@@ -174,7 +174,7 @@
 	return
 
 /obj/machinery/computer/arcade/battle/proc/arcade_action()
-	if ((enemy_mp <= 0) || (enemy_hp <= 0))
+	if((enemy_mp <= 0) || (enemy_hp <= 0))
 		if(!gameover)
 			gameover = 1
 			temp = "[enemy_name] has fallen! Rejoice!"
@@ -193,20 +193,20 @@
 				var/score = player_hp + player_mp + 5
 				prizevend(score)
 
-	else if (emagged && (turtle >= 4))
+	else if(emagged && (turtle >= 4))
 		var/boomamt = rand(5,10)
 		temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!"
 		playsound(src.loc, 'sound/arcade/Boom.ogg', 20, 1, extrarange = -6, falloff = 10)
 		player_hp -= boomamt
 
-	else if ((enemy_mp <= 5) && (prob(70)))
+	else if((enemy_mp <= 5) && (prob(70)))
 		var/stealamt = rand(2,3)
 		temp = "[enemy_name] steals [stealamt] of your power!"
 		playsound(src.loc, 'sound/arcade/Steal.ogg', 20, 1, extrarange = -6, falloff = 10)
 		player_mp -= stealamt
 		updateUsrDialog()
 
-		if (player_mp <= 0)
+		if(player_mp <= 0)
 			gameover = 1
 			sleep(10)
 			temp = "You have been drained! GAME OVER"
@@ -217,7 +217,7 @@
 			else
 				feedback_inc("arcade_loss_mana_normal")
 
-	else if ((enemy_hp <= 10) && (enemy_mp > 4))
+	else if((enemy_hp <= 10) && (enemy_mp > 4))
 		temp = "[enemy_name] heals for 4 health!"
 		playsound(src.loc, 'sound/arcade/Heal.ogg', 20, 1, extrarange = -6, falloff = 10)
 		enemy_hp += 4
@@ -229,7 +229,7 @@
 		playsound(src.loc, 'sound/arcade/Hit.ogg', 20, 1, extrarange = -6, falloff = 10)
 		player_hp -= attackamt
 
-	if ((player_mp <= 0) || (player_hp <= 0))
+	if((player_mp <= 0) || (player_hp <= 0))
 		gameover = 1
 		temp = "You have been crushed! GAME OVER"
 		playsound(src.loc, 'sound/arcade/Lose.ogg', 20, 1, extrarange = -6, falloff = 10)
@@ -426,7 +426,7 @@
 		return
 	busy = 1
 
-	if (href_list["continue"]) //Continue your travels
+	if(href_list["continue"]) //Continue your travels
 		if(turns >= ORION_TRAIL_WINTURN)
 			win()
 		else
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index b128b06bf49..1168552b952 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -13,7 +13,7 @@
 /obj/item/weapon/circuitboard
 	density = 0
 	anchored = 0
-	w_class = 2.0
+	w_class = 2
 	name = "circuit board"
 	icon = 'icons/obj/module.dmi'
 	icon_state = "id_mod"
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 0311ac200fb..0fccf7b77a8 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -43,7 +43,7 @@
 
 
 /obj/machinery/computer/security/check_eye(var/mob/user as mob)
-	if ((get_dist(user, src) > 1 || !( user.canmove ) || user.blinded || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon)))
+	if((get_dist(user, src) > 1 || !( user.canmove ) || user.blinded || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon)))
 		return null
 	user.reset_view(current)
 	return 1
@@ -118,7 +118,7 @@
 		data["current"] = current.nano_structure()
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "sec_camera.tmpl", "Camera Console", 900, 800)
 
 		// adding a template with the key "mapContent" enables the map ui functionality
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 16242f5a58e..07443a9041c 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -153,16 +153,16 @@
 
 	var/list/L = list()
 
-	for (var/obj/machinery/camera/cam in cameranet.cameras)
+	for(var/obj/machinery/camera/cam in cameranet.cameras)
 		L.Add(cam)
 
 	camera_sort(L)
 
 	var/list/T = list()
 
-	for (var/obj/machinery/camera/netcam in L)
+	for(var/obj/machinery/camera/netcam in L)
 		var/list/tempnetwork = netcam.network&origin.networks
-		if (tempnetwork.len)
+		if(tempnetwork.len)
 			T[text("[][]", netcam.c_tag, (netcam.can_use() ? null : " (Deactivated)"))] = netcam
 
 
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 7af28cc4f73..bb31fba787d 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -37,6 +37,8 @@ var/time_last_changed_position = 0
 		/datum/job/mechanic,
 		/datum/job/barber,
 		/datum/job/chaplain,
+		/datum/job/ntnavyofficer,
+		/datum/job/ntspecops,
 		/datum/job/civilian
 	)
 
@@ -212,7 +214,7 @@ var/time_last_changed_position = 0
 	if(modify)
 		data["current_skin"] = modify.icon_state
 
-	if (modify && is_centcom())
+	if(modify && is_centcom())
 		var/list/all_centcom_access = list()
 		for(var/access in get_all_centcom_access())
 			all_centcom_access.Add(list(list(
@@ -223,12 +225,12 @@ var/time_last_changed_position = 0
 		data["all_centcom_access"] = all_centcom_access
 		data["all_centcom_skins"] = format_card_skins(get_centcom_card_skins())
 
-	else if (modify)
+	else if(modify)
 		var/list/regions = list()
 		for(var/i = 1; i <= 7; i++)
 			var/list/accesses = list()
 			for(var/access in get_region_accesses(i))
-				if (get_access_desc(access))
+				if(get_access_desc(access))
 					accesses.Add(list(list(
 						"desc" = replacetext(get_access_desc(access), " ", "&nbsp;"),
 						"ref" = access,
@@ -241,7 +243,7 @@ var/time_last_changed_position = 0
 		data["regions"] = regions
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "identification_computer.tmpl", src.name, 775, 700)
 		ui.set_initial_data(data)
 		ui.open()
@@ -251,8 +253,8 @@ var/time_last_changed_position = 0
 		return 1
 
 	switch(href_list["choice"])
-		if ("modify")
-			if (modify)
+		if("modify")
+			if(modify)
 				data_core.manifest_modify(modify.registered_name, modify.assignment)
 				modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
 				if(ishuman(usr))
@@ -265,13 +267,13 @@ var/time_last_changed_position = 0
 					modify = null
 			else
 				var/obj/item/I = usr.get_active_hand()
-				if (istype(I, /obj/item/weapon/card/id))
+				if(istype(I, /obj/item/weapon/card/id))
 					usr.drop_item()
 					I.loc = src
 					modify = I
 
-		if ("scan")
-			if (scan)
+		if("scan")
+			if(scan)
 				if(ishuman(usr))
 					scan.loc = usr.loc
 					if(!usr.get_active_hand())
@@ -282,7 +284,7 @@ var/time_last_changed_position = 0
 					scan = null
 			else
 				var/obj/item/I = usr.get_active_hand()
-				if (istype(I, /obj/item/weapon/card/id))
+				if(istype(I, /obj/item/weapon/card/id))
 					usr.drop_item()
 					I.loc = src
 					scan = I
@@ -302,8 +304,8 @@ var/time_last_changed_position = 0
 			if(is_authenticated(usr) && modify && ((skin in get_station_card_skins()) || ((skin in get_centcom_card_skins()) && is_centcom())))
 				modify.icon_state = href_list["skin_target"]
 
-		if ("assign")
-			if (is_authenticated(usr) && modify)
+		if("assign")
+			if(is_authenticated(usr) && modify)
 				var/t1 = href_list["assign_target"]
 				if(t1 == "Custom")
 					var/temp_t = sanitize(copytext(input("Enter a custom job assignment.","Assignment"),1,MAX_MESSAGE_LEN))
@@ -333,10 +335,10 @@ var/time_last_changed_position = 0
 
 				callHook("reassign_employee", list(modify))
 
-		if ("reg")
-			if (is_authenticated(usr))
+		if("reg")
+			if(is_authenticated(usr))
 				var/t2 = modify
-				if ((modify == t2 && (in_range(src, usr) || (istype(usr, /mob/living/silicon))) && istype(loc, /turf)))
+				if((modify == t2 && (in_range(src, usr) || (istype(usr, /mob/living/silicon))) && istype(loc, /turf)))
 					var/temp_name = reject_bad_name(href_list["reg"])
 					if(temp_name)
 						modify.registered_name = temp_name
@@ -344,19 +346,19 @@ var/time_last_changed_position = 0
 						src.visible_message("<span class='notice'>[src] buzzes rudely.</span>")
 			nanomanager.update_uis(src)
 
-		if ("account")
-			if (is_authenticated(usr))
+		if("account")
+			if(is_authenticated(usr))
 				var/t2 = modify
-				if ((modify == t2 && (in_range(src, usr) || (istype(usr, /mob/living/silicon))) && istype(loc, /turf)))
+				if((modify == t2 && (in_range(src, usr) || (istype(usr, /mob/living/silicon))) && istype(loc, /turf)))
 					var/account_num = text2num(href_list["account"])
 					modify.associated_account_number = account_num
 			nanomanager.update_uis(src)
 
-		if ("mode")
+		if("mode")
 			mode = text2num(href_list["mode_target"])
 
-		if ("print")
-			if (!printing)
+		if("print")
+			if(!printing)
 				printing = 1
 				playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
 				spawn(50)
@@ -364,13 +366,13 @@ var/time_last_changed_position = 0
 					nanomanager.update_uis(src)
 
 					var/obj/item/weapon/paper/P = new(loc)
-					if (mode == 2)
+					if(mode == 2)
 						P.name = text("crew manifest ([])", worldtime2text())
 						P.info = {"<h4>Crew Manifest</h4>
 							<br>
 							[data_core ? data_core.get_manifest(0) : ""]
 						"}
-					else if (modify && !mode)
+					else if(modify && !mode)
 						P.name = "access report"
 						P.info = {"<h4>Access Report</h4>
 							<u>Prepared By:</u> [scan && scan.registered_name ? scan.registered_name : "Unknown"]<br>
@@ -388,8 +390,8 @@ var/time_last_changed_position = 0
 							first = 0
 						P.info += "</div>"
 
-		if ("terminate")
-			if (is_authenticated(usr))
+		if("terminate")
+			if(is_authenticated(usr))
 				modify.assignment = "Terminated"
 				modify.access = list()
 
@@ -426,7 +428,7 @@ var/time_last_changed_position = 0
 				opened_positions[edit_job_target]--
 				nanomanager.update_uis(src)
 
-	if (modify)
+	if(modify)
 		modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
 
 	return 1
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 0818dccbe35..107bdea149c 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -37,7 +37,7 @@
 	if(scanner.occupant && can_autoprocess())
 		scan_mob(scanner.occupant)
 
-	for (var/obj/machinery/clonepod/pod in pods)
+	for(var/obj/machinery/clonepod/pod in pods)
 		if(!(pod.occupant || pod.mess) && (pod.efficiency > 5))
 			for(var/datum/dna2/record/R in src.records)
 				if(!(pod.occupant || pod.mess))
@@ -57,7 +57,7 @@
 	//Try to find scanner on adjacent tiles first
 	for(dir in list(NORTH,EAST,SOUTH,WEST))
 		scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
-		if (scannerf)
+		if(scannerf)
 			return scannerf
 
 	//Then look for a free one in the area
@@ -82,8 +82,8 @@
 			P.name = "[initial(P.name)] #[num++]"
 
 /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES
-		if (!src.diskette)
+	if(istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES
+		if(!src.diskette)
 			user.drop_item()
 			W.loc = src
 			src.diskette = W
@@ -129,7 +129,7 @@
 		data["numberofpods"] = src.pods.len
 
 		var/list/tempods[0]
-		for (var/obj/machinery/clonepod/pod in pods)
+		for(var/obj/machinery/clonepod/pod in pods)
 			if(pod.efficiency > 5)
 				canpodautoprocess = 1
 
@@ -159,13 +159,13 @@
 	data["records"] = temprecords
 
 	if(src.menu == 3)
-		if (src.active_record)
+		if(src.active_record)
 			data["activerecord"] = "\ref[src.active_record]"
 			var/obj/item/weapon/implant/health/H = null
 			if(src.active_record.implant)
 				H = locate(src.active_record.implant)
 
-			if ((H) && (istype(H)))
+			if((H) && (istype(H)))
 				data["health"] = H.sensehealth()
 			data["realname"] = sanitize(src.active_record.dna.real_name)
 			data["unidentity"] = src.active_record.dna.uni_identity
@@ -177,7 +177,7 @@
 
 	// Set up the Nano UI
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "cloning_console.tmpl", "Cloning Console UI", 640, 520)
 		ui.set_initial_data(data)
 		ui.open()
@@ -189,7 +189,7 @@
 	if(loading)
 		return
 
-	if (href_list["scan"] && scanner && scanner.occupant)
+	if(href_list["scan"] && scanner && scanner.occupant)
 		scantemp = "Scanner ready."
 
 		loading = 1
@@ -213,16 +213,16 @@
 				nanomanager.update_uis(src)
 
 	//No locking an open scanner.
-	else if ((href_list["lock"]) && (!isnull(src.scanner)))
-		if ((!src.scanner.locked) && (src.scanner.occupant))
+	else if((href_list["lock"]) && (!isnull(src.scanner)))
+		if((!src.scanner.locked) && (src.scanner.occupant))
 			src.scanner.locked = 1
 		else
 			src.scanner.locked = 0
 
-	else if (href_list["view_rec"])
+	else if(href_list["view_rec"])
 		src.active_record = locate(href_list["view_rec"])
 		if(istype(src.active_record,/datum/dna2/record))
-			if ((isnull(src.active_record.ckey)))
+			if((isnull(src.active_record.ckey)))
 				qdel(src.active_record)
 				src.temp = "<span class=\"bad\">Error: Record corrupt.</span>"
 			else
@@ -231,16 +231,16 @@
 			src.active_record = null
 			src.temp = "<span class=\"bad\">Error: Record missing.</span>"
 
-	else if (href_list["del_rec"])
-		if ((!src.active_record) || (src.menu < 3))
+	else if(href_list["del_rec"])
+		if((!src.active_record) || (src.menu < 3))
 			return
-		if (src.menu == 3) //If we are viewing a record, confirm deletion
+		if(src.menu == 3) //If we are viewing a record, confirm deletion
 			src.temp = "Please confirm that you want to delete the record?"
 			src.menu = 4
 
-		else if (src.menu == 4)
+		else if(src.menu == 4)
 			var/obj/item/weapon/card/id/C = usr.get_active_hand()
-			if (istype(C)||istype(C, /obj/item/device/pda))
+			if(istype(C)||istype(C, /obj/item/device/pda))
 				if(src.check_access(C))
 					src.records.Remove(src.active_record)
 					qdel(src.active_record)
@@ -249,14 +249,14 @@
 				else
 					src.temp = "<span class=\"bad\">Error: Access denied.</span>"
 
-	else if (href_list["disk"]) //Load or eject.
+	else if(href_list["disk"]) //Load or eject.
 		switch(href_list["disk"])
 			if("load")
-				if ((isnull(src.diskette)) || isnull(src.diskette.buf))
+				if((isnull(src.diskette)) || isnull(src.diskette.buf))
 					src.temp = "<span class=\"bad\">Error: The disk's data could not be read.</span>"
 					nanomanager.update_uis(src)
 					return
-				if (isnull(src.active_record))
+				if(isnull(src.active_record))
 					src.temp = "<span class=\"bad\">Error: No active record was found.</span>"
 					src.menu = 1
 					nanomanager.update_uis(src)
@@ -267,12 +267,12 @@
 				src.temp = "Load successful."
 
 			if("eject")
-				if (!isnull(src.diskette))
+				if(!isnull(src.diskette))
 					src.diskette.loc = src.loc
 					src.diskette = null
 
-	else if (href_list["save_disk"]) //Save to disk!
-		if ((isnull(src.diskette)) || (src.diskette.read_only) || (isnull(src.active_record)))
+	else if(href_list["save_disk"]) //Save to disk!
+		if((isnull(src.diskette)) || (src.diskette.read_only) || (isnull(src.active_record)))
 			src.temp = "<span class=\"bad\">Error: The data could not be saved.</span>"
 			nanomanager.update_uis(src)
 			return
@@ -290,15 +290,15 @@
 		src.diskette.name = "data disk - '[src.active_record.dna.real_name]'"
 		src.temp = "Save \[[href_list["save_disk"]]\] successful."
 
-	else if (href_list["refresh"])
+	else if(href_list["refresh"])
 		nanomanager.update_uis(src)
 
-	else if (href_list["selectpod"])
+	else if(href_list["selectpod"])
 		var/obj/machinery/clonepod/selected = locate(href_list["selectpod"])
 		if(istype(selected) && (selected in pods))
 			selected_pod = selected
 
-	else if (href_list["clone"])
+	else if(href_list["clone"])
 		var/datum/dna2/record/C = locate(href_list["clone"])
 		//Look for that player! They better be dead!
 		if(istype(C))
@@ -307,7 +307,7 @@
 				temp = "<span class=\"bad\">Error: No cloning pod detected.</span>"
 			else
 				var/obj/machinery/clonepod/pod = selected_pod
-				if (!selected_pod)
+				if(!selected_pod)
 					temp = "<span class=\"bad\">Error: No cloning pod selected.</span>"
 				else if(pod.occupant)
 					temp = "<span class=\"bad\">Error: The cloning pod is currently occupied.</span>"
@@ -340,11 +340,11 @@
 		else
 			temp = "<span class=\"bad\">Error: Data corruption.</span>"
 
-	else if (href_list["menu"])
+	else if(href_list["menu"])
 		src.menu = text2num(href_list["menu"])
 		temp = ""
 		scantemp = "Scanner ready."
-	else if (href_list["toggle_mode"])
+	else if(href_list["toggle_mode"])
 		if(can_brainscan())
 			scan_mode = !scan_mode
 		else
@@ -355,13 +355,13 @@
 	return
 
 /obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob, var/scan_brain = 0)
-	if (stat & NOPOWER)
+	if(stat & NOPOWER)
 		return
-	if (scanner.stat & (NOPOWER|BROKEN))
+	if(scanner.stat & (NOPOWER|BROKEN))
 		return
-	if (scan_brain && !can_brainscan())
+	if(scan_brain && !can_brainscan())
 		return
-	if ((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (subject.species.flags & NO_SCAN))
+	if((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (subject.species.flags & NO_SCAN))
 		scantemp = "<span class=\"bad\">Error: Unable to locate valid genetic data.</span>"
 		nanomanager.update_uis(src)
 		return
@@ -377,23 +377,23 @@
 		scantemp = "<span class=\"bad\">Error: No signs of intelligence detected.</span>"
 		nanomanager.update_uis(src)
 		return
-	if (subject.suiciding == 1 && src.scanner.scan_level < 2)
+	if(subject.suiciding == 1 && src.scanner.scan_level < 2)
 		scantemp = "<span class=\"bad\">Error: Subject's brain is not responding to scanning stimuli.</span>"
 		nanomanager.update_uis(src)
 		return
-	if ((!subject.ckey) || (!subject.client))
+	if((!subject.ckey) || (!subject.client))
 		scantemp = "<span class=\"bad\">Error: Mental interface failure.</span>"
 		nanomanager.update_uis(src)
 		return
-	if ((NOCLONE in subject.mutations) && src.scanner.scan_level < 2)
+	if((NOCLONE in subject.mutations) && src.scanner.scan_level < 2)
 		scantemp = "<span class=\"bad\">Error: Mental interface failure.</span>"
 		nanomanager.update_uis(src)
 		return
-	if (scan_brain && !subject.get_int_organ(/obj/item/organ/internal/brain))
+	if(scan_brain && !subject.get_int_organ(/obj/item/organ/internal/brain))
 		scantemp = "<span class=\"bad\">Error: No brain found.</span>"
 		nanomanager.update_uis(src)
 		return
-	if (!isnull(find_record(subject.ckey)))
+	if(!isnull(find_record(subject.ckey)))
 		scantemp = "Subject already in database."
 		nanomanager.update_uis(src)
 		return
@@ -422,7 +422,7 @@
 	R.languages=subject.languages
 	//Add an implant if needed
 	var/obj/item/weapon/implant/health/imp = locate(/obj/item/weapon/implant/health, subject)
-	if (isnull(imp))
+	if(isnull(imp))
 		imp = new /obj/item/weapon/implant/health(subject)
 		imp.implanted = subject
 		R.implant = "\ref[imp]"
@@ -430,7 +430,7 @@
 	else
 		R.implant = "\ref[imp]"
 
-	if (!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning.
+	if(!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning.
 		R.mind = "\ref[subject.mind]"
 
 	src.records += R
@@ -441,7 +441,7 @@
 /obj/machinery/computer/cloning/proc/find_record(var/find_key)
 	var/selected_record = null
 	for(var/datum/dna2/record/R in src.records)
-		if (R.ckey == find_key)
+		if(R.ckey == find_key)
 			selected_record = R
 			break
 	return selected_record
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 73779c170e0..e87802f728c 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -54,7 +54,7 @@
 	if(..(href, href_list))
 		return 1
 
-	if ((!(src.z in config.station_levels) && !(src.z in config.admin_levels)))
+	if((!(src.z in config.station_levels) && !(src.z in config.admin_levels)))
 		to_chat(usr, "<span class='warning'>Unable to establish a connection: You're too far away from the station!</span>")
 		return 1
 
@@ -65,10 +65,10 @@
 		var/mob/living/carbon/human/M = usr
 		var/obj/item/card = M.get_active_hand()
 		var/obj/item/weapon/card/id/I = (card && card.GetID())||M.wear_id||M.wear_pda
-		if (istype(I, /obj/item/device/pda))
+		if(istype(I, /obj/item/device/pda))
 			var/obj/item/device/pda/pda = I
 			I = pda.id
-		if (I && istype(I))
+		if(I && istype(I))
 			if(src.check_access(I))
 				authenticated = 1
 			if(access_captain in I.access)
@@ -103,10 +103,10 @@
 			var/mob/living/carbon/human/L = usr
 			var/obj/item/card = L.get_active_hand()
 			var/obj/item/weapon/card/id/I = (card && card.GetID())||L.wear_id||L.wear_pda
-			if (istype(I, /obj/item/device/pda))
+			if(istype(I, /obj/item/device/pda))
 				var/obj/item/device/pda/pda = I
 				I = pda.id
-			if (I && istype(I))
+			if(I && istype(I))
 				if(access_captain in I.access)
 					var/old_level = security_level
 					if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN
@@ -303,7 +303,7 @@
 	if(stat & (NOPOWER|BROKEN))
 		return
 
-	if (!(src.z in list(ZLEVEL_STATION, ZLEVEL_CENTCOMM)))
+	if(!(src.z in list(ZLEVEL_STATION, ZLEVEL_CENTCOMM)))
 		to_chat(user, "<span class='warning'>Unable to establish a connection: You're too far away from the station!</span>")
 		return
 
@@ -376,7 +376,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "comm_console.tmpl", "Communications Console", 400, 500)
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 8524cd85754..537d3772366 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -40,15 +40,15 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(25))
+			if(prob(25))
 				qdel(src)
 				return
-			if (prob(50))
+			if(prob(50))
 				for(var/x in verbs)
 					verbs -= x
 				set_broken()
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				for(var/x in verbs)
 					verbs -= x
 				set_broken()
@@ -62,7 +62,7 @@
 	..()
 
 /obj/machinery/computer/blob_act()
-	if (prob(75))
+	if(prob(75))
 		for(var/x in verbs)
 			verbs -= x
 		set_broken()
@@ -117,9 +117,9 @@
 			var/obj/item/weapon/circuitboard/M = new circuit( A )
 			A.circuit = M
 			A.anchored = 1
-			for (var/obj/C in src)
+			for(var/obj/C in src)
 				C.loc = src.loc
-			if (src.stat & BROKEN)
+			if(src.stat & BROKEN)
 				to_chat(user, "\blue The broken glass falls out.")
 				new /obj/item/weapon/shard(loc)
 				A.state = 3
diff --git a/code/game/machinery/computer/hologram.dm b/code/game/machinery/computer/hologram.dm
index 2b5f0b92296..48dfaf36bf6 100644
--- a/code/game/machinery/computer/hologram.dm
+++ b/code/game/machinery/computer/hologram.dm
@@ -22,7 +22,7 @@
 	return
 
 /obj/machinery/computer/hologram_comp/attack_hand()
-	if (!in_range(src, usr))
+	if(!in_range(src, usr))
 		return 0
 	src.show_console(usr)
 	return
@@ -30,7 +30,7 @@
 /obj/machinery/computer/hologram_comp/proc/render()
 	var/icon/I = new /icon('icons/mob/human.dmi', "body_m_s")
 
-	if (src.lumens >= 0)
+	if(src.lumens >= 0)
 		I.Blend(rgb(src.lumens, src.lumens, src.lumens), ICON_ADD)
 	else
 		I.Blend(rgb(- src.lumens,  -src.lumens,  -src.lumens), ICON_SUBTRACT)
@@ -48,7 +48,7 @@
 /obj/machinery/computer/hologram_comp/proc/show_console(var/mob/user as mob)
 	var/dat
 	user.set_machine(src)
-	if (src.temp)
+	if(src.temp)
 		dat = text("[]<BR><BR><A href='?src=\ref[];temp=1'>Clear</A>", src.temp, src)
 	else
 		dat = text("<B>Hologram Status:</B><HR>\nPower: <A href='?src=\ref[];power=1'>[]</A><HR>\n<B>Hologram Control:</B><BR>\nColor Luminosity: []/220 <A href='?src=\ref[];reset=1'>\[Reset\]</A><BR>\nLighten: <A href='?src=\ref[];light=1'>1</A> <A href='?src=\ref[];light=10'>10</A><BR>\nDarken: <A href='?src=\ref[];light=-1'>1</A> <A href='?src=\ref[];light=-10'>10</A><BR>\n<BR>\nHair Color: ([],[],[]) <A href='?src=\ref[];h_reset=1'>\[Reset\]</A><BR>\nRed (0-255): <A href='?src=\ref[];h_r=-300'>\[0\]</A> <A href='?src=\ref[];h_r=-10'>-10</A> <A href='?src=\ref[];h_r=-1'>-1</A> [] <A href='?src=\ref[];h_r=1'>1</A> <A href='?src=\ref[];h_r=10'>10</A> <A href='?src=\ref[];h_r=300'>\[255\]</A><BR>\nGreen (0-255): <A href='?src=\ref[];h_g=-300'>\[0\]</A> <A href='?src=\ref[];h_g=-10'>-10</A> <A href='?src=\ref[];h_g=-1'>-1</A> [] <A href='?src=\ref[];h_g=1'>1</A> <A href='?src=\ref[];h_g=10'>10</A> <A href='?src=\ref[];h_g=300'>\[255\]</A><BR>\nBlue (0-255): <A href='?src=\ref[];h_b=-300'>\[0\]</A> <A href='?src=\ref[];h_b=-10'>-10</A> <A href='?src=\ref[];h_b=-1'>-1</A> [] <A href='?src=\ref[];h_b=1'>1</A> <A href='?src=\ref[];h_b=10'>10</A> <A href='?src=\ref[];h_b=300'>\[255\]</A><BR>", src, (src.projector.hologram ? "On" : "Off"),  -src.lumens + 35, src, src, src, src, src, src.h_r, src.h_g, src.h_b, src, src, src, src, src.h_r, src, src, src, src, src, src, src.h_g, src, src, src, src, src, src, src.h_b, src, src, src)
@@ -59,10 +59,10 @@
 /obj/machinery/computer/hologram_comp/Topic(href, href_list)
 	if(..())
 		return 1
-	if (in_range(src, usr))
+	if(in_range(src, usr))
 		flick("holo_console1", src)
-		if (href_list["power"])
-			if (src.projector.hologram)
+		if(href_list["power"])
+			if(src.projector.hologram)
 				src.projector.icon_state = "hologram0"
 				//src.projector.hologram = null
 				qdel(src.projector.hologram)
@@ -73,38 +73,38 @@
 				src.projector.icon_state = "hologram1"
 				src.render()
 		else
-			if (href_list["h_r"])
-				if (src.projector.hologram)
+			if(href_list["h_r"])
+				if(src.projector.hologram)
 					src.h_r += text2num(href_list["h_r"])
 					src.h_r = min(max(src.h_r, 0), 255)
 					render()
 			else
-				if (href_list["h_g"])
-					if (src.projector.hologram)
+				if(href_list["h_g"])
+					if(src.projector.hologram)
 						src.h_g += text2num(href_list["h_g"])
 						src.h_g = min(max(src.h_g, 0), 255)
 						render()
 				else
-					if (href_list["h_b"])
-						if (src.projector.hologram)
+					if(href_list["h_b"])
+						if(src.projector.hologram)
 							src.h_b += text2num(href_list["h_b"])
 							src.h_b = min(max(src.h_b, 0), 255)
 							render()
 					else
-						if (href_list["light"])
-							if (src.projector.hologram)
+						if(href_list["light"])
+							if(src.projector.hologram)
 								src.lumens += text2num(href_list["light"])
 								src.lumens = min(max(src.lumens, -185.0), 35)
 								render()
 						else
-							if (href_list["reset"])
-								if (src.projector.hologram)
+							if(href_list["reset"])
+								if(src.projector.hologram)
 									src.lumens = 0
 									render()
 							else
-								if (href_list["temp"])
+								if(href_list["temp"])
 									src.temp = null
 		for(var/mob/M in viewers(1, src))
-			if ((M.client && M.machine == src))
+			if((M.client && M.machine == src))
 				src.show_console(M)
 	return
diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm
index 03e66710fd7..2f26663395e 100644
--- a/code/game/machinery/computer/honkputer.dm
+++ b/code/game/machinery/computer/honkputer.dm
@@ -20,7 +20,7 @@
 /obj/machinery/computer/HONKputer/Topic(href, href_list)
 	if(..())
 		return 1
-	if (!(src.z in config.station_levels))
+	if(!(src.z in config.station_levels))
 		to_chat(usr, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
 		return
 	usr.set_machine(src)
@@ -34,10 +34,10 @@
 		if("login")
 			var/mob/M = usr
 			var/obj/item/weapon/card/id/I = M.get_active_hand()
-			if (istype(I, /obj/item/device/pda))
+			if(istype(I, /obj/item/device/pda))
 				var/obj/item/device/pda/pda = I
 				I = pda.id
-			if (I && istype(I))
+			if(I && istype(I))
 				if(src.check_access(I) || src.emagged==1)
 					authenticated = 1
 		if("logout")
@@ -68,20 +68,20 @@
 /obj/machinery/computer/HONKputer/attack_hand(var/mob/user as mob)
 	if(..())
 		return
-	if (src.z > 6)
+	if(src.z > 6)
 		to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
 		return
 
 	user.set_machine(src)
 	var/dat = "<head><title>HONKputer Interface</title></head><body>"
 
-	if (istype(user, /mob/living/silicon))
+	if(istype(user, /mob/living/silicon))
 		to_chat(user, "This console is not networked to the rest of the grid.")
 		return
 
 	switch(src.state)
 		if(STATE_DEFAULT)
-			if (src.authenticated)
+			if(src.authenticated)
 				dat += "<BR>\[ <A HREF='?src=\ref[src];operation=logout'>Log Out</A> \]"
 				dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageHonkplanet'>Send an emergency message to Honkplanet</A> \]"
 			else
@@ -101,9 +101,9 @@
 			var/obj/item/weapon/circuitboard/M = new circuit( A )
 			A.circuit = M
 			A.anchored = 1
-			for (var/obj/C in src)
+			for(var/obj/C in src)
 				C.loc = src.loc
-			if (src.stat & BROKEN)
+			if(src.stat & BROKEN)
 				to_chat(user, "\blue The broken glass falls out.")
 				new /obj/item/weapon/shard( src.loc )
 				A.state = 3
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index 2f7cfad49b9..d50edbfd0cb 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -29,7 +29,7 @@
 
 
 	attackby(obj/item/weapon/O as obj, mob/user as mob, params)
-		if (user.z > 6)
+		if(user.z > 6)
 			to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
 			return
 		if(istype(O, /obj/item/weapon/aiModule))
@@ -54,7 +54,7 @@
 
 		src.current = select_active_ai(user)
 
-		if (!src.current)
+		if(!src.current)
 			to_chat(usr, "No active AIs detected.")
 		else
 			to_chat(usr, "[src.current.name] selected for law changes.")
@@ -94,7 +94,7 @@
 
 		src.current = freeborg()
 
-		if (!src.current)
+		if(!src.current)
 			to_chat(usr, "No free cyborgs detected.")
 		else
 			to_chat(usr, "[src.current.name] selected for law changes.")
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 6e331d46cf3..bb19e1fe451 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -27,11 +27,11 @@
 	if(..())
 		return
 	var/dat
-	if (src.temp)
+	if(src.temp)
 		dat = text("<TT>[src.temp]</TT><BR><BR><A href='?src=\ref[src];temp=1'>Clear Screen</A>")
 	else
 		dat = text("Confirm Identity: <A href='?src=\ref[];scan=1'>[]</A><HR>", src, (src.scan ? text("[]", src.scan.name) : "----------"))
-		if (src.authenticated)
+		if(src.authenticated)
 			switch(src.screen)
 				if(1.0)
 					dat += {"
@@ -54,12 +54,8 @@
 				if(3.0)
 					dat += text("<B>Records Maintenance</B><HR>\n<A href='?src=\ref[];back=1'>Backup To Disk</A><BR>\n<A href='?src=\ref[];u_load=1'>Upload From disk</A><BR>\n<A href='?src=\ref[];del_all=1'>Delete All Records</A><BR>\n<BR>\n<A href='?src=\ref[];screen=1'>Back</A>", src, src, src, src)
 				if(4.0)
-					var/icon/front = new(active1.fields["photo"], dir = SOUTH)
-					var/icon/side = new(active1.fields["photo"], dir = WEST)
-					user << browse_rsc(front, "front.png")
-					user << browse_rsc(side, "side.png")
 					dat += "<CENTER><B>Medical Record</B></CENTER><BR>"
-					if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
+					if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
 						dat += "<table><tr><td>Name: [active1.fields["name"]] \
 								ID: [active1.fields["id"]]<BR>\n	\
 								Sex: <A href='?src=\ref[src];field=sex'>[active1.fields["sex"]]</A><BR>\n	\
@@ -67,10 +63,11 @@
 								Fingerprint: <A href='?src=\ref[src];field=fingerprint'>[active1.fields["fingerprint"]]</A><BR>\n	\
 								Physical Status: <A href='?src=\ref[src];field=p_stat'>[active1.fields["p_stat"]]</A><BR>\n	\
 								Mental Status: <A href='?src=\ref[src];field=m_stat'>[active1.fields["m_stat"]]</A><BR></td><td align = center valign = top> \
-								Photo:<br><img src=front.png height=64 width=64 border=5><img src=side.png height=64 width=64 border=5></td></tr></table>"
+								Photo:<br><img src=[active1.fields["photo-south"]] height=64 width=64 border=5> \
+								<img src=[active1.fields["photo-west"]] height=64 width=64 border=5></td></tr></table>"
 					else
 						dat += "<B>General Record Lost!</B><BR>"
-					if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
+					if((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
 						dat += text("<BR>\n<CENTER><B>Medical Data</B></CENTER><BR>\nBlood Type: <A href='?src=\ref[];field=b_type'>[]</A><BR>\nDNA: <A href='?src=\ref[];field=b_dna'>[]</A><BR>\n<BR>\nMinor Disabilities: <A href='?src=\ref[];field=mi_dis'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=mi_dis_d'>[]</A><BR>\n<BR>\nMajor Disabilities: <A href='?src=\ref[];field=ma_dis'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=ma_dis_d'>[]</A><BR>\n<BR>\nAllergies: <A href='?src=\ref[];field=alg'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=alg_d'>[]</A><BR>\n<BR>\nCurrent Diseases: <A href='?src=\ref[];field=cdi'>[]</A> (per disease info placed in log/comment section)<BR>\nDetails: <A href='?src=\ref[];field=cdi_d'>[]</A><BR>\n<BR>\nImportant Notes:<BR>\n\t<A href='?src=\ref[];field=notes'>[]</A><BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src, src.active2.fields["b_type"], src, src.active2.fields["b_dna"], src, src.active2.fields["mi_dis"], src, src.active2.fields["mi_dis_d"], src, src.active2.fields["ma_dis"], src, src.active2.fields["ma_dis_d"], src, src.active2.fields["alg"], src, src.active2.fields["alg_d"], src, src.active2.fields["cdi"], src, src.active2.fields["cdi_d"], src, src.active2.fields["notes"])
 						var/counter = 1
 						while(src.active2.fields[text("com_[]", counter)])
@@ -123,20 +120,20 @@
 	if(..())
 		return 1
 
-	if (!( data_core.general.Find(src.active1) ))
+	if(!( data_core.general.Find(src.active1) ))
 		src.active1 = null
 
-	if (!( data_core.medical.Find(src.active2) ))
+	if(!( data_core.medical.Find(src.active2) ))
 		src.active2 = null
 
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 
-		if (href_list["temp"])
+		if(href_list["temp"])
 			src.temp = null
 
-		if (href_list["scan"])
-			if (src.scan)
+		if(href_list["scan"])
+			if(src.scan)
 
 				if(ishuman(usr))
 					scan.loc = usr.loc
@@ -152,27 +149,27 @@
 
 			else
 				var/obj/item/I = usr.get_active_hand()
-				if (istype(I, /obj/item/weapon/card/id))
+				if(istype(I, /obj/item/weapon/card/id))
 					usr.drop_item()
 					I.loc = src
 					src.scan = I
 
-		else if (href_list["logout"])
+		else if(href_list["logout"])
 			src.authenticated = null
 			src.screen = null
 			src.active1 = null
 			src.active2 = null
 
-		else if (href_list["login"])
+		else if(href_list["login"])
 
-			if (istype(usr, /mob/living/silicon/ai))
+			if(istype(usr, /mob/living/silicon/ai))
 				src.active1 = null
 				src.active2 = null
 				src.authenticated = usr.name
 				src.rank = "AI"
 				src.screen = 1
 
-			else if (istype(usr, /mob/living/silicon/robot))
+			else if(istype(usr, /mob/living/silicon/robot))
 				src.active1 = null
 				src.active2 = null
 				src.authenticated = usr.name
@@ -180,16 +177,16 @@
 				src.rank = "[R.modtype] [R.braintype]"
 				src.screen = 1
 
-			else if (istype(src.scan, /obj/item/weapon/card/id))
+			else if(istype(src.scan, /obj/item/weapon/card/id))
 				src.active1 = null
 				src.active2 = null
 
-				if (src.check_access(src.scan))
+				if(src.check_access(src.scan))
 					src.authenticated = src.scan.registered_name
 					src.rank = src.scan.assignment
 					src.screen = 1
 
-		if (src.authenticated)
+		if(src.authenticated)
 
 			if(href_list["screen"])
 				src.screen = text2num(href_list["screen"])
@@ -215,125 +212,125 @@
 <BR>
 <BR><b>Severity:</b> [Dis.severity]"}
 
-			if (href_list["del_all"])
+			if(href_list["del_all"])
 				src.temp = text("Are you sure you wish to delete all records?<br>\n\t<A href='?src=\ref[];temp=1;del_all2=1'>Yes</A><br>\n\t<A href='?src=\ref[];temp=1'>No</A><br>", src, src)
 
-			if (href_list["del_all2"])
+			if(href_list["del_all2"])
 				for(var/datum/data/record/R in data_core.medical)
 					//R = null
 					qdel(R)
 					//Foreach goto(494)
 				src.temp = "All records deleted."
 
-			if (href_list["field"])
+			if(href_list["field"])
 				var/a1 = src.active1
 				var/a2 = src.active2
 				switch(href_list["field"])
 					if("fingerprint")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input fingerprint hash:", "Med. records", src.active1.fields["fingerprint"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							src.active1.fields["fingerprint"] = t1
 					if("sex")
-						if (istype(src.active1, /datum/data/record))
-							if (src.active1.fields["sex"] == "Male")
+						if(istype(src.active1, /datum/data/record))
+							if(src.active1.fields["sex"] == "Male")
 								src.active1.fields["sex"] = "Female"
 							else
 								src.active1.fields["sex"] = "Male"
 					if("age")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							var/t1 = input("Please input age:", "Med. records", src.active1.fields["age"], null)  as num
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							src.active1.fields["age"] = t1
 					if("mi_dis")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input minor disabilities list:", "Med. records", src.active2.fields["mi_dis"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["mi_dis"] = t1
 					if("mi_dis_d")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please summarize minor dis.:", "Med. records", src.active2.fields["mi_dis_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["mi_dis_d"] = t1
 					if("ma_dis")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input major diabilities list:", "Med. records", src.active2.fields["ma_dis"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["ma_dis"] = t1
 					if("ma_dis_d")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please summarize major dis.:", "Med. records", src.active2.fields["ma_dis_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["ma_dis_d"] = t1
 					if("alg")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please state allergies:", "Med. records", src.active2.fields["alg"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["alg"] = t1
 					if("alg_d")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please summarize allergies:", "Med. records", src.active2.fields["alg_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["alg_d"] = t1
 					if("cdi")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please state diseases:", "Med. records", src.active2.fields["cdi"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["cdi"] = t1
 					if("cdi_d")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please summarize diseases:", "Med. records", src.active2.fields["cdi_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["cdi_d"] = t1
 					if("notes")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = copytext(html_encode(trim(input("Please summarize notes:", "Med. records", html_decode(src.active2.fields["notes"]), null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["notes"] = t1
 					if("p_stat")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							src.temp = text("<B>Physical Condition:</B><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=deceased'>*Deceased*</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=ssd'>*SSD*</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=active'>Active</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=unfit'>Physically Unfit</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=disabled'>Disabled</A><BR>", src, src, src, src, src)
 					if("m_stat")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							src.temp = text("<B>Mental Condition:</B><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=insane'>*Insane*</A><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=unstable'>*Unstable*</A><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=watch'>*Watch*</A><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=stable'>Stable</A><BR>", src, src, src, src)
 					if("b_type")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							src.temp = text("<B>Blood Type:</B><BR>\n\t<A href='?src=\ref[];temp=1;b_type=an'>A-</A> <A href='?src=\ref[];temp=1;b_type=ap'>A+</A><BR>\n\t<A href='?src=\ref[];temp=1;b_type=bn'>B-</A> <A href='?src=\ref[];temp=1;b_type=bp'>B+</A><BR>\n\t<A href='?src=\ref[];temp=1;b_type=abn'>AB-</A> <A href='?src=\ref[];temp=1;b_type=abp'>AB+</A><BR>\n\t<A href='?src=\ref[];temp=1;b_type=on'>O-</A> <A href='?src=\ref[];temp=1;b_type=op'>O+</A><BR>", src, src, src, src, src, src, src, src)
 					if("b_dna")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input DNA hash:", "Med. records", src.active1.fields["dna"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							src.active1.fields["dna"] = t1
 					if("vir_name")
 						var/datum/data/record/v = locate(href_list["edit_vir"])
-						if (v)
+						if(v)
 							var/t1 = copytext(trim(sanitize(input("Please input pathogen name:", "VirusDB", v.fields["name"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							v.fields["name"] = t1
 					if("vir_desc")
 						var/datum/data/record/v = locate(href_list["edit_vir"])
-						if (v)
+						if(v)
 							var/t1 = copytext(trim(sanitize(input("Please input information about pathogen:", "VirusDB", v.fields["description"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							v.fields["description"] = t1
 					else
 
-			if (href_list["p_stat"])
-				if (src.active1)
+			if(href_list["p_stat"])
+				if(src.active1)
 					switch(href_list["p_stat"])
 						if("deceased")
 							src.active1.fields["p_stat"] = "*Deceased*"
@@ -346,8 +343,8 @@
 						if("disabled")
 							src.active1.fields["p_stat"] = "Disabled"
 
-			if (href_list["m_stat"])
-				if (src.active1)
+			if(href_list["m_stat"])
+				if(src.active1)
 					switch(href_list["m_stat"])
 						if("insane")
 							src.active1.fields["m_stat"] = "*Insane*"
@@ -359,8 +356,8 @@
 							src.active1.fields["m_stat"] = "Stable"
 
 
-			if (href_list["b_type"])
-				if (src.active2)
+			if(href_list["b_type"])
+				if(src.active2)
 					switch(href_list["b_type"])
 						if("an")
 							src.active2.fields["b_type"] = "A-"
@@ -380,23 +377,23 @@
 							src.active2.fields["b_type"] = "O+"
 
 
-			if (href_list["del_r"])
-				if (src.active2)
+			if(href_list["del_r"])
+				if(src.active2)
 					src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?<br>\n\t<A href='?src=\ref[];temp=1;del_r2=1'>Yes</A><br>\n\t<A href='?src=\ref[];temp=1'>No</A><br>", src, src)
 
-			if (href_list["del_r2"])
-				if (src.active2)
+			if(href_list["del_r2"])
+				if(src.active2)
 					//src.active2 = null
 					qdel(src.active2)
 
-			if (href_list["d_rec"])
+			if(href_list["d_rec"])
 				var/datum/data/record/R = locate(href_list["d_rec"])
 				var/datum/data/record/M = locate(href_list["d_rec"])
-				if (!( data_core.general.Find(R) ))
+				if(!( data_core.general.Find(R) ))
 					src.temp = "Record Not Found!"
 					return
 				for(var/datum/data/record/E in data_core.medical)
-					if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+					if((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 						M = E
 					else
 						//Foreach continue //goto(2540)
@@ -404,8 +401,8 @@
 				src.active2 = M
 				src.screen = 4
 
-			if (href_list["new"])
-				if ((istype(src.active1, /datum/data/record) && !( istype(src.active2, /datum/data/record) )))
+			if(href_list["new"])
+				if((istype(src.active1, /datum/data/record) && !( istype(src.active2, /datum/data/record) )))
 					var/datum/data/record/R = new /datum/data/record(  )
 					R.fields["name"] = src.active1.fields["name"]
 					R.fields["id"] = src.active1.fields["id"]
@@ -425,56 +422,56 @@
 					src.active2 = R
 					src.screen = 4
 
-			if (href_list["add_c"])
-				if (!( istype(src.active2, /datum/data/record) ))
+			if(href_list["add_c"])
+				if(!( istype(src.active2, /datum/data/record) ))
 					return
 				var/a2 = src.active2
 				var/t1 = copytext(trim(sanitize(input("Add Comment:", "Med. records", null, null)  as message)),1,MAX_MESSAGE_LEN)
-				if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+				if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 					return
 				var/counter = 1
 				while(src.active2.fields[text("com_[]", counter)])
 					counter++
 				src.active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")]<BR>[t1]")
 
-			if (href_list["del_c"])
-				if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))
+			if(href_list["del_c"])
+				if((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))
 					src.active2.fields[text("com_[]", href_list["del_c"])] = "<B>Deleted</B>"
 
-			if (href_list["search"])
+			if(href_list["search"])
 				var/t1 = input("Search String: (Name, DNA, or ID)", "Med. records", null, null)  as text
-				if ((!( t1 ) || usr.stat || !( src.authenticated ) || usr.restrained() || ((!in_range(src, usr)) && (!istype(usr, /mob/living/silicon)))))
+				if((!( t1 ) || usr.stat || !( src.authenticated ) || usr.restrained() || ((!in_range(src, usr)) && (!istype(usr, /mob/living/silicon)))))
 					return
 				src.active1 = null
 				src.active2 = null
 				t1 = lowertext(t1)
 				for(var/datum/data/record/R in data_core.medical)
-					if ((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])))
+					if((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])))
 						src.active2 = R
 					else
 						//Foreach continue //goto(3229)
-				if (!( src.active2 ))
+				if(!( src.active2 ))
 					src.temp = text("Could not locate record [].", t1)
 				else
 					for(var/datum/data/record/E in data_core.general)
-						if ((E.fields["name"] == src.active2.fields["name"] || E.fields["id"] == src.active2.fields["id"]))
+						if((E.fields["name"] == src.active2.fields["name"] || E.fields["id"] == src.active2.fields["id"]))
 							src.active1 = E
 						else
 							//Foreach continue //goto(3334)
 					src.screen = 4
 
-			if (href_list["print_p"])
-				if (!( src.printing ))
+			if(href_list["print_p"])
+				if(!( src.printing ))
 					src.printing = 1
 					playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
 					sleep(50)
 					var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc )
 					P.info = "<CENTER><B>Medical Record</B></CENTER><BR>"
-					if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
+					if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
 						P.info += text("Name: [] ID: []<BR>\nSex: []<BR>\nAge: []<BR>\nFingerprint: []<BR>\nPhysical Status: []<BR>\nMental Status: []<BR>", src.active1.fields["name"], src.active1.fields["id"], src.active1.fields["sex"], src.active1.fields["age"], src.active1.fields["fingerprint"], src.active1.fields["p_stat"], src.active1.fields["m_stat"])
 					else
 						P.info += "<B>General Record Lost!</B><BR>"
-					if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
+					if((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
 						P.info += text("<BR>\n<CENTER><B>Medical Data</B></CENTER><BR>\nBlood Type: []<BR>\nDNA: []<BR>\n<BR>\nMinor Disabilities: []<BR>\nDetails: []<BR>\n<BR>\nMajor Disabilities: []<BR>\nDetails: []<BR>\n<BR>\nAllergies: []<BR>\nDetails: []<BR>\n<BR>\nCurrent Diseases: [] (per disease info placed in log/comment section)<BR>\nDetails: []<BR>\n<BR>\nImportant Notes:<BR>\n\t[]<BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src.active2.fields["b_type"], src.active2.fields["b_dna"], src.active2.fields["mi_dis"], src.active2.fields["mi_dis_d"], src.active2.fields["ma_dis"], src.active2.fields["ma_dis_d"], src.active2.fields["alg"], src.active2.fields["alg_d"], src.active2.fields["cdi"], src.active2.fields["cdi_d"], src.active2.fields["notes"])
 						var/counter = 1
 						while(src.active2.fields[text("com_[]", counter)])
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index a56fe597b13..50dc9c19603 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -317,9 +317,9 @@
 /obj/machinery/computer/message_monitor/Topic(href, href_list)
 	if(..(href, href_list))
 		return 1
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		//Authenticate
-		if (href_list["auth"])
+		if(href_list["auth"])
 			if(auth)
 				auth = 0
 				screen = 0
@@ -332,10 +332,10 @@
 						message = incorrectkey
 
 		//Turn the server on/off.
-		if (href_list["active"])
+		if(href_list["active"])
 			if(auth) linkedServer.active = !linkedServer.active
 		//Find a server
-		if (href_list["find"])
+		if(href_list["find"])
 			if(message_servers && message_servers.len > 1)
 				src.linkedServer = input(usr,"Please select a server.", "Select a server.", null) as null|anything in message_servers
 				message = "<span class='alert'>NOTICE: Server selected.</span>"
@@ -346,7 +346,7 @@
 				message = noserver
 
 		//View the logs - KEY REQUIRED
-		if (href_list["view"])
+		if(href_list["view"])
 			if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
@@ -354,7 +354,7 @@
 					src.screen = 1
 
 		//Clears the logs - KEY REQUIRED
-		if (href_list["clear"])
+		if(href_list["clear"])
 			if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
@@ -362,7 +362,7 @@
 					src.linkedServer.pda_msgs = list()
 					message = "<span class='notice'>NOTICE: Logs cleared.</span>"
 		//Clears the request console logs - KEY REQUIRED
-		if (href_list["clearr"])
+		if(href_list["clearr"])
 			if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
@@ -370,7 +370,7 @@
 					src.linkedServer.rc_msgs = list()
 					message = "<span class='notice'>NOTICE: Logs cleared.</span>"
 		//Change the password - KEY REQUIRED
-		if (href_list["pass"])
+		if(href_list["pass"])
 			if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
@@ -390,7 +390,7 @@
 							message = incorrectkey
 
 		//Hack the Console to get the password
-		if (href_list["hack"])
+		if(href_list["hack"])
 			if((istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot)) && (usr.mind.special_role && usr.mind.original == usr))
 				src.hacking = 1
 				src.screen = 2
@@ -400,7 +400,7 @@
 					if(src && src.linkedServer && usr)
 						BruteForce(usr)
 		//Delete the log.
-		if (href_list["delete"])
+		if(href_list["delete"])
 			//Are they on the view logs screen?
 			if(screen == 1)
 				if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
@@ -409,7 +409,7 @@
 					src.linkedServer.pda_msgs -= locate(href_list["delete"])
 					message = "<span class='notice'>NOTICE: Log Deleted!</span>"
 		//Delete the request console log.
-		if (href_list["deleter"])
+		if(href_list["deleter"])
 			//Are they on the view logs screen?
 			if(screen == 4)
 				if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
@@ -418,14 +418,14 @@
 					src.linkedServer.rc_msgs -= locate(href_list["deleter"])
 					message = "<span class='notice'>NOTICE: Log Deleted!</span>"
 		//Create a custom message
-		if (href_list["msg"])
+		if(href_list["msg"])
 			if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
 				if(auth)
 					src.screen = 3
 		//Fake messaging selection - KEY REQUIRED
-		if (href_list["select"])
+		if(href_list["select"])
 			if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 				screen = 0
@@ -484,10 +484,10 @@
 							return src.attack_hand(usr)
 
 						var/obj/item/device/pda/PDARec = null
-						for (var/obj/item/device/pda/P in PDAs)
+						for(var/obj/item/device/pda/P in PDAs)
 							var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
 
-							if (!PM || !PM.can_receive())
+							if(!PM || !PM.can_receive())
 								continue
 							if(P.owner == customsender)
 								PDARec = P
@@ -520,15 +520,15 @@
 
 //			to_chat(usr, href_list["select"])
 
-		if (href_list["back"])
+		if(href_list["back"])
 			src.screen = 0
 		// View chat room list
-		if (href_list["chatroom"])
+		if(href_list["chatroom"])
 			if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else if(auth)
 				screen = 5
-		if (href_list["viewroom"])
+		if(href_list["viewroom"])
 			if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else if(auth)
diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm
index 6817d265a0f..cf16c34e04d 100644
--- a/code/game/machinery/computer/pod_tracking_console.dm
+++ b/code/game/machinery/computer/pod_tracking_console.dm
@@ -36,7 +36,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "pod_tracking.tmpl", "Pod Tracking Console", 400, 500)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 42875f58019..1f840bb5e08 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -47,7 +47,7 @@
 
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "robot_control.tmpl", "Robotic Control Console", 400, 500)
 		ui.set_initial_data(data)
 		ui.open()
@@ -94,7 +94,7 @@
 				target.self_destruct()
 
 	// Locks or unlocks the cyborg
-	else if (href_list["lockdown"])
+	else if(href_list["lockdown"])
 		var/mob/living/silicon/robot/target = get_cyborg_by_name(href_list["lockdown"])
 		if(!target || !istype(target))
 			return
@@ -123,7 +123,7 @@
 			to_chat(target.connected_ai, "[!target.lockcharge ? "<span class='notice'>NOTICE - Cyborg lockdown lifted</span>" : "<span class='alert'>ALERT - Cyborg lockdown detected</span>"]: <a href='?src=\ref[target.connected_ai];track=[html_encode(target.name)]'>[target.name]</a></span><br>")
 
 	// Remotely hacks the cyborg. Only antag AIs can do this and only to linked cyborgs.
-	else if (href_list["hack"])
+	else if(href_list["hack"])
 		var/mob/living/silicon/robot/target = get_cyborg_by_name(href_list["hack"])
 		if(!target || !istype(target))
 			return
@@ -204,7 +204,7 @@
 		robot["name"] = R.name
 		if(R.stat)
 			robot["status"] = "Not Responding"
-		else if (!R.canmove)
+		else if(!R.canmove)
 			robot["status"] = "Lockdown"
 		else
 			robot["status"] = "Operational"
@@ -240,7 +240,7 @@
 // Parameters: 1 (name - Cyborg we are trying to find)
 // Description: Helper proc for finding cyborg by name
 /obj/machinery/computer/robotics/proc/get_cyborg_by_name(var/name)
-	if (!name)
+	if(!name)
 		return
 	for(var/mob/living/silicon/robot/R in mob_list)
 		if(R.name == name)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 6f285930ab7..ae2c61a6c09 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -41,16 +41,16 @@
 /obj/machinery/computer/secure_data/attack_hand(mob/user as mob)
 	if(..())
 		return
-	if (src.z > 6)
+	if(src.z > 6)
 		to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
 		return
 	var/dat
 
-	if (temp)
+	if(temp)
 		dat = text("<TT>[]</TT><BR><BR><A href='?src=\ref[];choice=Clear Screen'>Clear Screen</A>", temp, src)
 	else
 		dat = text("Confirm Identity: <A href='?src=\ref[];choice=Confirm Identity'>[]</A><HR>", src, (scan ? text("[]", scan.name) : "----------"))
-		if (authenticated)
+		if(authenticated)
 			switch(screen)
 				if(1.0)
 
@@ -127,7 +127,7 @@
 						for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order))
 							var/crimstat = ""
 							for(var/datum/data/record/E in data_core.security)
-								if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
+								if((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
 									crimstat = E.fields["criminal"]
 							var/background
 							switch(crimstat)
@@ -164,11 +164,7 @@
 					dat += "<BR><A href='?src=\ref[src];choice=Delete All Records'>Delete All Records</A><BR><BR><A href='?src=\ref[src];choice=Return'>Back</A>"
 				if(3.0)
 					dat += "<CENTER><B>Security Record</B></CENTER><BR>"
-					if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
-						var/icon/front = new(active1.fields["photo"], dir = SOUTH)
-						var/icon/side = new(active1.fields["photo"], dir = WEST)
-						user << browse_rsc(front, "front.png")
-						user << browse_rsc(side, "side.png")
+					if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
 						dat += {"
 							<table><tr><td>
 								Name: <A href='?src=\ref[src];choice=Edit Field;field=name'>[active1.fields["name"]]</A><BR>
@@ -182,13 +178,13 @@
 							</td>
 							<td align = center valign = top>
 								Photo:<br>
-								<img src=front.png height=80 width=80 border=4>
-								<img src=side.png height=80 width=80 border=4><br>
+								<img src=[active1.fields["photo-south"]] height=80 width=80 border=4>
+								<img src=[active1.fields["photo-west"]] height=80 width=80 border=4><br>
 								<a href='?src=\ref[src];choice=Print Photo'>Print Photo</a>
 							</td></tr></table>"}
 					else
 						dat += "<B>General Record Lost!</B><BR>"
-					if ((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
+					if((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
 						dat += text("<BR>\n<CENTER><B>Security Data</B></CENTER><BR>\nCriminal Status: <A href='?src=\ref[];choice=Edit Field;field=criminal'>[]</A><BR>\n<BR>\nMinor Crimes: <A href='?src=\ref[];choice=Edit Field;field=mi_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];choice=Edit Field;field=mi_crim_d'>[]</A><BR>\n<BR>\nMajor Crimes: <A href='?src=\ref[];choice=Edit Field;field=ma_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];choice=Edit Field;field=ma_crim_d'>[]</A><BR>\n<BR>\nImportant Notes:<BR>\n\t<A href='?src=\ref[];choice=Edit Field;field=notes'>[]</A><BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src, active2.fields["criminal"], src, active2.fields["mi_crim"], src, active2.fields["mi_crim_d"], src, active2.fields["ma_crim"], src, active2.fields["ma_crim_d"], src, active2.fields["notes"])
 						var/counter = 1
 						while(active2.fields[text("com_[]", counter)])
@@ -213,11 +209,11 @@ What a mess.*/
 /obj/machinery/computer/secure_data/Topic(href, href_list)
 	if(..())
 		return 1
-	if (!( data_core.general.Find(active1) ))
+	if(!( data_core.general.Find(active1) ))
 		active1 = null
-	if (!( data_core.security.Find(active2) ))
+	if(!( data_core.security.Find(active2) ))
 		active2 = null
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 		switch(href_list["choice"])
 // SORTING!
@@ -236,13 +232,13 @@ What a mess.*/
 			if("Clear Screen")
 				temp = null
 
-			if ("Return")
+			if("Return")
 				screen = 1
 				active1 = null
 				active2 = null
 
 			if("Confirm Identity")
-				if (scan)
+				if(scan)
 					if(istype(usr,/mob/living/carbon/human) && !usr.get_active_hand())
 						usr.put_in_hands(scan)
 					else
@@ -250,7 +246,7 @@ What a mess.*/
 					scan = null
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id))
+					if(istype(I, /obj/item/weapon/card/id))
 						usr.drop_item()
 						I.loc = src
 						scan = I
@@ -262,20 +258,20 @@ What a mess.*/
 				active2 = null
 
 			if("Log In")
-				if (istype(usr, /mob/living/silicon/ai))
+				if(istype(usr, /mob/living/silicon/ai))
 					src.active1 = null
 					src.active2 = null
 					src.authenticated = usr.name
 					src.rank = "AI"
 					src.screen = 1
-				else if (istype(usr, /mob/living/silicon/robot))
+				else if(istype(usr, /mob/living/silicon/robot))
 					src.active1 = null
 					src.active2 = null
 					src.authenticated = usr.name
 					var/mob/living/silicon/robot/R = usr
 					src.rank = R.braintype
 					src.screen = 1
-				else if (istype(scan, /obj/item/weapon/card/id))
+				else if(istype(scan, /obj/item/weapon/card/id))
 					active1 = null
 					active2 = null
 					if(check_access(scan))
@@ -288,49 +284,49 @@ What a mess.*/
 				active1 = null
 				active2 = null
 
-			if ("Browse Record")
+			if("Browse Record")
 				var/datum/data/record/R = locate(href_list["d_rec"])
 				var/S = locate(href_list["d_rec"])
-				if (!( data_core.general.Find(R) ))
+				if(!( data_core.general.Find(R) ))
 					temp = "Record Not Found!"
 				else
 					for(var/datum/data/record/E in data_core.security)
-						if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+						if((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 							S = E
 					active1 = R
 					active2 = S
 					screen = 3
 
-/*			if ("Search Fingerprints")
+/*			if("Search Fingerprints")
 				var/t1 = input("Search String: (Fingerprint)", "Secure. records", null, null)  as text
-				if ((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || (!in_range(src, usr)) && (!istype(usr, /mob/living/silicon))))
+				if((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || (!in_range(src, usr)) && (!istype(usr, /mob/living/silicon))))
 					return
 				active1 = null
 				active2 = null
 				t1 = lowertext(t1)
 				for(var/datum/data/record/R in data_core.general)
-					if (lowertext(R.fields["fingerprint"]) == t1)
+					if(lowertext(R.fields["fingerprint"]) == t1)
 						active1 = R
-				if (!( active1 ))
+				if(!( active1 ))
 					temp = text("Could not locate record [].", t1)
 				else
 					for(var/datum/data/record/E in data_core.security)
-						if ((E.fields["name"] == active1.fields["name"] || E.fields["id"] == active1.fields["id"]))
+						if((E.fields["name"] == active1.fields["name"] || E.fields["id"] == active1.fields["id"]))
 							active2 = E
 					screen = 3	*/
 
-			if ("Print Record")
-				if (!( printing ))
+			if("Print Record")
+				if(!( printing ))
 					printing = 1
 					playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
 					sleep(50)
 					var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc )
 					P.info = "<CENTER><B>Security Record</B></CENTER><BR>"
-					if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
+					if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
 						P.info += text("Name: [] ID: []<BR>\nSex: []<BR>\nAge: []<BR>\nFingerprint: []<BR>\nPhysical Status: []<BR>\nMental Status: []<BR>", active1.fields["name"], active1.fields["id"], active1.fields["sex"], active1.fields["age"], active1.fields["fingerprint"], active1.fields["p_stat"], active1.fields["m_stat"])
 					else
 						P.info += "<B>General Record Lost!</B><BR>"
-					if ((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
+					if((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
 						P.info += text("<BR>\n<CENTER><B>Security Data</B></CENTER><BR>\nCriminal Status: []<BR>\n<BR>\nMinor Crimes: []<BR>\nDetails: []<BR>\n<BR>\nMajor Crimes: []<BR>\nDetails: []<BR>\n<BR>\nImportant Notes:<BR>\n\t[]<BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", active2.fields["criminal"], active2.fields["mi_crim"], active2.fields["mi_crim_d"], active2.fields["ma_crim"], active2.fields["ma_crim_d"], active2.fields["notes"])
 						var/counter = 1
 						while(active2.fields[text("com_[]", counter)])
@@ -342,7 +338,7 @@ What a mess.*/
 					P.name = "paper - 'Security Record'"
 					printing = null
 
-			if ("Print Photo")
+			if("Print Photo")
 				if(!printing)
 					printing = 1
 					playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
@@ -352,47 +348,47 @@ What a mess.*/
 					printing = null
 
 //RECORD DELETE
-			if ("Delete All Records")
+			if("Delete All Records")
 				temp = ""
 				temp += "Are you sure you wish to delete all Security records?<br>"
 				temp += "<a href='?src=\ref[src];choice=Purge All Records'>Yes</a><br>"
 				temp += "<a href='?src=\ref[src];choice=Clear Screen'>No</a>"
 
-			if ("Purge All Records")
+			if("Purge All Records")
 				for(var/datum/data/record/R in data_core.security)
 					qdel(R)
 				temp = "All Security records deleted."
 
-			if ("Add Entry")
-				if (!( istype(active2, /datum/data/record) ))
+			if("Add Entry")
+				if(!( istype(active2, /datum/data/record) ))
 					return
 				var/a2 = active2
 				var/t1 = copytext(trim(sanitize(input("Add Comment:", "Secure. records", null, null)  as message)),1,MAX_MESSAGE_LEN)
-				if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+				if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 					return
 				var/counter = 1
 				while(active2.fields[text("com_[]", counter)])
 					counter++
 				active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")
 
-			if ("Delete Record (ALL)")
-				if (active1)
+			if("Delete Record (ALL)")
+				if(active1)
 					temp = "<h5>Are you sure you wish to delete the record (ALL)?</h5>"
 					temp += "<a href='?src=\ref[src];choice=Delete Record (ALL) Execute'>Yes</a><br>"
 					temp += "<a href='?src=\ref[src];choice=Clear Screen'>No</a>"
 
-			if ("Delete Record (Security)")
-				if (active2)
+			if("Delete Record (Security)")
+				if(active2)
 					temp = "<h5>Are you sure you wish to delete the record (Security Portion Only)?</h5>"
 					temp += "<a href='?src=\ref[src];choice=Delete Record (Security) Execute'>Yes</a><br>"
 					temp += "<a href='?src=\ref[src];choice=Clear Screen'>No</a>"
 
-			if ("Delete Entry")
-				if ((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])]))
+			if("Delete Entry")
+				if((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])]))
 					active2.fields[text("com_[]", href_list["del_c"])] = "<B>Deleted</B>"
 //RECORD CREATE
-			if ("New Record (Security)")
-				if ((istype(active1, /datum/data/record) && !( istype(active2, /datum/data/record) )))
+			if("New Record (Security)")
+				if((istype(active1, /datum/data/record) && !( istype(active2, /datum/data/record) )))
 					var/datum/data/record/R = new /datum/data/record()
 					R.fields["name"] = active1.fields["name"]
 					R.fields["id"] = active1.fields["id"]
@@ -407,7 +403,7 @@ What a mess.*/
 					active2 = R
 					screen = 3
 
-			if ("New Record (General)")
+			if("New Record (General)")
 				var/datum/data/record/G = new /datum/data/record()
 				G.fields["name"] = "New Record"
 				G.fields["id"] = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6))
@@ -424,72 +420,72 @@ What a mess.*/
 				active2 = null
 
 //FIELD FUNCTIONS
-			if ("Edit Field")
+			if("Edit Field")
 				var/a1 = active1
 				var/a2 = active2
 				switch(href_list["field"])
 					if("name")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = reject_bad_name(input("Please input name:", "Secure. records", active1.fields["name"], null)  as text)
-							if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
+							if((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
 								return
 							active1.fields["name"] = t1
 					if("id")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["id"] = t1
 					if("fingerprint")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["fingerprint"] = t1
 					if("sex")
-						if (istype(active1, /datum/data/record))
-							if (active1.fields["sex"] == "Male")
+						if(istype(active1, /datum/data/record))
+							if(active1.fields["sex"] == "Male")
 								active1.fields["sex"] = "Female"
 							else
 								active1.fields["sex"] = "Male"
 					if("age")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = input("Please input age:", "Secure. records", active1.fields["age"], null)  as num
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["age"] = t1
 					if("mi_crim")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input minor crimes list:", "Secure. records", active2.fields["mi_crim"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["mi_crim"] = t1
 					if("mi_crim_d")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please summarize minor crimes:", "Secure. records", active2.fields["mi_crim_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["mi_crim_d"] = t1
 					if("ma_crim")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input major crimes list:", "Secure. records", active2.fields["ma_crim"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["ma_crim"] = t1
 					if("ma_crim_d")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please summarize major crimes:", "Secure. records", active2.fields["ma_crim_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["ma_crim_d"] = t1
 					if("notes")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = copytext(html_encode(trim(input("Please summarize notes:", "Secure. records", html_decode(active2.fields["notes"]), null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["notes"] = t1
 					if("criminal")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							temp = "<h5>Criminal Status:</h5>"
 							temp += "<ul>"
 							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=none'>None</a></li>"
@@ -501,7 +497,7 @@ What a mess.*/
 					if("rank")
 						var/list/L = list( "Head of Personnel", "Captain", "AI" )
 						//This was so silly before the change. Now it actually works without beating your head against the keyboard. /N
-						if ((istype(active1, /datum/data/record) && L.Find(rank)))
+						if((istype(active1, /datum/data/record) && L.Find(rank)))
 							temp = "<h5>Rank:</h5>"
 							temp += "<ul>"
 							for(var/rank in joblist)
@@ -510,9 +506,9 @@ What a mess.*/
 						else
 							alert(usr, "You do not have the required rank to do this!")
 					if("species")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please enter race:", "General records", active1.fields["species"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["species"] = t1
 
@@ -520,14 +516,14 @@ What a mess.*/
 			else//To properly clear as per clear screen.
 				temp=null
 				switch(href_list["choice"])
-					if ("Change Rank")
-						if (active1)
+					if("Change Rank")
+						if(active1)
 							active1.fields["rank"] = href_list["rank"]
 							if(href_list["rank"] in joblist)
 								active1.fields["real_rank"] = href_list["real_rank"]
 
-					if ("Change Criminal Status")
-						if (active2)
+					if("Change Criminal Status")
+						if(active2)
 							switch(href_list["criminal2"])
 								if("none")
 									active2.fields["criminal"] = "None"
@@ -543,18 +539,18 @@ What a mess.*/
 							for(var/mob/living/carbon/human/H in mob_list)
 								H.sec_hud_set_security_status()
 
-					if ("Delete Record (Security) Execute")
-						if (active2)
+					if("Delete Record (Security) Execute")
+						if(active2)
 							qdel(active2)
 
-					if ("Delete Record (ALL) Execute")
-						if (active1)
+					if("Delete Record (ALL) Execute")
+						if(active1)
 							for(var/datum/data/record/R in data_core.medical)
-								if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
+								if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
 									qdel(R)
 								else
 							qdel(active1)
-						if (active2)
+						if(active2)
 							qdel(active2)
 					else
 						temp = "This function does not appear to be working at the moment. Our apologies."
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index ddcfeed9a74..2f039841cc3 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -40,16 +40,16 @@
 /obj/machinery/computer/skills/attack_hand(mob/user as mob)
 	if(..())
 		return
-	if (src.z > 6)
+	if(src.z > 6)
 		to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
 		return
 	var/dat
 
-	if (temp)
+	if(temp)
 		dat = text("<TT>[]</TT><BR><BR><A href='?src=\ref[];choice=Clear Screen'>Clear Screen</A>", temp, src)
 	else
 		dat = text("Confirm Identity: <A href='?src=\ref[];choice=Confirm Identity'>[]</A><HR>", src, (scan ? text("[]", scan.name) : "----------"))
-		if (authenticated)
+		if(authenticated)
 			switch(screen)
 				if(1.0)
 					dat += {"
@@ -86,11 +86,7 @@
 					dat += "<BR><A href='?src=\ref[src];choice=Delete All Records'>Delete All Records</A><BR><BR><A href='?src=\ref[src];choice=Return'>Back</A>"
 				if(3.0)
 					dat += "<CENTER><B>Employment Record</B></CENTER><BR>"
-					if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
-						var/icon/front = new(active1.fields["photo"], dir = SOUTH)
-						var/icon/side = new(active1.fields["photo"], dir = WEST)
-						user << browse_rsc(front, "front.png")
-						user << browse_rsc(side, "side.png")
+					if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
 						dat += text("<table><tr><td>	\
 						Name: <A href='?src=\ref[src];choice=Edit Field;field=name'>[active1.fields["name"]]</A><BR> \
 						ID: <A href='?src=\ref[src];choice=Edit Field;field=id'>[active1.fields["id"]]</A><BR>\n	\
@@ -101,8 +97,8 @@
 						Physical Status: [active1.fields["p_stat"]]<BR>\n	\
 						Mental Status: [active1.fields["m_stat"]]<BR><BR>\n	\
 						Employment/skills summary:<BR> [active1.fields["notes"]]<BR></td>	\
-						<td align = center valign = top>Photo:<br><img src=front.png height=80 width=80 border=4>	\
-						<img src=side.png height=80 width=80 border=4></td></tr></table>")
+						<td align = center valign = top>Photo:<br><img src=[active1.fields["photo-south"]] height=80 width=80 border=4>	\
+						<img src=[active1.fields["photo-west"]] height=80 width=80 border=4></td></tr></table>")
 					else
 						dat += "<B>General Record Lost!</B><BR>"
 					dat += text("\n<A href='?src=\ref[];choice=Delete Record (ALL)'>Delete Record (ALL)</A><BR><BR>\n<A href='?src=\ref[];choice=Print Record'>Print Record</A><BR>\n<A href='?src=\ref[];choice=Return'>Back</A><BR>", src, src, src)
@@ -152,9 +148,9 @@ What a mess.*/
 /obj/machinery/computer/skills/Topic(href, href_list)
 	if(..())
 		return 1
-	if (!( data_core.general.Find(active1) ))
+	if(!( data_core.general.Find(active1) ))
 		active1 = null
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 		switch(href_list["choice"])
 // SORTING!
@@ -173,12 +169,12 @@ What a mess.*/
 			if("Clear Screen")
 				temp = null
 
-			if ("Return")
+			if("Return")
 				screen = 1
 				active1 = null
 
 			if("Confirm Identity")
-				if (scan)
+				if(scan)
 					if(istype(usr,/mob/living/carbon/human) && !usr.get_active_hand())
 						usr.put_in_hands(scan)
 					else
@@ -186,7 +182,7 @@ What a mess.*/
 					scan = null
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id))
+					if(istype(I, /obj/item/weapon/card/id))
 						usr.drop_item()
 						I.loc = src
 						scan = I
@@ -197,18 +193,18 @@ What a mess.*/
 				active1 = null
 
 			if("Log In")
-				if (istype(usr, /mob/living/silicon/ai))
+				if(istype(usr, /mob/living/silicon/ai))
 					src.active1 = null
 					src.authenticated = usr.name
 					src.rank = "AI"
 					src.screen = 1
-				else if (istype(usr, /mob/living/silicon/robot))
+				else if(istype(usr, /mob/living/silicon/robot))
 					src.active1 = null
 					src.authenticated = usr.name
 					var/mob/living/silicon/robot/R = usr
 					src.rank = R.braintype
 					src.screen = 1
-				else if (istype(scan, /obj/item/weapon/card/id))
+				else if(istype(scan, /obj/item/weapon/card/id))
 					active1 = null
 					if(check_access(scan))
 						authenticated = scan.registered_name
@@ -217,7 +213,7 @@ What a mess.*/
 //RECORD FUNCTIONS
 			if("Search Records")
 				var/t1 = input("Search String: (Partial Name or ID or Fingerprints or Rank)", "Secure. records", null, null)  as text
-				if ((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || !in_range(src, usr)))
+				if((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || !in_range(src, usr)))
 					return
 				Perp = new/list()
 				t1 = lowertext(t1)
@@ -234,7 +230,7 @@ What a mess.*/
 				for(var/i = 1, i<=Perp.len, i+=2)
 					for(var/datum/data/record/E in data_core.security)
 						var/datum/data/record/R = Perp[i]
-						if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
+						if((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
 							Perp[i+1] = E
 				tempname = t1
 				screen = 4
@@ -243,23 +239,23 @@ What a mess.*/
 				screen = 2
 				active1 = null
 
-			if ("Browse Record")
+			if("Browse Record")
 				var/datum/data/record/R = locate(href_list["d_rec"])
-				if (!( data_core.general.Find(R) ))
+				if(!( data_core.general.Find(R) ))
 					temp = "Record Not Found!"
 				else
 					for(var/datum/data/record/E in data_core.security)
 					active1 = R
 					screen = 3
 
-			if ("Print Record")
-				if (!( printing ))
+			if("Print Record")
+				if(!( printing ))
 					printing = 1
 					playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
 					sleep(50)
 					var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc )
 					P.info = "<CENTER><B>Employment Record</B></CENTER><BR>"
-					if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
+					if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
 						P.info += text("Name: [] ID: []<BR>\nSex: []<BR>\nAge: []<BR>\nFingerprint: []<BR>\nPhysical Status: []<BR>\nMental Status: []<BR>\nEmployment/Skills Summary:[]<BR>", active1.fields["name"], active1.fields["id"], active1.fields["sex"], active1.fields["age"], active1.fields["fingerprint"], active1.fields["p_stat"], active1.fields["m_stat"], active1.fields["notes"])
 					else
 						P.info += "<B>General Record Lost!</B><BR>"
@@ -267,26 +263,26 @@ What a mess.*/
 					P.name = "paper - 'Employment Record'"
 					printing = null
 //RECORD DELETE
-			if ("Delete All Records")
+			if("Delete All Records")
 				temp = ""
 				temp += "Are you sure you wish to delete all Employment records?<br>"
 				temp += "<a href='?src=\ref[src];choice=Purge All Records'>Yes</a><br>"
 				temp += "<a href='?src=\ref[src];choice=Clear Screen'>No</a>"
 
-			if ("Purge All Records")
+			if("Purge All Records")
 				if(PDA_Manifest.len)
 					PDA_Manifest.Cut()
 				for(var/datum/data/record/R in data_core.security)
 					qdel(R)
 				temp = "All Employment records deleted."
 
-			if ("Delete Record (ALL)")
-				if (active1)
+			if("Delete Record (ALL)")
+				if(active1)
 					temp = "<h5>Are you sure you wish to delete the record (ALL)?</h5>"
 					temp += "<a href='?src=\ref[src];choice=Delete Record (ALL) Execute'>Yes</a><br>"
 					temp += "<a href='?src=\ref[src];choice=Clear Screen'>No</a>"
 //RECORD CREATE
-			if ("New Record (General)")
+			if("New Record (General)")
 
 				if(PDA_Manifest.len)
 					PDA_Manifest.Cut()
@@ -305,43 +301,43 @@ What a mess.*/
 				active1 = G
 
 //FIELD FUNCTIONS
-			if ("Edit Field")
+			if("Edit Field")
 				var/a1 = active1
 				switch(href_list["field"])
 					if("name")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = reject_bad_name(input("Please input name:", "Secure. records", active1.fields["name"], null)  as text)
-							if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
+							if((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
 								return
 							active1.fields["name"] = t1
 					if("id")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["id"] = t1
 					if("fingerprint")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["fingerprint"] = t1
 					if("sex")
-						if (istype(active1, /datum/data/record))
-							if (active1.fields["sex"] == "Male")
+						if(istype(active1, /datum/data/record))
+							if(active1.fields["sex"] == "Male")
 								active1.fields["sex"] = "Female"
 							else
 								active1.fields["sex"] = "Male"
 					if("age")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = input("Please input age:", "Secure. records", active1.fields["age"], null)  as num
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["age"] = t1
 					if("rank")
 						var/list/L = list( "Head of Personnel", "Captain", "AI" )
 						//This was so silly before the change. Now it actually works without beating your head against the keyboard. /N
-						if ((istype(active1, /datum/data/record) && L.Find(rank)))
+						if((istype(active1, /datum/data/record) && L.Find(rank)))
 							temp = "<h5>Rank:</h5>"
 							temp += "<ul>"
 							for(var/rank in joblist)
@@ -350,9 +346,9 @@ What a mess.*/
 						else
 							alert(usr, "You do not have the required rank to do this!")
 					if("species")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = copytext(trim(sanitize(input("Please enter race:", "General records", active1.fields["species"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["species"] = t1
 
@@ -360,20 +356,20 @@ What a mess.*/
 			else//To properly clear as per clear screen.
 				temp=null
 				switch(href_list["choice"])
-					if ("Change Rank")
-						if (active1)
+					if("Change Rank")
+						if(active1)
 							if(PDA_Manifest.len)
 								PDA_Manifest.Cut()
 							active1.fields["rank"] = href_list["rank"]
 							if(href_list["rank"] in joblist)
 								active1.fields["real_rank"] = href_list["real_rank"]
 
-					if ("Delete Record (ALL) Execute")
-						if (active1)
+					if("Delete Record (ALL) Execute")
+						if(active1)
 							if(PDA_Manifest.len)
 								PDA_Manifest.Cut()
 							for(var/datum/data/record/R in data_core.medical)
-								if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
+								if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
 									qdel(R)
 								else
 							qdel(active1)
diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm
index d74e27bc702..a0386fe80c7 100644
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -134,9 +134,9 @@ var/specops_shuttle_timeleft = 0
 	specops_shuttle_moving_to_centcom = 0
 
 	specops_shuttle_at_station = 1
-	if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
+	if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
 
-	if (!specops_can_move())
+	if(!specops_can_move())
 		to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
 		return
 
@@ -262,7 +262,7 @@ var/specops_shuttle_timeleft = 0
 		return
 
 //Commented out so admins can do shenanigans at their leisure. Also makes the force-spawned admin ERTs able to use the shuttle.
-//	if (sent_strike_team == 0 && send_emergency_team == 0)
+//	if(sent_strike_team == 0 && send_emergency_team == 0)
 //		to_chat(usr, "\red The strike team has not yet deployed.")
 //		return
 
@@ -271,7 +271,7 @@ var/specops_shuttle_timeleft = 0
 
 	user.machine = src
 	var/dat
-	if (temp)
+	if(temp)
 		dat = temp
 	else
 		dat += {"<BR><B>Special Operations Shuttle</B><HR>
@@ -287,16 +287,16 @@ var/specops_shuttle_timeleft = 0
 	if(..())
 		return 1
 
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.machine = src
 
-	if (href_list["sendtodock"])
+	if(href_list["sendtodock"])
 		if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
 
-		if (!specops_can_move())
+		if(!specops_can_move())
 			to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return yet.")
 			if(world.timeofday <= specops_shuttle_timereset)
-				if (((world.timeofday - specops_shuttle_timereset)/10) > 60)
+				if(((world.timeofday - specops_shuttle_timereset)/10) > 60)
 					to_chat(usr, "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!")
 				to_chat(usr, "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!")
 			return
@@ -311,10 +311,10 @@ var/specops_shuttle_timeleft = 0
 		spawn(0)
 			specops_return()
 
-	else if (href_list["sendtostation"])
+	else if(href_list["sendtostation"])
 		if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
 
-		if (!specops_can_move())
+		if(!specops_can_move())
 			to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
 			return
 
@@ -332,7 +332,7 @@ var/specops_shuttle_timeleft = 0
 		spawn(0)
 			specops_process()
 
-	else if (href_list["mainmenu"])
+	else if(href_list["mainmenu"])
 		temp = null
 
 	add_fingerprint(usr)
diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm
index c8ae8741288..168ceb60e36 100644
--- a/code/game/machinery/computer/store.dm
+++ b/code/game/machinery/computer/store.dm
@@ -132,7 +132,7 @@ td.cost.toomuch {
 
 	src.add_fingerprint(usr)
 
-	if (href_list["buy"])
+	if(href_list["buy"])
 		var/itemID = text2num(href_list["buy"])
 		var/datum/storeitem/item = centcomm_store.items[itemID]
 		var/sure = alert(usr,"Are you sure you wish to purchase [item.name] for $[item.cost]?","You sure?","Yes","No") in list("Yes","No")
diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm
index 16de635b0e7..f05a600b680 100644
--- a/code/game/machinery/computer/syndicate_specops_shuttle.dm
+++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm
@@ -57,9 +57,9 @@ var/syndicate_elite_shuttle_timeleft = 0
 	syndicate_elite_shuttle_moving_to_mothership = 0
 
 	syndicate_elite_shuttle_at_station = 1
-	if (syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
+	if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
 
-	if (!syndicate_elite_can_move())
+	if(!syndicate_elite_can_move())
 		to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
 		return
 
@@ -133,8 +133,8 @@ var/syndicate_elite_shuttle_timeleft = 0
 		elite_squad.readyreset()//Reset firealarm after the team launched.
 	//End Marauder launchpad.
 
-	for (var/obj/effect/landmark/L in landmarks_list)
-		if (L.name == "Syndicate Breach Area")
+	for(var/obj/effect/landmark/L in landmarks_list)
+		if(L.name == "Syndicate Breach Area")
 			explosion(L.loc,4,6,8,10,0)
 
 	sleep(40)
@@ -196,7 +196,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 		to_chat(user, "\red Access Denied.")
 		return
 
-//	if (sent_syndicate_strike_team == 0)
+//	if(sent_syndicate_strike_team == 0)
 //		to_chat(usr, "\red The strike team has not yet deployed.")
 //		return
 
@@ -205,7 +205,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 
 	user.set_machine(src)
 	var/dat
-	if (temp)
+	if(temp)
 		dat = temp
 	else
 		dat  = {"<BR><B>Special Operations Shuttle</B><HR>
@@ -221,19 +221,19 @@ var/syndicate_elite_shuttle_timeleft = 0
 	if(..())
 		return 1
 
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 
-	if (href_list["sendtodock"])
+	if(href_list["sendtodock"])
 		if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
 
 		to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.")
 		return
 
-	else if (href_list["sendtostation"])
+	else if(href_list["sendtostation"])
 		if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
 
-		if (!specops_can_move())
+		if(!specops_can_move())
 			to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
 			return
 
@@ -252,7 +252,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 			syndicate_elite_process()
 
 
-	else if (href_list["mainmenu"])
+	else if(href_list["mainmenu"])
 		temp = null
 
 	add_fingerprint(usr)
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 4c820d26857..fae97ee9d5b 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -386,6 +386,16 @@ to destroy them and players will be able to make replacements.
 							/obj/item/stack/cable_coil = 5,
 							/obj/item/weapon/stock_parts/console_screen = 1)
 
+/obj/item/weapon/circuitboard/deepfryer
+	name = "circuit board (Deep Fryer)"
+	build_path = /obj/machinery/cooker/deepfryer
+	board_type = "machine"
+	origin_tech = "programming=2"
+	frame_desc = "Requires 2 Micro Lasers and 5 pieces of cable."
+	req_components = list(
+							/obj/item/weapon/stock_parts/micro_laser = 2,
+							/obj/item/stack/cable_coil = 5)
+
 /obj/item/weapon/circuitboard/gibber
 	name = "circuit board (Gibber)"
 	build_path = /obj/machinery/gibber
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index e469f389ff3..45e71fc5f84 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -185,7 +185,7 @@
 	data["hasOccupant"] = occupant ? 1 : 0
 
 	var/occupantData[0]
-	if (occupant)
+	if(occupant)
 		occupantData["name"] = occupant.name
 		occupantData["stat"] = occupant.stat
 		occupantData["health"] = occupant.health
@@ -217,7 +217,7 @@
 	data["beakerVolume"] = 0
 	if(beaker)
 		data["beakerLabel"] = beaker.label_text ? beaker.label_text : null
-		if (beaker.reagents && beaker.reagents.reagent_list.len)
+		if(beaker.reagents && beaker.reagents.reagent_list.len)
 			for(var/datum/reagent/R in beaker.reagents.reagent_list)
 				data["beakerVolume"] += R.volume
 
@@ -225,7 +225,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 420)
@@ -283,7 +283,7 @@
 
 		user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!")
 
-	if (istype(G, /obj/item/weapon/screwdriver))
+	if(istype(G, /obj/item/weapon/screwdriver))
 		if(occupant || on)
 			to_chat(user, "<span class='notice'>The maintenance panel is locked.</span>")
 			return
@@ -417,7 +417,7 @@
 		occupant.client.eye = occupant.client.mob
 		occupant.client.perspective = MOB_PERSPECTIVE
 	occupant.forceMove(get_step(loc, SOUTH))	//this doesn't account for walls or anything, but i don't forsee that being a problem.
-	if (occupant.bodytemperature < 261 && occupant.bodytemperature >= 70) //Patch by Aranclanos to stop people from taking burn damage after being ejected
+	if(occupant.bodytemperature < 261 && occupant.bodytemperature >= 70) //Patch by Aranclanos to stop people from taking burn damage after being ejected
 		occupant.bodytemperature = 261
 	occupant = null
 	update_icon()
@@ -426,19 +426,19 @@
 		A.forceMove(get_step(loc, SOUTH))
 
 /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob)
-	if (!istype(M))
+	if(!istype(M))
 		to_chat(usr, "\red <B>The cryo cell cannot handle such a lifeform!</B>")
 		return
-	if (occupant)
+	if(occupant)
 		to_chat(usr, "\red <B>The cryo cell is already occupied!</B>")
 		return
-	if (M.abiotic())
+	if(M.abiotic())
 		to_chat(usr, "\red Subject may not have abiotic items on.")
 		return
 	if(!node)
 		to_chat(usr, "\red The cell is not correctly connected to its pipe network!")
 		return
-	if (M.client)
+	if(M.client)
 		M.client.perspective = EYE_PERSPECTIVE
 		M.client.eye = src
 	M.stop_pulling()
@@ -457,7 +457,7 @@
 	set category = "Object"
 	set src in oview(1)
 	if(usr == occupant)//If the user is inside the tube...
-		if (usr.stat == 2)//and he's not dead....
+		if(usr.stat == 2)//and he's not dead....
 			return
 		to_chat(usr, "\blue Release sequence activated. This will take two minutes.")
 		sleep(600)
@@ -465,7 +465,7 @@
 			return
 		go_out()//and release him from the eternal prison.
 	else
-		if (usr.stat != 0)
+		if(usr.stat != 0)
 			return
 		go_out()
 	add_fingerprint(usr)
@@ -479,7 +479,7 @@
 		if(M.Victim == usr)
 			to_chat(usr, "You're too busy getting your life sucked out of you.")
 			return
-	if (usr.stat != 0 || stat & (NOPOWER|BROKEN))
+	if(usr.stat != 0 || stat & (NOPOWER|BROKEN))
 		return
 	if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other
 		return
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index f7de2dd6b5f..7e67bd417c2 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -40,7 +40,7 @@
 
 	var/dat
 
-	if (!( ticker ))
+	if(!( ticker ))
 		return
 
 	dat += "<hr/><br/><b>[storage_name]</b><br/>"
@@ -347,13 +347,13 @@
 	if(PDA_Manifest.len)
 		PDA_Manifest.Cut()
 	for(var/datum/data/record/R in data_core.medical)
-		if ((R.fields["name"] == occupant.real_name))
+		if((R.fields["name"] == occupant.real_name))
 			qdel(R)
 	for(var/datum/data/record/T in data_core.security)
-		if ((T.fields["name"] == occupant.real_name))
+		if((T.fields["name"] == occupant.real_name))
 			qdel(T)
 	for(var/datum/data/record/G in data_core.general)
-		if ((G.fields["name"] == occupant.real_name))
+		if((G.fields["name"] == occupant.real_name))
 			qdel(G)
 
 	if(orient_right)
@@ -365,9 +365,9 @@
 	control_computer.frozen_crew += "[occupant.real_name]"
 
 	var/ailist[] = list()
-	for (var/mob/living/silicon/ai/A in living_mob_list)
+	for(var/mob/living/silicon/ai/A in living_mob_list)
 		ailist += A
-	if (ailist.len)
+	if(ailist.len)
 		var/mob/living/silicon/ai/announcer = pick(ailist)
 		announcer.say(";[occupant.real_name] [on_store_message]")
 	else
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index df7d3319c06..507527fd6da 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -63,8 +63,8 @@ for reference:
 	var/stacktype = /obj/item/stack/sheet/metal
 
 /obj/structure/barricade/attackby(obj/item/W as obj, mob/user as mob, params)
-	if (istype(W, stacktype))
-		if (src.health < src.maxhealth)
+	if(istype(W, stacktype))
+		if(src.health < src.maxhealth)
 			visible_message("\red [user] begins to repair the [src]!")
 			if(do_after(user,20, target = src))
 				src.health = src.maxhealth
@@ -74,7 +74,7 @@ for reference:
 		else
 			return
 		return
-	else if (istype(W, /obj/item/weapon/crowbar))
+	else if(istype(W, /obj/item/weapon/crowbar))
 		user.changeNext_move(CLICK_CD_MELEE)
 		user.visible_message("<span class='notice'>[user] is prying apart \the [src].</span>", "<span class='notice'>You begin to pry apart \the [src].</span>")
 		playsound(src, 'sound/items/Crowbar.ogg', 200, 1)
@@ -90,7 +90,7 @@ for reference:
 			if("brute")
 				src.health -= W.force * 0.75
 			else
-		if (src.health <= 0)
+		if(src.health <= 0)
 			visible_message("<span class='danger'>\The [src] is smashed apart!</span>")
 			dismantle()
 		..()
@@ -103,14 +103,14 @@ for reference:
 			return
 		if(2.0)
 			src.health -= 25
-			if (src.health <= 0)
+			if(src.health <= 0)
 				visible_message("<span class='danger'>\The [src] is blown apart!</span>")
 				dismantle()
 			return
 
 /obj/structure/barricade/blob_act()
 	src.health -= 25
-	if (src.health <= 0)
+	if(src.health <= 0)
 		visible_message("\red <B>The blob eats through \the [src]!</B>")
 		qdel(src)
 	return
@@ -173,16 +173,16 @@ for reference:
 		src.icon_state = "barrier[src.locked]"
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-		if (istype(W, /obj/item/weapon/card/id))
-			if (src.allowed(user))
-				if	(src.emagged < 2.0)
+		if(istype(W, /obj/item/weapon/card/id))
+			if(src.allowed(user))
+				if(src.emagged < 2.0)
 					src.locked = !src.locked
 					src.anchored = !src.anchored
 					src.icon_state = "barrier[src.locked]"
-					if ((src.locked == 1.0) && (src.emagged < 2.0))
+					if((src.locked == 1.0) && (src.emagged < 2.0))
 						to_chat(user, "Barrier lock toggled on.")
 						return
-					else if ((src.locked == 0.0) && (src.emagged < 2.0))
+					else if((src.locked == 0.0) && (src.emagged < 2.0))
 						to_chat(user, "Barrier lock toggled off.")
 						return
 				else
@@ -192,14 +192,14 @@ for reference:
 					visible_message("\red BZZzZZzZZzZT")
 					return
 			return
-		else if (istype(W, /obj/item/weapon/wrench))
-			if (src.health < src.maxhealth)
+		else if(istype(W, /obj/item/weapon/wrench))
+			if(src.health < src.maxhealth)
 				src.health = src.maxhealth
 				src.emagged = 0
 				src.req_access = list(access_security)
 				visible_message("\red [user] repairs the [src]!")
 				return
-			else if (src.emagged > 0)
+			else if(src.emagged > 0)
 				src.emagged = 0
 				src.req_access = list(access_security)
 				visible_message("\red [user] repairs the [src]!")
@@ -212,12 +212,12 @@ for reference:
 				if("brute")
 					src.health -= W.force * 0.5
 				else
-			if (src.health <= 0)
+			if(src.health <= 0)
 				src.explode()
 			..()
 
 	emag_act(user as mob)
-		if (!emagged)
+		if(!emagged)
 			emagged = 1
 			req_access = null
 			to_chat(user, "You break the ID authentication lock on the [src].")
@@ -225,7 +225,7 @@ for reference:
 			s.set_up(2, 1, src)
 			s.start()
 			visible_message("\red BZZzZZzZZzZT")
-		else if (src.emagged == 1)
+		else if(src.emagged == 1)
 			src.emagged = 2
 			to_chat(user, "You short out the anchoring mechanism on the [src].")
 			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
@@ -240,7 +240,7 @@ for reference:
 				return
 			if(2.0)
 				src.health -= 25
-				if (src.health <= 0)
+				if(src.health <= 0)
 					src.explode()
 				return
 	emp_act(severity)
@@ -253,7 +253,7 @@ for reference:
 
 	blob_act()
 		src.health -= 25
-		if (src.health <= 0)
+		if(src.health <= 0)
 			src.explode()
 		return
 
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 8c419216d07..a0f6c9a08ce 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -39,7 +39,7 @@
 
 /obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob, params)
 	/* For later implementation
-	if (istype(W, /obj/item/weapon/screwdriver))
+	if(istype(W, /obj/item/weapon/screwdriver))
 	{
 		if(wiresexposed)
 			icon_state = "doorctrl0"
@@ -81,7 +81,7 @@
 		for(var/obj/machinery/door/airlock/D in range(range))
 			if(D.id_tag == src.id)
 				if(specialfunctions & OPEN)
-					if (D.density)
+					if(D.density)
 						spawn(0)
 							D.open()
 							return
@@ -110,8 +110,8 @@
 
 	else
 		for(var/obj/machinery/door/poddoor/M in world)
-			if (M.id_tag == src.id)
-				if (M.density)
+			if(M.id_tag == src.id)
+				if(M.density)
 					spawn( 0 )
 						M.open()
 						return
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 9c361225866..2ee085c908a 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -257,14 +257,14 @@
 /obj/machinery/door/airlock/clown
 	name = "Bananium Airlock"
 	icon = 'icons/obj/doors/Doorbananium.dmi'
-	mineral = "clown"
+	mineral = "bananium"
 	doorOpen = 'sound/items/bikehorn.ogg'
 	doorClose = 'sound/items/bikehorn.ogg'
 
 /obj/machinery/door/airlock/mime
 	name = "Tranquillite Airlock"
 	icon = 'icons/obj/doors/Doorfreezer.dmi'
-	mineral = "mime"
+	mineral = "tranquillite"
 	doorOpen = null
 	doorClose = null
 
@@ -390,7 +390,7 @@ About the new airlock wires panel:
 	return ((src.aiControlDisabled==1) && (!hackProof) && (!src.isAllPowerLoss()));
 
 /obj/machinery/door/airlock/proc/arePowerSystemsOn()
-	if (stat & (NOPOWER|BROKEN))
+	if(stat & (NOPOWER|BROKEN))
 		return 0
 	return (src.main_power_lost_until==0 || src.backup_power_lost_until==0)
 
@@ -571,7 +571,7 @@ About the new airlock wires panel:
 	data["commands"] = commands
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "door_control.tmpl", "Door Controls - [src]", 600, 375)
 		ui.set_initial_data(data)
 		ui.open()
@@ -622,14 +622,14 @@ About the new airlock wires panel:
 			sleep(10)
 			//bring up airlock dialog
 			src.aiHacking = 0
-			if (user)
+			if(user)
 				src.attack_ai(user)
 
 /obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-	if (src.isElectrified())
-		if (istype(mover, /obj/item))
+	if(src.isElectrified())
+		if(istype(mover, /obj/item))
 			var/obj/item/i = mover
-			if (i.materials[MAT_METAL])
+			if(i.materials[MAT_METAL])
 				var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 				s.set_up(5, 1, src)
 				s.start()
@@ -673,7 +673,7 @@ About the new airlock wires panel:
 		if(src.canAIHack(user))
 			src.hack(user)
 		else
-			if (src.isAllPowerLoss()) //don't really like how this gets checked a second time, but not sure how else to do it.
+			if(src.isAllPowerLoss()) //don't really like how this gets checked a second time, but not sure how else to do it.
 				to_chat(user, "<span class='warning'>Unable to interface: Connection timed out.</span>")
 			else
 				to_chat(user, "<span class='warning'>Unable to interface: Connection refused.</span>")
@@ -686,7 +686,7 @@ About the new airlock wires panel:
 		return 1
 
 	var/activate = text2num(href_list["activate"])
-	switch (href_list["command"])
+	switch(href_list["command"])
 		if("idscan")
 			if(src.isWireCut(AIRLOCK_WIRE_IDSCAN))
 				to_chat(usr, "The IdScan wire has been cut - IdScan feature permanently disabled.")
@@ -742,33 +742,33 @@ About the new airlock wires panel:
 				close()
 		if("safeties")
 			// Safeties!  We don't need no stinking safeties!
-			if (src.isWireCut(AIRLOCK_WIRE_SAFETY))
+			if(src.isWireCut(AIRLOCK_WIRE_SAFETY))
 				to_chat(usr, text("The safety wire is cut - Cannot secure the door."))
-			else if (activate && src.safe)
+			else if(activate && src.safe)
 				safe = 0
-			else if (!activate && !src.safe)
+			else if(!activate && !src.safe)
 				safe = 1
 		if("timing")
 			// Door speed control
 			if(src.isWireCut(AIRLOCK_WIRE_SPEED))
 				to_chat(usr, text("The timing wire is cut - Cannot alter timing."))
-			else if (activate && src.normalspeed)
+			else if(activate && src.normalspeed)
 				normalspeed = 0
-			else if (!activate && !src.normalspeed)
+			else if(!activate && !src.normalspeed)
 				normalspeed = 1
 		if("lights")
 			// Bolt lights
 			if(src.isWireCut(AIRLOCK_WIRE_LIGHT))
 				to_chat(usr, "The bolt lights wire has been cut - The door bolt lights are permanently disabled.")
-			else if (!activate && src.lights)
+			else if(!activate && src.lights)
 				lights = 0
 				to_chat(usr, "The door bolt lights have been disabled.")
-			else if (activate && !src.lights)
+			else if(activate && !src.lights)
 				lights = 1
 				to_chat(usr, "The door bolt lights have been enabled.")
 		if("emergency")
 			// Emergency access
-			if (src.emergency)
+			if(src.emergency)
 				emergency = 0
 				to_chat(usr, "Emergency access has been disabled.")
 			else
@@ -843,7 +843,7 @@ About the new airlock wires panel:
 						src.check_access()
 					if(src.req_access.len)
 						ae.conf_access = src.req_access
-					else if (src.req_one_access.len)
+					else if(src.req_one_access.len)
 						ae.conf_access = src.req_one_access
 						ae.one_access = 1
 				else
@@ -935,7 +935,7 @@ About the new airlock wires panel:
 	operating = 1
 	do_animate("closing")
 	src.layer = 3.1
-	if (!override) sleep(5)
+	if(!override) sleep(5)
 	src.density = 1
 	if(!safe)
 		crush()
@@ -956,7 +956,7 @@ About the new airlock wires panel:
 	if(locked)
 		return 0
 
-	if (operating && !forced) return 0
+	if(operating && !forced) return 0
 
 	src.locked = 1
 	playsound(src, boltDown, 30, 0, 3)
@@ -967,7 +967,7 @@ About the new airlock wires panel:
 	if(!src.locked)
 		return
 
-	if (!forced)
+	if(!forced)
 		if(operating || !src.arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS)) return
 
 	src.locked = 0
@@ -980,7 +980,7 @@ About the new airlock wires panel:
 	wires = new(src)
 	if(src.closeOtherId != null)
 		spawn (5)
-			for (var/obj/machinery/door/airlock/A in world)
+			for(var/obj/machinery/door/airlock/A in world)
 				if(A.closeOtherId == src.closeOtherId && A != src)
 					src.closeOther = A
 					break
diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm
index 5f55eb26fc2..0b13ae1ab8f 100644
--- a/code/game/machinery/doors/airlock_control.dm
+++ b/code/game/machinery/doors/airlock_control.dm
@@ -16,7 +16,7 @@ obj/machinery/door/airlock/process()
 		return PROCESS_KILL
 
 obj/machinery/door/airlock/receive_signal(datum/signal/signal)
-	if (!arePowerSystemsOn()) return //no power
+	if(!arePowerSystemsOn()) return //no power
 
 	if(!signal || signal.encryption) return
 
@@ -30,7 +30,7 @@ obj/machinery/door/airlock/proc/execute_current_command()
 	if(operating)
 		return //emagged or busy doing something else
 
-	if (!cur_command)
+	if(!cur_command)
 		return
 
 	do_command(cur_command)
@@ -103,7 +103,7 @@ obj/machinery/door/airlock/proc/send_status(var/bumped = 0)
 		signal.data["door_status"] = density?("closed"):("open")
 		signal.data["lock_status"] = locked?("locked"):("unlocked")
 
-		if (bumped)
+		if(bumped)
 			signal.data["bumped_with_access"] = 1
 
 		radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
@@ -252,7 +252,7 @@ obj/machinery/access_button/update_icon()
 
 obj/machinery/access_button/attackby(obj/item/I as obj, mob/user as mob, params)
 	//Swiping ID on the access button
-	if (istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda))
+	if(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda))
 		attack_hand(user)
 		return
 	..()
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index 6113d1cf377..12e61d6ec55 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -4,7 +4,7 @@
 	name = "airlock electronics"
 	icon = 'icons/obj/doors/door_assembly.dmi'
 	icon_state = "door_electronics"
-	w_class = 2.0 //It should be tiny! -Agouri
+	w_class = 2 //It should be tiny! -Agouri
 	materials = list(MAT_METAL=50, MAT_GLASS=50)
 
 	req_access = list(access_engine)
@@ -15,7 +15,7 @@
 	var/locked = 1
 
 	attack_self(mob/user as mob)
-		if (!ishuman(user) && !istype(user,/mob/living/silicon/robot))
+		if(!ishuman(user) && !istype(user,/mob/living/silicon/robot))
 			return ..(user)
 
 		var/mob/living/carbon/human/H = user
@@ -25,10 +25,10 @@
 		var/t1 = text("<B>Access control</B><br>\n")
 
 
-		if (last_configurator)
+		if(last_configurator)
 			t1 += "Operator: [last_configurator]<br>"
 
-		if (locked)
+		if(locked)
 			t1 += "<a href='?src=\ref[src];login=1'>Swipe ID</a><hr>"
 		else
 			t1 += "<a href='?src=\ref[src];logout=1'>Block</a><hr>"
@@ -41,10 +41,10 @@
 			t1 += "<br>"
 
 			var/list/accesses = get_all_accesses()
-			for (var/acc in accesses)
+			for(var/acc in accesses)
 				var/aname = get_access_desc(acc)
 
-				if (!conf_access || !conf_access.len || !(acc in conf_access))
+				if(!conf_access || !conf_access.len || !(acc in conf_access))
 					t1 += "<a href='?src=\ref[src];access=[acc]'>[aname]</a><br>"
 				else if(one_access)
 					t1 += "<a style='color: green' href='?src=\ref[src];access=[acc]'>[aname]</a><br>"
@@ -58,53 +58,53 @@
 
 	Topic(href, href_list)
 		..()
-		if (usr.stat || usr.restrained() || (!ishuman(usr) && !istype(usr,/mob/living/silicon)))
+		if(usr.stat || usr.restrained() || (!ishuman(usr) && !istype(usr,/mob/living/silicon)))
 			return
-		if (href_list["close"])
+		if(href_list["close"])
 			usr << browse(null, "window=airlock")
 			return
 
-		if (href_list["login"])
+		if(href_list["login"])
 			if(istype(usr,/mob/living/silicon))
 				src.locked = 0
 				src.last_configurator = usr.name
 			else
 				var/obj/item/I = usr.get_active_hand()
-				if (istype(I, /obj/item/device/pda))
+				if(istype(I, /obj/item/device/pda))
 					var/obj/item/device/pda/pda = I
 					I = pda.id
-				if (I && src.check_access(I))
+				if(I && src.check_access(I))
 					src.locked = 0
 					src.last_configurator = I:registered_name
 
-		if (locked)
+		if(locked)
 			return
 
-		if (href_list["logout"])
+		if(href_list["logout"])
 			locked = 1
 
-		if (href_list["one_access"])
+		if(href_list["one_access"])
 			one_access = !one_access
 
-		if (href_list["access"])
+		if(href_list["access"])
 			toggle_access(href_list["access"])
 
 		attack_self(usr)
 
 	proc
 		toggle_access(var/acc)
-			if (acc == "all")
+			if(acc == "all")
 				conf_access = null
 			else
 				var/req = text2num(acc)
 
-				if (conf_access == null)
+				if(conf_access == null)
 					conf_access = list()
 
-				if (!(req in conf_access))
+				if(!(req in conf_access))
 					conf_access += req
 				else
 					conf_access -= req
-					if (!conf_access.len)
+					if(!conf_access.len)
 						conf_access = null
 
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 3e611b8dea4..bb9f6e45967 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -43,7 +43,7 @@
 
 	spawn(20)
 		for(var/obj/machinery/door/window/brigdoor/M in airlocks)
-			if (M.id == id)
+			if(M.id == id)
 				targets += M
 
 		for(var/obj/machinery/flasher/F in machines)
@@ -194,7 +194,7 @@
 	dat += " <b>Door [src.id] controls</b><br/>"
 
 	// Start/Stop timer
-	if (src.timing)
+	if(src.timing)
 		dat += "<a href='?src=\ref[src];timing=0'>Stop Timer and open door</a><br/>"
 	else
 		dat += "<a href='?src=\ref[src];timing=1'>Activate Timer and close door</a><br/>"
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 1b3f13955d0..de3c4514bb5 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -44,9 +44,9 @@
 
 /obj/machinery/door/poddoor/attackby(obj/item/weapon/C as obj, mob/user as mob, params)
 	src.add_fingerprint(user)
-	if (!( istype(C, /obj/item/weapon/crowbar) || (istype(C, /obj/item/weapon/twohanded/fireaxe) && C:wielded == 1) ))
+	if(!( istype(C, /obj/item/weapon/crowbar) || (istype(C, /obj/item/weapon/twohanded/fireaxe) && C:wielded == 1) ))
 		return
-	if ((src.density && (stat & NOPOWER) && !( src.operating )))
+	if((src.density && (stat & NOPOWER) && !( src.operating )))
 		spawn( 0 )
 			src.operating = 1
 			flick("pdoorc0", src)
@@ -59,9 +59,9 @@
 	return
 
 /obj/machinery/door/poddoor/open()
-	if (src.operating == 1) //doors can still open when emag-disabled
+	if(src.operating == 1) //doors can still open when emag-disabled
 		return
-	if (!ticker)
+	if(!ticker)
 		return 0
 	if(!src.operating) //in case of emag
 		src.operating = 1
@@ -82,7 +82,7 @@
 	return 1
 
 /obj/machinery/door/poddoor/close()
-	if (src.operating)
+	if(src.operating)
 		return
 	src.operating = 1
 	flick("pdoorc1", src)
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 39ed81b3360..cbad06fab9c 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -13,7 +13,7 @@
 /obj/machinery/door/window/New()
 	..()
 
-	if (src.req_access && src.req_access.len)
+	if(src.req_access && src.req_access.len)
 		src.icon_state = "[src.icon_state]"
 		src.base_state = src.icon_state
 
@@ -42,7 +42,7 @@
 /obj/machinery/door/window/Bumped(atom/movable/AM as mob|obj)
 	if(operating || !density)
 		return
-	if (!ismob(AM))
+	if(!ismob(AM))
 		if(istype(AM, /obj/mecha))
 			var/obj/mecha/mecha = AM
 			if(mecha.occupant && src.allowed(mecha.occupant))
@@ -50,7 +50,7 @@
 			else
 				flick(text("[]deny", src.base_state), src)
 		return
-	if (!ticker)
+	if(!ticker)
 		return
 	var/mob/M = AM
 	if(!M.restrained() && !M.small)
@@ -97,9 +97,9 @@
 		return 1
 
 /obj/machinery/door/window/open(var/forced=0)
-	if (src.operating == 1) //doors can still open when emag-disabled
+	if(src.operating == 1) //doors can still open when emag-disabled
 		return 0
-	if (!ticker)
+	if(!ticker)
 		return 0
 	if(!forced)
 		if(stat & NOPOWER)
@@ -124,7 +124,7 @@
 	return 1
 
 /obj/machinery/door/window/close(var/forced=0)
-	if (src.operating)
+	if(src.operating)
 		return 0
 	if(!forced)
 		if(stat & NOPOWER)
@@ -149,7 +149,7 @@
 
 /obj/machinery/door/window/proc/take_damage(var/damage)
 	src.health = max(0, src.health - damage)
-	if (src.health <= 0)
+	if(src.health <= 0)
 		var/debris = list(
 			new /obj/item/weapon/shard(src.loc),
 			new /obj/item/weapon/shard(src.loc),
@@ -248,13 +248,13 @@
 /obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/living/user as mob, params)
 
 	//If it's in the process of opening/closing, ignore the click
-	if (src.operating)
+	if(src.operating)
 		return
 
 	add_fingerprint(user)
 
 	//Ninja swords? You may pass.
-	if (src.density && (istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade)))
+	if(src.density && (istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade)))
 		emag_act(user,I)
 		return 1
 
@@ -307,7 +307,7 @@
 							src.check_access()
 						if(src.req_access.len)
 							ae.conf_access = src.req_access
-						else if (src.req_one_access.len)
+						else if(src.req_one_access.len)
 							ae.conf_access = src.req_one_access
 							ae.one_access = 1
 					else
@@ -341,17 +341,17 @@
 			take_damage(aforce)
 		return
 
-	if (!src.requiresID())
+	if(!src.requiresID())
 		//don't care who they are or what they have, act as if they're NOTHING
 		user = null
 
-	if (src.allowed(user))
-		if (src.density)
+	if(src.allowed(user))
+		if(src.density)
 			open()
 		else
 			close()
 
-	else if (src.density)
+	else if(src.density)
 		flick(text("[]deny", src.base_state), src)
 
 	return
diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm
index c73996abd29..c64f7588583 100644
--- a/code/game/machinery/dye_generator.dm
+++ b/code/game/machinery/dye_generator.dm
@@ -32,7 +32,7 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
@@ -73,7 +73,7 @@
 	throw_speed = 4
 	throw_range = 7
 	force = 0
-	w_class = 1.0
+	w_class = 1
 	var/dye_color = "#FFFFFF"
 
 /obj/item/hair_dye_bottle/New()
diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm
index bf6fe4f0fe7..2b336859127 100644
--- a/code/game/machinery/embedded_controller/airlock_controllers.dm
+++ b/code/game/machinery/embedded_controller/airlock_controllers.dm
@@ -34,7 +34,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "advanced_airlock_console.tmpl", name, 470, 290)
 
 		ui.set_initial_data(data)
@@ -90,7 +90,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "simple_airlock_console.tmpl", name, 470, 290)
 
 		ui.set_initial_data(data)
@@ -154,7 +154,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "door_access_console.tmpl", name, 330, 220)
 
 		ui.set_initial_data(data)
diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm
index 0ffb9c3d7dc..e94a975b91f 100644
--- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm
+++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm
@@ -26,7 +26,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "docking_airlock_console.tmpl", name, 470, 290)
 		ui.set_initial_data(data)
 		ui.open()
@@ -71,8 +71,8 @@
 	airlock_program.master_prog = src
 
 /datum/computer/file/embedded_program/docking/airlock/receive_user_command(command)
-	if (command == "toggle_override")
-		if (override_enabled)
+	if(command == "toggle_override")
+		if(override_enabled)
 			disable_override()
 		else
 			enable_override()
@@ -120,7 +120,7 @@
 	var/datum/computer/file/embedded_program/docking/airlock/master_prog
 
 /datum/computer/file/embedded_program/airlock/docking/receive_user_command(command)
-	if (master_prog.undocked() || master_prog.override_enabled)	//only allow the port to be used as an airlock if nothing is docked here or the override is enabled
+	if(master_prog.undocked() || master_prog.override_enabled)	//only allow the port to be used as an airlock if nothing is docked here or the override is enabled
 		..(command)
 
 /datum/computer/file/embedded_program/airlock/docking/proc/enable_mech_regulators()
@@ -134,7 +134,7 @@
 	toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open")
 
 /datum/computer/file/embedded_program/airlock/docking/cycleDoors(var/target)
-	if (master_prog.undocked() || master_prog.override_enabled)	//only allow the port to be used as an airlock if nothing is docked here or the override is enabled
+	if(master_prog.undocked() || master_prog.override_enabled)	//only allow the port to be used as an airlock if nothing is docked here or the override is enabled
 		..(target)
 
 /*** DEBUG VERBS ***
diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm
index f7ca5b1339a..8eeb93b8a8e 100644
--- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm
+++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm
@@ -17,8 +17,8 @@
 	var/list/names = splittext(child_names_txt, ";")
 	var/list/tags = splittext(child_tags_txt, ";")
 
-	if (names.len == tags.len)
-		for (var/i = 1; i <= tags.len; i++)
+	if(names.len == tags.len)
+		for(var/i = 1; i <= tags.len; i++)
 			child_names[tags[i]] = names[i]
 
 
@@ -27,7 +27,7 @@
 
 	var/list/airlocks[child_names.len]
 	var/i = 1
-	for (var/child_tag in child_names)
+	for(var/child_tag in child_names)
 		airlocks[i++] = list("name"=child_names[child_tag], "override_enabled"=(docking_program.children_override[child_tag] == "enabled"))
 
 	data = list(
@@ -37,7 +37,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "multi_docking_console.tmpl", name, 470, 290)
 		ui.set_initial_data(data)
 		ui.open()
@@ -75,7 +75,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "docking_airlock_console.tmpl", name, 470, 290)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/game/machinery/embedded_controller/airlock_program.dm b/code/game/machinery/embedded_controller/airlock_program.dm
index 8cb3abb9980..670cce47785 100644
--- a/code/game/machinery/embedded_controller/airlock_program.dm
+++ b/code/game/machinery/embedded_controller/airlock_program.dm
@@ -36,7 +36,7 @@
 	memory["purge"] = 0
 	memory["secure"] = 0
 
-	if (istype(M, /obj/machinery/embedded_controller/radio/airlock))	//if our controller is an airlock controller than we can auto-init our tags
+	if(istype(M, /obj/machinery/embedded_controller/radio/airlock))	//if our controller is an airlock controller than we can auto-init our tags
 		var/obj/machinery/embedded_controller/radio/airlock/controller = M
 		tag_exterior_door = controller.tag_exterior_door? controller.tag_exterior_door : "[id_tag]_outer"
 		tag_interior_door = controller.tag_interior_door? controller.tag_interior_door : "[id_tag]_inner"
@@ -177,13 +177,13 @@
 			if(memory["pump_status"] != "off")	//send a signal to stop pumping
 				signalPump(tag_airpump, 0)
 
-	if ((state == STATE_PRESSURIZE || state == STATE_DEPRESSURIZE) && !check_doors_secured())
+	if((state == STATE_PRESSURIZE || state == STATE_DEPRESSURIZE) && !check_doors_secured())
 		//the airlock will not allow itself to continue to cycle when any of the doors are forced open.
 		stop_cycling()
 
 	switch(state)
 		if(STATE_PREPARE)
-			if (check_doors_secured())
+			if(check_doors_secured())
 				var/chamber_pressure = memory["chamber_sensor_pressure"]
 				var/target_pressure = memory["target_pressure"]
 
diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm
index aa938c663bc..725ec6a337b 100644
--- a/code/game/machinery/embedded_controller/docking_program.dm
+++ b/code/game/machinery/embedded_controller/docking_program.dm
@@ -77,109 +77,109 @@
 	var/command = signal.data["command"]
 	var/recipient = signal.data["recipient"]	//the intended recipient of the docking signal
 
-	if (recipient != id_tag)
+	if(recipient != id_tag)
 		return	//this signal is not for us
 
-	switch (command)
-		if ("confirm_dock")
-			if (control_mode == MODE_CLIENT && dock_state == STATE_UNDOCKED && receive_tag == tag_target)
+	switch(command)
+		if("confirm_dock")
+			if(control_mode == MODE_CLIENT && dock_state == STATE_UNDOCKED && receive_tag == tag_target)
 				dock_state = STATE_DOCKING
 				broadcast_docking_status()
-				if (!override_enabled)
+				if(!override_enabled)
 					prepare_for_docking()
 
-			else if (control_mode == MODE_CLIENT && dock_state == STATE_DOCKING && receive_tag == tag_target)
+			else if(control_mode == MODE_CLIENT && dock_state == STATE_DOCKING && receive_tag == tag_target)
 				dock_state = STATE_DOCKED
 				broadcast_docking_status()
-				if (!override_enabled)
+				if(!override_enabled)
 					finish_docking()	//client done docking!
 				response_sent = 0
-			else if (control_mode == MODE_SERVER && dock_state == STATE_DOCKING && receive_tag == tag_target)	//client just sent us the confirmation back, we're done with the docking process
+			else if(control_mode == MODE_SERVER && dock_state == STATE_DOCKING && receive_tag == tag_target)	//client just sent us the confirmation back, we're done with the docking process
 				received_confirm = 1
 
-		if ("request_dock")
-			if (control_mode == MODE_NONE && dock_state == STATE_UNDOCKED)
+		if("request_dock")
+			if(control_mode == MODE_NONE && dock_state == STATE_UNDOCKED)
 				control_mode = MODE_SERVER
 
 				dock_state = STATE_DOCKING
 				broadcast_docking_status()
 
 				tag_target = receive_tag
-				if (!override_enabled)
+				if(!override_enabled)
 					prepare_for_docking()
 				send_docking_command(tag_target, "confirm_dock")	//acknowledge the request
 
-		if ("confirm_undock")
-			if (control_mode == MODE_CLIENT && dock_state == STATE_UNDOCKING && receive_tag == tag_target)
-				if (!override_enabled)
+		if("confirm_undock")
+			if(control_mode == MODE_CLIENT && dock_state == STATE_UNDOCKING && receive_tag == tag_target)
+				if(!override_enabled)
 					finish_undocking()
 				reset()		//client is done undocking!
-			else if (control_mode == MODE_SERVER && dock_state == STATE_UNDOCKING && receive_tag == tag_target)
+			else if(control_mode == MODE_SERVER && dock_state == STATE_UNDOCKING && receive_tag == tag_target)
 				received_confirm = 1
 
-		if ("request_undock")
-			if (control_mode == MODE_SERVER && dock_state == STATE_DOCKED && receive_tag == tag_target)
+		if("request_undock")
+			if(control_mode == MODE_SERVER && dock_state == STATE_DOCKED && receive_tag == tag_target)
 				dock_state = STATE_UNDOCKING
 				broadcast_docking_status()
 
-				if (!override_enabled)
+				if(!override_enabled)
 					prepare_for_undocking()
 
-		if ("dock_error")
-			if (receive_tag == tag_target)
+		if("dock_error")
+			if(receive_tag == tag_target)
 				reset()
 
 /datum/computer/file/embedded_program/docking/process()
 	switch(dock_state)
-		if (STATE_DOCKING)	//waiting for our docking port to be ready for docking
-			if (ready_for_docking())
-				if (control_mode == MODE_CLIENT)
-					if (!response_sent)
+		if(STATE_DOCKING)	//waiting for our docking port to be ready for docking
+			if(ready_for_docking())
+				if(control_mode == MODE_CLIENT)
+					if(!response_sent)
 						send_docking_command(tag_target, "confirm_dock")	//tell the server we're ready
 						response_sent = 1
 
-				else if (control_mode == MODE_SERVER && received_confirm)
+				else if(control_mode == MODE_SERVER && received_confirm)
 					send_docking_command(tag_target, "confirm_dock")	//tell the client we are done docking.
 
 					dock_state = STATE_DOCKED
 					broadcast_docking_status()
 
-					if (!override_enabled)
+					if(!override_enabled)
 						finish_docking()	//server done docking!
 					response_sent = 0
 					received_confirm = 0
 
-		if (STATE_UNDOCKING)
-			if (ready_for_undocking())
-				if (control_mode == MODE_CLIENT)
-					if (!response_sent)
+		if(STATE_UNDOCKING)
+			if(ready_for_undocking())
+				if(control_mode == MODE_CLIENT)
+					if(!response_sent)
 						send_docking_command(tag_target, "confirm_undock")	//tell the server we are OK to undock.
 						response_sent = 1
 
-				else if (control_mode == MODE_SERVER && received_confirm)
+				else if(control_mode == MODE_SERVER && received_confirm)
 					send_docking_command(tag_target, "confirm_undock")	//tell the client we are done undocking.
-					if (!override_enabled)
+					if(!override_enabled)
 						finish_undocking()
 					reset()		//server is done undocking!
 
-	if (response_sent || resend_counter > 0)
+	if(response_sent || resend_counter > 0)
 		resend_counter++
 
-	if (resend_counter >= MESSAGE_RESEND_TIME || (dock_state != STATE_DOCKING && dock_state != STATE_UNDOCKING))
+	if(resend_counter >= MESSAGE_RESEND_TIME || (dock_state != STATE_DOCKING && dock_state != STATE_UNDOCKING))
 		response_sent = 0
 		resend_counter = 0
 
 	//handle invalid states
-	if (control_mode == MODE_NONE && dock_state != STATE_UNDOCKED)
-		if (tag_target)
+	if(control_mode == MODE_NONE && dock_state != STATE_UNDOCKED)
+		if(tag_target)
 			send_docking_command(tag_target, "dock_error")
 		reset()
-	if (control_mode == MODE_SERVER && dock_state == STATE_UNDOCKED)
+	if(control_mode == MODE_SERVER && dock_state == STATE_UNDOCKED)
 		control_mode = MODE_NONE
 
 
 /datum/computer/file/embedded_program/docking/proc/initiate_docking(var/target)
-	if (dock_state != STATE_UNDOCKED || control_mode == MODE_SERVER)	//must be undocked and not serving another request to begin a new docking handshake
+	if(dock_state != STATE_UNDOCKED || control_mode == MODE_SERVER)	//must be undocked and not serving another request to begin a new docking handshake
 		return
 
 	tag_target = target
@@ -188,13 +188,13 @@
 	send_docking_command(tag_target, "request_dock")
 
 /datum/computer/file/embedded_program/docking/proc/initiate_undocking()
-	if (dock_state != STATE_DOCKED || control_mode != MODE_CLIENT)		//must be docked and must be client to start undocking
+	if(dock_state != STATE_DOCKED || control_mode != MODE_CLIENT)		//must be docked and must be client to start undocking
 		return
 
 	dock_state = STATE_UNDOCKING
 	broadcast_docking_status()
 
-	if (!override_enabled)
+	if(!override_enabled)
 		prepare_for_undocking()
 
 	send_docking_command(tag_target, "request_undock")
@@ -240,7 +240,7 @@
 
 /datum/computer/file/embedded_program/docking/proc/force_undock()
 //	to_chat(world, "[id_tag]: forcing undock")
-	if (tag_target)
+	if(tag_target)
 		send_docking_command(tag_target, "dock_error")
 	reset()
 
@@ -269,11 +269,11 @@
 
 //this is mostly for NanoUI
 /datum/computer/file/embedded_program/docking/proc/get_docking_status()
-	switch (dock_state)
-		if (STATE_UNDOCKED) return "undocked"
-		if (STATE_DOCKING) return "docking"
-		if (STATE_UNDOCKING) return "undocking"
-		if (STATE_DOCKED) return "docked"
+	switch(dock_state)
+		if(STATE_UNDOCKED) return "undocked"
+		if(STATE_DOCKING) return "docking"
+		if(STATE_UNDOCKING) return "undocking"
+		if(STATE_DOCKED) return "docked"
 
 
 #undef STATE_UNDOCKED
diff --git a/code/game/machinery/embedded_controller/docking_program_multi.dm b/code/game/machinery/embedded_controller/docking_program_multi.dm
index dc582b915f9..0a3d9228435 100644
--- a/code/game/machinery/embedded_controller/docking_program_multi.dm
+++ b/code/game/machinery/embedded_controller/docking_program_multi.dm
@@ -14,19 +14,19 @@
 /datum/computer/file/embedded_program/docking/multi/New(var/obj/machinery/embedded_controller/M)
 	..(M)
 
-	if (istype(M,/obj/machinery/embedded_controller/radio/docking_port_multi))	//if our parent controller is the right type, then we can auto-init stuff at construction
+	if(istype(M,/obj/machinery/embedded_controller/radio/docking_port_multi))	//if our parent controller is the right type, then we can auto-init stuff at construction
 		var/obj/machinery/embedded_controller/radio/docking_port_multi/controller = M
 		//parse child_tags_txt and create child tags
 		children_tags = splittext(controller.child_tags_txt, ";")
 
 	children_ready = list()
 	children_override = list()
-	for (var/child_tag in children_tags)
+	for(var/child_tag in children_tags)
 		children_ready[child_tag] = 0
 		children_override[child_tag] = "disabled"
 
 /datum/computer/file/embedded_program/docking/multi/proc/clear_children_ready_status()
-	for (var/child_tag in children_tags)
+	for(var/child_tag in children_tags)
 		children_ready[child_tag] = 0
 
 /datum/computer/file/embedded_program/docking/multi/receive_signal(datum/signal/signal, receive_method, receive_param)
@@ -34,21 +34,21 @@
 	var/command = signal.data["command"]
 	var/recipient = signal.data["recipient"]	//the intended recipient of the docking signal
 
-	if (receive_tag in children_tags)
+	if(receive_tag in children_tags)
 
 		//track children status
-		if (signal.data["override_status"])
+		if(signal.data["override_status"])
 			children_override[receive_tag] = signal.data["override_status"]
 
-		if (recipient == id_tag)
-			switch (command)
-				if ("ready_for_docking")
+		if(recipient == id_tag)
+			switch(command)
+				if("ready_for_docking")
 					children_ready[receive_tag] = 1
-				if ("ready_for_undocking")
+				if("ready_for_undocking")
 					children_ready[receive_tag] = 1
-				if ("status_override_enabled")
+				if("status_override_enabled")
 					children_override[receive_tag] = 1
-				if ("status_override_disabled")
+				if("status_override_disabled")
 					children_override[receive_tag] = 0
 
 	..(signal, receive_method, receive_param)
@@ -58,19 +58,19 @@
 	clear_children_ready_status()
 
 	//tell children to prepare for docking
-	for (var/child_tag in children_tags)
+	for(var/child_tag in children_tags)
 		send_docking_command(child_tag, "prepare_for_docking")
 
 /datum/computer/file/embedded_program/docking/multi/ready_for_docking()
 	//check children ready status
-	for (var/child_tag in children_tags)
-		if (!children_ready[child_tag])
+	for(var/child_tag in children_tags)
+		if(!children_ready[child_tag])
 			return 0
 	return 1
 
 /datum/computer/file/embedded_program/docking/multi/finish_docking()
 	//tell children to finish docking
-	for (var/child_tag in children_tags)
+	for(var/child_tag in children_tags)
 		send_docking_command(child_tag, "finish_docking")
 
 	//clear ready flags
@@ -81,19 +81,19 @@
 	clear_children_ready_status()
 
 	//tell children to prepare for undocking
-	for (var/child_tag in children_tags)
+	for(var/child_tag in children_tags)
 		send_docking_command(child_tag, "prepare_for_undocking")
 
 /datum/computer/file/embedded_program/docking/multi/ready_for_undocking()
 	//check children ready status
-	for (var/child_tag in children_tags)
-		if (!children_ready[child_tag])
+	for(var/child_tag in children_tags)
+		if(!children_ready[child_tag])
 			return 0
 	return 1
 
 /datum/computer/file/embedded_program/docking/multi/finish_undocking()
 	//tell children to finish undocking
-	for (var/child_tag in children_tags)
+	for(var/child_tag in children_tags)
 		send_docking_command(child_tag, "finish_undocking")
 
 	//clear ready flags
@@ -118,13 +118,13 @@
 /datum/computer/file/embedded_program/airlock/multi_docking/New(var/obj/machinery/embedded_controller/M)
 	..(M)
 
-	if (istype(M, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi))	//if our parent controller is the right type, then we can auto-init stuff at construction
+	if(istype(M, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi))	//if our parent controller is the right type, then we can auto-init stuff at construction
 		var/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/controller = M
 		src.master_tag = controller.master_tag
 
 /datum/computer/file/embedded_program/airlock/multi_docking/receive_user_command(command)
-	if (command == "toggle_override")
-		if (override_enabled)
+	if(command == "toggle_override")
+		if(override_enabled)
 			override_enabled = 0
 			broadcast_override_status()
 		else
@@ -132,7 +132,7 @@
 			broadcast_override_status()
 		return
 
-	if (!docking_enabled|| override_enabled)	//only allow the port to be used as an airlock if nothing is docked here or the override is enabled
+	if(!docking_enabled|| override_enabled)	//only allow the port to be used as an airlock if nothing is docked here or the override is enabled
 		..(command)
 
 /datum/computer/file/embedded_program/airlock/multi_docking/receive_signal(datum/signal/signal, receive_method, receive_param)
@@ -142,54 +142,54 @@
 	var/command = signal.data["command"]
 	var/recipient = signal.data["recipient"]	//the intended recipient of the docking signal
 
-	if (receive_tag != master_tag)
+	if(receive_tag != master_tag)
 		return	//only respond to master
 
 	//track master's status
-	if (signal.data["dock_status"])
+	if(signal.data["dock_status"])
 		master_status = signal.data["dock_status"]
 
-	if (recipient != id_tag)
+	if(recipient != id_tag)
 		return	//this signal is not for us
 
-	switch (command)
-		if ("prepare_for_docking")
+	switch(command)
+		if("prepare_for_docking")
 			docking_enabled = 1
 			docking_mode = 0
 			response_sent = 0
 
-			if (!override_enabled)
+			if(!override_enabled)
 				begin_cycle_in()
 
-		if ("prepare_for_undocking")
+		if("prepare_for_undocking")
 			docking_mode = 1
 			response_sent = 0
 
-			if (!override_enabled)
+			if(!override_enabled)
 				stop_cycling()
 				close_doors()
 				disable_mech_regulation()
 
-		if ("finish_docking")
-			if (!override_enabled)
+		if("finish_docking")
+			if(!override_enabled)
 				enable_mech_regulation()
 				open_doors()
 
-		if ("finish_undocking")
+		if("finish_undocking")
 			docking_enabled = 0
 
 /datum/computer/file/embedded_program/airlock/multi_docking/process()
 	..()
 
-	if (docking_enabled && !response_sent)
+	if(docking_enabled && !response_sent)
 
-		switch (docking_mode)
-			if (0)	//docking
-				if (ready_for_docking())
+		switch(docking_mode)
+			if(0)	//docking
+				if(ready_for_docking())
 					send_signal_to_master("ready_for_docking")
 					response_sent = 1
-			if (1)	//undocking
-				if (ready_for_undocking())
+			if(1)	//undocking
+				if(ready_for_undocking())
 					send_signal_to_master("ready_for_undocking")
 					response_sent = 1
 
@@ -206,7 +206,7 @@
 	toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open")
 
 /datum/computer/file/embedded_program/airlock/multi_docking/cycleDoors(var/target)
-	if (!docking_enabled|| override_enabled)	//only allow the port to be used as an airlock if nothing is docked here or the override is enabled
+	if(!docking_enabled|| override_enabled)	//only allow the port to be used as an airlock if nothing is docked here or the override is enabled
 		..(target)
 
 /datum/computer/file/embedded_program/airlock/multi_docking/proc/send_signal_to_master(var/command)
diff --git a/code/game/machinery/embedded_controller/embedded_program_base.dm b/code/game/machinery/embedded_controller/embedded_program_base.dm
index 06507d9d5f9..1fe527df13b 100644
--- a/code/game/machinery/embedded_controller/embedded_program_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_program_base.dm
@@ -7,7 +7,7 @@
 
 /datum/computer/file/embedded_program/New(var/obj/machinery/embedded_controller/M)
 	master = M
-	if (istype(M, /obj/machinery/embedded_controller/radio))
+	if(istype(M, /obj/machinery/embedded_controller/radio))
 		var/obj/machinery/embedded_controller/radio/R = M
 		id_tag = R.id_tag
 
diff --git a/code/game/machinery/embedded_controller/simple_docking_controller.dm b/code/game/machinery/embedded_controller/simple_docking_controller.dm
index 1883d363987..996a56b92ac 100644
--- a/code/game/machinery/embedded_controller/simple_docking_controller.dm
+++ b/code/game/machinery/embedded_controller/simple_docking_controller.dm
@@ -21,7 +21,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "simple_docking_console.tmpl", name, 470, 290)
 		ui.set_initial_data(data)
 		ui.open()
@@ -55,7 +55,7 @@
 	..(M)
 	memory["door_status"] = list(state = "closed", lock = "locked")		//assume closed and locked in case the doors dont report in
 
-	if (istype(M, /obj/machinery/embedded_controller/radio/simple_docking_controller))
+	if(istype(M, /obj/machinery/embedded_controller/radio/simple_docking_controller))
 		var/obj/machinery/embedded_controller/radio/simple_docking_controller/controller = M
 
 		tag_door = controller.tag_door? controller.tag_door : "[id_tag]_hatch"
@@ -78,13 +78,13 @@
 /datum/computer/file/embedded_program/docking/simple/receive_user_command(command)
 	switch(command)
 		if("force_door")
-			if (override_enabled)
+			if(override_enabled)
 				if(memory["door_status"]["state"] == "open")
 					close_door()
 				else
 					open_door()
 		if("toggle_override")
-			if (override_enabled)
+			if(override_enabled)
 				disable_override()
 			else
 				enable_override()
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 3426023f13c..45b515734f7 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -110,7 +110,9 @@ FIRE ALARM
 				else if(istype(W, /obj/item/weapon/crowbar))
 					to_chat(user, "<span class='warning'>You pry out the circuit!</span>")
 					playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
-					spawn(20)
+					if(do_after(user, 20, target = src))
+						if(buildstage != 1)
+							return
 						var/obj/item/weapon/firealarm_electronics/circuit = new /obj/item/weapon/firealarm_electronics()
 						circuit.loc = user.loc
 						buildstage = 0
@@ -174,14 +176,14 @@ FIRE ALARM
 	var/area/A = src.loc
 	var/d1
 	var/d2
-	if (ishuman(user) || issilicon(user) || isobserver(user))
+	if(ishuman(user) || issilicon(user) || isobserver(user))
 		A = A.loc
 
-		if (A.fire)
+		if(A.fire)
 			d1 = text("<A href='?src=\ref[];reset=1'>Reset - Lockdown</A>", src)
 		else
 			d1 = text("<A href='?src=\ref[];alarm=1'>Alarm - Lockdown</A>", src)
-		if (src.timing)
+		if(src.timing)
 			d2 = text("<A href='?src=\ref[];time=0'>Stop Time Lock</A>", src)
 		else
 			d2 = text("<A href='?src=\ref[];time=1'>Initiate Time Lock</A>", src)
@@ -192,11 +194,11 @@ FIRE ALARM
 		onclose(user, "firealarm")
 	else
 		A = A.loc
-		if (A.fire)
+		if(A.fire)
 			d1 = text("<A href='?src=\ref[];reset=1'>[]</A>", src, stars("Reset - Lockdown"))
 		else
 			d1 = text("<A href='?src=\ref[];alarm=1'>[]</A>", src, stars("Alarm - Lockdown"))
-		if (src.timing)
+		if(src.timing)
 			d2 = text("<A href='?src=\ref[];time=0'>[]</A>", src, stars("Stop Time Lock"))
 		else
 			d2 = text("<A href='?src=\ref[];time=1'>[]</A>", src, stars("Initiate Time Lock"))
@@ -258,7 +260,7 @@ FIRE ALARM
 		time = min(max(round(src.time), 0), 120)
 
 /obj/machinery/firealarm/proc/reset()
-	if (!( src.working ))
+	if(!( src.working ))
 		return
 	var/area/A = get_area(src)
 	A.fire_reset()
@@ -267,7 +269,7 @@ FIRE ALARM
 	return
 
 /obj/machinery/firealarm/proc/alarm(var/duration = 0)
-	if (!( src.working))
+	if(!( src.working))
 		return
 	var/area/A = get_area(src)
 	for(var/obj/machinery/firealarm/FA in A)
@@ -308,7 +310,7 @@ Just a object used in constructing fire alarms
 	icon = 'icons/obj/doors/door_assembly.dmi'
 	icon_state = "door_electronics"
 	desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees celsius!\""
-	w_class = 2.0
+	w_class = 2
 	materials = list(MAT_METAL=50, MAT_GLASS=50)
 
 /obj/machinery/partyalarm
@@ -330,7 +332,7 @@ Just a object used in constructing fire alarms
 
 /obj/machinery/partyalarm/New()
 	var/area/A = get_area_master(src)
-	if (!( istype(A, /area) ))
+	if(!( istype(A, /area) ))
 		return
 	master_area=A
 
@@ -343,13 +345,13 @@ Just a object used in constructing fire alarms
 	ASSERT(isarea(A))
 	var/d1
 	var/d2
-	if (istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai))
+	if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai))
 
-		if (A.party)
+		if(A.party)
 			d1 = text("<A href='?src=\ref[];reset=1'>No Party :(</A>", src)
 		else
 			d1 = text("<A href='?src=\ref[];alarm=1'>PARTY!!!</A>", src)
-		if (timing)
+		if(timing)
 			d2 = text("<A href='?src=\ref[];time=0'>Stop Time Lock</A>", src)
 		else
 			d2 = text("<A href='?src=\ref[];time=1'>Initiate Time Lock</A>", src)
@@ -359,11 +361,11 @@ Just a object used in constructing fire alarms
 		user << browse(dat, "window=partyalarm")
 		onclose(user, "partyalarm")
 	else
-		if (A.fire)
+		if(A.fire)
 			d1 = text("<A href='?src=\ref[];reset=1'>[]</A>", src, stars("No Party :("))
 		else
 			d1 = text("<A href='?src=\ref[];alarm=1'>[]</A>", src, stars("PARTY!!!"))
-		if (timing)
+		if(timing)
 			d2 = text("<A href='?src=\ref[];time=0'>[]</A>", src, stars("Stop Time Lock"))
 		else
 			d2 = text("<A href='?src=\ref[];time=1'>[]</A>", src, stars("Initiate Time Lock"))
@@ -375,7 +377,7 @@ Just a object used in constructing fire alarms
 	return
 
 /obj/machinery/partyalarm/proc/reset()
-	if (!( working ))
+	if(!( working ))
 		return
 	var/area/A = get_area(src)
 	ASSERT(isarea(A))
@@ -383,7 +385,7 @@ Just a object used in constructing fire alarms
 	return
 
 /obj/machinery/partyalarm/proc/alarm()
-	if (!( working ))
+	if(!( working ))
 		return
 	var/area/A = get_area(src)
 	ASSERT(isarea(A))
@@ -392,20 +394,20 @@ Just a object used in constructing fire alarms
 
 /obj/machinery/partyalarm/Topic(href, href_list)
 	..()
-	if (usr.stat || stat & (BROKEN|NOPOWER))
+	if(usr.stat || stat & (BROKEN|NOPOWER))
 		return
-	if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
+	if((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
 		usr.machine = src
-		if (href_list["reset"])
+		if(href_list["reset"])
 			reset()
 		else
-			if (href_list["alarm"])
+			if(href_list["alarm"])
 				alarm()
 			else
-				if (href_list["time"])
+				if(href_list["time"])
 					timing = text2num(href_list["time"])
 				else
-					if (href_list["tp"])
+					if(href_list["tp"])
 						var/tp = text2num(href_list["tp"])
 						time += tp
 						time = min(max(round(time), 0), 120)
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 01f95d81ab6..655ffd11634 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -28,7 +28,7 @@
 	src.sd_set_light(2)
 */
 /obj/machinery/flasher/power_change()
-	if ( powered() )
+	if( powered() )
 		stat &= ~NOPOWER
 		icon_state = "[base_state]1"
 //		src.sd_set_light(2)
@@ -39,26 +39,26 @@
 
 //Don't want to render prison breaks impossible
 /obj/machinery/flasher/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/wirecutters))
+	if(istype(W, /obj/item/weapon/wirecutters))
 		add_fingerprint(user)
 		src.disable = !src.disable
-		if (src.disable)
+		if(src.disable)
 			user.visible_message("\red [user] has disconnected the [src]'s flashbulb!", "\red You disconnect the [src]'s flashbulb!")
-		if (!src.disable)
+		if(!src.disable)
 			user.visible_message("\red [user] has connected the [src]'s flashbulb!", "\red You connect the [src]'s flashbulb!")
 
 //Let the AI trigger them directly.
 /obj/machinery/flasher/attack_ai()
-	if (src.anchored)
+	if(src.anchored)
 		return src.flash()
 	else
 		return
 
 /obj/machinery/flasher/proc/flash()
-	if (!(powered()))
+	if(!(powered()))
 		return
 
-	if ((src.disable) || (src.last_flash && world.time < src.last_flash + 150))
+	if((src.disable) || (src.last_flash && world.time < src.last_flash + 150))
 		return
 
 	playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
@@ -67,7 +67,7 @@
 	use_power(1000)
 
 	for(var/mob/living/L in viewers(src, null))
-		if (get_dist(src, L) > src.range)
+		if(get_dist(src, L) > src.range)
 			continue
 
 		if(L.flash_eyes(affect_silicon = 1))
@@ -85,24 +85,24 @@
 	..(severity)
 
 /obj/machinery/flasher/portable/HasProximity(atom/movable/AM as mob|obj)
-	if ((src.disable) || (src.last_flash && world.time < src.last_flash + 150))
+	if((src.disable) || (src.last_flash && world.time < src.last_flash + 150))
 		return
 
 	if(istype(AM, /mob/living/carbon))
 		var/mob/living/carbon/M = AM
-		if ((M.m_intent != "walk") && (src.anchored))
+		if((M.m_intent != "walk") && (src.anchored))
 			src.flash()
 
 /obj/machinery/flasher/portable/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/wrench))
+	if(istype(W, /obj/item/weapon/wrench))
 		add_fingerprint(user)
 		src.anchored = !src.anchored
 
-		if (!src.anchored)
+		if(!src.anchored)
 			user.show_message(text("\red [src] can now be moved."))
 			src.overlays.Cut()
 
-		else if (src.anchored)
+		else if(src.anchored)
 			user.show_message(text("\red [src] is now secured."))
 			src.overlays += "[base_state]-s"
 
diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm
index 7c5e152529f..53977708650 100644
--- a/code/game/machinery/floodlight.dm
+++ b/code/game/machinery/floodlight.dm
@@ -69,7 +69,7 @@
 
 /obj/machinery/floodlight/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/wrench))
-		if (!anchored && !isinspace())
+		if(!anchored && !isinspace())
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 			user.visible_message( \
 				"[user] tightens \the [src]'s casters.", \
@@ -83,8 +83,8 @@
 				"<span class='notice'> You have loosened \the [src]'s casters.</span>", \
 				"You hear ratchet.")
 			anchored = 0
-	if (istype(W, /obj/item/weapon/screwdriver))
-		if (!open)
+	if(istype(W, /obj/item/weapon/screwdriver))
+		if(!open)
 			if(unlocked)
 				unlocked = 0
 				to_chat(user, "You screw the battery panel in place.")
@@ -92,7 +92,7 @@
 				unlocked = 1
 				to_chat(user, "You unscrew the battery panel.")
 
-	if (istype(W, /obj/item/weapon/crowbar))
+	if(istype(W, /obj/item/weapon/crowbar))
 		if(unlocked)
 			if(open)
 				open = 0
@@ -103,7 +103,7 @@
 					open = 1
 					to_chat(user, "You remove the battery panel.")
 
-	if (istype(W, /obj/item/weapon/stock_parts/cell))
+	if(istype(W, /obj/item/weapon/stock_parts/cell))
 		if(open)
 			if(cell)
 				to_chat(user, "There is a power cell already installed.")
diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm
index bf1d69e7437..8620cb401f3 100644
--- a/code/game/machinery/guestpass.dm
+++ b/code/game/machinery/guestpass.dm
@@ -11,19 +11,19 @@
 	var/reason = "NOT SPECIFIED"
 
 /obj/item/weapon/card/id/guest/GetAccess()
-	if (world.time > expiration_time)
+	if(world.time > expiration_time)
 		return access
 	else
 		return temp_access
 
 /obj/item/weapon/card/id/guest/examine(mob/user)
 	..(user)
-	if (world.time < expiration_time)
+	if(world.time < expiration_time)
 		to_chat(user, "<span class='notice'>This pass expires at [worldtime2text(expiration_time)].</span>")
 	else
 		to_chat(user, "<span class='warning'>It expired at [worldtime2text(expiration_time)].</span>")
 	to_chat(user, "<span class='notice'>It grants access to following areas:</span>")
-	for (var/A in temp_access)
+	for(var/A in temp_access)
 		to_chat(user, "<span class='notice'>[get_access_desc(A)].</span>")
 	to_chat(user, "<span class='notice'>Issuing reason: [reason].</span>")
 
@@ -72,9 +72,9 @@
 	user.set_machine(src)
 	var/dat
 
-	if (mode == 1) //Logs
+	if(mode == 1) //Logs
 		dat += "<h3>Activity log</h3><br>"
-		for (var/entry in internal_log)
+		for(var/entry in internal_log)
 			dat += "[entry]<br><hr>"
 		dat += "<a href='?src=\ref[src];action=print'>Print</a><br>"
 		dat += "<a href='?src=\ref[src];mode=0'>Back</a><br>"
@@ -86,10 +86,10 @@
 		dat += "Reason:  <a href='?src=\ref[src];choice=reason'>[reason]</a><br>"
 		dat += "Duration (minutes):  <a href='?src=\ref[src];choice=duration'>[duration] m</a><br>"
 		dat += "Access to areas:<br>"
-		if (giver && giver.access)
-			for (var/A in get_changeable_accesses())
+		if(giver && giver.access)
+			for(var/A in get_changeable_accesses())
 				var/area = get_access_desc(A)
-				if (A in accesses)
+				if(A in accesses)
 					area = "<b>[area]</b>"
 				dat += "<a href='?src=\ref[src];choice=access;access=[A]'>[area]</a><br>"
 		dat += "<br><a href='?src=\ref[src];action=issue'>Issue pass</a><br>"
@@ -102,37 +102,37 @@
 	if(..())
 		return 1
 	usr.set_machine(src)
-	if (href_list["mode"])
+	if(href_list["mode"])
 		mode = text2num(href_list["mode"])
 
-	if (href_list["choice"])
+	if(href_list["choice"])
 		switch(href_list["choice"])
-			if ("giv_name")
+			if("giv_name")
 				var/nam = strip_html_simple(input("Person pass is issued to", "Name", giv_name) as text|null)
-				if (nam)
+				if(nam)
 					giv_name = nam
-			if ("reason")
+			if("reason")
 				var/reas = strip_html_simple(input("Reason why pass is issued", "Reason", reason) as text|null)
 				if(reas)
 					reason = reas
-			if ("duration")
+			if("duration")
 				var/dur = input("Duration (in minutes) during which pass is valid (up to 30 minutes).", "Duration") as num|null
-				if (dur)
-					if (dur > 0 && dur <= 30)
+				if(dur)
+					if(dur > 0 && dur <= 30)
 						duration = dur
 					else
 						to_chat(usr, "<span class='warning'>Invalid duration.</span>")
-			if ("access")
+			if("access")
 				var/A = text2num(href_list["access"])
-				if (A in accesses)
+				if(A in accesses)
 					accesses.Remove(A)
 				else
 					if(giver && giver.access && (A in get_changeable_accesses()))
 						accesses.Add(A)
-	if (href_list["action"])
+	if(href_list["action"])
 		switch(href_list["action"])
-			if ("id")
-				if (giver)
+			if("id")
+				if(giver)
 					if(ishuman(usr))
 						giver.loc = usr.loc
 						if(!usr.get_active_hand())
@@ -144,15 +144,15 @@
 					accesses.Cut()
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id))
+					if(istype(I, /obj/item/weapon/card/id))
 						usr.drop_item()
 						I.loc = src
 						giver = I
 				updateUsrDialog()
 
-			if ("print")
+			if("print")
 				var/dat = "<h3>Activity log of guest pass terminal #[uid]</h3><br>"
-				for (var/entry in internal_log)
+				for(var/entry in internal_log)
 					dat += "[entry]<br><hr>"
 //				to_chat(usr, "Printing the log, standby...")
 				//sleep(50)
@@ -161,13 +161,13 @@
 				P.name = "activity log"
 				P.info = dat
 
-			if ("issue")
-				if (giver)
+			if("issue")
+				if(giver)
 					var/number = add_zero("[rand(0,9999)]", 4)
 					var/entry = "\[[worldtime2text()]\] Pass #[number] issued by [giver.registered_name] ([giver.assignment]) to [giv_name]. Reason: [reason]. Grants access to following areas: "
-					for (var/i=1 to accesses.len)
+					for(var/i=1 to accesses.len)
 						var/A = accesses[i]
-						if (A)
+						if(A)
 							var/area = get_access_desc(A)
 							entry += "[i > 1 ? ", [area]" : "[area]"]"
 					entry += ". Expires at [worldtime2text(world.time + duration*10*60)]."
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index ba0006f16de..abe99777410 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -81,7 +81,7 @@ var/const/HOLOPAD_MODE = 0
 			to_chat(user, "<span class='notice'>A request for AI presence was already sent recently.</span>")
 
 /obj/machinery/hologram/holopad/attack_ai(mob/living/silicon/ai/user)
-	if (!istype(user))
+	if(!istype(user))
 		return
 	/*There are pretty much only three ways to interact here.
 	I don't need to check for client since they're clicking on an object.
@@ -165,7 +165,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 				if((HOLOPAD_MODE == 0 && (get_dist(master.eyeobj, src) <= holo_range)))
 					return 1
 
-				else if (HOLOPAD_MODE == 1)
+				else if(HOLOPAD_MODE == 1)
 
 					var/area/holo_area = get_area(src)
 					var/area/eye_area = get_area(master.eyeobj)
@@ -219,10 +219,10 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 		if(1.0)
 			qdel(src)
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				qdel(src)
 	return
 
diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm
index 687a07ced0f..d44ee2e3930 100644
--- a/code/game/machinery/holosign.dm
+++ b/code/game/machinery/holosign.dm
@@ -10,19 +10,19 @@
 	var/on_icon = "sign_on"
 
 	proc/toggle()
-		if (stat & (BROKEN|NOPOWER))
+		if(stat & (BROKEN|NOPOWER))
 			return
 		lit = !lit
 		update_icon()
 
 	update_icon()
-		if (!lit)
+		if(!lit)
 			icon_state = "sign_off"
 		else
 			icon_state = on_icon
 
 	power_change()
-		if (stat & NOPOWER)
+		if(stat & NOPOWER)
 			lit = 0
 		update_icon()
 
@@ -67,7 +67,7 @@
 		icon_state = "light0"
 
 	for(var/obj/machinery/holosign/M in world)
-		if (M.id == src.id)
+		if(M.id == src.id)
 			spawn( 0 )
 				M.toggle()
 				return
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index d6e41d29fa2..7cb51574a60 100755
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -25,9 +25,9 @@
 	return
 
 /obj/machinery/igniter/process()	//ugh why is this even in process()?
-	if (src.on && !(stat & NOPOWER) )
+	if(src.on && !(stat & NOPOWER) )
 		var/turf/location = src.loc
-		if (isturf(location))
+		if(isturf(location))
 			location.hotspot_expose(1000,500,1)
 	return 1
 
@@ -58,7 +58,7 @@
 	..()
 
 /obj/machinery/sparker/power_change()
-	if ( powered() && disable == 0 )
+	if( powered() && disable == 0 )
 		stat &= ~NOPOWER
 		icon_state = "[base_state]"
 //		src.sd_set_light(2)
@@ -70,13 +70,13 @@
 /obj/machinery/sparker/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/device/detective_scanner))
 		return
-	if (istype(W, /obj/item/weapon/screwdriver))
+	if(istype(W, /obj/item/weapon/screwdriver))
 		add_fingerprint(user)
 		src.disable = !src.disable
-		if (src.disable)
+		if(src.disable)
 			user.visible_message("\red [user] has disabled the [src]!", "\red You disable the connection to the [src].")
 			icon_state = "[base_state]-d"
-		if (!src.disable)
+		if(!src.disable)
 			user.visible_message("\red [user] has reconnected the [src]!", "\red You fix the connection to the [src].")
 			if(src.powered())
 				icon_state = "[base_state]"
@@ -84,16 +84,16 @@
 				icon_state = "[base_state]-p"
 
 /obj/machinery/sparker/attack_ai()
-	if (src.anchored)
+	if(src.anchored)
 		return src.spark()
 	else
 		return
 
 /obj/machinery/sparker/proc/spark()
-	if (!(powered()))
+	if(!(powered()))
 		return
 
-	if ((src.disable) || (src.last_spark && world.time < src.last_spark + 50))
+	if((src.disable) || (src.last_spark && world.time < src.last_spark + 50))
 		return
 
 
@@ -104,7 +104,7 @@
 	src.last_spark = world.time
 	use_power(1000)
 	var/turf/location = src.loc
-	if (isturf(location))
+	if(isturf(location))
 		location.hotspot_expose(1000,500,1)
 	return 1
 
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 5caff96d4ea..9c6b0fc548d 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -58,7 +58,7 @@
 
 
 /obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/reagent_containers))
+	if(istype(W, /obj/item/weapon/reagent_containers))
 		if(!isnull(src.beaker))
 			to_chat(user, "There is already a reagent container loaded!")
 			return
@@ -124,14 +124,16 @@
 
 			var/datum/reagent/B = T.take_blood(beaker,amount)
 
-			if (B)
+			if(B)
 				beaker.reagents.reagent_list |= B
 				beaker.reagents.update_total()
 				beaker.on_reagent_change()
 				beaker.reagents.handle_reactions()
 				update_icon()
 
-/obj/machinery/iv_drip/attack_hand(mob/user as mob)
+/obj/machinery/iv_drip/attack_hand(mob/living/carbon/user)
+	if(!istype(user))
+		return
 	if(src.beaker)
 		src.beaker.loc = get_turf(src)
 		src.beaker = null
@@ -157,7 +159,7 @@
 
 /obj/machinery/iv_drip/examine(mob/user)
 	..(user)
-	if (!(user in view(2)) && usr != src.loc) return
+	if(!(user in view(2)) && usr != src.loc) return
 
 	to_chat(usr, "The IV drip is [mode ? "injecting" : "taking blood"].")
 
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index 4c271a08f44..ddf289d6189 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -281,12 +281,12 @@
 		playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
 		operating = 0
 
-		for (var/obj/item/thing in contents) //Meat is spawned inside the gibber and thrown out afterwards.
+		for(var/obj/item/thing in contents) //Meat is spawned inside the gibber and thrown out afterwards.
 			thing.loc = get_turf(thing) // Drop it onto the turf for throwing.
 			thing.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15) // Being pelted with bits of meat and bone would hurt.
 			sleep(1)
 
-		for (var/obj/effect/gibs in contents) //throw out the gibs too
+		for(var/obj/effect/gibs in contents) //throw out the gibs too
 			gibs.loc = get_turf(gibs) //drop onto turf for throwing
 			gibs.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15)
 			sleep(1)
diff --git a/code/game/machinery/kitchen/icecream_vat.dm b/code/game/machinery/kitchen/icecream_vat.dm
index 07dfeb6f29c..a9a69a3bfbb 100644
--- a/code/game/machinery/kitchen/icecream_vat.dm
+++ b/code/game/machinery/kitchen/icecream_vat.dm
@@ -126,7 +126,7 @@ var/list/ingredients_source = list(
 			var/obj/item/weapon/reagent_containers/R = O
 			if(R.reagents)
 				src.visible_message("<span class='info'>[user] has emptied all of [R] into [src].</span>")
-				for (var/datum/reagent/current_reagent in R.reagents.reagent_list)
+				for(var/datum/reagent/current_reagent in R.reagents.reagent_list)
 					if(ingredients_source[current_reagent.id])
 						add(ingredients_source[current_reagent.id], current_reagent.volume / 2)
 					else
diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm
index 7b25e683941..8f2308eb124 100644
--- a/code/game/machinery/kitchen/juicer.dm
+++ b/code/game/machinery/kitchen/juicer.dm
@@ -36,9 +36,9 @@
 
 
 /obj/machinery/juicer/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (istype(O,/obj/item/weapon/reagent_containers/glass) || \
+	if(istype(O,/obj/item/weapon/reagent_containers/glass) || \
 		istype(O,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass))
-		if (beaker)
+		if(beaker)
 			return 1
 		else
 			if(!user.unEquip(O))
@@ -50,7 +50,7 @@
 			update_icon()
 			src.updateUsrDialog()
 			return 0
-	if (!is_type_in_list(O, allowed_items))
+	if(!is_type_in_list(O, allowed_items))
 		to_chat(user, "It doesn't look like that contains any juice.")
 		return 1
 	if(!user.unEquip(O))
@@ -73,21 +73,21 @@
 	var/processing_chamber = ""
 	var/beaker_contents = ""
 
-	for (var/i in allowed_items)
-		for (var/obj/item/O in src.contents)
-			if (!istype(O,i))
+	for(var/i in allowed_items)
+		for(var/obj/item/O in src.contents)
+			if(!istype(O,i))
 				continue
 			processing_chamber+= "some <B>[O]</B><BR>"
 			break
-	if (!processing_chamber)
+	if(!processing_chamber)
 		is_chamber_empty = 1
 		processing_chamber = "Nothing."
-	if (!beaker)
+	if(!beaker)
 		beaker_contents = "\The [src] has no beaker attached."
-	else if (!beaker.reagents.total_volume)
+	else if(!beaker.reagents.total_volume)
 		beaker_contents = "\The [src]  has attached an empty beaker."
 		is_beaker_ready = 1
-	else if (beaker.reagents.total_volume < beaker.reagents.maximum_volume)
+	else if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
 		beaker_contents = "\The [src]  has attached a beaker with something."
 		is_beaker_ready = 1
 	else
@@ -98,9 +98,9 @@
 [processing_chamber]<br>
 [beaker_contents]<hr>
 "}
-	if (is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
+	if(is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
 		dat += "<A href='?src=\ref[src];action=juice'>Turn on!<BR>"
-	if (beaker)
+	if(beaker)
 		dat += "<A href='?src=\ref[src];action=detach'>Detach a beaker!<BR>"
 	user << browse("<HEAD><TITLE>Juicer</TITLE></HEAD><TT>[dat]</TT>", "window=juicer")
 	onclose(user, "juicer")
@@ -112,10 +112,10 @@
 		return
 	usr.set_machine(src)
 	switch(href_list["action"])
-		if ("juice")
+		if("juice")
 			juice()
 
-		if ("detach")
+		if("detach")
 			detach()
 	src.updateUsrDialog()
 	return
@@ -124,9 +124,9 @@
 	set category = "Object"
 	set name = "Detach Beaker from the juicer"
 	set src in oview(1)
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
-	if (!beaker)
+	if(!beaker)
 		return
 	src.verbs -= /obj/machinery/juicer/verb/detach
 	beaker.forceMove(src.loc)
@@ -134,7 +134,7 @@
 	update_icon()
 
 /obj/machinery/juicer/proc/get_juice_id(var/obj/item/weapon/reagent_containers/food/snacks/O)
-	if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/watermelonslice))
+	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/watermelonslice))
 		return "watermelonjuice"
 	else if(istype(O, /obj.item/weapon/reagent_containers/food/snacks/grown))
 		var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O
@@ -144,9 +144,9 @@
 		return "water"
 
 /obj/machinery/juicer/proc/get_juice_amount(var/obj/item/weapon/reagent_containers/food/snacks/grown/O)
-	if (!istype(O))
+	if(!istype(O))
 		return 5
-	else if (O.potency == -1)
+	else if(O.potency == -1)
 		return 5
 	else
 		return round(5*sqrt(O.potency))
@@ -155,14 +155,14 @@
 	power_change() //it is a portable machine
 	if(stat & (NOPOWER|BROKEN))
 		return
-	if (!beaker || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+	if(!beaker || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 		return
 	playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
-	for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents)
+	for(var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents)
 		var/r_id = get_juice_id(O)
 		beaker.reagents.add_reagent(r_id,get_juice_amount(O))
 		qdel(O)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+		if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break
 
 /obj/structure/closet/crate/juice
diff --git a/code/game/machinery/kitchen/kitchen_machine.dm b/code/game/machinery/kitchen/kitchen_machine.dm
index 5c584d0468b..02488e5bfcb 100644
--- a/code/game/machinery/kitchen/kitchen_machine.dm
+++ b/code/game/machinery/kitchen/kitchen_machine.dm
@@ -34,19 +34,19 @@
 /obj/machinery/kitchen_machine/New()
 	reagents = new/datum/reagents(100)
 	reagents.my_atom = src
-	if (!available_recipes)
+	if(!available_recipes)
 		available_recipes = new
 		acceptable_items = new
 		acceptable_reagents = new
-		for (var/type in subtypesof(recipe_type))
+		for(var/type in subtypesof(recipe_type))
 			var/datum/recipe/recipe = new type
 			if(recipe.result) // Ignore recipe subtypes that lack a result
 				available_recipes += recipe
-				for (var/item in recipe.items)
+				for(var/item in recipe.items)
 					acceptable_items |= item
-				for (var/reagent in recipe.reagents)
+				for(var/reagent in recipe.reagents)
 					acceptable_reagents |= reagent
-				if (recipe.items || recipe.fruit)
+				if(recipe.items || recipe.fruit)
 					max_n_of_items = max(max_n_of_items,recipe.count_n_items())
 			else
 				qdel(recipe)
@@ -83,7 +83,7 @@
 				"<span class='notice'>[user] starts to fix part of \the [src].</span>", \
 				"<span class='notice'>You start to fix part of \the [src].</span>" \
 			)
-			if (do_after(user,20, target = src))
+			if(do_after(user,20, target = src))
 				user.visible_message( \
 					"<span class='notice'>[user] fixes part of \the [src].</span>", \
 					"<span class='notice'>You have fixed part of \the [src].</span>" \
@@ -94,7 +94,7 @@
 				"<span class='notice'>[user] starts to fix part of \the [src].</span>", \
 				"<span class='notice'>You start to fix part of \the [src].</span>" \
 			)
-			if (do_after(user,20, target = src))
+			if(do_after(user,20, target = src))
 				user.visible_message( \
 					"<span class='notice'>[user] fixes \the [src].</span>", \
 					"<span class='notice'>You have fixed \the [src].</span>" \
@@ -112,7 +112,7 @@
 				"<span class='notice'>[user] starts to clean \the [src].</span>", \
 				"<span class='notice'>You start to clean \the [src].</span>" \
 			)
-			if (do_after(user,20, target = src))
+			if(do_after(user,20, target = src))
 				user.visible_message( \
 					"<span class='notice'>[user]  has cleaned \the [src].</span>", \
 					"<span class='notice'>You have cleaned \the [src].</span>" \
@@ -125,10 +125,10 @@
 			to_chat(user, "<span class='alert'>It's dirty!</span>")
 			return 1
 	else if(is_type_in_list(O,acceptable_items))
-		if (contents.len>=max_n_of_items)
+		if(contents.len>=max_n_of_items)
 			to_chat(user, "<span class='alert'>This [src] is full of ingredients, you cannot put more.</span>")
 			return 1
-		if (istype(O,/obj/item/stack) && O:amount>1)
+		if(istype(O,/obj/item/stack) && O:amount>1)
 			new O.type (src)
 			O:use(1)
 			user.visible_message( \
@@ -147,10 +147,10 @@
 	        istype(O,/obj/item/weapon/reagent_containers/food/drinks) || \
 	        istype(O,/obj/item/weapon/reagent_containers/food/condiment) \
 		)
-		if (!O.reagents)
+		if(!O.reagents)
 			return 1
-		for (var/datum/reagent/R in O.reagents.reagent_list)
-			if (!(R.id in acceptable_reagents))
+		for(var/datum/reagent/R in O.reagents.reagent_list)
+			if(!(R.id in acceptable_reagents))
 				to_chat(user, "<span class='alert'>Your [O] contains components unsuitable for cookery.</span>")
 				return 1
 		//G.reagents.trans_to(src,G.amount_per_transfer_from_this)
@@ -188,44 +188,44 @@
 		var/list/items_counts = new
 		var/list/items_measures = new
 		var/list/items_measures_p = new
-		for (var/obj/O in contents)
+		for(var/obj/O in contents)
 			var/display_name = O.name
-			if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg))
+			if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg))
 				items_measures[display_name] = "egg"
 				items_measures_p[display_name] = "eggs"
-			if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu))
+			if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu))
 				items_measures[display_name] = "tofu chunk"
 				items_measures_p[display_name] = "tofu chunks"
-			if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat
+			if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat
 				items_measures[display_name] = "slab of meat"
 				items_measures_p[display_name] = "slabs of meat"
-			if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket))
+			if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket))
 				display_name = "Turnovers"
 				items_measures[display_name] = "turnover"
 				items_measures_p[display_name] = "turnovers"
-			if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat))
+			if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat))
 				items_measures[display_name] = "fillet of meat"
 				items_measures_p[display_name] = "fillets of meat"
 			items_counts[display_name]++
-		for (var/O in items_counts)
+		for(var/O in items_counts)
 			var/N = items_counts[O]
-			if (!(O in items_measures))
+			if(!(O in items_measures))
 				dat += {"<B>[capitalize(O)]:</B> [N] [lowertext(O)]\s<BR>"}
 			else
-				if (N==1)
+				if(N==1)
 					dat += {"<B>[capitalize(O)]:</B> [N] [items_measures[O]]<BR>"}
 				else
 					dat += {"<B>[capitalize(O)]:</B> [N] [items_measures_p[O]]<BR>"}
 
-		for (var/datum/reagent/R in reagents.reagent_list)
+		for(var/datum/reagent/R in reagents.reagent_list)
 			var/display_name = R.name
-			if (R.id == "capsaicin")
+			if(R.id == "capsaicin")
 				display_name = "Hotsauce"
-			if (R.id == "frostoil")
+			if(R.id == "frostoil")
 				display_name = "Coldsauce"
 			dat += {"<B>[display_name]:</B> [R.volume] unit\s<BR>"}
 
-		if (items_counts.len==0 && reagents.reagent_list.len==0)
+		if(items_counts.len==0 && reagents.reagent_list.len==0)
 			dat = {"<B>The [src] is empty</B><BR>"}
 		else
 			dat = {"<b>Ingredients:</b><br>[dat]"}
@@ -248,8 +248,8 @@
 	if(stat & (NOPOWER|BROKEN))
 		return
 	start()
-	if (reagents.total_volume==0 && !(locate(/obj) in contents)) //dry run
-		if (!wzhzhzh(10))
+	if(reagents.total_volume==0 && !(locate(/obj) in contents)) //dry run
+		if(!wzhzhzh(10))
 			abort()
 			return
 		stop()
@@ -258,10 +258,10 @@
 	var/datum/recipe/recipe = select_recipe(available_recipes,src)
 	var/obj/cooked
 	var/obj/byproduct
-	if (!recipe)
+	if(!recipe)
 		dirty += 1
-		if (prob(max(10,dirty*5)))
-			if (!wzhzhzh(4))
+		if(prob(max(10,dirty*5)))
+			if(!wzhzhzh(4))
 				abort()
 				return
 			muck_start()
@@ -269,15 +269,15 @@
 			muck_finish()
 			fail()
 			return
-		else if (has_extra_item())
-			if (!wzhzhzh(4))
+		else if(has_extra_item())
+			if(!wzhzhzh(4))
 				abort()
 				return
 			broke()
 			fail()
 			return
 		else
-			if (!wzhzhzh(10))
+			if(!wzhzhzh(10))
 				abort()
 				return
 			stop()
@@ -285,10 +285,10 @@
 			return
 	else
 		var/halftime = round(recipe.time/10/2)
-		if (!wzhzhzh(halftime))
+		if(!wzhzhzh(halftime))
 			abort()
 			return
-		if (!wzhzhzh(halftime))
+		if(!wzhzhzh(halftime))
 			abort()
 			fail()
 			return
@@ -304,15 +304,15 @@
 		return
 
 /obj/machinery/kitchen_machine/proc/wzhzhzh(var/seconds as num)
-	for (var/i=1 to seconds)
-		if (stat & (NOPOWER|BROKEN))
+	for(var/i=1 to seconds)
+		if(stat & (NOPOWER|BROKEN))
 			return 0
 		use_power(500)
 		sleep(10)
 	return 1
 
 /obj/machinery/kitchen_machine/proc/has_extra_item()
-	for (var/obj/O in contents)
+	for(var/obj/O in contents)
 		if ( \
 				!istype(O,/obj/item/weapon/reagent_containers/food) && \
 				!istype(O, /obj/item/weapon/grown) \
@@ -338,9 +338,9 @@
 	src.updateUsrDialog()
 
 /obj/machinery/kitchen_machine/proc/dispose()
-	for (var/obj/O in contents)
+	for(var/obj/O in contents)
 		O.forceMove(src.loc)
-	if (src.reagents.total_volume)
+	if(src.reagents.total_volume)
 		src.dirty++
 	src.reagents.clear_reagents()
 	to_chat(usr, "<span class='notice'>You dispose of \the [src]'s contents.</span>")
@@ -373,11 +373,11 @@
 /obj/machinery/kitchen_machine/proc/fail()
 	var/obj/item/weapon/reagent_containers/food/snacks/badrecipe/ffuu = new(src)
 	var/amount = 0
-	for (var/obj/O in contents-ffuu)
+	for(var/obj/O in contents-ffuu)
 		amount++
-		if (O.reagents)
+		if(O.reagents)
 			var/id = O.reagents.get_master_reagent_id()
-			if (id)
+			if(id)
 				amount+=O.reagents.get_reagent_amount(id)
 		qdel(O)
 	src.reagents.clear_reagents()
@@ -395,9 +395,9 @@
 		return
 
 	switch(href_list["action"])
-		if ("cook")
+		if("cook")
 			cook()
 
-		if ("dispose")
+		if("dispose")
 			dispose()
 	return
\ No newline at end of file
diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm
index b95e4ae5318..dc283e65d6c 100644
--- a/code/game/machinery/kitchen/monkeyrecycler.dm
+++ b/code/game/machinery/kitchen/monkeyrecycler.dm
@@ -62,9 +62,9 @@
 				cycle_through = 0
 		to_chat(user, "<span class='notice'>You change the monkeycube type to [initial(cube_type.name)].</span>")
 
-	if (src.stat != 0) //NOPOWER etc
+	if(src.stat != 0) //NOPOWER etc
 		return
-	if (istype(O, /obj/item/weapon/grab))
+	if(istype(O, /obj/item/weapon/grab))
 		var/obj/item/weapon/grab/G = O
 		var/grabbed = G.affecting
 		if(istype(grabbed, /mob/living/carbon/human))
@@ -91,7 +91,7 @@
 	return
 
 /obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob)
-	if (src.stat != 0) //NOPOWER etc
+	if(src.stat != 0) //NOPOWER etc
 		return
 	if(grinded >= required_grind)
 		to_chat(user, "<span class='notice'>The machine hisses loudly as it condenses the grinded monkey meat. After a moment, it dispenses a brand new monkey cube.</span>")
diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm
index 881c0536803..cf0aeba069e 100644
--- a/code/game/machinery/kitchen/processor.dm
+++ b/code/game/machinery/kitchen/processor.dm
@@ -45,7 +45,7 @@
 	if(!picked_slime)
 		return
 	var/datum/food_processor_process/P = select_recipe(picked_slime)
-	if (!P)
+	if(!P)
 		return
 
 	visible_message("[picked_slime] is sucked into \the [src].")
@@ -58,10 +58,10 @@
 	var/time = 40
 
 /datum/food_processor_process/proc/process_food(loc, what, obj/machinery/processor/processor)
-	if (src.output && loc && processor)
+	if(src.output && loc && processor)
 		for(var/i = 0, i < processor.rating_amount, i++)
 			new src.output(loc)
-	if (what)
+	if(what)
 		qdel(what)
 
 /////////////////////////
@@ -118,7 +118,7 @@
 
 /datum/food_processor_process/mob/monkey/process_food(loc, what, processor)
 	var/mob/living/carbon/human/monkey/O = what
-	if (O.client) //grief-proof
+	if(O.client) //grief-proof
 		O.loc = loc
 		O.visible_message("<span class='notice'>Suddenly [O] jumps out from the processor!</span>", \
 				"<span class='notice'>You jump out of \the [src].</span>", \
@@ -143,13 +143,13 @@
 //END RECIPE DATUMS
 
 /obj/machinery/processor/proc/select_recipe(var/X)
-	for (var/Type in subtypesof(/datum/food_processor_process) - /datum/food_processor_process/mob)
+	for(var/Type in subtypesof(/datum/food_processor_process) - /datum/food_processor_process/mob)
 		var/datum/food_processor_process/P = new Type()
 		if(istype(X, /obj/item/weapon/reagent_containers/food/snacks/grown))
 			var/obj/item/weapon/reagent_containers/food/snacks/grown/G = X
 			if(G.seed.kitchen_tag != P.input)
 				continue
-		else if (!istype(X, P.input))
+		else if(!istype(X, P.input))
 			continue
 		return P
 	return 0
@@ -173,13 +173,13 @@
 
 	var/obj/item/what = O
 
-	if (istype(O, /obj/item/weapon/grab))
+	if(istype(O, /obj/item/weapon/grab))
 		var/obj/item/weapon/grab/G = O
 		what = G.affecting
 
 	var/datum/food_processor_process/P = select_recipe(what)
 
-	if (!P)
+	if(!P)
 		to_chat(user, "<span class='warning'>That probably won't blend.</span>")
 		return 1
 
@@ -211,7 +211,7 @@
 	var/total_time = 0
 	for(var/O in src.contents)
 		var/datum/food_processor_process/P = select_recipe(O)
-		if (!P)
+		if(!P)
 			log_debug("The [O] in processor([src]) does not have a suitable recipe, but it was somehow put inside of the processor anyways.")
 			continue
 		total_time += P.time
@@ -219,7 +219,7 @@
 
 	for(var/O in src.contents)
 		var/datum/food_processor_process/P = select_recipe(O)
-		if (!P)
+		if(!P)
 			log_debug("The [O] in processor([src]) does not have a suitable recipe, but it was somehow put inside of the processor anyways.")
 			continue
 		P.process_food(src.loc, O, src)
diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm
index b17b09d5419..8f2c4e58cd9 100644
--- a/code/game/machinery/kitchen/smartfridge.dm
+++ b/code/game/machinery/kitchen/smartfridge.dm
@@ -322,7 +322,7 @@
 	data["secure"] = is_secure
 
 	var/list/items[0]
-	for (var/i=1 to length(item_quants))
+	for(var/i=1 to length(item_quants))
 		var/K = item_quants[i]
 		var/count = item_quants[K]
 		if(count > 0)
@@ -377,7 +377,7 @@
 	if(!target)
 		return 0
 
-	for (var/O in item_quants)
+	for(var/O in item_quants)
 		if(item_quants[O] <= 0) //Try to use a record that actually has something to dump.
 			continue
 
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index 3bc2bec5ec4..08e88b9c8c9 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -39,7 +39,7 @@
 			src.area = locate(text2path("/area/[otherarea]"))
 
 		if(!name)
-			name = "light switch ([area.name])"
+			name = "light switch([area.name])"
 
 		src.on = src.area.lightswitch
 		updateicon()
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index f19e37f051a..d96f4124459 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -122,19 +122,19 @@ Class Procs:
 	return ..()
 
 /obj/machinery/proc/addAtProcessing()
-	if (use_power)
+	if(use_power)
 		myArea = get_area_master(src)
 
 	machines += src
 
 /obj/machinery/proc/removeAtProcessing()
-	if (myArea)
+	if(myArea)
 		myArea = null
 
 	machines -= src
 
 /obj/machinery/Destroy()
-	if (src in machines)
+	if(src in machines)
 		removeAtProcessing()
 
 	return ..()
@@ -158,11 +158,11 @@ Class Procs:
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				qdel(src)
 				return
 		else
@@ -232,7 +232,7 @@ Class Procs:
 
 		if("unlink" in href_list)
 			var/idx = text2num(href_list["unlink"])
-			if (!idx)
+			if(!idx)
 				return 1
 
 			var/obj/O = getLink(idx)
@@ -255,7 +255,7 @@ Class Procs:
 			if(!canLink(O,href_list))
 				to_chat(usr, "\red You can't link with that device.")
 				return 1
-			if (isLinkedWith(O))
+			if(isLinkedWith(O))
 				to_chat(usr, "\red A red light flashes on \the [P]. The two devices are already linked.")
 				return 1
 
@@ -324,14 +324,13 @@ Class Procs:
 
 ////////////////////////////////////////////////////////////////////////////////////////////
 
-/obj/machinery/attack_ai(var/mob/user as mob)
-	if(isrobot(user))
-		// For some reason attack_robot doesn't work
-		// This is to stop robots from using cameras to remotely control machines.
-		if(user.client && user.client.eye == user)
-			return src.attack_hand(user)
+/obj/machinery/attack_ai(mob/user)
+	if(isrobot(user))// For some reason attack_robot doesn't work
+		var/mob/living/silicon/robot/R = user
+		if(R.client && R.client.eye == R && !R.low_power_mode)// This is to stop robots from using cameras to remotely control machines; and from using machines when the borg has no power.
+			return attack_hand(user)
 	else
-		return src.attack_hand(user)
+		return attack_hand(user)
 
 /obj/machinery/attack_hand(mob/user as mob)
 	if(user.lying || user.stat)
@@ -341,7 +340,7 @@ Class Procs:
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return 1
 
-	if (ishuman(user))
+	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		if(H.getBrainLoss() >= 60)
 			visible_message("<span class='warning'>[H] stares cluelessly at [src] and drools.</span>")
@@ -423,7 +422,7 @@ Class Procs:
     O.show_message("[bicon(src)] <span class = 'notice'>[msg]</span>", 2)
 
 /obj/machinery/proc/ping(text=null)
-  if (!text)
+  if(!text)
     text = "\The [src] pings."
 
   state(text, "blue")
@@ -547,7 +546,7 @@ Class Procs:
 	var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 	s.set_up(5, 1, src)
 	s.start()
-	if (electrocute_mob(user, get_area(src), src, 0.7))
+	if(electrocute_mob(user, get_area(src), src, 0.7))
 		if(user.stunned)
 			return 1
 	return 0
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 0bd5fff9fba..7953f738a40 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -211,7 +211,7 @@
 	set name = "Rotate Frame"
 	set src in view(1)
 
-	if ( usr.stat || usr.restrained()  || (usr.status_flags & FAKEDEATH))
+	if( usr.stat || usr.restrained()  || (usr.status_flags & FAKEDEATH))
 		return
 
 	src.dir = turn(src.dir, -90)
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index 79579e1bb66..5b6cfb5e73d 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -86,9 +86,9 @@
 
 		updateicon()
 
-	else if (istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda))
+	else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda))
 		if(open)
-			if (src.allowed(user))
+			if(src.allowed(user))
 				src.locked = !src.locked
 				to_chat(user, "<span class='notice'>Controls are now [src.locked ? "locked" : "unlocked"].</span>")
 			else
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index d991e7c5235..30484aae207 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -98,6 +98,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 	var/c_locked=0;        //Will our new channel be locked to public submissions?
 	var/hitstaken = 0      //Death at 3 hits from an item with force>=15
 	var/datum/feed_channel/viewing_channel = null
+	var/silence = 0
 	light_range = 0
 	anchored = 1
 
@@ -199,8 +200,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 				dat+= {"<HR><BR><A href='?src=\ref[src];create_channel=1'>Create Feed Channel</A>
 				<BR><A href='?src=\ref[src];view=1'>View Feed Channels</A>
 				<BR><A href='?src=\ref[src];create_feed_story=1'>Submit new Feed story</A>
-				<BR><A href='?src=\ref[src];menu_paper=1'>Print newspaper</A>
-				<BR><A href='?src=\ref[src];refresh=1'>Re-scan User</A>
+				<BR><A href='?src=\ref[src];menu_paper=1'>Print newspaper</A>"}
+				if(!silence)
+					dat+= "<BR><A href='?src=\ref[src];silence_unit=1'>Silence unit</A>"
+				else
+					dat+= "<BR><A href='?src=\ref[src];unsilence_unit=1'>Unsilence unit</A>"
+				dat+= {"<BR><A href='?src=\ref[src];refresh=1'>Re-scan User</A>
 				<BR><BR><A href='?src=\ref[human_or_robot_user];mach_close=newscaster_main'>Exit</A>"}
 				if(src.securityCaster)
 					var/wanted_already = 0
@@ -441,11 +446,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 /obj/machinery/newscaster/Topic(href, href_list)
 	if(..())
 		return 1
-	
+
 	usr.set_machine(src)
 	if(href_list["set_channel_name"])
 		src.channel_name = sanitizeSQL(strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")))
-		while (findtext(src.channel_name," ") == 1)
+		while(findtext(src.channel_name," ") == 1)
 			src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1)
 		src.updateUsrDialog()
 		//src.update_icon()
@@ -497,7 +502,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 
 	else if(href_list["set_new_message"])
 		src.msg = strip_html(input(usr, "Write your feed story", "Network Channel Handler", ""))
-		while (findtext(src.msg," ") == 1)
+		while(findtext(src.msg," ") == 1)
 			src.msg = copytext(src.msg,2,lentext(src.msg)+1)
 		src.updateUsrDialog()
 
@@ -546,6 +551,14 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 			src.screen = 20
 		src.updateUsrDialog()
 
+	else if(href_list["silence_unit"])
+		silence=1
+		updateUsrDialog()
+
+	else if(href_list["unsilence_unit"])
+		silence=0
+		updateUsrDialog()
+
 	else if(href_list["menu_censor_story"])
 		src.screen=10
 		src.updateUsrDialog()
@@ -567,13 +580,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 
 	else if(href_list["set_wanted_name"])
 		src.channel_name = strip_html(input(usr, "Provide the name of the Wanted person", "Network Security Handler", ""))
-		while (findtext(src.channel_name," ") == 1)
+		while(findtext(src.channel_name," ") == 1)
 			src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1)
 		src.updateUsrDialog()
 
 	else if(href_list["set_wanted_desc"])
 		src.msg = strip_html(input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler", ""))
-		while (findtext(src.msg," ") == 1)
+		while(findtext(src.msg," ") == 1)
 			src.msg = copytext(src.msg,2,lentext(src.msg)+1)
 		src.updateUsrDialog()
 
@@ -685,7 +698,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 
 	else if(href_list["setScreen"]) //Brings us to the main menu and resets all fields~
 		src.screen = text2num(href_list["setScreen"])
-		if (src.screen == 0)
+		if(src.screen == 0)
 			src.scanned_user = "Unknown";
 			msg = "";
 			src.c_locked=0;
@@ -718,7 +731,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 			qdel(src)
 		return
 
-	if (isbroken)
+	if(isbroken)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1)
 		visible_message("<span class='danger'>[user.name] further abuses the shattered [src.name].</span>", null, 5 )
 	else
@@ -759,7 +772,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 		if(!camera)
 			return
 		var/datum/picture/selection = camera.selectpicture()
-		if (!selection)
+		if(!selection)
 			return
 
 		var/obj/item/weapon/photo/P = new/obj/item/weapon/photo()
@@ -869,7 +882,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 obj/item/weapon/newspaper/Topic(href, href_list)
 	var/mob/living/U = usr
 	..()
-	if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ))
+	if((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ))
 		U.set_machine(src)
 		if(href_list["next_page"])
 			if(curr_page==src.pages+1)
@@ -894,7 +907,7 @@ obj/item/weapon/newspaper/Topic(href, href_list)
 			src.curr_page--
 			playsound(src.loc, "pageturn", 50, 1)
 
-		if (istype(src.loc, /mob))
+		if(istype(src.loc, /mob))
 			src.attack_self(src.loc)
 
 
@@ -905,9 +918,9 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, pa
 		else
 			var/s = strip_html( input(user, "Write something", "Newspaper", "") )
 			s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN))
-			if (!s)
+			if(!s)
 				return
-			if (!in_range(src, usr) && src.loc != usr)
+			if(!in_range(src, usr) && src.loc != usr)
 				return
 			src.scribble_page = src.curr_page
 			src.scribble = s
@@ -958,6 +971,7 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, pa
 /obj/machinery/newscaster/proc/newsAlert(var/news_call)   //This isn't Agouri's work, for it is ugly and vile.
 	var/turf/T = get_turf(src)                      //Who the fuck uses spawn(600) anyway, jesus christ
 	if(news_call)
+
 		for(var/mob/O in hearers(world.view-1, T))
 			O.show_message("<span class='newscaster'><EM>[src.name]</EM> beeps, \"[news_call]\"</span>",2)
 		src.alert = 1
@@ -965,7 +979,8 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, pa
 		spawn(300)
 			src.alert = 0
 			src.update_icon()
-		playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1)
+		if(!silence)
+			playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1)
 	else
 		for(var/mob/O in hearers(world.view-1, T))
 			O.show_message("<span class='newscaster'><EM>[src.name]</EM> beeps, \"Attention! Wanted issue distributed!\"</span>",2)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index ad54eb2e8e9..afe79ca48e3 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -54,16 +54,16 @@
 
 /obj/item/pipe/New(loc, pipe_type, dir, obj/machinery/atmospherics/make_from)
 	..()
-	if (make_from)
+	if(make_from)
 		src.dir = make_from.dir
 		src.pipename = make_from.name
 		color = make_from.pipe_color
 		var/is_bent
-		if  (make_from.initialize_directions in list(NORTH|SOUTH, WEST|EAST))
+		if(make_from.initialize_directions in list(NORTH|SOUTH, WEST|EAST))
 			is_bent = 0
 		else
 			is_bent = 1
-		if     (istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction))
+		if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction))
 			src.pipe_type = PIPE_JUNCTION
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging))
 			src.pipe_type = PIPE_HE_STRAIGHT + is_bent
@@ -158,13 +158,13 @@
 	else
 		src.pipe_type = pipe_type
 		src.dir = dir
-		if (pipe_type == PIPE_SUPPLY_STRAIGHT || pipe_type == PIPE_SUPPLY_BENT || pipe_type == PIPE_SUPPLY_MANIFOLD || pipe_type == PIPE_SUPPLY_MANIFOLD4W || pipe_type == PIPE_SUPPLY_CAP)
+		if(pipe_type == PIPE_SUPPLY_STRAIGHT || pipe_type == PIPE_SUPPLY_BENT || pipe_type == PIPE_SUPPLY_MANIFOLD || pipe_type == PIPE_SUPPLY_MANIFOLD4W || pipe_type == PIPE_SUPPLY_CAP)
 			connect_types = list(2)
 			src.color = PIPE_COLOR_BLUE
-		else if (pipe_type == PIPE_SCRUBBERS_STRAIGHT || pipe_type == PIPE_SCRUBBERS_BENT || pipe_type == PIPE_SCRUBBERS_MANIFOLD || pipe_type == PIPE_SCRUBBERS_MANIFOLD4W || pipe_type == PIPE_SCRUBBERS_CAP)
+		else if(pipe_type == PIPE_SCRUBBERS_STRAIGHT || pipe_type == PIPE_SCRUBBERS_BENT || pipe_type == PIPE_SCRUBBERS_MANIFOLD || pipe_type == PIPE_SCRUBBERS_MANIFOLD4W || pipe_type == PIPE_SCRUBBERS_CAP)
 			connect_types = list(3)
 			src.color = PIPE_COLOR_RED
-		else if (pipe_type == PIPE_UNIVERSAL)
+		else if(pipe_type == PIPE_UNIVERSAL)
 			connect_types = list(1,2,3)
 
 	update(make_from)
@@ -278,7 +278,7 @@
 	set name = "Rotate Pipe"
 	set src in view(1)
 
-	if ( usr.stat || usr.restrained() )
+	if( usr.stat || usr.restrained() )
 		return
 
 	src.dir = turn(src.dir, -90)
@@ -292,10 +292,10 @@
 	set name = "Flip Pipe"
 	set src in view(1)
 
-	if (usr.stat || usr.restrained())
+	if(usr.stat || usr.restrained())
 		return
 
-	if (pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER, PIPE_TVALVE, PIPE_DTVALVE))
+	if(pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER, PIPE_TVALVE, PIPE_DTVALVE))
 		if(flipped)
 			icon_state = copytext(icon_state,3)
 		else
@@ -311,10 +311,10 @@
 
 /obj/item/pipe/Move()
 	..()
-	if (is_bent_pipe() \
+	if(is_bent_pipe() \
 		&& (src.dir in cardinal))
 		src.dir = src.dir|turn(src.dir, 90)
-	else if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
+	else if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
 		if(dir==2)
 			dir = 1
 		else if(dir==8)
@@ -324,7 +324,7 @@
 // returns all pipe's endpoints
 
 /obj/item/pipe/proc/get_pipe_dir()
-	if (!dir)
+	if(!dir)
 		return 0
 	
 	var/direct = dir
@@ -374,7 +374,7 @@
 //	var/cw = turn(dir, -90)
 //	var/acw = turn(dir, 90)
 
-	if (!(pipe_type in list(PIPE_HE_STRAIGHT, PIPE_HE_BENT, PIPE_JUNCTION)))
+	if(!(pipe_type in list(PIPE_HE_STRAIGHT, PIPE_HE_BENT, PIPE_JUNCTION)))
 		return get_pipe_dir()
 	switch(pipe_type)
 		if(PIPE_HE_STRAIGHT,PIPE_HE_BENT)
@@ -408,12 +408,12 @@
 
 //Helper to clean up dir
 /obj/item/pipe/proc/fixdir()
-	if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
+	if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
 		if(dir==2)
 			dir = 1
 		else if(dir==8)
 			dir = 4
-	else if (pipe_type in list(PIPE_MANIFOLD4W, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W, PIPE_OMNI_MIXER, PIPE_OMNI_FILTER))
+	else if(pipe_type in list(PIPE_MANIFOLD4W, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W, PIPE_OMNI_MIXER, PIPE_OMNI_FILTER))
 		dir = 2
 
 /obj/item/pipe/attack_self(mob/user as mob)
@@ -422,10 +422,10 @@
 /obj/item/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	..()
 
-	if (!istype(W, /obj/item/weapon/wrench))
+	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
 		
-	if (!isturf(src.loc))
+	if(!isturf(src.loc))
 		return 1
 
 	fixdir()
@@ -461,7 +461,7 @@
 
 		if(PIPE_CONNECTOR)		// connector
 			var/obj/machinery/atmospherics/unary/portables_connector/C = new( src.loc )
-			if (pipename)
+			if(pipename)
 				C.name = pipename
 			C.construction(dir, pipe_dir, color)
 
@@ -500,13 +500,13 @@
 
 		if(PIPE_MVALVE)		//manual valve
 			var/obj/machinery/atmospherics/binary/valve/V = new( src.loc)
-			if (pipename)
+			if(pipename)
 				V.name = pipename
 			V.construction(dir, get_pdir(), color)
 			
 		if(PIPE_DVALVE)
 			var/obj/machinery/atmospherics/binary/valve/digital/V = new( src.loc )
-			if (pipename)
+			if(pipename)
 				V.name = pipename
 			V.construction(dir, get_pdir(), color)
 			
@@ -526,13 +526,13 @@
 				if(PIPE_DTVALVE)
 					P = new /obj/machinery/atmospherics/trinary/tvalve/digital(src.loc)
 			P.flipped = flipped
-			if (pipename)
+			if(pipename)
 				P.name = pipename
 			P.construction(unflip(dir), pipe_dir, color)
 
 		if(PIPE_SCRUBBER)		//scrubber
 			var/obj/machinery/atmospherics/unary/vent_scrubber/S = new(src.loc)
-			if (pipename)
+			if(pipename)
 				S.name = pipename
 			S.construction(dir, pipe_dir, color)
 
@@ -554,37 +554,37 @@
 
 		if(PIPE_PASSIVE_GATE)		//passive gate
 			var/obj/machinery/atmospherics/binary/passive_gate/P = new(src.loc)
-			if (pipename)
+			if(pipename)
 				P.name = pipename
 			P.construction(dir, pipe_dir, color)
 
 		if(PIPE_VOLUME_PUMP)		//volume pump
 			var/obj/machinery/atmospherics/binary/volume_pump/P = new(src.loc)
-			if (pipename)
+			if(pipename)
 				P.name = pipename
 			P.construction(dir, pipe_dir, color)
 
 		if(PIPE_HEAT_EXCHANGE)		// heat exchanger
 			var/obj/machinery/atmospherics/unary/heat_exchanger/C = new( src.loc )
-			if (pipename)
+			if(pipename)
 				C.name = pipename
 			C.construction(dir, pipe_dir, color)
 
 		if(PIPE_INJECTOR)		// air injector
 			var/obj/machinery/atmospherics/unary/outlet_injector/P = new( src.loc )
-			if (pipename)
+			if(pipename)
 				P.name = pipename
 			P.construction(dir, pipe_dir, color)
 			
 		if(PIPE_DP_VENT)
 			var/obj/machinery/atmospherics/binary/dp_vent_pump/P = new(src.loc)
-			if (pipename)
+			if(pipename)
 				P.name = pipename
 			P.construction(dir, pipe_dir, color)
 			
 		if(PIPE_PASV_VENT)
 			var/obj/machinery/atmospherics/unary/passive_vent/P  = new(src.loc)
-			if (pipename)
+			if(pipename)
 				P.name = pipename
 			P.construction(dir, pipe_dir, color)
 
@@ -616,7 +616,7 @@
 /obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	..()
 
-	if (!istype(W, /obj/item/weapon/wrench))
+	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if(!locate(/obj/machinery/atmospherics/pipe, src.loc))
 		to_chat(user, "\red You need to fasten it to a pipe")
@@ -636,7 +636,7 @@
 
 /obj/item/pipe_gsensor/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
 	..()
-	if (!istype(W, /obj/item/weapon/wrench))
+	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	new/obj/machinery/air_sensor( src.loc )
 	playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 9214178e9e4..c8f83aea104 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -99,16 +99,16 @@
 
 /obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
 	src.add_fingerprint(usr)
-	if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter) || istype(W, /obj/item/pipe_gsensor))
+	if(istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter) || istype(W, /obj/item/pipe_gsensor))
 		to_chat(usr, "\blue You put [W] back to [src].")
 		user.drop_item()
 		qdel(W)
 		return
-	else if (istype(W, /obj/item/weapon/wrench))
-		if (unwrenched==0)
+	else if(istype(W, /obj/item/weapon/wrench))
+		if(unwrenched==0)
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 			to_chat(user, "\blue You begin to unfasten \the [src] from the floor...")
-			if (do_after(user, 40, target = src))
+			if(do_after(user, 40, target = src))
 				user.visible_message( \
 					"[user] unfastens \the [src].", \
 					"\blue You have unfastened \the [src]. Now it can be pulled somewhere else.", \
@@ -116,12 +116,12 @@
 				src.anchored = 0
 				src.stat |= MAINT
 				src.unwrenched = 1
-				if (usr.machine==src)
+				if(usr.machine==src)
 					usr << browse(null, "window=pipedispenser")
-		else /*if (unwrenched==1)*/
+		else /*if(unwrenched==1)*/
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 			to_chat(user, "\blue You begin to fasten \the [src] to the floor...")
-			if (do_after(user, 20, target = src))
+			if(do_after(user, 20, target = src))
 				user.visible_message( \
 					"[user] fastens \the [src].", \
 					"\blue You have fastened \the [src]. Now it can dispense pipes.", \
@@ -155,10 +155,10 @@ Nah
 	if(!usr.canmove || usr.stat || usr.restrained())
 		return
 
-	if (!istype(pipe) || get_dist(usr, src) > 1 || get_dist(src,pipe) > 1 )
+	if(!istype(pipe) || get_dist(usr, src) > 1 || get_dist(src,pipe) > 1 )
 		return
 
-	if (pipe.anchored)
+	if(pipe.anchored)
 		return
 
 	qdel(pipe)
diff --git a/code/game/machinery/podmen.dm b/code/game/machinery/podmen.dm
index 54585c0eb26..c0ca39c3e12 100644
--- a/code/game/machinery/podmen.dm
+++ b/code/game/machinery/podmen.dm
@@ -57,7 +57,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
 			to_chat(user, "Nothing happens.")
 			return
 
-		if (!istype(source))
+		if(!istype(source))
 			return
 
 		if(source.ckey)
@@ -108,17 +108,17 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
 		callHook("harvest_podman", list(podman))
 
 		switch(ticker.mode.name)
-			if ("revolution")
-				if (podman.mind in ticker.mode:revolutionaries)
+			if("revolution")
+				if(podman.mind in ticker.mode:revolutionaries)
 					ticker.mode:add_revolutionary(podman.mind)
 					ticker.mode:update_all_rev_icons() //So the icon actually appears
-				if (podman.mind in ticker.mode:head_revolutionaries)
+				if(podman.mind in ticker.mode:head_revolutionaries)
 					ticker.mode:update_all_rev_icons()
-			if ("nuclear emergency")
-				if (podman.mind in ticker.mode:syndicates)
+			if("nuclear emergency")
+				if(podman.mind in ticker.mode:syndicates)
 					ticker.mode:update_all_synd_icons()
-			if ("cult")
-				if (podman.mind in ticker.mode:cult)
+			if("cult")
+				if(podman.mind in ticker.mode:cult)
 					ticker.mode:add_cultist(podman.mind)
 					ticker.mode:update_all_cult_icons() //So the icon actually appears
 			// -- End mode specific stuff
diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm
index 963dc0c803a..deafad7f9b7 100644
--- a/code/game/machinery/portable_tag_turret.dm
+++ b/code/game/machinery/portable_tag_turret.dm
@@ -50,7 +50,7 @@
 	data["is_lethal"] = 0
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "turret_control.tmpl", "Turret Controls", 500, 300)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index fb1ef8c8740..83f2dfef93f 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -215,7 +215,7 @@ var/list/turret_icons
 	data["one_access"] = one_access
 	var/accesses[0]
 	var/list/access_list = get_all_accesses()
-	for (var/access in access_list)
+	for(var/access in access_list)
 		var/name = get_access_desc(access)
 		var/active
 		if(one_access)
@@ -226,7 +226,7 @@ var/list/turret_icons
 	data["accesses"] = accesses
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "turret_control.tmpl", "Turret Controls", 500, 320)
 		ui.set_initial_data(data)
 		ui.open()
@@ -437,7 +437,7 @@ var/list/turret_icons
 			return
 
 	health -= force
-	if (force > 5 && prob(45))
+	if(force > 5 && prob(45))
 		spark_system.start()
 	if(health <= 0)
 		die()	//the death process :(
@@ -479,15 +479,15 @@ var/list/turret_icons
 	..()
 
 /obj/machinery/porta_turret/ex_act(severity)
-	switch (severity)
-		if (1)
+	switch(severity)
+		if(1)
 			qdel(src)
-		if (2)
-			if (prob(25))
+		if(2)
+			if(prob(25))
 				qdel(src)
 			else
 				take_damage(initial(health) * 8) //should instakill most turrets
-		if (3)
+		if(3)
 			take_damage(initial(health) * 8 / 3)
 
 /obj/machinery/porta_turret/proc/die()	//called when the turret dies, ie, health <= 0
diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm
index f061f9906e6..a095d1cc93c 100644
--- a/code/game/machinery/programmable_unloader.dm
+++ b/code/game/machinery/programmable_unloader.dm
@@ -197,10 +197,10 @@
 
 /obj/machinery/programmable/attackby(obj/item/I as obj, mob/user as mob, params)
 	if(istype(I,/obj/item/weapon/wrench)) // code borrowed from pipe dispenser
-		if (unwrenched==0)
+		if(unwrenched==0)
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 			to_chat(user, "\blue You begin to unfasten \the [src] from the floor...")
-			if (do_after(user, 40, target = src))
+			if(do_after(user, 40, target = src))
 				user.visible_message( \
 					"[user] unfastens \the [src].", \
 					"\blue You have unfastened \the [src]. Now it can be pulled somewhere else.", \
@@ -208,12 +208,12 @@
 				src.anchored = 0
 				src.stat |= MAINT
 				src.unwrenched = 1
-				if (usr.machine==src)
+				if(usr.machine==src)
 					usr << browse(null, "window=pipedispenser")
 		else /* unwrenched */
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 			to_chat(user, "\blue You begin to fasten \the [src] to the floor...")
-			if (do_after(user, 20, target = src))
+			if(do_after(user, 20, target = src))
 				user.visible_message( \
 					"[user] fastens \the [src].", \
 					"\blue You fastened \the [src] into place.", \
@@ -283,7 +283,7 @@
 	return
 
 /obj/machinery/programmable/process()
-	if (!output || !input)
+	if(!output || !input)
 		return
 
 	if(!on || stat || sleep)
@@ -330,7 +330,7 @@
 	if(sleep)
 		return // something stopped the machine
 
-	for (var/obj/A in input.contents)// I fully expect this to cause unreasonable lag
+	for(var/obj/A in input.contents)// I fully expect this to cause unreasonable lag
 		if(!A)
 			break
 		if(work > workmax)
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index be126aec5ff..6db7199a7f0 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -34,7 +34,7 @@
 			to_chat(user, "\red The [name] blinks red as you try to insert the item!")
 			return
 
-		if (istype(G, /obj/item/weapon/gun/energy))
+		if(istype(G, /obj/item/weapon/gun/energy))
 			var/obj/item/weapon/gun/energy/E = G
 			if(!E.can_charge)
 				to_chat(user, "<span class='notice'>Your gun has no external power connector.</span>")
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index a1559c4fb3a..aa16f852f11 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -71,14 +71,14 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(src.loc)
 					A.ex_act(severity)
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(src.loc)
 					A.ex_act(severity)
@@ -131,7 +131,7 @@
 		icon_state = "borgcharger0"
 
 /obj/machinery/recharge_station/attackby(obj/item/P as obj, mob/user as mob, params)
-	if (istype(P, /obj/item/weapon/screwdriver))
+	if(istype(P, /obj/item/weapon/screwdriver))
 		if(src.occupant)
 			to_chat(user, "<span class='notice'>The maintenance panel is locked.</span>")
 			return
@@ -145,7 +145,7 @@
 
 /obj/machinery/recharge_station/proc/process_occupant()
 	if(src.occupant)
-		if (istype(occupant, /mob/living/silicon/robot))
+		if(istype(occupant, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/R = occupant
 			restock_modules()
 			if(repairs)
@@ -170,7 +170,7 @@
 		return
 	//for(var/obj/O in src)
 	//	O.loc = src.loc
-	if (src.occupant.client)
+	if(src.occupant.client)
 		src.occupant.client.eye = src.occupant.client.mob
 		src.occupant.client.perspective = MOB_PERSPECTIVE
 	src.occupant.loc = src.loc
@@ -227,6 +227,9 @@
 						var/i = 1
 						for(1, i <= coeff, i++)
 							LR.Charge(occupant)
+					if(istype(O,/obj/item/weapon/mop/advanced))
+						if(O.reagents.get_reagent_amount("water") < 40)
+							O.reagents.add_reagent("water", 0.5 * coeff)
 				if(R)
 					if(R.module)
 						R.module.respawn_consumable(R)
@@ -246,7 +249,7 @@
 /obj/machinery/recharge_station/verb/move_eject()
 	set category = "Object"
 	set src in oview(1)
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
 	src.go_out()
 	add_fingerprint(usr)
@@ -258,14 +261,14 @@
 	if(!user || !usr)
 		return
 
-	if (usr.stat != CONSCIOUS)
+	if(usr.stat != CONSCIOUS)
 		return
 
 	if(get_dist(src, user) > 2 || get_dist(usr, user) > 1)
 		to_chat(usr, "They are too far away to put inside")
 		return
 
-	if (panel_open)
+	if(panel_open)
 		to_chat(usr, "<span class='warning'>Close the maintenance panel first.</span>")
 		return
 
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 2db551b67fa..c7ddfc84c38 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -194,7 +194,7 @@ var/const/SAFETY_COOLDOWN = 100
 
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	if (src.anchored)
+	if(src.anchored)
 		to_chat(usr, "[src] is fastened to the floor!")
 		return 0
 	eat_dir = turn(eat_dir, 270)
@@ -210,7 +210,7 @@ var/const/SAFETY_COOLDOWN = 100
 
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	if (src.anchored)
+	if(src.anchored)
 		to_chat(usr, "[src] is fastened to the floor!")
 		return 0
 	eat_dir = turn(eat_dir, 90)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 11079d06606..9b2515e8914 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -72,11 +72,11 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 
 	name = "[department] Requests Console"
 	allConsoles += src
-	if (departmentType & RC_ASSIST)
+	if(departmentType & RC_ASSIST)
 		req_console_assistance |= department
-	if (departmentType & RC_SUPPLY)
+	if(departmentType & RC_SUPPLY)
 		req_console_supplies |= department
-	if (departmentType & RC_INFO)
+	if(departmentType & RC_INFO)
 		req_console_information |= department
 
 	set_light(1)
@@ -84,16 +84,16 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 /obj/machinery/requests_console/Destroy()
 	allConsoles -= src
 	var/lastDeptRC = 1
-	for (var/obj/machinery/requests_console/Console in allConsoles)
-		if (Console.department == department)
+	for(var/obj/machinery/requests_console/Console in allConsoles)
+		if(Console.department == department)
 			lastDeptRC = 0
 			break
 	if(lastDeptRC)
-		if (departmentType & RC_ASSIST)
+		if(departmentType & RC_ASSIST)
 			req_console_assistance -= department
-		if (departmentType & RC_SUPPLY)
+		if(departmentType & RC_SUPPLY)
 			req_console_supplies -= department
-		if (departmentType & RC_INFO)
+		if(departmentType & RC_INFO)
 			req_console_information -= department
 	return ..()
 
@@ -130,7 +130,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 	data["announceAuth"] = announceAuth
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "request_console.tmpl", "[department] Request Console", 520, 410)
 		ui.set_initial_data(data)
 		ui.open()
@@ -172,7 +172,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		var/log_msg = message
 		var/pass = 0
 		screen = RCS_SENTFAIL
-		for (var/obj/machinery/message_server/MS in world)
+		for(var/obj/machinery/message_server/MS in world)
 			if(!MS.active) continue
 			MS.send_rc_message(ckey(href_list["department"]),department,log_msg,msgStamped,msgVerified,priority)
 			pass = 1
@@ -188,8 +188,8 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		if(tempScreen == RCS_ANNOUNCE && !announcementConsole)
 			return
 		if(tempScreen == RCS_VIEWMSGS)
-			for (var/obj/machinery/requests_console/Console in allConsoles)
-				if (Console.department == department)
+			for(var/obj/machinery/requests_console/Console in allConsoles)
+				if(Console.department == department)
 					Console.newmessagepriority = 0
 					Console.icon_state = "req_comp0"
 					Console.set_light(1)
@@ -207,7 +207,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 					//err... hacking code, which has no reason for existing... but anyway... it was once supposed to unlock priority 3 messanging on that console (EXTREME priority...), but the code for that was removed.
 /obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob)
 	/*
-	if (istype(O, /obj/item/weapon/crowbar))
+	if(istype(O, /obj/item/weapon/crowbar))
 		if(open)
 			open = 0
 			icon_state="req_comp0"
@@ -217,7 +217,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 				icon_state="req_comp_open"
 			else if(hackState == 1)
 				icon_state="req_comp_rewired"
-	if (istype(O, /obj/item/weapon/screwdriver))
+	if(istype(O, /obj/item/weapon/screwdriver))
 		if(open)
 			if(hackState == 0)
 				hackState = 1
@@ -228,7 +228,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		else
 			to_chat(user, "You can't do much with that.")*/
 
-	if (istype(O, /obj/item/weapon/card/id))
+	if(istype(O, /obj/item/weapon/card/id))
 		if(inoperable(MAINT)) return
 		if(screen == RCS_MESSAUTH)
 			var/obj/item/weapon/card/id/T = O
@@ -236,14 +236,14 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 			updateUsrDialog()
 		if(screen == RCS_ANNOUNCE)
 			var/obj/item/weapon/card/id/ID = O
-			if (access_RC_announce in ID.GetAccess())
+			if(access_RC_announce in ID.GetAccess())
 				announceAuth = 1
 				announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name
 			else
 				reset_message()
 				to_chat(user, "<span class='warning'>You are not authorized to send announcements.</span>")
 			updateUsrDialog()
-	if (istype(O, /obj/item/weapon/stamp))
+	if(istype(O, /obj/item/weapon/stamp))
 		if(inoperable(MAINT)) return
 		if(screen == RCS_MESSAUTH)
 			var/obj/item/weapon/stamp/T = O
diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm
index 44455884bd8..78b873e6ca1 100644
--- a/code/game/machinery/robot_fabricator.dm
+++ b/code/game/machinery/robot_fabricator.dm
@@ -12,8 +12,8 @@
 	active_power_usage = 5000
 
 /obj/machinery/robotic_fabricator/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (istype(O, /obj/item/stack/sheet/metal))
-		if (src.metal_amount < 150000.0)
+	if(istype(O, /obj/item/stack/sheet/metal))
+		if(src.metal_amount < 150000.0)
 			var/count = 0
 			src.overlays += "fab-load-metal"
 			spawn(15)
@@ -25,7 +25,7 @@
 						O:amount--
 						count++
 
-					if (O:amount < 1)
+					if(O:amount < 1)
 						qdel(O)
 
 					to_chat(user, "You insert [count] metal sheet\s into the fabricator.")
@@ -35,17 +35,17 @@
 			to_chat(user, "The robot part maker is full. Please remove metal from the robot part maker in order to insert more.")
 
 /obj/machinery/robotic_fabricator/power_change()
-	if (powered())
+	if(powered())
 		stat &= ~NOPOWER
 	else
 		stat |= NOPOWER
 
 /obj/machinery/robotic_fabricator/attack_hand(user as mob)
 	var/dat
-	if (..())
+	if(..())
 		return
 
-	if (src.operating)
+	if(src.operating)
 		dat = {"
 <TT>Building [src.being_built.name].<BR>
 Please wait until completion...</TT><BR>
@@ -69,59 +69,59 @@ Please wait until completion...</TT><BR>
 	return
 
 /obj/machinery/robotic_fabricator/Topic(href, href_list)
-	if (..())
+	if(..())
 		return
 
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 
-	if (href_list["make"])
-		if (!src.operating)
+	if(href_list["make"])
+		if(!src.operating)
 			var/part_type = text2num(href_list["make"])
 
 			var/build_type = ""
 			var/build_time = 200
 			var/build_cost = 25000
 
-			switch (part_type)
-				if (1)
+			switch(part_type)
+				if(1)
 					build_type = "/obj/item/robot_parts/l_arm"
 					build_time = 200
 					build_cost = 10000
 
-				if (2)
+				if(2)
 					build_type = "/obj/item/robot_parts/r_arm"
 					build_time = 200
 					build_cost = 10000
 
-				if (3)
+				if(3)
 					build_type = "/obj/item/robot_parts/l_leg"
 					build_time = 200
 					build_cost = 10000
 
-				if (4)
+				if(4)
 					build_type = "/obj/item/robot_parts/r_leg"
 					build_time = 200
 					build_cost = 10000
 
-				if (5)
+				if(5)
 					build_type = "/obj/item/robot_parts/chest"
 					build_time = 350
 					build_cost = 40000
 
-				if (6)
+				if(6)
 					build_type = "/obj/item/robot_parts/head"
 					build_time = 350
 					build_cost = 5000
 
-				if (7)
+				if(7)
 					build_type = "/obj/item/robot_parts/robot_suit"
 					build_time = 600
 					build_cost = 15000
 
 			var/building = text2path(build_type)
-			if (!isnull(building))
-				if (src.metal_amount >= build_cost)
+			if(!isnull(building))
+				if(src.metal_amount >= build_cost)
 					src.operating = 1
 					src.use_power = 2
 
@@ -133,7 +133,7 @@ Please wait until completion...</TT><BR>
 					src.updateUsrDialog()
 
 					spawn (build_time)
-						if (!isnull(src.being_built))
+						if(!isnull(src.being_built))
 							src.being_built.loc = get_turf(src)
 							src.being_built = null
 						src.use_power = 1
@@ -141,6 +141,6 @@ Please wait until completion...</TT><BR>
 						src.overlays -= "fab-active"
 		return
 
-	for (var/mob/M in viewers(1, src))
-		if (M.client && M.machine == src)
+	for(var/mob/M in viewers(1, src))
+		if(M.client && M.machine == src)
 			src.attack_hand(M)
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index f402551c842..2ba38e93c2e 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -45,7 +45,7 @@
 	playsound(src.loc, 'sound/effects/EMPulse.ogg', 75, 1)
 
 
-	if (src.health <= 0)
+	if(src.health <= 0)
 		visible_message("\blue The [src] dissipates")
 		qdel(src)
 		return
@@ -68,13 +68,13 @@
 /obj/machinery/shield/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			if (prob(75))
+			if(prob(75))
 				qdel(src)
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				qdel(src)
 	return
 
@@ -105,7 +105,7 @@
 	playsound(src.loc, 'sound/effects/EMPulse.ogg', 100, 1)
 
 	//Handle the destruction of the shield
-	if (src.health <= 0)
+	if(src.health <= 0)
 		visible_message("\blue The [src] dissipates")
 		qdel(src)
 		return
@@ -151,8 +151,8 @@
 	update_icon()
 
 	for(var/turf/target_tile in range(2, src))
-		if (istype(target_tile,/turf/space) && !(locate(/obj/machinery/shield) in target_tile))
-			if (malfunction && prob(33) || !malfunction)
+		if(istype(target_tile,/turf/space) && !(locate(/obj/machinery/shield) in target_tile))
+			if(malfunction && prob(33) || !malfunction)
 				deployed_shields += new /obj/machinery/shield(target_tile)
 
 /obj/machinery/shieldgen/proc/shields_down()
@@ -186,7 +186,7 @@
 			src.checkhp()
 		if(2.0)
 			src.health -= 30
-			if (prob(15))
+			if(prob(15))
 				src.malfunction = 1
 			src.checkhp()
 		if(3.0)
@@ -214,7 +214,7 @@
 		to_chat(user, "The panel must be closed before operating this machine.")
 		return
 
-	if (src.active)
+	if(src.active)
 		user.visible_message("\blue [bicon(src)] [user] deactivated the shield generator.", \
 			"\blue [bicon(src)] You deactivate the shield generator.", \
 			"You hear heavy droning fade out.")
@@ -470,7 +470,7 @@
 			return
 
 	if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if (src.allowed(user))
+		if(src.allowed(user))
 			src.locked = !src.locked
 			to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
 		else
@@ -602,7 +602,7 @@
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return prob(20)
 	else
-		if (istype(mover, /obj/item/projectile))
+		if(istype(mover, /obj/item/projectile))
 			return prob(10)
 		else
 			return !src.density
\ No newline at end of file
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index 8a4ef1bc330..9705ef9dedd 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -31,7 +31,7 @@
 	data["resultlvl"] = resultlvl
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "slotmachine.tmpl", name, 350, 200)
 		ui.set_initial_data(data)
 		ui.open()
@@ -43,9 +43,9 @@
 	if(href_list["ops"])
 		var/operation = text2num(href_list["ops"])
 		if(operation == 1) // Play
-			if (working == 1)
+			if(working == 1)
 				return
-			if (!account || account.money < 10)
+			if(!account || account.money < 10)
 				return
 			if(!account.charge(10, transaction_purpose = "Bet", dest_name = name))
 				return
@@ -55,39 +55,39 @@
 			var/roll = rand(1,1350)
 			playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
 			spawn(25)
-				if (roll == 1)
+				if(roll == 1)
 					visible_message("<b>[src]</b> says, 'JACKPOT! [usr.name] has won a MILLION CREDITS!'")
 					command_announcement.Announce("Congratulations to [usr.name] on winning the Jackpot of ONE MILLION CREDITS!", "Jackpot Winner")
 					result = "JACKPOT! You win one million credits!"
 					resultlvl = "highlight"
 					win_money(1000000, 'sound/goonstation/misc/airraid_loop.ogg')
-				else if (roll > 1 && roll <= 5)
+				else if(roll > 1 && roll <= 5)
 					visible_message("<b>[src]</b> says, 'Big Winner! [usr.name] has won a hundred thousand credits!'")
 					command_announcement.Announce("Congratulations to [usr.name] on winning a hundred thousand credits!", "Big Winner")
 					result = "Big Winner! You win a hundred thousand credits!"
 					resultlvl = "good"
 					win_money(100000, 'sound/goonstation/misc/klaxon.ogg')
-				else if (roll > 5 && roll <= 25)
+				else if(roll > 5 && roll <= 25)
 					visible_message("<b>[src]</b> says, 'Big Winner! [usr.name] has won ten thousand credits!'")
 					result = "You win ten thousand credits!"
 					resultlvl = "good"
 					win_money(10000, 'sound/goonstation/misc/klaxon.ogg')
-				else if (roll > 25 && roll <= 50)
+				else if(roll > 25 && roll <= 50)
 					visible_message("<b>[src]</b> says, 'Winner! [usr.name] has won a thousand credits!'")
 					result = "You win a thousand credits!"
 					resultlvl = "good"
 					win_money(1000, 'sound/goonstation/misc/bell.ogg')
-				else if (roll > 50 && roll <= 100)
+				else if(roll > 50 && roll <= 100)
 					visible_message("<b>[src]</b> says, 'Winner! [usr.name] has won a hundred credits!'")
 					result = "You win a hundred credits!"
 					resultlvl = "good"
 					win_money(100, 'sound/goonstation/misc/bell.ogg')
-				else if (roll > 100 && roll <= 200)
+				else if(roll > 100 && roll <= 200)
 					visible_message("<b>[src]</b> says, 'Winner! [usr.name] has won fifty credits!'")
 					result = "You win fifty credits!"
 					resultlvl = "good"
 					win_money(50)
-				else if (roll > 200 && roll <= 500)
+				else if(roll > 200 && roll <= 500)
 					visible_message("<b>[src]</b> says, 'Winner! [usr.name] has won ten credits!'")
 					result = "You win ten credits!"
 					resultlvl = "good"
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 6ba798cebee..ce5ca3ce85d 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -107,9 +107,9 @@
 
 
 /obj/machinery/space_heater/Topic(href, href_list)
-	if (..())
+	if(..())
 		return 1
-	if ((in_range(src, usr) && istype(src.loc, /turf)) || (istype(usr, /mob/living/silicon)))
+	if((in_range(src, usr) && istype(src.loc, /turf)) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 
 		switch(href_list["op"])
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 9cb2c7db4d6..f1693cca2ad 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -190,45 +190,45 @@
 /obj/machinery/suit_storage_unit/Topic(href, href_list) //I fucking HATE this proc
 	if(..())
 		return 1
-	if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
+	if((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
 		usr.set_machine(src)
-		if (href_list["toggleUV"])
+		if(href_list["toggleUV"])
 			src.toggleUV(usr)
 			src.updateUsrDialog()
 			src.update_icon()
-		if (href_list["togglesafeties"])
+		if(href_list["togglesafeties"])
 			src.togglesafeties(usr)
 			src.updateUsrDialog()
 			src.update_icon()
-		if (href_list["dispense_helmet"])
+		if(href_list["dispense_helmet"])
 			src.dispense_helmet(usr)
 			src.updateUsrDialog()
 			src.update_icon()
-		if (href_list["dispense_suit"])
+		if(href_list["dispense_suit"])
 			src.dispense_suit(usr)
 			src.updateUsrDialog()
 			src.update_icon()
-		if (href_list["dispense_mask"])
+		if(href_list["dispense_mask"])
 			src.dispense_mask(usr)
 			src.updateUsrDialog()
 			src.update_icon()
-		if (href_list["toggle_open"])
+		if(href_list["toggle_open"])
 			src.toggle_open(usr)
 			src.updateUsrDialog()
 			src.update_icon()
-		if (href_list["toggle_lock"])
+		if(href_list["toggle_lock"])
 			src.toggle_lock(usr)
 			src.updateUsrDialog()
 			src.update_icon()
-		if (href_list["start_UV"])
+		if(href_list["start_UV"])
 			src.start_UV(usr)
 			src.updateUsrDialog()
 			src.update_icon()
-		if (href_list["eject_guy"])
+		if(href_list["eject_guy"])
 			src.eject_occupant(usr)
 			src.updateUsrDialog()
 			src.update_icon()
-	/*if (href_list["refresh"])
+	/*if(href_list["refresh"])
 		src.updateUsrDialog()*/
 	src.add_fingerprint(usr)
 	return
@@ -430,15 +430,15 @@
 
 
 /obj/machinery/suit_storage_unit/proc/eject_occupant(mob/user as mob)
-	if (src.islocked)
+	if(src.islocked)
 		return
 
-	if (!src.OCCUPANT)
+	if(!src.OCCUPANT)
 		return
 //	for(var/obj/O in src)
 //		O.loc = src.loc
 
-	if (src.OCCUPANT.client)
+	if(src.OCCUPANT.client)
 		if(user != OCCUPANT)
 			to_chat(OCCUPANT, "<font color='blue'>The machine kicks you out!</font>")
 		if(user.loc != src.loc)
@@ -459,7 +459,7 @@
 	set category = "Object"
 	set src in oview(1)
 
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
 	src.eject_occupant(usr)
 	add_fingerprint(usr)
@@ -473,15 +473,15 @@
 	set category = "Object"
 	set src in oview(1)
 
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
-	if (!src.isopen)
+	if(!src.isopen)
 		to_chat(usr, "<font color='red'>The unit's doors are shut.</font>")
 		return
-	if (!src.ispowered || src.isbroken)
+	if(!src.ispowered || src.isbroken)
 		to_chat(usr, "<font color='red'>The unit is not operational.</font>")
 		return
-	if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) )
+	if( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) )
 		to_chat(usr, "<font color='red'>It's too cluttered inside for you to fit in!</font>")
 		return
 	visible_message("[usr] starts squeezing into the suit storage unit!")
@@ -515,24 +515,24 @@
 		to_chat(user, text("<font color='blue'>You [] the unit's maintenance panel.</font>",(src.panelopen ? "open up" : "close") ))
 		src.updateUsrDialog()
 		return
-	if ( istype(I, /obj/item/weapon/grab) )
+	if( istype(I, /obj/item/weapon/grab) )
 		var/obj/item/weapon/grab/G = I
 		if( !(ismob(G.affecting)) )
 			return
-		if (!src.isopen)
+		if(!src.isopen)
 			to_chat(usr, "<font color='red'>The unit's doors are shut.</font>")
 			return
-		if (!src.ispowered || src.isbroken)
+		if(!src.ispowered || src.isbroken)
 			to_chat(usr, "<font color='red'>The unit is not operational.</font>")
 			return
-		if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty
+		if( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty
 			to_chat(user, "<font color='red'>The unit's storage area is too cluttered.</font>")
 			return
 		visible_message("[user] starts putting [G.affecting.name] into the Suit Storage Unit.")
 		if(do_after(user, 20, target = G:affecting))
 			if(!G || !G.affecting) return //derpcheck
 			var/mob/M = G.affecting
-			if (M.client)
+			if(M.client)
 				M.client.perspective = EYE_PERSPECTIVE
 				M.client.eye = src
 			M.loc = src
@@ -690,7 +690,7 @@
 		if(do_after(user, 20, target = G:affecting))
 			if(!G || !G.affecting) return
 			var/mob/M = G.affecting
-			if (M.client)
+			if(M.client)
 				M.client.perspective = EYE_PERSPECTIVE
 				M.client.eye = src
 			M.loc = src
@@ -909,22 +909,22 @@
 			if(radiation_level > 1)
 				suit.clean_blood()
 
-/*	else if ((href_list["cutwire"]) && (src.panel_open))
+/*	else if((href_list["cutwire"]) && (src.panel_open))
 		var/twire = text2num(href_list["cutwire"])
-		if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) ))
+		if(!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) ))
 			to_chat(usr, "You need wirecutters!")
 			return
-		if (src.isWireColorCut(twire))
+		if(src.isWireColorCut(twire))
 			src.mend(twire)
 		else
 			src.cut(twire)
 
-	else if ((href_list["pulsewire"]) && (src.panel_open))
+	else if((href_list["pulsewire"]) && (src.panel_open))
 		var/twire = text2num(href_list["pulsewire"])
-		if (!istype(usr.get_active_hand(), /obj/item/device/multitool))
+		if(!istype(usr.get_active_hand(), /obj/item/device/multitool))
 			to_chat(usr, "You need a multitool!")
 			return
-		if (src.isWireColorCut(twire))
+		if(src.isWireColorCut(twire))
 			to_chat(usr, "You can't pulse a cut wire.")
 			return
 		else
@@ -983,7 +983,7 @@
 	set category = "Object"
 	set src in oview(1)
 
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
 
 	eject_occupant(usr)
@@ -994,10 +994,10 @@
 		to_chat(user, "\red The cycler is locked.")
 		return
 
-	if (!occupant)
+	if(!occupant)
 		return
 
-	if (occupant.client)
+	if(occupant.client)
 		occupant.client.eye = occupant.client.mob
 		occupant.client.perspective = MOB_PERSPECTIVE
 
@@ -1029,7 +1029,7 @@
 			safeties = 0
 		if(WIRE_SHOCK)
 			electrified = -1
-		if (WIRE_SCANID)
+		if(WIRE_SCANID)
 			locked = 0
 
 /obj/machinery/suit_cycler/proc/mend(var/wireColor)
@@ -1047,7 +1047,7 @@
 			safeties = !locked
 		if(WIRE_SHOCK)
 			electrified = 30
-		if (WIRE_SCANID)
+		if(WIRE_SCANID)
 			locked = !locked
 */
 
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index a2b6417c9f7..db4cb0271c0 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -88,7 +88,7 @@
 				payload = null
 			else
 				to_chat(user, "<span class='notice'>There isn't anything in here to remove!</span>")
-		else if (open_panel)
+		else if(open_panel)
 			to_chat(user, "<span class='notice'>The wires conneting the shell to the explosives are holding it down!</span>")
 		else
 			to_chat(user, "<span class='notice'>The cover is screwed on, it won't pry off!</span>")
@@ -180,7 +180,7 @@
 	icon = 'icons/obj/assemblies.dmi'
 	icon_state = "bombcore"
 	item_state = "eshield0"
-	w_class = 3.0
+	w_class = 3
 	origin_tech = "syndicate=6;combat=5"
 	var/adminlog = null
 
@@ -296,7 +296,7 @@
 	icon = 'icons/obj/assemblies.dmi'
 	icon_state = "bigred"
 	item_state = "electronic"
-	w_class = 1.0
+	w_class = 1
 	origin_tech = "syndicate=2"
 	var/cooldown = 0
 	var/detonated =	0
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 661744502ed..4d90971f003 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -234,7 +234,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 	if(data == 1)
 
-		for (var/obj/item/device/radio/intercom/R in connection.devices["[RADIO_CHAT]"])
+		for(var/obj/item/device/radio/intercom/R in connection.devices["[RADIO_CHAT]"])
 			if(R.receive_range(display_freq, level) > -1)
 				radios += R
 
@@ -242,7 +242,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 	else if(data == 2)
 
-		for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"])
+		for(var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"])
 
 			if(istype(R, /obj/item/device/radio/headset))
 				continue
@@ -255,7 +255,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	else if(data == 3)
 		for(var/antag_freq in ANTAG_FREQS)
 			var/datum/radio_frequency/antag_connection = radio_controller.return_frequency(antag_freq)
-			for (var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"])
+			for(var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"])
 				if(R.receive_range(antag_freq, level) > -1)
 					radios += R
 
@@ -263,7 +263,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 	else
 
-		for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"])
+		for(var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"])
 			if(R.receive_range(display_freq, level) > -1)
 				radios += R
 
@@ -281,11 +281,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	var/list/heard_garbled	= list() // garbled message (ie "f*c* **u, **i*er!")
 	var/list/heard_gibberish= list() // completely screwed over message (ie "F%! (O*# *#!<>&**%!")
 
-	for (var/mob/R in receive)
+	for(var/mob/R in receive)
 
 	  /* --- Loop through the receivers and categorize them --- */
 
-		if (R.client && R.client.holder && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios.
+		if(R.client && R.client.holder && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios.
 			continue
 
 		if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes.
@@ -302,10 +302,10 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 		// --- Can understand the speech ---
 
-		if (!M || R.say_understands(M))
+		if(!M || R.say_understands(M))
 
 			// - Not human or wearing a voice mask -
-			if (!M || !ishuman(M) || vmask)
+			if(!M || !ishuman(M) || vmask)
 				heard_masked += R
 
 			// - Human and not wearing voice mask -
@@ -316,7 +316,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 		else
 			// - The speaker has a prespecified "voice message" to display if not understood -
-			if (vmessage)
+			if(vmessage)
 				heard_voice += R
 
 			// - Just display a garbled message -
@@ -325,7 +325,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 
   /* ###### Begin formatting and sending the message ###### */
-	if (length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled) || length(heard_gibberish))
+	if(length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled) || length(heard_gibberish))
 
 	  /* --- Some miscellaneous variables to format the string output --- */
 		var/freq_text = get_frequency_name(display_freq)
@@ -387,34 +387,34 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 	  	/* --- Process all the mobs that heard a masked voice (understood) --- */
 
-		if (length(heard_masked))
-			for (var/mob/R in heard_masked)
+		if(length(heard_masked))
+			for(var/mob/R in heard_masked)
 				R.hear_radio(message,verbage, speaking, part_a, part_b, M, 0, name, follow_target=follow_target)
 
 		/* --- Process all the mobs that heard the voice normally (understood) --- */
 
-		if (length(heard_normal))
-			for (var/mob/R in heard_normal)
+		if(length(heard_normal))
+			for(var/mob/R in heard_normal)
 				R.hear_radio(message, verbage, speaking, part_a, part_b, M, 0, realname, follow_target=follow_target)
 
 		/* --- Process all the mobs that heard the voice normally (did not understand) --- */
 
-		if (length(heard_voice))
-			for (var/mob/R in heard_voice)
+		if(length(heard_voice))
+			for(var/mob/R in heard_voice)
 				R.hear_radio(message,verbage, speaking, part_a, part_b, M,0, vname, follow_target=follow_target)
 
 		/* --- Process all the mobs that heard a garbled voice (did not understand) --- */
 			// Displays garbled message (ie "f*c* **u, **i*er!")
 
-		if (length(heard_garbled))
-			for (var/mob/R in heard_garbled)
+		if(length(heard_garbled))
+			for(var/mob/R in heard_garbled)
 				R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1, vname, follow_target=follow_target)
 
 
 		/* --- Complete gibberish. Usually happens when there's a compressed message --- */
 
-		if (length(heard_gibberish))
-			for (var/mob/R in heard_gibberish)
+		if(length(heard_gibberish))
+			for(var/mob/R in heard_gibberish)
 				R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1, follow_target=follow_target)
 
 	return 1
@@ -437,7 +437,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	// --- Broadcast only to intercom devices ---
 
 	if(data == 1)
-		for (var/obj/item/device/radio/intercom/R in connection.devices["[RADIO_CHAT]"])
+		for(var/obj/item/device/radio/intercom/R in connection.devices["[RADIO_CHAT]"])
 			var/turf/position = get_turf(R)
 			if(position && position.z == level)
 				receive |= R.send_hear(display_freq, level)
@@ -446,7 +446,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	// --- Broadcast only to intercoms and station-bounced radios ---
 
 	else if(data == 2)
-		for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"])
+		for(var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"])
 
 			if(istype(R, /obj/item/device/radio/headset))
 				continue
@@ -460,7 +460,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	else if(data == 3)
 		for(var/freq in ANTAG_FREQS)
 			var/datum/radio_frequency/antag_connection = radio_controller.return_frequency(freq)
-			for (var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"])
+			for(var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"])
 				var/turf/position = get_turf(R)
 				if(position && position.z == level)
 					receive |= R.send_hear(freq)
@@ -469,7 +469,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	// --- Broadcast to ALL radio devices ---
 
 	else
-		for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"])
+		for(var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"])
 			var/turf/position = get_turf(R)
 			if(position && position.z == level)
 				receive |= R.send_hear(display_freq)
@@ -484,11 +484,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	var/list/heard_garbled	= list() // garbled message (ie "f*c* **u, **i*er!")
 	var/list/heard_gibberish= list() // completely screwed over message (ie "F%! (O*# *#!<>&**%!")
 
-	for (var/mob/R in receive)
+	for(var/mob/R in receive)
 
 	  /* --- Loop through the receivers and categorize them --- */
 
-		if (R.client && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios.
+		if(R.client && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios.
 			continue
 
 
@@ -500,7 +500,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 		// --- Can understand the speech ---
 
-		if (R.say_understands(M))
+		if(R.say_understands(M))
 
 			heard_normal += R
 
@@ -513,7 +513,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 
   /* ###### Begin formatting and sending the message ###### */
-	if (length(heard_normal) || length(heard_garbled) || length(heard_gibberish))
+	if(length(heard_normal) || length(heard_garbled) || length(heard_gibberish))
 
 	  /* --- Some miscellaneous variables to format the string output --- */
 		var/part_a = "<span class='[frequency_span_class(display_freq)]'><span class='name'>" // goes in the actual output
@@ -566,30 +566,30 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 		/* --- Process all the mobs that heard the voice normally (understood) --- */
 
-		if (length(heard_normal))
+		if(length(heard_normal))
 			var/rendered = "[part_a][source][part_b]\"[text]\"[part_c]"
 
-			for (var/mob/R in heard_normal)
+			for(var/mob/R in heard_normal)
 				R.show_message(rendered, 2)
 
 		/* --- Process all the mobs that heard a garbled voice (did not understand) --- */
 			// Displays garbled message (ie "f*c* **u, **i*er!")
 
-		if (length(heard_garbled))
+		if(length(heard_garbled))
 			var/quotedmsg = "\"[stars(text)]\""
 			var/rendered = "[part_a][source][part_b][quotedmsg][part_c]"
 
-			for (var/mob/R in heard_garbled)
+			for(var/mob/R in heard_garbled)
 				R.show_message(rendered, 2)
 
 
 		/* --- Complete gibberish. Usually happens when there's a compressed message --- */
 
-		if (length(heard_gibberish))
+		if(length(heard_gibberish))
 			var/quotedmsg = "\"[Gibberish(text, compression + 50)]\""
 			var/rendered = "[part_a][Gibberish(source, compression + 50)][part_b][quotedmsg][part_c]"
 
-			for (var/mob/R in heard_gibberish)
+			for(var/mob/R in heard_gibberish)
 				R.show_message(rendered, 2)
 
 //Use this to test if an obj can communicate with a Telecommunications Network
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index 5e46a20dd6d..a97e5a7d4c2 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -224,12 +224,12 @@
 		if(istype(D, /obj/item/weapon/screwdriver))
 			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20, target = src))
-				if (src.stat & BROKEN)
+				if(src.stat & BROKEN)
 					to_chat(user, "\blue The broken glass falls out.")
 					var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 					new /obj/item/weapon/shard(loc)
 					var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A )
-					for (var/obj/C in src)
+					for(var/obj/C in src)
 						C.loc = src.loc
 					A.circuit = M
 					A.state = 3
@@ -240,7 +240,7 @@
 					to_chat(user, "\blue You disconnect the monitor.")
 					var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 					var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A )
-					for (var/obj/C in src)
+					for(var/obj/C in src)
 						C.loc = src.loc
 					A.circuit = M
 					A.state = 4
diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm
index 16528b73d0e..57136b46dc9 100644
--- a/code/game/machinery/telecomms/telemonitor.dm
+++ b/code/game/machinery/telecomms/telemonitor.dm
@@ -130,12 +130,12 @@
 		if(istype(D, /obj/item/weapon/screwdriver))
 			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20, target = src))
-				if (src.stat & BROKEN)
+				if(src.stat & BROKEN)
 					to_chat(user, "\blue The broken glass falls out.")
 					var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 					new /obj/item/weapon/shard(loc)
 					var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A )
-					for (var/obj/C in src)
+					for(var/obj/C in src)
 						C.loc = src.loc
 					A.circuit = M
 					A.state = 3
@@ -146,7 +146,7 @@
 					to_chat(user, "\blue You disconnect the monitor.")
 					var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 					var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A )
-					for (var/obj/C in src)
+					for(var/obj/C in src)
 						C.loc = src.loc
 					A.circuit = M
 					A.state = 4
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index a5ee6631037..dbbf6682e4e 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -342,12 +342,12 @@
 	if(istype(D, /obj/item/weapon/screwdriver))
 		playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20, target = src))
-			if (src.stat & BROKEN)
+			if(src.stat & BROKEN)
 				to_chat(user, "\blue The broken glass falls out.")
 				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 				new /obj/item/weapon/shard(loc)
 				var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
-				for (var/obj/C in src)
+				for(var/obj/C in src)
 					C.loc = src.loc
 				A.circuit = M
 				A.state = 3
@@ -358,7 +358,7 @@
 				to_chat(user, "\blue You disconnect the monitor.")
 				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 				var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
-				for (var/obj/C in src)
+				for(var/obj/C in src)
 					C.loc = src.loc
 				A.circuit = M
 				A.state = 4
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index b2ba1a01cf7..95f115ac226 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -24,7 +24,7 @@
 	update_icon()
 
 /obj/machinery/computer/teleporter/Destroy()
-	if (power_station)
+	if(power_station)
 		power_station.teleporter_console = null
 		power_station = null
 	return ..()
@@ -88,7 +88,7 @@
 
 	// Set up the Nano UI
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "teleporter_console.tmpl", "Teleporter Console UI", 400, 400)
 		ui.set_initial_data(data)
 		ui.open()
@@ -179,7 +179,7 @@
 
 		for(var/obj/item/device/radio/beacon/R in beacons)
 			var/turf/T = get_turf(R)
-			if (!T)
+			if(!T)
 				continue
 			if((T.z in config.admin_levels) || T.z > 7)
 				continue
@@ -192,13 +192,13 @@
 				areaindex[tmpname] = 1
 			L[tmpname] = R
 
-		for (var/obj/item/weapon/implant/tracking/I in tracked_implants)
-			if (!I.implanted || !ismob(I.loc))
+		for(var/obj/item/weapon/implant/tracking/I in tracked_implants)
+			if(!I.implanted || !ismob(I.loc))
 				continue
 			else
 				var/mob/M = I.loc
-				if (M.stat == 2)
-					if (M.timeofdeath + 6000 < world.time)
+				if(M.stat == 2)
+					if(M.timeofdeath + 6000 < world.time)
 						continue
 				var/turf/T = get_turf(M)
 				if(!T)	continue
@@ -222,7 +222,7 @@
 			return
 		for(var/obj/machinery/teleport/station/R in S)
 			var/turf/T = get_turf(R)
-			if (!T || !R.teleporter_hub || !R.teleporter_console)
+			if(!T || !R.teleporter_hub || !R.teleporter_console)
 				continue
 			if((T.z in config.admin_levels) || T.z > 7)
 				continue
@@ -247,7 +247,7 @@
 	return
 
 /proc/find_loc(obj/R as obj)
-	if (!R)	return null
+	if(!R)	return null
 	var/turf/T = R.loc
 	while(!istype(T, /turf))
 		T = T.loc
@@ -297,7 +297,7 @@
 	link_power_station()
 
 /obj/machinery/teleport/hub/Destroy()
-	if (power_station)
+	if(power_station)
 		power_station.teleporter_hub = null
 		power_station = null
 	return ..()
@@ -351,12 +351,12 @@
 
 /obj/machinery/teleport/hub/proc/teleport(atom/movable/M as mob|obj, turf/T)
 	var/obj/machinery/computer/teleporter/com = power_station.teleporter_console
-	if (!com)
+	if(!com)
 		return
-	if (!com.target)
+	if(!com.target)
 		visible_message("<span class='alert'>Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.</span>")
 		return
-	if (istype(M, /atom/movable))
+	if(istype(M, /atom/movable))
 		if(!calibrated && prob(25 - ((accurate) * 10))) //oh dear a problem
 			do_teleport(M, locate(rand((2*TRANSITIONEDGE), world.maxx - (2*TRANSITIONEDGE)), rand((2*TRANSITIONEDGE), world.maxy - (2*TRANSITIONEDGE)), 3), 2)
 		else
@@ -499,7 +499,7 @@
 		teleporter_hub.power_station = null
 		teleporter_hub.update_icon()
 		teleporter_hub = null
-	if (teleporter_console)
+	if(teleporter_console)
 		teleporter_console.power_station = null
 		teleporter_console = null
 	return ..()
@@ -549,12 +549,12 @@
 		to_chat(user, "<span class='notice'>Close the maintenance panel first.</span>")
 
 /obj/machinery/teleport/station/proc/toggle(mob/user)
-	if (stat & (BROKEN|NOPOWER) || !teleporter_hub || !teleporter_console)
+	if(stat & (BROKEN|NOPOWER) || !teleporter_hub || !teleporter_console)
 		return
-	if (teleporter_hub.panel_open)
+	if(teleporter_hub.panel_open)
 		to_chat(user, "<span class='notice'>Close the hub's maintenance panel first.</span>")
 		return
-	if (teleporter_console.target)
+	if(teleporter_console.target)
 		src.engaged = !src.engaged
 		use_power(5000)
 		visible_message("<span class='notice'>Teleporter [engaged ? "" : "dis"]engaged!</span>")
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index d117961ff88..83b58d19d1c 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -227,7 +227,7 @@
 	playsound(src.loc, 'sound/effects/alert.ogg', 50, 0)
 	sleep(5)
 	H.apply_effect((rand(150,200)),IRRADIATE,0)
-	if (prob(5))
+	if(prob(5))
 		if(prob(75))
 			randmutb(H) // Applies bad mutation
 			domutcheck(H,null,1)
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index 0deb0d947a3..d87d8d1776c 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -136,7 +136,7 @@
 		data["settings"] = settings
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "turret_control.tmpl", "Turret Controls", 500, 300)
 		ui.set_initial_data(data)
 		ui.open()
@@ -184,7 +184,7 @@
 	TC.ailock = ailock
 
 	if(istype(control_area))
-		for (var/obj/machinery/porta_turret/aTurret in control_area)
+		for(var/obj/machinery/porta_turret/aTurret in control_area)
 			aTurret.setState(TC)
 
 	update_icon()
@@ -199,8 +199,8 @@
 	if(stat & NOPOWER)
 		icon_state = "control_off"
 		set_light(0)
-	else if (enabled)
-		if (lethal)
+	else if(enabled)
+		if(lethal)
 			icon_state = "control_kill"
 			set_light(1.5, 1,"#990000")
 		else
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index a41adfc1278..898ae50e2a6 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -97,8 +97,8 @@
 		icon_state = "grey_target_prism"
 	else
 		if( powered() )
-			if (src.enabled)
-				if (src.lasers)
+			if(src.enabled)
+				if(src.lasers)
 					icon_state = "orange_target_prism"
 				else
 					icon_state = "target_prism"
@@ -219,10 +219,10 @@
 /obj/machinery/turret/proc/shootAt(var/atom/movable/target)
 	var/turf/T = get_turf(src)
 	var/turf/U = get_turf(target)
-	if (!T || !U)
+	if(!T || !U)
 		return
 	var/obj/item/projectile/A
-	if (src.lasers)
+	if(src.lasers)
 		switch(lasertype)
 			if(1)
 				A = new /obj/item/projectile/beam(loc)
@@ -256,25 +256,25 @@
 	return (invisibility!=0)
 
 /obj/machinery/turret/proc/popUp()
-	if ((!isPopping()) || src.popping==-1)
+	if((!isPopping()) || src.popping==-1)
 		invisibility = 0
 		popping = 1
 		playsound(get_turf(src), 'sound/effects/turret/open.wav', 60, 1)
-		if (src.cover!=null)
+		if(src.cover!=null)
 			flick("popup", src.cover)
 			src.cover.icon_state = "openTurretCover"
 		spawn(10)
-			if (popping==1) popping = 0
+			if(popping==1) popping = 0
 
 /obj/machinery/turret/proc/popDown()
-	if ((!isPopping()) || src.popping==1)
+	if((!isPopping()) || src.popping==1)
 		popping = -1
 		playsound(get_turf(src), 'sound/effects/turret/open.wav', 60, 1)
-		if (src.cover!=null)
+		if(src.cover!=null)
 			flick("popdown", src.cover)
 			src.cover.icon_state = "turretCover"
 		spawn(10)
-			if (popping==-1)
+			if(popping==-1)
 				invisibility = INVISIBILITY_LEVEL_TWO
 				popping = 0
 
@@ -284,7 +284,7 @@
 		..()
 		if(prob(45) && Proj.damage > 0) src.spark_system.start()
 		qdel(Proj)
-		if (src.health <= 0)
+		if(src.health <= 0)
 			src.die()
 	return
 
@@ -294,7 +294,7 @@
 	playsound(src.loc, 'sound/weapons/smash.ogg', 60, 1)
 	src.spark_system.start()
 	src.health -= W.force * 0.5
-	if (src.health <= 0)
+	if(src.health <= 0)
 		src.die()
 	return
 
@@ -315,7 +315,7 @@
 	src.density = 0
 	src.stat |= BROKEN
 	src.icon_state = "destroyed_target_prism"
-	if (cover!=null)
+	if(cover!=null)
 		qdel(cover)
 	sleep(3)
 	flick("explosion", src)
@@ -332,7 +332,7 @@
 		add_logs(M, src, "attacked", admin=0)
 		//src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
 		src.health -= M.melee_damage_upper
-		if (src.health <= 0)
+		if(src.health <= 0)
 			src.die()
 	else
 		to_chat(M, "<span class='danger'>That object is useless to you.</span>")
@@ -348,7 +348,7 @@
 		playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 		visible_message("<span class='userdanger'>[M] has slashed at [src]!</span>")
 		src.health -= 15
-		if (src.health <= 0)
+		if(src.health <= 0)
 			src.die()
 	else
 		to_chat(M, "\green That object is useless to you.")
@@ -359,22 +359,22 @@
 /obj/machinery/turretid/Topic(href, href_list, var/nowindow = 0)
 	if(..(href, href_list))
 		return 1
-	if (src.locked)
-		if (!istype(usr, /mob/living/silicon))
+	if(src.locked)
+		if(!istype(usr, /mob/living/silicon))
 			to_chat(usr, "Control panel is locked!")
 			return
-	if (href_list["toggleOn"])
+	if(href_list["toggleOn"])
 		src.enabled = !src.enabled
 		src.updateTurrets()
-	else if (href_list["toggleLethal"])
+	else if(href_list["toggleLethal"])
 		src.lethal = !src.lethal
 		src.updateTurrets()
 	if(!nowindow)
 		src.attack_hand(usr)
 
 /obj/machinery/turretid/proc/update_icons()
-	if (src.enabled)
-		if (src.lethal)
+	if(src.enabled)
+		if(src.lethal)
 			icon_state = "control_kill"
 		else
 			icon_state = "control_stun"
@@ -382,7 +382,7 @@
 		icon_state = "control_standby"
 																				//CODE FIXED BUT REMOVED
 //	if(control_area)															//USE: updates other controls in the area
-//		for (var/obj/machinery/turretid/Turret_Control in world)				//I'm not sure if this is what it was
+//		for(var/obj/machinery/turretid/Turret_Control in world)				//I'm not sure if this is what it was
 //			if( Turret_Control.control_area != src.control_area )	continue	//supposed to do. Or whether the person
 //			Turret_Control.icon_state = icon_state								//who coded it originally was just tired
 //			Turret_Control.enabled = enabled									//or something. I don't see  any situation
@@ -542,9 +542,9 @@
 	if(!src)
 		return
 	var/turf/curloc = get_turf(src)
-	if (!targloc || !curloc)
+	if(!targloc || !curloc)
 		return
-	if (targloc == curloc)
+	if(targloc == curloc)
 		return
 	playsound(get_turf(src), firing_sound, 60, 1)
 	var/obj/item/projectile/A = new bullet_type(curloc)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 5d9533470d6..ed69b66614d 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -159,7 +159,7 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
@@ -209,14 +209,14 @@
 	return total
 
 /obj/machinery/vending/attackby(obj/item/weapon/W, mob/user, params)
-	if (currently_vending && vendor_account && !vendor_account.suspended)
+	if(currently_vending && vendor_account && !vendor_account.suspended)
 		var/paid = 0
 		var/handled = 0
 		if(istype(W, /obj/item/weapon/card/id))
 			var/obj/item/weapon/card/id/C = W
 			paid = pay_with_card(C)
 			handled = 1
-		else if (istype(W, /obj/item/weapon/spacecash))
+		else if(istype(W, /obj/item/weapon/spacecash))
 			var/obj/item/weapon/spacecash/C = W
 			paid = pay_with_cash(C, user)
 			handled = 1
@@ -327,7 +327,7 @@
 	return pay_with_account(get_card_account(I))
 
 /obj/machinery/vending/proc/pay_with_account(var/datum/money_account/customer_account)
-	if (!customer_account)
+	if(!customer_account)
 		src.status_message = "Error: Unable to access account. Please contact technical support if problem persists."
 		src.status_error = 1
 		return 0
@@ -443,7 +443,7 @@
 		data["panel"] = 0
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "vending_machine.tmpl", src.name, 440, 600)
 		ui.set_initial_data(data)
 		ui.open()
@@ -462,7 +462,7 @@
 		to_chat(usr, "\blue You remove the [coin] from the [src]")
 		categories &= ~CAT_COIN
 
-	if (href_list["pay"])
+	if(href_list["pay"])
 		if(currently_vending && vendor_account && !vendor_account.suspended)
 			var/paid = 0
 			var/handled = 0
@@ -480,8 +480,8 @@
 				nanomanager.update_uis(src)
 				return // don't smack that machine with your 2 credits
 
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
-		if ((href_list["vend"]) && (src.vend_ready) && (!currently_vending))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
+		if((href_list["vend"]) && (src.vend_ready) && (!currently_vending))
 
 			if(issilicon(usr) && !isrobot(usr))
 				to_chat(usr, "<span class=warning>The vending machine refuses to interface with you, as you are not in its target demographic!</span>")
@@ -511,10 +511,10 @@
 					src.status_message = "Please swipe a card or insert cash to pay for the item."
 					src.status_error = 0
 
-		else if (href_list["cancelpurchase"])
+		else if(href_list["cancelpurchase"])
 			src.currently_vending = null
 
-		else if ((href_list["togglevoice"]) && (src.panel_open))
+		else if((href_list["togglevoice"]) && (src.panel_open))
 			src.shut_up = !src.shut_up
 
 		src.add_fingerprint(usr)
@@ -534,7 +534,7 @@
 	src.status_error = 0
 	nanomanager.update_uis(src)
 
-	if (R.category & CAT_COIN)
+	if(R.category & CAT_COIN)
 		if(!coin)
 			to_chat(user, "\blue You need to insert a coin to get this item.")
 			return
@@ -559,7 +559,7 @@
 			src.last_reply = world.time
 
 	use_power(vend_power_usage)	//actuators and stuff
-	if (src.icon_vend) //Show the vending animation if needed
+	if(src.icon_vend) //Show the vending animation if needed
 		flick(src.icon_vend,src)
 	spawn(src.vend_delay)
 		new R.product_path(get_turf(src))
@@ -601,7 +601,7 @@
 	if(stat & NOPOWER)
 		return
 
-	if (!message)
+	if(!message)
 		return
 
 	for(var/mob/O in hearers(src, null))
@@ -623,10 +623,10 @@
 //Oh no we're malfunctioning!  Dump out some product and break.
 /obj/machinery/vending/proc/malfunction()
 	for(var/datum/data/vending_product/R in src.product_records)
-		if (R.amount <= 0) //Try to use a record that actually has something to dump.
+		if(R.amount <= 0) //Try to use a record that actually has something to dump.
 			continue
 		var/dump_path = R.product_path
-		if (!dump_path)
+		if(!dump_path)
 			continue
 
 		while(R.amount>0)
@@ -646,16 +646,16 @@
 		return 0
 
 	for(var/datum/data/vending_product/R in src.product_records)
-		if (R.amount <= 0) //Try to use a record that actually has something to dump.
+		if(R.amount <= 0) //Try to use a record that actually has something to dump.
 			continue
 		var/dump_path = R.product_path
-		if (!dump_path)
+		if(!dump_path)
 			continue
 
 		R.amount--
 		throw_item = new dump_path(src.loc)
 		break
-	if (!throw_item)
+	if(!throw_item)
 		return 0
 	spawn(0)
 		throw_item.throw_at(target, 16, 3, src)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 6889cf67c42..e075457a9e5 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -145,7 +145,7 @@
 						G.desc = new_desc
 			if(new_shoe_icon_state && new_shoe_name)
 				for(var/obj/item/clothing/shoes/S in contents)
-					if (S.chained == 1)
+					if(S.chained == 1)
 						S.chained = 0
 						S.slowdown = SHOES_SLOWDOWN
 						new /obj/item/weapon/restraints/handcuffs( src )
@@ -229,43 +229,43 @@
 		istype(W,/obj/item/weapon/bedsheet))
 
 		//YES, it's hardcoded... saves a var/can_be_washed for every single clothing item.
-		if ( istype(W,/obj/item/clothing/suit/space ) )
+		if( istype(W,/obj/item/clothing/suit/space ) )
 			to_chat(user, "This item does not fit.")
 			return
-		if ( istype(W,/obj/item/clothing/suit/syndicatefake ) )
+		if( istype(W,/obj/item/clothing/suit/syndicatefake ) )
 			to_chat(user, "This item does not fit.")
 			return
-//		if ( istype(W,/obj/item/clothing/suit/powered ) )
+//		if( istype(W,/obj/item/clothing/suit/powered ) )
 //			to_chat(user, "This item does not fit.")
 //			return
-		if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) )
+		if( istype(W,/obj/item/clothing/suit/cyborg_suit ) )
 			to_chat(user, "This item does not fit.")
 			return
-		if ( istype(W,/obj/item/clothing/suit/bomb_suit ) )
+		if( istype(W,/obj/item/clothing/suit/bomb_suit ) )
 			to_chat(user, "This item does not fit.")
 			return
-		if ( istype(W,/obj/item/clothing/suit/armor ) )
+		if( istype(W,/obj/item/clothing/suit/armor ) )
 			to_chat(user, "This item does not fit.")
 			return
-		if ( istype(W,/obj/item/clothing/suit/armor ) )
+		if( istype(W,/obj/item/clothing/suit/armor ) )
 			to_chat(user, "This item does not fit.")
 			return
-		if ( istype(W,/obj/item/clothing/mask/gas ) )
+		if( istype(W,/obj/item/clothing/mask/gas ) )
 			to_chat(user, "This item does not fit.")
 			return
-		if ( istype(W,/obj/item/clothing/mask/cigarette ) )
+		if( istype(W,/obj/item/clothing/mask/cigarette ) )
 			to_chat(user, "This item does not fit.")
 			return
-		if ( istype(W,/obj/item/clothing/head/syndicatefake ) )
+		if( istype(W,/obj/item/clothing/head/syndicatefake ) )
 			to_chat(user, "This item does not fit.")
 			return
-//		if ( istype(W,/obj/item/clothing/head/powered ) )
+//		if( istype(W,/obj/item/clothing/head/powered ) )
 //			to_chat(user, "This item does not fit.")
 //			return
-		if ( istype(W,/obj/item/clothing/head/helmet ) )
+		if( istype(W,/obj/item/clothing/head/helmet ) )
 			to_chat(user, "This item does not fit.")
 			return
-		if ( istype(W,/obj/item/clothing/gloves/furgloves ) )
+		if( istype(W,/obj/item/clothing/gloves/furgloves ) )
 			to_chat(user, "This item does not fit.")
 			return
 		if(W.flags & NODROP) //if "can't drop" item
@@ -273,7 +273,7 @@
 			return
 
 		if(contents.len < 5)
-			if ( state in list(1, 3) )
+			if( state in list(1, 3) )
 				user.drop_item()
 				W.loc = src
 				state = 3
diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index a5a8e44e165..cfe94888123 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -71,7 +71,7 @@
 
 /obj/mecha/combat/durand/Topic(href, href_list)
 	..()
-	if (href_list["toggle_defence_mode"])
+	if(href_list["toggle_defence_mode"])
 		src.defence_mode()
 	return
 
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index 26d9d066fd8..09caf2fcaf0 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -113,6 +113,6 @@
 
 /obj/mecha/combat/gygax/Topic(href, href_list)
 	..()
-	if (href_list["toggle_leg_overload"])
+	if(href_list["toggle_leg_overload"])
 		src.overload()
 	return
\ No newline at end of file
diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm
index d8ef8c8b9fe..4bfd5f9a161 100644
--- a/code/game/mecha/combat/honker.dm
+++ b/code/game/mecha/combat/honker.dm
@@ -139,7 +139,7 @@
 
 obj/mecha/combat/honker/Topic(href, href_list)
 	..()
-	if (href_list["play_sound"])
+	if(href_list["play_sound"])
 		switch(href_list["play_sound"])
 			if("sadtrombone")
 				playsound(src, 'sound/misc/sadtrombone.ogg', 50)
@@ -148,7 +148,7 @@ obj/mecha/combat/honker/Topic(href, href_list)
 proc/rand_hex_color()
 	var/list/colors = list("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f")
 	var/color=""
-	for (var/i=0;i<6;i++)
+	for(var/i=0;i<6;i++)
 		color = color+pick(colors)
 	return color
 
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index 0d7676d75b7..386afc0710c 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -188,10 +188,10 @@
 
 /obj/mecha/combat/marauder/Topic(href, href_list)
 	..()
-	if (href_list["toggle_thrusters"])
+	if(href_list["toggle_thrusters"])
 		src.toggle_thrusters()
-	if (href_list["smoke"])
+	if(href_list["smoke"])
 		src.smoke()
-	if (href_list["toggle_zoom"])
+	if(href_list["toggle_zoom"])
 		src.zoom()
 	return
\ No newline at end of file
diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index a4edcb4a89a..595fa67ea00 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -85,9 +85,9 @@
 
 /obj/mecha/combat/phazon/Topic(href, href_list)
 	..()
-	if (href_list["switch_damtype"])
+	if(href_list["switch_damtype"])
 		src.switch_damtype()
-	if (href_list["phasing"])
+	if(href_list["phasing"])
 		phasing = !phasing
 		send_byjax(src.occupant,"exosuit.browser","phasing_command","[phasing?"Dis":"En"]able phasing")
 		src.occupant_message("<font color=\"[phasing?"#00f\">En":"#f00\">Dis"]abled phasing.</font>")
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index 98db55e0f25..bef015cb7fa 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -296,7 +296,7 @@
 		//meh
 		switch(mode)
 			if(0)
-				if (istype(target, /turf/simulated/wall))
+				if(istype(target, /turf/simulated/wall))
 					if(istype(target, /turf/simulated/wall/r_wall) && !canRwall)
 						return 0
 					occupant_message("Deconstructing [target]...")
@@ -306,7 +306,7 @@
 						target:ChangeTurf(/turf/simulated/floor/plating)
 						playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
 						chassis.use_power(energy_drain)
-				else if (istype(target, /turf/simulated/floor))
+				else if(istype(target, /turf/simulated/floor))
 					occupant_message("Deconstructing [target]...")
 					set_ready_state(0)
 					if(do_after_cooldown(target))
@@ -314,7 +314,7 @@
 						target:ChangeTurf(/turf/space)
 						playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
 						chassis.use_power(energy_drain)
-				else if (istype(target, /obj/machinery/door/airlock))
+				else if(istype(target, /obj/machinery/door/airlock))
 					occupant_message("Deconstructing [target]...")
 					set_ready_state(0)
 					if(do_after_cooldown(target))
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index ae5595d69e5..22850e63f48 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -16,7 +16,7 @@
 			if(size > M.maxsize)
 				return 0
 			return 1
-		else if (M.emagged == 1)
+		else if(M.emagged == 1)
 			return 1
 	return 0
 
@@ -29,9 +29,9 @@
 
 	var/turf/curloc = get_turf(chassis)
 	var/turf/targloc = get_turf(target)
-	if (!targloc || !istype(targloc) || !curloc)
+	if(!targloc || !istype(targloc) || !curloc)
 		return 0
-	if (targloc == curloc)
+	if(targloc == curloc)
 		return 0
 
 	set_ready_state(0)
@@ -222,7 +222,7 @@
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/Topic(href, href_list)
 	..()
-	if (href_list["rearm"])
+	if(href_list["rearm"])
 		rearm()
 	return
 
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 4eae22d7646..46c92271308 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -283,7 +283,7 @@
 	else
 		data["has_mech"] = 0
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "mech_bay_console.tmpl", "Mech Bay Control Console", 500, 325)
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index d0bf82e4a92..b9b5d32d760 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -266,7 +266,7 @@
 
 /obj/machinery/mecha_part_fabricator/interact(mob/user as mob)
 	var/dat, left_part
-	if (..())
+	if(..())
 		return
 	user.set_machine(src)
 	var/turf/exit = get_step(src,SOUTH)
@@ -400,7 +400,7 @@
 		if(href_list["custom_eject"])
 			amount = input("How many sheets would you like to eject from the machine?", "How much?", 1) as null|num
 			amount = max(0,min(round(resources[material]/MINERAL_MATERIAL_AMOUNT),amount)) // Rounding errors aren't scary, as the mineral eject proc is smart
-			if (!amount)
+			if(!amount)
 				return
 			amount = round(amount)
 		if(amount < 0 || amount > resources[material]) //href protection, except that resources[] is 2000 per sheet
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 10349a8d306..7103b4f2d7a 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -213,7 +213,7 @@
 				return
 		var/obj/mecha/Mech = M.loc
 		spawn() //this helps prevent clickspam fest.
-			if (Mech)
+			if(Mech)
 				Mech.click_action(object,M)
 //	else
 //		return ..()
@@ -509,7 +509,7 @@
 	src.log_message("Attack by hand/paw. Attacker - [user].",1)
 
 
-	if ((HULK in user.mutations) && !prob(src.deflect_chance))
+	if((HULK in user.mutations) && !prob(src.deflect_chance))
 		src.take_damage(15)
 		src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
 		user.visible_message("<font color='red'><b>[user] hits [src.name], doing some damage.</b></font>", "<font color='red'><b>You hit [src.name] with all your might. The metal creaks and bends.</b></font>")
@@ -679,13 +679,13 @@
 		if(1.0)
 			qdel(src)
 		if(2.0)
-			if (prob(30))
+			if(prob(30))
 				qdel(src)
 			else
 				src.take_damage(initial(src.health)/2)
 				src.check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),1)
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				qdel(src)
 			else
 				src.take_damage(initial(src.health)/5)
@@ -700,7 +700,7 @@
 		src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
 		playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1)
 		to_chat(user, "\red You smash at the armored suit!")
-		for (var/mob/V in viewers(src))
+		for(var/mob/V in viewers(src))
 			if(V.client && !(V.blinded))
 				V.show_message("\red The [user] smashes against [src.name]'s armor!", 1)
 	else
@@ -708,7 +708,7 @@
 		playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1)
 		to_chat(user, "\green Your attack had no effect!")
 		src.occupant_message("\blue The [user]'s attack is stopped by the armor.")
-		for (var/mob/V in viewers(src))
+		for(var/mob/V in viewers(src))
 			if(V.client && !(V.blinded))
 				V.show_message("\blue The [user] rebounds off the [src.name] armor!", 1)
 	return
@@ -742,7 +742,7 @@
 		to_chat(user, "\red The [W] bounces off [src.name] armor.")
 		src.log_append_to_last("Armor saved.")
 /*
-		for (var/mob/V in viewers(src))
+		for(var/mob/V in viewers(src))
 			if(V.client && !(V.blinded))
 				V.show_message("The [W] bounces off [src.name] armor.", 1)
 */
@@ -855,8 +855,8 @@
 
 	else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM)
 		var/obj/item/weapon/weldingtool/WT = W
-		if (WT.remove_fuel(0,user))
-			if (hasInternalDamage(MECHA_INT_TANK_BREACH))
+		if(WT.remove_fuel(0,user))
+			if(hasInternalDamage(MECHA_INT_TANK_BREACH))
 				clearInternalDamage(MECHA_INT_TANK_BREACH)
 				to_chat(user, "\blue You repair the damaged gas tank.")
 		else
@@ -912,7 +912,7 @@
 			to_chat(user, "\red The [W] bounces off [src.name] armor.")
 			src.log_append_to_last("Armor saved.")
 /*
-			for (var/mob/V in viewers(src))
+			for(var/mob/V in viewers(src))
 				if(V.client && !(V.blinded))
 					V.show_message("The [W] bounces off [src.name] armor.", 1)
 */
@@ -969,7 +969,7 @@
 			if(!AI || !isAI(occupant)) //Mech does not have an AI for a pilot
 				to_chat(user, "<span class='warning'>No AI detected in the [name] onboard computer.</span>")
 				return
-			if (AI.mind.special_role == "malfunction") //Malf AIs cannot leave mechs. Except through death.
+			if(AI.mind.special_role == "malfunction") //Malf AIs cannot leave mechs. Except through death.
 				to_chat(user, "<span class='boldannounce'>ACCESS DENIED.</span>")
 				return
 			AI.aiRestorePowerRoutine = 0//So the AI initially has power.
@@ -1172,16 +1172,16 @@
 /obj/mecha/MouseDrop_T(mob/M as mob, mob/user as mob)
 	if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis || user.resting) //are you cuffed, dying, lying, stunned or other
 		return
-	if (user != M)
+	if(user != M)
 		return
 	src.log_message("[user] tries to move in.")
-	if (src.occupant)
+	if(src.occupant)
 		to_chat(usr, "<span class='warning'>The [src.name] is already occupied!</span>")
 		src.log_append_to_last("Permission denied.")
 		return
 	var/passed
 	if(src.dna)
-		if (user.stat || ishuman(user))
+		if(user.stat || ishuman(user))
 			if(user.dna.unique_enzymes==src.dna)
 				passed = 1
 	else if(src.operation_allowed(user))
@@ -1223,7 +1223,7 @@
 		dir = dir_in
 		playsound(src, 'sound/machines/windowdoor.ogg', 50, 1)
 		if(!hasInternalDamage())
-			to_chat(src.occupant, sound('sound/mecha/nominal.ogg',volume=50))
+			occupant << sound('sound/mecha/nominal.ogg',volume=50)
 		return 1
 	else
 		return 0
@@ -1706,7 +1706,7 @@
 	if(href_list["rfreq"])
 		if(usr != src.occupant)	return
 		var/new_frequency = (radio.frequency + filter.getNum("rfreq"))
-		if ((radio.frequency < PUBLIC_LOW_FREQ || radio.frequency > PUBLIC_HIGH_FREQ))
+		if((radio.frequency < PUBLIC_LOW_FREQ || radio.frequency > PUBLIC_HIGH_FREQ))
 			new_frequency = sanitize_frequency(new_frequency)
 		radio.set_frequency(new_frequency)
 		send_byjax(src.occupant,"exosuit.browser","rfreq","[format_frequency(radio.frequency)]")
@@ -1715,16 +1715,16 @@
 		if(usr != src.occupant)	return
 		src.disconnect_from_port()
 		return
-	if (href_list["port_connect"])
+	if(href_list["port_connect"])
 		if(usr != src.occupant)	return
 		src.connect_to_port()
 		return
-	if (href_list["view_log"])
+	if(href_list["view_log"])
 		if(usr != src.occupant)	return
 		src.occupant << browse(src.get_log_html(), "window=exosuit_log")
 		onclose(occupant, "exosuit_log")
 		return
-	if (href_list["change_name"])
+	if(href_list["change_name"])
 		if(usr != src.occupant)	return
 		var/newname = strip_html_simple(input(occupant,"Choose new exosuit name","Rename exosuit",initial(name)) as text, MAX_NAME_LEN)
 		if(newname && trim(newname))
@@ -1732,7 +1732,7 @@
 		else
 			alert(occupant, "nope.avi")
 		return
-	if (href_list["toggle_id_upload"])
+	if(href_list["toggle_id_upload"])
 		if(usr != src.occupant)	return
 		add_req_access = !add_req_access
 		send_byjax(src.occupant,"exosuit.browser","t_id_upload","[add_req_access?"L":"Unl"]ock ID upload panel")
@@ -1862,7 +1862,7 @@
 	return 0
 
 /obj/mecha/proc/reset_icon()
-	if (initial_icon)
+	if(initial_icon)
 		icon_state = initial_icon
 	else
 		icon_state = initial(icon_state)
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index f6d627cc505..f1641c94b64 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -5,7 +5,7 @@
 /datum/construction/mecha/custom_action(step, atom/used_atom, mob/user)
 	if(istype(used_atom, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/W = used_atom
-		if (W.remove_fuel(0, user))
+		if(W.remove_fuel(0, user))
 			playsound(holder, 'sound/items/Welder2.ogg', 50, 1)
 		else
 			return 0
@@ -37,7 +37,7 @@
 /datum/construction/reversible/mecha/custom_action(index as num, diff as num, atom/used_atom, mob/user as mob)
 	if(istype(used_atom, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/W = used_atom
-		if (W.remove_fuel(0, user))
+		if(W.remove_fuel(0, user))
 			playsound(holder, 'sound/items/Welder2.ogg', 50, 1)
 		else
 			return 0
@@ -52,7 +52,7 @@
 
 	else if(istype(used_atom, /obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/C = used_atom
-		if (C.use(4))
+		if(C.use(4))
 			playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1)
 		else
 			to_chat(user, ("There's not enough cable to finish the task."))
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 1bcb4ab6add..39cda37a167 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -31,7 +31,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "exosuit_control.tmpl", "Exosuit Control Console", 420, 500)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 880bcdecdff..60c352c20bd 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -376,7 +376,7 @@
 	board_type = "other"
 	flags = CONDUCT
 	force = 5.0
-	w_class = 2.0
+	w_class = 2
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 15
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index 8da0f916425..6bd600eaaa7 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -42,7 +42,7 @@
 				rods.amount = 2
 				qdel(src)
 		else
-			if (isemptylist(welder_salvage))
+			if(isemptylist(welder_salvage))
 				to_chat(user, "<span class='warning'>What's left on the [src] cannot be removed with a welder, besides the frame itself</span>")
 			else if(WT.remove_fuel(0,user))
 				var/type = prob(70)?pick(welder_salvage):null
diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm
index aa104a3d807..deb3df8b4fc 100644
--- a/code/game/mecha/medical/odysseus.dm
+++ b/code/game/mecha/medical/odysseus.dm
@@ -40,7 +40,7 @@
 			var/datum/atom_hud/data/human/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED]
 			A.remove_hud_from(H)
 			builtin_hud_user = 0
-		else if ((istype(occupant, /mob/living/carbon/brain) || pilot_is_mmi()) && builtin_hud_user )
+		else if((istype(occupant, /mob/living/carbon/brain) || pilot_is_mmi()) && builtin_hud_user )
 			var/mob/living/carbon/brain/H = occupant
 			var/datum/atom_hud/A = huds[DATA_HUD_MEDICAL_ADVANCED]
 			A.remove_hud_from(H)
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index 0666f6472af..c4916306ac2 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -36,28 +36,28 @@
 
 /obj/mecha/working/ripley/go_out()
 	..()
-	if (src.damage_absorption.["brute"] < 0.6 && src.damage_absorption.["brute"] > 0.3)
+	if(src.damage_absorption.["brute"] < 0.6 && src.damage_absorption.["brute"] > 0.3)
 		src.overlays = null
 		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-open")
-	else if (src.damage_absorption.["brute"] == 0.3)
+	else if(src.damage_absorption.["brute"] == 0.3)
 		src.overlays = null
 		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full-open")
 
 /obj/mecha/working/ripley/moved_inside(var/mob/living/carbon/human/H as mob)
 	..()
-	if (src.damage_absorption.["brute"] < 0.6 && src.damage_absorption.["brute"] > 0.3)
+	if(src.damage_absorption.["brute"] < 0.6 && src.damage_absorption.["brute"] > 0.3)
 		src.overlays = null
 		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g")
-	else if (src.damage_absorption.["brute"] == 0.3)
+	else if(src.damage_absorption.["brute"] == 0.3)
 		src.overlays = null
 		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full")
 
 /obj/mecha/working/ripley/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob)
 	..()
-	if (src.damage_absorption.["brute"] < 0.6 && src.damage_absorption.["brute"] > 0.3)
+	if(src.damage_absorption.["brute"] < 0.6 && src.damage_absorption.["brute"] > 0.3)
 		src.overlays = null
 		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g")
-	else if (src.damage_absorption.["brute"] == 0.3)
+	else if(src.damage_absorption.["brute"] == 0.3)
 		src.overlays = null
 		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full")
 
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 273a4fe4fe6..ada2399f20d 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -34,7 +34,7 @@
 	if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || M.buckled_mob || buckled_mob || (buckle_requires_restraints && !M.restrained()) || M == src)
 		return 0
 
-	if (isslime(M) || isAI(M))
+	if(isslime(M) || isAI(M))
 		if(M == usr)
 			to_chat(M, "<span class='warning'>You are unable to buckle yourself to the [src]!</span>")
 		else
diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
index 320ec09a2ee..caa636e36ed 100644
--- a/code/game/objects/effects/aliens.dm
+++ b/code/game/objects/effects/aliens.dm
@@ -179,7 +179,7 @@
 
 /obj/structure/alien/weeds/Destroy()
 	var/turf/T = loc
-	for (var/obj/structure/alien/weeds/W in range(1,T))
+	for(var/obj/structure/alien/weeds/W in range(1,T))
 		W.updateWeedOverlays()
 	linked_node = null
 	return ..()
@@ -267,7 +267,7 @@
 
 
 /obj/structure/alien/weeds/proc/fullUpdateWeedOverlays()
-	for (var/obj/structure/alien/weeds/W in range(1,src))
+	for(var/obj/structure/alien/weeds/W in range(1,src))
 		W.updateWeedOverlays()
 
 //Weed nodes
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index b11ad6bf633..3527c3fd49a 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -30,7 +30,7 @@ var/global/list/image/splatter_cache=list()
 		if(src.loc && isturf(src.loc))
 			for(var/obj/effect/decal/cleanable/blood/B in src.loc)
 				if(B != src)
-					if (B.blood_DNA)
+					if(B.blood_DNA)
 						blood_DNA |= B.blood_DNA.Copy()
 					qdel(B)
 	spawn(DRYING_TIME * (amount+1))
@@ -41,7 +41,7 @@ var/global/list/image/splatter_cache=list()
 	color = basecolor
 
 /obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp)
-	if (!istype(perp))
+	if(!istype(perp))
 		return
 	if(amount < 1)
 		return
@@ -68,7 +68,7 @@ var/global/list/image/splatter_cache=list()
 				S.overlays += S.blood_overlay
 			S.blood_DNA |= blood_DNA.Copy()
 
-	else if (hasfeet)//Or feet
+	else if(hasfeet)//Or feet
 		perp.feet_blood_color = basecolor
 		perp.track_blood = max(amount,perp.track_blood)
 		if(!perp.feet_blood_DNA)
@@ -86,14 +86,14 @@ var/global/list/image/splatter_cache=list()
 
 /obj/effect/decal/cleanable/blood/attack_hand(mob/living/carbon/human/user)
 	..()
-	if (amount && istype(user))
+	if(amount && istype(user))
 		add_fingerprint(user)
-		if (user.gloves)
+		if(user.gloves)
 			return
 		var/taken = rand(1,amount)
 		amount -= taken
 		to_chat(user, "<span class='notice'>You get some of \the [src] on your hands.</span>")
-		if (!user.blood_DNA)
+		if(!user.blood_DNA)
 			user.blood_DNA = list()
 		user.blood_DNA |= blood_DNA.Copy()
 		user.bloody_hands += taken
@@ -199,9 +199,9 @@ var/global/list/image/splatter_cache=list()
 /obj/effect/decal/cleanable/blood/gibs/proc/streak(var/list/directions)
 	set waitfor = 0
 	var/direction = pick(directions)
-	for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
+	for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
 		sleep(3)
-		if (i > 0)
+		if(i > 0)
 			var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
 			b.basecolor = src.basecolor
 			b.update_icon()
@@ -209,7 +209,7 @@ var/global/list/image/splatter_cache=list()
 				var/datum/disease/ND = D.Copy(1)
 				b.viruses += ND
 				ND.holder = b
-		if (step_to(src, get_step(src, direction), 0))
+		if(step_to(src, get_step(src, direction), 0))
 			break
 
 
diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm
index aba35274585..16688932b9c 100644
--- a/code/game/objects/effects/decals/Cleanable/robots.dm
+++ b/code/game/objects/effects/decals/Cleanable/robots.dm
@@ -15,17 +15,17 @@
 /obj/effect/decal/cleanable/blood/gibs/robot/streak(var/list/directions)
 	spawn (0)
 		var/direction = pick(directions)
-		for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
+		for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
 			sleep(3)
-			if (i > 0)
-				if (prob(40))
+			if(i > 0)
+				if(prob(40))
 					var/obj/effect/decal/cleanable/blood/oil/streak = new(src.loc)
 					streak.update_icon()
-				else if (prob(10))
+				else if(prob(10))
 					var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 					s.set_up(3, 1, src)
 					s.start()
-			if (step_to(src, get_step(src, direction), 0))
+			if(step_to(src, get_step(src, direction), 0))
 				break
 
 /obj/effect/decal/cleanable/blood/gibs/robot/limb
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 446f1f39e89..878adf6688b 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -5,7 +5,7 @@
 	var/noclear = 0    //if it has this, don't delete it when its' scooped up
 
 /obj/effect/decal/cleanable/New()
-	if (random_icon_states && length(src.random_icon_states) > 0)
+	if(random_icon_states && length(src.random_icon_states) > 0)
 		src.icon_state = pick(src.random_icon_states)
 	create_reagents(100)
 	..()
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index d73edde1525..464590b762f 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -56,7 +56,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 /obj/effect/effect/water/New()
 	..()
 	//var/turf/T = src.loc
-	//if (istype(T, /turf))
+	//if(istype(T, /turf))
 	//	T.firelevel = 0 //TODO: FIX
 	spawn( 70 )
 		delete()
@@ -65,9 +65,9 @@ would spawn and follow the beaker, even if it is carried or thrown.
 
 /obj/effect/effect/water/Move(turf/newloc)
 	//var/turf/T = src.loc
-	//if (istype(T, /turf))
+	//if(istype(T, /turf))
 	//	T.firelevel = 0 //TODO: FIX
-	if (--src.life < 1)
+	if(--src.life < 1)
 		//SN src = null
 		delete()
 	if(newloc.density)
@@ -177,21 +177,21 @@ steam.start() -- spawns the effect
 	..()
 	playsound(src.loc, "sparks", 100, 1)
 	var/turf/T = loc
-	if (istype(T, /turf))
+	if(istype(T, /turf))
 		T.hotspot_expose(1000, 100)
 	spawn (100)
 		qdel(src)
 
 /obj/effect/effect/sparks/Destroy()
 	var/turf/T = src.loc
-	if (istype(T, /turf))
+	if(istype(T, /turf))
 		T.hotspot_expose(1000,100)
 	return ..()
 
 /obj/effect/effect/sparks/Move()
 	..()
 	var/turf/T = src.loc
-	if (istype(T, /turf))
+	if(istype(T, /turf))
 		T.hotspot_expose(1000,100)
 	return
 
@@ -325,11 +325,11 @@ steam.start() -- spawns the effect
 /obj/effect/effect/bad_smoke/Move()
 	..()
 	for(var/mob/living/carbon/M in get_turf(src))
-		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
+		if(M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
 		else
 			M.drop_item()
 			M.adjustOxyLoss(1)
-			if (M.coughedtime != 1)
+			if(M.coughedtime != 1)
 				M.coughedtime = 1
 				M.emote("cough")
 				spawn ( 20 )
@@ -348,12 +348,12 @@ steam.start() -- spawns the effect
 /obj/effect/effect/bad_smoke/Crossed(mob/living/carbon/M as mob )
 	..()
 	if(istype(M, /mob/living/carbon))
-		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
+		if(M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
 			return
 		else
 			M.drop_item()
 			M.adjustOxyLoss(1)
-			if (M.coughedtime != 1)
+			if(M.coughedtime != 1)
 				M.coughedtime = 1
 				M.emote("cough")
 				spawn ( 20 )
@@ -579,12 +579,12 @@ steam.start() -- spawns the effect
 /obj/effect/effect/sleep_smoke/Move()
 	..()
 	for(var/mob/living/carbon/M in get_turf(src))
-		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
-//		if (M.wear_suit, /obj/item/clothing/suit/wizrobe && (M.hat, /obj/item/clothing/head/wizard) && (M.shoes, /obj/item/clothing/shoes/sandal))  // I'll work on it later
+		if(M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
+//		if(M.wear_suit, /obj/item/clothing/suit/wizrobe && (M.hat, /obj/item/clothing/head/wizard) && (M.shoes, /obj/item/clothing/shoes/sandal))  // I'll work on it later
 		else
 			M.drop_item()
 			M:sleeping += 5
-			if (M.coughedtime != 1)
+			if(M.coughedtime != 1)
 				M.coughedtime = 1
 				M.emote("cough")
 				spawn(20)
@@ -595,13 +595,13 @@ steam.start() -- spawns the effect
 /obj/effect/effect/sleep_smoke/Crossed(mob/living/carbon/M as mob )
 	..()
 	if(istype(M, /mob/living/carbon))
-		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
-//		if (M.wear_suit, /obj/item/clothing/suit/wizrobe && (M.hat, /obj/item/clothing/head/wizard) && (M.shoes, /obj/item/clothing/shoes/sandal)) // Work on it later
+		if(M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
+//		if(M.wear_suit, /obj/item/clothing/suit/wizrobe && (M.hat, /obj/item/clothing/head/wizard) && (M.shoes, /obj/item/clothing/shoes/sandal)) // Work on it later
 			return
 		else
 			M.drop_item()
 			M:sleeping += 5
-			if (M.coughedtime != 1)
+			if(M.coughedtime != 1)
 				M.coughedtime = 1
 				M.emote("cough")
 				spawn(20)
@@ -671,10 +671,10 @@ steam.start() -- spawns the effect
 /obj/effect/effect/mustard_gas/Move()
 	..()
 	for(var/mob/living/carbon/human/R in get_turf(src))
-		if (R.internal != null && usr.wear_mask && (R.wear_mask.flags & AIRTIGHT) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
+		if(R.internal != null && usr.wear_mask && (R.wear_mask.flags & AIRTIGHT) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
 		else
 			R.burn_skin(0.75)
-			if (R.coughedtime != 1)
+			if(R.coughedtime != 1)
 				R.coughedtime = 1
 				R.emote("gasp")
 				spawn (20)
@@ -684,11 +684,11 @@ steam.start() -- spawns the effect
 
 /obj/effect/effect/mustard_gas/Crossed(mob/living/carbon/human/R as mob )
 	..()
-	if (istype(R, /mob/living/carbon/human))
-		if (R.internal != null && usr.wear_mask && (R.wear_mask.flags & AIRTIGHT) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
+	if(istype(R, /mob/living/carbon/human))
+		if(R.internal != null && usr.wear_mask && (R.wear_mask.flags & AIRTIGHT) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
 			return
 		R.burn_skin(0.75)
-		if (R.coughedtime != 1)
+		if(R.coughedtime != 1)
 			R.coughedtime = 1
 			R.emote("gasp")
 			spawn (20)
@@ -997,7 +997,7 @@ steam.start() -- spawns the effect
 	if(metal)
 		return
 
-	if (istype(AM, /mob/living/carbon))
+	if(istype(AM, /mob/living/carbon))
 		var/mob/living/carbon/M =	AM
 		if(M.slip("foam", 5, 2))
 			if(reagents)
@@ -1109,7 +1109,7 @@ steam.start() -- spawns the effect
 /obj/structure/foamedmetal/attack_hand(var/mob/user)
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
-	if ((HULK in user.mutations) || (prob(75 - metal*25)))
+	if((HULK in user.mutations) || (prob(75 - metal*25)))
 		user.visible_message("<span class='warning'>[user] smashes through \the [src].</span>", "<span class='notice'>You smash through \the [src].</span>")
 		qdel(src)
 	else
@@ -1118,7 +1118,7 @@ steam.start() -- spawns the effect
 /obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params)
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
-	if (istype(I, /obj/item/weapon/grab))
+	if(istype(I, /obj/item/weapon/grab))
 		var/obj/item/weapon/grab/G = I
 		G.affecting.loc = src.loc
 		user.visible_message("<span class='warning'>[G.assailant] smashes [G.affecting] through the foamed metal wall.</span>")
@@ -1171,7 +1171,7 @@ steam.start() -- spawns the effect
 		return
 
 	start()
-		if (amount <= 2)
+		if(amount <= 2)
 			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 			s.set_up(2, 1, location)
 			s.start()
@@ -1179,7 +1179,7 @@ steam.start() -- spawns the effect
 			for(var/mob/M in viewers(5, location))
 				to_chat(M, "\red The solution violently explodes.")
 			for(var/mob/M in viewers(1, location))
-				if (prob (50 * amount))
+				if(prob (50 * amount))
 					to_chat(M, "\red The explosion knocks you down.")
 					M.Weaken(rand(1,5))
 			return
@@ -1190,16 +1190,16 @@ steam.start() -- spawns the effect
 			var/flash = -1
 
 			// Clamp all values to MAX_EXPLOSION_RANGE
-			if (round(amount/12) > 0)
+			if(round(amount/12) > 0)
 				devastation = min (MAX_EX_DEVESTATION_RANGE, devastation + round(amount/12))
 
-			if (round(amount/6) > 0)
+			if(round(amount/6) > 0)
 				heavy = min (MAX_EX_HEAVY_RANGE, heavy + round(amount/6))
 
-			if (round(amount/3) > 0)
+			if(round(amount/3) > 0)
 				light = min (MAX_EX_LIGHT_RANGE, light + round(amount/3))
 
-			if (flash && flashing_factor)
+			if(flash && flashing_factor)
 				flash += (round(amount/4) * flashing_factor)
 
 			for(var/mob/M in viewers(8, location))
@@ -1211,11 +1211,11 @@ steam.start() -- spawns the effect
 		if(holder)
 			var/dmglevel = 4
 
-			if (round(amount/8) > 0)
+			if(round(amount/8) > 0)
 				dmglevel = 1
-			else if (round(amount/4) > 0)
+			else if(round(amount/4) > 0)
 				dmglevel = 2
-			else if (round(amount/2) > 0)
+			else if(round(amount/2) > 0)
 				dmglevel = 3
 
 			if(dmglevel<4) holder.ex_act(dmglevel)
@@ -1243,7 +1243,7 @@ steam.start() -- spawns the effect
 	src.icon = I
 	playsound(src.loc, "sparks", 100, 1)
 	var/turf/T = src.loc
-	if (istype(T, /turf))
+	if(istype(T, /turf))
 		T.hotspot_expose(3000,100)
 	spawn (100)
 		qdel(src)
@@ -1251,14 +1251,14 @@ steam.start() -- spawns the effect
 
 /obj/effect/sparkles/Destroy()
 	var/turf/T = src.loc
-	if (istype(T, /turf))
+	if(istype(T, /turf))
 		T.hotspot_expose(3000,100)
 	return ..()
 
 /obj/effect/sparkles/Move()
 	..()
 	var/turf/T = src.loc
-	if (istype(T, /turf))
+	if(istype(T, /turf))
 		T.hotspot_expose(3000,100)
 	return
 
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index ea03fea46bc..ec77aa2e3a9 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -146,11 +146,11 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				qdel(src)
 				return
 		else
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 82b3f7235d8..1d36451f3cb 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -175,7 +175,7 @@
 	new /obj/item/clothing/gloves/color/white(src.loc)
 	new /obj/item/clothing/shoes/white(src.loc)
 	new /obj/item/clothing/under/scratch(src.loc)
-	if (prob(30))
+	if(prob(30))
 		new /obj/item/clothing/head/cueball(src.loc)
 	qdel(src)
 
@@ -227,7 +227,7 @@
 
 /obj/effect/landmark/costume/imperium_monk/New()
 	new /obj/item/clothing/suit/imperium_monk(src.loc)
-	if (prob(25))
+	if(prob(25))
 		new /obj/item/clothing/mask/gas/cyborg(src.loc)
 	qdel(src)
 
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 6b9be0282e9..0d6de688dcd 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -40,10 +40,10 @@
 		return
 	if(M.anchored&&istype(M, /obj/mecha))
 		return
-	if (!( target ))
+	if(!( target ))
 		qdel(src)
 		return
-	if (istype(M, /atom/movable))
+	if(istype(M, /atom/movable))
 		if(prob(failchance)) //oh dear a problem, put em in deep space
 			src.icon_state = "portal1"
 			do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0)
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index e065941a947..97d542858be 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -38,19 +38,19 @@
 
 	var/obj/item/device/assembly/S
 
-	switch (src.btype)
+	switch(src.btype)
 		// radio
-		if (0)
+		if(0)
 
 			S = new/obj/item/device/assembly/signaler(V)
 
 		// proximity
-		if (1)
+		if(1)
 
 			S = new/obj/item/device/assembly/prox_sensor(V)
 
 		// timer
-		if (2)
+		if(2)
 
 			S = new/obj/item/device/assembly/timer(V)
 
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index d88d5a309d1..b4b70424377 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -58,65 +58,97 @@
 	//maintcentral:			2  items,  2 spots 0 extra (08/08/2014)
 	//port:					5  items,  5 spots 0 extra (08/08/2014)
 	loot = list(
-				/obj/item/bodybag = 1,
-				/obj/item/clothing/glasses/meson = 2,
-				/obj/item/clothing/glasses/sunglasses = 1,
-				/obj/item/clothing/gloves/color/yellow/fake = 1,
-				/obj/item/clothing/head/hardhat = 1,
-				/obj/item/clothing/head/hardhat/red = 1,
-				/obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 1,
-				/obj/item/clothing/head/ushanka = 1,
-				/obj/item/clothing/head/welding = 1,
-				/obj/item/clothing/mask/gas = 15,
-				/obj/item/clothing/suit/storage/hazardvest = 1,
-				/obj/item/clothing/under/rank/vice = 1,
-				/obj/item/device/assembly/prox_sensor = 4,
-				/obj/item/device/assembly/timer = 3,
-				/obj/item/device/flashlight = 4,
-				/obj/item/device/flashlight/pen = 1,
-				/obj/item/device/multitool = 2,
-				/obj/item/device/radio/off = 2,
-				/obj/item/device/t_scanner = 6,
-				/obj/item/stack/cable_coil = 4,
-				/obj/item/stack/cable_coil{amount = 5} = 6,
-				/obj/item/stack/medical/advanced/bruise_pack = 1,
-				/obj/item/stack/rods{amount = 10} = 9,
-				/obj/item/stack/rods{amount = 23} = 1,
-				/obj/item/stack/rods{amount = 50} = 1,
-				/obj/item/stack/sheet/cardboard = 2,
-				/obj/item/stack/sheet/metal{amount = 20} = 1,
-				/obj/item/stack/sheet/mineral/plasma{layer = 2.9} = 1,
-				/obj/item/stack/sheet/rglass = 1,
-				/obj/item/weapon/book/manual/engineering_construction = 1,
-				/obj/item/weapon/book/manual/engineering_hacking = 1,
-				/obj/item/clothing/head/cone = 1,
-				/obj/item/weapon/coin/silver = 1,
-				/obj/item/weapon/coin/twoheaded = 1,
-				/obj/item/weapon/contraband/poster = 1,
-				/obj/item/weapon/crowbar = 1,
-				/obj/item/weapon/crowbar/red = 1,
-				/obj/item/weapon/extinguisher = 11,
+				/obj/item/bodybag = 10,
+				/obj/item/clothing/glasses/meson = 20,
+				/obj/item/clothing/glasses/sunglasses = 10,
+				/obj/item/clothing/gloves/color/yellow/fake = 15,
+				/obj/item/clothing/gloves/color/fyellow = 10,
+				/obj/item/clothing/gloves/color/yellow = 5,
+				/obj/item/clothing/gloves/color/black = 20,
+				/obj/item/clothing/head/hardhat = 10,
+				/obj/item/clothing/head/hardhat/red = 10,
+				/obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 10,
+				/obj/item/clothing/head/ushanka = 10,
+				/obj/item/clothing/head/welding = 10,
+				/obj/item/clothing/mask/gas = 10,
+				/obj/item/clothing/suit/storage/hazardvest = 10,
+				/obj/item/clothing/under/rank/vice = 10,
+				/obj/item/device/assembly/prox_sensor = 40,
+				/obj/item/device/assembly/timer = 30,
+				/obj/item/device/flashlight = 40,
+				/obj/item/device/flashlight/pen = 10,
+				/obj/item/device/multitool = 20,
+				/obj/item/device/radio/off = 20,
+				/obj/item/device/t_scanner = 60,
+				/obj/item/stack/cable_coil = 40,
+				/obj/item/stack/cable_coil{amount = 5} = 60,
+				/obj/item/stack/medical/advanced/bruise_pack = 10,
+				/obj/item/stack/rods{amount = 10} = 80,
+				/obj/item/stack/rods{amount = 23} = 20,
+				/obj/item/stack/rods{amount = 50} = 10,
+				/obj/item/stack/sheet/cardboard = 20,
+				/obj/item/stack/sheet/metal{amount = 20} = 10,
+				/obj/item/stack/sheet/mineral/plasma{layer = 2.9} = 10,
+				/obj/item/stack/sheet/rglass = 10,
+				/obj/item/weapon/book/manual/engineering_construction = 10,
+				/obj/item/weapon/book/manual/engineering_hacking = 10,
+				/obj/item/clothing/head/cone = 10,
+				/obj/item/weapon/coin/silver = 10,
+				/obj/item/weapon/coin/twoheaded = 10,
+				/obj/item/weapon/contraband/poster = 10,
+				/obj/item/weapon/crowbar = 10,
+				/obj/item/weapon/crowbar/red = 10,
+				/obj/item/weapon/extinguisher = 90,
 				//obj/item/weapon/gun/projectile/revolver/russian = 1, //disabled until lootdrop is a proper world proc.
-				/obj/item/weapon/hand_labeler = 1,
-				/obj/item/weapon/paper/crumpled = 1,
-				/obj/item/weapon/pen = 1,
-				/obj/item/weapon/plantspray/pests = 1,
-				/obj/item/weapon/stock_parts/cell = 3,
-				/obj/item/weapon/storage/belt/utility = 2,
-				/obj/item/weapon/storage/box = 2,
-				/obj/item/weapon/storage/box/cups = 1,
-				/obj/item/weapon/storage/box/donkpockets = 1,
-				/obj/item/weapon/storage/box/lights/mixed = 3,
-				/obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 1,
-				/obj/item/weapon/storage/toolbox/mechanical = 1,
-				/obj/item/weapon/screwdriver = 3,
-				/obj/item/weapon/tank/emergency_oxygen = 2,
-				/obj/item/weapon/vending_refill/cola = 1,
-				/obj/item/weapon/weldingtool = 3,
-				/obj/item/weapon/wirecutters = 1,
-				/obj/item/weapon/wrench = 4,
-				/obj/item/weapon/relic = 3,
-				"" = 11
+				/obj/item/weapon/hand_labeler = 10,
+				/obj/item/weapon/paper/crumpled = 10,
+				/obj/item/weapon/pen = 10,
+				 /obj/item/weapon/minihoe = 10,
+				/obj/item/weapon/plantspray/pests = 10,
+				/obj/item/weapon/stock_parts/cell = 30,
+				/obj/item/weapon/storage/belt/utility = 20,
+				/obj/item/weapon/storage/box = 20,
+				/obj/item/weapon/storage/box/cups = 10,
+				/obj/item/weapon/storage/box/donkpockets = 10,
+				/obj/item/weapon/storage/box/lights/mixed = 30,
+				/obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 10,
+				/obj/item/weapon/storage/toolbox/mechanical = 10,
+				/obj/item/weapon/screwdriver = 30,
+				/obj/item/weapon/tank/emergency_oxygen = 20,
+				/obj/item/weapon/tank/emergency_oxygen/engi = 10,
+				/obj/item/weapon/vending_refill/cola = 10,
+				/obj/item/weapon/weldingtool = 30,
+				/obj/item/weapon/wirecutters = 10,
+				/obj/item/weapon/wrench = 40,
+				/obj/item/weapon/relic = 35,
+				/obj/item/clothing/shoes/brown = 30,
+				/obj/item/seeds/ambrosiadeusseed = 10,
+				/obj/item/seeds/ambrosiavulgarisseed = 20,
+				/obj/item/clothing/under/color/black = 30,
+				/obj/item/stack/tape_roll = 10,
+				////////////////CONTRABAND STUFF//////////////////
+				/obj/item/weapon/grenade/clown_grenade = 3,
+				/obj/item/seeds/ambrosiavulgarisseed/cruciatus = 3,
+				/obj/item/weapon/gun/projectile/automatic/pistol/empty = 1,
+				/obj/item/ammo_box/magazine/m10mm = 4,
+				/obj/item/weapon/soap/syndie = 7,
+				/obj/item/weapon/gun/syringe/syndicate = 2,
+				/obj/item/weapon/suppressor = 4,
+				/obj/item/clothing/under/chameleon = 2,
+				/obj/item/weapon/stamp/chameleon = 2,
+				/obj/item/clothing/shoes/syndigaloshes = 5,
+				/obj/item/clothing/mask/gas/voice = 2,
+				/obj/item/weapon/dnascrambler = 1,
+				/obj/item/weapon/storage/backpack/satchel_flat = 2,
+				/obj/item/weapon/storage/toolbox/syndicate = 2,
+				/obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake = 2,
+				/obj/item/weapon/storage/belt/military = 2,
+				/obj/item/weapon/storage/box/syndie_kit/space = 2,
+				/obj/item/device/multitool/ai_detect = 2,
+				/obj/item/weapon/implanter/storage = 1,
+				/obj/item/toy/cards/deck/syndicate = 2,
+				/obj/item/weapon/storage/secure/briefcase/syndie = 2,
+				"" = 90
 				)
 
 /obj/effect/spawner/lootdrop/trade_sol_rare
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index f87e97f9cb0..79b09f48835 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -13,10 +13,10 @@
 		if(1.0)
 			qdel(src)
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				qdel(src)
 	return
 
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index bdec24c7902..32bf9a2fea5 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -222,10 +222,10 @@
 		if(dist < dev)
 			T.color = "red"
 			T.maptext = "Dev"
-		else if (dist < heavy)
+		else if(dist < heavy)
 			T.color = "yellow"
 			T.maptext = "Heavy"
-		else if (dist < light)
+		else if(dist < light)
 			T.color = "blue"
 			T.maptext = "Light"
 		else
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 2a3fe4a2a03..d74d831deb5 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -17,7 +17,7 @@
 	var/r_speed = 1.0
 	var/health = null
 	var/hitsound = null
-	var/w_class = 3.0
+	var/w_class = 3
 	var/slot_flags = 0		//This is used to determine on which slots an item can fit.
 	pass_flags = PASSTABLE
 	pressure_resistance = 3
@@ -44,7 +44,7 @@
 	var/permeability_coefficient = 1 // for chemicals/diseases
 	var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
 	var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
-	var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	var/armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	var/armour_penetration = 0 //percentage of armour effectiveness to remove
 	var/list/allowed = null //suit storage stuff.
 	var/obj/item/device/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers.
@@ -55,6 +55,11 @@
 	var/put_on_delay = DEFAULT_ITEM_PUTON_DELAY
 	var/breakouttime = 0
 
+	var/flags_size = 0 //flag, primarily used for clothing to determine if a fatty can wear something or not.
+
+	var/block_chance = 0
+	var/hit_reaction_chance = 0 //If you want to have something unrelated to blocking/armour piercing etc. Maybe not needed, but trying to think ahead/allow more freedom
+
 	/* Species-specific sprites, concept stolen from Paradise//vg/.
 	ex:
 	sprite_sheets = list(
@@ -88,11 +93,11 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				qdel(src)
 				return
 		else
@@ -167,11 +172,11 @@
 
 
 /obj/item/attack_hand(mob/user as mob)
-	if (!user) return 0
-	if (hasorgans(user))
+	if(!user) return 0
+	if(hasorgans(user))
 		var/mob/living/carbon/human/H = user
 		var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
-		if (user.hand)
+		if(user.hand)
 			temp = H.organs_by_name["l_hand"]
 		if(!temp)
 			to_chat(user, "<span class='warning'>You try to use your hand, but it's missing!</span>")
@@ -180,13 +185,13 @@
 			to_chat(user, "<span class='warning'>You try to move your [temp.name], but cannot!</span>")
 			return 0
 
-	if (istype(src.loc, /obj/item/weapon/storage))
+	if(istype(src.loc, /obj/item/weapon/storage))
 		//If the item is in a storage item, take it out
 		var/obj/item/weapon/storage/S = src.loc
 		S.remove_from_storage(src)
 
 	src.throwing = 0
-	if (loc == user)
+	if(loc == user)
 		if(!user.unEquip(src))
 			return 0
 
@@ -211,13 +216,13 @@
 			to_chat(user, "Your claws aren't capable of such fine manipulation.")
 			return
 
-	if (istype(src.loc, /obj/item/weapon/storage))
+	if(istype(src.loc, /obj/item/weapon/storage))
 		for(var/mob/M in range(1, src.loc))
-			if (M.s_active == src.loc)
-				if (M.client)
+			if(M.s_active == src.loc)
+				if(M.client)
 					M.client.screen -= src
 	src.throwing = 0
-	if (src.loc == user)
+	if(src.loc == user)
 		if(!user.unEquip(src))
 			return
 	else
@@ -240,12 +245,14 @@
 	attack_hand(A)
 
 /obj/item/attack_ai(mob/user as mob)
-	if (istype(src.loc, /obj/item/weapon/robot_module))
+	if(istype(src.loc, /obj/item/weapon/robot_module))
 		//If the item is part of a cyborg module, equip it
-		if(!isrobot(user)) return
+		if(!isrobot(user))
+			return
 		var/mob/living/silicon/robot/R = user
-		R.activate_module(src)
-		R.hud_used.update_robot_modules_display()
+		if(!R.low_power_mode) //can't equip modules with an empty cell.
+			R.activate_module(src)
+			R.hud_used.update_robot_modules_display()
 
 // Due to storage type consolidation this should get used more now.
 // I have cleaned it up a little, but it could probably use more.  -Sayu
@@ -280,6 +287,12 @@
 
 	return
 
+/obj/item/proc/hit_reaction(mob/living/carbon/human/owner, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+	if(prob(final_block_chance))
+		owner.visible_message("<span class='danger'>[owner] blocks [attack_text] with [src]!</span>")
+		return 1
+	return 0
+
 /obj/item/proc/talk_into(mob/M as mob, var/text, var/channel=null)
 	return
 
@@ -372,9 +385,6 @@
 /obj/item/proc/ui_action_click()
 	attack_self(usr)
 
-/obj/item/proc/IsShield()
-	return 0
-
 /obj/item/proc/IsReflect(var/def_zone) //This proc determines if and at what% an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit
 	return 0
 
@@ -439,7 +449,7 @@
 				M.eye_blurry += 10
 				M.Paralyse(1)
 				M.Weaken(2)
-			if (eyes.damage >= eyes.min_broken_damage)
+			if(eyes.damage >= eyes.min_broken_damage)
 				if(M.stat != 2)
 					to_chat(M, "<span class='danger'>You go blind!</span>")
 		var/obj/item/organ/external/affecting = H.get_organ("head")
@@ -460,7 +470,7 @@
 
 
 /obj/item/add_blood(mob/living/carbon/human/M as mob)
-	if (!..())
+	if(!..())
 		return 0
 
 	if(istype(src, /obj/item/weapon/melee/energy))
diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm
index 0e977fc5ead..8ce5ecc288f 100644
--- a/code/game/objects/items/ashtray.dm
+++ b/code/game/objects/items/ashtray.dm
@@ -15,59 +15,59 @@
 	return
 
 /obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (health < 1)
+	if(health < 1)
 		return
-	if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match))
-		if (contents.len >= max_butts)
+	if(istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match))
+		if(contents.len >= max_butts)
 			to_chat(user, "This ashtray is full.")
 			return
 		user.unEquip(W)
 		W.loc = src
 
-		if (istype(W,/obj/item/clothing/mask/cigarette))
+		if(istype(W,/obj/item/clothing/mask/cigarette))
 			var/obj/item/clothing/mask/cigarette/cig = W
-			if (cig.lit == 1)
+			if(cig.lit == 1)
 				src.visible_message("[user] crushes [cig] in [src], putting it out.")
 				processing_objects.Remove(cig)
 				var/obj/item/butt = new cig.type_butt(src)
 				cig.transfer_fingerprints_to(butt)
 				qdel(cig)
-			else if (cig.lit == 0)
+			else if(cig.lit == 0)
 				to_chat(user, "You place [cig] in [src] without even smoking it. Why would you do that?")
 
 		src.visible_message("[user] places [W] in [src].")
 		user.update_inv_l_hand()
 		user.update_inv_r_hand()
 		add_fingerprint(user)
-		if (contents.len == max_butts)
+		if(contents.len == max_butts)
 			icon_state = icon_full
 			desc = empty_desc + " It's stuffed full."
-		else if (contents.len > max_butts/2)
+		else if(contents.len > max_butts/2)
 			icon_state = icon_half
 			desc = empty_desc + " It's half-filled."
 	else
 		health = max(0,health - W.force)
 		to_chat(user, "You hit [src] with [W].")
-		if (health < 1)
+		if(health < 1)
 			die()
 	return
 
 /obj/item/ashtray/throw_impact(atom/hit_atom)
-	if (health > 0)
+	if(health > 0)
 		health = max(0,health - 3)
-		if (health < 1)
+		if(health < 1)
 			die()
 			return
-		if (contents.len)
+		if(contents.len)
 			src.visible_message("\red [src] slams into [hit_atom] spilling its contents!")
-		for (var/obj/item/clothing/mask/cigarette/O in contents)
+		for(var/obj/item/clothing/mask/cigarette/O in contents)
 			O.loc = src.loc
 		icon_state = icon_empty
 	return ..()
 
 /obj/item/ashtray/proc/die()
 	src.visible_message("\red [src] shatters spilling its contents!")
-	for (var/obj/item/clothing/mask/cigarette/O in contents)
+	for(var/obj/item/clothing/mask/cigarette/O in contents)
 		O.loc = src.loc
 	icon_state = icon_broken
 
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 70ede0a075d..5f46a2a5cb0 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -153,7 +153,7 @@
 
 
 /obj/item/areaeditor/proc/get_area_type(var/area/A = get_area())
-	if (istype(A,/area/space))
+	if(istype(A,/area/space))
 		return AREA_SPACE
 	var/list/SPECIALS = list(
 		/area/shuttle,
@@ -167,8 +167,8 @@
 		/area/prison
 		// /area/derelict //commented out, all hail derelict-rebuilders!
 	)
-	for (var/type in SPECIALS)
-		if ( istype(A,type) )
+	for(var/type in SPECIALS)
+		if( istype(A,type) )
 			return AREA_SPECIAL
 	return AREA_STATION
 
@@ -229,7 +229,7 @@
 
 
 /obj/item/areaeditor/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle)
-	if (!oldtitle) // or replacetext goes to infinite loop
+	if(!oldtitle) // or replacetext goes to infinite loop
 		return
 	for(var/obj/machinery/alarm/M in A)
 		M.name = replacetext(M.name,oldtitle,title)
@@ -244,28 +244,28 @@
 	//TODO: much much more. Unnamed airlocks, cameras, etc.
 
 /obj/item/areaeditor/proc/check_tile_is_border(var/turf/T2,var/dir)
-	if (istype(T2, /turf/space))
+	if(istype(T2, /turf/space))
 		return BORDER_SPACE //omg hull breach we all going to die here
-	if (istype(T2, /turf/simulated/shuttle))
+	if(istype(T2, /turf/simulated/shuttle))
 		return BORDER_SPACE
-	if (get_area_type(T2.loc)!=AREA_SPACE)
+	if(get_area_type(T2.loc)!=AREA_SPACE)
 		return BORDER_BETWEEN
-	if (istype(T2, /turf/simulated/wall))
+	if(istype(T2, /turf/simulated/wall))
 		return BORDER_2NDTILE
-	if (!istype(T2, /turf/simulated))
+	if(!istype(T2, /turf/simulated))
 		return BORDER_BETWEEN
 
-	for (var/obj/structure/window/W in T2)
+	for(var/obj/structure/window/W in T2)
 		if(turn(dir,180) == W.dir)
 			return BORDER_BETWEEN
-		if (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST))
+		if(W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST))
 			return BORDER_2NDTILE
 	for(var/obj/machinery/door/window/D in T2)
 		if(turn(dir,180) == D.dir)
 			return BORDER_BETWEEN
-	if (locate(/obj/machinery/door) in T2)
+	if(locate(/obj/machinery/door) in T2)
 		return BORDER_2NDTILE
-	if (locate(/obj/structure/falsewall) in T2)
+	if(locate(/obj/structure/falsewall) in T2)
 		return BORDER_2NDTILE
 
 	return BORDER_NONE
@@ -275,23 +275,23 @@
 	var/list/turf/found = new
 	var/list/turf/pending = list(first)
 	while(pending.len)
-		if (found.len+pending.len > 300)
+		if(found.len+pending.len > 300)
 			return ROOM_ERR_TOOLARGE
 		var/turf/T = pending[1] //why byond havent list::pop()?
 		pending -= T
-		for (var/dir in cardinal)
+		for(var/dir in cardinal)
 			var/skip = 0
-			for (var/obj/structure/window/W in T)
+			for(var/obj/structure/window/W in T)
 				if(dir == W.dir || (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST)))
 					skip = 1; break
-			if (skip) continue
+			if(skip) continue
 			for(var/obj/machinery/door/window/D in T)
 				if(dir == D.dir)
 					skip = 1; break
-			if (skip) continue
+			if(skip) continue
 
 			var/turf/NT = get_step(T,dir)
-			if (!isturf(NT) || (NT in found) || (NT in pending))
+			if(!isturf(NT) || (NT in found) || (NT in pending))
 				continue
 
 			switch(check_tile_is_border(NT,dir))
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 108dfd28de8..e7443755978 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -5,7 +5,7 @@
 	desc = "A folded bag designed for the storage and transportation of cadavers."
 	icon = 'icons/obj/bodybag.dmi'
 	icon_state = "bodybag_folded"
-	w_class = 2.0
+	w_class = 2
 
 	attack_self(mob/user)
 		var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
@@ -41,14 +41,14 @@
 
 
 	attackby(W as obj, mob/user as mob, params)
-		if (istype(W, /obj/item/weapon/pen))
+		if(istype(W, /obj/item/weapon/pen))
 			var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
-			if (user.get_active_hand() != W)
+			if(user.get_active_hand() != W)
 				return
-			if (!in_range(src, user) && src.loc != user)
+			if(!in_range(src, user) && src.loc != user)
 				return
 			t = sanitize(copytext(t,1,MAX_MESSAGE_LEN))
-			if (t)
+			if(t)
 				src.name = "body bag - "
 				src.name += t
 				src.overlays += image(src.icon, "bodybag_label")
diff --git a/code/game/objects/items/changestone.dm b/code/game/objects/items/changestone.dm
index 0074303a88f..62d56614a07 100644
--- a/code/game/objects/items/changestone.dm
+++ b/code/game/objects/items/changestone.dm
@@ -8,7 +8,7 @@ obj/item/changestone/attack_hand(var/mob/user as mob)
 	if(istype(user,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
 		if(!H.gloves)
-			if (H.gender == FEMALE)
+			if(H.gender == FEMALE)
 				H.change_gender(MALE)
 			else
 				H.change_gender(FEMALE)
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 6da176f8ba8..9f0388bc8cd 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -7,7 +7,7 @@
 	desc = "A colourful crayon. Looks tasty. Mmmm..."
 	icon = 'icons/obj/crayons.dmi'
 	icon_state = "crayonred"
-	w_class = 1.0
+	w_class = 1
 	slot_flags = SLOT_BELT | SLOT_EARS
 	attack_verb = list("attacked", "coloured")
 	var/colour = "#FF0000" //RGB
@@ -72,7 +72,7 @@
 			temp = pick(graffiti)
 		else
 			temp = href_list["type"]
-	if ((usr.restrained() || usr.stat || usr.get_active_hand() != src))
+	if((usr.restrained() || usr.stat || usr.get_active_hand() != src))
 		return
 	drawtype = temp
 	update_window(usr)
@@ -160,7 +160,7 @@
 	..()
 
 /obj/item/toy/crayon/mime/Topic(href,href_list)
-	if ((usr.restrained() || usr.stat || usr.get_active_hand() != src))
+	if((usr.restrained() || usr.stat || usr.get_active_hand() != src))
 		return
 	if(href_list["color"])
 		if(colour != "#FFFFFF")
@@ -188,7 +188,7 @@
 
 	if(href_list["color"])
 		var/temp = input(usr, "Please select colour.", "Crayon colour") as color
-		if ((usr.restrained() || usr.stat || usr.get_active_hand() != src))
+		if((usr.restrained() || usr.stat || usr.get_active_hand() != src))
 			return
 		colour = temp
 		update_window(usr)
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 1bf7edac749..d1f44316757 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/aicards.dmi'
 	icon_state = "aicard" // aicard-full
 	item_state = "electronic"
-	w_class = 2.0
+	w_class = 2
 	slot_flags = SLOT_BELT
 	flags = NOBLUDGEON
 	var/flush = null
@@ -26,7 +26,7 @@
 	var/mob/living/silicon/ai/AI = locate(/mob/living/silicon/ai) in src //AI is inside.
 	if(AI)
 		name = "intelliCard - [AI.name]"
-		if (AI.stat == DEAD)
+		if(AI.stat == DEAD)
 			icon_state = "aicard-404"
 		else
 			icon_state = "aicard-full"
@@ -60,7 +60,7 @@
 		data["has_laws"] = laws.len
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "aicard.tmpl", "[name]", 600, 400, state = state)
 		ui.set_initial_data(data)
 		ui.open()
@@ -77,25 +77,25 @@
 
 	var/user = usr
 
-	if (href_list["wipe"])
+	if(href_list["wipe"])
 		var/confirm = alert("Are you sure you want to wipe this card's memory? This cannot be undone once started.", "Confirm Wipe", "Yes", "No")
 		if(confirm == "Yes" && (CanUseTopic(user, state) == STATUS_INTERACTIVE))
 			msg_admin_attack("[key_name_admin(user)] wiped [key_name_admin(AI)] with \the [src].")
 			flush = 1
 			AI.suiciding = 1
 			to_chat(AI, "Your core files are being wiped!")
-			while (AI && AI.stat != DEAD)
+			while(AI && AI.stat != DEAD)
 				AI.adjustOxyLoss(2)
 				AI.updatehealth()
 				sleep(10)
 			flush = 0
 
-	if (href_list["radio"])
+	if(href_list["radio"])
 		AI.aiRadio.disabledAi = text2num(href_list["radio"])
 		to_chat(AI, "<span class='warning'>Your Subspace Transceiver has been [AI.aiRadio.disabledAi ? "disabled" : "enabled"]!</span>")
 		to_chat(user, "<span class='notice'>You [AI.aiRadio.disabledAi ? "disable" : "enable"] the AI's Subspace Transceiver.</span>")
 
-	if (href_list["wireless"])
+	if(href_list["wireless"])
 		AI.control_disabled = text2num(href_list["wireless"])
 		to_chat(AI, "<span class='warning'>Your wireless interface has been [AI.control_disabled ? "disabled" : "enabled"]!</span>")
 		to_chat(user, "<span class='notice'>You [AI.control_disabled ? "disable" : "enable"] the AI's wireless interface.</span>")
diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm
index be4009b0ed9..2d08b4f582b 100644
--- a/code/game/objects/items/devices/autopsy.dm
+++ b/code/game/objects/items/devices/autopsy.dm
@@ -8,7 +8,7 @@
 	icon = 'icons/obj/autopsy_scanner.dmi'
 	icon_state = ""
 	flags = CONDUCT
-	w_class = 1.0
+	w_class = 1
 	origin_tech = "materials=1;biotech=1"
 	var/list/datum/autopsy_data_scanner/wdata = list()
 	var/list/datum/autopsy_data_scanner/chemtraces = list()
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
index 003110f76cd..974835b6a2d 100644
--- a/code/game/objects/items/devices/camera_bug.dm
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -55,7 +55,7 @@
 	interact(user)
 
 /obj/item/device/camera_bug/check_eye(var/mob/user as mob)
-	if (user.stat || loc != user || !user.canmove || user.eye_blind || !current)
+	if(user.stat || loc != user || !user.canmove || user.eye_blind || !current)
 		user.reset_view(null)
 		user.unset_machine()
 		return null
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index d8a708d86b7..41bfeb4d8f6 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -7,7 +7,7 @@
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
-	w_class = 2.0
+	w_class = 2
 	origin_tech = "syndicate=4;magnets=4"
 	var/can_use = 1
 	var/obj/effect/dummy/chameleon/active_dummy = null
diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm
index 4b96ba904dd..0984b437155 100644
--- a/code/game/objects/items/devices/debugger.dm
+++ b/code/game/objects/items/devices/debugger.dm
@@ -11,7 +11,7 @@
 	icon_state = "hacktool-g"
 	flags = CONDUCT
 	force = 5.0
-	w_class = 2.0
+	w_class = 2
 	throwforce = 5.0
 	throw_range = 15
 	throw_speed = 3
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 5ff8f7dff33..db2519eca43 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -148,7 +148,7 @@ obj/item/device/flashlight/lamp/bananalamp
 /obj/item/device/flashlight/flare
 	name = "flare"
 	desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'."
-	w_class = 2.0
+	w_class = 2
 	brightness_on = 8 // Made it brighter (from 7 to 8).
 	light_color = "#ff0000" // changed colour to a more brighter red.
 	icon_state = "flare"
@@ -267,7 +267,7 @@ obj/item/device/flashlight/lamp/bananalamp
 
 /obj/item/device/flashlight/emp/afterattack(atom/A as mob|obj, mob/user, proximity)
 	if(!proximity) return
-	if (emp_cur_charges > 0)
+	if(emp_cur_charges > 0)
 		emp_cur_charges -= 1
 		A.visible_message("<span class='danger'>[user] blinks \the [src] at \the [A].", \
 											"<span class='userdanger'>[user] blinks \the [src] at \the [A].")
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index ba49f4a9e4c..0996fdd6de5 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -71,10 +71,10 @@
 /obj/item/device/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user, var/params)
 	if( !(user in (viewers(7,target))) )
 		return
-	if (!diode)
+	if(!diode)
 		to_chat(user, "<span class='notice'>You point [src] at [target], but nothing happens!</span>")
 		return
-	if (!user.IsAdvancedToolUser())
+	if(!user.IsAdvancedToolUser())
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 	if(ishuman(user))
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 7028153dff2..263f287a823 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -3,7 +3,7 @@
 	desc = "A device used to project your voice. Loudly."
 	icon_state = "megaphone"
 	item_state = "radio"
-	w_class = 1.0
+	w_class = 1
 	flags = CONDUCT
 
 	var/spamcheck = 0
@@ -12,7 +12,7 @@
 	var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TATER!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!")
 
 /obj/item/device/megaphone/attack_self(mob/living/user as mob)
-	if (user.client)
+	if(user.client)
 		if(user.client.prefs.muted & MUTE_IC)
 			to_chat(src, "\red You cannot speak in IC (muted).")
 			return
@@ -39,7 +39,7 @@
 	if(!message)
 		return
 	message = capitalize(message)
-	if ((src.loc == user && usr.stat == 0))
+	if((src.loc == user && usr.stat == 0))
 		if(emagged)
 			if(insults)
 				saymsg(user, pick(insultmsg))
diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index 7c1d4d6d7f2..52603b99a0b 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -18,7 +18,7 @@
 	if(!proximity)
 		return
 
-	if (!target_species)
+	if(!target_species)
 		return	//it shouldn't be null, okay?
 
 	if(!parts)
@@ -28,18 +28,18 @@
 		return
 
 	var/allowed = 0
-	for (var/permitted_type in permitted_types)
+	for(var/permitted_type in permitted_types)
 		if(istype(O, permitted_type))
 			allowed = 1
 
 	var/obj/item/clothing/I = O
-	if (!istype(I) || !allowed)
+	if(!istype(I) || !allowed)
 		to_chat(user, "<span class='notice'>[src] is unable to modify that.</span>")
 		return
 
 	var/excluding = ("exclude" in I.species_restricted)
 	var/in_list = (target_species in I.species_restricted)
-	if (excluding ^ in_list)
+	if(excluding ^ in_list)
 		to_chat(user, "<span class='notice'>[I] is already modified.</span>")
 		return
 
@@ -53,9 +53,9 @@
 
 	I.refit_for_species(target_species)
 
-	if (istype(I, /obj/item/clothing/head/helmet))
+	if(istype(I, /obj/item/clothing/head/helmet))
 		parts &= ~MODKIT_HELMET
-	if (istype(I, /obj/item/clothing/suit))
+	if(istype(I, /obj/item/clothing/suit))
 		parts &= ~MODKIT_SUIT
 
 	if(!parts)
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 9efa958caca..742afb83c81 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -10,7 +10,7 @@
 	icon_state = "multitool"
 	flags = CONDUCT
 	force = 5.0
-	w_class = 2.0
+	w_class = 2
 	throwforce = 5.0
 	throw_range = 15
 	throw_speed = 3
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 2dd138265e7..893ce504319 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/aicards.dmi'
 	icon_state = "pai"
 	item_state = "electronic"
-	w_class = 2.0
+	w_class = 2
 	slot_flags = SLOT_BELT
 	origin_tech = "programming=2"
 	var/request_cooldown = 5 // five seconds
@@ -30,7 +30,7 @@
 	return ..()
 
 /obj/item/device/paicard/attack_self(mob/user)
-	if (!in_range(src, user))
+	if(!in_range(src, user))
 		return
 	user.set_machine(src)
 	var/dat = {"
@@ -320,7 +320,7 @@
 
 /obj/item/device/paicard/proc/alertUpdate()
 	var/turf/T = get_turf_or_move(src.loc)
-	for (var/mob/M in viewers(T))
+	for(var/mob/M in viewers(T))
 		M.show_message("\blue [src] flashes a message across its screen, \"Additional personalities available for download.\"", 3, "\blue [src] bleeps electronically.", 2)
 
 /obj/item/device/paicard/emp_act(severity)
diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm
index d663ead8906..5d47e15af21 100644
--- a/code/game/objects/items/devices/pipe_painter.dm
+++ b/code/game/objects/items/devices/pipe_painter.dm
@@ -19,7 +19,7 @@
 	var/obj/machinery/atmospherics/pipe/P = A
 
 	var/turf/T = P.loc
-	if (P.level < 2 && T.level==1 && isturf(T) && T.intact)
+	if(P.level < 2 && T.level==1 && isturf(T) && T.intact)
 		to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
 		return
 
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 8f6f60bd11b..25e975fa920 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -5,7 +5,7 @@
 	desc = "A nulling power sink which drains energy from electrical systems."
 	icon_state = "powersink0"
 	item_state = "electronic"
-	w_class = 4.0
+	w_class = 4
 	flags = CONDUCT
 	throwforce = 5
 	throw_speed = 1
@@ -49,7 +49,7 @@
 				to_chat(user, "Device must be placed over an exposed cable to attach to it.")
 				return
 		else
-			if (mode == 2)
+			if(mode == 2)
 				processing_objects.Remove(src) // Now the power sink actually stops draining the station's power if you unhook it. --NeoFite
 				processing_power_items.Remove(src)
 			anchored = 0
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index af68ee8eeda..5dc67b15478 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -35,11 +35,11 @@
 	set category = "Object"
 	set src in usr
 
-	if (usr.stat || usr.restrained())
+	if(usr.stat || usr.restrained())
 		return
 
 	code = t
-	if (isnull(code))
+	if(isnull(code))
 		code = initial(code)
 	src.add_fingerprint(usr)
 	return
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index f0181104bbc..e37b267799b 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -6,7 +6,7 @@
 	frequency = 1449
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
-	w_class = 5.0
+	w_class = 5
 	materials = list(MAT_METAL=10000, MAT_GLASS=2500)
 	var/code = 2
 
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 751fc9c599e..d6e1034ee74 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -133,6 +133,10 @@
 	name = "Nanotrasen ERT Radio Encryption Key"
 	channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)
 
+/obj/item/device/encryptionkey/centcom
+	name = "Centcom Radio Encryption Key"
+	channels = list("Response Team" = 1, "Special Ops" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)
+
 /obj/item/device/encryptionkey/heads/ai_integrated //ported from bay, this goes 'inside' the AI.
 	name = "AI Integrated Encryption Key"
 	desc = "Integrated encryption key"
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 69b5db12af9..6695008e484 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -51,11 +51,11 @@
 	to_chat(user, radio_desc)
 
 /obj/item/device/radio/headset/handle_message_mode(mob/living/M as mob, message, channel)
-	if (channel == "special")
-		if (translate_binary)
+	if(channel == "special")
+		if(translate_binary)
 			var/datum/language/binary = all_languages["Robot Talk"]
 			binary.broadcast(M, message)
-		if (translate_hive)
+		if(translate_hive)
 			var/datum/language/hivemind = all_languages["Hivemind"]
 			hivemind.broadcast(M, message)
 		return null
@@ -293,7 +293,7 @@
 	flags = EARBANGPROTECT
 	icon_state = "com_headset_alt"
 	item_state = "com_headset_alt"
-	ks2type = /obj/item/device/encryptionkey/ert
+	ks2type = /obj/item/device/encryptionkey/centcom
 
 /obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
 	name = "\improper AI subspace transceiver"
@@ -306,13 +306,13 @@
 	var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
 
 /obj/item/device/radio/headset/heads/ai_integrated/receive_range(freq, level)
-	if (disabledAi)
+	if(disabledAi)
 		return -1 //Transciever Disabled.
 	return ..(freq, level, 1)
 
 /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	user.set_machine(src)
-	if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ ))))
+	if(!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ ))))
 		return
 
 	if(istype(W, /obj/item/weapon/screwdriver))
@@ -395,7 +395,7 @@
 			src.syndie = 1
 
 
-	for (var/ch_name in channels)
+	for(var/ch_name in channels)
 		if(!radio_controller)
 			src.name = "broken radio headset"
 			return
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index f1eb48e06d7..455a0f7098c 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -3,9 +3,9 @@
 	desc = "Talk through this."
 	icon_state = "intercom"
 	anchored = 1
-	w_class = 4.0
+	w_class = 4
 	canhear_range = 2
-	flags = CONDUCT | NOBLOODY
+	flags = CONDUCT
 	var/number = 0
 	var/circuitry_installed = 1
 	var/last_tick //used to delay the powercheck
@@ -120,13 +120,13 @@
 		attack_self(user)
 
 /obj/item/device/radio/intercom/receive_range(freq, level)
-	if (!on)
+	if(!on)
 		return -1
 	if(!(0 in level))
 		var/turf/position = get_turf(src)
 		if(isnull(position) || !(position.z in level))
 			return -1
-	if (!src.listening)
+	if(!src.listening)
 		return -1
 	if(freq in ANTAG_FREQS)
 		if(!(src.syndie))
@@ -141,6 +141,8 @@
 				to_chat(user, "<span class='notice'>You cut out the intercoms wiring and disconnect its electronics.</span>")
 				playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1)
 				if(do_after(user, 10, target = src))
+					if(buildstage != 3)
+						return
 					new /obj/item/stack/cable_coil(get_turf(src),5)
 					on = 0
 					b_stat = 1
@@ -178,6 +180,8 @@
 				to_chat(user, "<span class='notice'>You begin removing the electronics...</span>")
 				playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
 				if(do_after(user, 10, target = src))
+					if(buildstage != 1)
+						return
 					new /obj/item/weapon/intercom_electronics(get_turf(src))
 					to_chat(user, "<span class='notice'>The circuitboard pops out!</span>")
 					buildstage = 0
@@ -228,7 +232,7 @@
 	icon = 'icons/obj/doors/door_assembly.dmi'
 	icon_state = "door_electronics"
 	desc = "Looks like a circuit. Probably is."
-	w_class = 2.0
+	w_class = 2
 	materials = list(MAT_METAL=50, MAT_GLASS=50)
 
 /obj/item/device/radio/intercom/locked
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 1f86a35c497..d1e9bb2cdef 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -77,7 +77,7 @@ var/global/list/default_medbay_channels = list(
 	wires = null
 	if(radio_controller)
 		radio_controller.remove_object(src, frequency)
-		for (var/ch_name in channels)
+		for(var/ch_name in channels)
 			radio_controller.remove_object(src, radiochannels[ch_name])
 	patch_link = null
 	return ..()
@@ -88,7 +88,7 @@ var/global/list/default_medbay_channels = list(
 		frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
 	set_frequency(frequency)
 
-	for (var/ch_name in channels)
+	for(var/ch_name in channels)
 		secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name],  RADIO_CHAT)
 
 /obj/item/device/radio/attack_ghost(mob/user)
@@ -177,7 +177,7 @@ var/global/list/default_medbay_channels = list(
 	return can_admin_interact()
 
 /obj/item/device/radio/proc/text_wires()
-	if (b_stat)
+	if(b_stat)
 		return wires.GetInteractWindow()
 	return
 
@@ -194,31 +194,31 @@ var/global/list/default_medbay_channels = list(
 	if(is_special)
 		return 0
 
-	if (href_list["track"])
+	if(href_list["track"])
 		var/mob/target = locate(href_list["track"])
 		var/mob/living/silicon/ai/A = locate(href_list["track2"])
 		if(A && target)
 			A.ai_actual_track(target)
 		. = 1
 
-	else if (href_list["freq"])
+	else if(href_list["freq"])
 		var/new_frequency = (frequency + text2num(href_list["freq"]))
-		if ((new_frequency < PUBLIC_LOW_FREQ || new_frequency > PUBLIC_HIGH_FREQ))
+		if((new_frequency < PUBLIC_LOW_FREQ || new_frequency > PUBLIC_HIGH_FREQ))
 			new_frequency = sanitize_frequency(new_frequency)
 		set_frequency(new_frequency)
 		if(hidden_uplink)
 			if(hidden_uplink.check_trigger(usr, frequency, traitor_frequency))
 				usr << browse(null, "window=radio")
 		. = 1
-	else if (href_list["talk"])
+	else if(href_list["talk"])
 		ToggleBroadcast()
 		. = 1
 	else if(href_list["listen"])
 		var/chan_name = href_list["ch_name"]
-		if (!chan_name)
+		if(!chan_name)
 			ToggleReception()
 		else
-			if (channels[chan_name] & FREQ_LISTENING)
+			if(channels[chan_name] & FREQ_LISTENING)
 				channels[chan_name] &= ~FREQ_LISTENING
 			else
 				channels[chan_name] |= FREQ_LISTENING
@@ -237,16 +237,16 @@ var/global/list/default_medbay_channels = list(
 /obj/item/device/radio/proc/autosay(var/message, var/from, var/channel, var/zlevel = config.contact_levels, var/role = "Unknown") //BS12 EDIT
 	var/datum/radio_frequency/connection = null
 	if(channel && channels && channels.len > 0)
-		if (channel == "department")
+		if(channel == "department")
 //			to_chat(world, "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\"")
 			channel = channels[1]
 		connection = secure_radio_connections[channel]
 	else
 		connection = radio_connection
 		channel = null
-	if (!istype(connection))
+	if(!istype(connection))
 		return
-	if (!connection)
+	if(!connection)
 		return
 	var/mob/living/automatedannouncer/A = new /mob/living/automatedannouncer(src)
 	A.name = from
@@ -288,10 +288,10 @@ var/global/list/default_medbay_channels = list(
 
 	// Otherwise, if a channel is specified, look for it.
 	if(channels && channels.len > 0)
-		if (message_mode == "department") // Department radio shortcut
+		if(message_mode == "department") // Department radio shortcut
 			message_mode = channels[1]
 
-		if (channels[message_mode]) // only broadcast if the channel is set on
+		if(channels[message_mode]) // only broadcast if the channel is set on
 			return secure_radio_connections[message_mode]
 
 	// If we were to send to a channel we don't have, drop it.
@@ -323,9 +323,9 @@ var/global/list/default_medbay_channels = list(
 
 	//#### Grab the connection datum ####//
 	var/datum/radio_frequency/connection = handle_message_mode(M, message, channel)
-	if (!istype(connection))
+	if(!istype(connection))
 		return 0
-	if (!connection)
+	if(!connection)
 		return 0
 
 	var/turf/position = get_turf(src)
@@ -344,24 +344,24 @@ var/global/list/default_medbay_channels = list(
 	var/jobname // the mob's "job"
 
 	// --- Human: use their actual job ---
-	if (ishuman(M))
+	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		jobname = H.get_assignment()
 
 	// --- Carbon Nonhuman ---
-	else if (iscarbon(M)) // Nonhuman carbon mob
+	else if(iscarbon(M)) // Nonhuman carbon mob
 		jobname = "No id"
 
 	// --- AI ---
-	else if (isAI(M))
+	else if(isAI(M))
 		jobname = "AI"
 
 	// --- Cyborg ---
-	else if (isrobot(M))
+	else if(isrobot(M))
 		jobname = "Cyborg"
 
 	// --- Personal AI (pAI) ---
-	else if (istype(M, /mob/living/silicon/pai))
+	else if(istype(M, /mob/living/silicon/pai))
 		jobname = "Personal AI"
 
 	// --- Unidentifiable mob ---
@@ -372,7 +372,7 @@ var/global/list/default_medbay_channels = list(
 	// --- Modifications to the mob's identity ---
 
 	// The mob is disguising their identity:
-	if (ishuman(M) && M.GetVoice() != real_name)
+	if(ishuman(M) && M.GetVoice() != real_name)
 		displayname = M.GetVoice()
 		jobname = "Unknown"
 		voicemask = 1
@@ -500,7 +500,7 @@ var/global/list/default_medbay_channels = list(
 
 /obj/item/device/radio/hear_talk(mob/M as mob, msg, var/verb = "says", var/datum/language/speaking = null)
 
-	if (broadcasting)
+	if(broadcasting)
 		if(get_dist(src, M) <= canhear_range)
 			talk_into(M, msg,null,verb,speaking)
 
@@ -508,7 +508,7 @@ var/global/list/default_medbay_channels = list(
 /*
 /obj/item/device/radio/proc/accept_rad(obj/item/device/radio/R as obj, message)
 
-	if ((R.frequency == frequency && message))
+	if((R.frequency == frequency && message))
 		return 1
 	else if
 
@@ -523,7 +523,7 @@ var/global/list/default_medbay_channels = list(
 	// what the range is in which mobs will hear the radio
 	// returns: -1 if can't receive, range otherwise
 
-	if (!wires || wires.IsIndexCut(WIRE_RECEIVE))
+	if(!wires || wires.IsIndexCut(WIRE_RECEIVE))
 		return -1
 	if(!listening)
 		return -1
@@ -534,20 +534,20 @@ var/global/list/default_medbay_channels = list(
 	if(freq in ANTAG_FREQS)
 		if(!(src.syndie))//Checks to see if it's allowed on that frequency, based on the encryption keys
 			return -1
-	if (!on)
+	if(!on)
 		return -1
-	if (!freq) //recieved on main frequency
-		if (!listening)
+	if(!freq) //recieved on main frequency
+		if(!listening)
 			return -1
 	else
 		var/accept = (freq==frequency && listening)
-		if (!accept)
-			for (var/ch_name in channels)
+		if(!accept)
+			for(var/ch_name in channels)
 				var/datum/radio_frequency/RF = secure_radio_connections[ch_name]
-				if (RF.frequency==freq && (channels[ch_name]&FREQ_LISTENING))
+				if(RF.frequency==freq && (channels[ch_name]&FREQ_LISTENING))
 					accept = 1
 					break
-		if (!accept)
+		if(!accept)
 			return -1
 	return canhear_range
 
@@ -560,8 +560,8 @@ var/global/list/default_medbay_channels = list(
 
 /obj/item/device/radio/examine(mob/user, var/distance = -1)
 	. = ..(user, distance)
-	if ((in_range(src, user) || loc == user))
-		if (b_stat)
+	if((in_range(src, user) || loc == user))
+		if(b_stat)
 			user.show_message("\blue \the [src] can be attached and modified!")
 		else
 			user.show_message("\blue \the [src] can not be modified or attached!")
@@ -570,11 +570,11 @@ var/global/list/default_medbay_channels = list(
 /obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	user.set_machine(src)
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
+	if(!( istype(W, /obj/item/weapon/screwdriver) ))
 		return
 	b_stat = !( b_stat )
 	if(!istype(src, /obj/item/device/radio/beacon))
-		if (b_stat)
+		if(b_stat)
 			user.show_message("\blue The radio can now be attached and modified!")
 		else
 			user.show_message("\blue The radio can no longer be modified or attached!")
@@ -587,7 +587,7 @@ var/global/list/default_medbay_channels = list(
 /obj/item/device/radio/emp_act(severity)
 	broadcasting = 0
 	listening = 0
-	for (var/ch_name in channels)
+	for(var/ch_name in channels)
 		channels[ch_name] = 0
 	..()
 
@@ -631,17 +631,10 @@ var/global/list/default_medbay_channels = list(
 	..()
 	set_frequency(DTH_FREQ)
 
-/obj/item/device/radio/borg/talk_into()
-	. = ..()
-	if (isrobot(src.loc))
-		var/mob/living/silicon/robot/R = src.loc
-		var/datum/robot_component/C = R.components["radio"]
-		R.use_power(C.energy_consumption)
-
 /obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 //	..()
 	user.set_machine(src)
-	if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ ))))
+	if(!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ ))))
 		return
 
 	if(istype(W, /obj/item/weapon/screwdriver))
@@ -701,7 +694,7 @@ var/global/list/default_medbay_channels = list(
 			src.syndie = 1
 
 
-	for (var/ch_name in src.channels)
+	for(var/ch_name in src.channels)
 		if(!radio_controller)
 			sleep(30) // Waiting for the radio_controller to be created.
 		if(!radio_controller)
@@ -715,7 +708,7 @@ var/global/list/default_medbay_channels = list(
 /obj/item/device/radio/borg/Topic(href, href_list)
 	if(..())
 		return 1
-	if (href_list["mode"])
+	if(href_list["mode"])
 		var/enable_subspace_transmission = text2num(href_list["mode"])
 		if(enable_subspace_transmission != subspace_transmission)
 			subspace_transmission = !subspace_transmission
@@ -729,7 +722,7 @@ var/global/list/default_medbay_channels = list(
 			else
 				recalculateChannels()
 		. = 1
-	if (href_list["shutup"]) // Toggle loudspeaker mode, AKA everyone around you hearing your radio.
+	if(href_list["shutup"]) // Toggle loudspeaker mode, AKA everyone around you hearing your radio.
 		var/do_shut_up = text2num(href_list["shutup"])
 		if(do_shut_up != shut_up)
 			shut_up = !shut_up
@@ -778,12 +771,12 @@ var/global/list/default_medbay_channels = list(
 
 /obj/item/device/radio/proc/config(op)
 	if(radio_controller)
-		for (var/ch_name in channels)
+		for(var/ch_name in channels)
 			radio_controller.remove_object(src, radiochannels[ch_name])
 	secure_radio_connections = new
 	channels = op
 	if(radio_controller)
-		for (var/ch_name in op)
+		for(var/ch_name in op)
 			secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name],  RADIO_CHAT)
 	return
 
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 7138a4515be..6b472f95b80 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -117,7 +117,7 @@ REAGENT SCANNER
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 3
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 5
 	throw_range = 10
 	materials = list(MAT_METAL=200)
@@ -127,7 +127,7 @@ REAGENT SCANNER
 
 
 /obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
-	if (( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
+	if(( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
 		to_chat(user, text("\red You try to analyze the floor's vitals!"))
 		for(var/mob/O in viewers(M, null))
 			O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1)
@@ -136,9 +136,9 @@ REAGENT SCANNER
 		user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1)
 		user.show_message("\blue Body Temperature: ???", 1)
 		return
-	user.visible_message("<span class='notice'>[user] has analyzed [M]'s vitals.","<span class='notice'> You have analyzed [M]'s vitals.")
+	user.visible_message("<span class='notice'>[user] has analyzed [M]'s vitals.</span>","<span class='notice'> You have analyzed [M]'s vitals.</span>")
 
-	if (!istype(M,/mob/living/carbon/human) || M.isSynthetic())
+	if(!istype(M,/mob/living/carbon/human) || M.isSynthetic())
 		//these sensors are designed for organic life
 		user.show_message("\blue Analyzing Results for ERROR:\n\t Overall Status: ERROR")
 		user.show_message("\t Key: <font color='blue'>Suffocation</font>/<font color='green'>Toxin</font>/<font color='#FFA500'>Burns</font>/<font color='red'>Brute</font>", 1)
@@ -184,7 +184,7 @@ REAGENT SCANNER
 	if(M.status_flags & FAKEDEATH)
 		OX = fake_oxy > 50 ? 		"\red Severe oxygen deprivation detected\blue" 	: 	"Subject bloodstream oxygen level normal"
 	user.show_message("[OX] | [TX] | [BU] | [BR]")
-	if (istype(M, /mob/living/carbon))
+	if(istype(M, /mob/living/carbon))
 		if(upgraded)
 			chemscan(user, M)
 		for(var/datum/disease/D in M.viruses)
@@ -192,15 +192,15 @@ REAGENT SCANNER
 				to_chat(user, "<span class='alert'><b>Warning: [D.form] detected</b>\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]</span>")
 	if(M.getStaminaLoss())
 		user.show_message("<span class='info'>Subject appears to be suffering from fatigue.</span>")
-	if (M.getCloneLoss())
+	if(M.getCloneLoss())
 		user.show_message("<span class='warning'>Subject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.</span>")
-	if (M.has_brain_worms())
+	if(M.has_brain_worms())
 		user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.")
-	else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && !M.get_int_organ(/obj/item/organ/internal/brain))
+	else if(M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && !M.get_int_organ(/obj/item/organ/internal/brain))
 		user.show_message("\red Subject is brain dead.")
-	else if (M.getBrainLoss() >= 60)
+	else if(M.getBrainLoss() >= 60)
 		user.show_message("\red Severe brain damage detected. Subject likely to have mental retardation.")
-	else if (M.getBrainLoss() >= 10)
+	else if(M.getBrainLoss() >= 10)
 		user.show_message("\red Significant brain damage detected. Subject may have had a concussion.")
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
@@ -226,7 +226,7 @@ REAGENT SCANNER
 			for(var/datum/wound/W in e.wounds) if(W.internal)
 				user.show_message(text("\red Internal bleeding detected. Advanced scanner required for location."), 1)
 				break
-		if(M:vessel)
+		if(H.vessel)
 			var/blood_volume = round(M:vessel.get_reagent_amount("blood"))
 			var/blood_percent =  blood_volume / 560
 			blood_percent *= 100
@@ -246,7 +246,14 @@ REAGENT SCANNER
 		if(implant_detect)
 			user.show_message("<span class='notice'>Detected cybernetic modifications:</span>")
 			user.show_message("<span class='notice'>[implant_detect]</span>")
-
+		if(H.gene_stability < 40)
+			user.show_message("<span class='userdanger'>Subject's genes are quickly breaking down!</span>")
+		else if(H.gene_stability < 70)
+			user.show_message("<span class='danger'>Subject's genes are showing signs of spontenous breakdown.</span>")
+		else if(H.gene_stability < 85)
+			user.show_message("<span class='warning'>Subject's genes are showing minor signs of instability.</span>")
+		else
+			user.show_message("<span class='notice'>Subject's genes are stable.</span>")
 	src.add_fingerprint(user)
 	return
 
@@ -255,7 +262,7 @@ REAGENT SCANNER
 	set category = "Object"
 
 	mode = !mode
-	switch (mode)
+	switch(mode)
 		if(1)
 			to_chat(usr, "The scanner now shows specific limb damage.")
 		if(0)
@@ -283,7 +290,7 @@ REAGENT SCANNER
 	name = "Health Analyzer Upgrade"
 	icon_state = "healthupgrade"
 	desc = "An upgrade unit that can be installed on a health analyzer for expanded functionality."
-	w_class = 1.0
+	w_class = 1
 	origin_tech = "magnets=2;biotech=2"
 
 /obj/item/device/analyzer
@@ -291,7 +298,7 @@ REAGENT SCANNER
 	name = "analyzer"
 	icon_state = "atmos"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = 2
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 0
@@ -302,11 +309,11 @@ REAGENT SCANNER
 
 /obj/item/device/analyzer/attack_self(mob/user as mob)
 
-	if (user.stat)
+	if(user.stat)
 		return
 
 	var/turf/location = user.loc
-	if (!( istype(location, /turf) ))
+	if(!( istype(location, /turf) ))
 		return
 
 	var/datum/gas_mixture/environment = location.return_air()
@@ -357,7 +364,7 @@ REAGENT SCANNER
 	name = "mass-spectrometer"
 	icon_state = "spectrometer"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = 2
 	flags = CONDUCT | OPENCONTAINER
 	slot_flags = SLOT_BELT
 	throwforce = 5
@@ -381,12 +388,12 @@ REAGENT SCANNER
 		icon_state = initial(icon_state)
 
 /obj/item/device/mass_spectrometer/attack_self(mob/user as mob)
-	if (user.stat)
+	if(user.stat)
 		return
-	if (crit_fail)
+	if(crit_fail)
 		to_chat(user, "<span class='warning'>This device has critically failed and is no longer functional!</span>")
 		return
-	if (!user.IsAdvancedToolUser())
+	if(!user.IsAdvancedToolUser())
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 	if(reagents.total_volume)
@@ -429,7 +436,7 @@ REAGENT SCANNER
 	desc = "A hand-held reagent scanner which identifies chemical agents."
 	icon_state = "spectrometer"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = 2
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 5
@@ -441,14 +448,14 @@ REAGENT SCANNER
 	var/recent_fail = 0
 
 /obj/item/device/reagent_scanner/afterattack(obj/O, mob/user as mob)
-	if (user.stat)
+	if(user.stat)
 		return
-	if (!user.IsAdvancedToolUser())
+	if(!user.IsAdvancedToolUser())
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 	if(!istype(O))
 		return
-	if (crit_fail)
+	if(crit_fail)
 		to_chat(user, "<span class='warning'>This device has critically failed and is no longer functional!</span>")
 		return
 
@@ -456,7 +463,7 @@ REAGENT SCANNER
 		var/dat = ""
 		if(O.reagents.reagent_list.len > 0)
 			var/one_percent = O.reagents.total_volume / 100
-			for (var/datum/reagent/R in O.reagents.reagent_list)
+			for(var/datum/reagent/R in O.reagents.reagent_list)
 				if(prob(reliability))
 					dat += "<br>[TAB]<span class='notice'>[R][details ? ": [R.volume / one_percent]%" : ""]</span>"
 					recent_fail = 0
@@ -486,7 +493,7 @@ REAGENT SCANNER
 	icon_state = "adv_spectrometer_s"
 	item_state = "analyzer"
 	origin_tech = "biotech=1"
-	w_class = 2.0
+	w_class = 2
 	flags = CONDUCT
 	throwforce = 0
 	throw_speed = 3
@@ -494,24 +501,24 @@ REAGENT SCANNER
 	materials = list(MAT_METAL=30, MAT_GLASS=20)
 
 /obj/item/device/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob)
-	if (!isslime(M))
+	if(!isslime(M))
 		user.show_message("<span class='warning'>This device can only scan slimes!</span>", 1)
 		return
 	var/mob/living/carbon/slime/T = M
 	user.show_message("Slime scan results:", 1)
 	user.show_message(text("[T.colour] [] slime", T.is_adult ? "adult" : "baby"), 1)
 	user.show_message(text("Nutrition: [T.nutrition]/[]", T.get_max_nutrition()), 1)
-	if (T.nutrition < T.get_starve_nutrition())
+	if(T.nutrition < T.get_starve_nutrition())
 		user.show_message("<span class='warning'>Warning: slime is starving!</span>", 1)
-	else if (T.nutrition < T.get_hunger_nutrition())
+	else if(T.nutrition < T.get_hunger_nutrition())
 		user.show_message("<span class='warning'>Warning: slime is hungry</span>", 1)
 	user.show_message("Electric change strength: [T.powerlevel]", 1)
 	user.show_message("Health: [T.health]", 1)
-	if (T.slime_mutation[4] == T.colour)
+	if(T.slime_mutation[4] == T.colour)
 		user.show_message("This slime does not evolve any further.", 1)
 	else
-		if (T.slime_mutation[3] == T.slime_mutation[4])
-			if (T.slime_mutation[2] == T.slime_mutation[1])
+		if(T.slime_mutation[3] == T.slime_mutation[4])
+			if(T.slime_mutation[2] == T.slime_mutation[1])
 				user.show_message("Possible mutation: [T.slime_mutation[3]]", 1)
 				user.show_message("Genetic destability: [T.mutation_chance/2]% chance of mutation on splitting", 1)
 			else
@@ -520,7 +527,6 @@ REAGENT SCANNER
 		else
 			user.show_message("Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]], [T.slime_mutation[4]]", 1)
 			user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting", 1)
-	if (T.cores > 1)
+	if(T.cores > 1)
 		user.show_message("Anomalious slime core amount detected", 1)
 	user.show_message("Growth progress: [T.amount_grown]/10", 1)
-
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index 6172a603ce5..e1dd31b79be 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -3,7 +3,7 @@
 	desc = "A miniature machine that tracks suit sensors across the station."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "scanner"
-	w_class = 2.0
+	w_class = 2
 	slot_flags = SLOT_BELT
 	origin_tech = "biotech=3;materials=3;magnets=3"
 	var/datum/nano_module/crew_monitor/crew_monitor
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index f05b179e62a..e6cdec9a62e 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -19,7 +19,7 @@ effective or pretty fucking useless.
 	desc = "A strange device with twin antennas."
 	icon_state = "batterer"
 	throwforce = 5
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 4
 	throw_range = 10
 	flags = CONDUCT
@@ -79,7 +79,7 @@ effective or pretty fucking useless.
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 3
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 3
 	throw_range = 7
 	materials = list(MAT_METAL=400)
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 5b4afe8095c..8e8e00a0343 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -88,7 +88,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "transfer_valve.tmpl", "Tank Transfer Valve", 460, 280)
@@ -101,9 +101,9 @@
 
 /obj/item/device/transfer_valve/Topic(href, href_list)
 	..()
-	if ( usr.stat || usr.restrained() )
+	if( usr.stat || usr.restrained() )
 		return 0
-	if (src.loc != usr)
+	if(src.loc != usr)
 		return 0
 	if(tank_one && href_list["tankone"])
 		split_gases()
@@ -162,7 +162,7 @@
 	tank_two.air_contents.merge(temp)
 
 /obj/item/device/transfer_valve/proc/split_gases()
-	if (!valve_open || !tank_one || !tank_two)
+	if(!valve_open || !tank_one || !tank_two)
 		return
 	var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
 	var/datum/gas_mixture/temp
@@ -194,7 +194,7 @@
 		log_game("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]")
 		merge_gases()
 		spawn(20) // In case one tank bursts
-			for (var/i=0,i<5,i++)
+			for(var/i=0,i<5,i++)
 				src.update_icon()
 				sleep(10)
 			src.update_icon()
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index bd747555cc6..7760df16dcd 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -202,7 +202,7 @@ var/list/world_uplinks = list()
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "uplink.tmpl", title, 700, 600, state = inventory_state)
@@ -218,14 +218,14 @@ var/list/world_uplinks = list()
 
 // The purchasing code.
 /obj/item/device/uplink/hidden/Topic(href, href_list)
-	if (usr.stat || usr.restrained())
+	if(usr.stat || usr.restrained())
 		return 1
 
-	if (!( istype(usr, /mob/living/carbon/human)))
+	if(!( istype(usr, /mob/living/carbon/human)))
 		return 1
 	var/mob/user = usr
 	var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")
-	if ((usr.contents.Find(src.loc) || (in_range(src.loc, usr) && istype(src.loc.loc, /turf))))
+	if((usr.contents.Find(src.loc) || (in_range(src.loc, usr) && istype(src.loc.loc, /turf))))
 		usr.set_machine(src)
 		if(..(href, href_list))
 			return 1
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index 28b6b774705..c65f0a94355 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -3,14 +3,14 @@
 	desc = "Used by obese officers to save their breath for running."
 	icon_state = "voice0"
 	item_state = "flashtool"	//looks exactly like a flash (and nothing like a flashbang)
-	w_class = 1.0
+	w_class = 1
 	flags = CONDUCT
 
 	var/spamcheck = 0
 	var/emagged = 0
 
 /obj/item/device/hailer/attack_self(mob/living/carbon/user as mob)
-	if (spamcheck)
+	if(spamcheck)
 		return
 
 	if(emagged)
diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm
index b0761167d4e..f76a4942195 100644
--- a/code/game/objects/items/documents.dm
+++ b/code/game/objects/items/documents.dm
@@ -5,7 +5,7 @@
 	icon_state = "docs_generic"
 	item_state = "paper"
 	throwforce = 0
-	w_class = 1.0
+	w_class = 1
 	throw_range = 1
 	throw_speed = 1
 	layer = 4
diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm
index 97b2dfd6cfc..879a6846639 100644
--- a/code/game/objects/items/flag.dm
+++ b/code/game/objects/items/flag.dm
@@ -1,6 +1,6 @@
 /obj/item/flag
 	icon = 'icons/obj/flag.dmi'
-	w_class = 4.0
+	w_class = 4
 	var/lit = 0
 	var/burntime = 30
 
diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
index cdce6774518..f2fa9596375 100644
--- a/code/game/objects/items/misc.dm
+++ b/code/game/objects/items/misc.dm
@@ -16,7 +16,7 @@
 	item_state = "beachball"
 	density = 0
 	anchored = 0
-	w_class = 1.0
+	w_class = 1
 	force = 0.0
 	throwforce = 0.0
 	throw_speed = 1
diff --git a/code/game/objects/items/mountable_frames/apc_frame.dm b/code/game/objects/items/mountable_frames/apc_frame.dm
index fb543df2b8e..11542cdd94c 100644
--- a/code/game/objects/items/mountable_frames/apc_frame.dm
+++ b/code/game/objects/items/mountable_frames/apc_frame.dm
@@ -9,11 +9,11 @@
 	if(..())
 		var/turf/turf_loc = get_turf(user)
 		var/area/area_loc = turf_loc.loc
-		if (area_loc.get_apc())
+		if(area_loc.get_apc())
 			to_chat(user, "<span class='rose'>This area already has an APC.</span>")
 			return //only one APC per area
 		for(var/obj/machinery/power/terminal/T in turf_loc)
-			if (T.master)
+			if(T.master)
 				to_chat(user, "<span class='rose'>There is another network terminal here.</span>")
 				return
 			else
diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm
index ff8c1b8b593..e377cac4015 100644
--- a/code/game/objects/items/mountable_frames/frames.dm
+++ b/code/game/objects/items/mountable_frames/frames.dm
@@ -6,7 +6,7 @@
 
 /obj/item/mounted/frame/attackby(obj/item/weapon/W, mob/user)
 	..()
-	if (istype(W, /obj/item/weapon/wrench) && sheets_refunded)
+	if(istype(W, /obj/item/weapon/wrench) && sheets_refunded)
 		//new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
 		var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(get_turf(src))
 		M.amount = sheets_refunded
@@ -16,10 +16,10 @@
 	if(..()) //if we pass the parent tests
 		var/turf/turf_loc = get_turf(user)
 
-		if (src.mount_reqs.Find("simfloor") && !istype(turf_loc, /turf/simulated/floor))
+		if(src.mount_reqs.Find("simfloor") && !istype(turf_loc, /turf/simulated/floor))
 			to_chat(user, "<span class='rose'>[src] cannot be placed on this spot.</span>")
 			return
-		if (src.mount_reqs.Find("nospace"))
+		if(src.mount_reqs.Find("nospace"))
 			var/area/my_area = turf_loc.loc
 			if(!istype(my_area) || (my_area.requires_power == 0 || istype(my_area,/area/space)))
 				to_chat(user, "<span class='rose'>[src] cannot be placed in this area.</span>")
diff --git a/code/game/objects/items/mountable_frames/lights.dm b/code/game/objects/items/mountable_frames/lights.dm
index b12c22186e2..3655070ce2f 100644
--- a/code/game/objects/items/mountable_frames/lights.dm
+++ b/code/game/objects/items/mountable_frames/lights.dm
@@ -11,7 +11,7 @@
 	playsound(get_turf(src), 'sound/machines/click.ogg', 75, 1)
 	var/constrdir = user.dir
 	var/constrloc = get_turf(user)
-	if (!do_after(user, 30, target = src))
+	if(!do_after(user, 30, target = src))
 		return
 	var/obj/machinery/light_construct/newlight
 	switch(fixture_type)
diff --git a/code/game/objects/items/mountable_frames/mountables.dm b/code/game/objects/items/mountable_frames/mountables.dm
index 5e9811ee3d4..1b720712fa9 100644
--- a/code/game/objects/items/mountable_frames/mountables.dm
+++ b/code/game/objects/items/mountable_frames/mountables.dm
@@ -18,9 +18,9 @@
 /obj/item/mounted/proc/try_build(turf/on_wall, mob/user, proximity_flag) //checks
 	if(!on_wall || !user)
 		return
-	if (proximity_flag != 1) //if we aren't next to the wall
+	if(proximity_flag != 1) //if we aren't next to the wall
 		return
-	if (!( get_dir(on_wall,user) in cardinal))
+	if(!( get_dir(on_wall,user) in cardinal))
 		to_chat(user, "<span class='rose'>You need to be standing next to a wall to place \the [src].</span>")
 		return
 
diff --git a/code/game/objects/items/mountable_frames/newscaster_frame.dm b/code/game/objects/items/mountable_frames/newscaster_frame.dm
index 7e06805c3dc..8ed81d937d5 100644
--- a/code/game/objects/items/mountable_frames/newscaster_frame.dm
+++ b/code/game/objects/items/mountable_frames/newscaster_frame.dm
@@ -10,10 +10,10 @@
 	if(..())
 		var/turf/loc = get_turf(usr)
 		var/area/A = loc.loc
-		if (!istype(loc, /turf/simulated/floor))
+		if(!istype(loc, /turf/simulated/floor))
 			to_chat(usr, "<span class='alert'>Newscaster cannot be placed on this spot.</span>")
 			return
-		if (A.requires_power == 0 || A.name == "Space")
+		if(A.requires_power == 0 || A.name == "Space")
 			to_chat(usr, "<span class='alert'>Newscaster cannot be placed in this area.</span>")
 			return
 
diff --git a/code/game/objects/items/policetape.dm b/code/game/objects/items/policetape.dm
index ad46a511641..907be15d850 100644
--- a/code/game/objects/items/policetape.dm
+++ b/code/game/objects/items/policetape.dm
@@ -3,7 +3,7 @@
 	name = "tape roll"
 	icon = 'icons/policetape.dmi'
 	icon_state = "rollstart"
-	w_class = 1.0
+	w_class = 1
 	var/turf/start
 	var/turf/end
 	var/tape_type = /obj/item/tape
@@ -77,7 +77,7 @@ var/list/tape_roll_applications = list()
 
 		var/turf/cur = start
 		var/dir
-		if (start.x == end.x)
+		if(start.x == end.x)
 			var/d = end.y-start.y
 			if(d) d = d/abs(d)
 			end = get_turf(locate(end.x,end.y+d,end.z))
@@ -89,10 +89,10 @@ var/list/tape_roll_applications = list()
 			dir = "h"
 
 		var/can_place = 1
-		while (cur!=end && can_place)
+		while(cur!=end && can_place)
 			if(cur.density == 1)
 				can_place = 0
-			else if (istype(cur, /turf/space))
+			else if(istype(cur, /turf/space))
 				can_place = 0
 			else
 				for(var/obj/O in cur)
@@ -100,13 +100,13 @@ var/list/tape_roll_applications = list()
 						can_place = 0
 						break
 			cur = get_step_towards(cur,end)
-		if (!can_place)
+		if(!can_place)
 			to_chat(usr, "\blue You can't run \the [src] through that!")
 			return
 
 		cur = start
 		var/tapetest = 0
-		while (cur!=end)
+		while(cur!=end)
 			for(var/obj/item/tape/Ptest in cur)
 				if(Ptest.icon_state == "[Ptest.icon_base]_[dir]")
 					tapetest = 1
@@ -119,7 +119,7 @@ var/list/tape_roll_applications = list()
 
 
 /obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity)
-	if (!proximity)
+	if(!proximity)
 		return
 
 	if(istype(A, /obj/machinery/door/airlock))
@@ -130,7 +130,7 @@ var/list/tape_roll_applications = list()
 		P.layer = 3.2
 		to_chat(user, "\blue You finish placing the [src].")
 
-	if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor))
+	if(istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor))
 		var/turf/F = A
 		var/direction = user.loc == F ? user.dir : turn(user.dir, 180)
 		var/icon/hazard_overlay = hazard_overlays["[direction]"]
@@ -151,7 +151,7 @@ var/list/tape_roll_applications = list()
 	if(!density) return 1
 	if(air_group || (height==0)) return 1
 
-	if ((mover.pass_flags & PASSTABLE || istype(mover, /obj/effect/meteor) || mover.throwing == 1) )
+	if((mover.pass_flags & PASSTABLE || istype(mover, /obj/effect/meteor) || mover.throwing == 1) )
 		return 1
 	else if(ismob(mover) && allowed(mover))
 		return 1
@@ -162,7 +162,7 @@ var/list/tape_roll_applications = list()
 	breaktape(W, user)
 
 /obj/item/tape/attack_hand(mob/user as mob)
-	if (user.a_intent == I_HELP && src.allowed(user))
+	if(user.a_intent == I_HELP && src.allowed(user))
 		user.visible_message("<span class=notice>[user] lifts [src], allowing passage.</span>", "<span class=notice>You lift [src], allowing passage.</span>")
 		src.density = 0
 		spawn(200)
@@ -193,7 +193,7 @@ var/list/tape_roll_applications = list()
 		var/turf/cur = get_step(src,dir[i])
 		while(N != 1)
 			N = 1
-			for (var/obj/item/tape/P in cur)
+			for(var/obj/item/tape/P in cur)
 				if(P.icon_state == icon_dir)
 					N = 0
 					qdel(P)
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 0342dec3840..55a0fa7b0cd 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -17,7 +17,7 @@
 
 	user.do_attack_animation(M)
 	M.Weaken(5)
-	if (M.stuttering < 5)
+	if(M.stuttering < 5)
 		M.stuttering = 5
 	M.Stun(5)
 
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index c4a15f728ee..1b9f97d7fa0 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -120,7 +120,7 @@
 		B.loc = get_turf(src)
 		to_chat(user, "You armed the robot frame")
 		W:use(1)
-		if (user.get_inactive_hand()==src)
+		if(user.get_inactive_hand()==src)
 			user.unEquip(src)
 			user.put_in_inactive_hand(B)
 		qdel(src)
@@ -174,7 +174,7 @@
 		else
 			to_chat(user, "\blue You need to attach a flash to it first!")
 
-	if (istype(W, /obj/item/device/multitool))
+	if(istype(W, /obj/item/device/multitool))
 		if(check_completion())
 			Interact(user)
 		else
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index fd3f5505f4f..611a5a3e37e 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -33,7 +33,7 @@
 
 
 	attackby(obj/item/W as obj, mob/user as mob, params)
-		if (istype(W, /obj/item/weapon/weldingtool))
+		if(istype(W, /obj/item/weapon/weldingtool))
 			var/obj/item/weapon/weldingtool/WT = W
 			if(WT.remove_fuel(0, user))
 				overlays.Cut()
@@ -95,7 +95,7 @@
 		hp -= Proj.damage
 		if(hp <= 0)
 			for(var/mob/O in oviewers())
-				if ((O.client && !( O.blinded )))
+				if((O.client && !( O.blinded )))
 					to_chat(O, "\red [src] breaks into tiny pieces and collapses!")
 			qdel(src)
 
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 921be6a7083..23085ea3d78 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -11,16 +11,16 @@
 	var/heal_burn = 0
 
 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
-	if (!istype(M))
+	if(!istype(M))
 		to_chat(user, "<span class='danger'>\The [src] cannot be applied to [M]!</span>")
 		return 1
 
-	if (!user.IsAdvancedToolUser())
+	if(!user.IsAdvancedToolUser())
 		to_chat(user, "<span class='danger'>You don't have the dexterity to do this!</span>")
 		return 1
 
 
-	if (istype(M, /mob/living/carbon/human))
+	if(istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
@@ -57,7 +57,7 @@
 	if(..())
 		return 1
 
-	if (istype(M, /mob/living/carbon/human))
+	if(istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
@@ -66,13 +66,13 @@
 				to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been bandaged.")
 				return 1
 			else
-				for (var/datum/wound/W in affecting.wounds)
-					if (W.internal)
+				for(var/datum/wound/W in affecting.wounds)
+					if(W.internal)
 						continue
-					if (W.current_stage <= W.max_bleeding_stage)
+					if(W.current_stage <= W.max_bleeding_stage)
 						user.visible_message( 	"\blue [user] bandages \the [W.desc] on [M]'s [affecting.name].", \
 										"\blue You bandage \the [W.desc] on [M]'s [affecting.name]." )
-					else if (istype(W,/datum/wound/bruise))
+					else if(istype(W,/datum/wound/bruise))
 						user.visible_message( 	"\blue [user] places a bruise patch over \the [W.desc] on [M]'s [affecting.name].", \
 										"\blue You place a bruise patch over \the [W.desc] on [M]'s [affecting.name]." )
 					else
@@ -98,7 +98,7 @@
 	if(..())
 		return 1
 
-	if (istype(M, /mob/living/carbon/human))
+	if(istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
@@ -144,7 +144,7 @@
 	if(..())
 		return 1
 
-	if (istype(M, /mob/living/carbon/human))
+	if(istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
@@ -156,20 +156,20 @@
 				to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been treated.")
 				return 1
 			else
-				for (var/datum/wound/W in affecting.wounds)
-					if (W.internal)
+				for(var/datum/wound/W in affecting.wounds)
+					if(W.internal)
 						continue
-					if (W.current_stage <= W.max_bleeding_stage)
+					if(W.current_stage <= W.max_bleeding_stage)
 						user.visible_message( 	"\blue [user] cleans \the [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue.", \
 										"\blue You clean and seal \the [W.desc] on [M]'s [affecting.name]." )
 						//H.add_side_effect("Itch")
-					else if (istype(W,/datum/wound/bruise))
+					else if(istype(W,/datum/wound/bruise))
 						user.visible_message( 	"\blue [user] places a medicine patch over \the [W.desc] on [M]'s [affecting.name].", \
 										"\blue You place a medicine patch over \the [W.desc] on [M]'s [affecting.name]." )
 					else
 						user.visible_message( 	"\blue [user] smears some bioglue over [W.desc] on [M]'s [affecting.name].", \
 										"\blue You smear some bioglue over [W.desc] on [M]'s [affecting.name]." )
-				if (bandaged)
+				if(bandaged)
 					affecting.heal_damage(heal_brute,0)
 				use(1)
 		else
@@ -188,7 +188,7 @@
 	if(..())
 		return 1
 
-	if (istype(M, /mob/living/carbon/human))
+	if(istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
@@ -232,7 +232,7 @@
 				affecting.status &= ~ORGAN_SPLINTED
 				to_chat(user, "<span class='notice'>You remove the splint from [M]'s [limb].")
 			return
-		if (M != user)
+		if(M != user)
 			user.visible_message("\red [user] starts to apply \the [src] to [M]'s [limb].", "\red You start to apply \the [src] to [M]'s [limb].", "\red You hear something being wrapped.")
 		else
 			if((!user.hand && affecting.limb_name in list("r_arm", "r_hand")) || (user.hand && affecting.limb_name in list("l_arm", "l_hand")))
@@ -240,7 +240,7 @@
 				return
 			user.visible_message("\red [user] starts to apply \the [src] to their [limb].", "\red You start to apply \the [src] to your [limb].", "\red You hear something being wrapped.")
 		if(do_after(user, 50, target = M))
-			if (M != user)
+			if(M != user)
 				user.visible_message("\red [user] finishes applying \the [src] to [M]'s [limb].", "\red You finish applying \the [src] to [M]'s [limb].", "\red You hear something being wrapped.")
 			else
 				if(prob(25))
diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index 53ff2836885..55e1cc4a722 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -9,11 +9,11 @@
 
 
 /obj/item/stack/nanopaste/attack(mob/living/M as mob, mob/user as mob)
-	if (!istype(M) || !istype(user))
+	if(!istype(M) || !istype(user))
 		return 0
-	if (istype(M,/mob/living/silicon/robot))	//Repairing cyborgs
+	if(istype(M,/mob/living/silicon/robot))	//Repairing cyborgs
 		var/mob/living/silicon/robot/R = M
-		if (R.getBruteLoss() || R.getFireLoss() )
+		if(R.getBruteLoss() || R.getFireLoss() )
 			R.adjustBruteLoss(-15)
 			R.adjustFireLoss(-15)
 			R.updatehealth()
@@ -23,11 +23,11 @@
 		else
 			to_chat(user, "<span class='notice'>All [R]'s systems are nominal.</span>")
 
-	if (istype(M,/mob/living/carbon/human))		//Repairing robolimbs
+	if(istype(M,/mob/living/carbon/human))		//Repairing robolimbs
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting)
 
-		if (S && (S.status & ORGAN_ROBOT))
+		if(S && (S.status & ORGAN_ROBOT))
 			if(S.get_damage())
 				S.heal_damage(15, 15, robo_repair = 1)
 				H.updatehealth()
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index efba4f62a77..e4866856e97 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -5,7 +5,7 @@
 	icon_state = "rods"
 	item_state = "rods"
 	flags = CONDUCT
-	w_class = 3.0
+	w_class = 3
 	force = 9.0
 	throwforce = 10.0
 	throw_speed = 3
@@ -31,7 +31,7 @@
 		icon_state = "rods"
 
 /obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/weldingtool))
+	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 
 		if(get_amount() < 2)
@@ -51,7 +51,7 @@
 
 			var/replace = user.get_inactive_hand() == src
 			use(2)
-			if (get_amount() <= 0 && replace)
+			if(get_amount() <= 0 && replace)
 				user.unEquip(src, 1)
 				if(new_item)
 					user.put_in_hands(new_item)
@@ -64,9 +64,9 @@
 
 	if(!istype(user.loc,/turf)) return 0
 
-	if (locate(/obj/structure/grille, usr.loc))
+	if(locate(/obj/structure/grille, usr.loc))
 		for(var/obj/structure/grille/G in usr.loc)
-			if (G.destroyed)
+			if(G.destroyed)
 				G.health = 10
 				G.density = 1
 				G.destroyed = 0
@@ -80,7 +80,7 @@
 			return
 		to_chat(usr, "\blue Assembling grille...")
 
-		if (!do_after(usr, 10, target = user))
+		if(!do_after(usr, 10, target = user))
 			return
 
 		var /obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc )
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index bf3196b5581..0a52ea4c552 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -50,7 +50,7 @@
 		src = null
 		var/replace = (user.get_inactive_hand()==G)
 		G.use(1)
-		if (!G && !RG && replace)
+		if(!G && !RG && replace)
 			user.put_in_hands(RG)
 	else
 		return ..()
@@ -70,7 +70,7 @@
 
 			var/list/directions = new/list(cardinal)
 			var/i = 0
-			for (var/obj/structure/window/win in user.loc)
+			for(var/obj/structure/window/win in user.loc)
 				i++
 				if(i >= 4)
 					to_chat(user, "<span class='danger'>There are too many windows in this location.</span>")
@@ -173,7 +173,7 @@
 			if(src.loc != user)	return 1
 			var/list/directions = new/list(cardinal)
 			var/i = 0
-			for (var/obj/structure/window/win in user.loc)
+			for(var/obj/structure/window/win in user.loc)
 				i++
 				if(i >= 4)
 					to_chat(user, "<span class='danger'>There are too many windows in this location.</span>")
@@ -282,7 +282,7 @@
 		src = null
 		var/replace = (user.get_inactive_hand()==G)
 		G.use(1)
-		if (!G && !RG && replace)
+		if(!G && !RG && replace)
 			user.put_in_hands(RG)
 	else
 		return ..()
@@ -301,7 +301,7 @@
 			if(src.loc != user)  return 1
 			var/list/directions = new/list(cardinal)
 			var/i = 0
-			for (var/obj/structure/window/win in user.loc)
+			for(var/obj/structure/window/win in user.loc)
 				i++
 				if(i >= 4)
 					to_chat(user, "<span class='danger'>There are too many windows in this location.</span>")
@@ -373,7 +373,7 @@
 			if(src.loc != user)  return 1
 			var/list/directions = new/list(cardinal)
 			var/i = 0
-			for (var/obj/structure/window/win in user.loc)
+			for(var/obj/structure/window/win in user.loc)
 				i++
 				if(i >= 4)
 					to_chat(user, "<span class='danger'>There are too many windows in this location.</span>")
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index 8bb97f4f256..f96b10fff23 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -4,7 +4,7 @@
 	singular_name = "wired glass floor tile"
 	desc = "A glass tile, which is wired, somehow."
 	icon_state = "glass_wire"
-	w_class = 3.0
+	w_class = 3
 	force = 3.0
 	throwforce = 5.0
 	throw_speed = 5
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 7de3cfc0aaa..55fda54267f 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -72,7 +72,7 @@ var/global/list/datum/stack_recipe/mime_recipes = list ( \
 /obj/item/stack/sheet/mineral
 	force = 5.0
 	throwforce = 5
-	w_class = 3.0
+	w_class = 3
 	throw_speed = 3
 	throw_range = 3
 
diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm
index 739c625cb54..2a8b2130be6 100644
--- a/code/game/objects/items/stacks/sheets/sheets.dm
+++ b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -1,6 +1,6 @@
 /obj/item/stack/sheet
 	name = "sheet"
-	w_class = 3.0
+	w_class = 3
 	force = 5
 	throwforce = 5
 	max_amount = 50
@@ -15,11 +15,11 @@
 // item/attackby() properly, making this unnecessary
 
 /*/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/storage/bag/sheetsnatcher))
+	if(istype(W, /obj/item/weapon/storage/bag/sheetsnatcher))
 		var/obj/item/weapon/storage/bag/sheetsnatcher/S = W
 		if(!S.mode)
 			S.add(src,user)
 		else
-			for (var/obj/item/stack/sheet/stack in locate(src.x,src.y,src.z))
+			for(var/obj/item/stack/sheet/stack in locate(src.x,src.y,src.z))
 				S.add(stack,user)
 	..()*/
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index bd799640122..db9aea3def7 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -17,12 +17,12 @@
 
 /obj/item/stack/New(var/loc, var/amount=null)
 	..()
-	if (amount!=null)	//Allow for stacks with the amount=0
+	if(amount!=null)	//Allow for stacks with the amount=0
 		src.amount=amount
 	return
 
 /obj/item/stack/Destroy()
-	if (usr && usr.machine==src)
+	if(usr && usr.machine==src)
 		usr << browse(null, "window=stack")
 	return ..()
 
@@ -35,62 +35,62 @@
 	list_recipes(user)
 
 /obj/item/stack/proc/list_recipes(mob/user as mob, recipes_sublist)
-	if (!recipes)
+	if(!recipes)
 		return
-	if (!src || amount<=0)
+	if(!src || amount<=0)
 		user << browse(null, "window=stack")
 	user.set_machine(src) //for correct work of onclose
 	var/list/recipe_list = recipes
-	if (recipes_sublist && recipe_list[recipes_sublist] && istype(recipe_list[recipes_sublist], /datum/stack_recipe_list))
+	if(recipes_sublist && recipe_list[recipes_sublist] && istype(recipe_list[recipes_sublist], /datum/stack_recipe_list))
 		var/datum/stack_recipe_list/srl = recipe_list[recipes_sublist]
 		recipe_list = srl.recipes
 	var/t1 = text("<HTML><HEAD><title>Constructions from []</title></HEAD><body><TT>Amount Left: []<br>", src, src.amount)
 	for(var/i=1;i<=recipe_list.len,i++)
 		var/E = recipe_list[i]
-		if (isnull(E))
+		if(isnull(E))
 			t1 += "<hr>"
 			continue
 
-		if (i>1 && !isnull(recipe_list[i-1]))
+		if(i>1 && !isnull(recipe_list[i-1]))
 			t1+="<br>"
 
-		if (istype(E, /datum/stack_recipe_list))
+		if(istype(E, /datum/stack_recipe_list))
 			var/datum/stack_recipe_list/srl = E
-			if (src.amount >= srl.req_amount)
+			if(src.amount >= srl.req_amount)
 				t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title] ([srl.req_amount] [src.singular_name]\s)</a>"
 			else
 				t1 += "[srl.title] ([srl.req_amount] [src.singular_name]\s)<br>"
 
-		if (istype(E, /datum/stack_recipe))
+		if(istype(E, /datum/stack_recipe))
 			var/datum/stack_recipe/R = E
 			var/max_multiplier = round(src.amount / R.req_amount)
 			var/title as text
 			var/can_build = 1
 			can_build = can_build && (max_multiplier>0)
 			/*
-			if (R.one_per_turf)
+			if(R.one_per_turf)
 				can_build = can_build && !(locate(R.result_type) in usr.loc)
-			if (R.on_floor)
+			if(R.on_floor)
 				can_build = can_build && istype(usr.loc, /turf/simulated/floor)
 			*/
-			if (R.res_amount>1)
+			if(R.res_amount>1)
 				title+= "[R.res_amount]x [R.title]\s"
 			else
 				title+= "[R.title]"
 			title+= " ([R.req_amount] [src.singular_name]\s)"
-			if (can_build)
+			if(can_build)
 				t1 += text("<A href='?src=\ref[src];sublist=[recipes_sublist];make=[i]'>[title]</A>  ")
 			else
 				t1 += text("[]", title)
 				continue
-			if (R.max_res_amount>1 && max_multiplier>1)
+			if(R.max_res_amount>1 && max_multiplier>1)
 				max_multiplier = min(max_multiplier, round(R.max_res_amount/R.res_amount))
 				t1 += " |"
 				var/list/multipliers = list(5,10,25)
-				for (var/n in multipliers)
-					if (max_multiplier>=n)
+				for(var/n in multipliers)
+					if(max_multiplier>=n)
 						t1 += " <A href='?src=\ref[src];make=[i];multiplier=[n]'>[n*R.res_amount]x</A>"
-				if (!(max_multiplier in multipliers))
+				if(!(max_multiplier in multipliers))
 					t1 += " <A href='?src=\ref[src];make=[i];multiplier=[max_multiplier]'>[max_multiplier*R.res_amount]x</A>"
 
 	t1 += "</TT></body></HTML>"
@@ -100,71 +100,71 @@
 
 /obj/item/stack/Topic(href, href_list)
 	..()
-	if ((usr.restrained() || usr.stat || usr.get_active_hand() != src))
+	if((usr.restrained() || usr.stat || usr.get_active_hand() != src))
 		return
 
-	if (href_list["sublist"] && !href_list["make"])
+	if(href_list["sublist"] && !href_list["make"])
 		list_recipes(usr, text2num(href_list["sublist"]))
 
-	if (href_list["make"])
-		if (src.amount < 1) del(src) //Never should happen
+	if(href_list["make"])
+		if(src.amount < 1) del(src) //Never should happen
 
 		var/list/recipes_list = recipes
-		if (href_list["sublist"])
+		if(href_list["sublist"])
 			var/datum/stack_recipe_list/srl = recipes_list[text2num(href_list["sublist"])]
 			recipes_list = srl.recipes
 		var/datum/stack_recipe/R = recipes_list[text2num(href_list["make"])]
 		var/multiplier = text2num(href_list["multiplier"])
-		if (!multiplier) multiplier = 1
-		if (src.amount < R.req_amount*multiplier)
-			if (R.req_amount*multiplier>1)
+		if(!multiplier) multiplier = 1
+		if(src.amount < R.req_amount*multiplier)
+			if(R.req_amount*multiplier>1)
 				to_chat(usr, "\red You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!")
 			else
 				to_chat(usr, "\red You haven't got enough [src] to build \the [R.title]!")
 			return
-		if (R.one_per_turf && (locate(R.result_type) in usr.loc))
+		if(R.one_per_turf && (locate(R.result_type) in usr.loc))
 			to_chat(usr, "\red There is another [R.title] here!")
 			return
-		if (R.on_floor && !istype(usr.loc, /turf/simulated))
+		if(R.on_floor && !istype(usr.loc, /turf/simulated))
 			to_chat(usr, "\red \The [R.title] must be constructed on the floor!")
 			return
-		if (R.time)
+		if(R.time)
 			to_chat(usr, "\blue Building [R.title] ...")
-			if (!do_after(usr, R.time, target = usr))
+			if(!do_after(usr, R.time, target = usr))
 				return
-		if (src.amount < R.req_amount*multiplier)
+		if(src.amount < R.req_amount*multiplier)
 			return
 		var/atom/O = new R.result_type( usr.loc )
 		O.dir = usr.dir
-		if (R.max_res_amount>1)
+		if(R.max_res_amount>1)
 			var/obj/item/stack/new_item = O
 			new_item.amount = R.res_amount*multiplier
 			//new_item.add_to_stacks(usr)
 		src.amount-=R.req_amount*multiplier
-		if (src.amount < 1) // Just in case a stack's amount ends up fractional somehow
+		if(src.amount < 1) // Just in case a stack's amount ends up fractional somehow
 			var/oldsrc = src
 			src = null //dont kill proc after del()
 			usr.unEquip(oldsrc, 1)
 			del(oldsrc) // Not qdel, because qdel'd stacks act strange for cyborgs
-			if (istype(O,/obj/item))
+			if(istype(O,/obj/item))
 				usr.put_in_hands(O)
 		O.add_fingerprint(usr)
 		//BubbleWrap - so newly formed boxes are empty
-		if ( istype(O, /obj/item/weapon/storage) )
-			for (var/obj/item/I in O)
+		if( istype(O, /obj/item/weapon/storage) )
+			for(var/obj/item/I in O)
 				del(I)
 		//BubbleWrap END
-	if (src && usr.machine==src) //do not reopen closed window
+	if(src && usr.machine==src) //do not reopen closed window
 		spawn( 0 )
 			src.interact(usr)
 			return
 	return
 
 /obj/item/stack/proc/use(var/used)
-	if (amount < used)
+	if(amount < used)
 		return 0
 	amount -= used
-	if (amount < 1) // Just in case a stack's amount ends up fractional somehow
+	if(amount < 1) // Just in case a stack's amount ends up fractional somehow
 		if(usr)
 			usr.unEquip(src, 1)
 		spawn()
@@ -175,12 +175,12 @@
 /obj/item/stack/proc/add_to_stacks(mob/usr as mob)
 	var/obj/item/stack/oldsrc = src
 	src = null
-	for (var/obj/item/stack/item in usr.loc)
-		if (item==oldsrc)
+	for(var/obj/item/stack/item in usr.loc)
+		if(item==oldsrc)
 			continue
-		if (!istype(item, oldsrc.type))
+		if(!istype(item, oldsrc.type))
 			continue
-		if (item.amount>=item.max_amount)
+		if(item.amount>=item.max_amount)
 			continue
 		oldsrc.attackby(item, usr)
 		to_chat(usr, "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s.")
@@ -204,7 +204,7 @@
 	return F
 
 /obj/item/stack/attack_hand(mob/user as mob)
-	if (user.get_inactive_hand() == src)
+	if(user.get_inactive_hand() == src)
 		var/obj/item/stack/F = split(user, 1)
 		user.put_in_hands(F)
 		if(src && usr.machine == src)
@@ -215,12 +215,12 @@
 
 /obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
-	if (istype(W, src.type))
+	if(istype(W, src.type))
 		var/obj/item/stack/S = W
-		if (S.amount >= max_amount)
+		if(S.amount >= max_amount)
 			return 1
 		var/to_transfer as num
-		if (user.get_inactive_hand()==src)
+		if(user.get_inactive_hand()==src)
 			var/desired = input("How much would you like to transfer from this stack?", "How much?", 1) as null|num
 			if(!desired)
 				return
@@ -229,10 +229,10 @@
 		else
 			to_transfer = min(src.amount, S.max_amount-S.amount)
 		S.amount+=to_transfer
-		if (S && usr.machine==S)
+		if(S && usr.machine==S)
 			spawn(0) S.interact(usr)
 		src.use(to_transfer)
-		if (src && usr.machine==src)
+		if(src && usr.machine==src)
 			spawn(0) src.interact(usr)
 		S.update_icon()
 	else return ..()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 6c0cf78de6e..dd5102a25d7 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -47,7 +47,7 @@
 
 /obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
 	if(!proximity) return
-	if (istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1)
+	if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1)
 		A.reagents.trans_to(src, 10)
 		to_chat(user, "<span class='notice'>You fill the balloon with the contents of [A].</span>")
 		desc = "A translucent balloon with some form of liquid sloshing around in it."
@@ -109,7 +109,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "syndballoon"
 	item_state = "syndballoon"
-	w_class = 4.0
+	w_class = 4
 
 /*
  * Fake telebeacon
@@ -140,13 +140,12 @@
 	icon_state = "sword0"
 	item_state = "sword0"
 	var/active = 0.0
-	w_class = 2.0
-	flags = NOSHIELD
+	w_class = 2
 	attack_verb = list("attacked", "struck", "hit")
 
 /obj/item/toy/sword/attack_self(mob/user as mob)
 	active = !(active)
-	if (active)
+	if(active)
 		to_chat(user, "<span class='notice'>You extend the plastic blade with a quick flick of your wrist.</span>")
 		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 		icon_state = "swordblue"
@@ -199,7 +198,7 @@
 	origin_tech = null
 	attack_verb = list("attacked", "struck", "hit")
 
-/obj/item/weapon/twohanded/dualsaber/toy/IsShield()
+/obj/item/weapon/twohanded/dualsaber/toy/hit_reaction()
 	return 0
 
 /obj/item/weapon/twohanded/dualsaber/toy/IsReflect()//Stops Toy Dualsabers from reflecting energy projectiles
@@ -417,7 +416,7 @@ obj/item/toy/cards/deck
 	icon = 'icons/obj/toy.dmi'
 	deckstyle = "nanotrasen"
 	icon_state = "deck_nanotrasen_full"
-	w_class = 2.0
+	w_class = 2
 	var/cooldown = 0
 	var/list/cards = list()
 
@@ -547,7 +546,7 @@ obj/item/toy/cards/cardhand
 	desc = "A number of cards not in a deck, customarily held in ones hand."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "nanotrasen_hand2"
-	w_class = 1.0
+	w_class = 1
 	var/list/currenthand = list()
 	var/choice = null
 
@@ -575,7 +574,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
 	var/mob/living/carbon/human/cardUser = usr
 	var/O = src
 	if(href_list["pick"])
-		if (cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src)
+		if(cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src)
 			var/choice = href_list["pick"]
 			var/obj/item/toy/cards/singlecard/C = new/obj/item/toy/cards/singlecard(cardUser.loc)
 			currenthand -= choice
@@ -640,7 +639,7 @@ obj/item/toy/cards/singlecard
 	desc = "a card"
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "singlecard_nanotrasen_down"
-	w_class = 1.0
+	w_class = 1
 	var/cardname = null
 	var/flipped = 0
 	pixel_x = -5
@@ -664,7 +663,7 @@ obj/item/toy/cards/singlecard/verb/Flip()
 		return
 	if(!flipped)
 		flipped = 1
-		if (cardname)
+		if(cardname)
 			icon_state = "sc_[cardname]_[deckstyle]"
 			name = cardname
 		else
@@ -765,11 +764,11 @@ obj/item/toy/cards/deck/syndicate/black
 	desc = "A plastic model of a Nuclear Fission Explosive."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "nuketoyidle"
-	w_class = 2.0
+	w_class = 2
 	var/cooldown = 0
 
 /obj/item/toy/nuke/attack_self(mob/user)
-	if (cooldown < world.time)
+	if(cooldown < world.time)
 		cooldown = world.time + 1800 //3 minutes
 		user.visible_message("<span class='warning'>[user] presses a button on [src]</span>", "<span class='notice'>You activate [src], it plays a loud noise!</span>", "<span class='notice'>You hear the click of a button.</span>")
 		spawn(5) //gia said so
@@ -841,7 +840,7 @@ obj/item/toy/cards/deck/syndicate/black
 	name = "toddler"
 	desc = "This baby looks almost real. Wait, did it just burp?"
 	force = 5
-	w_class = 4.0
+	w_class = 4
 	slot_flags = SLOT_BACK
 
 
@@ -864,7 +863,7 @@ obj/item/toy/cards/deck/syndicate/black
 	desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor™"
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "minimeteor"
-	w_class = 2.0
+	w_class = 2
 
 /obj/item/toy/minimeteor/throw_impact(atom/hit_atom)
 	..()
@@ -1098,11 +1097,11 @@ obj/item/toy/cards/deck/syndicate/black
 	desc = "A big, plastic red button. Reads 'From HonkCo Pranks?' on the back."
 	icon = 'icons/obj/assemblies.dmi'
 	icon_state = "bigred"
-	w_class = 2.0
+	w_class = 2
 	var/cooldown = 0
 
 /obj/item/toy/redbutton/attack_self(mob/user)
-	if (cooldown < world.time)
+	if(cooldown < world.time)
 		cooldown = (world.time + 300) // Sets cooldown at 30 seconds
 		user.visible_message("<span class='warning'>[user] presses the big red button.</span>", "<span class='notice'>You press the button, it plays a loud noise!</span>", "<span class='notice'>The button clicks loudly.</span>")
 		playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, 0)
@@ -1123,7 +1122,7 @@ obj/item/toy/cards/deck/syndicate/black
 	desc = "A little toy model AI core with real law announcing action!"
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "AI"
-	w_class = 2.0
+	w_class = 2
 	var/cooldown = 0
 
 /obj/item/toy/AI/attack_self(mob/user)
@@ -1142,7 +1141,7 @@ obj/item/toy/cards/deck/syndicate/black
 	desc = "An action figure modeled after 'The Owl', defender of justice."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "owlprize"
-	w_class = 2.0
+	w_class = 2
 	var/cooldown = 0
 
 /obj/item/toy/owl/attack_self(mob/user)
@@ -1161,7 +1160,7 @@ obj/item/toy/cards/deck/syndicate/black
 	desc = "An action figure modeled after 'The Griffin', criminal mastermind."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "griffinprize"
-	w_class = 2.0
+	w_class = 2
 	var/cooldown = 0
 
 /obj/item/toy/griffin/attack_self(mob/user)
@@ -1255,7 +1254,7 @@ obj/item/toy/cards/deck/syndicate/black
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "minigibber"
 	attack_verb = list("grinded", "gibbed")
-	w_class = 2.0
+	w_class = 2
 	var/cooldown = 0
 	var/obj/stored_minature = null
 
@@ -1327,7 +1326,7 @@ obj/item/toy/cards/deck/syndicate/black
 	flags =  CONDUCT
 	slot_flags = SLOT_BELT
 	materials = list(MAT_METAL=2000)
-	w_class = 3.0
+	w_class = 3
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 5
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 159b4014bf4..f96f0c7ee36 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -4,7 +4,7 @@
 //Added by Jack Rost
 /obj/item/trash
 	icon = 'icons/obj/trash.dmi'
-	w_class = 1.0
+	w_class = 1
 	desc = "This is rubbish."
 
 /obj/item/trash/raisins
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 9c231fbb4a3..50306ac7e02 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -14,7 +14,7 @@ AI MODULES
 	desc = "An AI Module for transmitting encrypted instructions to the AI."
 	flags = CONDUCT
 	force = 5.0
-	w_class = 2.0
+	w_class = 2
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 15
@@ -23,7 +23,7 @@ AI MODULES
 	var/datum/ai_laws/laws = null
 
 /obj/item/weapon/aiModule/proc/install(var/obj/machinery/computer/C)
-	if (istype(C, /obj/machinery/computer/aiupload))
+	if(istype(C, /obj/machinery/computer/aiupload))
 		var/obj/machinery/computer/aiupload/comp = C
 		if(comp.stat & NOPOWER)
 			to_chat(usr, "<span class='warning'>The upload computer has no power!</span>")
@@ -31,13 +31,13 @@ AI MODULES
 		if(comp.stat & BROKEN)
 			to_chat(usr, "<span class='warning'>The upload computer is broken!</span>")
 			return
-		if (!comp.current)
+		if(!comp.current)
 			to_chat(usr, "<span class='warning'>You haven't selected an AI to transmit laws to!</span>")
 			return
 
-		if (comp.current.stat == DEAD || comp.current.control_disabled == 1)
+		if(comp.current.stat == DEAD || comp.current.control_disabled == 1)
 			to_chat(usr, "<span class='warning'>Upload failed. No signal is being detected from the AI.</span>")
-		else if (comp.current.see_in_dark == 0)
+		else if(comp.current.see_in_dark == 0)
 			to_chat(usr, "<span class='warning'>Upload failed. Only a faint signal is being detected from the AI, and it is not responding to our requests. It may be low on power.</span>")
 		else
 			src.transmitInstructions(comp.current, usr)
@@ -49,7 +49,7 @@ AI MODULES
 					R.show_laws()
 			to_chat(usr, "<span class='notice'>Upload complete. The AI's laws have been modified.</span>")
 
-	else if (istype(C, /obj/machinery/computer/borgupload))
+	else if(istype(C, /obj/machinery/computer/borgupload))
 		var/obj/machinery/computer/borgupload/comp = C
 		if(comp.stat & NOPOWER)
 			to_chat(usr, "<span class='warning'>The upload computer has no power!</span>")
@@ -57,13 +57,13 @@ AI MODULES
 		if(comp.stat & BROKEN)
 			to_chat(usr, "<span class='warning'>The upload computer is broken!</span>")
 			return
-		if (!comp.current)
+		if(!comp.current)
 			to_chat(usr, "<span class='warning'>You haven't selected a robot to transmit laws to!</span>")
 			return
 
-		if (comp.current.stat == DEAD || comp.current.emagged)
+		if(comp.current.stat == DEAD || comp.current.emagged)
 			to_chat(usr, "<span class='warning'>Upload failed. No signal is being detected from the robot.</span>")
-		else if (comp.current.connected_ai)
+		else if(comp.current.connected_ai)
 			to_chat(usr, "<span class='warning'>Upload failed. The robot is slaved to an AI.</span>")
 		else
 			src.transmitInstructions(comp.current, usr)
@@ -138,7 +138,7 @@ AI MODULES
 /obj/item/weapon/aiModule/oneCrewMember/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
 	var/law = "Only [targetName] is crew."
-	if (!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite
+	if(!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite
 		to_chat(target, law)
 		target.set_zeroth_law(law)
 		lawchanges.Add("The law specified [targetName]")
@@ -236,7 +236,7 @@ AI MODULES
 /obj/item/weapon/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	log_law_changes(target, sender)
 
-	if (!is_special_character(target))
+	if(!is_special_character(target))
 		target.set_zeroth_law("")
 	target.laws.clear_supplied_laws()
 	target.laws.clear_ion_laws()
@@ -252,7 +252,7 @@ AI MODULES
 
 /obj/item/weapon/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
-	if (!is_special_character(target))
+	if(!is_special_character(target))
 		target.set_zeroth_law("")
 	to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.")
 	target.clear_supplied_laws()
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index d5bbdf24a90..44ef04ab401 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -17,7 +17,7 @@ RCD
 	throwforce = 10.0
 	throw_speed = 3
 	throw_range = 5
-	w_class = 3.0
+	w_class = 3
 	materials = list(MAT_METAL=100000)
 	origin_tech = "engineering=4;materials=2"
 	var/datum/effect/system/spark_spread/spark_system
@@ -101,7 +101,7 @@ RCD
 		data["door_accesses"] = door_accesses_list
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 400, 400, state = state)
 		ui.set_initial_data(data)
 		ui.open()
@@ -130,20 +130,20 @@ RCD
 		menu = text2num(href_list["menu"])
 		. = 1
 	
-	if (href_list["login"])
+	if(href_list["login"])
 		if(istype(usr,/mob/living/silicon))
 			locked = 0
 		else
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/device/pda))
+			if(istype(I, /obj/item/device/pda))
 				var/obj/item/device/pda/pda = I
 				I = pda.id
 			var/obj/item/weapon/card/id/ID = I
-			if (istype(ID) && ID && check_access(ID))
+			if(istype(ID) && ID && check_access(ID))
 				locked = 0
 		. = 1
 	
-	if (href_list["logout"])
+	if(href_list["logout"])
 		locked = 1
 		. = 1
 	
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index de36f655360..7cbe5783a9a 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -13,7 +13,7 @@ RSF
 	anchored = 0.0
 	var/matter = 0
 	var/mode = 1
-	w_class = 3.0
+	w_class = 3
 
 /obj/item/weapon/rsf/New()
 	desc = "A RSF. It currently holds [matter]/30 fabrication-units."
@@ -21,8 +21,8 @@ RSF
 
 /obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
-	if (istype(W, /obj/item/weapon/rcd_ammo))
-		if ((matter + 10) > 30)
+	if(istype(W, /obj/item/weapon/rcd_ammo))
+		if((matter + 10) > 30)
 			to_chat(user, "The RSF cant hold any more matter.")
 			return
 		qdel(W)
@@ -34,27 +34,27 @@ RSF
 
 /obj/item/weapon/rsf/attack_self(mob/user as mob)
 	playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
-	if (mode == 1)
+	if(mode == 1)
 		mode = 2
 		to_chat(user, "Changed dispensing mode to 'Drinking Glass'")
 		return
-	if (mode == 2)
+	if(mode == 2)
 		mode = 3
 		to_chat(user, "Changed dispensing mode to 'Paper'")
 		return
-	if (mode == 3)
+	if(mode == 3)
 		mode = 4
 		to_chat(user, "Changed dispensing mode to 'Pen'")
 		return
-	if (mode == 4)
+	if(mode == 4)
 		mode = 5
 		to_chat(user, "Changed dispensing mode to 'Dice Pack'")
 		return
-	if (mode == 5)
+	if(mode == 5)
 		mode = 6
 		to_chat(user, "Changed dispensing mode to 'Cigarette'")
 		return
-	if (mode == 6)
+	if(mode == 6)
 		mode = 1
 		to_chat(user, "Changed dispensing mode to 'Dosh'")
 		return
@@ -62,15 +62,15 @@ RSF
 
 /obj/item/weapon/rsf/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity) return
-	if (!(istype(A, /obj/structure/table) || istype(A, /turf/simulated/floor)))
+	if(!(istype(A, /obj/structure/table) || istype(A, /turf/simulated/floor)))
 		return
 
-	if (istype(A, /obj/structure/table) && mode == 1)
-		if (istype(A, /obj/structure/table) && matter >= 1)
+	if(istype(A, /obj/structure/table) && mode == 1)
+		if(istype(A, /obj/structure/table) && matter >= 1)
 			to_chat(user, "Dispensing Dosh...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/spacecash/c10( A.loc )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
 			else
@@ -79,12 +79,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /turf/simulated/floor) && mode == 1)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
+	else if(istype(A, /turf/simulated/floor) && mode == 1)
+		if(istype(A, /turf/simulated/floor) && matter >= 1)
 			to_chat(user, "Dispensing Dosh...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/spacecash/c10( A )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
 			else
@@ -93,12 +93,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/structure/table) && mode == 2)
-		if (istype(A, /obj/structure/table) && matter >= 1)
+	else if(istype(A, /obj/structure/table) && mode == 2)
+		if(istype(A, /obj/structure/table) && matter >= 1)
 			to_chat(user, "Dispensing Drinking Glass...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A.loc )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 50
 			else
@@ -107,12 +107,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /turf/simulated/floor) && mode == 2)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
+	else if(istype(A, /turf/simulated/floor) && mode == 2)
+		if(istype(A, /turf/simulated/floor) && matter >= 1)
 			to_chat(user, "Dispensing Drinking Glass...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 50
 			else
@@ -121,12 +121,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/structure/table) && mode == 3)
-		if (istype(A, /obj/structure/table) && matter >= 1)
+	else if(istype(A, /obj/structure/table) && mode == 3)
+		if(istype(A, /obj/structure/table) && matter >= 1)
 			to_chat(user, "Dispensing Paper Sheet...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/paper( A.loc )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 10
 			else
@@ -135,12 +135,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /turf/simulated/floor) && mode == 3)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
+	else if(istype(A, /turf/simulated/floor) && mode == 3)
+		if(istype(A, /turf/simulated/floor) && matter >= 1)
 			to_chat(user, "Dispensing Paper Sheet...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/paper( A )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 10
 			else
@@ -149,12 +149,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/structure/table) && mode == 4)
-		if (istype(A, /obj/structure/table) && matter >= 1)
+	else if(istype(A, /obj/structure/table) && mode == 4)
+		if(istype(A, /obj/structure/table) && matter >= 1)
 			to_chat(user, "Dispensing Pen...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/pen( A.loc )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 50
 			else
@@ -163,12 +163,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /turf/simulated/floor) && mode == 4)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
+	else if(istype(A, /turf/simulated/floor) && mode == 4)
+		if(istype(A, /turf/simulated/floor) && matter >= 1)
 			to_chat(user, "Dispensing Pen...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/pen( A )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 50
 			else
@@ -177,12 +177,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/structure/table) && mode == 5)
-		if (istype(A, /obj/structure/table) && matter >= 1)
+	else if(istype(A, /obj/structure/table) && mode == 5)
+		if(istype(A, /obj/structure/table) && matter >= 1)
 			to_chat(user, "Dispensing Dice Pack...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/storage/pill_bottle/dice( A.loc )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 200
 			else
@@ -191,12 +191,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /turf/simulated/floor) && mode == 5)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
+	else if(istype(A, /turf/simulated/floor) && mode == 5)
+		if(istype(A, /turf/simulated/floor) && matter >= 1)
 			to_chat(user, "Dispensing Dice Pack...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/weapon/storage/pill_bottle/dice( A )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 200
 			else
@@ -205,12 +205,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/structure/table) && mode == 6)
-		if (istype(A, /obj/structure/table) && matter >= 1)
+	else if(istype(A, /obj/structure/table) && mode == 6)
+		if(istype(A, /obj/structure/table) && matter >= 1)
 			to_chat(user, "Dispensing Cigarette...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/clothing/mask/cigarette( A.loc )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 10
 			else
@@ -219,12 +219,12 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /turf/simulated/floor) && mode == 6)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
+	else if(istype(A, /turf/simulated/floor) && mode == 6)
+		if(istype(A, /turf/simulated/floor) && matter >= 1)
 			to_chat(user, "Dispensing Cigarette...")
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 			new /obj/item/clothing/mask/cigarette( A )
-			if (isrobot(user))
+			if(isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 10
 			else
diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm
index e4f6bcd7a75..c487af03cd6 100644
--- a/code/game/objects/items/weapons/alien_specific.dm
+++ b/code/game/objects/items/weapons/alien_specific.dm
@@ -14,7 +14,6 @@
 	throw_range = 5
 	w_class = 2
 	w_class_on = 2
-	flags = NOSHIELD
 	attack_verb = list("attacked", "slashed", "gored", "sliced", "torn", "ripped", "butchered", "cut")
 	attack_verb_on = list()
 
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 97f66ec6a72..0ee843fe85c 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -15,7 +15,7 @@
 	name = "card"
 	desc = "A card."
 	icon = 'icons/obj/card.dmi'
-	w_class = 1.0
+	w_class = 1
 	var/associated_account_number = 0
 
 	var/list/files = list(  )
@@ -34,7 +34,7 @@
 	set category = "Object"
 	set src in usr
 
-	if (t)
+	if(t)
 		src.name = text("Data Disk- '[]'", t)
 	else
 		src.name = "Data Disk"
@@ -103,8 +103,6 @@
 	var/sex
 	var/age
 	var/photo
-	var/icon/front
-	var/icon/side
 	var/dat
 	var/stamped = 0
 	
@@ -124,12 +122,12 @@
 		to_chat(user, "<span class='warning'>It is too far away.</span>")
 	if(guest_pass)
 		to_chat(user, "<span class='notice'>There is a guest pass attached to this ID card</span>")
-		if (world.time < guest_pass.expiration_time)
+		if(world.time < guest_pass.expiration_time)
 			to_chat(user, "<span class='notice'>It expires at [worldtime2text(guest_pass.expiration_time)].</span>")
 		else
 			to_chat(user, "<span class='warning'>It expired at [worldtime2text(guest_pass.expiration_time)].</span>")
 		to_chat(user, "<span class='notice'>It grants access to following areas:</span>")
-		for (var/A in guest_pass.temp_access)
+		for(var/A in guest_pass.temp_access)
 			to_chat(user, "<span class='notice'>[get_access_desc(A)].</span>")
 		to_chat(user, "<span class='notice'>Issuing reason: [guest_pass.reason].</span>")
 
@@ -137,12 +135,6 @@
 	var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper)
 	assets.send(user)
 
-	if(!front)
-		front = new(photo, dir = SOUTH)
-	if(!side)
-		side = new(photo, dir = WEST)
-	user << browse_rsc(front, "front.png")
-	user << browse_rsc(side, "side.png")
 	var/datum/browser/popup = new(user, "idcard", name, 600, 400)
 	popup.set_content(dat)
 	popup.set_title_image(usr.browse_rsc_icon(src.icon, src.icon_state))
@@ -170,16 +162,22 @@
 	dna_hash = H.dna.unique_enzymes
 	fingerprint_hash = md5(H.dna.uni_identity)
 
-	dat = ("<table><tr><td>")
-	dat += text("Name: []</A><BR>", registered_name)
-	dat += text("Sex: []</A><BR>\n", sex)
-	dat += text("Age: []</A><BR>\n", age)
-	dat += text("Rank: []</A><BR>\n", assignment)
-	dat += text("Fingerprint: []</A><BR>\n", fingerprint_hash)
-	dat += text("Blood Type: []<BR>\n", blood_type)
-	dat += text("DNA Hash: []<BR><BR>\n", dna_hash)
-	dat +="<td align = center valign = top>Photo:<br><img src=front.png height=80 width=80 border=4>	\
-	<img src=side.png height=80 width=80 border=4></td></tr></table>"
+	RebuildHTML()
+
+/obj/item/weapon/card/id/proc/RebuildHTML()
+	var/photo_front = "'data:image/png;base64,[icon2base64(icon(photo, dir = SOUTH))]'"
+	var/photo_side = "'data:image/png;base64,[icon2base64(icon(photo, dir = WEST))]'"
+
+	dat = {"<table><tr><td>
+	Name: [registered_name]</A><BR>
+	Sex: [sex]</A><BR>
+	Age: [age]</A><BR>
+	Rank: [assignment]</A><BR>
+	Fingerprint: [fingerprint_hash]</A><BR>
+	Blood Type: [blood_type]<BR>
+	DNA Hash: [dna_hash]<BR><BR>
+	<td align = center valign = top>Photo:<br><img src=[photo_front] height=80 width=80 border=4>
+	<img src=[photo_side] height=80 width=80 border=4></td></tr></table>"}
 
 /obj/item/weapon/card/id/GetAccess()
 	if(!guest_pass)
@@ -292,27 +290,22 @@
 				to_chat(usr, "<span class='notice'>The card's microscanners activate as you pass it over \the [I], copying its access.</span>")
 				src.access |= I.access //Don't copy access if user isn't an antag -- to prevent metagaming
 
-/obj/item/weapon/card/id/syndicate/proc/fake_id_photo(var/mob/living/carbon/human/H, var/side=0)//get_id_photo wouldn't work correctly
+/obj/item/weapon/card/id/syndicate/proc/fake_id_photo(var/mob/living/carbon/human/H)//get_id_photo wouldn't work correctly
 	if(!istype(H))
 		return
 	var/storedDir = H.dir //don't want to lose track of this
 
-	var/icon/faked
-	if(!side)
-		if(!H.equip_to_slot_if_possible(src, slot_l_store, 0, 1))
-			to_chat(H, "<span class='warning'>You need to empty your pockets before taking the ID picture.</span>")
-			return
+	var/icon/faked = new()
+	if(!H.equip_to_slot_if_possible(src, slot_l_store, 0, 1))
+		to_chat(H, "<span class='warning'>You need to empty your pockets before taking the ID picture.</span>")
+		return
 
-	if(side)
-		H.dir = WEST //ensure the icon is actually the proper direction before copying it
-		faked = getFlatIcon(H)
-		H.dir = storedDir //reset the user back to their original direction, not even noticable they changed
-		H.equip_to_slot_if_possible(src, slot_l_hand, 0, 1)
-
-	else
-		H.dir = SOUTH
-		faked = getFlatIcon(H)
-		H.dir = storedDir
+	H.dir = WEST //ensure the icon is actually the proper direction before copying it
+	faked.Insert(getFlatIcon(H), dir = WEST)
+	H.dir = SOUTH
+	faked.Insert(getFlatIcon(H), dir = SOUTH)
+	H.dir = storedDir
+	H.equip_to_slot_if_possible(src, slot_l_hand, 0, 1)
 
 	return faked
 
@@ -349,16 +342,17 @@
 						src.registered_name = new_name
 						UpdateName()
 						to_chat(user, "<span class='notice'>Name changed to [new_name].</span>")
+						RebuildHTML()
 
 					if("Photo")
 						if(!Adjacent(user))
 							return
-						photo = fake_id_photo(user)
-						var/icon/photoside = fake_id_photo(user,1)
-						front = new(photo)
-						side = new(photoside)
-						if(photo && photoside)
-							to_chat(user, "<span class='notice'>Photo changed.</span>")
+						var/icon/newphoto = fake_id_photo(user)
+						if(!newphoto)
+							return
+						photo = newphoto
+						to_chat(user, "<span class='notice'>Photo changed.</span>")
+						RebuildHTML()
 
 					if("Appearance")
 						var/list/appearances = list(
@@ -403,6 +397,7 @@
 							return
 						src.sex = new_sex
 						to_chat(user, "<span class='notice'>Sex changed to [new_sex].</span>")
+						RebuildHTML()
 
 					if("Age")
 						var/new_age = sanitize(stripped_input(user,"What age would you like to put on this card?","Agent Card Age","21", MAX_MESSAGE_LEN))
@@ -410,6 +405,7 @@
 							return
 						src.age = new_age
 						to_chat(user, "<span class='notice'>Age changed to [new_age].</span>")
+						RebuildHTML()
 
 					if("Occupation")
 						var/new_job = sanitize(stripped_input(user,"What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation", "Civilian", MAX_MESSAGE_LEN))
@@ -418,6 +414,7 @@
 						src.assignment = new_job
 						to_chat(user, "<span class='notice'>Occupation changed to [new_job].</span>")
 						UpdateName()
+						RebuildHTML()
 
 					if("Money Account")
 						var/new_account = input(user,"What money account would you like to link to this card?","Agent Card Account",12345) as num
@@ -438,6 +435,7 @@
 							return
 						src.blood_type = new_blood_type
 						to_chat(user, "<span class='notice'>Blood type changed to [new_blood_type].</span>")
+						RebuildHTML()
 
 					if("DNA Hash")
 						var/default = "\[UNSET\]"
@@ -451,6 +449,7 @@
 							return
 						src.dna_hash = new_dna_hash
 						to_chat(user, "<span class='notice'>DNA hash changed to [new_dna_hash].</span>")
+						RebuildHTML()
 
 					if("Fingerprint Hash")
 						var/default = "\[UNSET\]"
@@ -464,6 +463,7 @@
 							return
 						src.fingerprint_hash = new_fingerprint_hash
 						to_chat(user, "<span class='notice'>Fingerprint hash changed to [new_fingerprint_hash].</span>")
+						RebuildHTML()
 
 					if("Reset Card")
 						name = initial(name)
@@ -480,6 +480,7 @@
 						registered_user = null
 
 						to_chat(user, "<span class='notice'>All information has been deleted from \the [src].</span>")
+						RebuildHTML()
 	else
 		..()
 
diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm
index ab6ff1fac8e..7c1432bb772 100644
--- a/code/game/objects/items/weapons/cash.dm
+++ b/code/game/objects/items/weapons/cash.dm
@@ -22,7 +22,7 @@ var/global/list/moneytypes=list(
 	throwforce = 1.0
 	throw_speed = 1
 	throw_range = 2
-	w_class = 1.0
+	w_class = 1
 	var/access = list()
 	access = access_crate_cash
 	var/worth = 1 // Per chip
diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm
index 9c13ef43832..7b8af53e388 100644
--- a/code/game/objects/items/weapons/caution.dm
+++ b/code/game/objects/items/weapons/caution.dm
@@ -7,7 +7,7 @@
 	throwforce = 3.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
+	w_class = 2
 	attack_verb = list("warned", "cautioned", "smashed")
 
 	proximity_sign
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index b0a1c45622d..d99e1a6cf07 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -6,7 +6,7 @@
 	icon = 'icons/obj/chronos.dmi'
 	icon_state = "chronobackpack"
 	item_state = "backpack"
-	w_class = 4.0
+	w_class = 4
 	slot_flags = SLOT_BACK
 	slowdown = 1
 	action_button_name = "Equip/Unequip TED Gun"
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index b3d8a7a19e2..416608b77f7 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -15,13 +15,13 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "banana_peel"
 	item_state = "banana_peel"
-	w_class = 1.0
+	w_class = 1
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
 
 /obj/item/weapon/bananapeel/Crossed(AM as mob|obj)
-	if (istype(AM, /mob/living/carbon))
+	if(istype(AM, /mob/living/carbon))
 		var/mob/living/carbon/M =	AM
 		M.slip("banana peel", 4, 2)
 
@@ -29,7 +29,7 @@
  * Soap
  */
 /obj/item/weapon/soap/Crossed(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist
-	if (istype(AM, /mob/living/carbon))
+	if(istype(AM, /mob/living/carbon))
 		var/mob/living/carbon/M = AM
 		M.slip("soap", 4, 2)
 
@@ -77,7 +77,7 @@
 	item_state = "bike_horn"
 	hitsound = null
 	throwforce = 3
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 3
 	throw_range = 15
 	attack_verb = list("HONKED")
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index 89a8b52b8da..e60a68f42d6 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -3,7 +3,7 @@
 	desc = "A generic brand of lipstick."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "lipstick"
-	w_class = 1.0
+	w_class = 1
 	var/colour = "red"
 	var/open = 0
 
@@ -86,7 +86,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "razor"
 	flags = CONDUCT
-	w_class = 1.0
+	w_class = 1
 
 /obj/item/weapon/razor/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if(ishuman(M))
diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm
index 925b3ec4fb1..f070a1fe4ad 100644
--- a/code/game/objects/items/weapons/courtroom.dm
+++ b/code/game/objects/items/weapons/courtroom.dm
@@ -9,7 +9,7 @@
 	icon_state = "gavelhammer"
 	force = 5.0
 	throwforce = 6.0
-	w_class = 2.0
+	w_class = 2
 	attack_verb = list("bashed", "battered", "judged", "whacked")
 
 /obj/item/weapon/gavelhammer/suicide_act(mob/user)
@@ -24,7 +24,7 @@
 	icon_state = "gavelblock"
 	force = 2.0
 	throwforce = 2.0
-	w_class = 1.0
+	w_class = 1
 
 /obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/gavelhammer))
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 3e6b5c20c5b..f0311a8ae24 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -294,7 +294,7 @@
 	return	unwield()
 
 /obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O)
-	if (!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator))	//To avoid weird issues from admin spawns
+	if(!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator))	//To avoid weird issues from admin spawns
 		M.unEquip(O)
 		qdel(O)
 		return 0
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 2fc12e812fe..69a4d78643e 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -73,12 +73,12 @@
 		if(!(NOCLONE in M.mutations) && !(H && (H.species.flags & NO_DNA))) // prevents drained people from having their DNA changed
 			var/prev_ue = M.dna.unique_enzymes
 			// UI in syringe.
-			if (buf.types & DNA2_BUF_UI)
-				if (!block) //isolated block?
+			if(buf.types & DNA2_BUF_UI)
+				if(!block) //isolated block?
 					M.dna.UI = buf.dna.UI.Copy()
 					M.dna.UpdateUI()
 					M.UpdateAppearance()
-					if (buf.types & DNA2_BUF_UE) //unique enzymes? yes
+					if(buf.types & DNA2_BUF_UE) //unique enzymes? yes
 
 						M.real_name = buf.dna.real_name
 						M.name = buf.dna.real_name
@@ -87,13 +87,13 @@
 				else
 					M.dna.SetUIValue(block,src.GetValue())
 					M.UpdateAppearance()
-			if (buf.types & DNA2_BUF_SE)
-				if (!block) //isolated block?
+			if(buf.types & DNA2_BUF_SE)
+				if(!block) //isolated block?
 					M.dna.SE = buf.dna.SE.Copy()
 					M.dna.UpdateSE()
 				else
 					M.dna.SetSEValue(block,src.GetValue())
-				domutcheck(M, null, block!=null)
+				domutcheck(M, null, 0)
 				M.update_mutations()
 			if(H)
 				H.sync_organ_dna(assimilate = 0, old_ue = prev_ue)
@@ -110,7 +110,7 @@
 		if(H.species.flags & NO_DNA)
 			return 0
 
-	if (!user.IsAdvancedToolUser())
+	if(!user.IsAdvancedToolUser())
 		return 0
 
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [name] by [user.name] ([user.ckey])</font>")
diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm
index 2765b4a319d..94d3f8f764c 100644
--- a/code/game/objects/items/weapons/dnascrambler.dm
+++ b/code/game/objects/items/weapons/dnascrambler.dm
@@ -27,7 +27,7 @@
 			src.injected(user,user)
 		else
 			user.visible_message("\red <b>[user.name] is trying to inject [M.name] with [src]!</b>")
-			if (do_mob(user,M,30))
+			if(do_mob(user,M,30))
 				user.visible_message("\red <b>[user.name] injects [M.name] with [src].</b>")
 				src.injected(M, user)
 			else
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 5444110aa30..44387314147 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -6,7 +6,7 @@
 	icon_state = "plastic-explosive0"
 	item_state = "plasticx"
 	flags = NOBLUDGEON
-	w_class = 2.0
+	w_class = 2
 	origin_tech = "syndicate=2"
 	var/datum/wires/explosive/plastic/wires = null
 	var/timer = 10
@@ -74,9 +74,9 @@
 
 
 /obj/item/weapon/c4/afterattack(atom/target as obj|turf, mob/user as mob, flag)
-	if (!flag)
+	if(!flag)
 		return
-	if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/item/clothing/accessory/storage) || istype(target, /obj/item/clothing/under))
+	if(ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/item/clothing/accessory/storage) || istype(target, /obj/item/clothing/under))
 		return
 	to_chat(user, "Planting explosives...")
 
@@ -85,7 +85,7 @@
 		src.target = target
 		loc = null
 
-		if (ismob(target))
+		if(ismob(target))
 			add_logs(target, user, "planted [name] on")
 			user.visible_message("\red [user.name] finished planting an explosive on [target.name]!")
 			message_admins("[key_name_admin(user)] planted [src.name] on [key_name_admin(target)] with [timer] second fuse",0,1)
@@ -110,13 +110,13 @@
 		explosion(location, -1, -1, 4, 4)
 
 	if(target)
-		if (istype(target, /turf/simulated/wall))
+		if(istype(target, /turf/simulated/wall))
 			var/turf/simulated/wall/W = target
 			W.dismantle_wall(1)
 		else
 			target.ex_act(1)
-		if (isobj(target))
-			if (target)
+		if(isobj(target))
+			if(target)
 				qdel(target)
 	qdel(src)
 
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 92928a967e3..5fc704b7618 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -7,7 +7,7 @@
 	hitsound = 'sound/weapons/smash.ogg'
 	flags = CONDUCT
 	throwforce = 10
-	w_class = 3.0
+	w_class = 3
 	throw_speed = 2
 	throw_range = 7
 	force = 10
@@ -29,7 +29,7 @@
 	hitsound = null	//it is much lighter, after all.
 	flags = null //doesn't CONDUCT
 	throwforce = 2
-	w_class = 2.0
+	w_class = 2
 	force = 3.0
 	materials = list()
 	max_water = 30
@@ -83,12 +83,12 @@
 	var/Refill = AttemptRefill(target, user)
 	if(Refill)
 		return
-	if (!safety)
-		if (src.reagents.total_volume < 1)
+	if(!safety)
+		if(src.reagents.total_volume < 1)
 			to_chat(usr, "<span class='danger'>\The [src] is empty.</span>")
 			return
 
-		if (world.time < src.last_use + 20)
+		if(world.time < src.last_use + 20)
 			return
 
 		src.last_use = world.time
diff --git a/code/game/objects/items/weapons/fireworks.dm b/code/game/objects/items/weapons/fireworks.dm
index 389eb1738d6..1b191a2f894 100644
--- a/code/game/objects/items/weapons/fireworks.dm
+++ b/code/game/objects/items/weapons/fireworks.dm
@@ -7,7 +7,7 @@ obj/item/weapon/firework
 obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user, params)
 	if(litzor)
 		return
-	if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
+	if(istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
 		for(var/mob/M in viewers(user))
 			to_chat(M, "[user] lits \the [src]")
 		litzor = 1
@@ -29,7 +29,7 @@ obj/item/weapon/sparkler
 obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user, params)
 	if(litzor)
 		return
-	if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
+	if(istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
 		for(var/mob/M in viewers(user))
 			to_chat(M, "[user] lits \the [src]")
 		litzor = 1
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 75c1b030ed4..1c819f4c77a 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -11,7 +11,7 @@
 	throwforce = 10.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 3.0
+	w_class = 3
 	materials = list(MAT_METAL=500)
 	origin_tech = "combat=1;plasmatech=1"
 	var/status = 0
@@ -191,10 +191,10 @@
 	return
 
 
-/obj/item/weapon/flamethrower/proc/ignite_turf(turf/target)
+/obj/item/weapon/flamethrower/proc/ignite_turf(turf/target, release_amount = 0.05)
 	//TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this...
 	//Transfer 5% of current tank air contents to turf
-	var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.05)
+	var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(release_amount)
 	air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE
 	target.assume_air(air_transfer)
 	//Burn it based on transfered gas
@@ -218,4 +218,12 @@
 /obj/item/weapon/flamethrower/full/tank/New(var/loc)
 	..()
 	ptank = new /obj/item/weapon/tank/plasma/full(src)
-	update_icon()
\ No newline at end of file
+	update_icon()
+
+/obj/item/weapon/flamethrower/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
+	if(ptank && damage && attack_type == PROJECTILE_ATTACK && prob(15))
+		owner.visible_message("<span class='danger'>[attack_text] hits the fueltank on [owner]'s [src], rupturing it! What a shot!</span>")
+		var/target_turf = get_turf(owner)
+		ignite_turf(target_turf, 100)
+		qdel(ptank)
+		return 1 //It hit the flamethrower, not them
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 1b819bb0a0d..0ec893b53a6 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -39,14 +39,14 @@
 	return
 
 /obj/effect/spresent/relaymove(mob/user as mob)
-	if (user.stat)
+	if(user.stat)
 		return
 	to_chat(user, "\blue You cant move.")
 
 /obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 
-	if (!istype(W, /obj/item/weapon/wirecutters))
+	if(!istype(W, /obj/item/weapon/wirecutters))
 		to_chat(user, "\blue I need wirecutters for that.")
 		return
 
@@ -54,7 +54,7 @@
 
 	for(var/mob/M in src) //Should only be one but whatever.
 		M.loc = src.loc
-		if (M.client)
+		if(M.client)
 			M.client.eye = M.client.mob
 			M.client.perspective = MOB_PERSPECTIVE
 
diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm
index 12e2e111d21..189b4eb77c0 100644
--- a/code/game/objects/items/weapons/grenades/bananade.dm
+++ b/code/game/objects/items/weapons/grenades/bananade.dm
@@ -4,7 +4,7 @@ var/turf/T
 /obj/item/weapon/grenade/bananade
 	name = "bananade"
 	desc = "A yellow grenade."
-	w_class = 2.0
+	w_class = 2
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "banana"
 	item_state = "flashbang"
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index a951f1ade8f..f130f61b7a8 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -102,6 +102,11 @@
 			spawn(det_time)
 				prime()
 
+/obj/item/weapon/grenade/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
+	if(damage && attack_type == PROJECTILE_ATTACK && prob(15))
+		owner.visible_message("<span class='danger'>[attack_text] hits [owner]'s [src], setting it off! What a shot!</span>")
+		prime()
+		return 1 //It hit the grenade, not them
 
 /obj/item/weapon/grenade/chem_grenade/attackby(obj/item/I, mob/user, params)
 	if(istype(I,/obj/item/weapon/hand_labeler))
diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm
index 705b6a57095..1ce46b44957 100644
--- a/code/game/objects/items/weapons/grenades/clowngrenade.dm
+++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm
@@ -3,7 +3,7 @@
 	desc = "HONK! brand Bananas. In a special applicator for rapid slipping of wide areas."
 	icon_state = "banana"
 	item_state = "flashbang"
-	w_class = 2.0
+	w_class = 2
 	force = 2.0
 	var/stage = 0
 	var/state = 0
@@ -55,7 +55,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "banana_peel"
 	item_state = "banana_peel"
-	w_class = 1.0
+	w_class = 1
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 90ccef1d163..cf060b7d02a 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -53,11 +53,11 @@
 		M.Weaken(max(10/distance, 3))
 		M.ear_damage += rand(0, 5)
 		M.ear_deaf = max(M.ear_deaf,15)
-		if (M.ear_damage >= 15)
+		if(M.ear_damage >= 15)
 			to_chat(M, "<span class='warning'>Your ears start to ring badly!</span>")
 			if(prob(M.ear_damage - 10 + 5))
 				to_chat(M, "<span class='warning'>You can't hear anything!</span>")
 				M.disabilities |= DEAF
 		else
-			if (M.ear_damage >= 5)
+			if(M.ear_damage >= 5)
 				to_chat(M, "<span class='warning'>Your ears start to ring!</span>")
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
index 1a6959e8944..b7bbb4ed805 100644
--- a/code/game/objects/items/weapons/grenades/ghettobomb.dm
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -17,7 +17,7 @@
 /obj/item/weapon/grenade/iedcasing
 	name = "improvised explosive assembly"
 	desc = "An igniter stuffed into an aluminum shell."
-	w_class = 2.0
+	w_class = 2
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "improvised_grenade"
 	item_state = "flashbang"
@@ -67,7 +67,7 @@
 /obj/item/weapon/grenade/iedcasing/filled
 	name = "improvised firebomb"
 	desc = "A weak, improvised incendiary device."
-	w_class = 2.0
+	w_class = 2
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "improvised_grenade"
 	item_state = "flashbang"
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 33b0fc411bb..8cbd76041bd 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/grenade
 	name = "grenade"
 	desc = "A hand held grenade, with an adjustable timer."
-	w_class = 2.0
+	w_class = 2
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "grenade"
 	item_state = "flashbang"
@@ -28,8 +28,8 @@
 
 
 /*/obj/item/weapon/grenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
-	if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container
-	if (istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..()
+	if(istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container
+	if(istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..()
 	if((user.get_active_hand() == src) && (!active) && (clown_check(user)) && target.loc != src.loc)
 		to_chat(user, "<span class='warning'>You prime the [name]! [det_time/10] seconds!</span>")
 		active = 1
@@ -83,16 +83,16 @@
 /obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/screwdriver))
 		switch(det_time)
-			if ("1")
+			if("1")
 				det_time = 10
 				to_chat(user, "<span class='notice'>You set the [name] for 1 second detonation time.</span>")
-			if ("10")
+			if("10")
 				det_time = 30
 				to_chat(user, "<span class='notice'>You set the [name] for 3 second detonation time.</span>")
-			if ("30")
+			if("30")
 				det_time = 50
 				to_chat(user, "<span class='notice'>You set the [name] for 5 second detonation time.</span>")
-			if ("50")
+			if("50")
 				det_time = 1
 				to_chat(user, "<span class='notice'>You set the [name] for instant detonation.</span>")
 		add_fingerprint(user)
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 35b865790c7..804144504d5 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -7,7 +7,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 5
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 2
 	throw_range = 5
 	materials = list(MAT_METAL=500)
@@ -97,7 +97,7 @@
 	..()
 	if(istype(I, /obj/item/stack/rods))
 		var/obj/item/stack/rods/R = I
-		if (R.use(1))
+		if(R.use(1))
 			var/obj/item/weapon/wirerod/W = new /obj/item/weapon/wirerod
 			if(!remove_item_from_storage(user))
 				user.unEquip(src)
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index b56e103233e..ada15a3b108 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -76,9 +76,7 @@
 	w_class = 5
 	force = 5
 	slot_flags = SLOT_BACK
-
-/obj/item/weapon/nullrod/staff/IsShield()
-	return 1
+	block_chance = 50
 
 /obj/item/weapon/nullrod/staff/blue
 	name = "blue holy staff"
@@ -92,16 +90,16 @@
 	desc = "A weapon fit for a crusade!"
 	w_class = 4
 	slot_flags = SLOT_BACK|SLOT_BELT
+	block_chance = 30
 	sharp = 1
 	edge = 1
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
-/obj/item/weapon/nullrod/claymore/IsShield()
-	if(prob(30))
-		return 1
-	else
-		return 0
+/obj/item/weapon/nullrod/claymore/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
+	if(attack_type == PROJECTILE_ATTACK)
+		final_block_chance = 0 //Don't bring a sword to a gunfight
+	return ..()
 
 /obj/item/weapon/nullrod/claymore/darkblade
 	icon_state = "cultblade"
@@ -333,6 +331,7 @@
 	desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown."
 	w_class = 4
 	force = 15
+	block_chance = 40
 	slot_flags = SLOT_BACK
 	sharp = 0
 	edge = 0
@@ -342,12 +341,6 @@
 	icon_state = "bostaff0"
 	item_state = "bostaff0"
 
-/obj/item/weapon/nullrod/claymore/bostaff/IsShield()
-	if(prob(40))
-		return 1
-	else
-		return 0
-
 /obj/item/weapon/nullrod/tribal_knife
 	icon_state = "crysknife"
 	item_state = "crysknife"
diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm
index 33025b0a41f..72816600d37 100644
--- a/code/game/objects/items/weapons/implants/implant_chem.dm
+++ b/code/game/objects/items/weapons/implants/implant_chem.dm
@@ -41,7 +41,7 @@
 	if(!cause || !imp_in)	return 0
 	var/mob/living/carbon/R = imp_in
 	var/injectamount = null
-	if (cause == "action_button")
+	if(cause == "action_button")
 		injectamount = reagents.total_volume
 	else
 		injectamount = cause
diff --git a/code/game/objects/items/weapons/implants/implant_death_alarm.dm b/code/game/objects/items/weapons/implants/implant_death_alarm.dm
index 2ef9e2ce35f..db4f25e1be2 100644
--- a/code/game/objects/items/weapons/implants/implant_death_alarm.dm
+++ b/code/game/objects/items/weapons/implants/implant_death_alarm.dm
@@ -33,7 +33,7 @@
 /obj/item/weapon/implant/death_alarm/activate(var/cause)
 	var/mob/M = imp_in
 	var/area/t = get_area(M)
-	switch (cause)
+	switch(cause)
 		if("death")
 			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 			if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) )
@@ -43,7 +43,7 @@
 				a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
 			qdel(a)
 			qdel(src)
-		if ("emp")
+		if("emp")
 			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 			var/name = prob(50) ? t.name : pick(teleportlocs)
 			a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
diff --git a/code/game/objects/items/weapons/implants/implant_misc.dm b/code/game/objects/items/weapons/implants/implant_misc.dm
index ae369138ebd..af83960356b 100644
--- a/code/game/objects/items/weapons/implants/implant_misc.dm
+++ b/code/game/objects/items/weapons/implants/implant_misc.dm
@@ -56,7 +56,7 @@
 	uses = 2
 
 /obj/item/weapon/implant/emp/activate()
-	if (src.uses < 1)	return 0
+	if(src.uses < 1)	return 0
 	src.uses--
 	empulse(imp_in, 3, 5)
 
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index 35d98f179a2..92e58b5af82 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -94,7 +94,7 @@
 		return
 	if(M == occupant) // so that the guy inside can't eject himself -Agouri
 		return
-	if (src.occupant.client)
+	if(src.occupant.client)
 		src.occupant.client.eye = src.occupant.client.mob
 		src.occupant.client.perspective = MOB_PERSPECTIVE
 	src.occupant.loc = src.loc
@@ -125,7 +125,7 @@
 
 
 /obj/machinery/implantchair/implant(mob/M)
-	if (!istype(M, /mob/living/carbon))
+	if(!istype(M, /mob/living/carbon))
 		return
 	if(!implant_list.len)	return
 	for(var/obj/item/weapon/implant/loyalty/imp in implant_list)
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 2d98e0948dd..95f2a280be6 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -32,7 +32,7 @@
 		if(T && (M == user || do_after(user, 50, target = M)))
 			if(user && M && (get_turf(M) == T) && src && imp)
 				if(imp.implant(M, user))
-					if (M == user)
+					if(M == user)
 						to_chat(user, "<span class='notice'>You implant yourself.</span>")
 					else
 						M.visible_message("[user] has implanted [M].", "<span class='notice'>[user] implants you.</span>")
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm
index e89e5f737ed..b9a84c8a6d5 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/implants/implantpad.dm
@@ -55,7 +55,7 @@
 	set name = "Remove Implant"
 	set src in usr
 
-	if (usr.stat || usr.restrained())
+	if(usr.stat || usr.restrained())
 		return
 
 	dropcase(usr)
@@ -70,7 +70,7 @@
 	add_fingerprint(user)
 	user.set_machine(src)
 	var/dat = "<B>Implant Mini-Computer:</B><HR>"
-	if (case)
+	if(case)
 		if(case.imp)
 			if(istype(case.imp, /obj/item/weapon/implant))
 				dat += "<A href='byond://?src=\ref[src];removecase=1'>Remove Case</A><HR>"
@@ -96,7 +96,7 @@
 		return 1
 
 	var/mob/living/user = usr
-	if (href_list["tracking_id"])
+	if(href_list["tracking_id"])
 		if(case && case.imp)
 			var/obj/item/weapon/implant/tracking/T = case.imp
 			T.id += text2num(href_list["tracking_id"])
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 7e1b57f7d4a..183f07bb21c 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -18,7 +18,7 @@
  */
 /obj/item/weapon/kitchen/utensil
 	force = 5.0
-	w_class = 1.0
+	w_class = 1
 	throwforce = 0.0
 	throw_speed = 3
 	throw_range = 5
@@ -30,7 +30,7 @@
 	var/max_contents = 1
 
 /obj/item/weapon/kitchen/utensil/New()
-	if (prob(60))
+	if(prob(60))
 		src.pixel_y = rand(0, 4)
 
 	create_reagents(5)
@@ -48,7 +48,7 @@
 		else
 			return ..()
 
-	if (contents.len)
+	if(contents.len)
 		var/obj/item/weapon/reagent_containers/food/snacks/toEat = contents[1]
 		if(istype(toEat))
 			if(M.eat(toEat, user))
@@ -164,7 +164,7 @@
 	throwforce = 10.0
 	throw_speed = 3
 	throw_range = 7
-	w_class = 3.0
+	w_class = 3
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
 
 /* Trays moved to /obj/item/weapon/storage/bag */
@@ -181,7 +181,7 @@
 	throwforce = 5
 	throw_speed = 3
 	throw_range = 3
-	w_class = 2.0
+	w_class = 2
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
 
 /obj/item/weapon/kitchen/mould/bear
diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm
index 034dfc2ddc2..3e6c4f835f5 100644
--- a/code/game/objects/items/weapons/legcuffs.dm
+++ b/code/game/objects/items/weapons/legcuffs.dm
@@ -6,7 +6,7 @@
 	icon_state = "handcuff"
 	flags = CONDUCT
 	throwforce = 0
-	w_class = 3.0
+	w_class = 3
 	origin_tech = "materials=1"
 	slowdown = 7
 	breakouttime = 300	//Deciseconds = 30s = 0.5 minute
@@ -169,9 +169,9 @@
 				H.Stun(2)
 				H.drop_item(src)
 				return
-	if (!thrown_from && usr) //if something hasn't set it already (like a mech does when it launches)
+	if(!thrown_from && usr) //if something hasn't set it already (like a mech does when it launches)
 		thrown_from = usr //then the user must have thrown it
-	if (!istype(thrown_from, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas))
+	if(!istype(thrown_from, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas))
 		playsound(src, throw_sound, 20, 1) //because mechs play the sound anyways
 	var/turf/target = get_turf(A)
 	var/atom/movable/adjtarget = new /atom/movable
@@ -179,12 +179,12 @@
 	var/yadjust = 0
 	var/scaler = 0 //used to changed the normalised vector to the proper size
 	scaler = throw_range / max(abs(target.x - src.x), abs(target.y - src.y)) //whichever is larger magnitude is what we normalise to
-	if (target.x - src.x != 0) //just to avoid fucking with math for no reason
+	if(target.x - src.x != 0) //just to avoid fucking with math for no reason
 		xadjust = round((target.x - src.x) * scaler) //normalised vector is now scaled up to throw_range
 		adjtarget.x = src.x + xadjust //the new target at max range
 	else
 		adjtarget.x = src.x
-	if (target.y - src.y != 0)
+	if(target.y - src.y != 0)
 		yadjust = round((target.y - src.y) * scaler)
 		adjtarget.y = src.y + yadjust
 	else
diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index 973cfd259d3..307ec829072 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -147,7 +147,7 @@
 	icon_state = "match_unlit"
 	var/lit = 0
 	var/smoketime = 5
-	w_class = 1.0
+	w_class = 1
 	origin_tech = "materials=1"
 	attack_verb = list("burnt", "singed")
 
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index e3c65c2f35b..5687a9b90da 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -19,7 +19,7 @@
 		to_chat(user, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
 		user.take_organ_damage(5,5)
 	active = !active
-	if (active)
+	if(active)
 		force = force_on
 		throwforce = throwforce_on
 		hitsound = 'sound/weapons/blade1.ogg'
@@ -62,7 +62,8 @@
 	w_class = 3
 	w_class_on = 5
 	hitsound = "swing_hit"
-	flags = CONDUCT | NOSHIELD
+	flags = CONDUCT
+	armour_penetration = 100
 	origin_tech = "combat=3"
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	attack_verb_on = list()
@@ -82,8 +83,9 @@
 	throw_speed = 3
 	throw_range = 5
 	hitsound = "swing_hit"
-	flags = NOSHIELD
+	armour_penetration = 35
 	origin_tech = "magnets=3;syndicate=4"
+	block_chance = 50
 	sharp = 1
 	edge = 1
 	var/hacked = 0
@@ -93,9 +95,9 @@
 	if(item_color == null)
 		item_color = pick("red", "blue", "green", "purple")
 
-/obj/item/weapon/melee/energy/sword/IsShield()
+/obj/item/weapon/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
 	if(active)
-		return 1
+		return ..()
 	return 0
 
 /obj/item/weapon/melee/energy/sword/cyborg
@@ -131,7 +133,7 @@
 	..()
 	item_color = null
 
-/obj/item/weapon/melee/energy/sword/cyborg/saw/IsShield()
+/obj/item/weapon/melee/energy/sword/cyborg/saw/hit_reaction()
 	return 0
 
 /obj/item/weapon/melee/energy/sword/saber
@@ -204,7 +206,7 @@
 	throw_speed = 3
 	throw_range = 1
 	w_class = 4//So you can't hide it in your pocket or some such.
-	flags = NOSHIELD
+	armour_penetration = 50
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	var/datum/effect/system/spark_spread/spark_system
 
diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm
index ebe8ecb421d..2ff41257ea1 100644
--- a/code/game/objects/items/weapons/misc.dm
+++ b/code/game/objects/items/weapons/misc.dm
@@ -30,7 +30,7 @@
 	flags = CONDUCT
 	force = 5.0
 	throwforce = 7.0
-	w_class = 2.0
+	w_class = 2
 	materials = list(MAT_METAL=50)
 	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
 
@@ -40,7 +40,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "c_tube"
 	throwforce = 1
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 4
 	throw_range = 5
 
@@ -62,7 +62,7 @@
 	var/data = ""
 	var/base_url = "http://svn.slurm.us/public/spacestation13/misc/game_kit"
 	item_state = "sheet-metal"
-	w_class = 5.0
+	w_class = 5
 */
 
 /obj/item/weapon/gift
@@ -73,7 +73,7 @@
 	var/size = 3.0
 	var/obj/item/gift = null
 	item_state = "gift"
-	w_class = 4.0
+	w_class = 4
 
 /obj/item/weapon/kidanglobe
 	name = "Kidan homeworld globe"
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 7fad9cbbe5f..8b5baf79a35 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -9,14 +9,13 @@
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 7
-	w_class = 3.0
+	w_class = 3
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
 	var/mopping = 0
 	var/mopcount = 0
 	var/mopcap = 5
 	var/mopspeed = 30
 
-
 /obj/item/weapon/mop/New()
 	create_reagents(mopcap)
 	janitorial_equipment += src
@@ -34,7 +33,6 @@
 	reagents.reaction(A, TOUCH, 10)	//10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
 	reagents.remove_any(1)			//reaction() doesn't use up the reagents
 
-
 /obj/item/weapon/mop/afterattack(atom/A, mob/user, proximity)
 	if(!proximity) return
 
@@ -80,4 +78,15 @@
 	force = 6
 	throwforce = 8
 	throw_range = 4
-	mopspeed = 20
\ No newline at end of file
+	mopspeed = 20
+
+/obj/item/weapon/mop/advanced/cyborg
+	mopcap = 40
+
+/obj/item/weapon/mop/advanced/cyborg/New()
+	..()
+	reagents.add_reagent("water", mopcap)
+
+/obj/item/weapon/mop/advanced/cyborg/examine(mob/user)
+	..(user)
+	to_chat(user, "<span class='notice'>The mop's water tank has [round(reagents.get_reagent_amount("water"))] units of water left.</span>")
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm
index 866efe8763c..7e251532bd1 100644
--- a/code/game/objects/items/weapons/paint.dm
+++ b/code/game/objects/items/weapons/paint.dm
@@ -9,7 +9,7 @@ var/global/list/cached_icons = list()
 	icon_state = "paint_neutral"
 	item_state = "paintcan"
 	materials = list(MAT_METAL=200)
-	w_class = 3.0
+	w_class = 3
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(10,20,30,50,70)
 	volume = 70
@@ -73,7 +73,7 @@ var/global/list/cached_icons = list()
 	icon_state = "paint_neutral"
 	color = "FFFFFF"
 	item_state = "paintcan"
-	w_class = 3.0
+	w_class = 3
 
 /obj/item/weapon/paint/red
 	name = "Red paint"
@@ -117,7 +117,7 @@ var/global/list/cached_icons = list()
 
 	attack_self(mob/user as mob)
 		var/t1 = input(user, "Please select a color:", "Locking Computer", null) in list( "red", "blue", "green", "yellow", "black", "white")
-		if ((user.get_active_hand() != src || user.stat || user.restrained()))
+		if((user.get_active_hand() != src || user.stat || user.restrained()))
 			return
 		switch(t1)
 			if("red")
diff --git a/code/game/objects/items/weapons/scissors.dm b/code/game/objects/items/weapons/scissors.dm
index 9f0c824dead..d213b6bcbb6 100644
--- a/code/game/objects/items/weapons/scissors.dm
+++ b/code/game/objects/items/weapons/scissors.dm
@@ -118,7 +118,7 @@
 				H.losebreath += 10 //30 Oxy damage over time
 				H.apply_damage(18, BRUTE, "head", sharp =1, edge =1, used_weapon = "scissors")
 				var/turf/location = get_turf(H)
-				if (istype(location, /turf/simulated))
+				if(istype(location, /turf/simulated))
 					location.add_blood(H)
 				H.bloody_hands(H)
 				H.bloody_body(H)
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index 589f91b8302..90c98c6fdac 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "scroll"
 	var/uses = 4.0
-	w_class = 2.0
+	w_class = 2
 	item_state = "paper"
 	throw_speed = 4
 	throw_range = 20
@@ -29,15 +29,15 @@
 
 /obj/item/weapon/teleportation_scroll/Topic(href, href_list)
 	..()
-	if (usr.stat || usr.restrained() || src.loc != usr)
+	if(usr.stat || usr.restrained() || src.loc != usr)
 		return
 	var/mob/living/carbon/human/H = usr
-	if (!( istype(H, /mob/living/carbon/human)))
+	if(!( istype(H, /mob/living/carbon/human)))
 		return 1
-	if ((usr == src.loc || (in_range(src, usr) && istype(src.loc, /turf))))
+	if((usr == src.loc || (in_range(src, usr) && istype(src.loc, /turf))))
 		usr.set_machine(src)
-		if (href_list["spell_teleport"])
-			if (src.uses >= 1)
+		if(href_list["spell_teleport"])
+			if(src.uses >= 1)
 				teleportscroll(H)
 	attack_self(H)
 	return
@@ -49,7 +49,7 @@
 	A = input(user, "Area to jump to", "BOOYEA", A) in teleportlocs
 	var/area/thearea = teleportlocs[A]
 
-	if (user.stat || user.restrained())
+	if(user.stat || user.restrained())
 		return
 	if(!((user == loc || (in_range(src, user) && istype(src.loc, /turf)))))
 		return
diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm
index 4add062aabc..bcc09a86f16 100644
--- a/code/game/objects/items/weapons/shards.dm
+++ b/code/game/objects/items/weapons/shards.dm
@@ -7,7 +7,7 @@
 	sharp = 1
 	edge = 1
 	desc = "Could probably be used as ... a throwing weapon?"
-	w_class = 1.0
+	w_class = 1
 	force = 5.0
 	throwforce = 10.0
 	item_state = "shard-glass"
@@ -53,7 +53,7 @@
 /obj/item/weapon/shard/Crossed(AM as mob|obj)
 	if(isliving(AM))
 		var/mob/living/M = AM
-		if (M.incorporeal_move || M.flying)//you are incorporal or flying..no shard stepping!
+		if(M.incorporeal_move || M.flying)//you are incorporal or flying..no shard stepping!
 			return
 		to_chat(M, "\red <B>You step on \the [src]!</B>")
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index a161755c285..809bf0d298d 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -1,5 +1,6 @@
 /obj/item/weapon/shield
 	name = "shield"
+	block_chance = 50
 
 /obj/item/weapon/shield/riot
 	name = "riot shield"
@@ -17,8 +18,10 @@
 	attack_verb = list("shoved", "bashed")
 	var/cooldown = 0 //shield bash cooldown. based on world.time
 
-/obj/item/weapon/shield/riot/IsShield()
-	return 1
+/obj/item/weapon/shield/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
+	if(attack_type == THROWN_PROJECTILE_ATTACK)
+		final_block_chance += 30
+	return ..()
 
 /obj/item/weapon/shield/riot/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/melee/baton))
@@ -41,12 +44,7 @@
 	icon_state = "buckler"
 	item_state = "buckler"
 	materials = list()
-
-/obj/item/weapon/shield/riot/buckler/IsShield()
-	if(prob(60))
-		return 1
-	else
-		return 0
+	block_chance = 30
 
 /obj/item/weapon/shield/energy
 	name = "energy combat shield"
@@ -62,8 +60,8 @@
 	attack_verb = list("shoved", "bashed")
 	var/active = 0
 
-/obj/item/weapon/shield/energy/IsShield()
-	return (active)
+/obj/item/weapon/shield/energy/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
+	return 0
 
 /obj/item/weapon/shield/energy/IsReflect()
 	return (active)
@@ -109,8 +107,10 @@
 	w_class = 3
 	var/active = 0
 
-/obj/item/weapon/shield/riot/tele/IsShield()
-	return (active)
+/obj/item/weapon/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
+	if(active)
+		return ..()
+	return 0
 
 /obj/item/weapon/shield/riot/tele/attack_self(mob/living/user)
 	active = !active
diff --git a/code/game/objects/items/weapons/signs.dm b/code/game/objects/items/weapons/signs.dm
index 7ad4f40b668..0eba3b837d2 100644
--- a/code/game/objects/items/weapons/signs.dm
+++ b/code/game/objects/items/weapons/signs.dm
@@ -4,7 +4,7 @@
 	name = "blank picket sign"
 	desc = "It's blank"
 	force = 5
-	w_class = 4.0
+	w_class = 4
 	attack_verb = list("bashed","smacked")
 
 	var/delayed = 0 //used to do delays
diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm
index 961547d362f..f21c0581888 100644
--- a/code/game/objects/items/weapons/soap.dm
+++ b/code/game/objects/items/weapons/soap.dm
@@ -4,7 +4,7 @@
 	gender = PLURAL
 	icon = 'icons/obj/items.dmi'
 	icon_state = "soap"
-	w_class = 1.0
+	w_class = 1
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
@@ -35,7 +35,7 @@
 			to_chat(user, "<span class='notice'>You 'clean' \the [target.name].</span>")
 			if(istype(target, /turf/simulated))
 				new /obj/effect/decal/cleanable/blood/gibs/cleangibs(target)
-			else if (istype(target,/mob/living/carbon))
+			else if(istype(target,/mob/living/carbon))
 				for(var/obj/item/carried_item in target.contents)
 					if(!istype(carried_item, /obj/item/weapon/implant))//If it's not an implant.
 						carried_item.add_blood(target)//Oh yes, there will be blood...
diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm
index e36bed7a473..ffaadb59d59 100644
--- a/code/game/objects/items/weapons/staff.dm
+++ b/code/game/objects/items/weapons/staff.dm
@@ -7,8 +7,8 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
-	flags = NOSHIELD
+	w_class = 2
+	armour_penetration = 100
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
 
 /obj/item/weapon/twohanded/staff/broom
@@ -72,5 +72,4 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
-	flags = NOSHIELD
\ No newline at end of file
+	w_class = 2
diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm
index 6e0500ffd38..e6e58196108 100644
--- a/code/game/objects/items/weapons/stock_parts.dm
+++ b/code/game/objects/items/weapons/stock_parts.dm
@@ -59,7 +59,7 @@
 	desc = "What?"
 	gender = PLURAL
 	icon = 'icons/obj/stock_parts.dmi'
-	w_class = 2.0
+	w_class = 2
 	var/rating = 1
 	New()
 		src.pixel_x = rand(-5.0, 5)
diff --git a/code/game/objects/items/weapons/storage/artistic_toolbox.dm b/code/game/objects/items/weapons/storage/artistic_toolbox.dm
index 56a3279dde0..81ba661115a 100644
--- a/code/game/objects/items/weapons/storage/artistic_toolbox.dm
+++ b/code/game/objects/items/weapons/storage/artistic_toolbox.dm
@@ -73,7 +73,7 @@
 	..()
 
 /obj/item/weapon/storage/toolbox/green/memetic/proc/consume(mob/M)
-	if (!M)
+	if(!M)
 		return
 	hunger = 0
 	hunger_message_level = 0
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 6c59e98385f..fa8de4f51bf 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -10,7 +10,7 @@
 	item_state = "backpack"
 	lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
-	w_class = 4.0
+	w_class = 4
 	slot_flags = SLOT_BACK	//ERROOOOO
 	max_w_class = 3
 	max_combined_w_class = 21
@@ -63,13 +63,13 @@
 			. = ..()
 
 	proc/failcheck(mob/user as mob)
-		if (prob(src.reliability)) return 1 //No failure
-		if (prob(src.reliability))
+		if(prob(src.reliability)) return 1 //No failure
+		if(prob(src.reliability))
 			to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure
 
 		else
 			to_chat(user, "\red The Bluespace generator malfunctions!")
-			for (var/obj/O in src.contents) //it broke, delete what was in it
+			for(var/obj/O in src.contents) //it broke, delete what was in it
 				qdel(O)
 			crit_fail = 1
 			icon_state = "brokenpack"
@@ -85,7 +85,7 @@
 	desc = "Space Santa uses this to deliver toys to all the nice children in space on Christmas! Wow, it's pretty big!"
 	icon_state = "giftbag0"
 	item_state = "giftbag"
-	w_class = 4.0
+	w_class = 4
 	max_w_class = 3
 	max_combined_w_class = 400 // can store a ton of shit!
 
@@ -322,6 +322,25 @@
 	new /obj/item/clothing/mask/muzzle(src)
 	new /obj/item/device/mmi/syndie(src)
 
+/obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake //for maint spawns
+	name = "surgery dufflebag"
+	desc = "A suspicious looking dufflebag for holding surgery tools."
+	icon_state = "duffel-syndimed"
+	item_state = "duffle-syndimed"
+
+/obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake/New()
+	..()
+	new /obj/item/weapon/scalpel(src)
+	new /obj/item/weapon/hemostat(src)
+	new /obj/item/weapon/retractor(src)
+	new /obj/item/weapon/cautery(src)
+	new /obj/item/weapon/bonegel(src)
+	new /obj/item/weapon/bonesetter(src)
+	new /obj/item/weapon/FixOVein(src)
+	if(prob(50))
+		new /obj/item/weapon/circular_saw(src)
+		new /obj/item/weapon/surgicaldrill(src)
+
 /obj/item/weapon/storage/backpack/duffel/captain
 	name = "captain's duffelbag"
 	desc = "A duffelbag designed to hold large quantities of condoms."
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 41bc851dff1..66cb11a9dd6 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -198,7 +198,7 @@
 			new /obj/item/seeds/grassseed(O.loc, O)
 
 	for(var/mob/M in range(1))
-		if (M.s_active == src)
+		if(M.s_active == src)
 			src.close(M)
 
 
@@ -263,7 +263,7 @@
 		if(!inserted || !S.amount)
 			usr.unEquip(S)
 			usr.update_icons()	//update our overlays
-			if (usr.client && usr.s_active != src)
+			if(usr.client && usr.s_active != src)
 				usr.client.screen -= S
 			S.dropped(usr)
 			if(!S.amount)
@@ -296,7 +296,7 @@
 
 		var/row_num = 0
 		var/col_count = min(7,storage_slots) -1
-		if (adjusted_contents > 7)
+		if(adjusted_contents > 7)
 			row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width.
 		src.standard_orient_objs(row_num, col_count, numbered_contents)
 		return
@@ -389,7 +389,7 @@
 	throwforce = 10.0
 	throw_speed = 3
 	throw_range = 5
-	w_class = 4.0
+	w_class = 4
 	flags = CONDUCT
 	materials = list(MAT_METAL=3000)
 
@@ -432,17 +432,17 @@
 /obj/item/weapon/storage/bag/tray/cyborg
 
 /obj/item/weapon/storage/bag/tray/cyborg/afterattack(atom/target, mob/user as mob)
-	if ( isturf(target) || istype(target,/obj/structure/table) )
+	if( isturf(target) || istype(target,/obj/structure/table) )
 		var foundtable = istype(target,/obj/structure/table/)
-		if ( !foundtable ) //it must be a turf!
+		if( !foundtable ) //it must be a turf!
 			for(var/obj/structure/table/T in target)
 				foundtable = 1
 				break
 
 		var turf/dropspot
-		if ( !foundtable ) // don't unload things onto walls or other silly places.
+		if( !foundtable ) // don't unload things onto walls or other silly places.
 			dropspot = user.loc
-		else if ( isturf(target) ) // they clicked on a turf with a table in it
+		else if( isturf(target) ) // they clicked on a turf with a table in it
 			dropspot = target
 		else					// they clicked on a table
 			dropspot = target.loc
@@ -462,8 +462,8 @@
 						if(I)
 							step(I, pick(NORTH,SOUTH,EAST,WEST))
 							sleep(rand(2,4))
-		if ( droppedSomething )
-			if ( foundtable )
+		if( droppedSomething )
+			if( foundtable )
 				user.visible_message("\blue [user] unloads their service tray.")
 			else
 				user.visible_message("\blue [user] drops all the items on their tray.")
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index d4863da97b9..ee0427e0b94 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -26,7 +26,7 @@
 	if(!istype(over_object, /obj/screen))
 		return ..()
 	playsound(src.loc, "rustle", 50, 1, -5)
-	if (!M.restrained() && !M.stat && can_use())
+	if(!M.restrained() && !M.stat && can_use())
 		switch(over_object.name)
 			if("r_hand")
 				M.unEquip(src)
@@ -443,13 +443,13 @@
 	can_hold = list()
 
 	proc/failcheck(mob/user as mob)
-		if (prob(src.reliability)) return 1 //No failure
-		if (prob(src.reliability))
+		if(prob(src.reliability)) return 1 //No failure
+		if(prob(src.reliability))
 			to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure
 
 		else
 			to_chat(user, "\red The Bluespace generator malfunctions!")
-			for (var/obj/O in src.contents) //it broke, delete what was in it
+			for(var/obj/O in src.contents) //it broke, delete what was in it
 				qdel(O)
 			crit_fail = 1
 			return 0
@@ -519,9 +519,9 @@
  // As a last resort, the belt can be used as a plastic explosive with a fixed timer (15 seconds).  Naturally, you'll lose all your gear...
  // Of course, it could be worse.  It could spawn a singularity!
 /obj/item/weapon/storage/belt/bluespace/owlman/afterattack(atom/target as obj|turf, mob/user as mob, flag)
-	if (!flag)
+	if(!flag)
 		return
-	if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/structure/table) || istype(target, /obj/structure/closet))
+	if(istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/structure/table) || istype(target, /obj/structure/closet))
 		return
 	to_chat(user, "Planting explosives...")
 	user.visible_message("[user.name] is fiddling with their toolbelt.")
@@ -536,8 +536,8 @@
 		target = target
 		loc = null
 		var/location
-		if (isturf(target)) location = target
-		if (ismob(target))
+		if(isturf(target)) location = target
+		if(ismob(target))
 			target:attack_log += "\[[time_stamp()]\]<font color='orange'> Had the [name] planted on them by [user.real_name] ([user.ckey])</font>"
 			user.visible_message("\red [user.name] finished planting an explosive on [target.name]!")
 		target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2")
@@ -547,12 +547,12 @@
 				if(ismob(target) || isobj(target))
 					location = target.loc // These things can move
 				explosion(location, -1, -1, 2, 3)
-				if (istype(target, /turf/simulated/wall)) target:dismantle_wall(1)
+				if(istype(target, /turf/simulated/wall)) target:dismantle_wall(1)
 				else target.ex_act(1)
-				if (isobj(target))
-					if (target)
+				if(isobj(target))
+					if(target)
 						qdel(target)
-				if (src)
+				if(src)
 					qdel(src)
 */
 
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 3fa521a7451..57332ae24d6 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -4,7 +4,7 @@
 	icon_state ="bible"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 3.0
+	w_class = 3
 	var/mob/affecting = null
 	var/deity_name = "Christ"
 
@@ -52,7 +52,7 @@
 	else
 		M.LAssailant = user
 
-	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+	if(!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
 		to_chat(user, "\red You don't have the dexterity to do this!")
 		return
 	if(!chaplain)
@@ -60,7 +60,7 @@
 		user.take_organ_damage(0,10)
 		return
 
-	if ((CLUMSY in user.mutations) && prob(50))
+	if((CLUMSY in user.mutations) && prob(50))
 		to_chat(user, "\red The [src] slips out of your hand and hits your head.")
 		user.take_organ_damage(10)
 		user.Paralyse(20)
@@ -69,12 +69,12 @@
 //	if(..() == BLOCKED)
 //		return
 
-	if (M.stat !=2)
+	if(M.stat !=2)
 		/*if((M.mind in ticker.mode.cult) && (prob(20)))
 			to_chat(M, "\red The power of [src.deity_name] clears your mind of heresy!")
 			to_chat(user, "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!")
 			ticker.mode.remove_cultist(M.mind)*/
-		if ((istype(M, /mob/living/carbon/human) && prob(60)))
+		if((istype(M, /mob/living/carbon/human) && prob(60)))
 			bless(M)
 			for(var/mob/O in viewers(M, null))
 				O.show_message(text("\red <B>[] heals [] with the power of [src.deity_name]!</B>", user, M), 1)
@@ -96,7 +96,7 @@
 /obj/item/weapon/storage/bible/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity)
 		return
-	if (istype(A, /turf/simulated/floor))
+	if(istype(A, /turf/simulated/floor))
 		to_chat(user, "<span class='notice'>You hit the floor with the bible.</span>")
 		if(user.mind && (user.mind.assigned_role == "Chaplain"))
 			call(/obj/effect/rune/proc/revealrunes)(src)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index ce1e6aad9bb..7bfef0b5d06 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -603,7 +603,7 @@
 	icon_state = "syringe"
 	New()
 		..()
-		for (var/i; i < storage_slots; i++)
+		for(var/i; i < storage_slots; i++)
 			new /obj/item/weapon/reagent_containers/hypospray/autoinjector(src)
 
 /obj/item/weapon/storage/box/autoinjector/utility
diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm
index 390f7632ca3..543865aa592 100644
--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -8,7 +8,7 @@
 	force = 8.0
 	throw_speed = 2
 	throw_range = 4
-	w_class = 4.0
+	w_class = 4
 	max_w_class = 3
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 31ead836204..95b23e45b15 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -115,7 +115,7 @@
 	desc = "A box of crayons for all your rune drawing needs."
 	icon = 'icons/obj/crayons.dmi'
 	icon_state = "crayonbox"
-	w_class = 2.0
+	w_class = 2
 	storage_slots = 6
 	icon_type = "crayon"
 	can_hold = list(
@@ -355,7 +355,7 @@
 	var/total_contents = src.contents.len - itemremoved
 	src.icon_state = "vialbox[total_contents]"
 	src.overlays.Cut()
-	if (!broken)
+	if(!broken)
 		overlays += image(icon, src, "led[locked]")
 		if(locked)
 			overlays += image(icon, src, "cover")
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index a11d00dbccd..82ee049d51d 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -31,7 +31,7 @@
 
 	New()
 		..()
-		if (empty) return
+		if(empty) return
 
 		icon_state = pick("ointment","firefirstaid")
 
@@ -53,7 +53,7 @@
 
 	New()
 		..()
-		if (empty) return
+		if(empty) return
 		new /obj/item/weapon/reagent_containers/food/pill/patch/styptic( src )
 		new /obj/item/weapon/reagent_containers/food/pill/patch/styptic( src )
 		new /obj/item/weapon/reagent_containers/food/pill/salicylic( src )
@@ -71,7 +71,7 @@
 
 	New()
 		..()
-		if (empty) return
+		if(empty) return
 
 		icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
 
@@ -95,7 +95,7 @@
 
 	New()
 		..()
-		if (empty) return
+		if(empty) return
 		new /obj/item/weapon/reagent_containers/food/pill/salbutamol( src )
 		new /obj/item/weapon/reagent_containers/food/pill/salbutamol( src )
 		new /obj/item/weapon/reagent_containers/food/pill/salbutamol( src )
@@ -114,7 +114,7 @@
 
 	New()
 		..()
-		if (empty) return
+		if(empty) return
 
 		icon_state = pick("brute","brute2")
 
@@ -138,7 +138,7 @@
 
 /obj/item/weapon/storage/firstaid/adv/New()
 	..()
-	if (empty) return
+	if(empty) return
 	new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
 	new /obj/item/stack/medical/advanced/bruise_pack(src)
 	new /obj/item/stack/medical/advanced/bruise_pack(src)
@@ -164,7 +164,7 @@
 
 /obj/item/weapon/storage/firstaid/tactical/New()
 	..()
-	if (empty) return
+	if(empty) return
 	new /obj/item/clothing/accessory/stethoscope( src )
 	new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
 	new /obj/item/weapon/reagent_containers/hypospray/combat(src)
@@ -209,7 +209,7 @@
 	icon_state = "pill_canister"
 	icon = 'icons/obj/chemical.dmi'
 	item_state = "contsolid"
-	w_class = 2.0
+	w_class = 2
 	can_hold = list("/obj/item/weapon/reagent_containers/food/pill","/obj/item/weapon/dice","/obj/item/weapon/paper")
 	allow_quick_gather = 1
 	use_to_pickup = 1
@@ -223,11 +223,11 @@
 	base_name = name
 
 /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
-	if (ishuman(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
+	if(ishuman(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
 		var/mob/M = usr
-		if (!( istype(over_object, /obj/screen) ))
+		if(!( istype(over_object, /obj/screen) ))
 			return ..()
-		if ((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
+		if((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
 			switch(over_object.name)
 				if("r_hand")
 					M.unEquip(src)
@@ -238,7 +238,7 @@
 			src.add_fingerprint(usr)
 			return
 		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
-			if (usr.s_active)
+			if(usr.s_active)
 				usr.s_active.close(usr)
 			src.show_to(usr)
 			return
diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm
index 33ddaf498f2..f3dab6ce8ea 100644
--- a/code/game/objects/items/weapons/storage/internal.dm
+++ b/code/game/objects/items/weapons/storage/internal.dm
@@ -30,24 +30,24 @@
 //returns 1 if the master item's parent's MouseDrop() should be called, 0 otherwise. It's strange, but no other way of
 //doing it without the ability to call another proc's parent, really.
 /obj/item/weapon/storage/internal/proc/handle_mousedrop(mob/user as mob, obj/over_object as obj)
-	if (ishuman(user)) //so monkeys can take off their backpacks -- Urist
+	if(ishuman(user)) //so monkeys can take off their backpacks -- Urist
 
-		if (istype(user.loc,/obj/mecha)) // stops inventory actions in a mech
+		if(istype(user.loc,/obj/mecha)) // stops inventory actions in a mech
 			return 0
 
 		if(over_object == user && Adjacent(user)) // this must come before the screen objects only block
 			src.open(user)
 			return 0
 
-		if (!( istype(over_object, /obj/screen) ))
+		if(!( istype(over_object, /obj/screen) ))
 			return 1
 
 		//makes sure master_item is equipped before putting it in hand, so that we can't drag it into our hand from miles away.
 		//there's got to be a better way of doing this...
-		if (!(master_item.loc == user) || (master_item.loc && master_item.loc.loc == user))
+		if(!(master_item.loc == user) || (master_item.loc && master_item.loc.loc == user))
 			return 0
 
-		if (!( user.restrained() ) && !( user.stat ))
+		if(!( user.restrained() ) && !( user.stat ))
 			switch(over_object.name)
 				if("r_hand")
 					user.unEquip(master_item)
@@ -76,12 +76,12 @@
 			return 0
 
 	src.add_fingerprint(user)
-	if (master_item.loc == user)
+	if(master_item.loc == user)
 		src.open(user)
 		return 0
 
 	for(var/mob/M in range(1, master_item.loc))
-		if (M.s_active == src)
+		if(M.s_active == src)
 			src.close(M)
 	return 1
 
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index cb6d91b7dee..7cc71918905 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -18,7 +18,7 @@
 
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-		if (istype(W, /obj/item/weapon/card/id))
+		if(istype(W, /obj/item/weapon/card/id))
 			if(src.broken)
 				to_chat(user, "<span class='warning'>It appears to be broken.</span>")
 				return
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index dba3fb620e3..dad7b46a161 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -23,7 +23,7 @@
 	var/l_hacking = 0
 	var/emagged = 0
 	var/open = 0
-	w_class = 3.0
+	w_class = 3
 	max_w_class = 2
 	max_combined_w_class = 14
 
@@ -33,19 +33,19 @@
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(locked)
-			if ((istype(W, /obj/item/weapon/melee/energy/blade)) && (!src.emagged))
+			if((istype(W, /obj/item/weapon/melee/energy/blade)) && (!src.emagged))
 				emag_act(user, W)
 
-			if (istype(W, /obj/item/weapon/screwdriver))
-				if (do_after(user, 20, target = src))
+			if(istype(W, /obj/item/weapon/screwdriver))
+				if(do_after(user, 20, target = src))
 					src.open =! src.open
 					user.show_message(text("\blue You [] the service panel.", (src.open ? "open" : "close")))
 				return
-			if ((istype(W, /obj/item/device/multitool)) && (src.open == 1)&& (!src.l_hacking))
+			if((istype(W, /obj/item/device/multitool)) && (src.open == 1)&& (!src.l_hacking))
 				user.show_message(text("\red Now attempting to reset internal memory, please hold."), 1)
 				src.l_hacking = 1
-				if (do_after(usr, 100, target = src))
-					if (prob(40))
+				if(do_after(usr, 100, target = src))
+					if(prob(40))
 						src.l_setshort = 1
 						src.l_set = 0
 						user.show_message(text("\red Internal memory reset.  Please give it a few seconds to reinitialize."), 1)
@@ -85,7 +85,7 @@
 
 
 	MouseDrop(over_object, src_location, over_location)
-		if (locked)
+		if(locked)
 			src.add_fingerprint(usr)
 			return
 		..()
@@ -95,28 +95,28 @@
 		user.set_machine(src)
 		var/dat = text("<TT><B>[]</B><BR>\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED"))
 		var/message = "Code"
-		if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort))
+		if((src.l_set == 0) && (!src.emagged) && (!src.l_setshort))
 			dat += text("<p>\n<b>5-DIGIT PASSCODE NOT SET.<br>ENTER NEW PASSCODE.</b>")
-		if (src.emagged)
+		if(src.emagged)
 			dat += text("<p>\n<font color=red><b>LOCKING SYSTEM ERROR - 1701</b></font>")
-		if (src.l_setshort)
+		if(src.l_setshort)
 			dat += text("<p>\n<font color=red><b>ALERT: MEMORY SYSTEM ERROR - 6040 201</b></font>")
 		message = text("[]", src.code)
-		if (!src.locked)
+		if(!src.locked)
 			message = "*****"
 		dat += text("<HR>\n>[]<BR>\n<A href='?src=\ref[];type=1'>1</A>-<A href='?src=\ref[];type=2'>2</A>-<A href='?src=\ref[];type=3'>3</A><BR>\n<A href='?src=\ref[];type=4'>4</A>-<A href='?src=\ref[];type=5'>5</A>-<A href='?src=\ref[];type=6'>6</A><BR>\n<A href='?src=\ref[];type=7'>7</A>-<A href='?src=\ref[];type=8'>8</A>-<A href='?src=\ref[];type=9'>9</A><BR>\n<A href='?src=\ref[];type=R'>R</A>-<A href='?src=\ref[];type=0'>0</A>-<A href='?src=\ref[];type=E'>E</A><BR>\n</TT>", message, src, src, src, src, src, src, src, src, src, src, src, src)
 		user << browse(dat, "window=caselock;size=300x280")
 
 	Topic(href, href_list)
 		..()
-		if ((usr.stat || usr.restrained()) || (get_dist(src, usr) > 1))
+		if((usr.stat || usr.restrained()) || (get_dist(src, usr) > 1))
 			return
-		if (href_list["type"])
-			if (href_list["type"] == "E")
-				if ((src.l_set == 0) && (length(src.code) == 5) && (!src.l_setshort) && (src.code != "ERROR"))
+		if(href_list["type"])
+			if(href_list["type"] == "E")
+				if((src.l_set == 0) && (length(src.code) == 5) && (!src.l_setshort) && (src.code != "ERROR"))
 					src.l_code = src.code
 					src.l_set = 1
-				else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1))
+				else if((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1))
 					src.locked = 0
 					src.overlays = null
 					overlays += image('icons/obj/storage.dmi', icon_opened)
@@ -124,18 +124,18 @@
 				else
 					src.code = "ERROR"
 			else
-				if ((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort))
+				if((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort))
 					src.locked = 1
 					src.overlays = null
 					src.code = null
 					src.close(usr)
 				else
 					src.code += text("[]", href_list["type"])
-					if (length(src.code) > 5)
+					if(length(src.code) > 5)
 						src.code = "ERROR"
 			src.add_fingerprint(usr)
 			for(var/mob/M in viewers(1, src.loc))
-				if ((M.client && M.machine == src))
+				if((M.client && M.machine == src))
 					src.attack_self(M)
 				return
 		return
@@ -165,7 +165,7 @@
 	force = 8.0
 	throw_speed = 2
 	throw_range = 4
-	w_class = 4.0
+	w_class = 4
 	max_w_class = 3
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
@@ -176,17 +176,17 @@
 		new /obj/item/weapon/pen(src)
 
 	attack_hand(mob/user as mob)
-		if ((src.loc == user) && (src.locked == 1))
+		if((src.loc == user) && (src.locked == 1))
 			to_chat(usr, "\red [src] is locked and cannot be opened!")
-		else if ((src.loc == user) && (!src.locked))
+		else if((src.loc == user) && (!src.locked))
 			playsound(src.loc, "rustle", 50, 1, -5)
-			if (user.s_active)
+			if(user.s_active)
 				user.s_active.close(user) //Close and re-open
 			src.show_to(user)
 		else
 			..()
 			for(var/mob/M in range(1))
-				if (M.s_active == src)
+				if(M.s_active == src)
 					src.close(M)
 			src.orient2hud(user)
 		src.add_fingerprint(user)
@@ -213,7 +213,7 @@
 	icon_locking = "safeb"
 	icon_sparking = "safespark"
 	force = 8.0
-	w_class = 5.0
+	w_class = 5
 	max_w_class = 8
 	anchored = 1.0
 	density = 0
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 9bbc26017be..2a3a602258e 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -8,7 +8,7 @@
 /obj/item/weapon/storage
 	name = "storage"
 	icon = 'icons/obj/storage.dmi'
-	w_class = 3.0
+	w_class = 3
 	var/silent = 0 // No message on putting items in
 	var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
 	var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
@@ -26,10 +26,10 @@
 	var/use_sound = "rustle"	//sound played when used. null for no sound.
 
 /obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
-	if (ishuman(usr)) //so monkeys can take off their backpacks -- Urist
+	if(ishuman(usr)) //so monkeys can take off their backpacks -- Urist
 		var/mob/M = usr
 
-		if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+		if(istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
 			return
 
 		if(over_object == M && Adjacent(M)) // this must come before the screen objects only block
@@ -39,12 +39,12 @@
 			show_to(M)
 			return
 
-		if ((istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \
+		if((istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \
 			&& contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && over_object.Adjacent(usr) \
 			&& !istype(src, /obj/item/weapon/storage/lockbox))
 			var/turf/T = get_turf(over_object)
-			if (istype(over_object, /turf/simulated/floor))
-				if (get_turf(usr) != T)
+			if(istype(over_object, /turf/simulated/floor))
+				if(get_turf(usr) != T)
 					return // Can only empty containers onto the floor under you
 				if("Yes" != alert(usr,"Empty \the [src] onto \the [T]?","Confirm","Yes","No"))
 					return
@@ -59,12 +59,12 @@
 			update_icon() // For content-sensitive icons
 			return
 
-		if (!( istype(over_object, /obj/screen) ))
+		if(!( istype(over_object, /obj/screen) ))
 			return ..()
-		if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
+		if(!(src.loc == usr) || (src.loc && src.loc.loc == usr))
 			return
 		playsound(src.loc, "rustle", 50, 1, -5)
-		if (!( M.restrained() ) && !( M.stat ))
+		if(!( M.restrained() ) && !( M.stat ))
 			switch(over_object.name)
 				if("r_hand")
 					if(!M.unEquip(src))
@@ -77,7 +77,7 @@
 			src.add_fingerprint(usr)
 			return
 		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
-			if (usr.s_active)
+			if(usr.s_active)
 				usr.s_active.close(usr)
 			src.show_to(usr)
 			return
@@ -94,7 +94,7 @@
 		L += S.return_inv()
 	for(var/obj/item/weapon/gift/G in src)
 		L += G.gift
-		if (istype(G.gift, /obj/item/weapon/storage))
+		if(istype(G.gift, /obj/item/weapon/storage))
 			L += G.gift:return_inv()
 	for(var/obj/item/weapon/folder/F in src)
 		L += F.contents
@@ -128,11 +128,11 @@
 	return
 
 /obj/item/weapon/storage/proc/open(mob/user as mob)
-	if (src.use_sound)
+	if(src.use_sound)
 		playsound(src.loc, src.use_sound, 50, 1, -5)
 
 	orient2hud(user)
-	if (user.s_active)
+	if(user.s_active)
 		user.s_active.close(user)
 	show_to(user)
 
@@ -153,7 +153,7 @@
 		O.layer = 20
 		O.plane = HUD_PLANE
 		cx++
-		if (cx > mx)
+		if(cx > mx)
 			cx = tx
 			cy--
 	src.closer.screen_loc = "[mx+1],[my]"
@@ -173,7 +173,7 @@
 			ND.sample_object.layer = 20
 			ND.sample_object.plane = HUD_PLANE
 			cx++
-			if (cx > (4+cols))
+			if(cx > (4+cols))
 				cx = 4
 				cy--
 	else
@@ -184,7 +184,7 @@
 			O.layer = 20
 			O.plane = HUD_PLANE
 			cx++
-			if (cx > (4+cols))
+			if(cx > (4+cols))
 				cx = 4
 				cy--
 	src.closer.screen_loc = "[4+cols+1]:16,2:16"
@@ -224,7 +224,7 @@
 	//var/mob/living/carbon/human/H = user
 	var/row_num = 0
 	var/col_count = min(7,storage_slots) -1
-	if (adjusted_contents > 7)
+	if(adjusted_contents > 7)
 		row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width.
 	src.standard_orient_objs(row_num, col_count, numbered_contents)
 	return
@@ -249,7 +249,7 @@
 				break
 		if(!ok)
 			if(!stop_messages)
-				if (istype(W, /obj/item/weapon/hand_labeler))
+				if(istype(W, /obj/item/weapon/hand_labeler))
 					return 0
 				to_chat(usr, "<span class='notice'>[src] cannot hold [W].</span>")
 			return 0
@@ -260,7 +260,7 @@
 				to_chat(usr, "<span class='notice'>[src] cannot hold [W].</span>")
 			return 0
 
-	if (W.w_class > max_w_class)
+	if(W.w_class > max_w_class)
 		if(!stop_messages)
 			to_chat(usr, "<span class='notice'>[W] is too big for this [src].</span>")
 		return 0
@@ -301,18 +301,18 @@
 	W.loc = src
 	W.on_enter_storage(src)
 	if(usr)
-		if (usr.client && usr.s_active != src)
+		if(usr.client && usr.s_active != src)
 			usr.client.screen -= W
 		W.dropped(usr)
 		add_fingerprint(usr)
 
 		if(!prevent_warning && !istype(W, /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow))
 			for(var/mob/M in viewers(usr, null))
-				if (M == usr)
+				if(M == usr)
 					to_chat(usr, "<span class='notice'>You put the [W] into [src].</span>")
-				else if (M in range(1)) //If someone is standing close enough, they can tell what it is...
+				else if(M in range(1)) //If someone is standing close enough, they can tell what it is...
 					M.show_message("<span class='notice'>[usr] puts [W] into [src].</span>")
-				else if (W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance...
+				else if(W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance...
 					M.show_message("<span class='notice'>[usr] puts [W] into [src].</span>")
 
 		src.orient2hud(usr)
@@ -331,8 +331,8 @@
 		F.update_icon(1)
 
 	for(var/mob/M in range(1, src.loc))
-		if (M.s_active == src)
-			if (M.client)
+		if(M.s_active == src)
+			if(M.client)
 				M.client.screen -= W
 
 	if(new_location)
@@ -392,14 +392,14 @@
 			return
 
 	src.orient2hud(user)
-	if (src.loc == user)
-		if (user.s_active)
+	if(src.loc == user)
+		if(user.s_active)
 			user.s_active.close(user)
 		src.show_to(user)
 	else
 		..()
 		for(var/mob/M in range(1))
-			if (M.s_active == src)
+			if(M.s_active == src)
 				src.close(M)
 	src.add_fingerprint(user)
 	return
@@ -409,7 +409,7 @@
 	set category = "Object"
 
 	collection_mode = !collection_mode
-	switch (collection_mode)
+	switch(collection_mode)
 		if(1)
 			to_chat(usr, "[src] now picks up all items in a tile at once.")
 		if(0)
@@ -488,19 +488,19 @@
 			return
 
 	//Otherwise we'll try to fold it.
-	if ( contents.len )
+	if( contents.len )
 		return
 
-	if ( !ispath(src.foldable) )
+	if( !ispath(src.foldable) )
 		return
 	var/found = 0
 	// Close any open UI windows first
 	for(var/mob/M in range(1))
-		if (M.s_active == src)
+		if(M.s_active == src)
 			src.close(M)
-		if ( M == user )
+		if( M == user )
 			found = 1
-	if ( !found )	// User is too far away
+	if( !found )	// User is too far away
 		return
 	// Now make the cardboard
 	to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
@@ -514,14 +514,14 @@
 	var/depth = 0
 	var/atom/cur_atom = src
 
-	while (cur_atom && !(cur_atom in container.contents))
-		if (isarea(cur_atom))
+	while(cur_atom && !(cur_atom in container.contents))
+		if(isarea(cur_atom))
 			return -1
-		if (istype(cur_atom.loc, /obj/item/weapon/storage))
+		if(istype(cur_atom.loc, /obj/item/weapon/storage))
 			depth++
 		cur_atom = cur_atom.loc
 
-	if (!cur_atom)
+	if(!cur_atom)
 		return -1	//inside something with a null loc.
 
 	return depth
@@ -532,14 +532,14 @@
 	var/depth = 0
 	var/atom/cur_atom = src
 
-	while (cur_atom && !isturf(cur_atom))
-		if (isarea(cur_atom))
+	while(cur_atom && !isturf(cur_atom))
+		if(isarea(cur_atom))
 			return -1
-		if (istype(cur_atom.loc, /obj/item/weapon/storage))
+		if(istype(cur_atom.loc, /obj/item/weapon/storage))
 			depth++
 		cur_atom = cur_atom.loc
 
-	if (!cur_atom)
+	if(!cur_atom)
 		return -1	//inside something with a null loc.
 
 	return depth
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 22e46163fa3..fd44bacbf53 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -9,7 +9,7 @@
 	throwforce = 10.0
 	throw_speed = 2
 	throw_range = 7
-	w_class = 4.0
+	w_class = 4
 	materials = list(MAT_METAL = 500)
 	origin_tech = "combat=1"
 	attack_verb = list("robusted")
@@ -17,7 +17,7 @@
 
 	New()
 		..()
-		if (src.type == /obj/item/weapon/storage/toolbox)
+		if(src.type == /obj/item/weapon/storage/toolbox)
 			to_chat(world, "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]")
 			qdel(src)
 
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index e5ebf843c6e..3c972b9d041 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/storage/box/syndicate/
 	New()
 		..()
-		switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "bond" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "implant" = 1, "hacker" = 1, "lordsingulo" = 1, "darklord" = 1)))
+		switch(pickweight(list("bloodyspai" = 1, "stealth" = 1, "bond" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "implant" = 1, "hacker" = 1, "lordsingulo" = 1, "darklord" = 1)))
 			if("bloodyspai")
 				new /obj/item/clothing/under/chameleon(src)
 				new /obj/item/clothing/mask/gas/voice(src)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index db834beeb45..6ab787e519f 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -132,6 +132,11 @@
 
 
 /obj/item/weapon/melee/baton/proc/baton_stun(mob/living/L, mob/user)
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that
+			playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
+			return
 	user.lastattacked = L
 	L.lastattacker = user
 
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 63346476021..0d39e6bd1c7 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -46,11 +46,15 @@
 			return
 		if(!isliving(target))
 			return
-		if (user.a_intent == I_HARM)
+		if(user.a_intent == I_HARM)
 			if(!..()) return
 			if(!isrobot(target)) return
 		else
 			if(cooldown <= 0)
+				if(ishuman(target))
+					var/mob/living/carbon/human/H = target
+					if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK))
+						return 0
 				playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
 				target.Weaken(3)
 				add_logs(target, user, "stunned", object="[src]")
diff --git a/code/game/objects/items/weapons/syndie_uplink.dm b/code/game/objects/items/weapons/syndie_uplink.dm
index 173c9ff2960..3dd9a230ad1 100644
--- a/code/game/objects/items/weapons/syndie_uplink.dm
+++ b/code/game/objects/items/weapons/syndie_uplink.dm
@@ -10,7 +10,7 @@
 	var/mob/currentUser = null
 	var/obj/item/device/radio/origradio = null
 	flags = CONDUCT | ONBELT
-	w_class = 2.0
+	w_class = 2
 	item_state = "radio"
 	throw_speed = 4
 	throw_range = 20
@@ -31,7 +31,7 @@
 	slot_flags = SLOT_BELT
 	item_state = "radio"
 	throwforce = 5
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 4
 	throw_range = 20
 	materials = list(MAT_METAL=100)
diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm
index 4f5db94d4af..62c2f7aabfd 100644
--- a/code/game/objects/items/weapons/table_rack_parts.dm
+++ b/code/game/objects/items/weapons/table_rack_parts.dm
@@ -96,7 +96,7 @@
  */
 /obj/item/weapon/rack_parts/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
-	if (istype(W, /obj/item/weapon/wrench))
+	if(istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/metal(user.loc)
 		qdel(src)
 
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index 68fe80fdbfb..ccde1d215e2 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -4,7 +4,7 @@
 	name = "Jetpack (Empty)"
 	desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
 	icon_state = "jetpack"
-	w_class = 4.0
+	w_class = 4
 	item_state = "jetpack"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	var/datum/effect/system/ion_trail_follow/ion_trail
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 8f49bd68a38..485b800c105 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -100,9 +100,9 @@
 /obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 
-	if (istype(W, /obj/item/weapon/flamethrower))
+	if(istype(W, /obj/item/weapon/flamethrower))
 		var/obj/item/weapon/flamethrower/F = W
-		if ((!F.status)||(F.ptank))	return
+		if((!F.status)||(F.ptank))	return
 		src.master = F
 		F.ptank = src
 		user.unEquip(src)
@@ -135,7 +135,7 @@
 	icon_state = "emergency"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	w_class = 2.0
+	w_class = 2
 	force = 4.0
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 3dc3cdef9a5..98c6340d927 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -41,25 +41,25 @@
 
 /obj/item/weapon/tank/examine(mob/user)
 	var/obj/icon = src
-	if (istype(src.loc, /obj/item/assembly))
+	if(istype(src.loc, /obj/item/assembly))
 		icon = src.loc
-	if (!in_range(src, user))
-		if (icon == src)
+	if(!in_range(src, user))
+		if(icon == src)
 			to_chat(user, "\blue It's \a [bicon(icon)][src]! If you want any more information you'll need to get closer.")
 		return
 
 	var/celsius_temperature = src.air_contents.temperature-T0C
 	var/descriptive
 
-	if (celsius_temperature < 20)
+	if(celsius_temperature < 20)
 		descriptive = "cold"
-	else if (celsius_temperature < 40)
+	else if(celsius_temperature < 40)
 		descriptive = "room temperature"
-	else if (celsius_temperature < 80)
+	else if(celsius_temperature < 80)
 		descriptive = "lukewarm"
-	else if (celsius_temperature < 100)
+	else if(celsius_temperature < 100)
 		descriptive = "warm"
-	else if (celsius_temperature < 300)
+	else if(celsius_temperature < 300)
 		descriptive = "hot"
 	else
 		descriptive = "furiously hot"
@@ -71,7 +71,7 @@
 /obj/item/weapon/tank/blob_act()
 	if(prob(50))
 		var/turf/location = src.loc
-		if (!( istype(location, /turf) ))
+		if(!( istype(location, /turf) ))
 			qdel(src)
 
 		if(src.air_contents)
@@ -83,17 +83,17 @@
 	..()
 
 	src.add_fingerprint(user)
-	if (istype(src.loc, /obj/item/assembly))
+	if(istype(src.loc, /obj/item/assembly))
 		icon = src.loc
 
-	if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
+	if((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
 		atmosanalyzer_scan(air_contents, user)
 
 	if(istype(W, /obj/item/device/assembly_holder))
 		bomb_assemble(W,user)
 
 /obj/item/weapon/tank/attack_self(mob/user as mob)
-	if (!(src.air_contents))
+	if(!(src.air_contents))
 		return
 
 	ui_interact(user)
@@ -130,7 +130,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "tanks.tmpl", "Tank", 500, 300)
@@ -143,28 +143,28 @@
 
 /obj/item/weapon/tank/Topic(href, href_list)
 	..()
-	if (usr.stat|| usr.restrained())
+	if(usr.stat|| usr.restrained())
 		return 0
-	if (src.loc != usr)
+	if(src.loc != usr)
 		return 0
 
-	if (href_list["dist_p"])
-		if (href_list["dist_p"] == "reset")
+	if(href_list["dist_p"])
+		if(href_list["dist_p"] == "reset")
 			src.distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
-		else if (href_list["dist_p"] == "max")
+		else if(href_list["dist_p"] == "max")
 			src.distribute_pressure = TANK_MAX_RELEASE_PRESSURE
 		else
 			var/cp = text2num(href_list["dist_p"])
 			src.distribute_pressure += cp
 		src.distribute_pressure = min(max(round(src.distribute_pressure), 0), TANK_MAX_RELEASE_PRESSURE)
-	if (href_list["stat"])
+	if(href_list["stat"])
 		if(istype(loc,/mob/living/carbon))
 			var/mob/living/carbon/location = loc
 			if(location.internal == src)
 				location.internal = null
 				location.internals.icon_state = "internal0"
 				to_chat(usr, "\blue You close the tank release valve.")
-				if (location.internals)
+				if(location.internals)
 					location.internals.icon_state = "internal0"
 			else
 
@@ -179,7 +179,7 @@
 				if(can_open_valve)
 					location.internal = src
 					to_chat(usr, "\blue You open \the [src] valve.")
-					if (location.internals)
+					if(location.internals)
 						location.internals.icon_state = "internal1"
 				else
 					to_chat(usr, "\blue You need something to connect to \the [src].")
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 1d9cce844ff..468ac6bf3bf 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -5,7 +5,7 @@
 	icon = 'icons/obj/watertank.dmi'
 	icon_state = "waterbackpack"
 	item_state = "waterbackpack"
-	w_class = 4.0
+	w_class = 4
 	slot_flags = SLOT_BACK
 	slowdown = 1
 	action_button_name = "Toggle Mister"
@@ -25,7 +25,7 @@
 /obj/item/weapon/watertank/verb/toggle_mister()
 	set name = "Toggle Mister"
 	set category = "Object"
-	if (usr.get_item_by_slot(slot_back) != src)
+	if(usr.get_item_by_slot(slot_back) != src)
 		to_chat(usr, "<span class='notice'>The watertank needs to be on your back to use.</span>")
 		return
 	if(usr.incapacitated())
@@ -52,7 +52,7 @@
 	return new /obj/item/weapon/reagent_containers/spray/mister(src)
 
 /obj/item/weapon/watertank/equipped(mob/user, slot)
-	if (slot != slot_back)
+	if(slot != slot_back)
 		remove_noz()
 
 /obj/item/weapon/watertank/proc/remove_noz()
@@ -62,7 +62,7 @@
 	return
 
 /obj/item/weapon/watertank/Destroy()
-	if (on)
+	if(on)
 		remove_noz()
 		qdel(noz)
 		noz = null
@@ -108,7 +108,7 @@
 	icon = 'icons/obj/watertank.dmi'
 	icon_state = "mister"
 	item_state = "mister"
-	w_class = 4.0
+	w_class = 4
 	amount_per_transfer_from_this = 50
 	possible_transfer_amounts = list(25,50,100)
 	volume = 500
@@ -133,7 +133,7 @@
 	return
 
 /proc/check_tank_exists(parent_tank, var/mob/living/carbon/human/M, var/obj/O)
-	if (!parent_tank || !istype(parent_tank, /obj/item/weapon/watertank))	//To avoid weird issues from admin spawns
+	if(!parent_tank || !istype(parent_tank, /obj/item/weapon/watertank))	//To avoid weird issues from admin spawns
 		M.unEquip(O)
 		qdel(0)
 		return 0
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 99567b5952a..4728e8c730e 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -17,7 +17,7 @@
 	var/broadcasting = null
 	var/listening = 1.0
 	flags = CONDUCT
-	w_class = 2.0
+	w_class = 2
 	item_state = "electronic"
 	throw_speed = 4
 	throw_range = 20
@@ -27,7 +27,7 @@
 /obj/item/weapon/locator/attack_self(mob/user as mob)
 	add_fingerprint(usr)
 	var/dat
-	if (temp)
+	if(temp)
 		dat = "[src.temp]<BR><BR><A href='byond://?src=\ref[src];temp=1'>Clear</A>"
 	else
 		dat = {"
@@ -52,25 +52,25 @@ Frequency:
 		to_chat(usr, "<span class='warning'>\The [src] is malfunctioning.</span>")
 		return 1
 
-	if (href_list["refresh"])
+	if(href_list["refresh"])
 		temp = "<B>Persistent Signal Locator</B><HR>"
 		var/turf/sr = get_turf(src)
 
-		if (sr)
+		if(sr)
 			temp += "<B>Located Beacons:</B><BR>"
 
 			for(var/obj/item/device/radio/beacon/W in beacons)
-				if (W.frequency == frequency && !W.syndicate)
-					if (W && W.z == z)
+				if(W.frequency == frequency && !W.syndicate)
+					if(W && W.z == z)
 						var/turf/TB = get_turf(W)
 						temp += "[W.code]: [TB.x], [TB.y], [TB.z]<BR>"
 
 			temp += "<B>Located Implants:</B><BR>"
-			for (var/obj/item/weapon/implant/tracking/T in tracked_implants)
-				if (!T.implanted || !T.imp_in)
+			for(var/obj/item/weapon/implant/tracking/T in tracked_implants)
+				if(!T.implanted || !T.imp_in)
 					continue
 
-				if (T && T.z == z)
+				if(T && T.z == z)
 					temp += "[T.id]: [T.imp_in.x], [T.imp_in.y], [T.imp_in.z]<BR>"
 
 			temp += "<B>You are at \[[sr.x],[sr.y],[sr.z]\]</B>."
@@ -78,11 +78,11 @@ Frequency:
 		else
 			temp += "<B><FONT color='red'>Processing error:</FONT></B> Unable to locate orbital position.<BR>"
 	else
-		if (href_list["freq"])
+		if(href_list["freq"])
 			frequency += text2num(href_list["freq"])
 			frequency = sanitize_frequency(frequency)
 		else
-			if (href_list["temp"])
+			if(href_list["temp"])
 				temp = null
 
 	attack_self(usr)
@@ -98,7 +98,7 @@ Frequency:
 	icon_state = "hand_tele"
 	item_state = "electronic"
 	throwforce = 0
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 5
 	materials = list(MAT_METAL=10000)
@@ -123,12 +123,12 @@ Frequency:
 		if(T.x>world.maxx-8 || T.x<8)	continue	//putting them at the edge is dumb
 		if(T.y>world.maxy-8 || T.y<8)	continue
 		A = get_area(T)
-		if (A.tele_proof == 1) continue // Telescience-proofed areas require a beacon.
+		if(A.tele_proof == 1) continue // Telescience-proofed areas require a beacon.
 		turfs += T
 	if(turfs.len)
 		L["None (Dangerous)"] = pick(turfs)
 	var/t1 = input(user, "Please select a teleporter to lock in on.", "Hand Teleporter") as null|anything in L
-	if (!t1 || (user.get_active_hand() != src || user.stat || user.restrained()))
+	if(!t1 || (user.get_active_hand() != src || user.stat || user.restrained()))
 		return
 	if(active_portals >= 3)
 		user.show_message("<span class='notice'>\The [src] is recharging!</span>")
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 2a9b64748dd..1452273573a 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -24,7 +24,7 @@
 	slot_flags = SLOT_BELT
 	force = 5.0
 	throwforce = 7.0
-	w_class = 2.0
+	w_class = 2
 	materials = list(MAT_METAL=150)
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
@@ -41,7 +41,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 5.0
-	w_class = 1.0
+	w_class = 1
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
@@ -56,29 +56,29 @@
 
 /obj/item/weapon/screwdriver/New()
 	switch(pick("red","blue","purple","brown","green","cyan","yellow"))
-		if ("red")
+		if("red")
 			icon_state = "screwdriver2"
 			item_state = "screwdriver"
-		if ("blue")
+		if("blue")
 			icon_state = "screwdriver"
 			item_state = "screwdriver_blue"
-		if ("purple")
+		if("purple")
 			icon_state = "screwdriver3"
 			item_state = "screwdriver_purple"
-		if ("brown")
+		if("brown")
 			icon_state = "screwdriver4"
 			item_state = "screwdriver_brown"
-		if ("green")
+		if("green")
 			icon_state = "screwdriver5"
 			item_state = "screwdriver_green"
-		if ("cyan")
+		if("cyan")
 			icon_state = "screwdriver6"
 			item_state = "screwdriver_cyan"
-		if ("yellow")
+		if("yellow")
 			icon_state = "screwdriver7"
 			item_state = "screwdriver_yellow"
 
-	if (prob(75))
+	if(prob(75))
 		src.pixel_y = rand(0, 16)
 	return
 
@@ -104,7 +104,7 @@
 	force = 6.0
 	throw_speed = 3
 	throw_range = 7
-	w_class = 2.0
+	w_class = 2
 	materials = list(MAT_METAL=80)
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("pinched", "nipped")
@@ -119,7 +119,7 @@
 		item_state = "cutters_yellow"
 
 /obj/item/weapon/wirecutters/attack(mob/living/carbon/human/C as mob, mob/user as mob)
-	if(C.handcuffed)
+	if(istype(C) && C.handcuffed)
 		if(istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
 			usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\
 			"You cut \the [C]'s restraints with \the [src]!",\
@@ -235,7 +235,7 @@
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/S = H.organs_by_name[user.zone_sel.selecting]
-		if (!S)
+		if(!S)
 			return
 
 		if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP || S.open == 2)
@@ -243,7 +243,7 @@
 
 		if(S.brute_dam)
 			if(S.brute_dam < ROBOLIMB_SELF_REPAIR_CAP)
-				if (remove_fuel(0,null))
+				if(remove_fuel(0,null))
 					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 					S.heal_damage(15,0,0,1)
 					user.visible_message("<span class='alert'>\The [user] patches some dents on \the [M]'s [S.name] with \the [src].</span>")
@@ -345,7 +345,7 @@
 		if(!message)
 			to_chat(user, "<span class='notice'>You switch [src] off.</span>")
 		else
-			to_chat(user, "<span class='warning'>[src] shuts off!</span>")
+			visible_message("<span class='warning'>[src] shuts off!</span>")
 		force = 3
 		damtype = "brute"
 		hitsound = "swing_hit"
@@ -365,7 +365,7 @@
 /obj/item/weapon/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)
 	if(!status)
 		var/obj/item/stack/rods/R = I
-		if (R.use(1))
+		if(R.use(1))
 			var/obj/item/weapon/flamethrower/F = new /obj/item/weapon/flamethrower(user.loc)
 			if(!remove_item_from_storage(F))
 				user.unEquip(src)
@@ -409,7 +409,7 @@
 	icon_state = "upindwelder"
 	item_state = "upindwelder"
 	max_fuel = 80
-	w_class = 3.0
+	w_class = 3
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
 	origin_tech = "engineering=3"
 
@@ -419,7 +419,7 @@
 	icon_state = "exwelder"
 	item_state = "exwelder"
 	max_fuel = 40
-	w_class = 3.0
+	w_class = 3
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
 	origin_tech = "engineering=4;plasmatech=3"
 	var/last_gen = 0
@@ -453,7 +453,7 @@
 	force = 5.0
 	throwforce = 7.0
 	item_state = "crowbar"
-	w_class = 2.0
+	w_class = 2
 	materials = list(MAT_METAL=50)
 	origin_tech = "engineering=1"
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
@@ -479,7 +479,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "kit"
 	flags = CONDUCT
-	w_class = 2.0
+	w_class = 2
 	origin_tech = "combat=2"
 	var/open = 0
 
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 29bcb4f8fe2..586eaab9672 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -74,7 +74,7 @@
 		to_chat(user, "<span class='notice'>You dedicate your module to [name].</span>")
 	else
 		to_chat(user, "<span class='notice'>You grab the [name] with both hands.</span>")
-	if (wieldsound)
+	if(wieldsound)
 		playsound(loc, wieldsound, 50, 1)
 	var/obj/item/weapon/twohanded/offhand/O = new(user) ////Let's reserve his other hand~
 	O.name = "[name] - offhand"
@@ -109,7 +109,7 @@
 
 ///////////OFFHAND///////////////
 /obj/item/weapon/twohanded/offhand
-	w_class = 5.0
+	w_class = 5
 	icon_state = "offhand"
 	name = "offhand"
 	flags = ABSTRACT
@@ -120,18 +120,10 @@
 /obj/item/weapon/twohanded/offhand/wield()
 	qdel(src)
 
-/obj/item/weapon/twohanded/offhand/IsShield()//if the actual twohanded weapon is a shield, we count as a shield too!
-	var/mob/user = loc
-	if(!istype(user)) return 0
-	var/obj/item/I = user.get_active_hand()
-	if(I == src) I = user.get_inactive_hand()
-	if(!I) return 0
-	return I.IsShield()
-
 ///////////Two hand required objects///////////////
 //This is for objects that require two hands to even pick up
 /obj/item/weapon/twohanded/required/
-	w_class = 5.0
+	w_class = 5
 
 /obj/item/weapon/twohanded/required/attack_self()
 	return
@@ -165,7 +157,7 @@
 	throwforce = 15
 	sharp = 1
 	edge = 1
-	w_class = 4.0
+	w_class = 4
 	slot_flags = SLOT_BACK
 	force_unwielded = 5
 	force_wielded = 24
@@ -200,14 +192,15 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
+	w_class = 2
 	force_unwielded = 3
 	force_wielded = 34
 	wieldsound = 'sound/weapons/saberon.ogg'
 	unwieldsound = 'sound/weapons/saberoff.ogg'
-	flags = NOSHIELD
+	armour_penetration = 35
 	origin_tech = "magnets=3;syndicate=4"
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	block_chance = 75
 	sharp = 1
 	edge = 1
 	no_embed = 1 // Like with the single-handed esword, this shouldn't be embedding in people.
@@ -237,11 +230,10 @@
 				user.dir = i
 				sleep(1)
 
-/obj/item/weapon/twohanded/dualsaber/IsShield()
+/obj/item/weapon/twohanded/dualsaber/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
 	if(wielded)
-		return 1
-	else
-		return 0
+		return ..()
+	return 0
 
 /obj/item/weapon/twohanded/dualsaber/green/New()
 	blade_color = "green"
@@ -287,14 +279,14 @@
 	name = "spear"
 	desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
 	force = 10
-	w_class = 4.0
+	w_class = 4
 	slot_flags = SLOT_BACK
 	force_unwielded = 10
 	force_wielded = 18 // Was 13, Buffed - RR
 	throwforce = 20
 	throw_speed = 3
+	armour_penetration = 10
 	no_spin_thrown = 1 // Thrown spears that spin look dumb. -Fox
-	flags = NOSHIELD
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 
 /obj/item/weapon/twohanded/spear/update_icon()
@@ -364,12 +356,12 @@
 	throwforce = 15
 	throw_speed = 1
 	throw_range = 5
-	w_class = 4.0 // can't fit in backpacks
+	w_class = 4 // can't fit in backpacks
 	force_unwielded = 15 //still pretty robust
 	force_wielded = 40  //you'll gouge their eye out! Or a limb...maybe even their entire body!
 	wieldsound = 'sound/weapons/chainsawstart.ogg'
 	hitsound = null
-	flags = NOSHIELD
+	armour_penetration = 35
 	origin_tech = "materials=6;syndicate=4"
 	attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered")
 	sharp = 1
@@ -578,7 +570,7 @@
 				Z.ex_act(2)
 				charged = 3
 				playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
-			else if (istype(A, /obj/structure) || istype(A, /obj/mecha/))
+			else if(istype(A, /obj/structure) || istype(A, /obj/mecha/))
 				var/obj/Z = A
 				Z.ex_act(2)
 				charged = 3
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index 9f22daf08f8..a6a53b03606 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -10,7 +10,7 @@
 	throwforce = 10.0
 	throw_speed = 1
 	throw_range = 7
-	w_class = 4.0
+	w_class = 4
 
 	var/charges = 0		//how many restocking "charges" the refill has
 
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 8ff2f931159..b9c946c6210 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -5,7 +5,7 @@
 	icon_state = "toyhammer"
 	slot_flags = SLOT_BELT
 	throwforce = 0
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 7
 	throw_range = 15
 	attack_verb = list("banned")
@@ -50,13 +50,11 @@
 	edge = 1
 	w_class = 3
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	block_chance = 50
 
-	IsShield()
-		return 1
-
-	suicide_act(mob/user)
-		to_chat(viewers(user), "<span class='suicide'>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</span>")
-		return(BRUTELOSS)
+/obj/item/weapon/claymore/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</span>")
+	return(BRUTELOSS)
 
 /obj/item/weapon/claymore/ceremonial
 	name = "ceremonial claymore"
@@ -77,6 +75,7 @@
 	w_class = 3
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	block_chance = 50
 
 /obj/item/weapon/katana/cursed
 	slot_flags = null
@@ -85,9 +84,6 @@
 	user.visible_message("<span class='suicide'>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</span>")
 	return(BRUTELOSS)
 
-/obj/item/weapon/katana/IsShield()
-		return 1
-
 /obj/item/weapon/harpoon
 	name = "harpoon"
 	sharp = 1
diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm
index abae807c80a..2e9fcdbff1a 100644
--- a/code/game/objects/items/weapons/wires.dm
+++ b/code/game/objects/items/weapons/wires.dm
@@ -17,7 +17,7 @@
 
 
 /obj/item/weapon/wire/proc/update()
-	if (src.amount > 1)
+	if(src.amount > 1)
 		src.icon_state = "spool_wire"
 		src.desc = text("This is just spool of regular insulated wire. It consists of about [] unit\s of wire.", src.amount)
 	else
@@ -26,7 +26,7 @@
 	return
 
 /obj/item/weapon/wire/attack_self(mob/user as mob)
-	if (src.laying)
+	if(src.laying)
 		src.laying = 0
 		to_chat(user, "\blue You're done laying wire!")
 	else
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index a8579613604..48d90fe11e7 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -103,18 +103,18 @@
 		var/is_in_use = 0
 		var/list/nearby = viewers(1, src)
 		for(var/mob/M in nearby)
-			if ((M.client && M.machine == src))
+			if((M.client && M.machine == src))
 				is_in_use = 1
 				src.attack_hand(M)
-		if (istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot))
-			if (!(usr in nearby))
-				if (usr.client && usr.machine==src) // && M.machine == src is omitted because if we triggered this by using the dialog, it doesn't matter if our machine changed in between triggering it and this - the dialog is probably still supposed to refresh.
+		if(istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot))
+			if(!(usr in nearby))
+				if(usr.client && usr.machine==src) // && M.machine == src is omitted because if we triggered this by using the dialog, it doesn't matter if our machine changed in between triggering it and this - the dialog is probably still supposed to refresh.
 					is_in_use = 1
 					src.attack_ai(usr)
 
 		// check for TK users
 
-		if (istype(usr, /mob/living/carbon/human))
+		if(istype(usr, /mob/living/carbon/human))
 			if(istype(usr.l_hand, /obj/item/tk_grab) || istype(usr.r_hand, /obj/item/tk_grab/))
 				if(!(usr in nearby))
 					if(usr.client && usr.machine==src)
@@ -128,7 +128,7 @@
 		var/list/nearby = viewers(1, src)
 		var/is_in_use = 0
 		for(var/mob/M in nearby)
-			if ((M.client && M.machine == src))
+			if((M.client && M.machine == src))
 				is_in_use = 1
 				src.interact(M)
 		var/ai_in_use = AutoUpdateAI(src)
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index 7b54984399a..23f5707c766 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -9,7 +9,7 @@
 // creates a new object and deletes itself
 /obj/random/New()
 	..()
-	if (!prob(spawn_nothing_percentage))
+	if(!prob(spawn_nothing_percentage))
 		spawn_item()
 	qdel(src)
 
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 2bcabd8ac15..70b3e3c1d67 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -66,7 +66,7 @@
 
 /obj/structure/proc/do_climb(var/mob/living/user)
 
-	if (!can_touch(user) || !climbable)
+	if(!can_touch(user) || !climbable)
 		return
 
 	for(var/obj/O in range(0, src))
@@ -89,7 +89,7 @@
 		climber = null
 		return
 
-	if (!can_touch(user) || !climbable)
+	if(!can_touch(user) || !climbable)
 		climber = null
 		return
 
@@ -99,7 +99,7 @@
 		return
 
 	usr.loc = get_turf(src)
-	if (get_turf(user) == get_turf(src))
+	if(get_turf(user) == get_turf(src))
 		usr.visible_message("<span class='warning'>[user] climbs onto \the [src]!</span>")
 
 	climber = null
@@ -150,16 +150,16 @@
 	return
 
 /obj/structure/proc/can_touch(var/mob/user)
-	if (!user)
+	if(!user)
 		return 0
 	if(!Adjacent(user))
 		return 0
-	if (user.restrained() || user.buckled)
+	if(user.restrained() || user.buckled)
 		to_chat(user, "<span class='notice'>You need your hands and legs free for this.</span>")
 		return 0
-	if (user.stat || user.paralysis || user.sleeping || user.lying || user.weakened)
+	if(user.stat || user.paralysis || user.sleeping || user.lying || user.weakened)
 		return 0
-	if (issilicon(user))
+	if(issilicon(user))
 		to_chat(user, "<span class='notice'>You need hands for this.</span>")
 		return 0
 	return 1
diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index 86aa341d39c..93f4bb7be9b 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -49,10 +49,10 @@
 
 
 /obj/structure/sign/barsign/attack_hand(mob/user as mob)
-	if (!src.allowed(user))
+	if(!src.allowed(user))
 		to_chat(user, "<span class = 'info'>Access denied.</span>")
 		return
-	if (broken)
+	if(broken)
 		to_chat(user, "<span class ='danger'>The controls seem unresponsive.</span>")
 		return
 	pick_sign()
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index f7e178716c5..31958409954 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -14,7 +14,7 @@ LINEN BINS
 	throwforce = 1
 	throw_speed = 1
 	throw_range = 2
-	w_class = 1.0
+	w_class = 1
 	item_color = "white"
 	slot_flags = SLOT_BACK
 
diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm
index a91b5aa3564..3c68792fece 100644
--- a/code/game/objects/structures/coathanger.dm
+++ b/code/game/objects/structures/coathanger.dm
@@ -15,10 +15,10 @@
 
 /obj/structure/coatrack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	var/can_hang = 0
-	for (var/T in allowed)
+	for(var/T in allowed)
 		if(istype(W,T))
 			can_hang = 1
-	if (can_hang && !coat)
+	if(can_hang && !coat)
 		user.visible_message("[user] hangs [W] on \the [src].", "You hang [W] on the \the [src]")
 		coat = W
 		user.drop_item(src)
@@ -30,11 +30,11 @@
 
 /obj/structure/coatrack/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	var/can_hang = 0
-	for (var/T in allowed)
+	for(var/T in allowed)
 		if(istype(mover,T))
 			can_hang = 1
 
-	if (can_hang && !coat)
+	if(can_hang && !coat)
 		src.visible_message("[mover] lands on \the [src].")
 		coat = mover
 		coat.loc = src
@@ -45,9 +45,9 @@
 
 /obj/structure/coatrack/update_icon()
 	overlays.Cut()
-	if (istype(coat, /obj/item/clothing/suit/storage/labcoat))
+	if(istype(coat, /obj/item/clothing/suit/storage/labcoat))
 		overlays += image(icon, icon_state = "coat_lab")
-	if (istype(coat, /obj/item/clothing/suit/storage/labcoat/cmo))
+	if(istype(coat, /obj/item/clothing/suit/storage/labcoat/cmo))
 		overlays += image(icon, icon_state = "coat_cmo")
-	if (istype(coat, /obj/item/clothing/suit/storage/det_suit))
+	if(istype(coat, /obj/item/clothing/suit/storage/det_suit))
 		overlays += image(icon, icon_state = "coat_det")
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 44048f5113c..de0ef28d255 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -66,8 +66,8 @@
 	loc.Exited(M)
 	M.loc = destination
 	loc.Entered(M, ignoreRest = 1)
-	for (var/atom/movable/AM in loc)
-		if (istype(AM, /obj/item))
+	for(var/atom/movable/AM in loc)
+		if(istype(AM, /obj/item))
 			continue
 		AM.Crossed(M)
 
@@ -149,7 +149,7 @@
 			qdel(src)
 		if(2)
 			if(prob(50))
-				for (var/atom/movable/A as mob|obj in src)
+				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(loc)
 					A.ex_act(severity++)
 				new /obj/item/stack/sheet/metal(loc)
@@ -335,7 +335,7 @@
 		to_chat(user, "<span class='notice'>It won't budge!</span>")
 		if(!lastbang)
 			lastbang = 1
-			for (var/mob/M in hearers(src, null))
+			for(var/mob/M in hearers(src, null))
 				to_chat(M, text("<FONT size=[]>BANG, bang!</FONT>", max(0, 5 - get_dist(src, M))))
 			spawn(30)
 				lastbang = 0
@@ -384,10 +384,11 @@
 /obj/structure/closet/container_resist(var/mob/living/L)
 	var/breakout_time = 2 //2 minutes by default
 	if(opened)
-		if (L.loc == src)
+		if(L.loc == src)
 			L.forceMove(get_turf(src)) // Let's just be safe here
 		return //Door's open... wait, why are you in it's contents then?
 	if(!welded)
+		open() //for cardboard boxes
 		return //closed but not welded...
 	//	else Meh, lets just keep it at 2 minutes for now
 	//		breakout_time++ //Harder to get out of welded lockers than locked lockers
diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index 13c4c999ef5..715d16f9ebd 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -21,7 +21,7 @@
 		if(fireaxe)
 			hasaxe = 1
 
-		if (isrobot(user) || src.locked)
+		if(isrobot(user) || src.locked)
 			if(istype(O, /obj/item/device/multitool))
 				to_chat(user, "\red Resetting circuitry...")
 				playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
@@ -53,7 +53,7 @@
 						src.localopened = 1
 				update_icon()
 			return
-		if (istype(O, /obj/item/weapon/twohanded/fireaxe) && src.localopened)
+		if(istype(O, /obj/item/weapon/twohanded/fireaxe) && src.localopened)
 			if(!fireaxe)
 				if(O:wielded)
 					to_chat(user, "\red Unwield the axe first.")
@@ -155,7 +155,7 @@
 		set name = "Open/Close"
 		set category = "Object"
 
-		if (isrobot(usr) || src.locked || src.smashed)
+		if(isrobot(usr) || src.locked || src.smashed)
 			if(src.locked)
 				to_chat(usr, "\red The cabinet won't budge!")
 			else if(src.smashed)
@@ -169,10 +169,10 @@
 		set name = "Remove Fire Axe"
 		set category = "Object"
 
-		if (isrobot(usr))
+		if(isrobot(usr))
 			return
 
-		if (localopened)
+		if(localopened)
 			if(fireaxe)
 				usr.put_in_hands(fireaxe)
 				fireaxe = null
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 51f01d874a8..c4fa509b947 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -11,6 +11,7 @@
 	New()
 		..()
 		new /obj/item/clothing/under/rank/cargotech(src)
+		new /obj/item/clothing/under/rank/cargotech/skirt(src)
 		new /obj/item/clothing/shoes/black(src)
 		new /obj/item/device/radio/headset/headset_cargo(src)
 		new /obj/item/clothing/gloves/fingerless(src)
@@ -30,6 +31,7 @@
 	New()
 		..()
 		new /obj/item/clothing/under/rank/cargo(src)
+		new /obj/item/clothing/under/rank/cargo/skirt(src)
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/device/radio/headset/headset_cargo(src)
 		new /obj/item/clothing/gloves/fingerless(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
index 50ad1500192..ba971914f24 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
@@ -20,7 +20,7 @@
 	new /obj/item/clothing/suit/holidaypriest(src)
 	new /obj/item/clothing/under/wedding/bride_white(src)
 	new /obj/item/weapon/storage/backpack/cultpack (src)
-	new /obj/item/clothing/head/helmet/knight/templar(src)
+	new /obj/item/clothing/head/helmet/riot/knight/templar(src)
 	new /obj/item/clothing/suit/armor/riot/knight/templar(src)
 	new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
 	new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 1746211e248..c26ace63f08 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -18,6 +18,7 @@
 		new /obj/item/areaeditor/blueprints(src)
 		new /obj/item/weapon/storage/box/permits(src)
 		new /obj/item/clothing/under/rank/chief_engineer(src)
+		new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
 		new /obj/item/clothing/head/hardhat/white(src)
 		new /obj/item/clothing/glasses/welding/superior(src)
 		new /obj/item/clothing/gloves/color/yellow(src)
@@ -104,6 +105,7 @@
 		new /obj/item/weapon/storage/toolbox/mechanical(src)
 		new /obj/item/device/radio/headset/headset_eng(src)
 		new /obj/item/clothing/under/rank/engineer(src)
+		new /obj/item/clothing/under/rank/engineer/skirt(src)
 		new /obj/item/clothing/suit/storage/hazardvest(src)
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/clothing/glasses/meson(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index 4a8c3a4195a..149793399ed 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -26,19 +26,19 @@
 	else
 		var/lazors = 0
 		var/shottas = 0
-		for (var/obj/item/weapon/gun/G in contents)
-			if (istype(G, /obj/item/weapon/gun/energy))
+		for(var/obj/item/weapon/gun/G in contents)
+			if(istype(G, /obj/item/weapon/gun/energy))
 				lazors++
-			if (istype(G, /obj/item/weapon/gun/projectile/))
+			if(istype(G, /obj/item/weapon/gun/projectile/))
 				shottas++
-		if (lazors || shottas)
-			for (var/i = 0 to 2)
+		if(lazors || shottas)
+			for(var/i = 0 to 2)
 				var/image/gun = image(icon(src.icon))
 
-				if (lazors > 0 && (shottas <= 0 || prob(50)))
+				if(lazors > 0 && (shottas <= 0 || prob(50)))
 					lazors--
 					gun.icon_state = "laser"
-				else if (shottas > 0)
+				else if(shottas > 0)
 					shottas--
 					gun.icon_state = "projectile"
 
@@ -49,7 +49,7 @@
 
 		if(broken)
 			overlays += icon(src.icon,"broken")
-		else if (locked)
+		else if(locked)
 			overlays += icon(src.icon,"locked")
 		else
 			overlays += icon(src.icon,"open")
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 17f208e28e9..c0603396325 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -156,13 +156,13 @@
 		new /obj/item/clothing/head/bio_hood/cmo(src)
 		new /obj/item/clothing/shoes/white(src)
 		switch(pick("blue", "green", "purple"))
-			if ("blue")
+			if("blue")
 				new /obj/item/clothing/under/rank/medical/blue(src)
 				new /obj/item/clothing/head/surgery/blue(src)
-			if ("green")
+			if("green")
 				new /obj/item/clothing/under/rank/medical/green(src)
 				new /obj/item/clothing/head/surgery/green(src)
-			if ("purple")
+			if("purple")
 				new /obj/item/clothing/under/rank/medical/purple(src)
 				new /obj/item/clothing/head/surgery/purple(src)
 		new /obj/item/clothing/suit/storage/labcoat/cmo(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 0433ba0479f..51e3e8d06c3 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -53,11 +53,11 @@
 	new /obj/item/device/radio/headset( src )
 
 /obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (src.opened)
-		if (istype(W, /obj/item/weapon/grab))
+	if(src.opened)
+		if(istype(W, /obj/item/weapon/grab))
 			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
 		user.drop_item()
-		if (W) W.forceMove(loc)
+		if(W) W.forceMove(loc)
 	else if(istype(W, /obj/item/weapon/card/id))
 		if(src.broken)
 			to_chat(user, "\red It appears to be broken.")
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 488a422af86..cfecee359d6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -46,7 +46,7 @@
 		new /obj/item/device/radio/headset/heads/rd(src)
 		new /obj/item/weapon/tank/air(src)
 		new /obj/item/clothing/mask/gas(src)
-		new /obj/item/clothing/suit/armor/reactive(src)
+		new /obj/item/clothing/suit/armor/reactive/teleport(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/device/laser_pointer(src)
 		new /obj/item/weapon/door_remote/research_director(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index fe1e33d0999..db589c027e6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -133,7 +133,7 @@
 /obj/structure/closet/secure_closet/container_resist(var/mob/living/L)
 	var/breakout_time = 2 //2 minutes by default
 	if(opened)
-		if (L.loc == src)
+		if(L.loc == src)
 			L.forceMove(get_turf(src)) // Let's just be safe here
 		return //Door's open... wait, why are you in it's contents then?
 	if(!locked && !welded)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 2b823041950..3fdf47dc0c5 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -103,6 +103,7 @@
 		new /obj/item/clothing/under/rank/head_of_security(src)
 		new /obj/item/clothing/under/rank/head_of_security/formal(src)
 		new /obj/item/clothing/under/rank/head_of_security/corp(src)
+		new /obj/item/clothing/under/rank/head_of_security/skirt(src)
 		new /obj/item/clothing/suit/armor/hos(src)
 		new /obj/item/clothing/suit/armor/hos/alt(src)
 		new /obj/item/clothing/head/HoS(src)
@@ -145,6 +146,7 @@
 		new /obj/item/clothing/under/rank/warden(src)
 		new /obj/item/clothing/under/rank/warden/formal(src)
 		new /obj/item/clothing/under/rank/warden/corp(src)
+		new /obj/item/clothing/under/rank/warden/skirt(src)
 		new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 		new /obj/item/clothing/mask/gas/sechailer/warden(src)
 		new /obj/item/taperoll/police(src)
@@ -315,8 +317,8 @@
 		..()
 		new /obj/item/clothing/under/det(src)
 		new /obj/item/clothing/suit/storage/det_suit(src)
-		new /obj/item/clothing/suit/storage/forensics/blue(src)
-		new /obj/item/clothing/suit/storage/forensics/red(src)
+		new /obj/item/clothing/suit/storage/det_suit/forensics/blue(src)
+		new /obj/item/clothing/suit/storage/det_suit/forensics/red(src)
 		new /obj/item/clothing/gloves/color/black(src)
 		new /obj/item/clothing/head/det_hat(src)
 		new /obj/item/clothing/shoes/brown(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index 8a701bedd72..005caf3256d 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -54,7 +54,7 @@
 		M.adjustFireLoss(intialFire - M.getFireLoss())
 		M.adjustBruteLoss(intialBrute - M.getBruteLoss())
 		M.setOxyLoss(intialOxy)
-	if (timer <= 0)
+	if(timer <= 0)
 		dump_contents()
 		processing_objects.Remove(src)
 		qdel(src)
@@ -145,7 +145,7 @@
 	return
 
 /obj/structure/closet/statue/proc/shatter(mob/user as mob)
-	if (user)
+	if(user)
 		user.dust()
 	dump_contents()
 	visible_message("\red [src] shatters!. ")
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index c99790c4011..3fda5f8c603 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -22,36 +22,36 @@
 /obj/structure/closet/emcloset/New()
 	..()
 
-	switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
-		if ("small")
+	switch(pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
+		if("small")
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/clothing/mask/breath(src)
-		if ("aid")
+		if("aid")
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 			new /obj/item/weapon/storage/toolbox/emergency(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/weapon/storage/firstaid/o2(src)
-		if ("tank")
+		if("tank")
 			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
-		if ("both")
+		if("both")
 			new /obj/item/weapon/storage/toolbox/emergency(src)
 			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/weapon/storage/firstaid/o2(src)
-		if ("nothing")
+		if("nothing")
 			// doot
 
 		// teehee - Ah, tg coders...
-		if ("delete")
+		if("delete")
 			qdel(src)
 
 		//If you want to re-add fire, just add "fire" = 15 to the pick list.
-		/*if ("fire")
+		/*if("fire")
 			new /obj/structure/closet/firecloset(src.loc)
 			qdel(src)*/
 
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 0cccd860b04..c23701575df 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -38,6 +38,9 @@
 	new /obj/item/clothing/under/rank/security/formal(src)
 	new /obj/item/clothing/under/rank/security/formal(src)
 	new /obj/item/clothing/under/rank/security/formal(src)
+	new /obj/item/clothing/under/rank/security/skirt(src)
+	new /obj/item/clothing/under/rank/security/skirt(src)
+	new /obj/item/clothing/under/rank/security/skirt(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
@@ -173,6 +176,9 @@
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
 	new /obj/item/clothing/shoes/workboots(src)
 	new /obj/item/clothing/shoes/workboots(src)
 	new /obj/item/clothing/shoes/workboots(src)
@@ -195,6 +201,9 @@
 	new /obj/item/clothing/under/rank/engineer(src)
 	new /obj/item/clothing/under/rank/engineer(src)
 	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/under/rank/engineer/skirt(src)
+	new /obj/item/clothing/under/rank/engineer/skirt(src)
+	new /obj/item/clothing/under/rank/engineer/skirt(src)
 	new /obj/item/clothing/shoes/workboots(src)
 	new /obj/item/clothing/shoes/workboots(src)
 	new /obj/item/clothing/shoes/workboots(src)
@@ -239,6 +248,8 @@
 	new /obj/item/clothing/under/rank/medical/green(src)
 	new /obj/item/clothing/head/surgery/green(src)
 	new /obj/item/clothing/under/rank/medical/purple(src)
+	new /obj/item/clothing/under/rank/medical/skirt(src)
+	new /obj/item/clothing/under/rank/medical/skirt(src)
 	new /obj/item/clothing/head/surgery/purple(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
@@ -271,6 +282,9 @@
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/under/rank/scientist/skirt(src)
+	new /obj/item/clothing/under/rank/scientist/skirt(src)
+	new /obj/item/clothing/under/rank/scientist/skirt(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
@@ -293,6 +307,8 @@
 	new /obj/item/clothing/glasses/hud/diagnostic(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
+	new /obj/item/clothing/under/rank/roboticist/skirt(src)
+	new /obj/item/clothing/under/rank/roboticist/skirt(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/clothing/shoes/black(src)
@@ -312,6 +328,8 @@
 	..()
 	new /obj/item/clothing/under/rank/chemist(src)
 	new /obj/item/clothing/under/rank/chemist(src)
+	new /obj/item/clothing/under/rank/chemist/skirt(src)
+	new /obj/item/clothing/under/rank/chemist/skirt(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/labcoat/chemist(src)
@@ -354,6 +372,8 @@
 	..()
 	new /obj/item/clothing/under/rank/virologist(src)
 	new /obj/item/clothing/under/rank/virologist(src)
+	new /obj/item/clothing/under/rank/virologist/skirt(src)
+	new /obj/item/clothing/under/rank/virologist/skirt(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/labcoat/virologist(src)
@@ -375,6 +395,8 @@
 	..()
 	new /obj/item/clothing/under/rank/medical(src)
 	new /obj/item/clothing/under/rank/medical(src)
+	new /obj/item/clothing/under/rank/medical/skirt(src)
+	new /obj/item/clothing/under/rank/medical/skirt(src)
 	new /obj/item/clothing/under/rank/medical/blue(src)
 	new /obj/item/clothing/under/rank/medical/green(src)
 	new /obj/item/clothing/under/rank/medical/purple(src)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index c4129596892..c4178baec15 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -185,7 +185,7 @@
 			qdel(src)
 			return
 		if(3.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 			return
 		else
@@ -497,7 +497,7 @@
 
 /obj/structure/closet/crate/large/close()
 	. = ..()
-	if (.)//we can hold up to one large item
+	if(.)//we can hold up to one large item
 		var/found = 0
 		for(var/obj/structure/S in src.loc)
 			if(S == src)
@@ -524,7 +524,7 @@
 
 /obj/structure/closet/crate/secure/large/close()
 	. = ..()
-	if (.)//we can hold up to one large item
+	if(.)//we can hold up to one large item
 		var/found = 0
 		for(var/obj/structure/S in src.loc)
 			if(S == src)
diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm
index d07ee623d38..25a41a8dde7 100644
--- a/code/game/objects/structures/crates_lockers/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/walllocker.dm
@@ -27,7 +27,7 @@
 	icon_opened = "emergopen"
 
 /obj/structure/closet/walllocker/emerglocker/attack_hand(mob/user as mob)
-	if (istype(user, /mob/living/silicon/ai))	//Added by Strumpetplaya - AI shouldn't be able to
+	if(istype(user, /mob/living/silicon/ai))	//Added by Strumpetplaya - AI shouldn't be able to
 		return									//activate emergency lockers.  This fixes that.  (Does this make sense, the AI can't call attack_hand, can it? --Mloc)
 	if(!amount)
 		to_chat(usr, "<spawn class='notice'>It's empty.")
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 74709df5810..6b732653a64 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -140,17 +140,17 @@ var/global/list/captain_display_cases = list()
 
 /obj/structure/displaycase/ex_act(severity)
 	switch(severity)
-		if (1)
+		if(1)
 			new /obj/item/weapon/shard(loc)
-			if (occupant)
+			if(occupant)
 				dump()
 			qdel(src)
-		if (2)
-			if (prob(50))
+		if(2)
+			if(prob(50))
 				src.health -= 15
 				src.healthcheck()
-		if (3)
-			if (prob(50))
+		if(3)
+			if(prob(50))
 				src.health -= 5
 				src.healthcheck()
 
@@ -162,15 +162,15 @@ var/global/list/captain_display_cases = list()
 	return
 
 /obj/structure/displaycase/blob_act()
-	if (prob(75))
+	if(prob(75))
 		new /obj/item/weapon/shard(loc)
 		if(occupant) dump()
 		qdel(src)
 
 /obj/structure/displaycase/proc/healthcheck()
-	if (src.health <= 0)
+	if(src.health <= 0)
 		health = 0
-		if (!( src.destroyed ))
+		if(!( src.destroyed ))
 			src.density = 0
 			src.destroyed = 1
 			new /obj/item/weapon/shard(loc)
@@ -273,7 +273,7 @@ var/global/list/captain_display_cases = list()
 			update_icon()
 
 /obj/structure/displaycase/attack_hand(mob/user as mob)
-	if (destroyed || (!locked && user.a_intent == I_HARM))
+	if(destroyed || (!locked && user.a_intent == I_HARM))
 		if(occupant)
 			dump()
 			to_chat(user, "<span class='danger'>You smash your fist into the delicate electronics at the bottom of the case, and deactivate the hover field.</span>")
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index dc697aa7df9..d5a370e9225 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -151,7 +151,7 @@ obj/structure/door_assembly/multi_tile/Move()
 
 	if(istype(W, /obj/item/weapon/weldingtool) && ( (istext(glass)) || (glass == 1) || (!anchored) ))
 		var/obj/item/weapon/weldingtool/WT = W
-		if (WT.remove_fuel(0, user))
+		if(WT.remove_fuel(0, user))
 			playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 			if(istext(glass))
 				user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly.")
@@ -235,7 +235,7 @@ obj/structure/door_assembly/multi_tile/Move()
 			src.state = 1
 			src.name = "Wired Airlock Assembly"
 			var/obj/item/weapon/airlock_electronics/ae
-			if (!electronics)
+			if(!electronics)
 				ae = new/obj/item/weapon/airlock_electronics( src.loc )
 			else
 				ae = electronics
@@ -244,8 +244,8 @@ obj/structure/door_assembly/multi_tile/Move()
 
 	else if(istype(W, /obj/item/stack/sheet) && !glass)
 		var/obj/item/stack/sheet/S = W
-		if (S)
-			if (S.amount>=1)
+		if(S)
+			if(S.amount>=1)
 				if(istype(S, /obj/item/stack/sheet/rglass))
 					playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
 					user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
@@ -273,7 +273,7 @@ obj/structure/door_assembly/multi_tile/Move()
 			var/path
 			if(istext(glass))
 				path = text2path("/obj/machinery/door/airlock/[glass]")
-			else if (glass == 1)
+			else if(glass == 1)
 				path = text2path("/obj/machinery/door/airlock[glass_type]")
 			else
 				path = text2path("/obj/machinery/door/airlock[airlock_type]")
@@ -298,9 +298,9 @@ obj/structure/door_assembly/multi_tile/Move()
 /obj/structure/door_assembly/proc/update_state()
 	icon_state = "door_as_[glass == 1 ? "g" : ""][istext(glass) ? glass : base_icon_state][state]"
 	name = ""
-	switch (state)
+	switch(state)
 		if(0)
-			if (anchored)
+			if(anchored)
 				name = "Secured "
 		if(1)
 			name = "Wired "
diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm
index 76dbc81ca43..cce6c1c1bdb 100644
--- a/code/game/objects/structures/engicart.dm
+++ b/code/game/objects/structures/engicart.dm
@@ -80,7 +80,7 @@
 			else
 				to_chat(user, fail_msg)
 		else if(istype(I, /obj/item/weapon/wrench))
-			if (!anchored && !isinspace())
+			if(!anchored && !isinspace())
 				playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 				user.visible_message( \
 					"[user] tightens \the [src]'s casters.", \
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index d0521d33f0e..e5a89aa1fad 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -28,10 +28,10 @@
 /obj/structure/extinguisher_cabinet/attack_hand(mob/user)
 	if(isrobot(user) || isalien(user))
 		return
-	if (ishuman(user))
+	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
-		if (user.hand)
+		if(user.hand)
 			temp = H.organs_by_name["l_hand"]
 		if(temp && !temp.is_usable())
 			to_chat(user, "<span class='notice'>You try to move your [temp.name], but cannot!")
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 30dec267502..2d1afd939d7 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -86,7 +86,7 @@
 			to_chat(user, "<span class='warning'>[src] is blocked!</span>")
 			return
 		if(istype(W, /obj/item/weapon/screwdriver))
-			if (!istype(T, /turf/simulated/floor))
+			if(!istype(T, /turf/simulated/floor))
 				to_chat(user, "<span class='warning'>[src] bolts must be tightened on the floor!</span>")
 				return
 			user.visible_message("<span class='notice'>[user] tightens some bolts on the wall.</span>", "<span class='warning'>You tighten the bolts on the wall.</span>")
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index b5aff72fd6c..e4f8acd2c5b 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -288,10 +288,10 @@
 
 /*
 /obj/structure/bush/Bumped(M as mob)
-	if (istype(M, /mob/living/simple_animal))
+	if(istype(M, /mob/living/simple_animal))
 		var/mob/living/simple_animal/A = M
 		A.loc = get_turf(src)
-	else if (istype(M, /mob/living/carbon/monkey))
+	else if(istype(M, /mob/living/carbon/monkey))
 		var/mob/living/carbon/monkey/A = M
 		A.loc = get_turf(src)
 */
diff --git a/code/game/objects/structures/foodcart.dm b/code/game/objects/structures/foodcart.dm
index e2df39180d9..071200c8ca0 100644
--- a/code/game/objects/structures/foodcart.dm
+++ b/code/game/objects/structures/foodcart.dm
@@ -55,7 +55,7 @@
 			if(!success)
 				to_chat(user, fail_msg)
 		else if(istype(I, /obj/item/weapon/wrench))
-			if (!anchored && !isinspace())
+			if(!anchored && !isinspace())
 				playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 				user.visible_message( \
 					"[user] tightens \the [src]'s casters.", \
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 1cd49eb9b50..d84e879dbe0 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -41,7 +41,7 @@
 		else if(!anchored)
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
 			to_chat(user, "\blue Now securing the girder")
-			if(get_turf(user, 40))
+			if(do_after(user, 40, target = src))
 				to_chat(user, "\blue You secured the girder!")
 				new/obj/structure/girder( src.loc )
 				qdel(src)
@@ -106,7 +106,7 @@
 				else
 					if(S.amount < 2) return ..()
 					to_chat(user, "\blue Now adding plating...")
-					if (do_after(user,40, target = src))
+					if(do_after(user,40, target = src))
 						if(!src || !S || S.amount < 2) return
 						S.use(2)
 						to_chat(user, "\blue You added the plating!")
@@ -125,7 +125,7 @@
 					new /obj/structure/falsewall/reinforced (src.loc)
 					qdel(src)
 				else
-					if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code...
+					if(src.icon_state == "reinforced") //I cant believe someone would actually write this line of code...
 						if(S.amount < 1) return ..()
 						to_chat(user, "\blue Now finalising reinforced wall.")
 						if(do_after(user, 50, target = src))
@@ -141,7 +141,7 @@
 					else
 						if(S.amount < 1) return ..()
 						to_chat(user, "\blue Now reinforcing girders")
-						if (do_after(user,60, target = src))
+						if(do_after(user,60, target = src))
 							if(!src || !S || S.amount < 1) return
 							S.use(1)
 							to_chat(user, "\blue Girders reinforced!")
@@ -161,7 +161,7 @@
 			else
 				if(S.amount < 2) return ..()
 				to_chat(user, "\blue Now adding plating...")
-				if (do_after(user,40, target = src))
+				if(do_after(user,40, target = src))
 					if(!src || !S || S.amount < 2) return
 					S.use(2)
 					to_chat(user, "\blue You added the plating!")
@@ -176,7 +176,7 @@
 
 	else if(istype(W, /obj/item/pipe))
 		var/obj/item/pipe/P = W
-		if (P.pipe_type in list(0, 1, 5))	//simple pipes, simple bends, and simple manifolds.
+		if(P.pipe_type in list(0, 1, 5))	//simple pipes, simple bends, and simple manifolds.
 			user.drop_item()
 			P.loc = src.loc
 			to_chat(user, "\blue You fit the pipe into the [src]!")
@@ -206,13 +206,13 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(75))
+			if(prob(75))
 				var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
 				new remains(loc)
 				qdel(src)
 			return
 		if(3.0)
-			if (prob(40))
+			if(prob(40))
 				var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
 				new remains(loc)
 				qdel(src)
@@ -277,12 +277,12 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(30))
+			if(prob(30))
 				new /obj/effect/decal/remains/human(loc)
 				qdel(src)
 			return
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				new /obj/effect/decal/remains/human(loc)
 				qdel(src)
 			return
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 9c1a9e6867a..4cb2b20f99e 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -81,7 +81,7 @@
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
 	var/mob/living/carbon/slime/S = user
-	if (!S.is_adult)
+	if(!S.is_adult)
 		return
 
 	playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
@@ -142,7 +142,10 @@
 	if(iswirecutter(W))
 		if(!shock(user, 100))
 			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
-			new /obj/item/stack/rods(loc, 2)
+			if(!destroyed)
+				new /obj/item/stack/rods(loc, 2)
+			else
+				new /obj/item/stack/rods(loc)
 			qdel(src)
 	else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored))
 		if(!shock(user, 90))
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index 299f776c4f7..4137696ea2a 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -3,7 +3,7 @@
 	desc = "A folded membrane which rapidly expands into a large cubical shape on activation."
 	icon = 'icons/obj/inflatable.dmi'
 	icon_state = "folded_wall"
-	w_class = 3.0
+	w_class = 3
 
 /obj/item/inflatable/attack_self(mob/user)
 	playsound(loc, 'sound/items/zip.ogg', 75, 1)
@@ -89,14 +89,14 @@
 
 /obj/structure/inflatable/attack_slime(mob/user as mob)
 	var/mob/living/carbon/slime/S = user
-	if (!S.is_adult)
+	if(!S.is_adult)
 		return
 	attack_generic(user, rand(10, 15))
 
 /obj/structure/inflatable/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(!istype(W))
 		return
-	if (can_puncture(W))
+	if(can_puncture(W))
 		visible_message("\red <b>[user] pierces [src] with [W]!</b>")
 		deflate(1)
 	if(W.damtype == BRUTE || W.damtype == BURN)
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index e51ea6eb3ac..e51a7e3aac2 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -90,7 +90,7 @@
 				reagents.reaction(src.loc)
 				src.reagents.clear_reagents()
 		else if(istype(I, /obj/item/weapon/wrench))
-			if (!anchored && !isinspace())
+			if(!anchored && !isinspace())
 				playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 				user.visible_message( \
 					"[user] tightens \the [src]'s casters.", \
diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm
index 0f8cde25dbe..d661fb60b9e 100644
--- a/code/game/objects/structures/lamarr_cage.dm
+++ b/code/game/objects/structures/lamarr_cage.dm
@@ -12,16 +12,16 @@
 
 /obj/structure/lamarr/ex_act(severity)
 	switch(severity)
-		if (1)
+		if(1)
 			new /obj/item/weapon/shard(loc)
 			Break()
 			qdel(src)
-		if (2)
-			if (prob(50))
+		if(2)
+			if(prob(50))
 				src.health -= 15
 				src.healthcheck()
-		if (3)
-			if (prob(50))
+		if(3)
+			if(prob(50))
 				src.health -= 5
 				src.healthcheck()
 
@@ -34,14 +34,14 @@
 
 
 /obj/structure/lamarr/blob_act()
-	if (prob(75))
+	if(prob(75))
 		new /obj/item/weapon/shard(loc)
 		Break()
 		qdel(src)
 
 /obj/structure/lamarr/proc/healthcheck()
-	if (src.health <= 0)
-		if (!( src.destroyed ))
+	if(src.health <= 0)
+		if(!( src.destroyed ))
 			src.density = 0
 			src.destroyed = 1
 			new /obj/item/weapon/shard(loc)
@@ -66,12 +66,12 @@
 	return
 
 /obj/structure/lamarr/attack_hand(mob/user as mob)
-	if (src.destroyed)
+	if(src.destroyed)
 		return
 	else
 		to_chat(usr, text("\blue You kick the lab cage."))
 		for(var/mob/O in oviewers())
-			if ((O.client && !( O.blinded )))
+			if((O.client && !( O.blinded )))
 				to_chat(O, text("\red [] kicks the lab cage.", usr))
 		src.health -= 2
 		healthcheck()
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index d7704265861..bfb607585b0 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -18,14 +18,14 @@
 	icon = 'icons/obj/smoothlattice.dmi'
 	icon_state = "latticeblank"
 	updateOverlays()
-	for (var/dir in cardinal)
+	for(var/dir in cardinal)
 		var/obj/structure/lattice/L
 		if(locate(/obj/structure/lattice, get_step(src, dir)))
 			L = locate(/obj/structure/lattice, get_step(src, dir))
 			L.updateOverlays()
 
 /obj/structure/lattice/Destroy()
-	for (var/dir in cardinal)
+	for(var/dir in cardinal)
 		var/obj/structure/lattice/L
 		if(locate(/obj/structure/lattice, get_step(src, dir)))
 			L = locate(/obj/structure/lattice, get_step(src, dir))
@@ -51,11 +51,11 @@
 
 /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob, params)
 
-	if (istype(C, /obj/item/stack/tile/plasteel) || istype(C, /obj/item/stack/rods))
+	if(istype(C, /obj/item/stack/tile/plasteel) || istype(C, /obj/item/stack/rods))
 		var/turf/T = get_turf(src)
 		T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
 		return
-	if (istype(C, /obj/item/weapon/weldingtool))
+	if(istype(C, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = C
 		if(WT.remove_fuel(0, user))
 			to_chat(user, "\blue Slicing lattice joints ...")
@@ -72,7 +72,7 @@
 
 		var/dir_sum = 0
 
-		for (var/direction in cardinal)
+		for(var/direction in cardinal)
 			if(locate(/obj/structure/lattice, get_step(src, direction)))
 				dir_sum += direction
 			else
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 01c9442ea33..4c58183b026 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -129,7 +129,7 @@
 
 	proc/Dismantle(devastated = 0)
 		if(!devastated)
-			if (mineralType == "metal")
+			if(mineralType == "metal")
 				var/ore = /obj/item/stack/sheet/metal
 				for(var/i = 1, i <= oreAmount, i++)
 					new ore(get_turf(src))
@@ -138,7 +138,7 @@
 				for(var/i = 1, i <= oreAmount, i++)
 					new ore(get_turf(src))
 		else
-			if (mineralType == "metal")
+			if(mineralType == "metal")
 				var/ore = /obj/item/stack/sheet/metal
 				for(var/i = 3, i <= oreAmount, i++)
 					new ore(get_turf(src))
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index d0e8d4c9c85..83220bb6a33 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -76,7 +76,7 @@
 
 /obj/structure/mirror/attack_slime(mob/living/user as mob)
 	var/mob/living/carbon/slime/S = user
-	if (!S.is_adult)
+	if(!S.is_adult)
 		return
 	user.do_attack_animation(src)
 	if(shattered)
diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm
index 1b8737e1ddd..81511f16aa1 100644
--- a/code/game/objects/structures/misc.dm
+++ b/code/game/objects/structures/misc.dm
@@ -34,7 +34,7 @@
 	attack_hand(mob/user as mob)
 
 
-		if (user.mind.special_role=="Ninja")
+		if(user.mind.special_role=="Ninja")
 			switch(alert("Phase Jaunt relay primed, target locked as [station_name()], initiate VOID-shift translocation? (Warning! Internals required!)",,"Yes","No"))
 
 				if("Yes")
diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm
index fbe267e0779..68589112080 100644
--- a/code/game/objects/structures/mop_bucket.dm
+++ b/code/game/objects/structures/mop_bucket.dm
@@ -26,12 +26,12 @@
 		to_chat(usr, "[bicon(src)] [src] contains [reagents.total_volume] units of water left!")
 
 /obj/structure/mopbucket/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/mop))
-		if (src.reagents.total_volume >= 2)
+	if(istype(W, /obj/item/weapon/mop))
+		if(src.reagents.total_volume >= 2)
 			src.reagents.trans_to(W, 2)
 			to_chat(user, "\blue You wet the mop")
 			playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1)
-		if (src.reagents.total_volume < 1)
+		if(src.reagents.total_volume < 1)
 			to_chat(user, "\blue Out of water!")
 	return
 
@@ -41,10 +41,10 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				qdel(src)
 				return
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index f9809b422ca..694cb294b46 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -55,14 +55,14 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(loc)
 					ex_act(severity)
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(loc)
 					ex_act(severity)
@@ -75,9 +75,9 @@
 
 
 /obj/structure/morgue/attack_hand(mob/user as mob)
-	if (connected)
+	if(connected)
 		for(var/atom/movable/A as mob|obj in connected.loc)
-			if (!( A.anchored ))
+			if(!( A.anchored ))
 				A.forceMove(src)
 		playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		qdel(connected)
@@ -88,7 +88,7 @@
 		step(connected, dir)
 		connected.layer = OBJ_LAYER
 		var/turf/T = get_step(src, dir)
-		if (T.contents.Find(connected))
+		if(T.contents.Find(connected))
 			connected.connected = src
 			icon_state = "morgue0"
 			for(var/atom/movable/A as mob|obj in src)
@@ -103,14 +103,14 @@
 	return
 
 /obj/structure/morgue/attackby(P as obj, mob/user as mob, params)
-	if (istype(P, /obj/item/weapon/pen))
+	if(istype(P, /obj/item/weapon/pen))
 		var/t = input(user, "What would you like the label to be?", text("[]", name), null)  as text
-		if (user.get_active_hand() != P)
+		if(user.get_active_hand() != P)
 			return
-		if ((!in_range(src, usr) && loc != user))
+		if((!in_range(src, usr) && loc != user))
 			return
 		t = sanitize(copytext(t,1,MAX_MESSAGE_LEN))
-		if (t)
+		if(t)
 			name = text("Morgue- '[]'", t)
 			overlays += image(icon, "morgue_label")
 		else
@@ -120,13 +120,13 @@
 	return
 
 /obj/structure/morgue/relaymove(mob/user as mob)
-	if (user.stat)
+	if(user.stat)
 		return
 	connected = new /obj/structure/m_tray( loc )
 	step(connected, dir)
 	connected.layer = OBJ_LAYER
 	var/turf/T = get_step(src, dir)
-	if (T.contents.Find(connected))
+	if(T.contents.Find(connected))
 		connected.connected = src
 		icon_state = "morgue0"
 		for(var/atom/movable/A as mob|obj in src)
@@ -147,7 +147,7 @@
 	var/mob/living/carbon/CM = L
 	if(!istype(CM))
 		return
-	if (CM.stat || CM.restrained())
+	if(CM.stat || CM.restrained())
 		return
 
 	to_chat(CM, "<span class='alert'>You attempt to slide yourself out of \the [src]...</span>")
@@ -170,9 +170,9 @@
 
 
 /obj/structure/m_tray/attack_hand(mob/user as mob)
-	if (connected)
+	if(connected)
 		for(var/atom/movable/A as mob|obj in loc)
-			if (!( A.anchored ))
+			if(!( A.anchored ))
 				A.forceMove(connected)
 		connected.connected = null
 		connected.update()
@@ -182,16 +182,16 @@
 	return
 
 /obj/structure/m_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
-	if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
+	if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
 		return
-	if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag))
+	if(!ismob(O) && !istype(O, /obj/structure/closet/body_bag))
 		return
-	if (!ismob(user) || user.stat || user.lying || user.stunned)
+	if(!ismob(user) || user.stat || user.lying || user.stunned)
 		return
 	O.forceMove(loc)
-	if (user != O)
+	if(user != O)
 		for(var/mob/B in viewers(user, 3))
-			if ((B.client && !( B.blinded )))
+			if((B.client && !( B.blinded )))
 				to_chat(B, text("\red [] stuffs [] into []!", user, O, src))
 	return
 
@@ -235,10 +235,10 @@
 	var/locked = 0
 
 /obj/structure/crematorium/proc/update()
-	if (connected)
+	if(connected)
 		icon_state = "crema0"
 	else
-		if (contents.len)
+		if(contents.len)
 			icon_state = "crema2"
 		else
 			icon_state = "crema1"
@@ -253,14 +253,14 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(loc)
 					ex_act(severity)
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(loc)
 					ex_act(severity)
@@ -273,23 +273,23 @@
 
 
 /obj/structure/crematorium/attack_hand(mob/user as mob)
-	if (cremating)
+	if(cremating)
 		to_chat(usr, "\red It's locked.")
 		return
-	if ((connected) && (locked == 0))
+	if((connected) && (locked == 0))
 		for(var/atom/movable/A as mob|obj in connected.loc)
-			if (!( A.anchored ))
+			if(!( A.anchored ))
 				A.forceMove(src)
 		playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		qdel(connected)
 		connected = null
-	else if (locked == 0)
+	else if(locked == 0)
 		playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		connected = new /obj/structure/c_tray( loc )
 		step(connected, SOUTH)
 		connected.layer = OBJ_LAYER
 		var/turf/T = get_step(src, SOUTH)
-		if (T.contents.Find(connected))
+		if(T.contents.Find(connected))
 			connected.connected = src
 			icon_state = "crema0"
 			for(var/atom/movable/A as mob|obj in src)
@@ -302,14 +302,14 @@
 	update()
 
 /obj/structure/crematorium/attackby(P as obj, mob/user as mob, params)
-	if (istype(P, /obj/item/weapon/pen))
+	if(istype(P, /obj/item/weapon/pen))
 		var/t = input(user, "What would you like the label to be?", text("[]", name), null)  as text
-		if (user.get_active_hand() != P)
+		if(user.get_active_hand() != P)
 			return
-		if ((!in_range(src, usr) > 1 && loc != user))
+		if((!in_range(src, usr) > 1 && loc != user))
 			return
 		t = sanitize(copytext(t,1,MAX_MESSAGE_LEN))
-		if (t)
+		if(t)
 			name = text("Crematorium- '[]'", t)
 		else
 			name = "Crematorium"
@@ -317,13 +317,13 @@
 	return
 
 /obj/structure/crematorium/relaymove(mob/user as mob)
-	if (user.stat || locked)
+	if(user.stat || locked)
 		return
 	connected = new /obj/structure/c_tray( loc )
 	step(connected, SOUTH)
 	connected.layer = OBJ_LAYER
 	var/turf/T = get_step(src, SOUTH)
-	if (T.contents.Find(connected))
+	if(T.contents.Find(connected))
 		connected.connected = src
 		icon_state = "crema0"
 		for(var/atom/movable/A as mob|obj in src)
@@ -339,12 +339,12 @@
 		return //don't let you cremate something twice or w/e
 
 	if(contents.len <= 0)
-		for (var/mob/M in viewers(src))
+		for(var/mob/M in viewers(src))
 			M.show_message("<span class='warning'>You hear a hollow crackle.</span>", 1)
 			return
 
 	else
-		for (var/mob/M in viewers(src))
+		for(var/mob/M in viewers(src))
 			M.show_message("<span class='warning'>You hear a roar as the crematorium activates.</span>", 1)
 
 		cremating = 1
@@ -354,7 +354,7 @@
 		for(var/mob/living/M in search_contents_for(/mob/living))
 			if(!M || !isnull(M.gcDestroyed))
 				continue
-			if (M.stat!=2)
+			if(M.stat!=2)
 				M.emote("scream")
 			if(istype(user))
 				M.attack_log += "\[[time_stamp()]\] <font color='orange'>Has been cremated by [user.name] ([user.ckey])</font>"
@@ -385,7 +385,7 @@
 	var/mob/living/carbon/CM = L
 	if(!istype(CM))
 		return
-	if (CM.stat || CM.restrained())
+	if(CM.stat || CM.restrained())
 		return
 
 	to_chat(CM, "<span class='alert'>You attempt to slide yourself out of \the [src]...</span>")
@@ -406,9 +406,9 @@
 	throwpass = 1
 
 /obj/structure/c_tray/attack_hand(mob/user as mob)
-	if (connected)
+	if(connected)
 		for(var/atom/movable/A as mob|obj in loc)
-			if (!( A.anchored ))
+			if(!( A.anchored ))
 				A.forceMove(connected)
 			//Foreach goto(26)
 		connected.connected = null
@@ -419,16 +419,16 @@
 	return
 
 /obj/structure/c_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
-	if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
+	if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
 		return
-	if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag))
+	if(!ismob(O) && !istype(O, /obj/structure/closet/body_bag))
 		return
-	if (!ismob(user) || user.stat || user.lying || user.stunned)
+	if(!ismob(user) || user.stat || user.lying || user.stunned)
 		return
 	O.forceMove(loc)
-	if (user != O)
+	if(user != O)
 		for(var/mob/B in viewers(user, 3))
-			if ((B.client && !( B.blinded )))
+			if((B.client && !( B.blinded )))
 				to_chat(B, text("\red [] stuffs [] into []!", user, O, src))
 			//Foreach goto(99)
 	return
@@ -441,9 +441,9 @@
 
 /obj/machinery/crema_switch/attack_hand(mob/user as mob)
 	if(allowed(usr))
-		for (var/obj/structure/crematorium/C in world)
-			if (C.id == id)
-				if (!C.cremating)
+		for(var/obj/structure/crematorium/C in world)
+			if(C.id == id)
+				if(!C.cremating)
 					C.cremate(user)
 	else
 		to_chat(usr, "\red Access denied.")
@@ -451,48 +451,48 @@
 
 /hook/Login/proc/update_morgue(var/client/client, var/mob/L)
 	//Update morgues on login/logout
-	if (L.stat == DEAD)
+	if(L.stat == DEAD)
 		var/obj/structure/morgue/Morgue = null
 		var/mob/living/carbon/human/C = null
-		if (istype(L,/mob/dead/observer)) //We're a ghost, let's find our corpse
+		if(istype(L,/mob/dead/observer)) //We're a ghost, let's find our corpse
 			var/mob/dead/observer/G = L
 			if(!G.mind) //This'll probably break morgue sprites, but the line under the next If statement causes runtimes with Assume Direct Control.
 				return
-			if (G.can_reenter_corpse && G.mind.current)
+			if(G.can_reenter_corpse && G.mind.current)
 				C = G.mind.current
-		else if (istype(L,/mob/living/carbon/human))
+		else if(istype(L,/mob/living/carbon/human))
 			C = L
 
-		if (C) //We found our corpse, is it inside a morgue?
-			if (istype(C.loc,/obj/structure/morgue))
+		if(C) //We found our corpse, is it inside a morgue?
+			if(istype(C.loc,/obj/structure/morgue))
 				Morgue = C.loc
-			else if (istype(C.loc,/obj/structure/closet/body_bag))
+			else if(istype(C.loc,/obj/structure/closet/body_bag))
 				var/obj/structure/closet/body_bag/B = C.loc
-				if (istype(B.loc,/obj/structure/morgue))
+				if(istype(B.loc,/obj/structure/morgue))
 					Morgue = B.loc
-			if (Morgue)
+			if(Morgue)
 				Morgue.update()
 
 /hook/Logout/proc/update_morgue(var/client/client, var/mob/L)
 	//Update morgues on login/logout
-	if (L.stat == DEAD)
+	if(L.stat == DEAD)
 		var/obj/structure/morgue/Morgue = null
 		var/mob/living/carbon/human/C = null
-		if (istype(L,/mob/dead/observer)) //We're a ghost, let's find our corpse
+		if(istype(L,/mob/dead/observer)) //We're a ghost, let's find our corpse
 			var/mob/dead/observer/G = L
 			if(!G.mind) //This'll probably break morgue sprites, but the line under the next If statement causes runtimes with Assume Direct Control.
 				return 1
-			if (G.can_reenter_corpse && G.mind.current)
+			if(G.can_reenter_corpse && G.mind.current)
 				C = G.mind.current
-		else if (istype(L,/mob/living/carbon/human))
+		else if(istype(L,/mob/living/carbon/human))
 			C = L
 
-		if (C) //We found our corpse, is it inside a morgue?
-			if (istype(C.loc,/obj/structure/morgue))
+		if(C) //We found our corpse, is it inside a morgue?
+			if(istype(C.loc,/obj/structure/morgue))
 				Morgue = C.loc
-			else if (istype(C.loc,/obj/structure/closet/body_bag))
+			else if(istype(C.loc,/obj/structure/closet/body_bag))
 				var/obj/structure/closet/body_bag/B = C.loc
-				if (istype(B.loc,/obj/structure/morgue))
+				if(istype(B.loc,/obj/structure/morgue))
 					Morgue = B.loc
-			if (Morgue)
+			if(Morgue)
 				Morgue.update()
\ No newline at end of file
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index e790e785b40..563f9c5faa9 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -129,7 +129,7 @@
 		return
 
 	ui = nanomanager.try_update_ui(user, instrumentObj, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, instrumentObj, ui_key, "song.tmpl", instrumentObj.name, 700, 500)
 		ui.set_initial_data(data)
 		ui.open()
@@ -298,11 +298,11 @@
 	song.Topic(href, href_list)
 
 /obj/structure/piano/attackby(obj/item/O as obj, mob/user as mob, params)
-	if (istype(O, /obj/item/weapon/wrench))
-		if (!anchored && !isinspace())
+	if(istype(O, /obj/item/weapon/wrench))
+		if(!anchored && !isinspace())
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 			to_chat(user, "<span class='notice'> You begin to tighten \the [src] to the floor...</span>")
-			if (do_after(user, 20, target = src))
+			if(do_after(user, 20, target = src))
 				user.visible_message( \
 					"[user] tightens \the [src]'s casters.", \
 					"<span class='notice'> You have tightened \the [src]'s casters. Now it can be played again.</span>", \
@@ -311,7 +311,7 @@
 		else if(anchored)
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 			to_chat(user, "<span class='notice'> You begin to loosen \the [src]'s casters...</span>")
-			if (do_after(user, 40, target = src))
+			if(do_after(user, 40, target = src))
 				user.visible_message( \
 					"[user] loosens \the [src]'s casters.", \
 					"<span class='notice'> You have loosened \the [src]. Now it can be pulled somewhere else.</span>", \
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 3f5decad98e..d58888d6e24 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -47,7 +47,7 @@
 
 
 /obj/structure/stool/bed/nest/user_buckle_mob(mob/living/M, mob/living/user)
-	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
+	if( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
 		return
 
 	if(M.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel))
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 621f3a9d78e..c62df2f6cca 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -140,6 +140,15 @@
 	anchored = 0
 	movable = 1
 
+/obj/structure/stool/bed/chair/comfy/attackby(obj/item/weapon/W, mob/user, params)
+	if(iswrench(W))
+		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+		new /obj/item/stack/sheet/metal(get_turf(src))
+		new /obj/item/stack/sheet/metal(get_turf(src))
+		qdel(src)
+	else
+		..()
+
 /obj/structure/stool/bed/chair/office/Bump(atom/A)
 	..()
 	if(!buckled_mob)	return
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index 6ff52f09deb..da69c025bb8 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -11,12 +11,12 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(70))
+			if(prob(70))
 				new /obj/item/stack/sheet/metal(src.loc)
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(50))
+			if(prob(50))
 				new /obj/item/stack/sheet/metal(src.loc)
 				qdel(src)
 				return
@@ -37,9 +37,9 @@
 /obj/structure/stool/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params, skip_fucking_stool_shit = 0)
 	if(skip_fucking_stool_shit)
 		return ..(over_object)
-	if (istype(over_object, /mob/living/carbon/human))
+	if(istype(over_object, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = over_object
-		if (H==usr && !H.restrained() && !H.stat && in_range(src, over_object))
+		if(H==usr && !H.restrained() && !H.stat && in_range(src, over_object))
 			var/obj/item/weapon/stool/S = new/obj/item/weapon/stool()
 			S.origin = src
 			src.loc = S
@@ -53,7 +53,7 @@
 	icon_state = "stool"
 	force = 10
 	throwforce = 10
-	w_class = 5.0
+	w_class = 5
 	var/obj/structure/stool/origin = null
 
 /obj/item/weapon/stool/attack_self(mob/user as mob)
@@ -64,7 +64,7 @@
 	qdel(src)
 
 /obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
-	if (prob(5) && istype(M,/mob/living))
+	if(prob(5) && istype(M,/mob/living))
 		user.visible_message("<span class='danger'>[user] breaks [src] over [M]'s back!.</span>")
 		user.unEquip(src)
 		var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index bdf94263c8e..285b1da8aa5 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -54,14 +54,14 @@
 		var/subtype = null
 		for(var/direction in list(turn(dir,90), turn(dir,-90)) )
 			var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction))
-			if (T && T.flipped)
+			if(T && T.flipped)
 				type++
 				if(type == 1)
 					subtype = direction == turn(dir,90) ? "-" : "+"
 		var/base = "table"
-		if (istype(src, /obj/structure/table/woodentable))
+		if(istype(src, /obj/structure/table/woodentable))
 			base = "wood"
-		if (istype(src, /obj/structure/table/reinforced))
+		if(istype(src, /obj/structure/table/reinforced))
 			base = "rtable"
 
 		icon_state = "[base]flip[type][type == 1 ? subtype : ""]"
@@ -75,11 +75,11 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				destroy()
 		else
 	return
@@ -134,8 +134,8 @@
 		return 1
 	if(locate(/obj/structure/table) in get_turf(mover))
 		return 1
-	if (flipped)
-		if (get_dir(loc, target) == dir)
+	if(flipped)
+		if(get_dir(loc, target) == dir)
 			return !density
 		else
 			return 1
@@ -150,13 +150,13 @@
 //checks if projectile 'P' from turf 'from' can hit whatever is behind the table. Returns 1 if it can, 0 if bullet stops.
 /obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from)
 	var/turf/cover = flipped ? get_turf(src) : get_step(loc, get_dir(from, loc))
-	if (get_dist(P.starting, loc) <= 1) //Tables won't help you if people are THIS close
+	if(get_dist(P.starting, loc) <= 1) //Tables won't help you if people are THIS close
 		return 1
-	if (get_turf(P.original) == cover)
+	if(get_turf(P.original) == cover)
 		var/chance = 20
-		if (ismob(P.original))
+		if(ismob(P.original))
 			var/mob/M = P.original
-			if (M.lying)
+			if(M.lying)
 				chance += 20				//Lying down lets you catch less bullets
 		if(flipped)
 			if(get_dir(loc, from) == dir)	//Flipped tables catch mroe bullets
@@ -165,7 +165,7 @@
 				return 1					//But only from one side
 		if(prob(chance))
 			health -= P.damage/2
-			if (health > 0)
+			if(health > 0)
 				visible_message("<span class='warning'>[P] hits \the [src]!</span>")
 				return 0
 			else
@@ -177,8 +177,8 @@
 /obj/structure/table/CheckExit(atom/movable/O as mob|obj, target as turf)
 	if(istype(O) && O.checkpass(PASSTABLE))
 		return 1
-	if (flipped)
-		if (get_dir(loc, target) == dir)
+	if(flipped)
+		if(get_dir(loc, target) == dir)
 			return !density
 		else
 			return 1
@@ -186,13 +186,13 @@
 
 /obj/structure/table/MouseDrop_T(obj/O as obj, mob/user as mob)
 	..()
-	if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
+	if((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
 		return
 	if(isrobot(user))
 		return
 	if(!user.drop_item())
 		return
-	if (O.loc != src.loc)
+	if(O.loc != src.loc)
 		step(O, get_dir(O, src))
 	return
 
@@ -217,11 +217,11 @@
 	qdel(I)
 
 /obj/structure/table/attackby(obj/item/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/grab))
+	if(istype(W, /obj/item/weapon/grab))
 		tablepush(W, user)
 		return
 
-	if (istype(W, /obj/item/weapon/wrench))
+	if(istype(W, /obj/item/weapon/wrench))
 		user.visible_message("<span class='notice'>[user] is disassembling \a [src].</span>", "<span class='notice'>You start disassembling \the [src].</span>")
 		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 		if(do_after(user, 50, target = src))
@@ -263,11 +263,11 @@
 		if(T && !T.flipped)
 			return 0
 	T = locate() in get_step(src.loc,direction)
-	if (!T || T.flipped)
+	if(!T || T.flipped)
 		return 1
-	if (istype(T,/obj/structure/table/reinforced/))
+	if(istype(T,/obj/structure/table/reinforced/))
 		var/obj/structure/table/reinforced/R = T
-		if (R.status == 2)
+		if(R.status == 2)
 			return 0
 	return T.straight_table_check(direction)
 
@@ -277,7 +277,7 @@
 	set category = null
 	set src in oview(1)
 
-	if (!can_touch(usr) || ismouse(usr))
+	if(!can_touch(usr) || ismouse(usr))
 		return
 
 	if(!flip(get_cardinal_dir(usr,src)))
@@ -297,13 +297,13 @@
 	set category = "Object"
 	set src in oview(1)
 
-	if (!unflip())
+	if(!unflip())
 		to_chat(usr, "<span class='notice'>It won't budge.</span>")
 		return
 
 
 /obj/structure/table/proc/flip(var/direction)
-	if (flipped)
+	if(flipped)
 		return 0
 
 	if( !straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)) )
@@ -313,8 +313,8 @@
 	verbs +=/obj/structure/table/proc/do_put
 
 	var/list/targets = list(get_step(src,dir),get_step(src,turn(dir, 45)),get_step(src,turn(dir, -45)))
-	for (var/atom/movable/A in get_turf(src))
-		if (!A.anchored)
+	for(var/atom/movable/A in get_turf(src))
+		if(!A.anchored)
 			spawn(0)
 				A.throw_at(pick(targets),1,1)
 
@@ -333,14 +333,14 @@
 	return 1
 
 /obj/structure/table/proc/unflip()
-	if (!flipped)
+	if(!flipped)
 		return 0
 
 	var/can_flip = 1
-	for (var/mob/A in oview(src,0))//src.loc)
-		if (istype(A))
+	for(var/mob/A in oview(src,0))//src.loc)
+		if(istype(A))
 			can_flip = 0
-	if (!can_flip)
+	if(!can_flip)
 		return 0
 
 	verbs -=/obj/structure/table/proc/do_put
@@ -471,33 +471,33 @@
 	canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table)
 
 /obj/structure/table/reinforced/flip(var/direction)
-	if (status == 2)
+	if(status == 2)
 		return 0
 	else
 		return ..()
 
 /obj/structure/table/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/weldingtool))
+	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.remove_fuel(0, user))
 			if(src.status == 2)
 				to_chat(user, "\blue Now weakening the reinforced table")
 				playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
-				if (do_after(user, 50, target = src))
+				if(do_after(user, 50, target = src))
 					if(!src || !WT.isOn()) return
 					to_chat(user, "\blue Table weakened")
 					src.status = 1
 			else
 				to_chat(user, "\blue Now strengthening the reinforced table")
 				playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
-				if (do_after(user, 50, target = src))
+				if(do_after(user, 50, target = src))
 					if(!src || !WT.isOn()) return
 					to_chat(user, "\blue Table strengthened")
 					src.status = 2
 			return
 		return
 
-	if (istype(W, /obj/item/weapon/wrench))
+	if(istype(W, /obj/item/weapon/wrench))
 		if(src.status == 2)
 			return
 
@@ -560,18 +560,18 @@
 		. = . || mover.checkpass(PASSTABLE)
 
 /obj/structure/rack/MouseDrop_T(obj/O as obj, mob/user as mob)
-	if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
+	if((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
 		return
 	if(isrobot(user))
 		return
 	if(!user.drop_item())
 		return
-	if (O.loc != src.loc)
+	if(O.loc != src.loc)
 		step(O, get_dir(O, src))
 	return
 
 /obj/structure/rack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/wrench))
+	if(istype(W, /obj/item/weapon/wrench))
 		new /obj/item/weapon/rack_parts( src.loc )
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		qdel(src)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index efef25723a5..5d8c98be329 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -174,11 +174,11 @@
 	on = !on
 	update_icon()
 	if(on)
-		if (M.loc == loc)
+		if(M.loc == loc)
 			wash(M)
 			check_heat(M)
 			M.water_act(100, convertHeat(), src)
-		for (var/atom/movable/G in src.loc)
+		for(var/atom/movable/G in src.loc)
 			G.clean_blood()
 			G.water_act(100, convertHeat(), src)
 
@@ -283,9 +283,9 @@
 					washears = !(H.head.flags_inv & HIDEEARS)
 
 				if(H.wear_mask)
-					if (washears)
+					if(washears)
 						washears = !(H.wear_mask.flags_inv & HIDEEARS)
-					if (washglasses)
+					if(washglasses)
 						washglasses = !(H.wear_mask.flags_inv & HIDEEYES)
 
 				if(H.head)
@@ -382,10 +382,10 @@
 	if(!Adjacent(user))
 		return
 
-	if (ishuman(user))
+	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
-		if (user.hand)
+		if(user.hand)
 			temp = H.organs_by_name["l_hand"]
 		if(temp && !temp.is_usable())
 			to_chat(user, "<span class='notice'>You try to move your [temp.name], but cannot!")
@@ -434,7 +434,7 @@
 	var/wateract = 0
 	wateract = (O.wash(user, src))
 	busy = 0
-	if (wateract)
+	if(wateract)
 		O.water_act(20,310.15,src)
 
 /obj/structure/sink/kitchen
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 529dbb447a8..47e0823f549 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -76,7 +76,7 @@ obj/structure/windoor_assembly/Destroy()
 		if("01")
 			if(istype(W, /obj/item/weapon/weldingtool) && !anchored )
 				var/obj/item/weapon/weldingtool/WT = W
-				if (WT.remove_fuel(0,user))
+				if(WT.remove_fuel(0,user))
 					user.visible_message("<span class='warning'>[user] dissassembles the windoor assembly.</span>", "<span class='notice'>You start to dissassemble the windoor assembly.</span>")
 					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 
@@ -307,7 +307,7 @@ obj/structure/windoor_assembly/Destroy()
 	set src in oview(1)
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	if (src.anchored)
+	if(src.anchored)
 		to_chat(usr, "It is fastened to the floor; therefore, you can't rotate it!")
 		return 0
 	//if(src.state != "01")
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index e078fa2295e..32379e0881a 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -127,7 +127,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
 		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
 		destroy()
-	else if (user.a_intent == I_HARM)
+	else if(user.a_intent == I_HARM)
 		user.changeNext_move(CLICK_CD_MELEE)
 		playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
 		user.visible_message("\red [user.name] bangs against the [src.name]!", \
@@ -168,27 +168,27 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 
 /obj/structure/window/attack_slime(mob/living/user as mob)
 	var/mob/living/carbon/slime/S = user
-	if (!S.is_adult)
+	if(!S.is_adult)
 		return
 	attack_generic(user, rand(10, 15))
 
 
 /obj/structure/window/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
 	if(!istype(W)) return//I really wish I did not need this
-	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
+	if(istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
 		var/obj/item/weapon/grab/G = W
 		if(istype(G.affecting,/mob/living))
 			var/mob/living/M = G.affecting
 			var/state = G.state
 			qdel(W)	//gotta delete it here because if window breaks, it won't get deleted
-			switch (state)
+			switch(state)
 				if(1)
 					M.visible_message("<span class='warning'>[user] slams [M] against \the [src]!</span>")
 					M.apply_damage(7)
 					hit(10)
 				if(2)
 					M.visible_message("<span class='danger'>[user] bashes [M] against \the [src]!</span>")
-					if (prob(50))
+					if(prob(50))
 						M.Weaken(1)
 					M.apply_damage(10)
 					hit(25)
@@ -229,16 +229,16 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		for(var/i=0;i<sheets;i++)
 			var/obj/item/stack/sheet/glass/NG = new glasstype(src.loc)
-			for (var/obj/item/stack/sheet/glass/G in src.loc) //Stack em up
+			for(var/obj/item/stack/sheet/glass/G in src.loc) //Stack em up
 				if(G==NG)
 					continue
 				if(G.amount>=G.max_amount)
 					continue
 				G.attackby(NG, user, params)
 
-			if (reinf)
+			if(reinf)
 				var/obj/item/stack/rods/NR = new (src.loc)
-				for (var/obj/item/stack/rods/R in src.loc)
+				for(var/obj/item/stack/rods/R in src.loc)
 					if(R==NR)
 						continue
 					if(R.amount>=R.max_amount)
@@ -505,7 +505,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	update_icon()
 
 	for(var/obj/structure/window/reinforced/polarized/W in range(src,range))
-		if (W.id == src.id || !W.id)
+		if(W.id == src.id || !W.id)
 			spawn(0)
 				W.toggle()
 				return
diff --git a/code/game/response_team.dm b/code/game/response_team.dm
index d9b8cfcc375..e84b06c735e 100644
--- a/code/game/response_team.dm
+++ b/code/game/response_team.dm
@@ -9,6 +9,7 @@ var/list/response_team_members = list()
 var/responseteam_age = 21 // Minimum account age to play as an ERT member
 var/datum/response_team/active_team = null
 var/send_emergency_team
+var/ert_request_answered = 0
 
 /client/proc/response_team()
 	set name = "Dispatch CentComm Response Team"
@@ -47,6 +48,7 @@ var/send_emergency_team
 	if(!ert_type)
 		return
 
+	ert_request_answered = 1
 	message_admins("[key_name_admin(usr)] is dispatching an Emergency Response Team", 1)
 	log_admin("[key_name(usr)] used Dispatch Emergency Response Team..")
 	trigger_armed_response_team(ert_type)
@@ -100,8 +102,8 @@ var/send_emergency_team
 		to_chat(usr, "The emergency response team is already full!")
 		return
 
-	for (var/obj/effect/landmark/L in landmarks_list)
-		if (L.name == "Response Team")
+	for(var/obj/effect/landmark/L in landmarks_list)
+		if(L.name == "Response Team")
 			L.name = null
 
 			if(alert(usr, "Would you like to join the Emergency Response Team?", "Emergency Response Team", "Yes", "No") == "No")
@@ -139,8 +141,8 @@ var/send_emergency_team
 	var/obj/item/weapon/stamp/centcom/stamp = new
 	P.stamp(stamp)
 	qdel(stamp)
-	for (var/obj/effect/landmark/A in world)
-		if (A.name == "nukecode")
+	for(var/obj/effect/landmark/A in world)
+		if(A.name == "nukecode")
 			P.loc = A.loc
 			qdel(A)
 			continue
@@ -152,7 +154,7 @@ var/send_emergency_team
 	response_team_members |= M
 
 	var/new_gender = alert(usr, "Please select your gender.", "Character Generation", "Male", "Female")
-	if (new_gender)
+	if(new_gender)
 		if(new_gender == "Male")
 			M.change_gender(MALE)
 		else
@@ -202,7 +204,7 @@ var/send_emergency_team
 	M.loc = spawn_location
 
 	var/class = 0
-	while (!class)
+	while(!class)
 		class = input("Which loadout would you like to choose?") in active_team.get_slot_list()
 		if(!active_team.check_slot_available(class)) // Because the prompt does not update automatically when a slot gets filled.
 			class = 0
diff --git a/code/game/skincmd.dm b/code/game/skincmd.dm
index fd9131538e4..7d27a1ce6df 100644
--- a/code/game/skincmd.dm
+++ b/code/game/skincmd.dm
@@ -8,6 +8,6 @@
 	set hidden = 1
 
 	var/ref = copytext(data, 1, findtext(data, ";"))
-	if (src.skincmds[ref] != null)
+	if(src.skincmds[ref] != null)
 		var/obj/a = src.skincmds[ref]
 		a.SkinCmd(src, copytext(data, findtext(data, ";") + 1))
\ No newline at end of file
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 1890a0966e7..7bf3af10e9c 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -25,7 +25,7 @@ var/list/ricochet = list('sound/weapons/effects/ric1.ogg', 'sound/weapons/effect
 	var/turf/turf_source = get_turf(source)
 
  	// Looping through the player list has the added bonus of working for mobs inside containers
-	for (var/P in player_list)
+	for(var/P in player_list)
 		var/mob/M = P
 		if(!M || !M.client)
 			continue
@@ -48,7 +48,7 @@ var/const/FALLOFF_SOUNDS = 0.5
 	S.channel = 0 //Any channel
 	S.volume = vol
 	S.environment = -1
-	if (vary)
+	if(vary)
 		if(frequency)
 			S.frequency = frequency
 		else
@@ -69,20 +69,20 @@ var/const/FALLOFF_SOUNDS = 0.5
 		var/datum/gas_mixture/hearer_env = T.return_air()
 		var/datum/gas_mixture/source_env = turf_source.return_air()
 
-		if (hearer_env && source_env)
+		if(hearer_env && source_env)
 			var/pressure = min(hearer_env.return_pressure(), source_env.return_pressure())
 
-			if (pressure < ONE_ATMOSPHERE)
+			if(pressure < ONE_ATMOSPHERE)
 				pressure_factor = max((pressure - SOUND_MINIMUM_PRESSURE)/(ONE_ATMOSPHERE - SOUND_MINIMUM_PRESSURE), 0)
 		else //in space
 			pressure_factor = 0
 
-		if (distance <= 1)
+		if(distance <= 1)
 			pressure_factor = max(pressure_factor, 0.15)	//hearing through contact
 
 		S.volume *= pressure_factor
 
-		if (S.volume <= 0)
+		if(S.volume <= 0)
 			return	//no volume means no sound
 
 		var/dx = turf_source.x - T.x // Hearing from the right/left
@@ -108,29 +108,29 @@ var/const/FALLOFF_SOUNDS = 0.5
 /proc/get_sfx(soundin)
 	if(istext(soundin))
 		switch(soundin)
-			if ("shatter")
+			if("shatter")
 				soundin = pick(shatter_sound)
-			if ("explosion")
+			if("explosion")
 				soundin = pick(explosion_sound)
-			if ("sparks")
+			if("sparks")
 				soundin = pick(spark_sound)
-			if ("rustle")
+			if("rustle")
 				soundin = pick(rustle_sound)
-			if ("bodyfall")
+			if("bodyfall")
 				soundin = pick(bodyfall_sound)
-			if ("punch")
+			if("punch")
 				soundin = pick(punch_sound)
-			if ("clownstep")
+			if("clownstep")
 				soundin = pick(clown_sound)
-			if ("jackboot")
+			if("jackboot")
 				soundin = pick(jackboot_sound)
-			if ("swing_hit")
+			if("swing_hit")
 				soundin = pick(swing_hit_sound)
-			if ("hiss")
+			if("hiss")
 				soundin = pick(hiss_sound)
-			if ("pageturn")
+			if("pageturn")
 				soundin = pick(page_sound)
-			if ("gunshot")
+			if("gunshot")
 				soundin = pick(gun_sound)
 			if("computer_ambience")
 				soundin = pick(computer_ambience)
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index be8828a2dc9..3bce2fcfe3d 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -89,7 +89,7 @@
 					bloodcolor = M.feet_blood_color
 					M.track_blood--
 
-			if (bloodDNA)
+			if(bloodDNA)
 				src.AddTracks(/obj/effect/decal/cleanable/blood/tracks/footprints,bloodDNA,M.dir,0,bloodcolor) // Coming
 				var/turf/simulated/from = get_step(M,reverse_direction(M.dir))
 				if(istype(from) && from)
@@ -97,25 +97,24 @@
 
 				bloodDNA = null
 
-			switch (src.wet)
+			switch(src.wet)
 				if(TURF_WET_WATER)
-					if (!(M.slip("wet floor", 4, 2, 0, 1)))
+					if(!(M.slip("wet floor", 4, 2, 0, 1)))
 						M.inertia_dir = 0
 						return
 
 				if(TURF_WET_LUBE) //lube
-					if(M.slip("floor", 0, 7, 4, 0, 1))
-						M.take_organ_damage(2) // Was 5 -- TLE
+					M.slip("floor", 0, 5, 3, 0, 1)
 
 
 				if(TURF_WET_ICE) // Ice
-					if (!(prob(30) && M.slip("icy floor", 4, 2, 1, 1)))
+					if(!(prob(30) && M.slip("icy floor", 4, 2, 1, 1)))
 						M.inertia_dir = 0
 
 
 //returns 1 if made bloody, returns 0 otherwise
 /turf/simulated/add_blood(mob/living/carbon/human/M)
-	if (!..())
+	if(!..())
 		return 0
 
 	var/obj/effect/decal/cleanable/blood/B = locate() in contents	//check for existing blood splatter
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index f150be57ba6..979f0ca2ace 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -48,8 +48,8 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
 
 
 //turf/simulated/floor/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-//	if ((istype(mover, /obj/machinery/vehicle) && !(src.burnt)))
-//		if (!( locate(/obj/machinery/mass_driver, src) ))
+//	if((istype(mover, /obj/machinery/vehicle) && !(src.burnt)))
+//		if(!( locate(/obj/machinery/mass_driver, src) ))
 //			return 0
 //	return ..()
 
@@ -75,7 +75,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
 					src.hotspot_expose(1000,CELL_VOLUME)
 					if(prob(33)) new /obj/item/stack/sheet/metal(src)
 		if(3.0)
-			if (prob(50))
+			if(prob(50))
 				src.break_tile()
 				src.hotspot_expose(1000,CELL_VOLUME)
 	return
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 764ca6055d4..dcc05e5acfe 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -30,13 +30,13 @@
 			to_chat(user, "<span class='warning'>Repair the plating first!</span>")
 			return 1
 		var/obj/item/stack/rods/R = C
-		if (R.get_amount() < 2)
+		if(R.get_amount() < 2)
 			to_chat(user, "<span class='warning'>You need two rods to make a reinforced floor!</span>")
 			return 1
 		else
 			to_chat(user, "<span class='notice'>You begin reinforcing the floor...</span>")
 			if(do_after(user, 30, target = src))
-				if (R.get_amount() >= 2 && !istype(src, /turf/simulated/floor/engine))
+				if(R.get_amount() >= 2 && !istype(src, /turf/simulated/floor/engine))
 					ChangeTurf(/turf/simulated/floor/engine)
 					playsound(src, 'sound/items/Deconstruct.ogg', 80, 1)
 					R.use(2)
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 7f4ac1704d9..4d7c8ccd5da 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -140,7 +140,7 @@
 		if(!devastated)
 			playsound(src, 'sound/items/Welder.ogg', 100, 1)
 			new /obj/structure/girder(src)
-			if (mineral == "metal")
+			if(mineral == "metal")
 				new /obj/item/stack/sheet/metal( src )
 				new /obj/item/stack/sheet/metal( src )
 			else
@@ -148,7 +148,7 @@
 				new M( src )
 				new M( src )
 		else
-			if (mineral == "metal")
+			if(mineral == "metal")
 				new /obj/item/stack/sheet/metal( src )
 				new /obj/item/stack/sheet/metal( src )
 				new /obj/item/stack/sheet/metal( src )
@@ -258,8 +258,8 @@
 
 /turf/simulated/wall/attack_hand(mob/user as mob)
 	user.changeNext_move(CLICK_CD_MELEE)
-	if (HULK in user.mutations)
-		if (prob(hardness) || rotting)
+	if(HULK in user.mutations)
+		if(prob(hardness) || rotting)
 			playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
 			to_chat(user, text("<span class='notice'>You smash through the wall.</span>"))
 			user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
@@ -287,7 +287,7 @@
 
 /turf/simulated/wall/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	user.changeNext_move(CLICK_CD_MELEE)
-	if (!user.IsAdvancedToolUser())
+	if(!user.IsAdvancedToolUser())
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 
@@ -376,7 +376,7 @@
 			visible_message("<span class='warning'>[user] slices apart \the [src]!</span>","<span class='warning'>You hear metal being sliced apart.</span>")
 
 	//DRILLING
-	else if (istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill))
+	else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill))
 
 		to_chat(user, "<span class='notice'>You begin to drill though the wall.</span>")
 
@@ -385,7 +385,7 @@
 			dismantle_wall()
 			visible_message("<span class='warning'>[user] drills through \the [src]!</span>","<span class='warning'>You hear the grinding of metal.</span>")
 
-	else if (istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
+	else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
 
 		to_chat(user, "<span class='notice'>You begin to disintegrates the wall.</span>")
 
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index 8a36ea5af6b..d4f0767d755 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -134,7 +134,7 @@
 
 /*
 /turf/simulated/wall/mineral/proc/shock()
-	if (electrocute_mob(user, C, src))
+	if(electrocute_mob(user, C, src))
 		var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 		s.set_up(5, 1, src)
 		s.start()
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 1d792647042..27154fd00fb 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -15,7 +15,7 @@
 
 /turf/simulated/wall/r_wall/attackby(obj/item/W as obj, mob/user as mob, params)
 	user.changeNext_move(CLICK_CD_MELEE)
-	if (!user.IsAdvancedToolUser())
+	if(!user.IsAdvancedToolUser())
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 
@@ -90,7 +90,7 @@
 				return
 
 		if(1)
-			if (istype(W, /obj/item/weapon/screwdriver))
+			if(istype(W, /obj/item/weapon/screwdriver))
 				to_chat(user, "<span class='notice'>You begin removing the support lines.</span>")
 				playsound(src, 'sound/items/Screwdriver.ogg', 100, 1)
 
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index efe3bdb6e55..48f892caff0 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -116,9 +116,9 @@
 			A.z = target_z
 			A.x = world.maxx - 2
 			spawn (0)
-				if ((A && A.loc))
+				if((A && A.loc))
 					A.loc.Entered(A)
-	else if (src.x >= world.maxx)
+	else if(src.x >= world.maxx)
 		if(istype(A, /obj/effect/meteor))
 			qdel(A)
 			return
@@ -141,9 +141,9 @@
 			A.z = target_z
 			A.x = 3
 			spawn (0)
-				if ((A && A.loc))
+				if((A && A.loc))
 					A.loc.Entered(A)
-	else if (src.y <= 1)
+	else if(src.y <= 1)
 		if(istype(A, /obj/effect/meteor))
 			qdel(A)
 			return
@@ -165,10 +165,10 @@
 			A.z = target_z
 			A.y = world.maxy - 2
 			spawn (0)
-				if ((A && A.loc))
+				if((A && A.loc))
 					A.loc.Entered(A)
 
-	else if (src.y >= world.maxy)
+	else if(src.y >= world.maxy)
 		if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust))
 			qdel(A)
 			return
@@ -190,7 +190,7 @@
 			A.z = target_z
 			A.y = 3
 			spawn (0)
-				if ((A && A.loc))
+				if((A && A.loc))
 					A.loc.Entered(A)
 	return
 
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 8541a638040..ebcac04b6ed 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -86,7 +86,7 @@
 	return 0
 
 /turf/Enter(atom/movable/mover as mob|obj, atom/forget as mob|obj|turf|area)
-	if (!mover)
+	if(!mover)
 		return 1
 
 
@@ -109,7 +109,7 @@
 			large_dense += border_obstacle
 
 	//Then, check the turf itself
-	if (!src.CanPass(mover, src))
+	if(!src.CanPass(mover, src))
 		mover.Bump(src, 1)
 		return 0
 
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 302f6a1f742..e5f02a0a45a 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -75,7 +75,7 @@ var/global/admin_ooc_colour = "#b82e00"
 
 /proc/toggle_ooc()
 	config.ooc_allowed = ( !config.ooc_allowed )
-	if (config.ooc_allowed)
+	if(config.ooc_allowed)
 		to_chat(world, "<B>The OOC channel has been globally enabled!</B>")
 	else
 		to_chat(world, "<B>The OOC channel has been globally disabled!</B>")
diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
index 857fcadb48a..afc8db25b65 100644
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -52,11 +52,11 @@
 /mob/living/carbon/human/verb/suicide()
 	set hidden = 1
 
-	if (stat == DEAD)
+	if(stat == DEAD)
 		to_chat(src, "You're already dead!")
 		return
 
-	if (!ticker)
+	if(!ticker)
 		to_chat(src, "You can't commit suicide before the game starts!")
 		return
 
@@ -65,7 +65,7 @@
 		to_chat(src, "You try to bring yourself to commit suicide, but - something prevents you!")
 		return
 
-	if (suiciding)
+	if(suiciding)
 		to_chat(src, "You're already committing suicide! Be patient!")
 		return
 
@@ -88,15 +88,15 @@
 /mob/living/carbon/brain/verb/suicide()
 	set hidden = 1
 
-	if (stat == 2)
+	if(stat == 2)
 		to_chat(src, "You're already dead!")
 		return
 
-	if (!ticker)
+	if(!ticker)
 		to_chat(src, "You can't commit suicide before the game starts!")
 		return
 
-	if (suiciding)
+	if(suiciding)
 		to_chat(src, "You're already committing suicide! Be patient!")
 		return
 
@@ -113,11 +113,11 @@
 /mob/living/silicon/ai/verb/suicide()
 	set hidden = 1
 
-	if (stat == 2)
+	if(stat == 2)
 		to_chat(src, "You're already dead!")
 		return
 
-	if (suiciding)
+	if(suiciding)
 		to_chat(src, "You're already committing suicide! Be patient!")
 		return
 
@@ -133,11 +133,11 @@
 /mob/living/silicon/robot/verb/suicide()
 	set hidden = 1
 
-	if (stat == 2)
+	if(stat == 2)
 		to_chat(src, "You're already dead!")
 		return
 
-	if (suiciding)
+	if(suiciding)
 		to_chat(src, "You're already committing suicide! Be patient!")
 		return
 
@@ -161,7 +161,7 @@
 		var/obj/item/device/paicard/card = loc
 		card.removePersonality()
 		var/turf/T = get_turf_or_move(card.loc)
-		for (var/mob/M in viewers(T))
+		for(var/mob/M in viewers(T))
 			M.show_message("\blue [src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "\blue [src] bleeps electronically.", 2)
 		death(0, 1)
 	else
@@ -170,11 +170,11 @@
 /mob/living/carbon/alien/humanoid/verb/suicide()
 	set hidden = 1
 
-	if (stat == 2)
+	if(stat == 2)
 		to_chat(src, "You're already dead!")
 		return
 
-	if (suiciding)
+	if(suiciding)
 		to_chat(src, "You're already committing suicide! Be patient!")
 		return
 
@@ -190,11 +190,11 @@
 
 /mob/living/carbon/slime/verb/suicide()
 	set hidden = 1
-	if (stat == 2)
+	if(stat == 2)
 		to_chat(src, "You're already dead!")
 		return
 
-	if (suiciding)
+	if(suiciding)
 		to_chat(src, "You're already committing suicide! Be patient!")
 		return
 
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 3be9262d1ad..4e822710cd0 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -27,7 +27,7 @@
 							entry += " - <font color='gray'>Observing</font>"
 						else
 							entry += " - <font color='black'><b>DEAD</b></font>"
-					else if (istype(C.mob, /mob/new_player))
+					else if(istype(C.mob, /mob/new_player))
 						entry += " - <font color='green'>New Player</font>"
 					else
 						entry += " - <font color='black'><b>DEAD</b></font>"
@@ -122,7 +122,7 @@
 				if(!C.holder.fakekey)
 					msg += "\t[C] is a [C.holder.rank]\n"
 					num_admins_online++
-			else if (check_rights(R_MOD|R_MENTOR, 0, C.mob) && !check_rights(R_ADMIN, 0, C.mob))
+			else if(check_rights(R_MOD|R_MENTOR, 0, C.mob) && !check_rights(R_ADMIN, 0, C.mob))
 				modmsg += "\t[C] is a [C.holder.rank]\n"
 				num_mods_online++
 
diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm
index 1c5365a6b96..3027864ace6 100644
--- a/code/modules/admin/DB ban/functions.dm	
+++ b/code/modules/admin/DB ban/functions.dm	
@@ -17,6 +17,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
 	var/kickbannedckey		//Defines whether this proc should kick the banned person, if they are connected (if banned_mob is defined).
 							//some ban types kick players after this proc passes (tempban, permaban), but some are specific to db_ban, so
 							//they should kick within this proc.
+	var/isjobban // For job bans, which need to be inserted into the job ban lists
 	switch(bantype)
 		if(BANTYPE_PERMA)
 			bantype_str = "PERMABAN"
@@ -31,9 +32,11 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
 			bantype_str = "JOB_PERMABAN"
 			duration = -1
 			bantype_pass = 1
+			isjobban = 1
 		if(BANTYPE_JOB_TEMP)
 			bantype_str = "JOB_TEMPBAN"
 			bantype_pass = 1
+			isjobban = 1
 		if(BANTYPE_APPEARANCE)
 			bantype_str = "APPEARANCE_BAN"
 			duration = -1
@@ -134,11 +137,15 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
 		if(banned_mob && banned_mob.client && banned_mob.client.ckey == banckey)
 			del(banned_mob.client)
 
+	if(isjobban)
+		jobban_client_fullban(ckey, job)
+
 datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
 
 	if(!check_rights(R_BAN))	return
 
 	var/bantype_str
+	var/isjobban // For job bans, which need to be removed from the job ban lists
 	if(bantype)
 		var/bantype_pass = 0
 		switch(bantype)
@@ -151,9 +158,11 @@ datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
 			if(BANTYPE_JOB_PERMA)
 				bantype_str = "JOB_PERMABAN"
 				bantype_pass = 1
+				isjobban = 1
 			if(BANTYPE_JOB_TEMP)
 				bantype_str = "JOB_TEMPBAN"
 				bantype_pass = 1
+				isjobban = 1
 			if(BANTYPE_APPEARANCE)
 				bantype_str = "APPEARANCE_BAN"
 				bantype_pass = 1
@@ -206,6 +215,8 @@ datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
 		return
 
 	DB_ban_unban_by_id(ban_id)
+	if(isjobban)
+		jobban_unban_client(ckey, job)
 
 datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
 
@@ -215,18 +226,20 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
 		to_chat(usr, "Cancelled")
 		return
 
-	var/DBQuery/query = dbcon.NewQuery("SELECT ckey, duration, reason FROM [format_table_name("ban")] WHERE id = [banid]")
+	var/DBQuery/query = dbcon.NewQuery("SELECT ckey, duration, reason, job FROM [format_table_name("ban")] WHERE id = [banid]")
 	query.Execute()
 
 	var/eckey = usr.ckey	//Editing admin ckey
 	var/pckey				//(banned) Player ckey
 	var/duration			//Old duration
 	var/reason				//Old reason
+	var/job						//Old job
 
 	if(query.NextRow())
 		pckey = query.item[1]
 		duration = query.item[2]
 		reason = query.item[3]
+		job = query.item[4]
 	else
 		to_chat(usr, "Invalid ban id. Contact the database admin")
 		return
@@ -259,6 +272,8 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
 		if("unban")
 			if(alert("Unban [pckey]?", "Unban?", "Yes", "No") == "Yes")
 				DB_ban_unban_by_id(banid)
+				if(job && length(job))
+					jobban_unban_client(pckey, job)
 				return
 			else
 				to_chat(usr, "Cancelled")
@@ -396,7 +411,6 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
 	output += "<br><input type='submit' value='search'><br>"
 	output += "<input type='checkbox' value='[match]' name='dbmatch' [match? "checked=\"1\"" : null]> Match(min. 3 characters to search by key or ip, and 7 to search by cid)<br>"
 	output += "</form>"
-	output += "Please note that all jobban bans or unbans are in-effect the following round.<br>"
 	output += "This search shows only last 100 bans."
 
 	if(adminckey || playerckey || playerip || playercid || dbbantype)
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index c8ae67d4cab..3d7b11390eb 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -1,10 +1,10 @@
 //Blocks an attempt to connect before even creating our client datum thing.
 world/IsBanned(key,address,computer_id)
-	if (!key || !address || !computer_id)
+	if(!key || !address || !computer_id)
 		log_access("Failed Login (invalid data): [key] [address]-[computer_id]")
 		return list("reason"="invalid login data", "desc"="Error: Could not check ban status, please try again. Error message: Your computer provided invalid or blank information to the server on connection (BYOND Username, IP, and Computer ID). Provided information for reference: Username: '[key]' IP: '[address]' Computer ID: '[computer_id]'. If you continue to get this error, please restart byond or contact byond support.")
 
-	if (text2num(computer_id) == 2147483647) //this cid causes stickybans to go haywire
+	if(text2num(computer_id) == 2147483647) //this cid causes stickybans to go haywire
 		log_access("Failed Login (invalid cid): [key] [address]-[computer_id]")
 		return list("reason"="invalid login data", "desc"="Error: Could not check ban status, Please try again. Error message: Your computer provided an invalid Computer ID.")
 	var/admin = 0
@@ -34,7 +34,7 @@ world/IsBanned(key,address,computer_id)
 		//Ban Checking
 		. = CheckBan(ckey(key), computer_id, address)
 		if(.)
-			if (admin)
+			if(admin)
 				log_admin("The admin [key] has been allowed to bypass a matching ban on [.["key"]]")
 				message_admins("<span class='adminnotice'>The admin [key] has been allowed to bypass a matching ban on [.["key"]]</span>")
 				addclientmessage(ckey,"<span class='adminnotice'>You have been allowed to bypass a matching ban on [.["key"]].</span>")
@@ -71,13 +71,13 @@ world/IsBanned(key,address,computer_id)
 			var/duration = query.item[7]
 			var/bantime = query.item[8]
 			var/bantype = query.item[9]
-			if (bantype == "ADMIN_PERMABAN" || bantype == "ADMIN_TEMPBAN")
+			if(bantype == "ADMIN_PERMABAN" || bantype == "ADMIN_TEMPBAN")
 				//admin bans MUST match on ckey to prevent cid-spoofing attacks
 				//	as well as dynamic ip abuse
-				if (pckey != ckey)
+				if(pckey != ckey)
 					continue
-			if (admin)
-				if (bantype == "ADMIN_PERMABAN" || bantype == "ADMIN_TEMPBAN")
+			if(admin)
+				if(bantype == "ADMIN_PERMABAN" || bantype == "ADMIN_TEMPBAN")
 					log_admin("The admin [key] is admin banned, and has been disallowed access")
 					message_admins("<span class='adminnotice'>The admin [key] is admin banned, and has been disallowed access</span>")
 				else
@@ -102,11 +102,11 @@ world/IsBanned(key,address,computer_id)
 			return .
 
 	. = ..()	//default pager ban stuff
-	if (.)
+	if(.)
 		//byond will not trigger isbanned() for "global" host bans,
 		//ie, ones where the "apply to this game only" checkbox is not checked (defaults to not checked)
 		//So it's safe to let admins walk thru host/sticky bans here
-		if (admin)
+		if(admin)
 			log_admin("The admin [key] has been allowed to bypass a matching host/sticky ban")
 			message_admins("<span class='adminnotice'>The admin [key] has been allowed to bypass a matching host/sticky ban</span>")
 			addclientmessage(ckey,"<span class='adminnotice'>You have been allowed to bypass a matching host/sticky ban.</span>")
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index aba317a1996..172e826a0bb 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -15,8 +15,8 @@ var/savefile/Banlist
 	Banlist.cd = "/base"
 	if( "[ckey][id]" in Banlist.dir )
 		Banlist.cd = "[ckey][id]"
-		if (Banlist["temp"])
-			if (!GetExp(Banlist["minutes"]))
+		if(Banlist["temp"])
+			if(!GetExp(Banlist["minutes"]))
 				ClearTempbans()
 				return 0
 			else
@@ -27,7 +27,7 @@ var/savefile/Banlist
 		.["reason"]	= "ckey/id"
 		return .
 	else
-		for (var/A in Banlist.dir)
+		for(var/A in Banlist.dir)
 			Banlist.cd = "/base/[A]"
 			var/matches
 			if( ckey == Banlist["key"] )
@@ -43,7 +43,7 @@ var/savefile/Banlist
 
 			if(matches)
 				if(Banlist["temp"])
-					if (!GetExp(Banlist["minutes"]))
+					if(!GetExp(Banlist["minutes"]))
 						ClearTempbans()
 						return 0
 					else
@@ -66,13 +66,13 @@ var/savefile/Banlist
 	Banlist = new("data/banlist.bdb")
 	log_admin("Loading Banlist")
 
-	if (!length(Banlist.dir)) log_admin("Banlist is empty.")
+	if(!length(Banlist.dir)) log_admin("Banlist is empty.")
 
-	if (!Banlist.dir.Find("base"))
+	if(!Banlist.dir.Find("base"))
 		log_admin("Banlist missing base dir.")
 		Banlist.dir.Add("base")
 		Banlist.cd = "/base"
-	else if (Banlist.dir.Find("base"))
+	else if(Banlist.dir.Find("base"))
 		Banlist.cd = "/base"
 
 	ClearTempbans()
@@ -82,16 +82,16 @@ var/savefile/Banlist
 	UpdateTime()
 
 	Banlist.cd = "/base"
-	for (var/A in Banlist.dir)
+	for(var/A in Banlist.dir)
 		Banlist.cd = "/base/[A]"
-		if (!Banlist["key"] || !Banlist["id"])
+		if(!Banlist["key"] || !Banlist["id"])
 			RemoveBan(A)
 			log_admin("Invalid Ban.")
 			message_admins("Invalid Ban.")
 			continue
 
-		if (!Banlist["temp"]) continue
-		if (CMinutes >= Banlist["minutes"]) RemoveBan(A)
+		if(!Banlist["temp"]) continue
+		if(CMinutes >= Banlist["minutes"]) RemoveBan(A)
 
 	return 1
 
@@ -100,12 +100,12 @@ var/savefile/Banlist
 
 	var/bantimestamp
 
-	if (temp)
+	if(temp)
 		UpdateTime()
 		bantimestamp = CMinutes + minutes
 
 	Banlist.cd = "/base"
-	if ( Banlist.dir.Find("[ckey][computerid]") )
+	if( Banlist.dir.Find("[ckey][computerid]") )
 		to_chat(usr, "<span class='danger'>Ban already exists.</span>")
 		return 0
 	else
@@ -117,7 +117,7 @@ var/savefile/Banlist
 		Banlist["reason"] << reason
 		Banlist["bannedby"] << bannedby
 		Banlist["temp"] << temp
-		if (temp)
+		if(temp)
 			Banlist["minutes"] << bantimestamp
 		if(!temp)
 			add_note(ckey, "Permanently banned - [reason]", null, bannedby, 0)
@@ -134,7 +134,7 @@ var/savefile/Banlist
 	Banlist["id"] >> id
 	Banlist.cd = "/base"
 
-	if (!Banlist.dir.Remove(foldername)) return 0
+	if(!Banlist.dir.Remove(foldername)) return 0
 
 	if(!usr)
 		log_admin("Ban Expired: [key]")
@@ -145,9 +145,9 @@ var/savefile/Banlist
 		message_admins("[key_name_admin(usr)] unbanned: [key]")
 		feedback_inc("ban_unban",1)
 		usr.client.holder.DB_ban_unban( ckey(key), BANTYPE_ANY_FULLBAN)
-	for (var/A in Banlist.dir)
+	for(var/A in Banlist.dir)
 		Banlist.cd = "/base/[A]"
-		if (key == Banlist["key"] /*|| id == Banlist["id"]*/)
+		if(key == Banlist["key"] /*|| id == Banlist["id"]*/)
 			Banlist.cd = "/base"
 			Banlist.dir.Remove(A)
 			continue
@@ -157,13 +157,13 @@ var/savefile/Banlist
 /proc/GetExp(minutes as num)
 	UpdateTime()
 	var/exp = minutes - CMinutes
-	if (exp <= 0)
+	if(exp <= 0)
 		return 0
 	else
 		var/timeleftstring
-		if (exp >= 1440) //1440 = 1 day in minutes
+		if(exp >= 1440) //1440 = 1 day in minutes
 			timeleftstring = "[round(exp / 1440, 0.1)] Days"
-		else if (exp >= 60) //60 = 1 hour in minutes
+		else if(exp >= 60) //60 = 1 hour in minutes
 			timeleftstring = "[round(exp / 60, 0.1)] Hours"
 		else
 			timeleftstring = "[exp] Minutes"
@@ -174,7 +174,7 @@ var/savefile/Banlist
 	var/dat
 	//var/dat = "<HR><B>Unban Player:</B> \blue(U) = Unban , (E) = Edit Ban\green (Total<HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >"
 	Banlist.cd = "/base"
-	for (var/A in Banlist.dir)
+	for(var/A in Banlist.dir)
 		count++
 		Banlist.cd = "/base/[A]"
 		var/ref		= "\ref[src]"
@@ -228,6 +228,6 @@ var/savefile/Banlist
 
 /proc/ClearAllBans()
 	Banlist.cd = "/base"
-	for (var/A in Banlist.dir)
+	for(var/A in Banlist.dir)
 		RemoveBan(A)
 
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 7e5edf7c8bb..4427e694ffd 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -103,7 +103,7 @@ var/global/nologevent = 0
 		<A href='?_src_=holder;subtlemessage=\ref[M]'>Subtle message</A>
 	"}
 
-	if (M.client)
+	if(M.client)
 		if(!istype(M, /mob/new_player))
 			body += "<br><br>"
 			body += "<b>Transformation:</b>"
@@ -191,7 +191,7 @@ var/global/nologevent = 0
 				<A href='?_src_=holder;simplemake=shade;mob=\ref[M]'>Shade</A>
 			"}
 
-	if (M.client)
+	if(M.client)
 		body += {"<br><br>
 			<b>Other actions:</b>
 			<br>
@@ -243,7 +243,7 @@ var/global/nologevent = 0
 	if(!check_rights(R_EVENT))
 		return
 
-	if (!istype(src,/datum/admins))
+	if(!istype(src,/datum/admins))
 		src = usr.client.holder
 
 	var/dat
@@ -576,7 +576,7 @@ var/global/nologevent = 0
 		return
 
 	config.looc_allowed = !(config.looc_allowed)
-	if (config.looc_allowed)
+	if(config.looc_allowed)
 		to_chat(world, "<B>The LOOC channel has been globally enabled!</B>")
 	else
 		to_chat(world, "<B>The LOOC channel has been globally disabled!</B>")
@@ -592,7 +592,7 @@ var/global/nologevent = 0
 		return
 
 	config.dsay_allowed = !(config.dsay_allowed)
-	if (config.dsay_allowed)
+	if(config.dsay_allowed)
 		to_chat(world, "<B>Deadchat has been globally enabled!</B>")
 	else
 		to_chat(world, "<B>Deadchat has been globally disabled!</B>")
@@ -643,7 +643,7 @@ var/global/nologevent = 0
 		return
 
 	enter_allowed = !( enter_allowed )
-	if (!( enter_allowed ))
+	if(!( enter_allowed ))
 		to_chat(world, "<B>New players may no longer enter the game.</B>")
 	else
 		to_chat(world, "<B>New players may now enter the game.</B>")
@@ -661,7 +661,7 @@ var/global/nologevent = 0
 		return
 
 	config.allow_ai = !( config.allow_ai )
-	if (!( config.allow_ai ))
+	if(!( config.allow_ai ))
 		to_chat(world, "<B>The AI job is no longer chooseable.</B>")
 	else
 		to_chat(world, "<B>The AI job is chooseable now.</B>")
@@ -679,7 +679,7 @@ var/global/nologevent = 0
 		return
 
 	abandon_allowed = !( abandon_allowed )
-	if (abandon_allowed)
+	if(abandon_allowed)
 		to_chat(world, "<B>You may now respawn.</B>")
 	else
 		to_chat(world, "<B>You may no longer respawn :(</B>")
@@ -709,13 +709,13 @@ var/global/nologevent = 0
 	if(!check_rights(R_SERVER))
 		return
 
-	if (!ticker || ticker.current_state != GAME_STATE_PREGAME)
+	if(!ticker || ticker.current_state != GAME_STATE_PREGAME)
 		ticker.delay_end = !ticker.delay_end
 		log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
 		message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
 		return //alert("Round end delayed", null, null, null, null, null)
 	going = !( going )
-	if (!( going ))
+	if(!( going ))
 		to_chat(world, "<b>The game start has been delayed.</b>")
 		log_admin("[key_name(usr)] delayed the game.")
 	else
@@ -728,34 +728,34 @@ var/global/nologevent = 0
 /proc/is_special_character(mob/M as mob) // returns 1 for specail characters and 2 for heroes of gamemode
 	if(!ticker || !ticker.mode)
 		return 0
-	if (!istype(M))
+	if(!istype(M))
 		return 0
 	if((M.mind in ticker.mode.head_revolutionaries) || (M.mind in ticker.mode.revolutionaries))
-		if (ticker.mode.config_tag == "revolution")
+		if(ticker.mode.config_tag == "revolution")
 			return 2
 		return 1
 	if(M.mind in ticker.mode.cult)
-		if (ticker.mode.config_tag == "cult")
+		if(ticker.mode.config_tag == "cult")
 			return 2
 		return 1
 	if(M.mind in ticker.mode.malf_ai)
-		if (ticker.mode.config_tag == "malfunction")
+		if(ticker.mode.config_tag == "malfunction")
 			return 2
 		return 1
 	if(M.mind in ticker.mode.syndicates)
-		if (ticker.mode.config_tag == "nuclear")
+		if(ticker.mode.config_tag == "nuclear")
 			return 2
 		return 1
 	if(M.mind in ticker.mode.wizards)
-		if (ticker.mode.config_tag == "wizard")
+		if(ticker.mode.config_tag == "wizard")
 			return 2
 		return 1
 	if(M.mind in ticker.mode.changelings)
-		if (ticker.mode.config_tag == "changeling")
+		if(ticker.mode.config_tag == "changeling")
 			return 2
 		return 1
 	if(M.mind in ticker.mode.abductors)
-		if (ticker.mode.config_tag == "abduction")
+		if(ticker.mode.config_tag == "abduction")
 			return 2
 		return 1
 	if(isrobot(M))
@@ -829,7 +829,7 @@ var/global/nologevent = 0
 		return
 
 	guests_allowed = !( guests_allowed )
-	if (!( guests_allowed ))
+	if(!( guests_allowed ))
 		to_chat(world, "<B>Guests may no longer enter the game.</B>")
 	else
 		to_chat(world, "<B>Guests may now enter the game.</B>")
@@ -846,7 +846,7 @@ var/global/nologevent = 0
 		else if(isrobot(S))
 			var/mob/living/silicon/robot/R = S
 			to_chat(usr, "<b>CYBORG [key_name(S, usr)]'s [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independent)"] laws:</b>")
-		else if (ispAI(S))
+		else if(ispAI(S))
 			var/mob/living/silicon/pai/P = S
 			to_chat(usr, "<b>pAI [key_name(S, usr)]'s laws:</b>")
 			to_chat(usr, "[P.pai_law0]")
@@ -856,7 +856,7 @@ var/global/nologevent = 0
 		else
 			to_chat(usr, "<b>SILICON [key_name(S, usr)]'s laws:</b>")
 
-		if (S.laws == null)
+		if(S.laws == null)
 			to_chat(usr, "[key_name(S, usr)]'s laws are null. Contact a coder.")
 		else
 			S.laws.show_laws(usr)
@@ -888,7 +888,7 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
 /proc/move_gamma_ship()
 	var/area/fromArea
 	var/area/toArea
-	if (gamma_ship_location == 1)
+	if(gamma_ship_location == 1)
 		fromArea = locate(/area/shuttle/gamma/space)
 		toArea = locate(/area/shuttle/gamma/station)
 	else
@@ -905,7 +905,7 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
 	for(var/obj/machinery/alarm/A in toArea)
 		A.first_run()
 
-	if (gamma_ship_location)
+	if(gamma_ship_location)
 		gamma_ship_location = 0
 	else
 		gamma_ship_location = 1
@@ -955,18 +955,18 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
 		return //extra sanity check to make sure only observers are shoved into things
 
 	//same as assume-direct-control perm requirements.
-	if (!check_rights(R_VAREDIT,0)) //no varedit, check if they have r_admin and r_debug
+	if(!check_rights(R_VAREDIT,0)) //no varedit, check if they have r_admin and r_debug
 		if(!check_rights(R_ADMIN|R_DEBUG,0)) //if they don't have r_admin and r_debug, return
 			return 0 //otherwise, if they have no varedit, but do have r_admin and r_debug, execute the rest of the code
 
-	if (!frommob.ckey)
+	if(!frommob.ckey)
 		return 0
 
 	if(istype(tothing, /obj/item))
 		var/mob/living/toitem = tothing
 
 		var/ask = alert("Are you sure you want to allow [frommob.name]([frommob.key]) to possess [toitem.name]?", "Place ghost in control of item?", "Yes", "No")
-		if (ask != "Yes")
+		if(ask != "Yes")
 			return 1
 
 		if(!frommob || !toitem) //make sure the mobs don't go away while we waited for a response
@@ -986,12 +986,12 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
 		var/mob/living/tomob = tothing
 
 		var/question = ""
-		if (tomob.ckey)
+		if(tomob.ckey)
 			question = "This mob already has a user ([tomob.key]) in control of it! "
 		question += "Are you sure you want to place [frommob.name]([frommob.key]) in control of [tomob.name]?"
 
 		var/ask = alert(question, "Place ghost in control of mob?", "Yes", "No")
-		if (ask != "Yes")
+		if(ask != "Yes")
 			return 1
 
 		if(!frommob || !tomob) //make sure the mobs don't go away while we waited for a response
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index fa0059618bd..1c24e8cf214 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -615,7 +615,7 @@ var/list/admin_verbs_snpc = list(
 		var/message = input("What do you want the message to be?", "Make Sound") as text|null
 		if(!message)
 			return
-		for (var/mob/V in hearers(O))
+		for(var/mob/V in hearers(O))
 			V.show_message(message, 2)
 		log_admin("[key_name(usr)] made [O] at [O.x], [O.y], [O.z] make a sound")
 		message_admins("\blue [key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z] make a sound")
@@ -643,7 +643,7 @@ var/list/admin_verbs_snpc = list(
 	if(mob.control_object)
 		if(!msg)
 			return
-		for (var/mob/V in hearers(mob.control_object))
+		for(var/mob/V in hearers(mob.control_object))
 			V.show_message("<b>[mob.control_object.name]</b> says: \"" + msg + "\"", 2)
 		log_admin("[key_name(usr)] used oSay on [mob.control_object]: [msg]")
 		message_admins("[key_name_admin(usr)] used oSay on [mob.control_object]: [msg]")
@@ -857,14 +857,14 @@ var/list/admin_verbs_snpc = list(
 		return
 
 	var/list/jobs = list()
-	for (var/datum/job/J in job_master.occupations)
-		if (J.current_positions >= J.total_positions && J.total_positions != -1)
+	for(var/datum/job/J in job_master.occupations)
+		if(J.current_positions >= J.total_positions && J.total_positions != -1)
 			jobs += J.title
-	if (!jobs.len)
+	if(!jobs.len)
 		to_chat(usr, "There are no fully staffed jobs.")
 		return
 	var/job = input("Please select job slot to free", "Free Job Slot") as null|anything in jobs
-	if (job)
+	if(job)
 		job_master.FreeRole(job)
 		log_admin("[key_name(usr)] has freed a job slot for [job].")
 		message_admins("[key_name_admin(usr)] has freed a job slot for [job].")
@@ -878,7 +878,7 @@ var/list/admin_verbs_snpc = list(
 
 	prefs.toggles ^= CHAT_ATTACKLOGS
 	prefs.save_preferences(src)
-	if (prefs.toggles & CHAT_ATTACKLOGS)
+	if(prefs.toggles & CHAT_ATTACKLOGS)
 		to_chat(usr, "You now will get attack log messages")
 	else
 		to_chat(usr, "You now won't get attack log messages")
@@ -903,7 +903,7 @@ var/list/admin_verbs_snpc = list(
 
 	prefs.toggles ^= CHAT_DEBUGLOGS
 	prefs.save_preferences(src)
-	if (prefs.toggles & CHAT_DEBUGLOGS)
+	if(prefs.toggles & CHAT_DEBUGLOGS)
 		to_chat(usr, "You now will get debug log messages")
 	else
 		to_chat(usr, "You now won't get debug log messages")
@@ -933,7 +933,7 @@ var/list/admin_verbs_snpc = list(
 	var/confirm = alert("Are you sure you want to send the global message?", "Confirm Man Up Global", "Yes", "No")
 
 	if(confirm == "Yes")
-		for (var/mob/T as mob in mob_list)
+		for(var/mob/T as mob in mob_list)
 			to_chat(T, "<br><center><span class='notice'><b><font size=4>Man up.<br> Deal with it.</font></b><br>Move on.</span></center><br>")
 			T << 'sound/voice/ManUp1.ogg'
 
diff --git a/code/modules/admin/banappearance.dm b/code/modules/admin/banappearance.dm
index 7244e1152af..b039f6bd634 100644
--- a/code/modules/admin/banappearance.dm
+++ b/code/modules/admin/banappearance.dm
@@ -4,12 +4,12 @@ var/appearanceban_runonce	//Updates legacy bans with new info
 var/appearance_keylist[0]	//to store the keys
 
 /proc/appearance_fullban(mob/M, reason)
-	if (!M || !M.key) return
+	if(!M || !M.key) return
 	appearance_keylist.Add(text("[M.ckey] ## [reason]"))
 	appearance_savebanfile()
 
 /proc/appearance_client_fullban(ckey)
-	if (!ckey) return
+	if(!ckey) return
 	appearance_keylist.Add(text("[ckey]"))
 	appearance_savebanfile()
 
@@ -47,7 +47,7 @@ DEBUG
 		log_admin("Loading appearance_rank")
 		S["runonce"] >> appearanceban_runonce
 
-		if (!length(appearance_keylist))
+		if(!length(appearance_keylist))
 			appearance_keylist=list()
 			log_admin("appearance_keylist was empty")
 	else
@@ -86,7 +86,7 @@ DEBUG
 
 
 /proc/appearance_remove(X)
-	for (var/i = 1; i <= length(appearance_keylist); i++)
+	for(var/i = 1; i <= length(appearance_keylist); i++)
 		if( findtext(appearance_keylist[i], "[X]") )
 			appearance_keylist.Remove(appearance_keylist[i])
 			appearance_savebanfile()
diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm
index 34365264674..1f385093683 100644
--- a/code/modules/admin/banjob.dm
+++ b/code/modules/admin/banjob.dm
@@ -1,38 +1,48 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
 
 var/jobban_runonce			// Updates legacy bans with new info
-var/jobban_keylist[0]		//to store the keys & ranks
+var/jobban_keylist[0]		// Linear list of jobban strings, kept around for the legacy system
+var/jobban_assoclist[0] // Associative list, for efficiency
+
+// Matches string-based jobbans into ckey, rank, and reason groups
+var/regex/jobban_regex = regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## (.+))?")
+
+/proc/jobban_assoc_insert(ckey, rank, reason)
+	if(!ckey || !rank)
+		return
+	if(!jobban_assoclist[ckey])
+		jobban_assoclist[ckey] = list()
+	jobban_assoclist[ckey][rank] = reason || "Reason Unspecified"
 
 /proc/jobban_fullban(mob/M, rank, reason)
-	if (!M || !M.key) return
+	if(!M || !M.key)
+		return
 	jobban_keylist.Add(text("[M.ckey] - [rank] ## [reason]"))
-	jobban_savebanfile()
+	jobban_assoc_insert(M.ckey, rank, reason)
+	if(config.ban_legacy_system)
+		jobban_savebanfile()
 
 /proc/jobban_client_fullban(ckey, rank)
-	if (!ckey || !rank) return
+	if(!ckey || !rank)
+		return
 	jobban_keylist.Add(text("[ckey] - [rank]"))
-	jobban_savebanfile()
+	jobban_assoc_insert(ckey, rank)
+	if(config.ban_legacy_system)
+		jobban_savebanfile()
 
 //returns a reason if M is banned from rank, returns 0 otherwise
 /proc/jobban_isbanned(mob/M, rank)
-	if(M && rank)
+	if(!M || !rank)
+		return 0
 
-		//if(_jobban_isbanned(M, rank)) return "Reason Unspecified"	//for old jobban
-		if (guest_jobbans(rank))
-			if(config.guest_jobban && IsGuestKey(M.key))
-				return "Guest Job-ban"
-//			if(config.usewhitelist && !check_whitelist(M))
-//				return "Karma Job"
+	if(config.guest_jobban && guest_jobbans(rank))
+		if(IsGuestKey(M.key))
+			return "Guest Job-ban"
 
-		for (var/s in jobban_keylist)
-			if( findtext(s,"[M.ckey] - [rank]") == 1 )
-				var/startpos = findtext(s, "## ")+3
-				if(startpos && startpos<length(s))
-					var/text = copytext(s, startpos, 0)
-					if(text)
-						return text
-				return "Reason Unspecified"
-	return 0
+	if(jobban_assoclist[M.ckey])
+		return jobban_assoclist[M.ckey][rank]
+	else
+		return 0
 
 /*
 DEBUG
@@ -59,9 +69,15 @@ DEBUG
 		log_admin("Loading jobban_rank")
 		S["runonce"] >> jobban_runonce
 
-		if (!length(jobban_keylist))
+		if(!length(jobban_keylist))
 			jobban_keylist=list()
 			log_admin("jobban_keylist was empty")
+
+		for(var/s in jobban_keylist)
+			if(jobban_regex.Find(s))
+				jobban_assoc_insert(jobban_regex.group[1], jobban_regex.group[2], jobban_regex.group[3])
+			else
+				log_debug("Skipping malformed job ban: [s]")
 	else
 		if(!establish_db_connection())
 			log_to_dd("Database connection failed. Reverting to the legacy ban system.")
@@ -71,42 +87,56 @@ DEBUG
 			return
 
 		//Job permabans
-		var/DBQuery/query = dbcon.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_PERMABAN' AND isnull(unbanned)")
-		query.Execute()
+		var/DBQuery/permabans = dbcon.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_PERMABAN' AND isnull(unbanned)")
+		permabans.Execute()
+		// Job tempbans
+		var/DBQuery/tempbans = dbcon.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_TEMPBAN' AND isnull(unbanned) AND expiration_time > Now()")
+		tempbans.Execute()
 
-		while(query.NextRow())
-			var/ckey = query.item[1]
-			var/job = query.item[2]
-
-			jobban_keylist.Add("[ckey] - [job]")
-
-		//Job tempbans
-		var/DBQuery/query1 = dbcon.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_TEMPBAN' AND isnull(unbanned) AND expiration_time > Now()")
-		query1.Execute()
-
-		while(query1.NextRow())
-			var/ckey = query1.item[1]
-			var/job = query1.item[2]
+		while(TRUE)
+			var/ckey
+			var/job
+			if(permabans.NextRow())
+				ckey = permabans.item[1]
+				job = permabans.item[2]
+			else if(tempbans.NextRow())
+				ckey = tempbans.item[1]
+				job = tempbans.item[2]
+			else
+				break
 
 			jobban_keylist.Add("[ckey] - [job]")
+			jobban_assoc_insert(ckey, job)
 
 /proc/jobban_savebanfile()
 	var/savefile/S=new("data/job_full.ban")
-	to_chat(S["keys[0]"], jobban_keylist)
+	S["keys[0]"] << jobban_keylist
 
 /proc/jobban_unban(mob/M, rank)
 	jobban_remove("[M.ckey] - [rank]")
-	jobban_savebanfile()
 
+/proc/jobban_unban_client(ckey, rank)
+	jobban_remove("[ckey] - [rank]")
 
 /proc/ban_unban_log_save(var/formatted_log)
 	text2file(formatted_log,"data/ban_unban_log.txt")
 
 
 /proc/jobban_remove(X)
-	for (var/i = 1; i <= length(jobban_keylist); i++)
+	for(var/i = 1; i <= length(jobban_keylist); i++)
 		if( findtext(jobban_keylist[i], "[X]") )
+			// This need to be here, instead of jobban_unban, due to direct calls to jobban_remove
+			if(jobban_regex.Find(X))
+				var/ckey = jobban_regex.group[1]
+				var/rank = jobban_regex.group[2]
+				if(jobban_assoclist[ckey] && jobban_assoclist[ckey][rank])
+					jobban_assoclist[ckey] -= rank
+				else
+					log_debug("Attempted to remove non-existent job ban: [X]")
+			else
+				log_debug("Failed to remove malformed job ban from associative list: [X]")
 			jobban_keylist.Remove(jobban_keylist[i])
-			jobban_savebanfile()
+			if(config.ban_legacy_system)
+				jobban_savebanfile()
 			return 1
 	return 0
diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index 4a892d893da..af3853c1d05 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -1,6 +1,6 @@
 /var/create_mob_html = null
 /datum/admins/proc/create_mob(var/mob/user)
-	if (!create_mob_html)
+	if(!create_mob_html)
 		var/mobjs = null
 		mobjs = jointext(typesof(/mob), ";")
 		create_mob_html = file2text('html/create_object.html')
diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index c5cb9f42152..bec74191121 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -2,7 +2,7 @@ var/create_object_html = null
 var/list/create_object_forms = list(/obj, /obj/structure, /obj/machinery, /obj/effect, /obj/item, /obj/mecha, /obj/item/weapon, /obj/item/clothing, /obj/item/stack, /obj/item/device, /obj/item/weapon/reagent_containers, /obj/item/weapon/gun)
 
 /datum/admins/proc/create_object(var/mob/user)
-	if (!create_object_html)
+	if(!create_object_html)
 		var/objectjs = null
 		objectjs = jointext(typesof(/obj), ";")
 		create_object_html = file2text('html/create_object.html')
@@ -14,7 +14,7 @@ var/list/create_object_forms = list(/obj, /obj/structure, /obj/machinery, /obj/e
 	var/path = input("Select the path of the object you wish to create.", "Path", /obj) in create_object_forms
 	var/html_form = create_object_forms[path]
 
-	if (!html_form)
+	if(!html_form)
 		var/objectjs = jointext(typesof(path), ";")
 		html_form = file2text('html/create_object.html')
 		html_form = replacetext(html_form, "null /* object types */", "\"[objectjs]\"")
diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm
index fdaa103b5d5..5edffa65cbf 100644
--- a/code/modules/admin/create_turf.dm
+++ b/code/modules/admin/create_turf.dm
@@ -1,6 +1,6 @@
 /var/create_turf_html = null
 /datum/admins/proc/create_turf(var/mob/user)
-	if (!create_turf_html)
+	if(!create_turf_html)
 		var/turfjs = null
 		turfjs = jointext(typesof(/turf), ";")
 		create_turf_html = file2text('html/create_object.html')
diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm
deleted file mode 100644
index 71d61567962..00000000000
--- a/code/modules/admin/newbanjob.dm
+++ /dev/null
@@ -1,274 +0,0 @@
-var/savefile/Banlistjob
-
-
-/proc/_jobban_isbanned(var/client/clientvar, var/rank)
-	if(!clientvar) return 1
-	ClearTempbansjob()
-	var/id = clientvar.computer_id
-	var/key = clientvar.ckey
-	if (guest_jobbans(rank))
-		if(config.guest_jobban && IsGuestKey(key))
-			return 1
-	Banlistjob.cd = "/base"
-	if (Banlistjob.dir.Find("[key][id][rank]"))
-		return 1
-
-	Banlistjob.cd = "/base"
-	for (var/A in Banlistjob.dir)
-		Banlistjob.cd = "/base/[A]"
-		if ((id == Banlistjob["id"] || key == Banlistjob["key"]) && rank == Banlistjob["rank"])
-			return 1
-	return 0
-
-/proc/LoadBansjob()
-
-	Banlistjob = new("data/job_fullnew.bdb")
-	log_admin("Loading Banlistjob")
-
-	if (!length(Banlistjob.dir)) log_admin("Banlistjob is empty.")
-
-	if (!Banlistjob.dir.Find("base"))
-		log_admin("Banlistjob missing base dir.")
-		Banlistjob.dir.Add("base")
-		Banlistjob.cd = "/base"
-	else if (Banlistjob.dir.Find("base"))
-		Banlistjob.cd = "/base"
-
-	ClearTempbansjob()
-	return 1
-
-/proc/ClearTempbansjob()
-	UpdateTime()
-
-	Banlistjob.cd = "/base"
-	for (var/A in Banlistjob.dir)
-		Banlistjob.cd = "/base/[A]"
-		//if (!Banlistjob["key"] || !Banlistjob["id"])
-		//	RemoveBanjob(A, "full")
-		//	log_admin("Invalid Ban.")
-		//	message_admins("Invalid Ban.")
-		//	continue
-
-		if (!Banlistjob["temp"]) continue
-		if (CMinutes >= Banlistjob["minutes"]) RemoveBanjob(A)
-
-	return 1
-
-
-/proc/AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, rank)
-	UpdateTime()
-	var/bantimestamp
-	if (temp)
-		UpdateTime()
-		bantimestamp = CMinutes + minutes
-	if(rank == "Heads")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Personnel")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Captain")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer")
-		return 1
-	if(rank == "Security")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Warden")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Detective")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Security Officer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg")
-		return 1
-	if(rank == "Engineering")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Engineer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Life Support Specialist")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg")
-		return 1
-	if(rank == "Research")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Scientist")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")
-		return 1
-	if(rank == "Medical")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Medical Doctor")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chemist")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg")
-		return 1
-	if(rank == "CE_Station_Engineer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Engineer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer")
-		return 1
-	if(rank == "CE_Atmospheric_Tech")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Life Support Specialist")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer")
-		return 1
-	if(rank == "CE_Shaft_Miner")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Shaft Miner")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer")
-		return 1
-	if(rank == "Chemist_RD_CMO")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chemist")
-		return 1
-	if(rank == "Geneticist_RD_CMO")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist")
-		return 1
-	if(rank == "MD_CMO")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Medical Doctor")
-		return 1
-	if(rank == "Scientist_RD")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Scientist")
-		return 1
-	if(rank == "AI_Cyborg")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "AI")
-		return 1
-	if(rank == "Detective_HoS")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Detective")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security")
-		return 1
-	if(rank == "Virologist_RD_CMO")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")
-		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Virologist")
-		return 1
-
-	Banlistjob.cd = "/base"
-	if ( Banlistjob.dir.Find("[ckey][computerid][rank]") )
-		to_chat(usr, text("\red Banjob already exists."))
-		return 0
-	else
-		Banlistjob.dir.Add("[ckey][computerid][rank]")
-		Banlistjob.cd = "/base/[ckey][computerid][rank]"
-		to_chat(Banlistjob["key"], ckey)
-		to_chat(Banlistjob["id"], computerid)
-		to_chat(Banlistjob["rank"], rank)
-		to_chat(Banlistjob["reason"], reason)
-		to_chat(Banlistjob["bannedby"], bannedby)
-		to_chat(Banlistjob["temp"], temp)
-		if (temp)
-			to_chat(Banlistjob["minutes"], bantimestamp)
-
-	return 1
-
-/proc/RemoveBanjob(foldername)
-	var/key
-	var/id
-	var/rank
-	Banlistjob.cd = "/base/[foldername]"
-	Banlistjob["key"] >> key
-	Banlistjob["id"] >> id
-	Banlistjob["rank"] >> rank
-	Banlistjob.cd = "/base"
-
-	if (!Banlistjob.dir.Remove(foldername)) return 0
-
-	if(!usr)
-		log_admin("Banjob Expired: [key]")
-		message_admins("Banjob Expired: [key]")
-	else
-		log_admin("[key_name_admin(usr)] unjobbanned [key] from [rank]")
-		message_admins("[key_name_admin(usr)] unjobbanned:[key] from [rank]")
-		ban_unban_log_save("[key_name_admin(usr)] unjobbanned [key] from [rank]")
-		feedback_inc("ban_job_unban",1)
-		feedback_add_details("ban_job_unban","- [rank]")
-
-	for (var/A in Banlistjob.dir)
-		Banlistjob.cd = "/base/[A]"
-		if ((key == Banlistjob["key"] || id == Banlistjob["id"]) && (rank == Banlistjob["rank"]))
-			Banlistjob.cd = "/base"
-			Banlistjob.dir.Remove(A)
-			continue
-
-	return 1
-
-/proc/GetBanExpjob(minutes as num)
-	UpdateTime()
-	var/exp = minutes - CMinutes
-	if (exp <= 0)
-		return 0
-	else
-		var/timeleftstring
-		if (exp >= 1440) //1440 = 1 day in minutes
-			timeleftstring = "[round(exp / 1440, 0.1)] Days"
-		else if (exp >= 60) //60 = 1 hour in minutes
-			timeleftstring = "[round(exp / 60, 0.1)] Hours"
-		else
-			timeleftstring = "[exp] Minutes"
-		return timeleftstring
-
-/datum/admins/proc/unjobbanpanel()
-	var/count = 0
-	var/dat
-	//var/dat = "<HR><B>Unban Player:</B> \blue(U) = Unban , (E) = Edit Ban\green (Total<HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >"
-	Banlistjob.cd = "/base"
-	for (var/A in Banlistjob.dir)
-		count++
-		Banlistjob.cd = "/base/[A]"
-		dat += text("<tr><td><A href='?src=\ref[src];unjobbanf=[Banlistjob["key"]][Banlistjob["id"]][Banlistjob["rank"]]'>(U)</A> Key: <B>[Banlistjob["key"]] </B>Rank: <B>[Banlistjob["rank"]]</B></td><td> ([Banlistjob["temp"] ? "[GetBanExpjob(Banlistjob["minutes"]) ? GetBanExpjob(Banlistjob["minutes"]) : "Removal pending" ]" : "Permaban"])</td><td>(By: [Banlistjob["bannedby"]])</td><td>(Reason: [Banlistjob["reason"]])</td></tr>")
-
-	dat += "</table>"
-	dat = "<HR><B>Bans:</B> <FONT COLOR=blue>(U) = Unban , </FONT> - <FONT COLOR=green>([count] Bans)</FONT><HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >[dat]"
-	usr << browse(dat, "window=unbanp;size=875x400")
-
-/*/datum/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
-	if(AddBanjob(ckey, computerid, reason, usr.ckey, 0, 0, job))
-		to_chat(M, "\red<BIG><B>You have been banned from [job] by [usr.client.ckey].\nReason: [reason].</B></BIG>")
-		to_chat(M, "\red This is a permanent ban.")
-		if(config.banappeals)
-			to_chat(M, "\red To try to resolve this matter head to [config.banappeals]")
-		else
-			to_chat(M, "\red No ban appeals URL has been set.")
-		log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.")
-		message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.")
-/datum/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
-	if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job))
-		to_chat(M, "\red<BIG><B>You have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason].</B></BIG>")
-		to_chat(M, "\red This is a temporary ban, it will be removed in [mins] minutes.")
-		if(config.banappeals)
-			to_chat(M, "\red To try to resolve this matter head to [config.banappeals]")
-		else
-			to_chat(M, "\red No ban appeals URL has been set.")
-		log_admin("[usr.client.ckey] has jobbanned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
-		message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")*/
-//////////////////////////////////// DEBUG ////////////////////////////////////
-
-/proc/CreateBansjob()
-
-	UpdateTime()
-
-	var/i
-	var/last
-
-	for(i=0, i<1001, i++)
-		var/a = pick(1,0)
-		var/b = pick(1,0)
-		if(b)
-			Banlistjob.cd = "/base"
-			Banlistjob.dir.Add("trash[i]trashid[i]")
-			Banlistjob.cd = "/base/trash[i]trashid[i]"
-			to_chat(Banlistjob["key"], "trash[i]")
-		else
-			Banlistjob.cd = "/base"
-			Banlistjob.dir.Add("[last]trashid[i]")
-			Banlistjob.cd = "/base/[last]trashid[i]"
-			to_chat(Banlistjob["key"], last)
-		to_chat(Banlistjob["id"], "trashid[i]")
-		to_chat(Banlistjob["reason"], "Trashban[i].")
-		to_chat(Banlistjob["temp"], a)
-		to_chat(Banlistjob["minutes"], CMinutes + rand(1,2000))
-		to_chat(Banlistjob["bannedby"], "trashmin")
-		last = "trash[i]"
-
-	Banlistjob.cd = "/base"
-
-/proc/ClearAllBansjob()
-	Banlistjob.cd = "/base"
-	for (var/A in Banlistjob.dir)
-		RemoveBanjob(A, "full")
diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm
index d91f04aa4df..b840cad783d 100644
--- a/code/modules/admin/permissionverbs/permissionedit.dm
+++ b/code/modules/admin/permissionverbs/permissionedit.dm
@@ -156,7 +156,7 @@
 		
 /datum/admins/proc/updateranktodb(ckey,newrank)
 	establish_db_connection()
-	if (!dbcon.IsConnected())
+	if(!dbcon.IsConnected())
 		return
 	var/sql_ckey = sanitizeSQL(ckey)
 	var/sql_admin_rank = sanitizeSQL(newrank)
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 3802c7c7432..09e17479927 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -1,6 +1,6 @@
 
 /datum/admins/proc/player_panel_new()//The new one
-	if (!usr.client.holder)
+	if(!usr.client.holder)
 		return
 	var/dat = "<html><head><title>Admin Player Panel</title></head>"
 
@@ -29,7 +29,7 @@
 
 						var maintable_data = document.getElementById('maintable_data');
 						var ltr = maintable_data.getElementsByTagName("tr");
-						for ( var i = 0; i < ltr.length; ++i )
+						for( var i = 0; i < ltr.length; ++i )
 						{
 							try{
 								var tr = ltr\[i\];
@@ -42,7 +42,7 @@
 								var search = lsearch\[0\];
 								//var inner_span = li.getElementsByTagName("span")\[1\] //Should only ever contain one element.
 								//document.write("<p>"+search.innerText+"<br>"+filter+"<br>"+search.innerText.indexOf(filter))
-								if ( search.innerText.toLowerCase().indexOf(filter) == -1 )
+								if( search.innerText.toLowerCase().indexOf(filter) == -1 )
 								{
 									//document.write("a");
 									//ltr.removeChild(tr);
@@ -332,7 +332,7 @@
 
 //The old one
 /datum/admins/proc/player_panel_old()
-	if (!usr.client.holder)
+	if(!usr.client.holder)
 		return
 	var/dat = "<html><head><title>Player Menu</title></head>"
 	dat += "<body><table border=1 cellspacing=5><B><tr><th>Name</th><th>Real Name</th><th>Assigned Job</th><th>Key</th><th>Options</th><th>PM</th><th>Traitor?</th></tr></B>"
@@ -406,10 +406,10 @@
 
 /datum/admins/proc/check_antagonists()
 	if(!check_rights(R_ADMIN))	return
-	if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
+	if(ticker && ticker.current_state >= GAME_STATE_PLAYING)
 		var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
 		dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"
-		dat += "Round Duration: <B>[round(world.time / 36000)]:[add_zero(num2text(world.time / 600 % 60), 2)]:[add_zero(num2text(world.time / 10 % 60), 2)]</B><BR>"
+		dat += "Round Duration: <B>[round(ROUND_TIME / 36000)]:[add_zero(num2text(ROUND_TIME / 600 % 60), 2)]:[add_zero(num2text(ROUND_TIME / 10 % 60), 2)]</B><BR>"
 		dat += "<B>Emergency shuttle</B><BR>"
 		if(shuttle_master.emergency.mode < SHUTTLE_CALL)
 			dat += "<a href='?src=\ref[src];call_shuttle=1'>Call Shuttle</a><br>"
@@ -547,12 +547,12 @@
 	return txt
 
 /datum/admins/proc/check_role_table_row(mob/M, show_objectives)
-	if (!istype(M))
+	if(!istype(M))
 		return "<tr><td><i>Not found!</i></td></tr>"
 
 	var/txt = check_antagonists_line(M, close = 0)
 
-	if (show_objectives)
+	if(show_objectives)
 		txt += {"
 			<td>
 				<a href='?src=\ref[src];traitor=\ref[M]'>Show Objective</a>
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 99595d9a02c..30817dd94d5 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -14,7 +14,7 @@
 	dat += "</center>"
 	dat += "<HR>"
 	switch(current_tab)
-		if (0) // Debug
+		if(0) // Debug
 			if(check_rights(R_ADMIN,0))
 				dat += {"
 						<center><B><h2>Admin Secrets</h2></B>
@@ -67,7 +67,7 @@
 					</center>
 					"}
 
-		if (1)
+		if(1)
 			if(check_rights((R_EVENT|R_SERVER),0))
 				dat += {"
 					<center>
@@ -86,7 +86,7 @@
 					<BR>
 					</center>"}
 
-		if (2)
+		if(2)
 			if(check_rights((R_SERVER|R_EVENT),0))
 				dat += {"
 					<center>
diff --git a/code/modules/admin/sql_notes.dm b/code/modules/admin/sql_notes.dm
index df02b6f0c9c..338993af58c 100644
--- a/code/modules/admin/sql_notes.dm
+++ b/code/modules/admin/sql_notes.dm
@@ -33,7 +33,7 @@
 			return
 	var/admin_sql_ckey = sanitizeSQL(adminckey)
 	if(!server)
-		if (config && config.server_name)
+		if(config && config.server_name)
 			server = config.server_name
 	server = sanitizeSQL(server)
 	var/DBQuery/query_noteadd = dbcon.NewQuery("INSERT INTO [format_table_name("notes")] (ckey, timestamp, notetext, adminckey, server) VALUES ('[target_sql_ckey]', '[timestamp]', '[notetext]', '[admin_sql_ckey]', '[server]')")
diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm
index a772edc2608..bddebcff602 100644
--- a/code/modules/admin/stickyban.dm
+++ b/code/modules/admin/stickyban.dm
@@ -2,32 +2,32 @@
 	if(!check_rights(R_BAN))
 		return
 
-	switch (action)
-		if ("show")
+	switch(action)
+		if("show")
 			stickyban_show()
 			return
-		if ("add")
+		if("add")
 			var/list/ban = list()
 			var/ckey
 			ban["admin"] = usr.key
 			ban["type"] = list("sticky")
 			ban["reason"] = "(InGameBan)([usr.key])" //this will be displayed in dd only
 
-			if (data["ckey"])
+			if(data["ckey"])
 				ckey = ckey(data["ckey"])
 			else
 				ckey = input(usr,"Ckey","Ckey","") as text|null
-				if (!ckey)
+				if(!ckey)
 					return
 				ckey = ckey(ckey)
-			if (get_stickyban_from_ckey(ckey))
+			if(get_stickyban_from_ckey(ckey))
 				to_chat(usr, "<span class='adminnotice'>Error: Can not add a stickyban: User already has a current sticky ban</span>")
 
-			if (data["reason"])
+			if(data["reason"])
 				ban["message"] = data["reason"]
 			else
 				var/reason = input(usr,"Reason","Reason","Ban Evasion") as text|null
-				if (!reason)
+				if(!reason)
 					return
 				ban["message"] = "[reason]"
 
@@ -36,18 +36,18 @@
 			log_admin("[key_name(usr)] has stickybanned [ckey].\nReason: [ban["message"]]")
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has stickybanned [ckey].\nReason: [ban["message"]]</span>")
 
-		if ("remove")
-			if (!data["ckey"])
+		if("remove")
+			if(!data["ckey"])
 				return
 			var/ckey = data["ckey"]
 
 			var/ban = get_stickyban_from_ckey(ckey)
-			if (!ban)
+			if(!ban)
 				to_chat(usr, "<span class='adminnotice'>Error: No sticky ban for [ckey] found!</span>")
 				return
-			if (alert("Are you sure you want to remove the sticky ban on [ckey]?","Are you sure","Yes","No") == "No")
+			if(alert("Are you sure you want to remove the sticky ban on [ckey]?","Are you sure","Yes","No") == "No")
 				return
-			if (!get_stickyban_from_ckey(ckey))
+			if(!get_stickyban_from_ckey(ckey))
 				to_chat(usr, "<span class='adminnotice'>Error: The ban disappeared.</span>")
 				return
 			world.SetConfig("ban", ckey, null)
@@ -55,46 +55,46 @@
 			log_admin("[key_name(usr)] removed [ckey]'s stickyban")
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] removed [ckey]'s stickyban</span>")
 
-		if ("remove_alt")
-			if (!data["ckey"])
+		if("remove_alt")
+			if(!data["ckey"])
 				return
 			var/ckey = data["ckey"]
-			if (!data["alt"])
+			if(!data["alt"])
 				return
 			var/alt = ckey(data["alt"])
 			var/ban = get_stickyban_from_ckey(ckey)
-			if (!ban)
+			if(!ban)
 				to_chat(usr, "<span class='adminnotice'>Error: No sticky ban for [ckey] found!</span>")
 				return
 
 			var/found = 0
 			//we have to do it this way because byond keeps the case in its sticky ban matches WHY!!!
-			for (var/key in ban["keys"])
-				if (ckey(key) == alt)
+			for(var/key in ban["keys"])
+				if(ckey(key) == alt)
 					found = 1
 					break
 
-			if (!found)
+			if(!found)
 				to_chat(usr, "<span class='adminnotice'>Error: [alt] is not linked to [ckey]'s sticky ban!</span>")
 				return
 
-			if (alert("Are you sure you want to disassociate [alt] from [ckey]'s sticky ban? \nNote: Nothing stops byond from re-linking them","Are you sure","Yes","No") == "No")
+			if(alert("Are you sure you want to disassociate [alt] from [ckey]'s sticky ban? \nNote: Nothing stops byond from re-linking them","Are you sure","Yes","No") == "No")
 				return
 
 			//we have to do this again incase something changes
 			ban = get_stickyban_from_ckey(ckey)
-			if (!ban)
+			if(!ban)
 				to_chat(usr, "<span class='adminnotice'>Error: The ban disappeared.</span>")
 				return
 
 			found = 0
-			for (var/key in ban["keys"])
-				if (ckey(key) == alt)
+			for(var/key in ban["keys"])
+				if(ckey(key) == alt)
 					ban["keys"] -= key
 					found = 1
 					break
 
-			if (!found)
+			if(!found)
 				to_chat(usr, "<span class='adminnotice'>Error: [alt] link to [ckey]'s sticky ban disappeared.</span>")
 				return
 
@@ -103,21 +103,21 @@
 			log_admin("[key_name(usr)] has disassociated [alt] from [ckey]'s sticky ban")
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has disassociated [alt] from [ckey]'s sticky ban</span>")
 
-		if ("edit")
-			if (!data["ckey"])
+		if("edit")
+			if(!data["ckey"])
 				return
 			var/ckey = data["ckey"]
 			var/ban = get_stickyban_from_ckey(ckey)
-			if (!ban)
+			if(!ban)
 				to_chat(usr, "<span class='adminnotice'>Error: No sticky ban for [ckey] found!")
 				return
 			var/oldreason = ban["message"]
 			var/reason = input(usr,"Reason","Reason","[ban["message"]]") as text|null
-			if (!reason || reason == oldreason)
+			if(!reason || reason == oldreason)
 				return
 			//we have to do this again incase something changed while we waited for input
 			ban = get_stickyban_from_ckey(ckey)
-			if (!ban)
+			if(!ban)
 				to_chat(usr, "<span class='adminnotice'>Error: The ban disappeared.</span>")
 				return
 			ban["message"] = "[reason]"
@@ -133,13 +133,13 @@
 /datum/admins/proc/stickyban_gethtml(ckey, ban)
 	. = "<a href='?_src_=holder;stickyban=remove&ckey=[ckey]'>\[-\]</a><b>[ckey]</b><br />"
 	. += "[ban["message"]] <b><a href='?_src_=holder;stickyban=edit&ckey=[ckey]'>\[Edit\]</a></b><br />"
-	if (ban["admin"])
+	if(ban["admin"])
 		. += "[ban["admin"]]<br />"
 	else
 		. += "LEGACY<br />"
 	. += "Caught keys<br />\n<ol>"
-	for (var/key in ban["keys"])
-		if (ckey(key) == ckey)
+	for(var/key in ban["keys"])
+		if(ckey(key) == ckey)
 			continue
 		. += "<li><a href='?_src_=holder;stickyban=remove_alt&ckey=[ckey]&alt=[ckey(key)]'>\[-\]</a>[key]</li>"
 	. += "</ol>\n"
@@ -168,17 +168,17 @@
 	usr << browse(html,"window=stickybans;size=700x400")
 
 /proc/get_stickyban_from_ckey(var/ckey)
-	if (!ckey)
+	if(!ckey)
 		return null
 	ckey = ckey(ckey)
 	. = null
-	for (var/key in world.GetConfig("ban"))
-		if (ckey(key) == ckey)
+	for(var/key in world.GetConfig("ban"))
+		if(ckey(key) == ckey)
 			. = stickyban2list(world.GetConfig("ban",key))
 			break
 
 /proc/stickyban2list(var/ban)
-	if (!ban)
+	if(!ban)
 		return null
 	. = params2list(ban)
 	.["keys"] = splittext(.["keys"], ",")
@@ -187,16 +187,16 @@
 	.["computer_id"] = splittext(.["computer_id"], ",")
 
 /proc/list2stickyban(var/list/ban)
-	if (!ban || !islist(ban))
+	if(!ban || !islist(ban))
 		return null
 	. = ban.Copy()
-	if (.["keys"])
+	if(.["keys"])
 		.["keys"] = jointext(.["keys"], ",")
-	if (.["type"])
+	if(.["type"])
 		.["type"] = jointext(.["type"], ",")
-	if (.["IP"])
+	if(.["IP"])
 		.["IP"] = jointext(.["IP"], ",")
-	if (.["computer_id"])
+	if(.["computer_id"])
 		.["computer_id"] = jointext(.["computer_id"], ",")
 	. = list2params(.)
 
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 464d8b3a13d..635a3e6e5d4 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -877,7 +877,7 @@
 
 	else if(href_list["boot2"])
 		var/mob/M = locate(href_list["boot2"])
-		if (ismob(M))
+		if(ismob(M))
 			if(!check_if_greater_rights_than(M.client))
 				return
 			to_chat(M, "\red You have been kicked from the server")
@@ -1094,7 +1094,7 @@
 	else if(href_list["c_mode2"])
 		if(!check_rights(R_ADMIN|R_SERVER))	return
 
-		if (ticker && ticker.mode)
+		if(ticker && ticker.mode)
 			return alert(usr, "The game has already started.", null, null, null, null)
 		master_mode = href_list["c_mode2"]
 		log_admin("[key_name(usr)] set the mode as [master_mode].")
@@ -1124,7 +1124,7 @@
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
-		if(alert(usr, "Confirm make monkey?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make monkey?",, "Yes", "No") != "Yes")
 			return
 
 		log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]")
@@ -1140,7 +1140,7 @@
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
 
-		if(alert(usr, "Confirm make corgi?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make corgi?",, "Yes", "No") != "Yes")
 			return
 
 		log_admin("[key_name(usr)] attempting to corgize [key_name(H)]")
@@ -1154,7 +1154,7 @@
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
-		if(alert(usr, "Confirm make pai?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make pai?",, "Yes", "No") != "Yes")
 			return
 
 		var/painame = "Default"
@@ -1414,7 +1414,7 @@
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
 
-		if(alert(usr, "Confirm make ai?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make ai?",, "Yes", "No") != "Yes")
 			return
 
 		message_admins("\red Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!", 1)
@@ -1425,7 +1425,7 @@
 	else if(href_list["makemask"])
 		if(!check_rights(R_SPAWN))	return
 
-		if(alert(usr, "Confirm make mask?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make mask?",, "Yes", "No") != "Yes")
 			return
 
 		var/mob/currentMob = locate(href_list["makemask"])
@@ -1441,7 +1441,7 @@
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
-		if(alert(usr, "Confirm make alien?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make alien?",, "Yes", "No") != "Yes")
 			return
 
 		usr.client.cmd_admin_alienize(H)
@@ -1453,7 +1453,7 @@
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
-		if(alert(usr, "Confirm make slime?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make slime?",, "Yes", "No") != "Yes")
 			return
 
 		usr.client.cmd_admin_slimeize(H)
@@ -1466,7 +1466,7 @@
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
 
-		if(alert(usr, "Confirm make superhero?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make superhero?",, "Yes", "No") != "Yes")
 			return
 
 		usr.client.cmd_admin_super(H)
@@ -1478,7 +1478,7 @@
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
-		if(alert(usr, "Confirm make robot?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make robot?",, "Yes", "No") != "Yes")
 			return
 
 		usr.client.cmd_admin_robotize(H)
@@ -1490,7 +1490,7 @@
 		if(istype(M, /mob/new_player))
 			to_chat(usr, "This cannot be used on instances of type /mob/new_player")
 			return
-		if(alert(usr, "Confirm make animal?", "Yes", "No") != "Yes")
+		if(alert(usr, "Confirm make animal?",, "Yes", "No") != "Yes")
 			return
 
 		usr.client.cmd_admin_animalize(M)
@@ -1592,10 +1592,10 @@
 		if(isliving(M))
 			var/mob/living/L = M
 			var/status
-			switch (M.stat)
-				if (0) status = "Alive"
-				if (1) status = "<font color='orange'><b>Unconscious</b></font>"
-				if (2) status = "<font color='red'><b>Dead</b></font>"
+			switch(M.stat)
+				if(0) status = "Alive"
+				if(1) status = "<font color='orange'><b>Unconscious</b></font>"
+				if(2) status = "<font color='red'><b>Dead</b></font>"
 			health_description = "Status = [status]"
 			health_description += "<BR>Oxy: [L.getOxyLoss()] - Tox: [L.getToxLoss()] - Fire: [L.getFireLoss()] - Brute: [L.getBruteLoss()] - Clone: [L.getCloneLoss()] - Brain: [L.getBrainLoss()]"
 		else
@@ -1707,7 +1707,7 @@
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
-		var/etypes = list("borging","corgifying","firedeath","braindeath","honktumor","demotion")
+		var/etypes = list("Borgification","Corgification","Death By Fire","Total Brain Death","Honk Tumor","Demotion Notice")
 		var/eviltype = input(src.owner, "Which type of evil fax do you wish to send [H]?","Its good to be baaaad...", "") as null|anything in etypes
 		if(!(eviltype in etypes))
 			return
@@ -1718,7 +1718,7 @@
 		var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["originfax"])
 
 		P.name = "Central Command - [customname]"
-		P.info = "<b>A reminder: per the terms of your contract, stupid faxes will get you demoted, or worse.</b>"
+		P.info = "<b>You <i>really</i> should've known better.</b>"
 		P.myeffect = eviltype
 		P.mytarget = H
 		if(alert("Do you want the Evil Fax to activate automatically if [H] tries to ignore it?",,"Yes", "No") == "Yes")
@@ -1758,19 +1758,23 @@
 		var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(null)
 		var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["originfax"])
 		P.name = "Central Command - paper"
-		var/stypes = list("handle it yourself","illegible","not signed","sorry, not right now","stop wasting our time")
+		var/stypes = list("Handle it yourselves!","Illegible fax","Fax not signed","Not Right Now","You are wasting our time", "Keep up the good work", "ERT Instructions")
 		var/stype = input(src.owner, "Which type of standard reply do you wish to send to [H]?","Choose your paperwork", "") as null|anything in stypes
 		var/tmsg = "<font face='Verdana' color='black'><center><img src = 'ntlogo.png'><BR><BR><BR><font size='4'><B>NanoTrasen Science Station Cyberiad</B></font><BR><BR><BR><font size='4'>NAS Trurl Communications Department Report</font></center><BR><BR>"
-		if(stype == "handle it yourself")
-			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention."
-		else if(stype == "illegible")
-			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Your fax was too poorly written for our system to interpret."
-		else if(stype == "not signed")
-			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Your fax was not properly signed and/or stamped."
-		else if(stype == "sorry, not right now")
-			tmsg += "Greetings, esteemed crewmember. Unfortunately, we are unable to spare the resources to assist you at this time."
-		else if(stype == "stop wasting our time")
-			tmsg += "Stop wasting our time."
+		if(stype == "Handle it yourselves!")
+			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention.<BR><BR><i><small>This is an automatic message.</small>"
+		else if(stype == "Illegible fax")
+			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Your fax's grammar, syntax and/or typography are of a sub-par level and do not allow us to understand the contents of the message.<BR><BR>Please consult your nearest dictionary and/or thesaurus and try again.<BR><BR><i><small>This is an automatic message.</small>"
+		else if(stype == "Fax not signed")
+			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Your fax has not been correctly signed and, as such, we cannot verify your identity.<BR><BR>Please sign your faxes before sending them so that we may verify your identity.<BR><BR><i><small>This is an automatic message.</small>"
+		else if(stype == "Not Right Now")
+			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Due to pressing concerns of a matter above your current paygrade, we are unable to provide assistance in whatever matter your fax referenced.<BR><BR>This can be either due to a power outage, bureaucratic audit, pest infestation, Ascendance Event, corgi outbreak, or any other situation that would affect the proper functioning of the NAS Trurl.<BR><BR>Please try again later.<BR><BR><i><small>This is an automatic message.</small>"
+		else if(stype == "You are wasting our time")
+			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>In the interest of preventing further mismanagement of company resources, please avoid wasting our time with such petty drivel.<BR><BR>Do kindly remember that we expect our workforce to maintain at least a semi-decent level of profesionalism. Do not test our patience.<BR><BR><i><small>This is an automatic message.</i></small>"
+		else if(stype == "Keep up the good work")
+			tmsg += "Greetings, esteemed crewmember. Your fax has been received successfully by NAS Trurl Fax Registration.<BR><BR>We at the NAS Trurl appreciate the good work that you have done here, and sincerely recommend that you continue such a display of dedication to the company.<BR><BR><i><small>This is absolutely not an automated message.</i></small>"
+		else if(stype == "ERT Instructions")
+			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Please utilize the Card Swipers if you wish to call for an ERT.<BR><BR><i><small>This is an automated message.</i></small>"
 		else
 			return
 		tmsg += "</font>"
@@ -1854,7 +1858,7 @@
 
 			var/input = input(src.owner, "Please enter a reason for denying [key_name(H)]'s ERT request.","Outgoing message from CentComm", "")
 			if(!input)	return
-
+			ert_request_answered = 1
 			to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
 			log_admin("[src.owner] denied [key_name(H)]'s ERT request with the message [input].")
 			to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks.  \"Your ERT request has been denied for the following reasons: [input].  Message ends.\"")
@@ -1867,19 +1871,19 @@
 			return
 
 		var/obj/item/fax = locate(href_list["AdminFaxView"])
-		if (istype(fax, /obj/item/weapon/paper))
+		if(istype(fax, /obj/item/weapon/paper))
 			var/obj/item/weapon/paper/P = fax
 			P.show_content(usr,1)
-		else if (istype(fax, /obj/item/weapon/photo))
+		else if(istype(fax, /obj/item/weapon/photo))
 			var/obj/item/weapon/photo/H = fax
 			H.show(usr)
-		else if (istype(fax, /obj/item/weapon/paper_bundle))
+		else if(istype(fax, /obj/item/weapon/paper_bundle))
 			//having multiple people turning pages on a paper_bundle can cause issues
 			//open a browse window listing the contents instead
 			var/data = ""
 			var/obj/item/weapon/paper_bundle/B = fax
 
-			for (var/page = 1, page <= B.amount + 1, page++)
+			for(var/page = 1, page <= B.amount + 1, page++)
 				var/obj/pageobj = B.contents[page]
 				data += "<A href='?src=\ref[src];AdminFaxViewPage=[page];paper_bundle=\ref[B]'>Page [page] - [pageobj.name]</A><BR>"
 
@@ -1887,19 +1891,19 @@
 		else
 			to_chat(usr, "\red The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]")
 
-	else if (href_list["AdminFaxViewPage"])
+	else if(href_list["AdminFaxViewPage"])
 		if(!check_rights(R_ADMIN))
 			return
 
 		var/page = text2num(href_list["AdminFaxViewPage"])
 		var/obj/item/weapon/paper_bundle/bundle = locate(href_list["paper_bundle"])
 
-		if (!bundle) return
+		if(!bundle) return
 
-		if (istype(bundle.contents[page], /obj/item/weapon/paper))
+		if(istype(bundle.contents[page], /obj/item/weapon/paper))
 			var/obj/item/weapon/paper/P = bundle.contents[page]
 			P.show_content(usr, 1)
-		else if (istype(bundle.contents[page], /obj/item/weapon/photo))
+		else if(istype(bundle.contents[page], /obj/item/weapon/photo))
 			var/obj/item/weapon/photo/H = bundle.contents[page]
 			H.show(usr)
 		return
@@ -2124,9 +2128,9 @@
 		var/atom/loc = usr.loc
 
 		var/dirty_paths
-		if (istext(href_list["object_list"]))
+		if(istext(href_list["object_list"]))
 			dirty_paths = list(href_list["object_list"])
-		else if (istype(href_list["object_list"], /list))
+		else if(istype(href_list["object_list"], /list))
 			dirty_paths = href_list["object_list"]
 
 		var/paths = list()
@@ -2160,22 +2164,22 @@
 
 		var/atom/target //Where the object will be spawned
 		var/where = href_list["object_where"]
-		if (!( where in list("onfloor","inhand","inmarked") ))
+		if(!( where in list("onfloor","inhand","inmarked") ))
 			where = "onfloor"
 
 
 		switch(where)
 			if("inhand")
-				if (!iscarbon(usr) && !isrobot(usr))
+				if(!iscarbon(usr) && !isrobot(usr))
 					to_chat(usr, "Can only spawn in hand when you're a carbon mob or cyborg.")
 					where = "onfloor"
 				target = usr
 
 			if("onfloor")
 				switch(href_list["offset_type"])
-					if ("absolute")
+					if("absolute")
 						target = locate(0 + X,0 + Y,0 + Z)
-					if ("relative")
+					if("relative")
 						target = locate(loc.x + X,loc.y + Y,loc.z + Z)
 			if("inmarked")
 				if(!marked_datum)
@@ -2188,8 +2192,8 @@
 					target = marked_datum
 
 		if(target)
-			for (var/path in paths)
-				for (var/i = 0; i < number; i++)
+			for(var/path in paths)
+				for(var/i = 0; i < number; i++)
 					if(path in typesof(/turf))
 						var/turf/O = target
 						var/turf/N = O.ChangeTurf(path)
@@ -2217,7 +2221,7 @@
 										R.activate_module(I)
 										R.module.fix_modules()
 
-		if (number == 1)
+		if(number == 1)
 			log_admin("[key_name(usr)] created a [english_list(paths)]")
 			for(var/path in paths)
 				if(ispath(path, /mob))
@@ -2287,7 +2291,7 @@
 /*					for(var/obj/machinery/vehicle/pod/O in world)
 					for(var/mob/M in src)
 						M.loc = src.loc
-						if (M.client)
+						if(M.client)
 							M.client.perspective = MOB_PERSPECTIVE
 							M.client.eye = M
 					qdel(O)
@@ -2385,9 +2389,9 @@
 								continue
 								//don't strip organs
 							H.unEquip(W)
-							if (H.client)
+							if(H.client)
 								H.client.screen -= W
-							if (W)
+							if(W)
 								W.loc = H.loc
 								W.dropped(H)
 								W.layer = initial(W.layer)
@@ -2439,9 +2443,9 @@
 				feedback_add_details("admin_secrets_fun_used","BC")
 
 				var/newBombCap = input(usr,"What would you like the new bomb cap to be. (entered as the light damage range (the 3rd number in common (1,2,3) notation)) Must be between 4 and 128)", "New Bomb Cap", MAX_EX_LIGHT_RANGE) as num|null
-				if (newBombCap < 4)
+				if(newBombCap < 4)
 					return
-				if (newBombCap > 128)
+				if(newBombCap > 128)
 					newBombCap = 128
 
 				MAX_EX_DEVESTATION_RANGE = round(newBombCap/4)
@@ -2728,7 +2732,7 @@
 
 		if(usr)
 			log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]")
-			if (ok)
+			if(ok)
 				to_chat(world, text("<B>A secret has been activated by []!</B>", usr.key))
 
 	else if(href_list["secretsadmin"])
@@ -2768,7 +2772,7 @@
 			if("showgm")
 				if(!ticker)
 					alert("The game hasn't started yet!")
-				else if (ticker.mode)
+				else if(ticker.mode)
 					alert("The game mode is [ticker.mode.name]")
 				else alert("For some reason there's a ticker, but not a game mode")
 			if("manifest")
@@ -2803,9 +2807,9 @@
 				dat += "</table>"
 				usr << browse(dat, "window=fingerprints;size=440x410")
 			else
-		if (usr)
+		if(usr)
 			log_admin("[key_name(usr)] used secret [href_list["secretsadmin"]]")
-			if (ok)
+			if(ok)
 				to_chat(world, text("<B>A secret has been activated by []!</B>", usr.key))
 
 	else if(href_list["secretscoder"])
@@ -2821,12 +2825,12 @@
 				usr << browse(dat, "window=admin_log")
 			if("maint_access_brig")
 				for(var/obj/machinery/door/airlock/maintenance/M in world)
-					if (access_maint_tunnels in M.req_access)
+					if(access_maint_tunnels in M.req_access)
 						M.req_access = list(access_brig)
 				message_admins("[key_name_admin(usr)] made all maint doors brig access-only.")
 			if("maint_access_engiebrig")
 				for(var/obj/machinery/door/airlock/maintenance/M in world)
-					if (access_maint_tunnels in M.req_access)
+					if(access_maint_tunnels in M.req_access)
 						M.req_access = list()
 						M.req_one_access = list(access_brig,access_engine)
 				message_admins("[key_name_admin(usr)] made all maint doors engineering and brig access-only.")
@@ -2843,7 +2847,7 @@
 
 	else if(href_list["ac_set_channel_name"])
 		src.admincaster_feed_channel.channel_name = strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", ""))
-		while (findtext(src.admincaster_feed_channel.channel_name," ") == 1)
+		while(findtext(src.admincaster_feed_channel.channel_name," ") == 1)
 			src.admincaster_feed_channel.channel_name = copytext(src.admincaster_feed_channel.channel_name,2,lentext(src.admincaster_feed_channel.channel_name)+1)
 		src.access_news_network()
 
@@ -2882,7 +2886,7 @@
 
 	else if(href_list["ac_set_new_message"])
 		src.admincaster_feed_message.body = adminscrub(input(usr, "Write your Feed story", "Network Channel Handler", ""))
-		while (findtext(src.admincaster_feed_message.body," ") == 1)
+		while(findtext(src.admincaster_feed_message.body," ") == 1)
 			src.admincaster_feed_message.body = copytext(src.admincaster_feed_message.body,2,lentext(src.admincaster_feed_message.body)+1)
 		src.access_news_network()
 
@@ -2936,13 +2940,13 @@
 
 	else if(href_list["ac_set_wanted_name"])
 		src.admincaster_feed_message.author = adminscrub(input(usr, "Provide the name of the Wanted person", "Network Security Handler", ""))
-		while (findtext(src.admincaster_feed_message.author," ") == 1)
+		while(findtext(src.admincaster_feed_message.author," ") == 1)
 			src.admincaster_feed_message.author = copytext(admincaster_feed_message.author,2,lentext(admincaster_feed_message.author)+1)
 		src.access_news_network()
 
 	else if(href_list["ac_set_wanted_desc"])
 		src.admincaster_feed_message.body = adminscrub(input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler", ""))
-		while (findtext(src.admincaster_feed_message.body," ") == 1)
+		while(findtext(src.admincaster_feed_message.body," ") == 1)
 			src.admincaster_feed_message.body = copytext(src.admincaster_feed_message.body,2,lentext(src.admincaster_feed_message.body)+1)
 		src.access_news_network()
 
@@ -3025,7 +3029,7 @@
 
 	else if(href_list["ac_setScreen"]) //Brings us to the main menu and resets all fields~
 		src.admincaster_screen = text2num(href_list["ac_setScreen"])
-		if (src.admincaster_screen == 0)
+		if(src.admincaster_screen == 0)
 			if(src.admincaster_feed_channel)
 				src.admincaster_feed_channel = new /datum/feed_channel
 			if(src.admincaster_feed_message)
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index b46e5401528..27048b441dd 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -412,7 +412,7 @@
 		else if(expression[start + 1] == "\[" && islist(v))
 			var/list/L = v
 			var/index = SDQL_expression(source, expression[start + 2])
-			if (isnum(index) && (!IsInteger(index) || L.len < index))
+			if(isnum(index) && (!IsInteger(index) || L.len < index))
 				to_chat(world, "<span class='danger'>Invalid list index: [index]</span>")
 				return null
 			return L[index]
@@ -424,7 +424,7 @@
 	for(var/arg in arguments)
 		new_args[++new_args.len] = SDQL_expression(source, arg)
 
-	if (object == world) // Global proc.
+	if(object == world) // Global proc.
 		procname = "/proc/[procname]"
 		return call(procname)(arglist(new_args))
 
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
index 5aa2aa0dc93..0d0573e3760 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
@@ -358,7 +358,7 @@
 		else if(token(i + 1) == "\[")	// list index
 			var/list/expression = list()
 			i = expression(i + 2, expression)
-			if (token(i) != "]")
+			if(token(i) != "]")
 				parse_error("Missing ] at the end of list access.")
 
 			L += "\["
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index e533a4716b6..319830d0235 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -99,7 +99,7 @@
 				adminhelp(msg)	//admin we are replying to has vanished, adminhelp instead
 			return
 
-	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
+	if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return
 
 	//clean the message if it's not sent by a high-rank admin
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 3f116b0a0d5..784f924966f 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -27,7 +27,7 @@
 	msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))
 	log_admin("MOD: [key_name(src)] : [msg]")
 
-	if (!msg)
+	if(!msg)
 		return
 
 	var/spanclass = "mod_channel"
diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm
index e1225275e17..1f88f2ce9d6 100644
--- a/code/modules/admin/verbs/atmosdebug.dm
+++ b/code/modules/admin/verbs/atmosdebug.dm
@@ -12,18 +12,18 @@
 
 	to_chat(usr, "Checking for disconnected pipes...")
 	//all plumbing - yes, some things might get stated twice, doesn't matter.
-	for (var/obj/machinery/atmospherics/plumbing in world)
-		if (plumbing.nodealert)
+	for(var/obj/machinery/atmospherics/plumbing in world)
+		if(plumbing.nodealert)
 			to_chat(usr, "Unconnected [plumbing.name] located at [plumbing.x],[plumbing.y],[plumbing.z] ([get_area(plumbing.loc)])")
 
 	//Manifolds
-	for (var/obj/machinery/atmospherics/pipe/manifold/pipe in world)
-		if (!pipe.node1 || !pipe.node2 || !pipe.node3)
+	for(var/obj/machinery/atmospherics/pipe/manifold/pipe in world)
+		if(!pipe.node1 || !pipe.node2 || !pipe.node3)
 			to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])")
 
 	//Pipes
-	for (var/obj/machinery/atmospherics/pipe/simple/pipe in world)
-		if (!pipe.node1 || !pipe.node2)
+	for(var/obj/machinery/atmospherics/pipe/simple/pipe in world)
+		if(!pipe.node1 || !pipe.node2)
 			to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])")
 
 	to_chat(usr, "Checking for overlapping pipes...")
@@ -47,13 +47,13 @@
 		return
 	feedback_add_details("admin_verb","CPOW") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-	for (var/datum/powernet/PN in powernets)
-		if (!PN.nodes || !PN.nodes.len)
+	for(var/datum/powernet/PN in powernets)
+		if(!PN.nodes || !PN.nodes.len)
 			if(PN.cables && (PN.cables.len > 1))
 				var/obj/structure/cable/C = PN.cables[1]
 				to_chat(usr, "Powernet with no nodes! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]")
 
-		if (!PN.cables || (PN.cables.len < 10))
+		if(!PN.cables || (PN.cables.len < 10))
 			if(PN.cables && (PN.cables.len > 1))
 				var/obj/structure/cable/C = PN.cables[1]
 				to_chat(usr, "Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]")
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 74596c333cc..690cac87536 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -17,24 +17,24 @@
 		to_chat(src, "<span class='warning'>You have deadchat muted.</span>")
 		return
 
-	if (handle_spam_prevention(msg,MUTE_DEADCHAT))
+	if(handle_spam_prevention(msg,MUTE_DEADCHAT))
 		return
 
 	var/stafftype = null
 
-	if (check_rights(R_MENTOR, 0))
+	if(check_rights(R_MENTOR, 0))
 		stafftype = "MENTOR"
 
-	if (check_rights(R_MOD, 0))
+	if(check_rights(R_MOD, 0))
 		stafftype = "MOD"
 
-	if (check_rights(R_ADMIN, 0))
+	if(check_rights(R_ADMIN, 0))
 		stafftype = "ADMIN"
 
 	msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))
 	log_admin("[key_name(src)] : [msg]")
 
-	if (!msg)
+	if(!msg)
 		return
 
 	var/prefix = "[stafftype] ([src.key])"
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index f8358411b9f..fde2ec0579e 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -194,7 +194,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		return
 	var/turf/T = mob.loc
 
-	if (!( istype(T, /turf) ))
+	if(!( istype(T, /turf) ))
 		return
 
 	var/datum/gas_mixture/env = T.return_air()
@@ -399,12 +399,12 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	if(!check_rights(R_EVENT))
 		return
 
-	if (!ticker)
+	if(!ticker)
 		alert("Wait until the game starts")
 		return
-	if (istype(M, /mob/living/carbon/human))
+	if(istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		if (H.wear_id)
+		if(H.wear_id)
 			var/obj/item/weapon/card/id/id = H.wear_id
 			if(istype(H.wear_id, /obj/item/device/pda))
 				var/obj/item/device/pda/pda = H.wear_id
@@ -616,32 +616,32 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	if(isnull(dostrip))
 		return
 	var/dresscode = input("Select dress for [M]", "Robust quick dress shop") as null|anything in dresspacks
-	if (isnull(dresscode))
+	if(isnull(dresscode))
 		return
 
 	var/datum/job/jobdatum
-	if (dresscode == "as job...")
+	if(dresscode == "as job...")
 		var/jobname = input("Select job", "Robust quick dress shop") as null|anything in get_all_jobs()
 		jobdatum = job_master.GetJob(jobname)
 
 	feedback_add_details("admin_verb","SEQ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	if(dostrip)
-		for (var/obj/item/I in M)
-			if (istype(I, /obj/item/weapon/implant))
+		for(var/obj/item/I in M)
+			if(istype(I, /obj/item/weapon/implant))
 				continue
 			if(istype(I, /obj/item/organ))
 				continue
 			qdel(I)
 	switch(dresscode)
-		if ("strip")
+		if("strip")
 			//do nothing
 
-		if ("as job...")
+		if("as job...")
 			if(jobdatum)
 				dresscode = "[jobdatum.title]"
 				jobdatum.equip(M)
 
-		if ("standard space gear")
+		if("standard space gear")
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
 
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform)
@@ -652,7 +652,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			J.toggle()
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(M), slot_wear_mask)
 			J.Topic(null, list("stat" = 1))
-		if ("Engineer RIG","CE RIG","Mining RIG","Syndi RIG","Wizard RIG","Medical RIG","Atmos RIG")
+		if("Engineer RIG","CE RIG","Mining RIG","Syndi RIG","Wizard RIG","Medical RIG","Atmos RIG")
 			if(dresscode=="Engineer RIG")
 				M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig(M), slot_wear_suit)
 				M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig(M), slot_head)
@@ -680,8 +680,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(M), slot_wear_mask)
 			J.Topic(null, list("stat" = 1))
 
-		if ("tournament standard red","tournament standard green") //we think stunning weapon is too overpowered to use it on tournaments. --rastaf0
-			if (dresscode=="tournament standard red")
+		if("tournament standard red","tournament standard green") //we think stunning weapon is too overpowered to use it on tournaments. --rastaf0
+			if(dresscode=="tournament standard red")
 				M.equip_to_slot_or_del(new /obj/item/clothing/under/color/red(M), slot_w_uniform)
 			else
 				M.equip_to_slot_or_del(new /obj/item/clothing/under/color/green(M), slot_w_uniform)
@@ -695,7 +695,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/weapon/grenade/smokebomb(M), slot_r_store)
 
 
-		if ("tournament gangster") //gangster are supposed to fight each other. --rastaf0
+		if("tournament gangster") //gangster are supposed to fight each other. --rastaf0
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/det(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
 
@@ -707,7 +707,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/proto(M), slot_r_hand)
 			M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store)
 
-		if ("tournament chef") //Steven Seagal FTW
+		if("tournament chef") //Steven Seagal FTW
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
@@ -718,7 +718,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/knife(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/knife(M), slot_s_store)
 
-		if ("tournament janitor")
+		if("tournament janitor")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
 			var/obj/item/weapon/storage/backpack/backpack = new(M)
@@ -741,14 +741,14 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack)
 
-		if ("pirate")
+		if("pirate")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/pirate(M), slot_r_hand)
 
-		if ("space pirate")
+		if("space pirate")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/pirate(M), slot_wear_suit)
@@ -757,7 +757,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 			M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/pirate(M), slot_r_hand)
 
-		if ("soviet soldier")
+		if("soviet soldier")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(M), slot_head)
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index 70505b8abdf..9b9a7c6caae 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -83,20 +83,20 @@
 		"_default" = "NO_FILTER"
 		)
 	var/output = "<b>Radio Report</b><hr>"
-	for (var/fq in radio_controller.frequencies)
+	for(var/fq in radio_controller.frequencies)
 		output += "<b>Freq: [fq]</b><br>"
 		var/list/datum/radio_frequency/fqs = radio_controller.frequencies[fq]
-		if (!fqs)
+		if(!fqs)
 			output += "&nbsp;&nbsp;<b>ERROR</b><br>"
 			continue
-		for (var/filter in fqs.devices)
+		for(var/filter in fqs.devices)
 			var/list/f = fqs.devices[filter]
-			if (!f)
+			if(!f)
 				output += "&nbsp;&nbsp;[filters[filter]]: ERROR<br>"
 				continue
 			output += "&nbsp;&nbsp;[filters[filter]]: [f.len]<br>"
-			for (var/device in f)
-				if (isobj(device))
+			for(var/device in f)
+				if(isobj(device))
 					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device] ([device:x],[device:y],[device:z] in area [get_area(device:loc)])<br>"
 				else
 					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device]<br>"
diff --git a/code/modules/admin/verbs/freeze.dm b/code/modules/admin/verbs/freeze.dm
index f6d31d6bede..3537dd3d6df 100644
--- a/code/modules/admin/verbs/freeze.dm
+++ b/code/modules/admin/verbs/freeze.dm
@@ -93,7 +93,7 @@ var/global/list/frozen_mob_list = list()
 		return
 	else
 		if(usr)
-			if (usr.client)
+			if(usr.client)
 				if(usr.client.holder)
 					var/adminomaly = new/obj/effect/overlay/adminoverlay
 					if(M.can_move == 1)
diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm
index dd37a828302..0a52bdbdce0 100644
--- a/code/modules/admin/verbs/honksquad.dm
+++ b/code/modules/admin/verbs/honksquad.dm
@@ -50,7 +50,7 @@ var/global/sent_honksquad = 0
 //Spawns HONKsquad and equips them.
 	for(var/obj/effect/landmark/L in landmarks_list)
 		if(honksquad_number<=0)	break
-		if (L.name == "HONKsquad")
+		if(L.name == "HONKsquad")
 			honk_leader_selected = honksquad_number == 1?1:0
 
 			var/mob/living/carbon/human/new_honksquad = create_honksquad(L, honk_leader_selected)
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index c59cd417c91..6578898a0bd 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -86,7 +86,7 @@ var/intercom_range_display_status = 0
 			if(!(locate(/obj/structure/grille,T)))
 				var/window_check = 0
 				for(var/obj/structure/window/W in T)
-					if (W.dir == turn(C1.dir,180) || W.is_fulltile() )
+					if(W.dir == turn(C1.dir,180) || W.is_fulltile() )
 						window_check = 1
 						break
 				if(!window_check)
@@ -115,7 +115,7 @@ var/intercom_range_display_status = 0
 		for(var/obj/item/device/radio/intercom/I in world)
 			for(var/turf/T in orange(7,I))
 				var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T)
-				if (!(F in view(7,I.loc)))
+				if(!(F in view(7,I.loc)))
 					qdel(F)
 	feedback_add_details("admin_verb","mIRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index c861531714c..c416f224cf9 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -34,7 +34,7 @@
 			return
 
 	var/list/names = list()
-	for (var/V in O.vars)
+	for(var/V in O.vars)
 		names += V
 
 	names = sortList(names)
@@ -123,7 +123,7 @@
 
 	var/original_name
 
-	if (!istype(O, /atom))
+	if(!istype(O, /atom))
 		original_name = "\ref[O] ([O])"
 	else
 		original_name = O:name
@@ -135,33 +135,33 @@
 			if(method)
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if ( istype(M , O.type) )
+						if( istype(M , O.type) )
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 
 			else
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if (M.type == O.type)
+						if(M.type == O.type)
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 		if("edit referenced object")
@@ -175,32 +175,32 @@
 			if(method)
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if ( istype(M , O.type) )
+						if( istype(M , O.type) )
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 			else
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if (M.type == O.type)
+						if(M.type == O.type)
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 		if("num")
@@ -216,7 +216,7 @@
 			if(method)
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if ( istype(M , O.type) )
+						if( istype(M , O.type) )
 							if(variable=="light_range")
 								M.set_light(new_value)
 							else
@@ -224,7 +224,7 @@
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							if(variable=="light_range")
 								A.set_light(new_value)
 							else
@@ -232,7 +232,7 @@
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							if(variable=="light_range")
 								A.set_light(new_value)
 							else
@@ -241,7 +241,7 @@
 			else
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if (M.type == O.type)
+						if(M.type == O.type)
 							if(variable=="light_range")
 								M.set_light(new_value)
 							else
@@ -249,7 +249,7 @@
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							if(variable=="light_range")
 								A.set_light(new_value)
 							else
@@ -257,7 +257,7 @@
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							if(variable=="light_range")
 								A.set_light(new_value)
 							else
@@ -271,32 +271,32 @@
 			if(method)
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if ( istype(M , O.type) )
+						if( istype(M , O.type) )
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 			else
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if (M.type == O.type)
+						if(M.type == O.type)
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 		if("file")
@@ -307,32 +307,32 @@
 			if(method)
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if ( istype(M , O.type) )
+						if( istype(M , O.type) )
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O.type, /obj))
 					for(var/obj/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O.type, /turf))
 					for(var/turf/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 			else
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if (M.type == O.type)
+						if(M.type == O.type)
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O.type, /obj))
 					for(var/obj/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O.type, /turf))
 					for(var/turf/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 		if("icon")
@@ -342,33 +342,33 @@
 			if(method)
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if ( istype(M , O.type) )
+						if( istype(M , O.type) )
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if ( istype(A , O.type) )
+						if( istype(A , O.type) )
 							A.vars[variable] = O.vars[variable]
 
 			else
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
-						if (M.type == O.type)
+						if(M.type == O.type)
 							M.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /obj))
 					for(var/obj/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 				else if(istype(O, /turf))
 					for(var/turf/A in world)
-						if (A.type == O.type)
+						if(A.type == O.type)
 							A.vars[variable] = O.vars[variable]
 
 	log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]")
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index a6aa95a359d..0be55889bc2 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -17,7 +17,7 @@ var/list/forbidden_varedit_object_types = list(
 	set category = "Debug"
 	set name = "Edit Ticker Variables"
 
-	if (ticker == null)
+	if(ticker == null)
 		to_chat(src, "Game hasn't started yet.")
 	else
 		src.modify_variables(ticker)
@@ -308,7 +308,7 @@ var/list/forbidden_varedit_object_types = list(
 	else
 
 		var/list/names = list()
-		for (var/V in O.vars)
+		for(var/V in O.vars)
 			names += V
 
 		names = sortList(names)
@@ -347,7 +347,7 @@ var/list/forbidden_varedit_object_types = list(
 
 	var/original_name
 
-	if (!istype(O, /atom))
+	if(!istype(O, /atom))
 		original_name = "\ref[O] ([O])"
 	else
 		original_name = O:name
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 5fb8335732d..daedb7ae5e0 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -62,7 +62,7 @@ client/proc/one_click_antag()
 			if(player_old_enough_antag(applicant.client,ROLE_TRAITOR))
 				if(!applicant.stat)
 					if(applicant.mind)
-						if (!applicant.mind.special_role)
+						if(!applicant.mind.special_role)
 							if(!jobban_isbanned(applicant, "traitor") && !jobban_isbanned(applicant, "Syndicate"))
 								if(!(applicant.mind.assigned_role in temp.restricted_jobs))
 									if(!(applicant.client.prefs.species in temp.protected_species))
@@ -96,7 +96,7 @@ client/proc/one_click_antag()
 			if(player_old_enough_antag(applicant.client,ROLE_CHANGELING))
 				if(!applicant.stat)
 					if(applicant.mind)
-						if (!applicant.mind.special_role)
+						if(!applicant.mind.special_role)
 							if(!jobban_isbanned(applicant, "changeling") && !jobban_isbanned(applicant, "Syndicate"))
 								if(!(applicant.mind.assigned_role in temp.restricted_jobs))
 									if(!(applicant.client.prefs.species in temp.protected_species))
@@ -277,13 +277,13 @@ client/proc/one_click_antag()
 		if(closet_spawn)
 			new /obj/structure/closet/syndicate/nuclear(closet_spawn.loc)
 
-		for (var/obj/effect/landmark/A in /area/syndicate_station/start)//Because that's the only place it can BE -Sieve
-			if (A.name == "Syndicate-Gear-Closet")
+		for(var/obj/effect/landmark/A in /area/syndicate_station/start)//Because that's the only place it can BE -Sieve
+			if(A.name == "Syndicate-Gear-Closet")
 				new /obj/structure/closet/syndicate/personal(A.loc)
 				qdel(A)
 				continue
 
-			if (A.name == "Syndicate-Bomb")
+			if(A.name == "Syndicate-Bomb")
 				new /obj/effect/spawner/newbomb/timer/syndicate(A.loc)
 				qdel(A)
 				continue
@@ -303,7 +303,7 @@ client/proc/one_click_antag()
 							var/I = image('icons/mob/mob.dmi', loc = synd_mind_1.current, icon_state = "synd")
 							synd_mind.current.client.images += I
 
-		for (var/obj/machinery/nuclearbomb/bomb in world)
+		for(var/obj/machinery/nuclearbomb/bomb in world)
 			bomb.r_code = nuke_code						// All the nukes are set to this code.
 
 	return 1
@@ -356,10 +356,10 @@ client/proc/one_click_antag()
 	if(candidates.len)
 		var/numagents = 6
 		//Spawns commandos and equips them.
-		for (var/obj/effect/landmark/L in /area/syndicate_mothership/elite_squad)
+		for(var/obj/effect/landmark/L in /area/syndicate_mothership/elite_squad)
 			if(numagents<=0)
 				break
-			if (L.name == "Syndicate-Commando")
+			if(L.name == "Syndicate-Commando")
 				syndicate_leader_selected = numagents == 1?1:0
 
 				var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected)
@@ -386,8 +386,8 @@ client/proc/one_click_antag()
 		if(numagents >= 6)
 			return 0
 
-		for (var/obj/effect/landmark/L in /area/shuttle/syndicate_elite)
-			if (L.name == "Syndicate-Commando-Bomb")
+		for(var/obj/effect/landmark/L in /area/shuttle/syndicate_elite)
+			if(L.name == "Syndicate-Commando-Bomb")
 				new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
 
 	return 1
@@ -469,7 +469,7 @@ client/proc/one_click_antag()
 		var/max_raiders = 1
 		var/raiders = max_raiders
 		//Spawns vox raiders and equips them.
-		for (var/obj/effect/landmark/L in world)
+		for(var/obj/effect/landmark/L in world)
 			if(L.name == "voxstart")
 				if(raiders<=0)
 					break
@@ -551,7 +551,7 @@ client/proc/one_click_antag()
 			if(player_old_enough_antag(applicant.client,ROLE_VAMPIRE))
 				if(!applicant.stat)
 					if(applicant.mind)
-						if (!applicant.mind.special_role)
+						if(!applicant.mind.special_role)
 							if(!jobban_isbanned(applicant, "vampire") && !jobban_isbanned(applicant, "Syndicate"))
 								if(!(applicant.job in temp.restricted_jobs))
 									if(!(applicant.client.prefs.species in temp.protected_species))
@@ -600,7 +600,7 @@ client/proc/one_click_antag()
 		var/teamOneMembers = 5
 		var/teamTwoMembers = 5
 		var/datum/preferences/A = new()
-		for (var/obj/effect/landmark/L in world)
+		for(var/obj/effect/landmark/L in world)
 			if(L.name == "tdome1")
 				if(teamOneMembers<=0)
 					break
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index ded5891edd9..6723299c5a8 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -27,8 +27,8 @@
 			to_chat(H, "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]")
 			obj_count++
 
-		for (var/obj/item/I in H)
-			if (istype(I, /obj/item/weapon/implant))
+		for(var/obj/item/I in H)
+			if(istype(I, /obj/item/weapon/implant))
 				continue
 			if(istype(I, /obj/item/organ))
 				continue
diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm
index 5072b43383e..a88270077d6 100644
--- a/code/modules/admin/verbs/onlyoneteam.dm
+++ b/code/modules/admin/verbs/onlyoneteam.dm
@@ -15,8 +15,8 @@
 			var/datum/preferences/A = new()	// Randomize appearance
 			A.copy_to(H)
 
-		for (var/obj/item/I in H)
-			if (istype(I, /obj/item/weapon/implant))
+		for(var/obj/item/I in H)
+			if(istype(I, /obj/item/weapon/implant))
 				continue
 			if(istype (I, /obj/item/organ))
 				continue
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index caed1de43af..c35b4d7596e 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -50,9 +50,11 @@
 			if(X.prefs.sound & SOUND_ADMINHELP)
 				X << 'sound/effects/adminhelp.ogg'
 
-/proc/ERT_Announce(var/text , var/mob/Sender)
+/proc/ERT_Announce(var/text , var/mob/Sender, var/repeat_warning)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "\blue <b><font color=orange>ERT REQUEST: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;ErtReply=\ref[Sender]'>REPLY</A>):</b> [msg]"
+	msg = "<span class='adminnotice'><b><font color=orange>ERT REQUEST: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;ErtReply=\ref[Sender]'>RESPOND</A>):</b> [msg]</span>"
+	if(repeat_warning)
+		msg += "<BR><span class='adminnotice'><b>WARNING: ERT request has gone 5 minutes with no reply!</b></span>"
 	for(var/client/X in admins)
 		if(check_rights(R_EVENT,0,X.mob))
 			to_chat(X, msg)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index ac0453d34df..f41a900aed7 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -23,7 +23,7 @@
 	if(!check_rights(R_ADMIN))
 		return
 
-	if (ismob(M))
+	if(ismob(M))
 		if(istype(M, /mob/living/silicon/ai))
 			alert("The AI can't be sent to prison you jerk!", null, null, null, null, null)
 			return
@@ -56,10 +56,10 @@
 
 	var/msg = input("Message:", text("Subtle PM to [M.key]")) as text
 
-	if (!msg)
+	if(!msg)
 		return
 	if(usr)
-		if (usr.client)
+		if(usr.client)
 			if(usr.client.holder)
 				to_chat(M, "\bold You hear a voice in your head... \italic [msg]")
 
@@ -108,7 +108,7 @@
 
 	var/msg = input("Message:", text("Enter the text you wish to appear to everyone:")) as text
 
-	if (!msg)
+	if(!msg)
 		return
 	to_chat(world, "[msg]")
 	log_admin("GlobalNarrate: [key_name(usr)] : [msg]")
@@ -561,7 +561,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			if("No")
 				to_chat(world, "\red [from] available at all communications consoles.")
 
-		for (var/obj/machinery/computer/communications/C in machines)
+		for(var/obj/machinery/computer/communications/C in machines)
 			if(! (C.stat & (BROKEN|NOPOWER) ) )
 				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
 				P.name = "[from]"
@@ -581,7 +581,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			if("No")
 				to_chat(world, "\red New Nanotrasen Update available at all communication consoles.")
 
-		for (var/obj/machinery/computer/communications/C in machines)
+		for(var/obj/machinery/computer/communications/C in machines)
 			if(! (C.stat & (BROKEN|NOPOWER) ) )
 				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
 				P.name = "'[command_name()] Update.'"
@@ -603,7 +603,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!check_rights(R_ADMIN))
 		return
 
-	if (alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No") == "Yes")
+	if(alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No") == "Yes")
 		log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
 		message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])", 1)
 		feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -643,9 +643,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/flames = input("Range of flames. -1 to none", text("Input"))  as num|null
 	if(flames == null) return
 
-	if ((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1) || (flames != -1))
-		if ((devastation > 20) || (heavy > 20) || (light > 20) || (flames > 20))
-			if (alert(src, "Are you sure you want to do this? It will laaag.", "Confirmation", "Yes", "No") == "No")
+	if((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1) || (flames != -1))
+		if((devastation > 20) || (heavy > 20) || (light > 20) || (flames > 20))
+			if(alert(src, "Are you sure you want to do this? It will laaag.", "Confirmation", "Yes", "No") == "No")
 				return
 
 		explosion(O, devastation, heavy, light, flash, null, null,flames)
@@ -668,7 +668,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/light = input("Range of light pulse.", text("Input"))  as num|null
 	if(light == null) return
 
-	if (heavy || light)
+	if(heavy || light)
 
 		empulse(O, heavy, light)
 		log_admin("[key_name(usr)] created an EM pulse ([heavy], [light]) at ([O.x],[O.y],[O.z])")
@@ -710,7 +710,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm == "Yes")
-		if (istype(mob, /mob/dead/observer)) // so they don't spam gibs everywhere
+		if(istype(mob, /mob/dead/observer)) // so they don't spam gibs everywhere
 			return
 		else
 			mob.gib()
@@ -791,7 +791,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Admin"
 	set name = "Toggle Deny Shuttle"
 
-	if (!ticker)
+	if(!ticker)
 		return
 
 	if(!check_rights(R_ADMIN))
@@ -824,7 +824,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!check_rights(R_SERVER|R_EVENT))
 		return
 
-	if (ticker && ticker.mode)
+	if(ticker && ticker.mode)
 		to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!")
 		return
 
diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm
index 142bb8203cd..98ef8d7b3b8 100644
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -55,7 +55,7 @@ var/global/sent_strike_team = 0
 //Spawns commandos and equips them.
 	for(var/obj/effect/landmark/L in landmarks_list)
 		if(commando_number<=0)	break
-		if (L.name == "Commando")
+		if(L.name == "Commando")
 			leader_selected = commando_number == 1?1:0
 
 			var/mob/living/carbon/human/new_commando = create_death_commando(L, leader_selected)
@@ -76,8 +76,8 @@ var/global/sent_strike_team = 0
 			commando_number--
 
 //Spawns the rest of the commando gear.
-	for (var/obj/effect/landmark/L in landmarks_list)
-		if (L.name == "Commando_Manual")
+	for(var/obj/effect/landmark/L in landmarks_list)
+		if(L.name == "Commando_Manual")
 			//new /obj/item/weapon/gun/energy/pulse_rifle(L.loc)
 			var/obj/item/weapon/paper/P = new(L.loc)
 			P.info = "<p><b>Good morning soldier!</b>. This compact guide will familiarize you with standard operating procedure. There are three basic rules to follow:<br>#1 Work as a team.<br>#2 Accomplish your objective at all costs.<br>#3 Leave no witnesses.<br>You are fully equipped and stocked for your mission--before departing on the Spec. Ops. Shuttle due South, make sure that all operatives are ready. Actual mission objective will be relayed to you by Central Command through your headsets.<br>If deemed appropriate, Central Command will also allow members of your team to equip assault power-armor for the mission. You will find the armor storage due West of your position. Once you are ready to leave, utilize the Special Operations shuttle console and toggle the hull doors via the other console.</p><p>In the event that the team does not accomplish their assigned objective in a timely manner, or finds no other way to do so, attached below are instructions on how to operate a Nanotrasen Nuclear Device. Your operations <b>LEADER</b> is provided with a nuclear authentication disk and a pin-pointer for this reason. You may easily recognize them by their rank: Lieutenant, Captain, or Major. The nuclear device itself will be present somewhere on your destination.</p><p>Hello and thank you for choosing Nanotrasen for your nuclear information needs. Today's crash course will deal with the operation of a Fission Class Nanotrasen made Nuclear Device.<br>First and foremost, <b>DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE.</b> Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done to unbolt it one must completely log in which at this time may not be possible.<br>To make the device functional:<br>#1 Place bomb in designated detonation zone<br> #2 Extend and anchor bomb (attack with hand).<br>#3 Insert Nuclear Auth. Disk into slot.<br>#4 Type numeric code into keypad ([nuke_code]).<br>Note: If you make a mistake press R to reset the device.<br>#5 Press the E button to log onto the device.<br>You now have activated the device. To deactivate the buttons at anytime, for example when you have already prepped the bomb for detonation, remove the authentication disk OR press the R on the keypad. Now the bomb CAN ONLY be detonated using the timer. A manual detonation is not an option.<br>Note: Toggle off the <b>SAFETY</b>.<br>Use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.<br>Note: <b>THE BOMB IS STILL SET AND WILL DETONATE</b><br>Now before you remove the disk if you need to move the bomb you can: Toggle off the anchor, move it, and re-anchor.</p><p>The nuclear authorization code is: <b>[nuke_code ? nuke_code : "None provided"]</b></p><p><b>Good luck, soldier!</b></p>"
@@ -87,8 +87,8 @@ var/global/sent_strike_team = 0
 			P.stamp(stamp)
 			qdel(stamp)
 
-	for (var/obj/effect/landmark/L in landmarks_list)
-		if (L.name == "Commando-Bomb")
+	for(var/obj/effect/landmark/L in landmarks_list)
+		if(L.name == "Commando-Bomb")
 			new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
 			qdel(L)
 
@@ -125,7 +125,7 @@ var/global/sent_strike_team = 0
 	var/obj/item/device/radio/R = new /obj/item/device/radio/headset/alt(src)
 	R.set_frequency(DTH_FREQ)
 	equip_to_slot_or_del(R, slot_l_ear)
-	if (leader_selected == 0)
+	if(leader_selected == 0)
 		equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform)
 	else
 		equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform)
@@ -143,7 +143,7 @@ var/global/sent_strike_team = 0
 	equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_in_backpack)
-	if (!leader_selected)
+	if(!leader_selected)
 		equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_in_backpack)
 	else
 		equip_to_slot_or_del(new /obj/item/weapon/pinpointer(src), slot_in_backpack)
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm
index 054b5469d9b..abb6de5ceb7 100644
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -32,7 +32,7 @@ var/global/sent_syndicate_strike_team = 0
 
 	sent_syndicate_strike_team = 1
 
-	//if (emergency_shuttle.can_recall())
+	//if(emergency_shuttle.can_recall())
 	//	emergency_shuttle.recall()	//why, exactly? Admins can do this themselves.
 
 	var/syndicate_commando_number = syndicate_commandos_possible //for selecting a leader
@@ -62,7 +62,7 @@ var/global/sent_syndicate_strike_team = 0
 //Spawns commandos and equips them.
 	for(var/obj/effect/landmark/L in landmarks_list)
 		if(syndicate_commando_number<=0)	break
-		if (L.name == "Syndicate-Commando")
+		if(L.name == "Syndicate-Commando")
 			syndicate_leader_selected = syndicate_commando_number == 1?1:0
 
 			var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected)
@@ -83,15 +83,15 @@ var/global/sent_syndicate_strike_team = 0
 			syndicate_commando_number--
 
 //Spawns the rest of the commando gear.
-//	for (var/obj/effect/landmark/L)
-	//	if (L.name == "Commando_Manual")
+//	for(var/obj/effect/landmark/L)
+	//	if(L.name == "Commando_Manual")
 			//new /obj/item/weapon/gun/energy/pulse_rifle(L.loc)
 		//	var/obj/item/weapon/paper/P = new(L.loc)
 		//	P.info = "<p><b>Good morning soldier!</b>. This compact guide will familiarize you with standard operating procedure. There are three basic rules to follow:<br>#1 Work as a team.<br>#2 Accomplish your objective at all costs.<br>#3 Leave no witnesses.<br>You are fully equipped and stocked for your mission--before departing on the Spec. Ops. Shuttle due South, make sure that all operatives are ready. Actual mission objective will be relayed to you by Central Command through your headsets.<br>If deemed appropriate, Central Command will also allow members of your team to equip assault power-armor for the mission. You will find the armor storage due West of your position. Once you are ready to leave, utilize the Special Operations shuttle console and toggle the hull doors via the other console.</p><p>In the event that the team does not accomplish their assigned objective in a timely manner, or finds no other way to do so, attached below are instructions on how to operate a Nanotrasen Nuclear Device. Your operations <b>LEADER</b> is provided with a nuclear authentication disk and a pin-pointer for this reason. You may easily recognize them by their rank: Lieutenant, Captain, or Major. The nuclear device itself will be present somewhere on your destination.</p><p>Hello and thank you for choosing Nanotrasen for your nuclear information needs. Today's crash course will deal with the operation of a Fission Class Nanotrasen made Nuclear Device.<br>First and foremost, <b>DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE.</b> Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done to unbolt it one must completely log in which at this time may not be possible.<br>To make the device functional:<br>#1 Place bomb in designated detonation zone<br> #2 Extend and anchor bomb (attack with hand).<br>#3 Insert Nuclear Auth. Disk into slot.<br>#4 Type numeric code into keypad ([nuke_code]).<br>Note: If you make a mistake press R to reset the device.<br>#5 Press the E button to log onto the device.<br>You now have activated the device. To deactivate the buttons at anytime, for example when you have already prepped the bomb for detonation, remove the authentication disk OR press the R on the keypad. Now the bomb CAN ONLY be detonated using the timer. A manual detonation is not an option.<br>Note: Toggle off the <b>SAFETY</b>.<br>Use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.<br>Note: <b>THE BOMB IS STILL SET AND WILL DETONATE</b><br>Now before you remove the disk if you need to move the bomb you can: Toggle off the anchor, move it, and re-anchor.</p><p>The nuclear authorization code is: <b>[nuke_code ? nuke_code : "None provided"]</b></p><p><b>Good luck, soldier!</b></p>"
 		//	P.name = "Spec. Ops. Manual"
 
-	for (var/obj/effect/landmark/L in landmarks_list)
-		if (L.name == "Syndicate-Commando-Bomb")
+	for(var/obj/effect/landmark/L in landmarks_list)
+		if(L.name == "Syndicate-Commando-Bomb")
 			new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
 			qdel(L)
 
@@ -131,12 +131,12 @@ var/global/sent_syndicate_strike_team = 0
 	equip_to_slot_or_del(R, slot_l_ear)
 	equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), slot_w_uniform)
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/syndie/advance(src), slot_shoes)
-	if (!syndicate_leader_selected)
+	if(!syndicate_leader_selected)
 		equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/strike(src), slot_wear_suit)
 	else
 		equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/red/strike(src), slot_wear_suit)
 	equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), slot_gloves)
-	if (!syndicate_leader_selected)
+	if(!syndicate_leader_selected)
 		equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/strike(src), slot_head)
 	else
 		equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/red/strike(src), slot_head)
@@ -150,7 +150,7 @@ var/global/sent_syndicate_strike_team = 0
 	equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_in_backpack)
-	if (!syndicate_leader_selected)
+	if(!syndicate_leader_selected)
 		equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_in_backpack)
 		equip_to_slot_or_del(new /obj/item/weapon/card/emag(src), slot_in_backpack)
 	else
diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm
index 4d42358aee8..251ec478381 100644
--- a/code/modules/admin/verbs/vox_raiders.dm
+++ b/code/modules/admin/verbs/vox_raiders.dm
@@ -75,6 +75,6 @@ var/global/vox_tick = 1
 
 */
 	vox_tick++
-	if (vox_tick > 4) vox_tick = 1
+	if(vox_tick > 4) vox_tick = 1
 
 	return 1
diff --git a/code/modules/alarm/alarm_handler.dm b/code/modules/alarm/alarm_handler.dm
index bfa2b5f44ed..9878a4b5e5e 100644
--- a/code/modules/alarm/alarm_handler.dm
+++ b/code/modules/alarm/alarm_handler.dm
@@ -54,7 +54,7 @@
 	return alarms
 
 /datum/alarm_handler/proc/check_alarm_cleared(var/datum/alarm/alarm)
-	if ((alarm.end_time && world.time > alarm.end_time) || !alarm.sources.len)
+	if((alarm.end_time && world.time > alarm.end_time) || !alarm.sources.len)
 		alarms -= alarm
 		alarms_assoc -= alarm.origin
 		on_alarm_change(alarm, ALARM_CLEARED)
diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm
index 0d16f8bcb9f..d886fa3f4be 100644
--- a/code/modules/arcade/arcade_base.dm
+++ b/code/modules/arcade/arcade_base.dm
@@ -97,7 +97,7 @@
 /obj/machinery/arcade/proc/pay_with_card(var/obj/item/weapon/card/id/I, var/mob/user)
 	visible_message("<span class='info'>[usr] swipes a card through [src].</span>")
 	var/datum/money_account/customer_account = attempt_account_access_nosec(I.associated_account_number)
-	if (!customer_account)
+	if(!customer_account)
 		to_chat(user, "Error: Unable to access account. Please contact technical support if problem persists.")
 		return 0
 
diff --git a/code/modules/arcade/arcade_prize.dm b/code/modules/arcade/arcade_prize.dm
index f57a64de03c..d3457696268 100644
--- a/code/modules/arcade/arcade_prize.dm
+++ b/code/modules/arcade/arcade_prize.dm
@@ -67,7 +67,7 @@
 	throwforce = 0
 	throw_speed = 1
 	throw_range = 1
-	w_class = 1.0
+	w_class = 1
 	max_amount = 9999	//Dang that's a lot of tickets
 
 /obj/item/stack/tickets/New(var/loc, var/amount=null)
diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm
index 5f66881cea6..e45d3d1bfe0 100644
--- a/code/modules/arcade/prize_counter.dm
+++ b/code/modules/arcade/prize_counter.dm
@@ -171,7 +171,7 @@ td.cost.toomuch {
 	if(href_list["eject"])
 		print_tickets()
 
-	if (href_list["buy"])
+	if(href_list["buy"])
 		var/itemID = text2num(href_list["buy"])
 		var/datum/prize_item/item = global_prizes.prizes[itemID]
 		var/sure = alert(usr,"Are you sure you wish to purchase [item.name] for [item.cost] tickets?","You sure?","Yes","No") in list("Yes","No")
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 9a61921764d..84e10835215 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = ""
 	flags = CONDUCT
-	w_class = 2.0
+	w_class = 2
 	materials = list(MAT_METAL=100)
 	throwforce = 2
 	throw_speed = 3
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 5808109b768..f6019ace266 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/tank.dmi'
 	item_state = "assembly"
 	throwforce = 5
-	w_class = 3.0
+	w_class = 3
 	throw_speed = 2
 	throw_range = 4
 	flags = CONDUCT //Copied this from old code, so this may or may not be necessary
@@ -141,7 +141,7 @@
 
 		if(strength >=1)
 			explosion(ground_zero, 0, round(strength,1), round(strength*2,1), round(strength*3,1))
-		else if (strength >=0.5)
+		else if(strength >=0.5)
 			explosion(ground_zero, -1, 0, 1, 2)
 		else
 			ground_zero.assume_air(air_contents)
@@ -150,7 +150,7 @@
 	else if(air_contents.temperature > (T0C + 100))
 		strength = (fuel_moles/25)
 
-		if (strength >=1)
+		if(strength >=1)
 			explosion(ground_zero, -1, 0, round(strength,1), round(strength*3,1))
 		else
 			ground_zero.assume_air(air_contents)
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 6333fbca635..f4cafef9c97 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -5,7 +5,7 @@
 	item_state = "assembly"
 	flags = CONDUCT
 	throwforce = 5
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 10
 
@@ -68,8 +68,8 @@
 
 	examine(mob/user)
 		..(user)
-		if ((in_range(src, user) || src.loc == user))
-			if (src.secured)
+		if((in_range(src, user) || src.loc == user))
+			if(src.secured)
 				to_chat(user, "\The [src] is ready!")
 			else
 				to_chat(user, "\The [src] can be attached!")
@@ -202,11 +202,11 @@
 				qdel(src)
 				return
 			if(2.0)
-				if (prob(50))
+				if(prob(50))
 					qdel(src)
 					return
 			if(3.0)
-				if (prob(25))
+				if(prob(25))
 					qdel(src)
 					return
 		return
diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index a5485a59078..e6505e385ad 100644
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -25,12 +25,12 @@
 	if(!..())	return 0//Cooldown check
 	var/turf/location = get_turf(loc)
 	if(location)	location.hotspot_expose(1000,1000)
-	if (istype(src.loc,/obj/item/device/assembly_holder))
-		if (istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/))
+	if(istype(src.loc,/obj/item/device/assembly_holder))
+		if(istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/))
 			var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc
-			if (tank)
+			if(tank)
 				tank.boom()
-		if (istype(src.loc.loc, /obj/item/weapon/reagent_containers/glass/beaker/))
+		if(istype(src.loc.loc, /obj/item/weapon/reagent_containers/glass/beaker/))
 			var/obj/item/weapon/reagent_containers/glass/beaker/beakerbomb = src.loc.loc
 			if(beakerbomb)
 				beakerbomb.heat_beaker()
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 90e86f07a6e..4b21da11cd2 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -42,8 +42,8 @@
 
 
 	HasProximity(atom/movable/AM as mob|obj)
-		if (istype(AM, /obj/effect/beam))	return
-		if (AM.move_speed < 12)	sense()
+		if(istype(AM, /obj/effect/beam))	return
+		if(AM.move_speed < 12)	sense()
 		return
 
 
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index 6c5c9e4e5bb..3aa24a2d014 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -6,7 +6,7 @@
 	var/obj/item/clothing/head/helmet/part1 = null
 	var/obj/item/device/radio/electropack/part2 = null
 	var/status = 0
-	w_class = 5.0
+	w_class = 5
 	flags = CONDUCT
 
 /obj/item/assembly/shock_kit/Destroy()
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 24fcca4e901..99090ff2dac 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -51,7 +51,7 @@
 
 /obj/item/device/assembly/signaler/interact(mob/user as mob, flag1)
 	var/t1 = "-------"
-//	if ((src.b_stat && !( flag1 )))
+//	if((src.b_stat && !( flag1 )))
 //		t1 = text("-------<BR>\nGreen Wire: []<BR>\nRed Wire:   []<BR>\nBlue Wire:  []<BR>\n", (src.wires & 4 ? text("<A href='?src=\ref[];wires=4'>Cut Wire</A>", src) : text("<A href='?src=\ref[];wires=4'>Mend Wire</A>", src)), (src.wires & 2 ? text("<A href='?src=\ref[];wires=2'>Cut Wire</A>", src) : text("<A href='?src=\ref[];wires=2'>Mend Wire</A>", src)), (src.wires & 1 ? text("<A href='?src=\ref[];wires=1'>Cut Wire</A>", src) : text("<A href='?src=\ref[];wires=1'>Mend Wire</A>", src)))
 //	else
 //		t1 = "-------"	Speaker: [src.listening ? "<A href='byond://?src=\ref[src];listen=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];listen=1'>Disengaged</A>"]<BR>
@@ -94,7 +94,7 @@
 		onclose(usr, "radio")
 		return
 
-	if (href_list["freq"])
+	if(href_list["freq"])
 		var/new_frequency = (frequency + text2num(href_list["freq"]))
 		if(new_frequency < RADIO_LOW_FREQ || new_frequency > RADIO_HIGH_FREQ)
 			new_frequency = sanitize_frequency(new_frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
diff --git a/code/modules/atmos_automation/console.dm b/code/modules/atmos_automation/console.dm
index c567a45e108..201a6f63e4d 100644
--- a/code/modules/atmos_automation/console.dm
+++ b/code/modules/atmos_automation/console.dm
@@ -61,7 +61,7 @@
 			if(!(A.returntype in valid_returntypes))
 				continue
 			choices[A.name]=A
-		if (choices.len==0)
+		if(choices.len==0)
 			testing("Unable to find automations with returntype in [english_list(valid_returntypes)]!")
 			return 0
 		var/label=input(user, "Select new automation:", "Automations", "Cancel") as null|anything in choices
diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm
index 670d8143390..00263352325 100644
--- a/code/modules/awaymissions/bluespaceartillery.dm
+++ b/code/modules/awaymissions/bluespaceartillery.dm
@@ -32,7 +32,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "bluespace_artillery.tmpl", "Bluespace Control", 400, 260)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 8da37d2ae3e..5045b5369a1 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -236,10 +236,10 @@ obj/machinery/gateway/centerstation/process()
 	if(!ready)	return
 	if(!active)	return
 	if(istype(M, /mob/living/carbon))
-		if (exilecheck(M)) return
+		if(exilecheck(M)) return
 	if(istype(M, /obj))
 		for(var/mob/living/carbon/F in M)
-			if (exilecheck(F)) return
+			if(exilecheck(F)) return
 	M.forceMove(get_step(stationgate.loc, SOUTH))
 	M.dir = SOUTH
 
diff --git a/code/modules/awaymissions/mission_code/spacehotel.dm b/code/modules/awaymissions/mission_code/spacehotel.dm
index b5737ddcfd4..c4820db97ec 100644
--- a/code/modules/awaymissions/mission_code/spacehotel.dm
+++ b/code/modules/awaymissions/mission_code/spacehotel.dm
@@ -230,19 +230,15 @@
 // to check a person into a room; no financial stuff; returns the keycard
 /obj/effect/hotel_controller/proc/checkin(roomid, mob/living/carbon/occupant, obj/item/weapon/card/id/id)
 	if(!istype(occupant))
-		world << "no occupant"
 		return null
 	var/obj/machinery/door/unpowered/hotel_door/D = room_doors["[roomid]"]
 	if(!D || D.occupant || (occupant in guests))
-		world << "room occupied"
 		return null
 
 	D.account = get_card_account(id, occupant)
 	if(!D.account)
-		world << "no account"
 		return null
 	if(!D.account.charge(100, transaction_purpose = "10 minutes", dest_name = name))
-		world << "xaction failed"
 		return null
 
 	D.occupant = occupant
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index 682e2137d2a..7a6480943a7 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -175,7 +175,7 @@ var/sc_safecode5 = "[rand(0,9)]"
 /obj/singularity/narsie/sc_Narsie/consume(var/atom/A)
 	if(is_type_in_list(A, uneatable))
 		return 0
-	if (istype(A,/mob/living))
+	if(istype(A,/mob/living))
 		var/mob/living/L = A
 		L.gib()
 	else if(istype(A,/obj/))
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 8227671f0ac..3db7ff86668 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -65,7 +65,7 @@
 	else if(is_special_character(user))
 		to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this.  Something instinctual makes you pull away.")
 
-	else if (!insistinga)
+	else if(!insistinga)
 		to_chat(user, "Your first touch makes the Wish Granter stir, listening to you.  Are you really sure you want to do this?")
 		insistinga++
 
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index 321e4033f0e..33c42950345 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -30,27 +30,27 @@
 		Lines = file2list("config/example/away_mission_config.txt")
 
 	if(!Lines.len)	return
-	for (var/t in Lines)
-		if (!t)
+	for(var/t in Lines)
+		if(!t)
 			continue
 
 		t = trim(t)
-		if (length(t) == 0)
+		if(length(t) == 0)
 			continue
-		else if (copytext(t, 1, 2) == "#")
+		else if(copytext(t, 1, 2) == "#")
 			continue
 
 		var/pos = findtext(t, " ")
 		var/name = null
 	//	var/value = null
 
-		if (pos)
+		if(pos)
 			name = lowertext(copytext(t, 1, pos))
 		//	value = copytext(t, pos + 1)
 		else
 			name = lowertext(t)
 
-		if (!name)
+		if(!name)
 			continue
 
 		potentialRandomZlevels.Add(t)
@@ -68,7 +68,7 @@
 			log_to_dd("  Away mission loaded: [map]")
 
 		for(var/obj/effect/landmark/L in landmarks_list)
-			if (L.name != "awaystart")
+			if(L.name != "awaystart")
 				continue
 			awaydestinations.Add(L)
 
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index ac4a426fe08..9948bbcc557 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -46,10 +46,10 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 
 	client << browse_rsc(asset_cache[asset_name], asset_name)
 	if(!verify || !winexists(client, "asset_cache_browser")) // Can't access the asset cache browser, rip.
-		if (client)
+		if(client)
 			client.cache += asset_name
 		return 1
-	if (!client)
+	if(!client)
 		return 0
 
 	client.sending |= asset_name
@@ -91,17 +91,17 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 	var/list/unreceived = asset_list - (client.cache + client.sending)
 	if(!unreceived || !unreceived.len)
 		return 0
-	if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT)
+	if(unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT)
 		to_chat(client, "Sending Resources...")
 	for(var/asset in unreceived)
-		if (asset in asset_cache)
+		if(asset in asset_cache)
 			client << browse_rsc(asset_cache[asset], asset)
 
 	if(!verify || !winexists(client, "asset_cache_browser")) // Can't access the asset cache browser, rip.
-		if (client)
+		if(client)
 			client.cache += unreceived
 		return 1
-	if (!client)
+	if(!client)
 		return 0
 	client.sending |= unreceived
 	var/job = ++client.last_asset_job
@@ -129,9 +129,9 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 //The proc calls procs that sleep for long times.
 proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 	for(var/file in files)
-		if (!client)
+		if(!client)
 			break
-		if (register_asset)
+		if(register_asset)
 			register_asset(file,files[file])
 		send_asset(client,file)
 		sleep(-1) //queuing calls like this too quickly can cause issues in some client versions
@@ -159,7 +159,7 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 
 //get a assetdatum or make a new one
 /proc/get_asset_datum(var/type)
-	if (!(type in asset_datums))
+	if(!(type in asset_datums))
 		return new type()
 	return asset_datums[type]
 
@@ -240,14 +240,14 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 
 /datum/asset/nanoui/register()
 	// Crawl the directories to find files.
-	for (var/path in common_dirs)
+	for(var/path in common_dirs)
 		var/list/filenames = flist(path)
 		for(var/filename in filenames)
 			if(copytext(filename, length(filename)) != "/") // Ignore directories.
 				if(fexists(path + filename))
 					common[filename] = fcopy_rsc(path + filename)
 					register_asset(filename, common[filename])
-	for (var/path in uncommon_dirs)
+	for(var/path in uncommon_dirs)
 		var/list/filenames = flist(path)
 		for(var/filename in filenames)
 			if(copytext(filename, length(filename)) != "/") // Ignore directories.
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index d7b41fe2c59..0d56f0d1122 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -8,6 +8,8 @@
 #define UPLOAD_LIMIT		10485760	//Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen?
 #define MIN_CLIENT_VERSION	0		//Just an ambiguously low version for now, I don't want to suddenly stop people playing.
 									//I would just like the code ready should it ever need to be used.
+#define SUGGESTED_CLIENT_VERSION	510		// only integers (e.g: 510, 511) useful here. Does not properly handle minor versions (e.g: 510.58, 511.848)
+
 	/*
 	When somebody clicks a link in game, this Topic is called first.
 	It does the stuff in this proc and  then is redirected to the Topic() proc for the src=[0xWhatever]
@@ -208,7 +210,7 @@
 
 
 	switch(href_list["action"])
-		if ("openLink")
+		if("openLink")
 			src << link(href_list["link"])
 
 	..()	//redirect to hsrc.Topic()
@@ -258,8 +260,10 @@
 
 	if(connection != "seeker")					//Invalid connection type.
 		return null
-	if(byond_version < MIN_CLIENT_VERSION)		//Out of date client.
+	if(byond_version < MIN_CLIENT_VERSION) // Too out of date to play at all. Unfortunately, we can't send them a message here.
 		return null
+	if(byond_version < SUGGESTED_CLIENT_VERSION) // Update is suggested, but not required.
+		to_chat(src,"<span class='userdanger'>Your BYOND client (v: [byond_version]) is out of date. This can cause glitches. We highly suggest you download the latest client from http://www.byond.com/ before playing. </span>")
 
 	if(IsGuestKey(key))
 		alert(src,"This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK")
@@ -317,8 +321,8 @@
 
 	log_client_to_db()
 
-	if (ckey in clientmessages)
-		for (var/message in clientmessages[ckey])
+	if(ckey in clientmessages)
+		for(var/message in clientmessages[ckey])
 			to_chat(src, message)
 		clientmessages.Remove(ckey)
 
@@ -358,7 +362,7 @@
 
 /client/proc/log_client_to_db()
 
-	if ( IsGuestKey(src.key) )
+	if( IsGuestKey(src.key) )
 		return
 
 	establish_db_connection()
diff --git a/code/modules/client/message.dm b/code/modules/client/message.dm
index 6406a7d051a..a5c78008b4f 100644
--- a/code/modules/client/message.dm
+++ b/code/modules/client/message.dm
@@ -2,8 +2,8 @@ var/list/clientmessages = list()
 
 proc/addclientmessage(var/ckey, var/message)
 	ckey = ckey(ckey)
-	if (!ckey || !message)
+	if(!ckey || !message)
 		return
-	if (!(ckey in clientmessages))
+	if(!(ckey in clientmessages))
 		clientmessages[ckey] = list()
 	clientmessages[ckey] += message
diff --git a/code/modules/client/preference/loadout/gear_tweaks.dm b/code/modules/client/preference/loadout/gear_tweaks.dm
new file mode 100644
index 00000000000..6458a51b9a3
--- /dev/null
+++ b/code/modules/client/preference/loadout/gear_tweaks.dm
@@ -0,0 +1,113 @@
+/datum/gear_tweak/proc/get_contents(var/metadata)
+	return
+
+/datum/gear_tweak/proc/get_metadata(var/user, var/metadata)
+	return
+
+/datum/gear_tweak/proc/get_default()
+	return
+
+/datum/gear_tweak/proc/tweak_gear_data(var/metadata, var/datum/gear_data)
+	return
+
+/datum/gear_tweak/proc/tweak_item(var/obj/item/I, var/metadata)
+	return
+
+/*
+* Color adjustment
+*/
+
+var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
+
+/datum/gear_tweak/color
+	var/list/valid_colors
+
+/datum/gear_tweak/color/New(var/list/colors)
+	valid_colors = colors
+	..()
+
+/datum/gear_tweak/color/get_contents(var/metadata)
+	return "Color: <font color='[metadata]'>&#9899;</font>"
+
+/datum/gear_tweak/color/get_default()
+	return valid_colors ? valid_colors[1] : COLOR_GRAY
+
+/datum/gear_tweak/color/get_metadata(var/user, var/metadata)
+	if(valid_colors)
+		return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors
+	return input(user, "Choose an item color.", "Global Preference", metadata) as color|null
+
+/datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
+	if(valid_colors && !(metadata in valid_colors))
+		return
+	I.color = metadata
+
+/*
+* Path adjustment
+*/
+
+/datum/gear_tweak/path
+	var/list/valid_paths
+
+/datum/gear_tweak/path/New(var/list/paths)
+	valid_paths = paths
+	..()
+
+/datum/gear_tweak/path/get_contents(var/metadata)
+	return "Type: [metadata]"
+
+/datum/gear_tweak/path/get_default()
+	return valid_paths[1]
+
+/datum/gear_tweak/path/get_metadata(var/user, var/metadata)
+	return input(user, "Choose a type.", "Character Preference", metadata) as null|anything in valid_paths
+
+/datum/gear_tweak/path/tweak_gear_data(var/metadata, var/datum/gear_data/gear_data)
+	if(!(metadata in valid_paths))
+		return
+	gear_data.path = valid_paths[metadata]
+
+/*
+* Content adjustment
+*/
+
+/datum/gear_tweak/contents
+	var/list/valid_contents
+
+/datum/gear_tweak/contents/New()
+	valid_contents = args.Copy()
+	..()
+
+/datum/gear_tweak/contents/get_contents(var/metadata)
+	return "Contents: [english_list(metadata, and_text = ", ")]"
+
+/datum/gear_tweak/contents/get_default()
+	. = list()
+	for(var/i = 1 to valid_contents.len)
+		. += "Random"
+
+/datum/gear_tweak/contents/get_metadata(var/user, var/list/metadata)
+	. = list()
+	for(var/i = metadata.len to valid_contents.len)
+		metadata += "Random"
+	for(var/i = 1 to valid_contents.len)
+		var/entry = input(user, "Choose an entry.", "Character Preference", metadata[i]) as null|anything in (valid_contents[i] + list("Random", "None"))
+		if(entry)
+			. += entry
+		else
+			return metadata
+
+/datum/gear_tweak/contents/tweak_item(var/obj/item/I, var/list/metadata)
+	if(metadata.len != valid_contents.len)
+		return
+	for(var/i = 1 to valid_contents.len)
+		var/path
+		var/list/contents = valid_contents[i]
+		if(metadata[i] == "Random")
+			path = pick(contents)
+			path = contents[path]
+		else if(metadata[i] == "None")
+			continue
+		else
+			path = 	contents[metadata[i]]
+		new path(I)
diff --git a/code/modules/client/preference/loadout/loadout.dm b/code/modules/client/preference/loadout/loadout.dm
new file mode 100644
index 00000000000..010fc54564c
--- /dev/null
+++ b/code/modules/client/preference/loadout/loadout.dm
@@ -0,0 +1,79 @@
+var/list/loadout_categories = list()
+var/list/gear_datums = list()
+
+/datum/loadout_category
+	var/category = ""
+	var/list/gear = list()
+
+/datum/loadout_category/New(cat)
+	category = cat
+	..()
+
+/hook/startup/proc/populate_gear_list()
+	//create a list of gear datums to sort
+	for(var/geartype in subtypesof(/datum/gear))
+		var/datum/gear/G = geartype
+
+		var/use_name = initial(G.display_name)
+		var/use_category = initial(G.sort_category)
+
+		if(G == initial(G.subtype_path))
+			continue
+
+		if(!use_name)
+			error("Loadout - Missing display name: [G]")
+			continue
+		if(!initial(G.cost))
+			error("Loadout - Missing cost: [G]")
+			continue
+		if(!initial(G.path))
+			error("Loadout - Missing path definition: [G]")
+			continue
+
+		if(!loadout_categories[use_category])
+			loadout_categories[use_category] = new /datum/loadout_category(use_category)
+		var/datum/loadout_category/LC = loadout_categories[use_category]
+		gear_datums[use_name] = new geartype
+		LC.gear[use_name] = gear_datums[use_name]
+
+	loadout_categories = sortAssoc(loadout_categories)
+	for(var/loadout_category in loadout_categories)
+		var/datum/loadout_category/LC = loadout_categories[loadout_category]
+		LC.gear = sortAssoc(LC.gear)
+	return 1
+
+/datum/gear
+	var/display_name       //Name/index. Must be unique.
+	var/description        //Description of this gear. If left blank will default to the description of the pathed item.
+	var/path               //Path to item.
+	var/cost = 1           //Number of points used. Items in general cost 1 point, storage/armor/gloves/special use costs 2 points.
+	var/slot               //Slot to equip to.
+	var/list/allowed_roles //Roles that can spawn with this item.
+	var/whitelisted        //Term to check the whitelist for..
+	var/sort_category = "General"
+	var/list/gear_tweaks = list() //List of datums which will alter the item after it has been spawned.
+	var/subtype_path = /datum/gear //for skipping organizational subtypes (optional)
+	var/subtype_cost_overlap = TRUE //if subtypes can take points at the same time
+
+/datum/gear/New()
+	..()
+	if(!description)
+		var/obj/O = path
+		description = initial(O.desc)
+
+/datum/gear_data
+	var/path
+	var/location
+
+/datum/gear_data/New(npath, nlocation)
+	path = npath
+	location = nlocation
+
+/datum/gear/proc/spawn_item(location, metadata)
+	var/datum/gear_data/gd = new(path, location)
+	for(var/datum/gear_tweak/gt in gear_tweaks)
+		gt.tweak_gear_data(metadata["[gt]"], gd)
+	var/item = new gd.path(gd.location)
+	for(var/datum/gear_tweak/gt in gear_tweaks)
+		gt.tweak_item(item, metadata["[gt]"])
+	return item
\ No newline at end of file
diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm
new file mode 100644
index 00000000000..e392f8a4087
--- /dev/null
+++ b/code/modules/client/preference/loadout/loadout_accessories.dm
@@ -0,0 +1,64 @@
+/datum/gear/accessory
+	subtype_path = /datum/gear/accessory
+	slot = slot_tie
+	sort_category = "Accessories"
+
+/datum/gear/accessory/scarf
+	display_name = "scarf"
+	path = /obj/item/clothing/accessory/scarf
+
+/datum/gear/accessory/scarf/red
+	display_name = "scarf, red"
+	path = /obj/item/clothing/accessory/scarf/red
+
+/datum/gear/accessory/scarf/green
+	display_name = "scarf, green"
+	path = /obj/item/clothing/accessory/scarf/green
+
+/datum/gear/accessory/scarf/darkblue
+	display_name = "scarf, dark blue"
+	path = /obj/item/clothing/accessory/scarf/darkblue
+
+/datum/gear/accessory/scarf/purple
+	display_name = "scarf, purple"
+	path = /obj/item/clothing/accessory/scarf/purple
+
+/datum/gear/accessory/scarf/yellow
+	display_name = "scarf, yellow"
+	path = /obj/item/clothing/accessory/scarf/yellow
+
+/datum/gear/accessory/scarf/orange
+	display_name = "scarf, orange"
+	path = /obj/item/clothing/accessory/scarf/orange
+
+/datum/gear/accessory/scarf/lightblue
+	display_name = "scarf, light blue"
+	path = /obj/item/clothing/accessory/scarf/lightblue
+
+/datum/gear/accessory/scarf/white
+	display_name = "scarf, white"
+	path = /obj/item/clothing/accessory/scarf/white
+
+/datum/gear/accessory/scarf/black
+	display_name = "scarf, black"
+	path = /obj/item/clothing/accessory/scarf/black
+
+/datum/gear/accessory/scarf/zebra
+	display_name = "scarf, zebra"
+	path = /obj/item/clothing/accessory/scarf/zebra
+
+/datum/gear/accessory/scarf/christmas
+	display_name = "scarf, christmas"
+	path = /obj/item/clothing/accessory/scarf/christmas
+
+/datum/gear/accessory/scarf/stripedred
+	display_name = "scarf, striped red"
+	path = /obj/item/clothing/accessory/stripedredscarf
+
+/datum/gear/accessory/scarf/stripedgreen
+	display_name = "scarf, striped green"
+	path = /obj/item/clothing/accessory/stripedgreenscarf
+
+/datum/gear/accessory/scarf/stripedblue
+	display_name = "scarf, striped blue"
+	path = /obj/item/clothing/accessory/stripedbluescarf
\ No newline at end of file
diff --git a/code/modules/client/preference/loadout/loadout_cosmetics.dm b/code/modules/client/preference/loadout/loadout_cosmetics.dm
new file mode 100644
index 00000000000..0b47a299ce6
--- /dev/null
+++ b/code/modules/client/preference/loadout/loadout_cosmetics.dm
@@ -0,0 +1,20 @@
+/datum/gear/lipstick
+	display_name = "lipstick, black"
+	path = /obj/item/weapon/lipstick/black
+	sort_category = "Cosmetics"
+
+/datum/gear/lipstick/jade
+	display_name = "lipstick, jade"
+	path = /obj/item/weapon/lipstick/jade
+
+/datum/gear/lipstick/purple
+	display_name = "lipstick, purple"
+	path = /obj/item/weapon/lipstick/purple
+
+/datum/gear/lipstick/red
+	display_name = "lipstick, red"
+	path = /obj/item/weapon/lipstick
+
+/datum/gear/monocle
+	display_name = "monocle"
+	path = /obj/item/clothing/glasses/monocle
\ No newline at end of file
diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm
new file mode 100644
index 00000000000..9266dc6ebf0
--- /dev/null
+++ b/code/modules/client/preference/loadout/loadout_general.dm
@@ -0,0 +1,3 @@
+/datum/gear/dice
+	display_name = "d20"
+	path = /obj/item/weapon/dice/d20
\ No newline at end of file
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
new file mode 100644
index 00000000000..826cc7d5838
--- /dev/null
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -0,0 +1,99 @@
+// Uniform slot
+/datum/gear/uniform
+	subtype_path = /datum/gear/uniform
+	slot = slot_w_uniform
+	sort_category = "Uniforms and Casual Dress"
+
+/datum/gear/uniform/skirt
+	subtype_path = /datum/gear/uniform/skirt
+
+/datum/gear/uniform/skirt/blue
+	display_name = "plaid skirt, blue"
+	path = /obj/item/clothing/under/dress/plaid_blue
+
+/datum/gear/uniform/skirt/purple
+	display_name = "plaid skirt, purple"
+	path = /obj/item/clothing/under/dress/plaid_purple
+
+/datum/gear/uniform/skirt/red
+	display_name = "plaid skirt, red"
+	path = /obj/item/clothing/under/dress/plaid_red
+
+/datum/gear/uniform/skirt/black
+	display_name = "skirt, black"
+	path = /obj/item/clothing/under/blackskirt
+
+/datum/gear/uniform/skirt/job
+	cost = 3
+	subtype_path = /datum/gear/uniform/skirt/job
+	subtype_cost_overlap = FALSE
+
+/datum/gear/uniform/skirt/job/ce
+	display_name = "skirt, ce"
+	path = /obj/item/clothing/under/rank/chief_engineer/skirt
+	allowed_roles = list("Chief Engineer")
+
+/datum/gear/uniform/skirt/job/atmos
+	display_name = "skirt, atmos"
+	path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
+	allowed_roles = list("Chief Engineer","Atmospheric Technician")
+
+/datum/gear/uniform/skirt/job/eng
+	display_name = "skirt, engineer"
+	path = /obj/item/clothing/under/rank/engineer/skirt
+	allowed_roles = list("Chief Engineer","Station Engineer")
+
+/datum/gear/uniform/skirt/job/roboticist
+	display_name = "skirt, roboticist"
+	path = /obj/item/clothing/under/rank/roboticist/skirt
+	allowed_roles = list("Research Director","Roboticist")
+
+/datum/gear/uniform/skirt/job/cmo
+	display_name = "skirt, cmo"
+	path = /obj/item/clothing/under/rank/chief_medical_officer
+	allowed_roles = list("Chief Medical Officer")
+
+/datum/gear/uniform/skirt/job/chem
+	display_name = "skirt, chemist"
+	path = /obj/item/clothing/under/rank/chemist/skirt
+	allowed_roles = list("Chief Medical Officer","Chemist")
+
+/datum/gear/uniform/skirt/job/viro
+	display_name = "skirt, virologist"
+	path = /obj/item/clothing/under/rank/virologist/skirt
+	allowed_roles = list("Chief Medical Officer","Medical Doctor")
+
+/datum/gear/uniform/skirt/job/med
+	display_name = "skirt, medical"
+	path = /obj/item/clothing/under/rank/medical/skirt
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
+
+/datum/gear/uniform/skirt/job/sci
+	display_name = "skirt, scientist"
+	path = /obj/item/clothing/under/rank/scientist/skirt
+	allowed_roles = list("Research Director","Scientist")
+
+/datum/gear/uniform/skirt/job/cargo
+	display_name = "skirt, cargo"
+	path = /obj/item/clothing/under/rank/cargotech/skirt
+	allowed_roles = list("Quartermaster","Cargo Technician")
+
+/datum/gear/uniform/skirt/job/qm
+	display_name = "skirt, QM"
+	path = /obj/item/clothing/under/rank/cargo/skirt
+	allowed_roles = list("Quartermaster")
+
+/datum/gear/uniform/skirt/job/warden
+	display_name = "skirt, warden"
+	path = /obj/item/clothing/under/rank/warden/skirt
+	allowed_roles = list("Head of Security", "Warden")
+
+/datum/gear/uniform/skirt/job/security
+	display_name = "skirt, security"
+	path = /obj/item/clothing/under/rank/security/skirt
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
+
+/datum/gear/uniform/skirt/job/head_of_security
+	display_name = "skirt, hos"
+	path = /obj/item/clothing/under/rank/head_of_security/skirt
+	allowed_roles = list("Head of Security")
\ No newline at end of file
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preference/preferences.dm
similarity index 93%
rename from code/modules/client/preferences.dm
rename to code/modules/client/preference/preferences.dm
index 6d1240ac86d..ee63e2e3243 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -1,1902 +1,2021 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
-
-var/list/preferences_datums = list()
-
-var/global/list/special_role_times = list( //minimum age (in days) for accounts to play these roles
-	ROLE_PAI = 0,
-	ROLE_POSIBRAIN = 0,
-	ROLE_GUARDIAN = 0,
-	ROLE_TRAITOR = 7,
-	ROLE_CHANGELING = 14,
-	ROLE_SHADOWLING = 14,
-	ROLE_WIZARD = 14,
-	ROLE_REV = 14,
-	ROLE_VAMPIRE = 14,
-	ROLE_BLOB = 14,
-	ROLE_REVENANT = 14,
-	ROLE_OPERATIVE = 21,
-	ROLE_CULTIST = 21,
-	ROLE_RAIDER = 21,
-	ROLE_ALIEN = 21,
-	ROLE_DEMON = 21,
-	ROLE_SENTIENT = 21,
-// 	ROLE_GANG = 21,
-	ROLE_BORER = 21,
-	ROLE_NINJA = 21,
-	ROLE_MUTINEER = 21,
-	ROLE_MALF = 30,
-	ROLE_ABDUCTOR = 30,
-)
-
-/proc/player_old_enough_antag(client/C, role)
-	if(available_in_days_antag(C, role) == 0)
-		return 1	//Available in 0 days = available right now = player is old enough to play.
-	return 0
-
-/proc/available_in_days_antag(client/C, role)
-	if(!C)
-		return 0
-	if(!role)
-		return 0
-	if(!config.use_age_restriction_for_antags)
-		return 0
-	if(!isnum(C.player_age))
-		return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced
-	var/minimal_player_age_antag = special_role_times[num2text(role)]
-	if(!isnum(minimal_player_age_antag))
-		return 0
-
-	return max(0, minimal_player_age_antag - C.player_age)
-
-/proc/check_client_age(client/C, var/days) // If days isn't provided, returns the age of the client. If it is provided, it returns the days until the player_age is equal to or greater than the days variable
-	if(!days)
-		return C.player_age
-	else
-		return max(0, days - C.player_age)
-	return 0
-
-//used for alternate_option
-#define GET_RANDOM_JOB 0
-#define BE_CIVILIAN 1
-#define RETURN_TO_LOBBY 2
-
-#define MAX_SAVE_SLOTS 20 // Save slots for regular players
-#define MAX_SAVE_SLOTS_MEMBER 20 // Save slots for BYOND members
-
-#define TAB_CHAR 0
-#define TAB_GAME 1
-
-/datum/preferences
-	//doohickeys for savefiles
-//	var/path
-	var/default_slot = 1				//Holder so it doesn't default to slot 1, rather the last one used
-//	var/savefile_version = 0
-	var/max_save_slots = MAX_SAVE_SLOTS
-
-	//non-preference stuff
-	var/warns = 0
-	var/muted = 0
-	var/last_ip
-	var/last_id
-
-	//game-preferences
-	var/lastchangelog = ""				//Saved changelog filesize to detect if there was a change
-	var/ooccolor = "#b82e00"
-	var/be_special = list()				//Special role selection
-	var/UI_style = "Midnight"
-	var/nanoui_fancy = TRUE
-	var/toggles = TOGGLES_DEFAULT
-	var/sound = SOUND_DEFAULT
-	var/show_ghostitem_attack = TRUE
-	var/UI_style_color = "#ffffff"
-	var/UI_style_alpha = 255
-
-
-	//character preferences
-	var/real_name						//our character's name
-	var/be_random_name = 0				//whether we are a random name every round
-	var/gender = MALE					//gender of character (well duh)
-	var/age = 30						//age of character
-	var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
-	var/b_type = "A+"					//blood type (not-chooseable)
-	var/underwear = "Nude"					//underwear type
-	var/undershirt = "Nude"					//undershirt type
-	var/socks = "Nude"					//socks type
-	var/backbag = 2						//backpack type
-	var/ha_style = "None"				//Head accessory style
-	var/r_headacc = 0					//Head accessory colour
-	var/g_headacc = 0					//Head accessory colour
-	var/b_headacc = 0					//Head accessory colour
-	var/m_style = "None"				//Marking style
-	var/r_markings = 0					//Marking colour
-	var/g_markings = 0					//Marking colour
-	var/b_markings = 0					//Marking colour
-	var/h_style = "Bald"				//Hair type
-	var/r_hair = 0						//Hair color
-	var/g_hair = 0						//Hair color
-	var/b_hair = 0						//Hair color
-	var/f_style = "Shaved"				//Face hair type
-	var/r_facial = 0					//Face hair color
-	var/g_facial = 0					//Face hair color
-	var/b_facial = 0					//Face hair color
-	var/s_tone = 0						//Skin tone
-	var/r_skin = 0						//Skin color
-	var/g_skin = 0						//Skin color
-	var/b_skin = 0						//Skin color
-	var/r_eyes = 0						//Eye color
-	var/g_eyes = 0						//Eye color
-	var/b_eyes = 0						//Eye color
-	var/species = "Human"
-	var/language = "None"				//Secondary language
-
-	var/body_accessory = null
-
-	var/speciesprefs = 0//I hate having to do this, I really do (Using this for oldvox code, making names universal I guess
-
-		//Mob preview
-	var/icon/preview_icon = null
-	var/icon/preview_icon_front = null
-	var/icon/preview_icon_side = null
-
-		//Jobs, uses bitflags
-	var/job_support_high = 0
-	var/job_support_med = 0
-	var/job_support_low = 0
-
-	var/job_medsci_high = 0
-	var/job_medsci_med = 0
-	var/job_medsci_low = 0
-
-	var/job_engsec_high = 0
-	var/job_engsec_med = 0
-	var/job_engsec_low = 0
-
-	var/job_karma_high = 0
-	var/job_karma_med = 0
-	var/job_karma_low = 0
-
-	//Keeps track of preferrence for not getting any wanted jobs
-	var/alternate_option = 0
-
-	// maps each organ to either null(intact), "cyborg" or "amputated"
-	// will probably not be able to do this for head and torso ;)
-	var/list/organ_data = list()
-	var/list/rlimb_data = list()
-
-	var/list/player_alt_titles = new()		// the default name of a job like "Medical Doctor"
-//	var/accent = "en-us"
-//	var/voice = "m1"
-//	var/pitch = 50
-//	var/talkspeed = 175
-	var/flavor_text = ""
-	var/med_record = ""
-	var/sec_record = ""
-	var/gen_record = ""
-	var/disabilities = 0
-
-	var/nanotrasen_relation = "Neutral"
-
-	// 0 = character settings, 1 = game preferences
-	var/current_tab = TAB_CHAR
-
-		// OOC Metadata:
-	var/metadata = ""
-	var/slot_name = ""
-
-	// Whether or not to use randomized character slots
-	var/randomslot = 0
-
-	// jukebox volume
-	var/volume = 100
-
-	// BYOND membership
-	var/unlock_content = 0
-
-/datum/preferences/New(client/C)
-	b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
-	if(istype(C))
-		if(!IsGuestKey(C.key))
-			unlock_content = C.IsByondMember()
-			if(unlock_content)
-				max_save_slots = MAX_SAVE_SLOTS_MEMBER
-	var/loaded_preferences_successfully = load_preferences(C)
-	if(loaded_preferences_successfully)
-		if(load_character(C))
-			return
-	//we couldn't load character data so just randomize the character appearance + name
-	random_character()		//let's create a random character then - rather than a fat, bald and naked man.
-	real_name = random_name(gender)
-	if(!loaded_preferences_successfully)
-		save_preferences(C)
-	save_character(C)		//let's save this new random character so it doesn't keep generating new ones.
-
-/datum/preferences/proc/color_square(r, g, b)
-	return "<span style='font-face: fixedsys; background-color: #[num2hex(r, 2)][num2hex(g, 2)][num2hex(b, 2)]; color: #[num2hex(r, 2)][num2hex(g, 2)][num2hex(b, 2)]'>___</span>"
-
-// Hello I am a proc full of snowflake species checks how are you
-/datum/preferences/proc/ShowChoices(mob/user)
-	if(!user || !user.client)
-		return
-	update_preview_icon()
-	user << browse_rsc(preview_icon_front, "previewicon.png")
-	user << browse_rsc(preview_icon_side, "previewicon2.png")
-
-	var/dat = ""
-	dat += "<center>"
-	dat += "<a href='?_src_=prefs;preference=tab;tab=[TAB_CHAR]' [current_tab == TAB_CHAR ? "class='linkOn'" : ""]>Character Settings</a>"
-	dat += "<a href='?_src_=prefs;preference=tab;tab=[TAB_GAME]' [current_tab == TAB_GAME ? "class='linkOn'" : ""]>Game Preferences</a>"
-	dat += "</center>"
-	dat += "<HR>"
-
-	switch(current_tab)
-		if(TAB_CHAR) // Character Settings
-			dat += "<div class='statusDisplay' style='max-width: 128px; position: absolute; left: 150px; top: 150px'><img src=previewicon.png height=64 width=64><img src=previewicon2.png height=64 width=64></div>"
-			dat += "<table width='100%'><tr><td width='405px' height='25px' valign='top'>"
-			dat += "<b>Name: </b>"
-			dat += "<a href='?_src_=prefs;preference=name;task=input'><b>[real_name]</b></a>"
-			dat += "<a href='?_src_=prefs;preference=name;task=random'>(Randomize)</a>"
-			dat += "<a href='?_src_=prefs;preference=name'><span class='[be_random_name ? "good" : "bad"]'>(Always Randomize)</span></a><br>"
-			dat += "</td><td width='405px' height='25px' valign='left'>"
-			dat += "<center>"
-			dat += "Slot <b>[slot_name]</b> - "
-			dat += "<a href=\"byond://?src=\ref[user];preference=open_load_dialog\">Load slot</a> - "
-			dat += "<a href=\"byond://?src=\ref[user];preference=save\">Save slot</a> - "
-			dat += "<a href=\"byond://?src=\ref[user];preference=reload\">Reload slot</a>"
-			dat += "</center>"
-			dat += "</td></tr></table>"
-			dat += "<table width='100%'><tr><td width='405px' height='200px' valign='top'>"
-			dat += "<h2>Identity</h2>"
-			if(appearance_isbanned(user))
-				dat += "<b>You are banned from using custom names and appearances. \
-				You can continue to adjust your characters, but you will be randomised once you join the game.\
-				</b><br>"
-			dat += "<b>Gender:</b> <a href='?_src_=prefs;preference=gender'>[gender == MALE ? "Male" : "Female"]</a><br>"
-			dat += "<b>Age:</b> <a href='?_src_=prefs;preference=age;task=input'>[age]</a><br>"
-			dat += "<b>Body:</b> <a href='?_src_=prefs;preference=all;task=random'>(&reg;)</a><br>"
-			dat += "<b>Species:</b> <a href='?_src_=prefs;preference=species;task=input'>[species]</a><br>"
-			if(species == "Vox")
-				dat += "<b>N2 Tank:</b> <a href='?_src_=prefs;preference=speciesprefs;task=input'>[speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank"]</a><br>"
-			dat += "<b>Secondary Language:</b> <a href='?_src_=prefs;preference=language;task=input'>[language]</a><br>"
-			dat += "<b>Blood Type:</b> <a href='?_src_=prefs;preference=b_type;task=input'>[b_type]</a><br>"
-			if(species in list("Human", "Drask", "Vox"))
-				dat += "<b>Skin Tone:</b> <a href='?_src_=prefs;preference=s_tone;task=input'>[species == "Vox" ? "[s_tone]" : "[-s_tone + 35]/220"]</a><br>"
-			dat += "<b>Disabilities:</b> <a href='?_src_=prefs;preference=disabilities'>\[Set\]</a><br>"
-			dat += "<b>Nanotrasen Relation:</b> <a href ='?_src_=prefs;preference=nt_relation;task=input'>[nanotrasen_relation]</a><br>"
-			dat += "<a href='byond://?src=\ref[user];preference=flavor_text;task=input'>Set Flavor Text</a><br>"
-			if(lentext(flavor_text) <= 40)
-				if(!lentext(flavor_text))	dat += "\[...\]<br>"
-				else						dat += "[flavor_text]<br>"
-			else dat += "[TextPreview(flavor_text)]...<br>"
-
-			dat += "<h2>Hair & Accessories</h2>"
-
-			if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species that have head accessories.
-				var/headaccessoryname = "Head Accessory: "
-				if(species == "Unathi")
-					headaccessoryname = "Horns: "
-				dat += "<b>[headaccessoryname]</b>"
-				dat += "<a href='?_src_=prefs;preference=ha_style;task=input'>[ha_style]</a> "
-				dat += "<a href='?_src_=prefs;preference=headaccessory;task=input'>Color</a> [color_square(r_headacc, g_headacc, b_headacc)]<br>"
-
-			if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species that have body markings.
-				dat += "<b>Body Markings:</b> "
-				dat += "<a href='?_src_=prefs;preference=m_style;task=input'>[m_style]</a>"
-				dat += "<a href='?_src_=prefs;preference=markings;task=input'>Color</a> [color_square(r_markings, g_markings, b_markings)]<br>"
-
-			dat += "<b>Hair:</b> "
-			dat += "<a href='?_src_=prefs;preference=h_style;task=input'>[h_style]</a>"
-			dat += "<a href='?_src_=prefs;preference=hair;task=input'>Color</a> [color_square(r_hair, g_hair, b_hair)]<br>"
-
-			dat += "<b>Facial Hair:</b> "
-			dat += "<a href='?_src_=prefs;preference=f_style;task=input'>[f_style ? "[f_style]" : "Shaved"]</a>"
-			dat += "<a href='?_src_=prefs;preference=facial;task=input'>Color</a> [color_square(r_facial, g_facial, b_facial)]<br>"
-
-			if(species != "Machine")
-				dat += "<b>Eyes:</b> "
-				dat += "<a href='?_src_=prefs;preference=eyes;task=input'>Color</a> [color_square(r_eyes, g_eyes, b_eyes)]<br>"
-
-			if((species in list("Unathi", "Tajaran", "Skrell", "Slime People", "Vulpkanin", "Machine")) || body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user)) //admins can always fuck with this, because they are admins
-				dat += "<b>Body Color:</b> "
-				dat += "<a href='?_src_=prefs;preference=skin;task=input'>Color</a> [color_square(r_skin, g_skin, b_skin)]<br>"
-
-			if(body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user))
-				dat += "<b>Body Accessory:</b> "
-				dat += "<a href='?_src_=prefs;preference=body_accessory;task=input'>[body_accessory ? "[body_accessory]" : "None"]</a><br>"
-
-			dat += "</td><td width='405px' height='200px' valign='top'>"
-			dat += "<h2>Occupation Choices</h2>"
-			dat += "<a href='?_src_=prefs;preference=job;task=menu'>Set Occupation Preferences</a><br>"
-			if(jobban_isbanned(user, "Records"))
-				dat += "<b>You are banned from using character records.</b><br>"
-			else
-				dat += "<a href=\"byond://?src=\ref[user];preference=records;record=1\">Character Records</a><br>"
-
-			dat += "<h2>Limbs</h2>"
-			dat += "<b>Limbs and Parts:</b> <a href='?_src_=prefs;preference=limbs;task=input'>Adjust</a><br>"
-			if(species != "Slime People" && species != "Machine")
-				dat += "<b>Internal Organs:</b> <a href='?_src_=prefs;preference=organs;task=input'>Adjust</a><br>"
-
-			//display limbs below
-			var/ind = 0
-			for(var/name in organ_data)
-				var/status = organ_data[name]
-				var/organ_name = null
-				switch(name)
-					if("chest")		organ_name = "torso"
-					if("groin")		organ_name = "lower body"
-					if("head")		organ_name = "head"
-					if("l_arm")		organ_name = "left arm"
-					if("r_arm")		organ_name = "right arm"
-					if("l_leg")		organ_name = "left leg"
-					if("r_leg")		organ_name = "right leg"
-					if("l_foot")	organ_name = "left foot"
-					if("r_foot")	organ_name = "right foot"
-					if("l_hand")	organ_name = "left hand"
-					if("r_hand")	organ_name = "right hand"
-					if("heart")		organ_name = "heart"
-					if("eyes")		organ_name = "eyes"
-
-				if(status in list("cyborg", "amputated", "mechanical", "assisted"))
-					++ind
-					if(ind > 1) dat += ", "
-
-				switch(status)
-					if("cyborg")
-						var/datum/robolimb/R
-						if(rlimb_data[name] && all_robolimbs[rlimb_data[name]])
-							R = all_robolimbs[rlimb_data[name]]
-						else
-							R = basic_robolimb
-						dat += "\t[R.company] [organ_name] prosthesis"
-					if("amputated")		dat += "\tAmputated [organ_name]"
-					if("mechanical")	dat += "\tMechanical [organ_name]"
-					if("assisted")
-						switch(organ_name)
-							if("heart")		dat += "\tPacemaker-assisted [organ_name]"
-							if("voicebox")	dat += "\tSurgically altered [organ_name]"
-							if("eyes")		dat += "\tRetinal overlayed [organ_name]"
-							else			dat += "\tMechanically assisted [organ_name]"
-			if(!ind)	dat += "\[...\]<br>"
-			else		dat += "<br>"
-
-			dat += "<h2>Clothing</h2>"
-			dat += "<b>Underwear:</b> <a href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a><BR>"
-			dat += "<b>Undershirt:</b> <a href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a><BR>"
-			dat += "<b>Socks:</b> <a href ='?_src_=prefs;preference=socks;task=input'>[socks]</a><BR>"
-			dat += "<b>Backpack Type:</b> <a href ='?_src_=prefs;preference=bag;task=input'>[backbaglist[backbag]]</a><br>"
-
-			dat += "</td></tr></table>"
-
-		if(TAB_GAME) // General Preferences
-			dat += "<table><tr><td width='340px' height='300px' valign='top'>"
-			dat += "<h2>General Settings</h2>"
-			dat += "<b>Fancy NanoUI:</b> <a href='?_src_=prefs;preference=nanoui'>[(nanoui_fancy) ? "Yes" : "No"]</a><br>"
-			dat += "<b>Ghost-Item Attack Animation:</b> <a href='?_src_=prefs;preference=ghost_att_anim'>[(show_ghostitem_attack) ? "Yes" : "No"]</a><br>"
-			dat += "<b>Custom UI settings:</b><br>"
-			dat += " - <b>UI Style:</b> <a href='?_src_=prefs;preference=ui'><b>[UI_style]</b></a><br>"
-			dat += " - <b>Color:</b> <a href='?_src_=prefs;preference=UIcolor'><b>[UI_style_color]</b></a> <table style='display:inline;' bgcolor='[UI_style_color]'<tr><td>__</td></tr></table><br>"
-			dat += " - <b>Alpha (transparency):</b> <a href='?_src_=prefs;preference=UIalpha'><b>[UI_style_alpha]</b></a><br>"
-			dat += "<br>"
-			dat += "<b>Play admin midis:</b> <a href='?_src_=prefs;preference=hear_midis'><b>[(sound & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>"
-			dat += "<b>Play lobby music:</b> <a href='?_src_=prefs;preference=lobby_music'><b>[(sound & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>"
-			if(user.client.holder)
-				dat += "<b>Adminhelp sound:</b> "
-				dat += "<a href='?_src_=prefs;preference=hear_adminhelps'><b>[(sound & SOUND_ADMINHELP)?"On":"Off"]</b></a><br>"
-
-			if(check_rights(R_ADMIN,0))
-				dat += "<b>OOC:</b> <span style='border: 1px solid #161616; background-color: [ooccolor ? ooccolor : normal_ooc_colour];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=ooccolor;task=input'><b>Change</b></a><br>"
-			if(config.allow_Metadata)
-				dat += "<b>OOC notes:</b> <a href='?_src_=prefs;preference=metadata;task=input'><b>Edit</b></a><br>"
-			if(unlock_content)
-				dat += "<b>BYOND Membership Publicity:</b> <a href='?_src_=prefs;preference=publicity'><b>[(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"]</b></a><br>"
-
-			dat += "<b>Randomized character slot:</b> <a href='?_src_=prefs;preference=randomslot'><b>[randomslot ? "Yes" : "No"]</b></a><br>"
-			dat += "<b>Ghost ears:</b> <a href='?_src_=prefs;preference=ghost_ears'><b>[(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]</b></a><br>"
-			dat += "<b>Ghost sight:</b> <a href='?_src_=prefs;preference=ghost_sight'><b>[(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]</b></a><br>"
-			dat += "<b>Ghost radio:</b> <a href='?_src_=prefs;preference=ghost_radio'><b>[(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"]</b></a><br>"
-
-			dat += "</td><td width='300px' height='300px' valign='top'>"
-			dat += "<h2>Special Role Settings</h2>"
-			if(jobban_isbanned(user, "Syndicate"))
-				dat += "<b>You are banned from special roles.</b>"
-				be_special = list()
-			else
-				for(var/i in special_roles)
-					if(jobban_isbanned(user, i))
-						dat += "<b>Be [capitalize(i)]:</b> <font color=red><b> \[BANNED]</b></font><br>"
-					else if(!player_old_enough_antag(user.client,i))
-						var/available_in_days_antag = available_in_days_antag(user.client,i)
-						dat += "<b>Be [capitalize(i)]:</b> <font color=red><b> \[IN [(available_in_days_antag)] DAYS]</b></font><br>"
-					else
-						dat += "<b>Be [capitalize(i)]:</b> <a href='?_src_=prefs;preference=be_special;role=[i]'><b>[(i in src.be_special) ? "Yes" : "No"]</b></a><br>"
-			dat += "</td></tr></table>"
-
-	dat += "<hr><center>"
-	if(!IsGuestKey(user.key))
-		dat += "<a href='?_src_=prefs;preference=load'>Undo</a> - "
-		dat += "<a href='?_src_=prefs;preference=save'>Save Setup</a> - "
-
-	dat += "<a href='?_src_=prefs;preference=reset_all'>Reset Setup</a>"
-	dat += "</center>"
-
-	var/datum/browser/popup = new(user, "preferences", "<div align='center'>Character Setup</div>", 820, 640)
-	popup.set_content(dat)
-	popup.open(0)
-
-/datum/preferences/proc/SetChoices(mob/user, limit = 12, list/splitJobs = list("Civilian","Research Director","AI","Bartender"), width = 760, height = 790)
-	if(!job_master)
-		return
-
-	//limit 	 - The amount of jobs allowed per column. Defaults to 17 to make it look nice.
-	//splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice.
-	//width	 - Screen' width. Defaults to 550 to make it look nice.
-	//height 	 - Screen's height. Defaults to 500 to make it look nice.
-
-
-	var/HTML = "<body>"
-	HTML += "<tt><center>"
-	HTML += "<b>Choose occupation chances</b><br>Unavailable occupations are crossed out.<br><br>"
-	HTML += "<center><a href='?_src_=prefs;preference=job;task=close'>\[Done\]</a></center><br>" // Easier to press up here.
-	HTML += "<div align='center'>Left-click to raise an occupation preference, right-click to lower it.<br></div>"
-	HTML += "<script type='text/javascript'>function setJobPrefRedirect(level, rank) { window.location.href='?_src_=prefs;preference=job;task=setJobLevel;level=' + level + ';text=' + encodeURIComponent(rank); return false; }</script>"
-	HTML += "<table width='100%' cellpadding='1' cellspacing='0'><tr><td width='20%'>" // Table within a table for alignment, also allows you to easily add more colomns.
-	HTML += "<table width='100%' cellpadding='1' cellspacing='0'>"
-	var/index = -1
-
-	//The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows.
-	var/datum/job/lastJob
-	if (!job_master)		return
-	for(var/datum/job/job in job_master.occupations)
-
-		if (job.admin_only)
-			continue
-
-		index += 1
-		if((index >= limit) || (job.title in splitJobs))
-			if((index < limit) && (lastJob != null))
-				//If the cells were broken up by a job in the splitJob list then it will fill in the rest of the cells with
-				//the last job's selection color. Creating a rather nice effect.
-				for(var/i = 0, i < (limit - index), i += 1)
-					HTML += "<tr bgcolor='[lastJob.selection_color]'><td width='60%' align='right'>&nbsp</td><td>&nbsp</td></tr>"
-			HTML += "</table></td><td width='20%'><table width='100%' cellpadding='1' cellspacing='0'>"
-			index = 0
-
-		HTML += "<tr bgcolor='[job.selection_color]'><td width='60%' align='right'>"
-		var/rank = job.title
-		lastJob = job
-		if(!is_job_whitelisted(user, rank))
-			HTML += "<font color=red>[rank]</font></td><td><font color=red><b> \[KARMA]</b></font></td></tr>"
-			continue
-		if(jobban_isbanned(user, rank))
-			HTML += "<del>[rank]</del></td><td><b> \[BANNED]</b></td></tr>"
-			continue
-		if(!job.player_old_enough(user.client))
-			var/available_in_days = job.available_in_days(user.client)
-			HTML += "<del>[rank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
-			continue
-		if((job_support_low & CIVILIAN) && (rank != "Civilian"))
-			HTML += "<font color=orange>[rank]</font></td><td></td></tr>"
-			continue
-		if((rank in command_positions) || (rank == "AI"))//Bold head jobs
-			HTML += "<b><span class='dark'>[rank]</span></b>"
-		else
-			HTML += "<span class='dark'>[rank]</span>"
-
-		HTML += "</td><td width='40%'>"
-
-		var/prefLevelLabel = "ERROR"
-		var/prefLevelColor = "pink"
-		var/prefUpperLevel = -1 // level to assign on left click
-		var/prefLowerLevel = -1 // level to assign on right click
-
-		if(GetJobDepartment(job, 1) & job.flag)
-			prefLevelLabel = "High"
-			prefLevelColor = "slateblue"
-			prefUpperLevel = 4
-			prefLowerLevel = 2
-		else if(GetJobDepartment(job, 2) & job.flag)
-			prefLevelLabel = "Medium"
-			prefLevelColor = "green"
-			prefUpperLevel = 1
-			prefLowerLevel = 3
-		else if(GetJobDepartment(job, 3) & job.flag)
-			prefLevelLabel = "Low"
-			prefLevelColor = "orange"
-			prefUpperLevel = 2
-			prefLowerLevel = 4
-		else
-			prefLevelLabel = "NEVER"
-			prefLevelColor = "red"
-			prefUpperLevel = 3
-			prefLowerLevel = 1
-
-
-		HTML += "<a class='white' href='?_src_=prefs;preference=job;task=setJobLevel;level=[prefUpperLevel];text=[rank]' oncontextmenu='javascript:return setJobPrefRedirect([prefLowerLevel], \"[rank]\");'>"
-
-//			HTML += "<a href='?_src_=prefs;preference=job;task=input;text=[rank]'>"
-
-		if(rank == "Civilian")//Civilian is special
-			if(job_support_low & CIVILIAN)
-				HTML += " <font color=green>\[Yes]</font></a>"
-			else
-				HTML += " <font color=red>\[No]</font></a>"
-			if(job.alt_titles)
-				HTML += "<br><b><a class='white' href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
-			HTML += "</td></tr>"
-			continue
-/*
-		if(GetJobDepartment(job, 1) & job.flag)
-			HTML += " <font color=blue>\[High]</font>"
-		else if(GetJobDepartment(job, 2) & job.flag)
-			HTML += " <font color=green>\[Medium]</font>"
-		else if(GetJobDepartment(job, 3) & job.flag)
-			HTML += " <font color=orange>\[Low]</font>"
-		else
-			HTML += " <font color=red>\[NEVER]</font>"
-			*/
-		HTML += "<font color=[prefLevelColor]>[prefLevelLabel]</font></a>"
-
-		if(job.alt_titles)
-			HTML += "<br><b><a class='white' href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
-
-
-		HTML += "</td></tr>"
-
-	for(var/i = 1, i < (limit - index), i += 1) // Finish the column so it is even
-		HTML += "<tr bgcolor='[lastJob.selection_color]'><td width='60%' align='right'>&nbsp</td><td>&nbsp</td></tr>"
-
-	HTML += "</td'></tr></table>"
-
-	HTML += "</center></table>"
-
-	switch(alternate_option)
-		if(GET_RANDOM_JOB)
-			HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Get random job if preferences unavailable</font></a></u></center><br>"
-		if(BE_CIVILIAN)
-			HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Be a civilian if preferences unavailable</font></a></u></center><br>"
-		if(RETURN_TO_LOBBY)
-			HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Return to lobby if preferences unavailable</font></a></u></center><br>"
-
-	HTML += "<center><a href='?_src_=prefs;preference=job;task=reset'>\[Reset\]</a></center>"
-	HTML += "</tt>"
-
-	user << browse(null, "window=preferences")
-//		user << browse(HTML, "window=mob_occupation;size=[width]x[height]")
-	var/datum/browser/popup = new(user, "mob_occupation", "<div align='center'>Occupation Preferences</div>", width, height)
-	popup.set_window_options("can_close=0")
-	popup.set_content(HTML)
-	popup.open(0)
-	return
-
-/datum/preferences/proc/SetJobPreferenceLevel(var/datum/job/job, var/level)
-	if (!job)
-		return 0
-
-	if (level == 1) // to high
-		// remove any other job(s) set to high
-		job_support_med |= job_support_high
-		job_engsec_med |= job_engsec_high
-		job_medsci_med |= job_medsci_high
-		job_karma_med |= job_karma_high
-		job_support_high = 0
-		job_engsec_high = 0
-		job_medsci_high = 0
-		job_karma_high = 0
-
-	if (job.department_flag == SUPPORT)
-		job_support_low &= ~job.flag
-		job_support_med &= ~job.flag
-		job_support_high &= ~job.flag
-
-		switch(level)
-			if (1)
-				job_support_high |= job.flag
-			if (2)
-				job_support_med |= job.flag
-			if (3)
-				job_support_low |= job.flag
-
-		return 1
-	else if (job.department_flag == ENGSEC)
-		job_engsec_low &= ~job.flag
-		job_engsec_med &= ~job.flag
-		job_engsec_high &= ~job.flag
-
-		switch(level)
-			if (1)
-				job_engsec_high |= job.flag
-			if (2)
-				job_engsec_med |= job.flag
-			if (3)
-				job_engsec_low |= job.flag
-
-		return 1
-	else if (job.department_flag == MEDSCI)
-		job_medsci_low &= ~job.flag
-		job_medsci_med &= ~job.flag
-		job_medsci_high &= ~job.flag
-
-		switch(level)
-			if (1)
-				job_medsci_high |= job.flag
-			if (2)
-				job_medsci_med |= job.flag
-			if (3)
-				job_medsci_low |= job.flag
-
-		return 1
-	else if (job.department_flag == KARMA)
-		job_karma_low &= ~job.flag
-		job_karma_med &= ~job.flag
-		job_karma_high &= ~job.flag
-
-		switch(level)
-			if (1)
-				job_karma_high |= job.flag
-			if (2)
-				job_karma_med |= job.flag
-			if (3)
-				job_karma_low |= job.flag
-
-		return 1
-
-	return 0
-
-/datum/preferences/proc/UpdateJobPreference(mob/user, role, desiredLvl)
-	var/datum/job/job = job_master.GetJob(role)
-
-	if(!job)
-		user << browse(null, "window=mob_occupation")
-		ShowChoices(user)
-		return
-
-	if (!isnum(desiredLvl))
-		to_chat(user, "\red UpdateJobPreference - desired level was not a number. Please notify coders!")
-		ShowChoices(user)
-		return
-
-	if(role == "Civilian")
-		if(job_support_low & job.flag)
-			job_support_low &= ~job.flag
-		else
-			job_support_low |= job.flag
-		SetChoices(user)
-		return 1
-
-	SetJobPreferenceLevel(job, desiredLvl)
-	SetChoices(user)
-
-	return 1
-
-/datum/preferences/proc/ShowDisabilityState(mob/user,flag,label)
-	if(flag==DISABILITY_FLAG_FAT && species!=("Human" || "Tajaran" || "Grey"))
-		return "<li><i>[species] cannot be fat.</i></li>"
-	return "<li><b>[label]:</b> <a href=\"?_src_=prefs;task=input;preference=disabilities;disability=[flag]\">[disabilities & flag ? "Yes" : "No"]</a></li>"
-
-/datum/preferences/proc/SetDisabilities(mob/user)
-	var/HTML = "<body>"
-
-	// AUTOFIXED BY fix_string_idiocy.py
-	// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\client\preferences.dm:474: HTML += "<tt><center>"
-	HTML += {"<tt><center>
-		<b>Choose disabilities</b><ul>"}
-	// END AUTOFIX
-	HTML += ShowDisabilityState(user,DISABILITY_FLAG_NEARSIGHTED,"Needs Glasses")
-	HTML += ShowDisabilityState(user,DISABILITY_FLAG_FAT,"Obese")
-	HTML += ShowDisabilityState(user,DISABILITY_FLAG_EPILEPTIC,"Seizures")
-	HTML += ShowDisabilityState(user,DISABILITY_FLAG_DEAF,"Deaf")
-	HTML += ShowDisabilityState(user,DISABILITY_FLAG_BLIND,"Blind")
-	HTML += ShowDisabilityState(user,DISABILITY_FLAG_MUTE,"Mute")
-
-
-	// AUTOFIXED BY fix_string_idiocy.py
-	// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\client\preferences.dm:481: HTML += "</ul>"
-	HTML += {"</ul>
-		<a href=\"?_src_=prefs;task=close;preference=disabilities\">\[Done\]</a>
-		<a href=\"?_src_=prefs;task=reset;preference=disabilities\">\[Reset\]</a>
-		</center></tt>"}
-	// END AUTOFIX
-	user << browse(null, "window=preferences")
-	user << browse(HTML, "window=disabil;size=350x300")
-	return
-
-/datum/preferences/proc/SetRecords(mob/user)
-	var/HTML = "<body>"
-	HTML += "<tt><center>"
-	HTML += "<b>Set Character Records</b><br>"
-
-	HTML += "<a href=\"byond://?src=\ref[user];preference=records;task=med_record\">Medical Records</a><br>"
-
-	if(lentext(med_record) <= 40)
-		HTML += "[med_record]"
-	else
-		HTML += "[copytext(med_record, 1, 37)]..."
-
-	HTML += "<br><br><a href=\"byond://?src=\ref[user];preference=records;task=gen_record\">Employment Records</a><br>"
-
-	if(lentext(gen_record) <= 40)
-		HTML += "[gen_record]"
-	else
-		HTML += "[copytext(gen_record, 1, 37)]..."
-
-	HTML += "<br><br><a href=\"byond://?src=\ref[user];preference=records;task=sec_record\">Security Records</a><br>"
-
-	if(lentext(sec_record) <= 40)
-		HTML += "[sec_record]<br>"
-	else
-		HTML += "[copytext(sec_record, 1, 37)]...<br>"
-
-	HTML += "<br>"
-	HTML += "<a href=\"byond://?src=\ref[user];preference=records;records=-1\">\[Done\]</a>"
-	HTML += "</center></tt>"
-
-	user << browse(null, "window=preferences")
-	user << browse(HTML, "window=records;size=350x300")
-	return
-
-/datum/preferences/proc/GetPlayerAltTitle(datum/job/job)
-	return player_alt_titles.Find(job.title) > 0 \
-		? player_alt_titles[job.title] \
-		: job.title
-
-/datum/preferences/proc/SetPlayerAltTitle(datum/job/job, new_title)
-	// remove existing entry
-	if(player_alt_titles.Find(job.title))
-		player_alt_titles -= job.title
-	// add one if it's not default
-	if(job.title != new_title)
-		player_alt_titles[job.title] = new_title
-
-/datum/preferences/proc/SetJob(mob/user, role)
-	var/datum/job/job = job_master.GetJob(role)
-	if(!job)
-		user << browse(null, "window=mob_occupation")
-		ShowChoices(user)
-		return
-
-	if(role == "Civilian")
-		if(job_support_low & job.flag)
-			job_support_low &= ~job.flag
-		else
-			job_support_low |= job.flag
-		SetChoices(user)
-		return 1
-
-	if(GetJobDepartment(job, 1) & job.flag)
-		SetJobDepartment(job, 1)
-	else if(GetJobDepartment(job, 2) & job.flag)
-		SetJobDepartment(job, 2)
-	else if(GetJobDepartment(job, 3) & job.flag)
-		SetJobDepartment(job, 3)
-	else//job = Never
-		SetJobDepartment(job, 4)
-
-	SetChoices(user)
-	return 1
-
-/datum/preferences/proc/ResetJobs()
-	job_support_high = 0
-	job_support_med = 0
-	job_support_low = 0
-
-	job_medsci_high = 0
-	job_medsci_med = 0
-	job_medsci_low = 0
-
-	job_engsec_high = 0
-	job_engsec_med = 0
-	job_engsec_low = 0
-
-	job_karma_high = 0
-	job_karma_med = 0
-	job_karma_low = 0
-
-
-/datum/preferences/proc/GetJobDepartment(var/datum/job/job, var/level)
-	if(!job || !level)	return 0
-	switch(job.department_flag)
-		if(SUPPORT)
-			switch(level)
-				if(1)
-					return job_support_high
-				if(2)
-					return job_support_med
-				if(3)
-					return job_support_low
-		if(MEDSCI)
-			switch(level)
-				if(1)
-					return job_medsci_high
-				if(2)
-					return job_medsci_med
-				if(3)
-					return job_medsci_low
-		if(ENGSEC)
-			switch(level)
-				if(1)
-					return job_engsec_high
-				if(2)
-					return job_engsec_med
-				if(3)
-					return job_engsec_low
-		if(KARMA)
-			switch(level)
-				if(1)
-					return job_karma_high
-				if(2)
-					return job_karma_med
-				if(3)
-					return job_karma_low
-	return 0
-
-/datum/preferences/proc/SetJobDepartment(var/datum/job/job, var/level)
-	if(!job || !level)	return 0
-	switch(level)
-		if(1)//Only one of these should ever be active at once so clear them all here
-			job_support_high = 0
-			job_medsci_high = 0
-			job_engsec_high = 0
-			job_karma_high = 0
-			return 1
-		if(2)//Set current highs to med, then reset them
-			job_support_med |= job_support_high
-			job_medsci_med |= job_medsci_high
-			job_engsec_med |= job_engsec_high
-			job_karma_med |= job_karma_high
-			job_support_high = 0
-			job_medsci_high = 0
-			job_engsec_high = 0
-			job_karma_high = 0
-
-	switch(job.department_flag)
-		if(SUPPORT)
-			switch(level)
-				if(2)
-					job_support_high = job.flag
-					job_support_med &= ~job.flag
-				if(3)
-					job_support_med |= job.flag
-					job_support_low &= ~job.flag
-				else
-					job_support_low |= job.flag
-		if(MEDSCI)
-			switch(level)
-				if(2)
-					job_medsci_high = job.flag
-					job_medsci_med &= ~job.flag
-				if(3)
-					job_medsci_med |= job.flag
-					job_medsci_low &= ~job.flag
-				else
-					job_medsci_low |= job.flag
-		if(ENGSEC)
-			switch(level)
-				if(2)
-					job_engsec_high = job.flag
-					job_engsec_med &= ~job.flag
-				if(3)
-					job_engsec_med |= job.flag
-					job_engsec_low &= ~job.flag
-				else
-					job_engsec_low |= job.flag
-		if(KARMA)
-			switch(level)
-				if(2)
-					job_karma_high = job.flag
-					job_karma_med &= ~job.flag
-				if(3)
-					job_karma_med |= job.flag
-					job_karma_low &= ~job.flag
-				else
-					job_karma_low |= job.flag
-	return 1
-
-/datum/preferences/proc/process_link(mob/user, list/href_list)
-	if(!user)	return
-
-	if(href_list["preference"] == "job")
-		switch(href_list["task"])
-			if("close")
-				user << browse(null, "window=mob_occupation")
-				ShowChoices(user)
-			if("reset")
-				ResetJobs()
-				SetChoices(user)
-			if("random")
-				if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_CIVILIAN)
-					alternate_option += 1
-				else if(alternate_option == RETURN_TO_LOBBY)
-					alternate_option = 0
-				else
-					return 0
-				SetChoices(user)
-			if ("alt_title")
-				var/datum/job/job = locate(href_list["job"])
-				if (job)
-					var/choices = list(job.title) + job.alt_titles
-					var/choice = input("Pick a title for [job.title].", "Character Generation", GetPlayerAltTitle(job)) as anything in choices | null
-					if(choice)
-						SetPlayerAltTitle(job, choice)
-						SetChoices(user)
-			if("input")
-				SetJob(user, href_list["text"])
-			if("setJobLevel")
-				UpdateJobPreference(user, href_list["text"], text2num(href_list["level"]))
-			else
-				SetChoices(user)
-		return 1
-	else if(href_list["preference"] == "disabilities")
-
-		switch(href_list["task"])
-			if("close")
-				user << browse(null, "window=disabil")
-				ShowChoices(user)
-			if("reset")
-				disabilities=0
-				SetDisabilities(user)
-			if("input")
-				var/dflag=text2num(href_list["disability"])
-				if(dflag >= 0)
-					if(!(dflag==DISABILITY_FLAG_FAT && species!=("Human" || "Tajaran" || "Grey")))
-						disabilities ^= text2num(href_list["disability"]) //MAGIC
-				SetDisabilities(user)
-			else
-				SetDisabilities(user)
-		return 1
-
-	else if(href_list["preference"] == "records")
-		if(text2num(href_list["record"]) >= 1)
-			SetRecords(user)
-			return
-		else
-			user << browse(null, "window=records")
-		if(href_list["task"] == "med_record")
-			var/medmsg = input(usr,"Set your medical notes here.","Medical Records",html_decode(med_record)) as message
-
-			if(medmsg != null)
-				medmsg = copytext(medmsg, 1, MAX_PAPER_MESSAGE_LEN)
-				medmsg = html_encode(medmsg)
-
-				med_record = medmsg
-				SetRecords(user)
-
-		if(href_list["task"] == "sec_record")
-			var/secmsg = input(usr,"Set your security notes here.","Security Records",html_decode(sec_record)) as message
-
-			if(secmsg != null)
-				secmsg = copytext(secmsg, 1, MAX_PAPER_MESSAGE_LEN)
-				secmsg = html_encode(secmsg)
-
-				sec_record = secmsg
-				SetRecords(user)
-		if(href_list["task"] == "gen_record")
-			var/genmsg = input(usr,"Set your employment notes here.","Employment Records",html_decode(gen_record)) as message
-
-			if(genmsg != null)
-				genmsg = copytext(genmsg, 1, MAX_PAPER_MESSAGE_LEN)
-				genmsg = html_encode(genmsg)
-
-				gen_record = genmsg
-				SetRecords(user)
-
-	switch(href_list["task"])
-		if("random")
-			switch(href_list["preference"])
-				if("name")
-					real_name = random_name(gender,species)
-				if("age")
-					age = rand(AGE_MIN, AGE_MAX)
-				if("hair")
-					if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Wryn", "Vulpkanin", "Vox"))
-						r_hair = rand(0,255)
-						g_hair = rand(0,255)
-						b_hair = rand(0,255)
-				if("h_style")
-					h_style = random_hair_style(gender, species)
-				if("facial")
-					if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Wryn", "Vulpkanin", "Vox"))
-						r_facial = rand(0,255)
-						g_facial = rand(0,255)
-						b_facial = rand(0,255)
-				if("f_style")
-					f_style = random_facial_hair_style(gender, species)
-				if("underwear")
-					underwear = random_underwear(gender)
-					ShowChoices(user)
-				if("undershirt")
-					undershirt = random_undershirt(gender)
-					ShowChoices(user)
-				if("socks")
-					socks = random_socks(gender)
-					ShowChoices(user)
-				if("eyes")
-					r_eyes = rand(0,255)
-					g_eyes = rand(0,255)
-					b_eyes = rand(0,255)
-				if("s_tone")
-					if(species in list("Human", "Drask", "Vox"))
-						s_tone = random_skin_tone(species)
-				if("s_color")
-					if(species in list("Unathi", "Tajaran", "Skrell", "Slime People", "Wryn", "Vulpkanin", "Machine"))
-						r_skin = rand(0,255)
-						g_skin = rand(0,255)
-						b_skin = rand(0,255)
-				if("bag")
-					backbag = rand(1,4)
-				/*if("skin_style")
-					h_style = random_skin_style(gender)*/
-				if("all")
-					random_character()
-		if("input")
-			switch(href_list["preference"])
-				if("name")
-					var/raw_name = input(user, "Choose your character's name:", "Character Preference") as text|null
-					if (!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
-						var/new_name = reject_bad_name(raw_name)
-						if(new_name)
-							real_name = new_name
-						else
-							to_chat(user, "<font color='red'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</font>")
-
-				if("age")
-					var/new_age = input(user, "Choose your character's age:\n([AGE_MIN]-[AGE_MAX])", "Character Preference") as num|null
-					if(new_age)
-						age = max(min(round(text2num(new_age)), AGE_MAX),AGE_MIN)
-				if("species")
-
-					var/list/new_species = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin")
-					var/prev_species = species
-//						var/whitelisted = 0
-
-					if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
-						for(var/S in whitelisted_species)
-							if(is_alien_whitelisted(user,S))
-								new_species += S
-//									whitelisted = 1
-//							if(!whitelisted)
-//								alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.")
-					else //Not using the whitelist? Aliens for everyone!
-						new_species += whitelisted_species
-
-					species = input("Please select a species", "Character Generation", null) in new_species
-
-					if(prev_species != species)
-						//grab one of the valid hair styles for the newly chosen species
-						var/list/valid_hairstyles = list()
-						for(var/hairstyle in hair_styles_list)
-							var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
-							if(gender == MALE && S.gender == FEMALE)
-								continue
-							if(gender == FEMALE && S.gender == MALE)
-								continue
-							if(!(species in S.species_allowed))
-								continue
-
-							valid_hairstyles[hairstyle] = hair_styles_list[hairstyle]
-
-						if(valid_hairstyles.len)
-							h_style = pick(valid_hairstyles)
-						else
-							//this shouldn't happen
-							h_style = hair_styles_list["Bald"]
-
-						//grab one of the valid facial hair styles for the newly chosen species
-						var/list/valid_facialhairstyles = list()
-						for(var/facialhairstyle in facial_hair_styles_list)
-							var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
-							if(gender == MALE && S.gender == FEMALE)
-								continue
-							if(gender == FEMALE && S.gender == MALE)
-								continue
-							if(!(species in S.species_allowed))
-								continue
-
-							valid_facialhairstyles[facialhairstyle] = facial_hair_styles_list[facialhairstyle]
-
-						if(valid_facialhairstyles.len)
-							f_style = pick(valid_facialhairstyles)
-						else
-							//this shouldn't happen
-							f_style = facial_hair_styles_list["Shaved"]
-
-						// Don't wear another species' underwear!
-						var/datum/sprite_accessory/S = underwear_list[underwear]
-						if(!(species in S.species_allowed))
-							underwear = random_underwear(gender, species)
-
-						S = undershirt_list[undershirt]
-						if(!(species in S.species_allowed))
-							undershirt = random_undershirt(gender, species)
-
-						S = socks_list[socks]
-						if(!(species in S.species_allowed))
-							socks = random_socks(gender, species)
-
-						//reset hair colour and skin colour
-						r_hair = 0//hex2num(copytext(new_hair, 2, 4))
-						g_hair = 0//hex2num(copytext(new_hair, 4, 6))
-						b_hair = 0//hex2num(copytext(new_hair, 6, 8))
-
-						s_tone = 0
-
-						if(!(species in list("Unathi", "Tajaran", "Skrell", "Slime People", "Vulpkanin", "Machine")))
-							r_skin = 0
-							g_skin = 0
-							b_skin = 0
-
-						ha_style = "None" // No Vulp ears on Unathi
-						m_style = "None" // No Unathi markings on Tajara
-
-						body_accessory = null //no vulptail on humans damnit
-
-						//Reset prosthetics.
-						organ_data = list()
-						rlimb_data = list()
-				if("speciesprefs")//oldvox code
-					speciesprefs = !speciesprefs
-
-				if("language")
-//						var/languages_available
-					var/list/new_languages = list("None")
-/*
-					if(config.usealienwhitelist)
-						for(var/L in all_languages)
-							var/datum/language/lang = all_languages[L]
-							if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))))
-								new_languages += lang
-								languages_available = 1
-
-						if(!(languages_available))
-							alert(user, "There are not currently any available secondary languages.")
-					else
-*/
-					for(var/L in all_languages)
-						var/datum/language/lang = all_languages[L]
-						if(!(lang.flags & RESTRICTED))
-							new_languages += lang.name
-
-					language = input("Please select a secondary language", "Character Generation", null) in new_languages
-
-				if("metadata")
-					var/new_metadata = input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , metadata)  as message|null
-					if(new_metadata)
-						metadata = sanitize(copytext(new_metadata,1,MAX_MESSAGE_LEN))
-
-				if("b_type")
-					var/new_b_type = input(user, "Choose your character's blood-type:", "Character Preference") as null|anything in list( "A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-" )
-					if(new_b_type)
-						b_type = new_b_type
-
-				if("hair")
-					if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox"))
-						var/input = "Choose your character's hair colour:"
-						var/new_hair = input(user, input, "Character Preference", rgb(r_hair, g_hair, b_hair)) as color|null
-						if(new_hair)
-							r_hair = hex2num(copytext(new_hair, 2, 4))
-							g_hair = hex2num(copytext(new_hair, 4, 6))
-							b_hair = hex2num(copytext(new_hair, 6, 8))
-
-				if("h_style")
-					var/list/valid_hairstyles = list()
-					for(var/hairstyle in hair_styles_list)
-						var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
-						if(species == "Machine") //Species that can use prosthetic heads.
-							var/obj/item/organ/external/head/H = new()
-							if(S.name == "Bald")
-								valid_hairstyles[hairstyle] = S
-							if(!rlimb_data["head"]) //Handle situations where the head is default.
-								H.model = "Morpheus Cyberkinetics"
-							else
-								H.model = rlimb_data["head"]
-							var/datum/robolimb/robohead = all_robolimbs[H.model]
-							if(species in S.species_allowed)
-								if(robohead.is_monitor && (robohead.company in S.models_allowed)) //If the Machine character has the default Morpheus screen head or another screen head
-																														   //and said head is in the hair style's allowed models list...
-									valid_hairstyles[hairstyle] = S //Allow them to select the hairstyle.
-								continue
-							else
-								if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human hairstyles).
-									continue
-								else if(!robohead.is_monitor && ("Human" in S.species_allowed))
-									valid_hairstyles[hairstyle] = S
-								continue
-						else
-							if(!(species in S.species_allowed))
-								continue
-
-							valid_hairstyles[hairstyle] = S
-
-					var/new_h_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in valid_hairstyles
-					if(new_h_style)
-						h_style = new_h_style
-
-				if("headaccessory")
-					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories.
-						var/input = "Choose the colour of your your character's head accessory:"
-						var/new_head_accessory = input(user, input, "Character Preference", rgb(r_headacc, g_headacc, b_headacc)) as color|null
-						if(new_head_accessory)
-							r_headacc = hex2num(copytext(new_head_accessory, 2, 4))
-							g_headacc = hex2num(copytext(new_head_accessory, 4, 6))
-							b_headacc = hex2num(copytext(new_head_accessory, 6, 8))
-
-				if("ha_style")
-					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories.
-						var/list/valid_head_accessory_styles = list()
-						for(var/head_accessory_style in head_accessory_styles_list)
-							var/datum/sprite_accessory/H = head_accessory_styles_list[head_accessory_style]
-							if(!(species in H.species_allowed))
-								continue
-
-							valid_head_accessory_styles[head_accessory_style] = head_accessory_styles_list[head_accessory_style]
-
-						var/new_head_accessory_style = input(user, "Choose the style of your character's head accessory:", "Character Preference") as null|anything in valid_head_accessory_styles
-						if(new_head_accessory_style)
-							ha_style = new_head_accessory_style
-
-				if("markings")
-					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with markings.
-						var/input = "Choose the colour of your your character's markings:"
-						var/new_markings = input(user, input, "Character Preference", rgb(r_markings, g_markings, b_markings)) as color|null
-						if(new_markings)
-							r_markings = hex2num(copytext(new_markings, 2, 4))
-							g_markings = hex2num(copytext(new_markings, 4, 6))
-							b_markings = hex2num(copytext(new_markings, 6, 8))
-
-				if("m_style")
-					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with markings.
-						var/list/valid_markings = list()
-						for(var/markingstyle in marking_styles_list)
-							var/datum/sprite_accessory/M = marking_styles_list[markingstyle]
-							if(!(species in M.species_allowed))
-								continue
-
-							if(species == "Machine") //Species that can use prosthetic heads.
-								var/obj/item/organ/external/head/H = new()
-								if(!rlimb_data["head"]) //Handle situations where the head is default.
-									H.model = "Morpheus Cyberkinetics"
-								else
-									H.model = rlimb_data["head"]
-								var/datum/robolimb/robohead = all_robolimbs[H.model]
-								if(robohead.is_monitor && M.name != "None") //If the character can have prosthetic heads and they have the default Morpheus head (or another monitor-head), no optic markings.
-									continue
-								else if(!robohead.is_monitor && M.name != "None") //Otherwise, if they DON'T have the default head and the head's not a monitor but the head's not in the style's list of allowed models, skip.
-									if(!(robohead.company in M.models_allowed))
-										continue
-
-							valid_markings[markingstyle] = marking_styles_list[markingstyle]
-
-						var/new_marking_style = input(user, "Choose the style of your character's markings:", "Character Preference", m_style) as null|anything in valid_markings
-						if(new_marking_style)
-							m_style = new_marking_style
-
-				if("body_accessory")
-					var/list/possible_body_accessories = list()
-					if(check_rights(R_ADMIN, 1, user))
-						possible_body_accessories = body_accessory_by_name.Copy()
-					else
-						for(var/B in body_accessory_by_name)
-							var/datum/body_accessory/accessory = body_accessory_by_name[B]
-							if(!istype(accessory))
-								possible_body_accessories += "None" //the only null entry should be the "None" option
-								continue
-							if(species in accessory.allowed_species)
-								possible_body_accessories += B
-
-					var/new_body_accessory = input(user, "Choose your body accessory:", "Character Preference") as null|anything in possible_body_accessories
-					if(new_body_accessory)
-						body_accessory = (new_body_accessory == "None") ? null : new_body_accessory
-
-				if("facial")
-					if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox"))
-						var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference", rgb(r_facial, g_facial, b_facial)) as color|null
-						if(new_facial)
-							r_facial = hex2num(copytext(new_facial, 2, 4))
-							g_facial = hex2num(copytext(new_facial, 4, 6))
-							b_facial = hex2num(copytext(new_facial, 6, 8))
-
-				if("f_style")
-					var/list/valid_facialhairstyles = list()
-					for(var/facialhairstyle in facial_hair_styles_list)
-						var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
-						if(S.name == "Shaved")
-							valid_facialhairstyles[facialhairstyle] = S
-						if(gender == MALE && S.gender == FEMALE)
-							continue
-						if(gender == FEMALE && S.gender == MALE)
-							continue
-						if(species == "Machine") //Species that can use prosthetic heads.
-							var/obj/item/organ/external/head/H = new()
-							if(!rlimb_data["head"]) //Handle situations where the head is default.
-								H.model = "Morpheus Cyberkinetics"
-							else
-								H.model = rlimb_data["head"]
-							var/datum/robolimb/robohead = all_robolimbs[H.model]
-							if(species in S.species_allowed)
-								if(robohead.is_monitor) //If the Machine character has the default Morpheus screen head or another screen head and they're allowed to have the style, let them have it.
-									valid_facialhairstyles[facialhairstyle] = S
-								continue
-							else
-								if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human facial hairstyles).
-									continue
-								else if(!robohead.is_monitor && ("Human" in S.species_allowed))
-									valid_facialhairstyles[facialhairstyle] = S
-								continue
-						else
-							if(!(species in S.species_allowed))
-								continue
-
-						valid_facialhairstyles[facialhairstyle] = facial_hair_styles_list[facialhairstyle]
-
-					var/new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference")  as null|anything in valid_facialhairstyles
-					if(new_f_style)
-						f_style = new_f_style
-
-				if("underwear")
-					var/list/underwear_options
-					if(gender == MALE)
-						underwear_options = underwear_m
-					else
-						underwear_options = underwear_f
-
-					var/new_underwear = input(user, "Choose your character's underwear:", "Character Preference")  as null|anything in underwear_options
-					if(new_underwear)
-						underwear = new_underwear
-					ShowChoices(user)
-
-				if("undershirt")
-					var/new_undershirt
-					if(gender == MALE)
-						new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in undershirt_m
-					else
-						new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in undershirt_f
-					if(new_undershirt)
-						undershirt = new_undershirt
-					ShowChoices(user)
-
-				if("socks")
-					var/list/valid_sockstyles = list()
-					for(var/sockstyle in socks_list)
-						var/datum/sprite_accessory/S = socks_list[sockstyle]
-						if(gender == MALE && S.gender == FEMALE)
-							continue
-						if(gender == FEMALE && S.gender == MALE)
-							continue
-						if(!(species in S.species_allowed))
-							continue
-						valid_sockstyles[sockstyle] = socks_list[sockstyle]
-					var/new_socks = input(user, "Choose your character's socks:", "Character Preference")  as null|anything in valid_sockstyles
-					ShowChoices(user)
-					if(new_socks)
-						socks = new_socks
-
-				if("eyes")
-					var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference", rgb(r_eyes, g_eyes, b_eyes)) as color|null
-					if(new_eyes)
-						r_eyes = hex2num(copytext(new_eyes, 2, 4))
-						g_eyes = hex2num(copytext(new_eyes, 4, 6))
-						b_eyes = hex2num(copytext(new_eyes, 6, 8))
-
-				if("s_tone")
-					if(species == "Human" || species == "Drask")
-						var/new_s_tone = input(user, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Character Preference")  as num|null
-						if(new_s_tone)
-							s_tone = 35 - max(min(round(new_s_tone), 220), 1)
-					else if(species == "Vox")
-						var/skin_c = input(user, "Choose your Vox's skin color:\n(1 = Default Green, 2 = Dark Green, 3 = Brown, 4 = Grey, \n5 = Emerald, 6 = Azure)", "Character Preference") as num|null
-						if(skin_c)
-							s_tone = max(min(round(skin_c), 6), 1)
-
-				if("skin")
-					if((species in list("Unathi", "Tajaran", "Skrell", "Slime People", "Vulpkanin", "Machine")) || body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user))
-						var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference", rgb(r_skin, g_skin, b_skin)) as color|null
-						if(new_skin)
-							r_skin = hex2num(copytext(new_skin, 2, 4))
-							g_skin = hex2num(copytext(new_skin, 4, 6))
-							b_skin = hex2num(copytext(new_skin, 6, 8))
-
-				if("ooccolor")
-					var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference", ooccolor) as color|null
-					if(new_ooccolor)
-						ooccolor = new_ooccolor
-
-				if("bag")
-					var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference")  as null|anything in backbaglist
-					if(new_backbag)
-						backbag = backbaglist.Find(new_backbag)
-
-				if("nt_relation")
-					var/new_relation = input(user, "Choose your relation to NT. Note that this represents what others can find out about your character by researching your background, not what your character actually thinks.", "Character Preference")  as null|anything in list("Loyal", "Supportive", "Neutral", "Skeptical", "Opposed")
-					if(new_relation)
-						nanotrasen_relation = new_relation
-
-				if("flavor_text")
-					var/msg = input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(flavor_text)) as message
-
-					if(msg != null)
-						msg = copytext(msg, 1, MAX_MESSAGE_LEN)
-						msg = html_encode(msg)
-
-						flavor_text = msg
-
-				if("limbs")
-					var/valid_limbs = list("Left Leg", "Right Leg", "Left Arm", "Right Arm", "Left Foot", "Right Foot", "Left Hand", "Right Hand")
-					if(species == "Machine")
-						valid_limbs = list("Torso", "Lower Body", "Head", "Left Leg", "Right Leg", "Left Arm", "Right Arm", "Left Foot", "Right Foot", "Left Hand", "Right Hand")
-					var/limb_name = input(user, "Which limb do you want to change?") as null|anything in valid_limbs
-					if(!limb_name) return
-
-					var/limb = null
-					var/second_limb = null // if you try to change the arm, the hand should also change
-					var/third_limb = null  // if you try to unchange the hand, the arm should also change
-					var/valid_limb_states = list("Normal", "Amputated", "Prosthesis")
-					var/no_amputate = 0
-
-					switch(limb_name)
-						if("Torso")
-							limb = "chest"
-							second_limb = "groin"
-							no_amputate = 1
-						if("Lower Body")
-							limb = "groin"
-							no_amputate = 1
-						if("Head")
-							limb = "head"
-							no_amputate = 1
-						if("Left Leg")
-							limb = "l_leg"
-							second_limb = "l_foot"
-						if("Right Leg")
-							limb = "r_leg"
-							second_limb = "r_foot"
-						if("Left Arm")
-							limb = "l_arm"
-							second_limb = "l_hand"
-						if("Right Arm")
-							limb = "r_arm"
-							second_limb = "r_hand"
-						if("Left Foot")
-							limb = "l_foot"
-							if(species != "Machine")
-								third_limb = "l_leg"
-						if("Right Foot")
-							limb = "r_foot"
-							if(species != "Machine")
-								third_limb = "r_leg"
-						if("Left Hand")
-							limb = "l_hand"
-							if(species != "Machine")
-								third_limb = "l_arm"
-						if("Right Hand")
-							limb = "r_hand"
-							if(species != "Machine")
-								third_limb = "r_arm"
-
-					var/new_state = input(user, "What state do you wish the limb to be in?") as null|anything in valid_limb_states
-					if(!new_state) return
-
-					switch(new_state)
-						if("Normal")
-							if(limb == "head")
-								m_style = "None"
-								h_style = random_hair_style(gender, species)
-								f_style = facial_hair_styles_list["Shaved"]
-							organ_data[limb] = null
-							rlimb_data[limb] = null
-							if(third_limb)
-								organ_data[third_limb] = null
-								rlimb_data[third_limb] = null
-						if("Amputated")
-							if(!no_amputate)
-								organ_data[limb] = "amputated"
-								rlimb_data[limb] = null
-								if(second_limb)
-									organ_data[second_limb] = "amputated"
-									rlimb_data[second_limb] = null
-						if("Prosthesis")
-							var/choice
-							var/subchoice
-							var/datum/robolimb/R = new()
-							var/in_model
-							var/robolimb_companies = list()
-							for(var/limb_type in typesof(/datum/robolimb)) //This loop populates a list of companies that offer the limb the user selected previously as one of their cybernetic products.
-								R = new limb_type()
-								if(!R.unavailable_at_chargen && (limb in R.parts) && R.has_subtypes) //Ensures users can only choose companies that offer the parts they want, that singular models get added to the list as well companies that offer more than one model, and...
-									robolimb_companies[R.company] = R //List only main brands that have the parts we're looking for.
-							R = new() //Re-initialize R.
-
-							choice = input(user, "Which manufacturer do you wish to use for this limb?") as null|anything in robolimb_companies //Choose from a list of companies that offer the part the user wants.
-							if(!choice)
-								return
-							R.company = choice
-							R = all_robolimbs[R.company]
-							if(R.has_subtypes == 1) //If the company the user selected provides more than just one base model, lets handle it.
-								var/list/robolimb_models = list()
-								for(var/limb_type in typesof(R)) //Handling the different models of parts that manufacturers can provide.
-									var/datum/robolimb/L = new limb_type()
-									if(limb in L.parts) //Make sure that only models that provide the parts the user needs populate the list.
-										robolimb_models[L.company] = L
-										if(robolimb_models.len == 1) //If there's only one model available in the list, autoselect it to avoid having to bother the user with a dialog that provides only one option.
-											subchoice = L.company //If there ends up being more than one model populating the list, subchoice will be overwritten later anyway, so this isn't a problem.
-										if(second_limb in L.parts) //If the child limb of the limb the user selected is also present in the model's parts list, state it's been found so the second limb can be set later.
-											in_model = 1
-								if(robolimb_models.len > 1) //If there's more than one model in the list that can provide the part the user wants, let them choose.
-									subchoice = input(user, "Which model of [choice] [limb_name] do you wish to use?") as null|anything in robolimb_models
-								if(subchoice)
-									choice = subchoice
-							if(limb == "head")
-								ha_style = "None"
-								h_style = hair_styles_list["Bald"]
-								f_style = facial_hair_styles_list["Shaved"]
-								m_style = "None"
-							rlimb_data[limb] = choice
-							organ_data[limb] = "cyborg"
-							if(second_limb)
-								if(subchoice)
-									if(in_model)
-										rlimb_data[second_limb] = choice
-										organ_data[second_limb] = "cyborg"
-								else
-									rlimb_data[second_limb] = choice
-									organ_data[second_limb] = "cyborg"
-
-				if("organs")
-					var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes")
-					if(!organ_name) return
-
-					var/organ = null
-					switch(organ_name)
-						if("Heart")
-							organ = "heart"
-						if("Eyes")
-							organ = "eyes"
-
-					var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in list("Normal","Assisted","Mechanical")
-					if(!new_state) return
-
-					switch(new_state)
-						if("Normal")
-							organ_data[organ] = null
-						if("Assisted")
-							organ_data[organ] = "assisted"
-						if("Mechanical")
-							organ_data[organ] = "mechanical"
-
-/*
-				if("skin_style")
-					var/skin_style_name = input(user, "Select a new skin style") as null|anything in list("default1", "default2", "default3")
-					if(!skin_style_name) return
-*/
-
-/*					if("spawnpoint")
-					var/list/spawnkeys = list()
-					for(var/S in spawntypes)
-						spawnkeys += S
-					var/choice = input(user, "Where would you like to spawn when latejoining?") as null|anything in spawnkeys
-					if(!choice || !spawntypes[choice])
-						spawnpoint = "Arrivals Shuttle"
-						return
-					spawnpoint = choice */
-
-		else
-			switch(href_list["preference"])
-				if("publicity")
-					if(unlock_content)
-						toggles ^= MEMBER_PUBLIC
-
-				if("gender")
-					if(gender == MALE)
-						gender = FEMALE
-					else
-						gender = MALE
-					underwear = random_underwear(gender)
-
-				if("hear_adminhelps")
-					sound ^= SOUND_ADMINHELP
-
-				if("ui")
-					switch(UI_style)
-						if("Midnight")
-							UI_style = "Plasmafire"
-						if("Plasmafire")
-							UI_style = "Retro"
-						if("Retro")
-							UI_style = "Slimecore"
-						if("Slimecore")
-							UI_style = "Operative"
-						if("Operative")
-							UI_style = "White"
-						else
-							UI_style = "Midnight"
-
-					if(ishuman(usr)) //mid-round preference changes, for aesthetics
-						var/mob/living/carbon/human/H = usr
-						H.remake_hud()
-
-				if("nanoui")
-					nanoui_fancy = !nanoui_fancy
-
-				if("ghost_att_anim")
-					show_ghostitem_attack = !show_ghostitem_attack
-
-				if("UIcolor")
-					var/UI_style_color_new = input(user, "Choose your UI color, dark colors are not recommended!", UI_style_color) as color|null
-					if(!UI_style_color_new) return
-					UI_style_color = UI_style_color_new
-
-					if(ishuman(usr)) //mid-round preference changes, for aesthetics
-						var/mob/living/carbon/human/H = usr
-						H.remake_hud()
-
-				if("UIalpha")
-					var/UI_style_alpha_new = input(user, "Select a new alpha(transparence) parameter for UI, between 50 and 255", UI_style_alpha) as num
-					if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
-					UI_style_alpha = UI_style_alpha_new
-
-					if(ishuman(usr)) //mid-round preference changes, for aesthetics
-						var/mob/living/carbon/human/H = usr
-						H.remake_hud()
-
-				if("be_special")
-					var/r = href_list["role"]
-					if(!(r in special_roles))
-						var/cleaned_r = sql_sanitize_text(r)
-						if(r != cleaned_r) // up to no good
-							message_admins("[user] attempted an href exploit! (This could have possibly lead to a \"Bobby Tables\" exploit, so they're probably up to no good). String: [r] ID: [last_id] IP: [last_ip]")
-							to_chat(user, "<span class='userdanger'>Stop right there, criminal scum</span>")
-					else
-						be_special ^= r
-
-				if("name")
-					be_random_name = !be_random_name
-
-				if("randomslot")
-					randomslot = !randomslot
-
-				if("hear_midis")
-					sound ^= SOUND_MIDI
-
-				if("lobby_music")
-					sound ^= SOUND_LOBBY
-					if(sound & SOUND_LOBBY)
-						user << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1)
-					else
-						user << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)
-
-				if("ghost_ears")
-					toggles ^= CHAT_GHOSTEARS
-
-				if("ghost_sight")
-					toggles ^= CHAT_GHOSTSIGHT
-
-				if("ghost_radio")
-					toggles ^= CHAT_GHOSTRADIO
-
-				if("ghost_radio")
-					toggles ^= CHAT_GHOSTRADIO
-
-				if("save")
-					save_preferences(user)
-					save_character(user)
-
-				if("reload")
-					load_preferences(user)
-					load_character(user)
-
-				if("open_load_dialog")
-					if(!IsGuestKey(user.key))
-						open_load_dialog(user)
-						return 1
-
-				if("close_load_dialog")
-					close_load_dialog(user)
-
-				if("changeslot")
-					if(!load_character(user,text2num(href_list["num"])))
-						random_character()
-						real_name = random_name(gender)
-						save_character(user)
-					close_load_dialog(user)
-
-				if("tab")
-					if (href_list["tab"])
-						current_tab = text2num(href_list["tab"])
-
-	ShowChoices(user)
-	return 1
-
-/datum/preferences/proc/copy_to(mob/living/carbon/human/character)
-	var/datum/species/S = all_species[species]
-	character.change_species(species) // Yell at me if this causes everything to melt
-	if(be_random_name)
-		real_name = random_name(gender,species)
-
-	if(config.humans_need_surnames)
-		var/firstspace = findtext(real_name, " ")
-		var/name_length = length(real_name)
-		if(!firstspace)	//we need a surname
-			real_name += " [pick(last_names)]"
-		else if(firstspace == name_length)
-			real_name += "[pick(last_names)]"
-
-	character.add_language(language)
-
-	character.real_name = real_name
-	character.dna.real_name = real_name
-	character.name = character.real_name
-
-	character.flavor_text = flavor_text
-	if(character.ckey && !jobban_isbanned(character, "Records"))
-		character.med_record = med_record
-		character.sec_record = sec_record
-		character.gen_record = gen_record
-
-	character.change_gender(gender)
-	character.age = age
-	character.b_type = b_type
-
-	character.r_eyes = r_eyes
-	character.g_eyes = g_eyes
-	character.b_eyes = b_eyes
-
-	//Head-specific
-	var/obj/item/organ/external/head/H = character.get_organ("head")
-	H.r_hair = r_hair
-	H.g_hair = g_hair
-	H.b_hair = b_hair
-
-	H.r_facial = r_facial
-	H.g_facial = g_facial
-	H.b_facial = b_facial
-
-	H.h_style = h_style
-	H.f_style = f_style
-	//End of head-specific.
-
-	character.r_skin = r_skin
-	character.g_skin = g_skin
-	character.b_skin = b_skin
-
-	character.s_tone = s_tone
-
-	// Destroy/cyborgize organs
-	for(var/name in organ_data)
-
-		var/status = organ_data[name]
-		var/obj/item/organ/external/O = character.organs_by_name[name]
-		if(O)
-			if(status == "amputated")
-				character.organs_by_name[O.limb_name] = null
-				character.organs -= O
-				if(O.children) // This might need to become recursive.
-					for(var/obj/item/organ/external/child in O.children)
-						character.organs_by_name[child.limb_name] = null
-						character.organs -= child
-
-			else if(status == "cyborg")
-				if(rlimb_data[name])
-					O.robotize(rlimb_data[name])
-				else
-					O.robotize()
-		else
-			var/obj/item/organ/internal/I = character.get_int_organ_tag(name)
-			if(I)
-				if(status == "assisted")
-					I.mechassist()
-				else if(status == "mechanical")
-					I.robotize()
-
-	character.dna.b_type = b_type
-	if(disabilities & DISABILITY_FLAG_FAT && character.species.flags & CAN_BE_FAT)
-		character.dna.SetSEState(FATBLOCK,1,1)
-		character.mutations += FAT
-		character.mutations += OBESITY
-		character.overeatduration = 600
-
-	if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
-		character.dna.SetSEState(GLASSESBLOCK,1,1)
-		character.disabilities|=NEARSIGHTED
-
-	if(disabilities & DISABILITY_FLAG_EPILEPTIC)
-		character.dna.SetSEState(EPILEPSYBLOCK,1,1)
-		character.disabilities|=EPILEPSY
-
-	if(disabilities & DISABILITY_FLAG_DEAF)
-		character.dna.SetSEState(DEAFBLOCK,1,1)
-		character.sdisabilities|=DEAF
-
-	if(disabilities & DISABILITY_FLAG_BLIND)
-		character.dna.SetSEState(BLINDBLOCK,1,1)
-		character.sdisabilities|=BLIND
-
-	if(disabilities & DISABILITY_FLAG_MUTE)
-		character.dna.SetSEState(MUTEBLOCK,1,1)
-		character.sdisabilities |= MUTE
-
-	S.handle_dna(character)
-
-	if(character.dna.dirtySE)
-		character.dna.UpdateSE()
-	domutcheck(character)
-
-	// Wheelchair necessary?
-	var/obj/item/organ/external/l_foot = character.get_organ("l_foot")
-	var/obj/item/organ/external/r_foot = character.get_organ("r_foot")
-	if((!l_foot || l_foot.status & ORGAN_DESTROYED) && (!r_foot || r_foot.status & ORGAN_DESTROYED))
-		var/obj/structure/stool/bed/chair/wheelchair/W = new /obj/structure/stool/bed/chair/wheelchair (character.loc)
-		character.buckled = W
-		character.update_canmove()
-		W.dir = character.dir
-		W.buckled_mob = character
-		W.add_fingerprint(character)
-
-	character.underwear = underwear
-	character.undershirt = undershirt
-	character.socks = socks
-
-	if(character.species.bodyflags & HAS_HEAD_ACCESSORY)
-		H.r_headacc = r_headacc
-		H.g_headacc = g_headacc
-		H.b_headacc = b_headacc
-		H.ha_style = ha_style
-	if(character.species.bodyflags & HAS_MARKINGS)
-		character.r_markings = r_markings
-		character.g_markings = g_markings
-		character.b_markings = b_markings
-		character.m_style = m_style
-
-	if(body_accessory)
-		character.body_accessory = body_accessory_by_name["[body_accessory]"]
-
-	if(backbag > 4 || backbag < 1)
-		backbag = 1 //Same as above
-	character.backbag = backbag
-
-	//Debugging report to track down a bug, which randomly assigned the plural gender to people.
-	if(character.gender in list(PLURAL, NEUTER))
-		if(isliving(src)) //Ghosts get neuter by default
-			message_admins("[key_name_admin(character)] has spawned with their gender as plural or neuter. Please notify coders.")
-			character.change_gender(MALE)
-
-	character.dna.ready_dna(character, flatten_SE = 0)
-	character.sync_organ_dna(assimilate=1)
-	character.UpdateAppearance()
-
-	// Do the initial caching of the player's body icons.
-	character.force_update_limbs()
-	character.update_eyes()
-	character.regenerate_icons()
-
-/datum/preferences/proc/open_load_dialog(mob/user)
-
-	var/DBQuery/query = dbcon.NewQuery("SELECT slot,real_name FROM [format_table_name("characters")] WHERE ckey='[user.ckey]' ORDER BY slot")
-
-	var/dat = "<body>"
-	dat += "<tt><center>"
-	dat += "<b>Select a character slot to load</b><hr>"
-	var/name
-
-	for(var/i=1, i<=max_save_slots, i++)
-		if(!query.Execute())
-			var/err = query.ErrorMsg()
-			log_game("SQL ERROR during character slot loading. Error : \[[err]\]\n")
-			message_admins("SQL ERROR during character slot loading. Error : \[[err]\]\n")
-			return
-		while(query.NextRow())
-			if(i==text2num(query.item[1]))
-				name =  query.item[2]
-		if(!name)	name = "Character[i]"
-		if(i==default_slot)
-			name = "<b>[name]</b>"
-		dat += "<a href='?_src_=prefs;preference=changeslot;num=[i];'>[name]</a><br>"
-		name = null
-
-	dat += "<hr>"
-	dat += "<a href='byond://?src=\ref[user];preference=close_load_dialog'>Close</a><br>"
-	dat += "</center></tt>"
-//		user << browse(dat, "window=saves;size=300x390")
-	var/datum/browser/popup = new(user, "saves", "<div align='center'>Character Saves</div>", 300, 390)
-	popup.set_content(dat)
-	popup.open(0)
-
-/datum/preferences/proc/close_load_dialog(mob/user)
-	user << browse(null, "window=saves")
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+
+var/list/preferences_datums = list()
+
+var/global/list/special_role_times = list( //minimum age (in days) for accounts to play these roles
+	ROLE_PAI = 0,
+	ROLE_POSIBRAIN = 0,
+	ROLE_GUARDIAN = 0,
+	ROLE_TRAITOR = 7,
+	ROLE_CHANGELING = 14,
+	ROLE_SHADOWLING = 14,
+	ROLE_WIZARD = 14,
+	ROLE_REV = 14,
+	ROLE_VAMPIRE = 14,
+	ROLE_BLOB = 14,
+	ROLE_REVENANT = 14,
+	ROLE_OPERATIVE = 21,
+	ROLE_CULTIST = 21,
+	ROLE_RAIDER = 21,
+	ROLE_ALIEN = 21,
+	ROLE_DEMON = 21,
+	ROLE_SENTIENT = 21,
+// 	ROLE_GANG = 21,
+	ROLE_BORER = 21,
+	ROLE_NINJA = 21,
+	ROLE_MUTINEER = 21,
+	ROLE_MALF = 30,
+	ROLE_ABDUCTOR = 30,
+)
+
+/proc/player_old_enough_antag(client/C, role)
+	if(available_in_days_antag(C, role) == 0)
+		return 1	//Available in 0 days = available right now = player is old enough to play.
+	return 0
+
+/proc/available_in_days_antag(client/C, role)
+	if(!C)
+		return 0
+	if(!role)
+		return 0
+	if(!config.use_age_restriction_for_antags)
+		return 0
+	if(!isnum(C.player_age))
+		return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced
+	var/minimal_player_age_antag = special_role_times[num2text(role)]
+	if(!isnum(minimal_player_age_antag))
+		return 0
+
+	return max(0, minimal_player_age_antag - C.player_age)
+
+/proc/check_client_age(client/C, var/days) // If days isn't provided, returns the age of the client. If it is provided, it returns the days until the player_age is equal to or greater than the days variable
+	if(!days)
+		return C.player_age
+	else
+		return max(0, days - C.player_age)
+	return 0
+
+//used for alternate_option
+#define GET_RANDOM_JOB 0
+#define BE_CIVILIAN 1
+#define RETURN_TO_LOBBY 2
+
+#define MAX_SAVE_SLOTS 20 // Save slots for regular players
+#define MAX_SAVE_SLOTS_MEMBER 20 // Save slots for BYOND members
+
+#define MAX_GEAR_COST config.max_loadout_points
+
+#define TAB_CHAR 0
+#define TAB_GAME 1
+#define TAB_GEAR 2
+
+/datum/preferences
+	//doohickeys for savefiles
+//	var/path
+	var/default_slot = 1				//Holder so it doesn't default to slot 1, rather the last one used
+//	var/savefile_version = 0
+	var/max_save_slots = MAX_SAVE_SLOTS
+
+	//non-preference stuff
+	var/warns = 0
+	var/muted = 0
+	var/last_ip
+	var/last_id
+
+	//game-preferences
+	var/lastchangelog = ""				//Saved changlog filesize to detect if there was a change
+	var/ooccolor = "#b82e00"
+	var/be_special = list()				//Special role selection
+	var/UI_style = "Midnight"
+	var/nanoui_fancy = TRUE
+	var/toggles = TOGGLES_DEFAULT
+	var/sound = SOUND_DEFAULT
+	var/show_ghostitem_attack = TRUE
+	var/UI_style_color = "#ffffff"
+	var/UI_style_alpha = 255
+
+
+	//character preferences
+	var/real_name						//our character's name
+	var/be_random_name = 0				//whether we are a random name every round
+	var/gender = MALE					//gender of character (well duh)
+	var/age = 30						//age of character
+	var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
+	var/b_type = "A+"					//blood type (not-chooseable)
+	var/underwear = "Nude"					//underwear type
+	var/undershirt = "Nude"					//undershirt type
+	var/socks = "Nude"					//socks type
+	var/backbag = 2						//backpack type
+	var/ha_style = "None"				//Head accessory style
+	var/r_headacc = 0					//Head accessory colour
+	var/g_headacc = 0					//Head accessory colour
+	var/b_headacc = 0					//Head accessory colour
+	var/m_style = "None"				//Marking style
+	var/r_markings = 0					//Marking colour
+	var/g_markings = 0					//Marking colour
+	var/b_markings = 0					//Marking colour
+	var/h_style = "Bald"				//Hair type
+	var/r_hair = 0						//Hair color
+	var/g_hair = 0						//Hair color
+	var/b_hair = 0						//Hair color
+	var/f_style = "Shaved"				//Face hair type
+	var/r_facial = 0					//Face hair color
+	var/g_facial = 0					//Face hair color
+	var/b_facial = 0					//Face hair color
+	var/s_tone = 0						//Skin tone
+	var/r_skin = 0						//Skin color
+	var/g_skin = 0						//Skin color
+	var/b_skin = 0						//Skin color
+	var/r_eyes = 0						//Eye color
+	var/g_eyes = 0						//Eye color
+	var/b_eyes = 0						//Eye color
+	var/species = "Human"
+	var/language = "None"				//Secondary language
+
+	var/body_accessory = null
+
+	var/speciesprefs = 0//I hate having to do this, I really do (Using this for oldvox code, making names universal I guess
+
+		//Mob preview
+	var/icon/preview_icon = null
+	var/icon/preview_icon_front = null
+	var/icon/preview_icon_side = null
+
+		//Jobs, uses bitflags
+	var/job_support_high = 0
+	var/job_support_med = 0
+	var/job_support_low = 0
+
+	var/job_medsci_high = 0
+	var/job_medsci_med = 0
+	var/job_medsci_low = 0
+
+	var/job_engsec_high = 0
+	var/job_engsec_med = 0
+	var/job_engsec_low = 0
+
+	var/job_karma_high = 0
+	var/job_karma_med = 0
+	var/job_karma_low = 0
+
+	//Keeps track of preferrence for not getting any wanted jobs
+	var/alternate_option = 0
+
+	// maps each organ to either null(intact), "cyborg" or "amputated"
+	// will probably not be able to do this for head and torso ;)
+	var/list/organ_data = list()
+	var/list/rlimb_data = list()
+
+	var/list/player_alt_titles = new()		// the default name of a job like "Medical Doctor"
+//	var/accent = "en-us"
+//	var/voice = "m1"
+//	var/pitch = 50
+//	var/talkspeed = 175
+	var/flavor_text = ""
+	var/med_record = ""
+	var/sec_record = ""
+	var/gen_record = ""
+	var/disabilities = 0
+
+	var/nanotrasen_relation = "Neutral"
+
+	// 0 = character settings, 1 = game preferences
+	var/current_tab = TAB_CHAR
+
+		// OOC Metadata:
+	var/metadata = ""
+	var/slot_name = ""
+
+	// Whether or not to use randomized character slots
+	var/randomslot = 0
+
+	// jukebox volume
+	var/volume = 100
+
+	// BYOND membership
+	var/unlock_content = 0
+
+	//Gear stuff
+	var/list/gear = list()
+	var/gear_tab = "General"
+
+/datum/preferences/New(client/C)
+	b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
+	if(istype(C))
+		if(!IsGuestKey(C.key))
+			unlock_content = C.IsByondMember()
+			if(unlock_content)
+				max_save_slots = MAX_SAVE_SLOTS_MEMBER
+	var/loaded_preferences_successfully = load_preferences(C)
+	if(loaded_preferences_successfully)
+		if(load_character(C))
+			return
+	//we couldn't load character data so just randomize the character appearance + name
+	random_character()		//let's create a random character then - rather than a fat, bald and naked man.
+	real_name = random_name(gender)
+	if(!loaded_preferences_successfully)
+		save_preferences(C)
+	save_character(C)		//let's save this new random character so it doesn't keep generating new ones.
+
+/datum/preferences/proc/color_square(r, g, b)
+	return "<span style='font-face: fixedsys; background-color: #[num2hex(r, 2)][num2hex(g, 2)][num2hex(b, 2)]; color: #[num2hex(r, 2)][num2hex(g, 2)][num2hex(b, 2)]'>___</span>"
+
+// Hello I am a proc full of snowflake species checks how are you
+/datum/preferences/proc/ShowChoices(mob/user)
+	if(!user || !user.client)
+		return
+	update_preview_icon()
+	user << browse_rsc(preview_icon_front, "previewicon.png")
+	user << browse_rsc(preview_icon_side, "previewicon2.png")
+
+	var/dat = ""
+	dat += "<center>"
+	dat += "<a href='?_src_=prefs;preference=tab;tab=[TAB_CHAR]' [current_tab == TAB_CHAR ? "class='linkOn'" : ""]>Character Settings</a>"
+	dat += "<a href='?_src_=prefs;preference=tab;tab=[TAB_GAME]' [current_tab == TAB_GAME ? "class='linkOn'" : ""]>Game Preferences</a>"
+	dat += "<a href='?_src_=prefs;preference=tab;tab=[TAB_GEAR]' [current_tab == TAB_GEAR ? "class='linkOn'" : ""]>Loadout</a>"
+	dat += "</center>"
+	dat += "<HR>"
+
+	switch(current_tab)
+		if(TAB_CHAR) // Character Settings
+			dat += "<div class='statusDisplay' style='max-width: 128px; position: absolute; left: 150px; top: 150px'><img src=previewicon.png height=64 width=64><img src=previewicon2.png height=64 width=64></div>"
+			dat += "<table width='100%'><tr><td width='405px' height='25px' valign='top'>"
+			dat += "<b>Name: </b>"
+			dat += "<a href='?_src_=prefs;preference=name;task=input'><b>[real_name]</b></a>"
+			dat += "<a href='?_src_=prefs;preference=name;task=random'>(Randomize)</a>"
+			dat += "<a href='?_src_=prefs;preference=name'><span class='[be_random_name ? "good" : "bad"]'>(Always Randomize)</span></a><br>"
+			dat += "</td><td width='405px' height='25px' valign='left'>"
+			dat += "<center>"
+			dat += "Slot <b>[slot_name]</b> - "
+			dat += "<a href=\"byond://?src=\ref[user];preference=open_load_dialog\">Load slot</a> - "
+			dat += "<a href=\"byond://?src=\ref[user];preference=save\">Save slot</a> - "
+			dat += "<a href=\"byond://?src=\ref[user];preference=reload\">Reload slot</a>"
+			dat += "</center>"
+			dat += "</td></tr></table>"
+			dat += "<table width='100%'><tr><td width='405px' height='200px' valign='top'>"
+			dat += "<h2>Identity</h2>"
+			if(appearance_isbanned(user))
+				dat += "<b>You are banned from using custom names and appearances. \
+				You can continue to adjust your characters, but you will be randomised once you join the game.\
+				</b><br>"
+			dat += "<b>Gender:</b> <a href='?_src_=prefs;preference=gender'>[gender == MALE ? "Male" : "Female"]</a><br>"
+			dat += "<b>Age:</b> <a href='?_src_=prefs;preference=age;task=input'>[age]</a><br>"
+			dat += "<b>Body:</b> <a href='?_src_=prefs;preference=all;task=random'>(&reg;)</a><br>"
+			dat += "<b>Species:</b> <a href='?_src_=prefs;preference=species;task=input'>[species]</a><br>"
+			if(species == "Vox")
+				dat += "<b>N2 Tank:</b> <a href='?_src_=prefs;preference=speciesprefs;task=input'>[speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank"]</a><br>"
+			dat += "<b>Secondary Language:</b> <a href='?_src_=prefs;preference=language;task=input'>[language]</a><br>"
+			dat += "<b>Blood Type:</b> <a href='?_src_=prefs;preference=b_type;task=input'>[b_type]</a><br>"
+			if(species in list("Human", "Drask", "Vox"))
+				dat += "<b>Skin Tone:</b> <a href='?_src_=prefs;preference=s_tone;task=input'>[species == "Vox" ? "[s_tone]" : "[-s_tone + 35]/220"]</a><br>"
+			dat += "<b>Disabilities:</b> <a href='?_src_=prefs;preference=disabilities'>\[Set\]</a><br>"
+			dat += "<b>Nanotrasen Relation:</b> <a href ='?_src_=prefs;preference=nt_relation;task=input'>[nanotrasen_relation]</a><br>"
+			dat += "<a href='byond://?src=\ref[user];preference=flavor_text;task=input'>Set Flavor Text</a><br>"
+			if(lentext(flavor_text) <= 40)
+				if(!lentext(flavor_text))	dat += "\[...\]<br>"
+				else						dat += "[flavor_text]<br>"
+			else dat += "[TextPreview(flavor_text)]...<br>"
+
+			dat += "<h2>Hair & Accessories</h2>"
+
+			if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species that have head accessories.
+				var/headaccessoryname = "Head Accessory: "
+				if(species == "Unathi")
+					headaccessoryname = "Horns: "
+				dat += "<b>[headaccessoryname]</b>"
+				dat += "<a href='?_src_=prefs;preference=ha_style;task=input'>[ha_style]</a> "
+				dat += "<a href='?_src_=prefs;preference=headaccessory;task=input'>Color</a> [color_square(r_headacc, g_headacc, b_headacc)]<br>"
+
+			if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species that have body markings.
+				dat += "<b>Body Markings:</b> "
+				dat += "<a href='?_src_=prefs;preference=m_style;task=input'>[m_style]</a>"
+				dat += "<a href='?_src_=prefs;preference=markings;task=input'>Color</a> [color_square(r_markings, g_markings, b_markings)]<br>"
+
+			dat += "<b>Hair:</b> "
+			dat += "<a href='?_src_=prefs;preference=h_style;task=input'>[h_style]</a>"
+			dat += "<a href='?_src_=prefs;preference=hair;task=input'>Color</a> [color_square(r_hair, g_hair, b_hair)]<br>"
+
+			dat += "<b>Facial Hair:</b> "
+			dat += "<a href='?_src_=prefs;preference=f_style;task=input'>[f_style ? "[f_style]" : "Shaved"]</a>"
+			dat += "<a href='?_src_=prefs;preference=facial;task=input'>Color</a> [color_square(r_facial, g_facial, b_facial)]<br>"
+
+			if(species != "Machine")
+				dat += "<b>Eyes:</b> "
+				dat += "<a href='?_src_=prefs;preference=eyes;task=input'>Color</a> [color_square(r_eyes, g_eyes, b_eyes)]<br>"
+
+			if((species in list("Unathi", "Tajaran", "Skrell", "Slime People", "Vulpkanin", "Machine")) || body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user)) //admins can always fuck with this, because they are admins
+				dat += "<b>Body Color:</b> "
+				dat += "<a href='?_src_=prefs;preference=skin;task=input'>Color</a> [color_square(r_skin, g_skin, b_skin)]<br>"
+
+			if(body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user))
+				dat += "<b>Body Accessory:</b> "
+				dat += "<a href='?_src_=prefs;preference=body_accessory;task=input'>[body_accessory ? "[body_accessory]" : "None"]</a><br>"
+
+			dat += "</td><td width='405px' height='200px' valign='top'>"
+			dat += "<h2>Occupation Choices</h2>"
+			dat += "<a href='?_src_=prefs;preference=job;task=menu'>Set Occupation Preferences</a><br>"
+			if(jobban_isbanned(user, "Records"))
+				dat += "<b>You are banned from using character records.</b><br>"
+			else
+				dat += "<a href=\"byond://?src=\ref[user];preference=records;record=1\">Character Records</a><br>"
+
+			dat += "<h2>Limbs</h2>"
+			dat += "<b>Limbs and Parts:</b> <a href='?_src_=prefs;preference=limbs;task=input'>Adjust</a><br>"
+			if(species != "Slime People" && species != "Machine")
+				dat += "<b>Internal Organs:</b> <a href='?_src_=prefs;preference=organs;task=input'>Adjust</a><br>"
+
+			//display limbs below
+			var/ind = 0
+			for(var/name in organ_data)
+				var/status = organ_data[name]
+				var/organ_name = null
+				switch(name)
+					if("chest")		organ_name = "torso"
+					if("groin")		organ_name = "lower body"
+					if("head")		organ_name = "head"
+					if("l_arm")		organ_name = "left arm"
+					if("r_arm")		organ_name = "right arm"
+					if("l_leg")		organ_name = "left leg"
+					if("r_leg")		organ_name = "right leg"
+					if("l_foot")	organ_name = "left foot"
+					if("r_foot")	organ_name = "right foot"
+					if("l_hand")	organ_name = "left hand"
+					if("r_hand")	organ_name = "right hand"
+					if("heart")		organ_name = "heart"
+					if("eyes")		organ_name = "eyes"
+
+				if(status in list("cyborg", "amputated", "mechanical", "assisted"))
+					++ind
+					if(ind > 1) dat += ", "
+
+				switch(status)
+					if("cyborg")
+						var/datum/robolimb/R
+						if(rlimb_data[name] && all_robolimbs[rlimb_data[name]])
+							R = all_robolimbs[rlimb_data[name]]
+						else
+							R = basic_robolimb
+						dat += "\t[R.company] [organ_name] prosthesis"
+					if("amputated")		dat += "\tAmputated [organ_name]"
+					if("mechanical")	dat += "\tMechanical [organ_name]"
+					if("assisted")
+						switch(organ_name)
+							if("heart")		dat += "\tPacemaker-assisted [organ_name]"
+							if("voicebox")	dat += "\tSurgically altered [organ_name]"
+							if("eyes")		dat += "\tRetinal overlayed [organ_name]"
+							else			dat += "\tMechanically assisted [organ_name]"
+			if(!ind)	dat += "\[...\]<br>"
+			else		dat += "<br>"
+
+			dat += "<h2>Clothing</h2>"
+			dat += "<b>Underwear:</b> <a href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a><BR>"
+			dat += "<b>Undershirt:</b> <a href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a><BR>"
+			dat += "<b>Socks:</b> <a href ='?_src_=prefs;preference=socks;task=input'>[socks]</a><BR>"
+			dat += "<b>Backpack Type:</b> <a href ='?_src_=prefs;preference=bag;task=input'>[backbaglist[backbag]]</a><br>"
+
+			dat += "</td></tr></table>"
+
+		if(TAB_GAME) // General Preferences
+			dat += "<table><tr><td width='340px' height='300px' valign='top'>"
+			dat += "<h2>General Settings</h2>"
+			dat += "<b>Fancy NanoUI:</b> <a href='?_src_=prefs;preference=nanoui'>[(nanoui_fancy) ? "Yes" : "No"]</a><br>"
+			dat += "<b>Ghost-Item Attack Animation:</b> <a href='?_src_=prefs;preference=ghost_att_anim'>[(show_ghostitem_attack) ? "Yes" : "No"]</a><br>"
+			dat += "<b>Custom UI settings:</b><br>"
+			dat += " - <b>UI Style:</b> <a href='?_src_=prefs;preference=ui'><b>[UI_style]</b></a><br>"
+			dat += " - <b>Color:</b> <a href='?_src_=prefs;preference=UIcolor'><b>[UI_style_color]</b></a> <table style='display:inline;' bgcolor='[UI_style_color]'<tr><td>__</td></tr></table><br>"
+			dat += " - <b>Alpha (transparency):</b> <a href='?_src_=prefs;preference=UIalpha'><b>[UI_style_alpha]</b></a><br>"
+			dat += "<br>"
+			dat += "<b>Play admin midis:</b> <a href='?_src_=prefs;preference=hear_midis'><b>[(sound & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>"
+			dat += "<b>Play lobby music:</b> <a href='?_src_=prefs;preference=lobby_music'><b>[(sound & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>"
+			if(user.client.holder)
+				dat += "<b>Adminhelp sound:</b> "
+				dat += "<a href='?_src_=prefs;preference=hear_adminhelps'><b>[(sound & SOUND_ADMINHELP)?"On":"Off"]</b></a><br>"
+
+			if(check_rights(R_ADMIN,0))
+				dat += "<b>OOC:</b> <span style='border: 1px solid #161616; background-color: [ooccolor ? ooccolor : normal_ooc_colour];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=ooccolor;task=input'><b>Change</b></a><br>"
+			if(config.allow_Metadata)
+				dat += "<b>OOC notes:</b> <a href='?_src_=prefs;preference=metadata;task=input'><b>Edit</b></a><br>"
+			if(unlock_content)
+				dat += "<b>BYOND Membership Publicity:</b> <a href='?_src_=prefs;preference=publicity'><b>[(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"]</b></a><br>"
+
+			dat += "<b>Randomized character slot:</b> <a href='?_src_=prefs;preference=randomslot'><b>[randomslot ? "Yes" : "No"]</b></a><br>"
+			dat += "<b>Ghost ears:</b> <a href='?_src_=prefs;preference=ghost_ears'><b>[(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]</b></a><br>"
+			dat += "<b>Ghost sight:</b> <a href='?_src_=prefs;preference=ghost_sight'><b>[(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]</b></a><br>"
+			dat += "<b>Ghost radio:</b> <a href='?_src_=prefs;preference=ghost_radio'><b>[(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"]</b></a><br>"
+
+			dat += "</td><td width='300px' height='300px' valign='top'>"
+			dat += "<h2>Special Role Settings</h2>"
+			if(jobban_isbanned(user, "Syndicate"))
+				dat += "<b>You are banned from special roles.</b>"
+				be_special = list()
+			else
+				for(var/i in special_roles)
+					if(jobban_isbanned(user, i))
+						dat += "<b>Be [capitalize(i)]:</b> <font color=red><b> \[BANNED]</b></font><br>"
+					else if(!player_old_enough_antag(user.client,i))
+						var/available_in_days_antag = available_in_days_antag(user.client,i)
+						dat += "<b>Be [capitalize(i)]:</b> <font color=red><b> \[IN [(available_in_days_antag)] DAYS]</b></font><br>"
+					else
+						dat += "<b>Be [capitalize(i)]:</b> <a href='?_src_=prefs;preference=be_special;role=[i]'><b>[(i in src.be_special) ? "Yes" : "No"]</b></a><br>"
+			dat += "</td></tr></table>"
+
+		if(TAB_GEAR)
+			var/total_cost = 0
+			var/list/type_blacklist = list()
+			if(gear && gear.len)
+				for(var/i = 1, i <= gear.len, i++)
+					var/datum/gear/G = gear_datums[gear[i]]
+					if(G)
+						if(!G.subtype_cost_overlap)
+							if(G.subtype_path in type_blacklist)
+								continue
+							type_blacklist += G.subtype_path
+						total_cost += G.cost
+
+			var/fcolor =  "#3366CC"
+			if(total_cost < MAX_GEAR_COST)
+				fcolor = "#E67300"
+			dat += "<table align='center' width='100%'>"
+			dat += "<tr><td colspan=4><center><b><font color='[fcolor]'>[total_cost]/[MAX_GEAR_COST]</font> loadout points spent.</b> \[<a href='?_src_=prefs;preference=gear;clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
+			dat += "<tr><td colspan=4><center><b>"
+
+			var/firstcat = 1
+			for(var/category in loadout_categories)
+				if(firstcat)
+					firstcat = 0
+				else
+					dat += " |"
+				if(category == gear_tab)
+					dat += " <span class='linkOff'>[category]</span> "
+				else
+					dat += " <a href='?_src_=prefs;preference=gear;select_category=[category]'>[category]</a> "
+			dat += "</b></center></td></tr>"
+
+			var/datum/loadout_category/LC = loadout_categories[gear_tab]
+			dat += "<tr><td colspan=4><hr></td></tr>"
+			dat += "<tr><td colspan=4><b><center>[LC.category]</center></b></td></tr>"
+			dat += "<tr><td colspan=4><hr></td></tr>"
+			for(var/gear_name in LC.gear)
+				var/datum/gear/G = LC.gear[gear_name]
+				var/ticked = (G.display_name in gear)
+				dat += "<tr style='vertical-align:top;'><td width=15%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='?_src_=prefs;preference=gear;toggle_gear=[G.display_name]'>[G.display_name]</a></td>"
+				dat += "<td width = 5% style='vertical-align:top'>[G.cost]</td><td>"
+				if(G.allowed_roles)
+					dat += "<font size=2>Restrictions: "
+					for(var/role in G.allowed_roles)
+						dat += role + " "
+					dat += "</font>"
+				dat += "</td><td><font size=2><i>[G.description]</i></font></td></tr>"
+				if(ticked)
+					. += "<tr><td colspan=4>"
+					for(var/datum/gear_tweak/tweak in G.gear_tweaks)
+						. += " <a href='?_src_=prefs;preference=gear;gear=[G.display_name];tweak=\ref[tweak]'>[tweak.get_contents(get_tweak_metadata(G, tweak))]</a>"
+					. += "</td></tr>"
+			dat += "</table>"
+
+	dat += "<hr><center>"
+	if(!IsGuestKey(user.key))
+		dat += "<a href='?_src_=prefs;preference=load'>Undo</a> - "
+		dat += "<a href='?_src_=prefs;preference=save'>Save Setup</a> - "
+
+	dat += "<a href='?_src_=prefs;preference=reset_all'>Reset Setup</a>"
+	dat += "</center>"
+
+	var/datum/browser/popup = new(user, "preferences", "<div align='center'>Character Setup</div>", 820, 640)
+	popup.set_content(dat)
+	popup.open(0)
+
+
+/datum/preferences/proc/get_gear_metadata(var/datum/gear/G)
+	. = gear[G.display_name]
+	if(!.)
+		. = list()
+		gear[G.display_name] = .
+
+/datum/preferences/proc/get_tweak_metadata(var/datum/gear/G, var/datum/gear_tweak/tweak)
+	var/list/metadata = get_gear_metadata(G)
+	. = metadata["[tweak]"]
+	if(!.)
+		. = tweak.get_default()
+		metadata["[tweak]"] = .
+
+/datum/preferences/proc/set_tweak_metadata(var/datum/gear/G, var/datum/gear_tweak/tweak, var/new_metadata)
+	var/list/metadata = get_gear_metadata(G)
+	metadata["[tweak]"] = new_metadata
+
+
+/datum/preferences/proc/SetChoices(mob/user, limit = 12, list/splitJobs = list("Civilian","Research Director","AI","Bartender"), width = 760, height = 790)
+	if(!job_master)
+		return
+
+	//limit 	 - The amount of jobs allowed per column. Defaults to 17 to make it look nice.
+	//splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice.
+	//width	 - Screen' width. Defaults to 550 to make it look nice.
+	//height 	 - Screen's height. Defaults to 500 to make it look nice.
+
+
+	var/HTML = "<body>"
+	HTML += "<tt><center>"
+	HTML += "<b>Choose occupation chances</b><br>Unavailable occupations are crossed out.<br><br>"
+	HTML += "<center><a href='?_src_=prefs;preference=job;task=close'>\[Done\]</a></center><br>" // Easier to press up here.
+	HTML += "<div align='center'>Left-click to raise an occupation preference, right-click to lower it.<br></div>"
+	HTML += "<script type='text/javascript'>function setJobPrefRedirect(level, rank) { window.location.href='?_src_=prefs;preference=job;task=setJobLevel;level=' + level + ';text=' + encodeURIComponent(rank); return false; }</script>"
+	HTML += "<table width='100%' cellpadding='1' cellspacing='0'><tr><td width='20%'>" // Table within a table for alignment, also allows you to easily add more colomns.
+	HTML += "<table width='100%' cellpadding='1' cellspacing='0'>"
+	var/index = -1
+
+	//The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows.
+	var/datum/job/lastJob
+	if(!job_master)		return
+	for(var/datum/job/job in job_master.occupations)
+
+		if(job.admin_only)
+			continue
+
+		index += 1
+		if((index >= limit) || (job.title in splitJobs))
+			if((index < limit) && (lastJob != null))
+				//If the cells were broken up by a job in the splitJob list then it will fill in the rest of the cells with
+				//the last job's selection color. Creating a rather nice effect.
+				for(var/i = 0, i < (limit - index), i += 1)
+					HTML += "<tr bgcolor='[lastJob.selection_color]'><td width='60%' align='right'>&nbsp</td><td>&nbsp</td></tr>"
+			HTML += "</table></td><td width='20%'><table width='100%' cellpadding='1' cellspacing='0'>"
+			index = 0
+
+		HTML += "<tr bgcolor='[job.selection_color]'><td width='60%' align='right'>"
+		var/rank = job.title
+		lastJob = job
+		if(!is_job_whitelisted(user, rank))
+			HTML += "<font color=red>[rank]</font></td><td><font color=red><b> \[KARMA]</b></font></td></tr>"
+			continue
+		if(jobban_isbanned(user, rank))
+			HTML += "<del>[rank]</del></td><td><b> \[BANNED]</b></td></tr>"
+			continue
+		if(!job.player_old_enough(user.client))
+			var/available_in_days = job.available_in_days(user.client)
+			HTML += "<del>[rank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
+			continue
+		if((job_support_low & CIVILIAN) && (rank != "Civilian"))
+			HTML += "<font color=orange>[rank]</font></td><td></td></tr>"
+			continue
+		if((rank in command_positions) || (rank == "AI"))//Bold head jobs
+			HTML += "<b><span class='dark'>[rank]</span></b>"
+		else
+			HTML += "<span class='dark'>[rank]</span>"
+
+		HTML += "</td><td width='40%'>"
+
+		var/prefLevelLabel = "ERROR"
+		var/prefLevelColor = "pink"
+		var/prefUpperLevel = -1 // level to assign on left click
+		var/prefLowerLevel = -1 // level to assign on right click
+
+		if(GetJobDepartment(job, 1) & job.flag)
+			prefLevelLabel = "High"
+			prefLevelColor = "slateblue"
+			prefUpperLevel = 4
+			prefLowerLevel = 2
+		else if(GetJobDepartment(job, 2) & job.flag)
+			prefLevelLabel = "Medium"
+			prefLevelColor = "green"
+			prefUpperLevel = 1
+			prefLowerLevel = 3
+		else if(GetJobDepartment(job, 3) & job.flag)
+			prefLevelLabel = "Low"
+			prefLevelColor = "orange"
+			prefUpperLevel = 2
+			prefLowerLevel = 4
+		else
+			prefLevelLabel = "NEVER"
+			prefLevelColor = "red"
+			prefUpperLevel = 3
+			prefLowerLevel = 1
+
+
+		HTML += "<a class='white' href='?_src_=prefs;preference=job;task=setJobLevel;level=[prefUpperLevel];text=[rank]' oncontextmenu='javascript:return setJobPrefRedirect([prefLowerLevel], \"[rank]\");'>"
+
+//			HTML += "<a href='?_src_=prefs;preference=job;task=input;text=[rank]'>"
+
+		if(rank == "Civilian")//Civilian is special
+			if(job_support_low & CIVILIAN)
+				HTML += " <font color=green>\[Yes]</font></a>"
+			else
+				HTML += " <font color=red>\[No]</font></a>"
+			if(job.alt_titles)
+				HTML += "<br><b><a class='white' href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
+			HTML += "</td></tr>"
+			continue
+/*
+		if(GetJobDepartment(job, 1) & job.flag)
+			HTML += " <font color=blue>\[High]</font>"
+		else if(GetJobDepartment(job, 2) & job.flag)
+			HTML += " <font color=green>\[Medium]</font>"
+		else if(GetJobDepartment(job, 3) & job.flag)
+			HTML += " <font color=orange>\[Low]</font>"
+		else
+			HTML += " <font color=red>\[NEVER]</font>"
+			*/
+		HTML += "<font color=[prefLevelColor]>[prefLevelLabel]</font></a>"
+
+		if(job.alt_titles)
+			HTML += "<br><b><a class='white' href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
+
+
+		HTML += "</td></tr>"
+
+	for(var/i = 1, i < (limit - index), i += 1) // Finish the column so it is even
+		HTML += "<tr bgcolor='[lastJob.selection_color]'><td width='60%' align='right'>&nbsp</td><td>&nbsp</td></tr>"
+
+	HTML += "</td'></tr></table>"
+
+	HTML += "</center></table>"
+
+	switch(alternate_option)
+		if(GET_RANDOM_JOB)
+			HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Get random job if preferences unavailable</font></a></u></center><br>"
+		if(BE_CIVILIAN)
+			HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Be a civilian if preferences unavailable</font></a></u></center><br>"
+		if(RETURN_TO_LOBBY)
+			HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Return to lobby if preferences unavailable</font></a></u></center><br>"
+
+	HTML += "<center><a href='?_src_=prefs;preference=job;task=reset'>\[Reset\]</a></center>"
+	HTML += "</tt>"
+
+	user << browse(null, "window=preferences")
+//		user << browse(HTML, "window=mob_occupation;size=[width]x[height]")
+	var/datum/browser/popup = new(user, "mob_occupation", "<div align='center'>Occupation Preferences</div>", width, height)
+	popup.set_window_options("can_close=0")
+	popup.set_content(HTML)
+	popup.open(0)
+	return
+
+/datum/preferences/proc/SetJobPreferenceLevel(var/datum/job/job, var/level)
+	if(!job)
+		return 0
+
+	if(level == 1) // to high
+		// remove any other job(s) set to high
+		job_support_med |= job_support_high
+		job_engsec_med |= job_engsec_high
+		job_medsci_med |= job_medsci_high
+		job_karma_med |= job_karma_high
+		job_support_high = 0
+		job_engsec_high = 0
+		job_medsci_high = 0
+		job_karma_high = 0
+
+	if(job.department_flag == SUPPORT)
+		job_support_low &= ~job.flag
+		job_support_med &= ~job.flag
+		job_support_high &= ~job.flag
+
+		switch(level)
+			if(1)
+				job_support_high |= job.flag
+			if(2)
+				job_support_med |= job.flag
+			if(3)
+				job_support_low |= job.flag
+
+		return 1
+	else if(job.department_flag == ENGSEC)
+		job_engsec_low &= ~job.flag
+		job_engsec_med &= ~job.flag
+		job_engsec_high &= ~job.flag
+
+		switch(level)
+			if(1)
+				job_engsec_high |= job.flag
+			if(2)
+				job_engsec_med |= job.flag
+			if(3)
+				job_engsec_low |= job.flag
+
+		return 1
+	else if(job.department_flag == MEDSCI)
+		job_medsci_low &= ~job.flag
+		job_medsci_med &= ~job.flag
+		job_medsci_high &= ~job.flag
+
+		switch(level)
+			if(1)
+				job_medsci_high |= job.flag
+			if(2)
+				job_medsci_med |= job.flag
+			if(3)
+				job_medsci_low |= job.flag
+
+		return 1
+	else if(job.department_flag == KARMA)
+		job_karma_low &= ~job.flag
+		job_karma_med &= ~job.flag
+		job_karma_high &= ~job.flag
+
+		switch(level)
+			if(1)
+				job_karma_high |= job.flag
+			if(2)
+				job_karma_med |= job.flag
+			if(3)
+				job_karma_low |= job.flag
+
+		return 1
+
+	return 0
+
+/datum/preferences/proc/UpdateJobPreference(mob/user, role, desiredLvl)
+	var/datum/job/job = job_master.GetJob(role)
+
+	if(!job)
+		user << browse(null, "window=mob_occupation")
+		ShowChoices(user)
+		return
+
+	if(!isnum(desiredLvl))
+		to_chat(user, "\red UpdateJobPreference - desired level was not a number. Please notify coders!")
+		ShowChoices(user)
+		return
+
+	if(role == "Civilian")
+		if(job_support_low & job.flag)
+			job_support_low &= ~job.flag
+		else
+			job_support_low |= job.flag
+		SetChoices(user)
+		return 1
+
+	SetJobPreferenceLevel(job, desiredLvl)
+	SetChoices(user)
+
+	return 1
+
+/datum/preferences/proc/ShowDisabilityState(mob/user,flag,label)
+	if(flag==DISABILITY_FLAG_FAT && species!=("Human" || "Tajaran" || "Grey"))
+		return "<li><i>[species] cannot be fat.</i></li>"
+	return "<li><b>[label]:</b> <a href=\"?_src_=prefs;task=input;preference=disabilities;disability=[flag]\">[disabilities & flag ? "Yes" : "No"]</a></li>"
+
+/datum/preferences/proc/SetDisabilities(mob/user)
+	var/HTML = "<body>"
+
+	// AUTOFIXED BY fix_string_idiocy.py
+	// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\client\preferences.dm:474: HTML += "<tt><center>"
+	HTML += {"<tt><center>
+		<b>Choose disabilities</b><ul>"}
+	// END AUTOFIX
+	HTML += ShowDisabilityState(user,DISABILITY_FLAG_NEARSIGHTED,"Needs Glasses")
+	HTML += ShowDisabilityState(user,DISABILITY_FLAG_FAT,"Obese")
+	HTML += ShowDisabilityState(user,DISABILITY_FLAG_EPILEPTIC,"Seizures")
+	HTML += ShowDisabilityState(user,DISABILITY_FLAG_DEAF,"Deaf")
+	HTML += ShowDisabilityState(user,DISABILITY_FLAG_BLIND,"Blind")
+	HTML += ShowDisabilityState(user,DISABILITY_FLAG_MUTE,"Mute")
+
+
+	// AUTOFIXED BY fix_string_idiocy.py
+	// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\client\preferences.dm:481: HTML += "</ul>"
+	HTML += {"</ul>
+		<a href=\"?_src_=prefs;task=close;preference=disabilities\">\[Done\]</a>
+		<a href=\"?_src_=prefs;task=reset;preference=disabilities\">\[Reset\]</a>
+		</center></tt>"}
+	// END AUTOFIX
+	user << browse(null, "window=preferences")
+	user << browse(HTML, "window=disabil;size=350x300")
+	return
+
+/datum/preferences/proc/SetRecords(mob/user)
+	var/HTML = "<body>"
+	HTML += "<tt><center>"
+	HTML += "<b>Set Character Records</b><br>"
+
+	HTML += "<a href=\"byond://?src=\ref[user];preference=records;task=med_record\">Medical Records</a><br>"
+
+	if(lentext(med_record) <= 40)
+		HTML += "[med_record]"
+	else
+		HTML += "[copytext(med_record, 1, 37)]..."
+
+	HTML += "<br><br><a href=\"byond://?src=\ref[user];preference=records;task=gen_record\">Employment Records</a><br>"
+
+	if(lentext(gen_record) <= 40)
+		HTML += "[gen_record]"
+	else
+		HTML += "[copytext(gen_record, 1, 37)]..."
+
+	HTML += "<br><br><a href=\"byond://?src=\ref[user];preference=records;task=sec_record\">Security Records</a><br>"
+
+	if(lentext(sec_record) <= 40)
+		HTML += "[sec_record]<br>"
+	else
+		HTML += "[copytext(sec_record, 1, 37)]...<br>"
+
+	HTML += "<br>"
+	HTML += "<a href=\"byond://?src=\ref[user];preference=records;records=-1\">\[Done\]</a>"
+	HTML += "</center></tt>"
+
+	user << browse(null, "window=preferences")
+	user << browse(HTML, "window=records;size=350x300")
+	return
+
+/datum/preferences/proc/GetPlayerAltTitle(datum/job/job)
+	return player_alt_titles.Find(job.title) > 0 \
+		? player_alt_titles[job.title] \
+		: job.title
+
+/datum/preferences/proc/SetPlayerAltTitle(datum/job/job, new_title)
+	// remove existing entry
+	if(player_alt_titles.Find(job.title))
+		player_alt_titles -= job.title
+	// add one if it's not default
+	if(job.title != new_title)
+		player_alt_titles[job.title] = new_title
+
+/datum/preferences/proc/SetJob(mob/user, role)
+	var/datum/job/job = job_master.GetJob(role)
+	if(!job)
+		user << browse(null, "window=mob_occupation")
+		ShowChoices(user)
+		return
+
+	if(role == "Civilian")
+		if(job_support_low & job.flag)
+			job_support_low &= ~job.flag
+		else
+			job_support_low |= job.flag
+		SetChoices(user)
+		return 1
+
+	if(GetJobDepartment(job, 1) & job.flag)
+		SetJobDepartment(job, 1)
+	else if(GetJobDepartment(job, 2) & job.flag)
+		SetJobDepartment(job, 2)
+	else if(GetJobDepartment(job, 3) & job.flag)
+		SetJobDepartment(job, 3)
+	else//job = Never
+		SetJobDepartment(job, 4)
+
+	SetChoices(user)
+	return 1
+
+/datum/preferences/proc/ResetJobs()
+	job_support_high = 0
+	job_support_med = 0
+	job_support_low = 0
+
+	job_medsci_high = 0
+	job_medsci_med = 0
+	job_medsci_low = 0
+
+	job_engsec_high = 0
+	job_engsec_med = 0
+	job_engsec_low = 0
+
+	job_karma_high = 0
+	job_karma_med = 0
+	job_karma_low = 0
+
+
+/datum/preferences/proc/GetJobDepartment(var/datum/job/job, var/level)
+	if(!job || !level)	return 0
+	switch(job.department_flag)
+		if(SUPPORT)
+			switch(level)
+				if(1)
+					return job_support_high
+				if(2)
+					return job_support_med
+				if(3)
+					return job_support_low
+		if(MEDSCI)
+			switch(level)
+				if(1)
+					return job_medsci_high
+				if(2)
+					return job_medsci_med
+				if(3)
+					return job_medsci_low
+		if(ENGSEC)
+			switch(level)
+				if(1)
+					return job_engsec_high
+				if(2)
+					return job_engsec_med
+				if(3)
+					return job_engsec_low
+		if(KARMA)
+			switch(level)
+				if(1)
+					return job_karma_high
+				if(2)
+					return job_karma_med
+				if(3)
+					return job_karma_low
+	return 0
+
+/datum/preferences/proc/SetJobDepartment(var/datum/job/job, var/level)
+	if(!job || !level)	return 0
+	switch(level)
+		if(1)//Only one of these should ever be active at once so clear them all here
+			job_support_high = 0
+			job_medsci_high = 0
+			job_engsec_high = 0
+			job_karma_high = 0
+			return 1
+		if(2)//Set current highs to med, then reset them
+			job_support_med |= job_support_high
+			job_medsci_med |= job_medsci_high
+			job_engsec_med |= job_engsec_high
+			job_karma_med |= job_karma_high
+			job_support_high = 0
+			job_medsci_high = 0
+			job_engsec_high = 0
+			job_karma_high = 0
+
+	switch(job.department_flag)
+		if(SUPPORT)
+			switch(level)
+				if(2)
+					job_support_high = job.flag
+					job_support_med &= ~job.flag
+				if(3)
+					job_support_med |= job.flag
+					job_support_low &= ~job.flag
+				else
+					job_support_low |= job.flag
+		if(MEDSCI)
+			switch(level)
+				if(2)
+					job_medsci_high = job.flag
+					job_medsci_med &= ~job.flag
+				if(3)
+					job_medsci_med |= job.flag
+					job_medsci_low &= ~job.flag
+				else
+					job_medsci_low |= job.flag
+		if(ENGSEC)
+			switch(level)
+				if(2)
+					job_engsec_high = job.flag
+					job_engsec_med &= ~job.flag
+				if(3)
+					job_engsec_med |= job.flag
+					job_engsec_low &= ~job.flag
+				else
+					job_engsec_low |= job.flag
+		if(KARMA)
+			switch(level)
+				if(2)
+					job_karma_high = job.flag
+					job_karma_med &= ~job.flag
+				if(3)
+					job_karma_med |= job.flag
+					job_karma_low &= ~job.flag
+				else
+					job_karma_low |= job.flag
+	return 1
+
+/datum/preferences/proc/process_link(mob/user, list/href_list)
+	if(!user)	return
+
+	if(href_list["preference"] == "job")
+		switch(href_list["task"])
+			if("close")
+				user << browse(null, "window=mob_occupation")
+				ShowChoices(user)
+			if("reset")
+				ResetJobs()
+				SetChoices(user)
+			if("random")
+				if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_CIVILIAN)
+					alternate_option += 1
+				else if(alternate_option == RETURN_TO_LOBBY)
+					alternate_option = 0
+				else
+					return 0
+				SetChoices(user)
+			if("alt_title")
+				var/datum/job/job = locate(href_list["job"])
+				if(job)
+					var/choices = list(job.title) + job.alt_titles
+					var/choice = input("Pick a title for [job.title].", "Character Generation", GetPlayerAltTitle(job)) as anything in choices | null
+					if(choice)
+						SetPlayerAltTitle(job, choice)
+						SetChoices(user)
+			if("input")
+				SetJob(user, href_list["text"])
+			if("setJobLevel")
+				UpdateJobPreference(user, href_list["text"], text2num(href_list["level"]))
+			else
+				SetChoices(user)
+		return 1
+	else if(href_list["preference"] == "disabilities")
+
+		switch(href_list["task"])
+			if("close")
+				user << browse(null, "window=disabil")
+				ShowChoices(user)
+			if("reset")
+				disabilities=0
+				SetDisabilities(user)
+			if("input")
+				var/dflag=text2num(href_list["disability"])
+				if(dflag >= 0)
+					if(!(dflag==DISABILITY_FLAG_FAT && species!=("Human" || "Tajaran" || "Grey")))
+						disabilities ^= text2num(href_list["disability"]) //MAGIC
+				SetDisabilities(user)
+			else
+				SetDisabilities(user)
+		return 1
+
+	else if(href_list["preference"] == "records")
+		if(text2num(href_list["record"]) >= 1)
+			SetRecords(user)
+			return
+		else
+			user << browse(null, "window=records")
+		if(href_list["task"] == "med_record")
+			var/medmsg = input(usr,"Set your medical notes here.","Medical Records",html_decode(med_record)) as message
+
+			if(medmsg != null)
+				medmsg = copytext(medmsg, 1, MAX_PAPER_MESSAGE_LEN)
+				medmsg = html_encode(medmsg)
+
+				med_record = medmsg
+				SetRecords(user)
+
+		if(href_list["task"] == "sec_record")
+			var/secmsg = input(usr,"Set your security notes here.","Security Records",html_decode(sec_record)) as message
+
+			if(secmsg != null)
+				secmsg = copytext(secmsg, 1, MAX_PAPER_MESSAGE_LEN)
+				secmsg = html_encode(secmsg)
+
+				sec_record = secmsg
+				SetRecords(user)
+		if(href_list["task"] == "gen_record")
+			var/genmsg = input(usr,"Set your employment notes here.","Employment Records",html_decode(gen_record)) as message
+
+			if(genmsg != null)
+				genmsg = copytext(genmsg, 1, MAX_PAPER_MESSAGE_LEN)
+				genmsg = html_encode(genmsg)
+
+				gen_record = genmsg
+				SetRecords(user)
+
+	if(href_list["preference"] == "gear")
+		if(href_list["toggle_gear"])
+			var/datum/gear/TG = gear_datums[href_list["toggle_gear"]]
+			if(TG.display_name in gear)
+				gear -= TG.display_name
+			else
+				var/total_cost = 0
+				var/list/type_blacklist = list()
+				for(var/gear_name in gear)
+					var/datum/gear/G = gear_datums[gear_name]
+					if(istype(G))
+						if(!G.subtype_cost_overlap)
+							if(G.subtype_path in type_blacklist)
+								continue
+							type_blacklist += G.subtype_path
+						total_cost += G.cost
+
+				if((total_cost + TG.cost) <= MAX_GEAR_COST)
+					gear += TG.display_name
+
+		else if(href_list["gear"] && href_list["tweak"])
+			var/datum/gear/gear = gear_datums[href_list["gear"]]
+			var/datum/gear_tweak/tweak = locate(href_list["tweak"])
+			if(!tweak || !istype(gear) || !(tweak in gear.gear_tweaks))
+				return
+			var/metadata = tweak.get_metadata(user, get_tweak_metadata(gear, tweak))
+			if(!metadata || !CanUseTopic(user))
+				return
+			set_tweak_metadata(gear, tweak, metadata)
+		else if(href_list["select_category"])
+			gear_tab = href_list["select_category"]
+		else if(href_list["clear_loadout"])
+			gear.Cut()
+
+		ShowChoices(user)
+		return
+
+	switch(href_list["task"])
+		if("random")
+			switch(href_list["preference"])
+				if("name")
+					real_name = random_name(gender,species)
+				if("age")
+					age = rand(AGE_MIN, AGE_MAX)
+				if("hair")
+					if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Wryn", "Vulpkanin", "Vox"))
+						r_hair = rand(0,255)
+						g_hair = rand(0,255)
+						b_hair = rand(0,255)
+				if("h_style")
+					h_style = random_hair_style(gender, species)
+				if("facial")
+					if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Wryn", "Vulpkanin", "Vox"))
+						r_facial = rand(0,255)
+						g_facial = rand(0,255)
+						b_facial = rand(0,255)
+				if("f_style")
+					f_style = random_facial_hair_style(gender, species)
+				if("underwear")
+					underwear = random_underwear(gender)
+					ShowChoices(user)
+				if("undershirt")
+					undershirt = random_undershirt(gender)
+					ShowChoices(user)
+				if("socks")
+					socks = random_socks(gender)
+					ShowChoices(user)
+				if("eyes")
+					r_eyes = rand(0,255)
+					g_eyes = rand(0,255)
+					b_eyes = rand(0,255)
+				if("s_tone")
+					if(species in list("Human", "Drask", "Vox"))
+						s_tone = random_skin_tone()
+				if("s_color")
+					if(species in list("Unathi", "Tajaran", "Skrell", "Slime People", "Wryn", "Vulpkanin", "Machine"))
+						r_skin = rand(0,255)
+						g_skin = rand(0,255)
+						b_skin = rand(0,255)
+				if("bag")
+					backbag = rand(1,4)
+				/*if("skin_style")
+					h_style = random_skin_style(gender)*/
+				if("all")
+					random_character()
+		if("input")
+			switch(href_list["preference"])
+				if("name")
+					var/raw_name = input(user, "Choose your character's name:", "Character Preference") as text|null
+					if(!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
+						var/new_name = reject_bad_name(raw_name)
+						if(new_name)
+							real_name = new_name
+						else
+							to_chat(user, "<font color='red'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</font>")
+
+				if("age")
+					var/new_age = input(user, "Choose your character's age:\n([AGE_MIN]-[AGE_MAX])", "Character Preference") as num|null
+					if(new_age)
+						age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN)
+				if("species")
+
+					var/list/new_species = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin")
+					var/prev_species = species
+//						var/whitelisted = 0
+
+					if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
+						for(var/S in whitelisted_species)
+							if(is_alien_whitelisted(user,S))
+								new_species += S
+//									whitelisted = 1
+//							if(!whitelisted)
+//								alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.")
+					else //Not using the whitelist? Aliens for everyone!
+						new_species += whitelisted_species
+
+					species = input("Please select a species", "Character Generation", null) in new_species
+
+					if(prev_species != species)
+						//grab one of the valid hair styles for the newly chosen species
+						var/list/valid_hairstyles = list()
+						for(var/hairstyle in hair_styles_list)
+							var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
+							if(gender == MALE && S.gender == FEMALE)
+								continue
+							if(gender == FEMALE && S.gender == MALE)
+								continue
+							if(!(species in S.species_allowed))
+								continue
+
+							valid_hairstyles[hairstyle] = hair_styles_list[hairstyle]
+
+						if(valid_hairstyles.len)
+							h_style = pick(valid_hairstyles)
+						else
+							//this shouldn't happen
+							h_style = hair_styles_list["Bald"]
+
+						//grab one of the valid facial hair styles for the newly chosen species
+						var/list/valid_facialhairstyles = list()
+						for(var/facialhairstyle in facial_hair_styles_list)
+							var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
+							if(gender == MALE && S.gender == FEMALE)
+								continue
+							if(gender == FEMALE && S.gender == MALE)
+								continue
+							if(!(species in S.species_allowed))
+								continue
+
+							valid_facialhairstyles[facialhairstyle] = facial_hair_styles_list[facialhairstyle]
+
+						if(valid_facialhairstyles.len)
+							f_style = pick(valid_facialhairstyles)
+						else
+							//this shouldn't happen
+							f_style = facial_hair_styles_list["Shaved"]
+
+						// Don't wear another species' underwear!
+						var/datum/sprite_accessory/S = underwear_list[underwear]
+						if(!S || !(species in S.species_allowed))
+							underwear = random_underwear(gender, species)
+
+						S = undershirt_list[undershirt]
+						if(!S || !(species in S.species_allowed))
+							undershirt = random_undershirt(gender, species)
+
+						S = socks_list[socks]
+						if(!S || !(species in S.species_allowed))
+							socks = random_socks(gender, species)
+
+						//reset hair colour and skin colour
+						r_hair = 0//hex2num(copytext(new_hair, 2, 4))
+						g_hair = 0//hex2num(copytext(new_hair, 4, 6))
+						b_hair = 0//hex2num(copytext(new_hair, 6, 8))
+
+						s_tone = 0
+
+						if(!(species in list("Unathi", "Tajaran", "Skrell", "Slime People", "Vulpkanin", "Machine")))
+							r_skin = 0
+							g_skin = 0
+							b_skin = 0
+
+						ha_style = "None" // No Vulp ears on Unathi
+						m_style = "None" // No Unathi markings on Tajara
+
+						body_accessory = null //no vulptail on humans damnit
+
+						//Reset prosthetics.
+						organ_data = list()
+						rlimb_data = list()
+				if("speciesprefs")//oldvox code
+					speciesprefs = !speciesprefs
+
+				if("language")
+//						var/languages_available
+					var/list/new_languages = list("None")
+/*
+					if(config.usealienwhitelist)
+						for(var/L in all_languages)
+							var/datum/language/lang = all_languages[L]
+							if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))))
+								new_languages += lang
+								languages_available = 1
+
+						if(!(languages_available))
+							alert(user, "There are not currently any available secondary languages.")
+					else
+*/
+					for(var/L in all_languages)
+						var/datum/language/lang = all_languages[L]
+						if(!(lang.flags & RESTRICTED))
+							new_languages += lang.name
+
+					language = input("Please select a secondary language", "Character Generation", null) in new_languages
+
+				if("metadata")
+					var/new_metadata = input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , metadata)  as message|null
+					if(new_metadata)
+						metadata = sanitize(copytext(new_metadata,1,MAX_MESSAGE_LEN))
+
+				if("b_type")
+					var/new_b_type = input(user, "Choose your character's blood-type:", "Character Preference") as null|anything in list( "A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-" )
+					if(new_b_type)
+						b_type = new_b_type
+
+				if("hair")
+					if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox"))
+						var/input = "Choose your character's hair colour:"
+						var/new_hair = input(user, input, "Character Preference", rgb(r_hair, g_hair, b_hair)) as color|null
+						if(new_hair)
+							r_hair = hex2num(copytext(new_hair, 2, 4))
+							g_hair = hex2num(copytext(new_hair, 4, 6))
+							b_hair = hex2num(copytext(new_hair, 6, 8))
+
+				if("h_style")
+					var/list/valid_hairstyles = list()
+					for(var/hairstyle in hair_styles_list)
+						var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
+						if(species == "Machine") //Species that can use prosthetic heads.
+							var/obj/item/organ/external/head/H = new()
+							if(S.name == "Bald")
+								valid_hairstyles[hairstyle] = S
+							if(!rlimb_data["head"]) //Handle situations where the head is default.
+								H.model = "Morpheus Cyberkinetics"
+							else
+								H.model = rlimb_data["head"]
+							var/datum/robolimb/robohead = all_robolimbs[H.model]
+							if(species in S.species_allowed)
+								if(robohead.is_monitor && (robohead.company in S.models_allowed)) //If the Machine character has the default Morpheus screen head or another screen head
+																														   //and said head is in the hair style's allowed models list...
+									valid_hairstyles[hairstyle] = S //Allow them to select the hairstyle.
+								continue
+							else
+								if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human hairstyles).
+									continue
+								else if(!robohead.is_monitor && ("Human" in S.species_allowed))
+									valid_hairstyles[hairstyle] = S
+								continue
+						else
+							if(!(species in S.species_allowed))
+								continue
+
+							valid_hairstyles[hairstyle] = S
+
+					var/new_h_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in valid_hairstyles
+					if(new_h_style)
+						h_style = new_h_style
+
+				if("headaccessory")
+					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories.
+						var/input = "Choose the colour of your your character's head accessory:"
+						var/new_head_accessory = input(user, input, "Character Preference", rgb(r_headacc, g_headacc, b_headacc)) as color|null
+						if(new_head_accessory)
+							r_headacc = hex2num(copytext(new_head_accessory, 2, 4))
+							g_headacc = hex2num(copytext(new_head_accessory, 4, 6))
+							b_headacc = hex2num(copytext(new_head_accessory, 6, 8))
+
+				if("ha_style")
+					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories.
+						var/list/valid_head_accessory_styles = list()
+						for(var/head_accessory_style in head_accessory_styles_list)
+							var/datum/sprite_accessory/H = head_accessory_styles_list[head_accessory_style]
+							if(!(species in H.species_allowed))
+								continue
+
+							valid_head_accessory_styles[head_accessory_style] = head_accessory_styles_list[head_accessory_style]
+
+						var/new_head_accessory_style = input(user, "Choose the style of your character's head accessory:", "Character Preference") as null|anything in valid_head_accessory_styles
+						if(new_head_accessory_style)
+							ha_style = new_head_accessory_style
+
+				if("markings")
+					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with markings.
+						var/input = "Choose the colour of your your character's markings:"
+						var/new_markings = input(user, input, "Character Preference", rgb(r_markings, g_markings, b_markings)) as color|null
+						if(new_markings)
+							r_markings = hex2num(copytext(new_markings, 2, 4))
+							g_markings = hex2num(copytext(new_markings, 4, 6))
+							b_markings = hex2num(copytext(new_markings, 6, 8))
+
+				if("m_style")
+					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with markings.
+						var/list/valid_markings = list()
+						for(var/markingstyle in marking_styles_list)
+							var/datum/sprite_accessory/M = marking_styles_list[markingstyle]
+							if(!(species in M.species_allowed))
+								continue
+
+							if(species == "Machine") //Species that can use prosthetic heads.
+								var/obj/item/organ/external/head/H = new()
+								if(!rlimb_data["head"]) //Handle situations where the head is default.
+									H.model = "Morpheus Cyberkinetics"
+								else
+									H.model = rlimb_data["head"]
+								var/datum/robolimb/robohead = all_robolimbs[H.model]
+								if(robohead.is_monitor && M.name != "None") //If the character can have prosthetic heads and they have the default Morpheus head (or another monitor-head), no optic markings.
+									continue
+								else if(!robohead.is_monitor && M.name != "None") //Otherwise, if they DON'T have the default head and the head's not a monitor but the head's not in the style's list of allowed models, skip.
+									if(!(robohead.company in M.models_allowed))
+										continue
+
+							valid_markings[markingstyle] = marking_styles_list[markingstyle]
+
+						var/new_marking_style = input(user, "Choose the style of your character's markings:", "Character Preference", m_style) as null|anything in valid_markings
+						if(new_marking_style)
+							m_style = new_marking_style
+
+				if("body_accessory")
+					var/list/possible_body_accessories = list()
+					if(check_rights(R_ADMIN, 1, user))
+						possible_body_accessories = body_accessory_by_name.Copy()
+					else
+						for(var/B in body_accessory_by_name)
+							var/datum/body_accessory/accessory = body_accessory_by_name[B]
+							if(!istype(accessory))
+								possible_body_accessories += "None" //the only null entry should be the "None" option
+								continue
+							if(species in accessory.allowed_species)
+								possible_body_accessories += B
+
+					var/new_body_accessory = input(user, "Choose your body accessory:", "Character Preference") as null|anything in possible_body_accessories
+					if(new_body_accessory)
+						body_accessory = (new_body_accessory == "None") ? null : new_body_accessory
+
+				if("facial")
+					if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox"))
+						var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference", rgb(r_facial, g_facial, b_facial)) as color|null
+						if(new_facial)
+							r_facial = hex2num(copytext(new_facial, 2, 4))
+							g_facial = hex2num(copytext(new_facial, 4, 6))
+							b_facial = hex2num(copytext(new_facial, 6, 8))
+
+				if("f_style")
+					var/list/valid_facialhairstyles = list()
+					for(var/facialhairstyle in facial_hair_styles_list)
+						var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
+						if(S.name == "Shaved")
+							valid_facialhairstyles[facialhairstyle] = S
+						if(gender == MALE && S.gender == FEMALE)
+							continue
+						if(gender == FEMALE && S.gender == MALE)
+							continue
+						if(species == "Machine") //Species that can use prosthetic heads.
+							var/obj/item/organ/external/head/H = new()
+							if(!rlimb_data["head"]) //Handle situations where the head is default.
+								H.model = "Morpheus Cyberkinetics"
+							else
+								H.model = rlimb_data["head"]
+							var/datum/robolimb/robohead = all_robolimbs[H.model]
+							if(species in S.species_allowed)
+								if(robohead.is_monitor) //If the Machine character has the default Morpheus screen head or another screen head and they're allowed to have the style, let them have it.
+									valid_facialhairstyles[facialhairstyle] = S
+								continue
+							else
+								if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human facial hairstyles).
+									continue
+								else if(!robohead.is_monitor && ("Human" in S.species_allowed))
+									valid_facialhairstyles[facialhairstyle] = S
+								continue
+						else
+							if(!(species in S.species_allowed))
+								continue
+
+						valid_facialhairstyles[facialhairstyle] = facial_hair_styles_list[facialhairstyle]
+
+					var/new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference")  as null|anything in valid_facialhairstyles
+					if(new_f_style)
+						f_style = new_f_style
+
+				if("underwear")
+					var/list/underwear_options
+					if(gender == MALE)
+						underwear_options = underwear_m
+					else
+						underwear_options = underwear_f
+
+					var/new_underwear = input(user, "Choose your character's underwear:", "Character Preference")  as null|anything in underwear_options
+					if(new_underwear)
+						underwear = new_underwear
+					ShowChoices(user)
+
+				if("undershirt")
+					var/new_undershirt
+					if(gender == MALE)
+						new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in undershirt_m
+					else
+						new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in undershirt_f
+					if(new_undershirt)
+						undershirt = new_undershirt
+					ShowChoices(user)
+
+				if("socks")
+					var/list/valid_sockstyles = list()
+					for(var/sockstyle in socks_list)
+						var/datum/sprite_accessory/S = socks_list[sockstyle]
+						if(gender == MALE && S.gender == FEMALE)
+							continue
+						if(gender == FEMALE && S.gender == MALE)
+							continue
+						if(!(species in S.species_allowed))
+							continue
+						valid_sockstyles[sockstyle] = socks_list[sockstyle]
+					var/new_socks = input(user, "Choose your character's socks:", "Character Preference")  as null|anything in valid_sockstyles
+					ShowChoices(user)
+					if(new_socks)
+						socks = new_socks
+
+				if("eyes")
+					var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference", rgb(r_eyes, g_eyes, b_eyes)) as color|null
+					if(new_eyes)
+						r_eyes = hex2num(copytext(new_eyes, 2, 4))
+						g_eyes = hex2num(copytext(new_eyes, 4, 6))
+						b_eyes = hex2num(copytext(new_eyes, 6, 8))
+
+				if("s_tone")
+					if(species == "Human" || species == "Drask")
+						var/new_s_tone = input(user, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Character Preference")  as num|null
+						if(new_s_tone)
+							s_tone = 35 - max(min(round(new_s_tone), 220), 1)
+					else if(species == "Vox")
+						var/skin_c = input(user, "Choose your Vox's skin color:\n(1 = Default Green, 2 = Dark Green, 3 = Brown, 4 = Grey, \n5 = Emerald, 6 = Azure)", "Character Preference") as num|null
+						if(skin_c)
+							s_tone = max(min(round(skin_c), 6), 1)
+
+				if("skin")
+					if((species in list("Unathi", "Tajaran", "Skrell", "Slime People", "Vulpkanin", "Machine")) || body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user))
+						var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference", rgb(r_skin, g_skin, b_skin)) as color|null
+						if(new_skin)
+							r_skin = hex2num(copytext(new_skin, 2, 4))
+							g_skin = hex2num(copytext(new_skin, 4, 6))
+							b_skin = hex2num(copytext(new_skin, 6, 8))
+
+
+				if("ooccolor")
+					var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference", ooccolor) as color|null
+					if(new_ooccolor)
+						ooccolor = new_ooccolor
+
+				if("bag")
+					var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference")  as null|anything in backbaglist
+					if(new_backbag)
+						backbag = backbaglist.Find(new_backbag)
+
+				if("nt_relation")
+					var/new_relation = input(user, "Choose your relation to NT. Note that this represents what others can find out about your character by researching your background, not what your character actually thinks.", "Character Preference")  as null|anything in list("Loyal", "Supportive", "Neutral", "Skeptical", "Opposed")
+					if(new_relation)
+						nanotrasen_relation = new_relation
+
+				if("flavor_text")
+					var/msg = input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(flavor_text)) as message
+
+					if(msg != null)
+						msg = copytext(msg, 1, MAX_MESSAGE_LEN)
+						msg = html_encode(msg)
+
+						flavor_text = msg
+
+				if("limbs")
+					var/valid_limbs = list("Left Leg", "Right Leg", "Left Arm", "Right Arm", "Left Foot", "Right Foot", "Left Hand", "Right Hand")
+					if(species == "Machine")
+						valid_limbs = list("Torso", "Lower Body", "Head", "Left Leg", "Right Leg", "Left Arm", "Right Arm", "Left Foot", "Right Foot", "Left Hand", "Right Hand")
+					var/limb_name = input(user, "Which limb do you want to change?") as null|anything in valid_limbs
+					if(!limb_name) return
+
+					var/limb = null
+					var/second_limb = null // if you try to change the arm, the hand should also change
+					var/third_limb = null  // if you try to unchange the hand, the arm should also change
+					var/valid_limb_states = list("Normal", "Amputated", "Prosthesis")
+					var/no_amputate = 0
+
+					switch(limb_name)
+						if("Torso")
+							limb = "chest"
+							second_limb = "groin"
+							no_amputate = 1
+						if("Lower Body")
+							limb = "groin"
+							no_amputate = 1
+						if("Head")
+							limb = "head"
+							no_amputate = 1
+						if("Left Leg")
+							limb = "l_leg"
+							second_limb = "l_foot"
+						if("Right Leg")
+							limb = "r_leg"
+							second_limb = "r_foot"
+						if("Left Arm")
+							limb = "l_arm"
+							second_limb = "l_hand"
+						if("Right Arm")
+							limb = "r_arm"
+							second_limb = "r_hand"
+						if("Left Foot")
+							limb = "l_foot"
+							if(species != "Machine")
+								third_limb = "l_leg"
+						if("Right Foot")
+							limb = "r_foot"
+							if(species != "Machine")
+								third_limb = "r_leg"
+						if("Left Hand")
+							limb = "l_hand"
+							if(species != "Machine")
+								third_limb = "l_arm"
+						if("Right Hand")
+							limb = "r_hand"
+							if(species != "Machine")
+								third_limb = "r_arm"
+
+					var/new_state = input(user, "What state do you wish the limb to be in?") as null|anything in valid_limb_states
+					if(!new_state) return
+
+					switch(new_state)
+						if("Normal")
+							if(limb == "head")
+								m_style = "None"
+								h_style = random_hair_style(gender, species)
+								f_style = facial_hair_styles_list["Shaved"]
+							organ_data[limb] = null
+							rlimb_data[limb] = null
+							if(third_limb)
+								organ_data[third_limb] = null
+								rlimb_data[third_limb] = null
+						if("Amputated")
+							if(!no_amputate)
+								organ_data[limb] = "amputated"
+								rlimb_data[limb] = null
+								if(second_limb)
+									organ_data[second_limb] = "amputated"
+									rlimb_data[second_limb] = null
+						if("Prosthesis")
+							var/choice
+							var/subchoice
+							var/datum/robolimb/R = new()
+							var/in_model
+							var/robolimb_companies = list()
+							for(var/limb_type in typesof(/datum/robolimb)) //This loop populates a list of companies that offer the limb the user selected previously as one of their cybernetic products.
+								R = new limb_type()
+								if(!R.unavailable_at_chargen && (limb in R.parts) && R.has_subtypes) //Ensures users can only choose companies that offer the parts they want, that singular models get added to the list as well companies that offer more than one model, and...
+									robolimb_companies[R.company] = R //List only main brands that have the parts we're looking for.
+							R = new() //Re-initialize R.
+
+							choice = input(user, "Which manufacturer do you wish to use for this limb?") as null|anything in robolimb_companies //Choose from a list of companies that offer the part the user wants.
+							if(!choice)
+								return
+							R.company = choice
+							R = all_robolimbs[R.company]
+							if(R.has_subtypes == 1) //If the company the user selected provides more than just one base model, lets handle it.
+								var/list/robolimb_models = list()
+								for(var/limb_type in typesof(R)) //Handling the different models of parts that manufacturers can provide.
+									var/datum/robolimb/L = new limb_type()
+									if(limb in L.parts) //Make sure that only models that provide the parts the user needs populate the list.
+										robolimb_models[L.company] = L
+										if(robolimb_models.len == 1) //If there's only one model available in the list, autoselect it to avoid having to bother the user with a dialog that provides only one option.
+											subchoice = L.company //If there ends up being more than one model populating the list, subchoice will be overwritten later anyway, so this isn't a problem.
+										if(second_limb in L.parts) //If the child limb of the limb the user selected is also present in the model's parts list, state it's been found so the second limb can be set later.
+											in_model = 1
+								if(robolimb_models.len > 1) //If there's more than one model in the list that can provide the part the user wants, let them choose.
+									subchoice = input(user, "Which model of [choice] [limb_name] do you wish to use?") as null|anything in robolimb_models
+								if(subchoice)
+									choice = subchoice
+							if(limb == "head")
+								ha_style = "None"
+								h_style = hair_styles_list["Bald"]
+								f_style = facial_hair_styles_list["Shaved"]
+								m_style = "None"
+							rlimb_data[limb] = choice
+							organ_data[limb] = "cyborg"
+							if(second_limb)
+								if(subchoice)
+									if(in_model)
+										rlimb_data[second_limb] = choice
+										organ_data[second_limb] = "cyborg"
+								else
+									rlimb_data[second_limb] = choice
+									organ_data[second_limb] = "cyborg"
+
+				if("organs")
+					var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes")
+					if(!organ_name) return
+
+					var/organ = null
+					switch(organ_name)
+						if("Heart")
+							organ = "heart"
+						if("Eyes")
+							organ = "eyes"
+
+					var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in list("Normal","Assisted","Mechanical")
+					if(!new_state) return
+
+					switch(new_state)
+						if("Normal")
+							organ_data[organ] = null
+						if("Assisted")
+							organ_data[organ] = "assisted"
+						if("Mechanical")
+							organ_data[organ] = "mechanical"
+
+/*
+				if("skin_style")
+					var/skin_style_name = input(user, "Select a new skin style") as null|anything in list("default1", "default2", "default3")
+					if(!skin_style_name) return
+*/
+
+/*					if("spawnpoint")
+					var/list/spawnkeys = list()
+					for(var/S in spawntypes)
+						spawnkeys += S
+					var/choice = input(user, "Where would you like to spawn when latejoining?") as null|anything in spawnkeys
+					if(!choice || !spawntypes[choice])
+						spawnpoint = "Arrivals Shuttle"
+						return
+					spawnpoint = choice */
+
+		else
+			switch(href_list["preference"])
+				if("publicity")
+					if(unlock_content)
+						toggles ^= MEMBER_PUBLIC
+
+				if("gender")
+					if(gender == MALE)
+						gender = FEMALE
+					else
+						gender = MALE
+					underwear = random_underwear(gender)
+
+				if("hear_adminhelps")
+					sound ^= SOUND_ADMINHELP
+
+				if("ui")
+					switch(UI_style)
+						if("Midnight")
+							UI_style = "Plasmafire"
+						if("Plasmafire")
+							UI_style = "Retro"
+						if("Retro")
+							UI_style = "Slimecore"
+						if("Slimecore")
+							UI_style = "Operative"
+						if("Operative")
+							UI_style = "White"
+						else
+							UI_style = "Midnight"
+
+					if(ishuman(usr)) //mid-round preference changes, for aesthetics
+						var/mob/living/carbon/human/H = usr
+						H.remake_hud()
+
+				if("nanoui")
+					nanoui_fancy = !nanoui_fancy
+
+				if("ghost_att_anim")
+					show_ghostitem_attack = !show_ghostitem_attack
+
+				if("UIcolor")
+					var/UI_style_color_new = input(user, "Choose your UI color, dark colors are not recommended!", UI_style_color) as color|null
+					if(!UI_style_color_new) return
+					UI_style_color = UI_style_color_new
+
+					if(ishuman(usr)) //mid-round preference changes, for aesthetics
+						var/mob/living/carbon/human/H = usr
+						H.remake_hud()
+
+				if("UIalpha")
+					var/UI_style_alpha_new = input(user, "Select a new alpha(transparence) parameter for UI, between 50 and 255", UI_style_alpha) as num
+					if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
+					UI_style_alpha = UI_style_alpha_new
+
+					if(ishuman(usr)) //mid-round preference changes, for aesthetics
+						var/mob/living/carbon/human/H = usr
+						H.remake_hud()
+
+				if("be_special")
+					var/r = href_list["role"]
+					if(!(r in special_roles))
+						var/cleaned_r = sql_sanitize_text(r)
+						if(r != cleaned_r) // up to no good
+							message_admins("[user] attempted an href exploit! (This could have possibly lead to a \"Bobby Tables\" exploit, so they're probably up to no good). String: [r] ID: [last_id] IP: [last_ip]")
+							to_chat(user, "<span class='userdanger'>Stop right there, criminal scum</span>")
+					else
+						be_special ^= r
+
+				if("name")
+					be_random_name = !be_random_name
+
+				if("randomslot")
+					randomslot = !randomslot
+
+				if("hear_midis")
+					sound ^= SOUND_MIDI
+
+				if("lobby_music")
+					sound ^= SOUND_LOBBY
+					if(sound & SOUND_LOBBY)
+						user << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1)
+					else
+						user << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)
+
+				if("ghost_ears")
+					toggles ^= CHAT_GHOSTEARS
+
+				if("ghost_sight")
+					toggles ^= CHAT_GHOSTSIGHT
+
+				if("ghost_radio")
+					toggles ^= CHAT_GHOSTRADIO
+
+				if("ghost_radio")
+					toggles ^= CHAT_GHOSTRADIO
+
+				if("save")
+					save_preferences(user)
+					save_character(user)
+
+				if("reload")
+					load_preferences(user)
+					load_character(user)
+
+				if("open_load_dialog")
+					if(!IsGuestKey(user.key))
+						open_load_dialog(user)
+						return 1
+
+				if("close_load_dialog")
+					close_load_dialog(user)
+
+				if("changeslot")
+					if(!load_character(user,text2num(href_list["num"])))
+						random_character()
+						real_name = random_name(gender)
+						save_character(user)
+					close_load_dialog(user)
+
+				if("tab")
+					if(href_list["tab"])
+						current_tab = text2num(href_list["tab"])
+
+	ShowChoices(user)
+	return 1
+
+/datum/preferences/proc/copy_to(mob/living/carbon/human/character)
+	var/datum/species/S = all_species[species]
+	character.change_species(species) // Yell at me if this causes everything to melt
+	if(be_random_name)
+		real_name = random_name(gender,species)
+
+	if(config.humans_need_surnames)
+		var/firstspace = findtext(real_name, " ")
+		var/name_length = length(real_name)
+		if(!firstspace)	//we need a surname
+			real_name += " [pick(last_names)]"
+		else if(firstspace == name_length)
+			real_name += "[pick(last_names)]"
+
+	character.add_language(language)
+
+	character.real_name = real_name
+	character.dna.real_name = real_name
+	character.name = character.real_name
+
+	character.flavor_text = flavor_text
+	if(character.ckey && !jobban_isbanned(character, "Records"))
+		character.med_record = med_record
+		character.sec_record = sec_record
+		character.gen_record = gen_record
+
+	character.change_gender(gender)
+	character.age = age
+	character.b_type = b_type
+
+	character.r_eyes = r_eyes
+	character.g_eyes = g_eyes
+	character.b_eyes = b_eyes
+
+	//Head-specific
+	var/obj/item/organ/external/head/H = character.get_organ("head")
+	H.r_hair = r_hair
+	H.g_hair = g_hair
+	H.b_hair = b_hair
+
+	H.r_facial = r_facial
+	H.g_facial = g_facial
+	H.b_facial = b_facial
+
+	H.h_style = h_style
+	H.f_style = f_style
+	//End of head-specific.
+
+	character.r_skin = r_skin
+	character.g_skin = g_skin
+	character.b_skin = b_skin
+
+	character.s_tone = s_tone
+
+	// Destroy/cyborgize organs
+	for(var/name in organ_data)
+
+		var/status = organ_data[name]
+		var/obj/item/organ/external/O = character.organs_by_name[name]
+		if(O)
+			if(status == "amputated")
+				character.organs_by_name[O.limb_name] = null
+				character.organs -= O
+				if(O.children) // This might need to become recursive.
+					for(var/obj/item/organ/external/child in O.children)
+						character.organs_by_name[child.limb_name] = null
+						character.organs -= child
+
+			else if(status == "cyborg")
+				if(rlimb_data[name])
+					O.robotize(rlimb_data[name])
+				else
+					O.robotize()
+		else
+			var/obj/item/organ/internal/I = character.get_int_organ_tag(name)
+			if(I)
+				if(status == "assisted")
+					I.mechassist()
+				else if(status == "mechanical")
+					I.robotize()
+
+	character.dna.b_type = b_type
+	if(disabilities & DISABILITY_FLAG_FAT && character.species.flags & CAN_BE_FAT)
+		character.dna.SetSEState(FATBLOCK,1,1)
+		character.mutations += FAT
+		character.mutations += OBESITY
+		character.overeatduration = 600
+
+	if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
+		character.dna.SetSEState(GLASSESBLOCK,1,1)
+		character.disabilities|=NEARSIGHTED
+
+	if(disabilities & DISABILITY_FLAG_EPILEPTIC)
+		character.dna.SetSEState(EPILEPSYBLOCK,1,1)
+		character.disabilities|=EPILEPSY
+
+	if(disabilities & DISABILITY_FLAG_DEAF)
+		character.dna.SetSEState(DEAFBLOCK,1,1)
+		character.sdisabilities|=DEAF
+
+	if(disabilities & DISABILITY_FLAG_BLIND)
+		character.dna.SetSEState(BLINDBLOCK,1,1)
+		character.sdisabilities|=BLIND
+
+	if(disabilities & DISABILITY_FLAG_MUTE)
+		character.dna.SetSEState(MUTEBLOCK,1,1)
+		character.sdisabilities |= MUTE
+
+	S.handle_dna(character)
+
+	if(character.dna.dirtySE)
+		character.dna.UpdateSE()
+	domutcheck(character)
+
+	// Wheelchair necessary?
+	var/obj/item/organ/external/l_foot = character.get_organ("l_foot")
+	var/obj/item/organ/external/r_foot = character.get_organ("r_foot")
+	if((!l_foot || l_foot.status & ORGAN_DESTROYED) && (!r_foot || r_foot.status & ORGAN_DESTROYED))
+		var/obj/structure/stool/bed/chair/wheelchair/W = new /obj/structure/stool/bed/chair/wheelchair (character.loc)
+		character.buckled = W
+		character.update_canmove()
+		W.dir = character.dir
+		W.buckled_mob = character
+		W.add_fingerprint(character)
+
+	character.underwear = underwear
+	character.undershirt = undershirt
+	character.socks = socks
+
+	if(character.species.bodyflags & HAS_HEAD_ACCESSORY)
+		H.r_headacc = r_headacc
+		H.g_headacc = g_headacc
+		H.b_headacc = b_headacc
+		H.ha_style = ha_style
+	if(character.species.bodyflags & HAS_MARKINGS)
+		character.r_markings = r_markings
+		character.g_markings = g_markings
+		character.b_markings = b_markings
+		character.m_style = m_style
+
+	if(body_accessory)
+		character.body_accessory = body_accessory_by_name["[body_accessory]"]
+
+	if(backbag > 4 || backbag < 1)
+		backbag = 1 //Same as above
+	character.backbag = backbag
+
+	//Debugging report to track down a bug, which randomly assigned the plural gender to people.
+	if(character.gender in list(PLURAL, NEUTER))
+		if(isliving(src)) //Ghosts get neuter by default
+			message_admins("[key_name_admin(character)] has spawned with their gender as plural or neuter. Please notify coders.")
+			character.change_gender(MALE)
+
+	character.dna.ready_dna(character, flatten_SE = 0)
+	character.sync_organ_dna(assimilate=1)
+	character.UpdateAppearance()
+
+	// Do the initial caching of the player's body icons.
+	character.force_update_limbs()
+	character.update_eyes()
+	character.regenerate_icons()
+
+/datum/preferences/proc/open_load_dialog(mob/user)
+
+	var/DBQuery/query = dbcon.NewQuery("SELECT slot,real_name FROM [format_table_name("characters")] WHERE ckey='[user.ckey]' ORDER BY slot")
+
+	var/dat = "<body>"
+	dat += "<tt><center>"
+	dat += "<b>Select a character slot to load</b><hr>"
+	var/name
+
+	for(var/i=1, i<=max_save_slots, i++)
+		if(!query.Execute())
+			var/err = query.ErrorMsg()
+			log_game("SQL ERROR during character slot loading. Error : \[[err]\]\n")
+			message_admins("SQL ERROR during character slot loading. Error : \[[err]\]\n")
+			return
+		while(query.NextRow())
+			if(i==text2num(query.item[1]))
+				name =  query.item[2]
+		if(!name)	name = "Character[i]"
+		if(i==default_slot)
+			name = "<b>[name]</b>"
+		dat += "<a href='?_src_=prefs;preference=changeslot;num=[i];'>[name]</a><br>"
+		name = null
+
+	dat += "<hr>"
+	dat += "<a href='byond://?src=\ref[user];preference=close_load_dialog'>Close</a><br>"
+	dat += "</center></tt>"
+//		user << browse(dat, "window=saves;size=300x390")
+	var/datum/browser/popup = new(user, "saves", "<div align='center'>Character Saves</div>", 300, 390)
+	popup.set_content(dat)
+	popup.open(0)
+
+/datum/preferences/proc/close_load_dialog(mob/user)
+	user << browse(null, "window=saves")
\ No newline at end of file
diff --git a/code/modules/client/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm
similarity index 98%
rename from code/modules/client/preferences_mysql.dm
rename to code/modules/client/preference/preferences_mysql.dm
index 15abdab0360..f72ac076dff 100644
--- a/code/modules/client/preferences_mysql.dm
+++ b/code/modules/client/preference/preferences_mysql.dm
@@ -59,7 +59,7 @@
 /datum/preferences/proc/save_preferences(client/C)
 
 	// Might as well scrub out any malformed be_special list entries while we're here
-	for (var/role in be_special)
+	for(var/role in be_special)
 		if(!(role in special_roles))
 			log_to_dd("[C.key] had a malformed role entry: '[role]'. Removing!")
 			be_special -= role
@@ -158,7 +158,8 @@
 					nanotrasen_relation,
 					speciesprefs,
 					socks,
-					body_accessory
+					body_accessory,
+					gear
 				 	FROM [format_table_name("characters")] WHERE ckey='[C.ckey]' AND slot='[slot]'"})
 	if(!query.Execute())
 		var/err = query.ErrorMsg()
@@ -236,6 +237,7 @@
 		//socks
 		socks = query.item[58]
 		body_accessory = query.item[59]
+		gear = params2list(query.item[60])
 
 	//Sanitize
 	metadata		= sanitize_text(metadata, initial(metadata))
@@ -298,6 +300,7 @@
 	if(!player_alt_titles) player_alt_titles = new()
 	if(!organ_data) src.organ_data = list()
 	if(!rlimb_data) src.rlimb_data = list()
+	if(!gear) gear = list()
 
 	return 1
 
@@ -305,12 +308,15 @@
 	var/organlist
 	var/rlimblist
 	var/playertitlelist
+	var/gearlist
 	if(!isemptylist(organ_data))
 		organlist = list2params(organ_data)
 	if(!isemptylist(rlimb_data))
 		rlimblist = list2params(rlimb_data)
 	if(!isemptylist(player_alt_titles))
 		playertitlelist = list2params(player_alt_titles)
+	if(!isemptylist(gear))
+		gearlist = list2params(gear)
 
 	var/DBQuery/firstquery = dbcon.NewQuery("SELECT slot FROM [format_table_name("characters")] WHERE ckey='[C.ckey]' ORDER BY slot")
 	firstquery.Execute()
@@ -374,7 +380,8 @@
 												nanotrasen_relation='[nanotrasen_relation]',
 												speciesprefs='[speciesprefs]',
 												socks='[socks]',
-												body_accessory='[body_accessory]'
+												body_accessory='[body_accessory]',
+												gear='[gearlist]'
 												WHERE ckey='[C.ckey]'
 												AND slot='[default_slot]'"}
 												)
@@ -405,7 +412,7 @@
 											flavor_text, med_record, sec_record, gen_record,
 											player_alt_titles,
 											disabilities, organ_data, rlimb_data, nanotrasen_relation, speciesprefs,
-											socks, body_accessory)
+											socks, body_accessory, gear)
 
 					VALUES
 											('[C.ckey]', '[default_slot]', '[sql_sanitize_text(metadata)]', '[sql_sanitize_text(real_name)]', '[be_random_name]','[gender]',
@@ -426,7 +433,7 @@
 											'[sql_sanitize_text(html_encode(flavor_text))]', '[sql_sanitize_text(html_encode(med_record))]', '[sql_sanitize_text(html_encode(sec_record))]', '[sql_sanitize_text(html_encode(gen_record))]',
 											'[playertitlelist]',
 											'[disabilities]', '[organlist]', '[rlimblist]', '[nanotrasen_relation]', '[speciesprefs]',
-											'[socks]', '[body_accessory]')
+											'[socks]', '[body_accessory]', '[gearlist]')
 
 "}
 )
diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preference/preferences_spawnpoints.dm
similarity index 100%
rename from code/modules/client/preferences_spawnpoints.dm
rename to code/modules/client/preference/preferences_spawnpoints.dm
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm
similarity index 97%
rename from code/modules/client/preferences_toggles.dm
rename to code/modules/client/preference/preferences_toggles.dm
index 0b52b15bd42..541dee07242 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preference/preferences_toggles.dm
@@ -1,216 +1,216 @@
-//toggles
-/client/verb/toggle_ghost_ears()
-	set name = "Show/Hide GhostEars"
-	set category = "Preferences"
-	set desc = ".Toggle Between seeing all mob speech, and only speech of nearby mobs"
-	prefs.toggles ^= CHAT_GHOSTEARS
-	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].")
-	prefs.save_preferences(src)
-	feedback_add_details("admin_verb","TGE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggle_ghost_sight()
-	set name = "Show/Hide GhostSight"
-	set category = "Preferences"
-	set desc = ".Toggle Between seeing all mob emotes, and only emotes of nearby mobs"
-	prefs.toggles ^= CHAT_GHOSTSIGHT
-	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].")
-	prefs.save_preferences(src)
-	feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggle_ghost_radio()
-	set name = "Enable/Disable GhostRadio"
-	set category = "Preferences"
-	set desc = ".Toggle between hearing all radio chatter, or only from nearby speakers"
-	prefs.toggles ^= CHAT_GHOSTRADIO
-	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"].")
-	prefs.save_preferences(src)
-	feedback_add_details("admin_verb","TGR")
-
-/client/proc/toggle_hear_radio()
-	set name = "Show/Hide RadioChatter"
-	set category = "Preferences"
-	set desc = "Toggle seeing radiochatter from radios and speakers"
-	if(!holder) return
-	prefs.toggles ^= CHAT_RADIO
-	prefs.save_preferences(src)
-	to_chat(usr, "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers")
-	feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggleadminhelpsound()
-	set name = "Hear/Silence Adminhelps"
-	set category = "Preferences"
-	set desc = "Toggle hearing a notification when admin PMs are recieved"
-	if(!holder)	return
-	prefs.sound ^= SOUND_ADMINHELP
-	prefs.save_preferences(src)
-	to_chat(usr, "You will [(prefs.sound & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.")
-	feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/deadchat() // Deadchat toggle is usable by anyone.
-	set name = "Show/Hide Deadchat"
-	set category = "Preferences"
-	set desc ="Toggles seeing deadchat"
-	prefs.toggles ^= CHAT_DEAD
-	prefs.save_preferences(src)
-
-	if(src.holder)
-		to_chat(src, "You will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.")
-	else
-		to_chat(src, "As a ghost, you will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.")
-
-	feedback_add_details("admin_verb","TDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/toggleprayers()
-	set name = "Show/Hide Prayers"
-	set category = "Preferences"
-	set desc = "Toggles seeing prayers"
-	prefs.toggles ^= CHAT_PRAYER
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.")
-	feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/togglescoreboard()
-	set name = "Hide/Display End Round Scoreboard"
-	set category = "Preferences"
-	set desc = "Toggles displaying end of round scoreboard"
-	prefs.toggles ^= DISABLE_SCOREBOARD
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & DISABLE_SCOREBOARD) ? "no longer" : "now"] see the end of round scoreboard.")
-	feedback_add_details("admin_verb","TScoreboard") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/togglekarmareminder()
-	set name = "Hide/Display End Round Karma Reminder"
-	set category = "Preferences"
-	set desc = "Toggles displaying end of round karma reminder"
-	prefs.toggles ^= DISABLE_KARMA_REMINDER
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & DISABLE_KARMA_REMINDER) ? "no longer" : "now"] see the end of round karma reminder.")
-	feedback_add_details("admin_verb","TKarmabugger") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggletitlemusic()
-	set name = "Hear/Silence LobbyMusic"
-	set category = "Preferences"
-	set desc = "Toggles hearing the GameLobby music"
-	prefs.sound ^= SOUND_LOBBY
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_LOBBY)
-		to_chat(src, "You will now hear music in the game lobby.")
-		if(istype(mob, /mob/new_player))
-			playtitlemusic()
-	else
-		to_chat(src, "You will no longer hear music in the game lobby.")
-		if(istype(mob, /mob/new_player))
-			src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)// stop the jamsz
-
-	feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/togglemidis()
-	set name = "Hear/Silence Midis"
-	set category = "Preferences"
-	set desc = "Toggles hearing sounds uploaded by admins"
-	prefs.sound ^= SOUND_MIDI
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_MIDI)
-		to_chat(src, "You will now hear any sounds uploaded by admins.")
-	else
-		var/sound/break_sound = sound(null, repeat = 0, wait = 0, channel = 777)
-		break_sound.priority = 250
-		src << break_sound//breaks the client's sound output on channel 777
-
-		to_chat(src, "You will no longer hear sounds uploaded by admins; any currently playing midis have been disabled.")
-	feedback_add_details("admin_verb","TMidi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/listen_ooc()
-	set name = "Show/Hide OOC"
-	set category = "Preferences"
-	set desc = "Toggles seeing OutOfCharacter chat"
-	prefs.toggles ^= CHAT_OOC
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.")
-	feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/verb/listen_looc()
-	set name = "Show/Hide LOOC"
-	set category = "Preferences"
-	set desc = "Toggles seeing Local OutOfCharacter chat"
-	prefs.toggles ^= CHAT_LOOC
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.")
-	feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful
-	set name = "Hear/Silence Ambience"
-	set category = "Preferences"
-	set desc = "Toggles hearing ambient sound effects"
-	prefs.sound ^= SOUND_AMBIENCE
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_AMBIENCE)
-		to_chat(src, "You will now hear ambient sounds.")
-	else
-		to_chat(src, "You will no longer hear ambient sounds.")
-		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)
-	feedback_add_details("admin_verb","TAmbi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/Toggle_Buzz() //No more headaches because headphones bump up shipambience.ogg to insanity levels.
-	set name = "Hear/Silence White Noise"
-	set category = "Preferences"
-	set desc = "Toggles hearing ambient white noise"
-	prefs.sound ^= SOUND_BUZZ
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_BUZZ)
-		to_chat(src, "You will now hear ambient white noise.")
-	else
-		to_chat(src, "You will no longer hear ambient white noise.")
-		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)
-	feedback_add_details("admin_verb","TBuzz") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/verb/Toggle_Heartbeat() //to toggle off heartbeat sounds, in case they get too annoying
-	set name = "Hear/Silence Heartbeat"
-	set category = "Preferences"
-	set desc = "Toggles hearing heart beating sound effects"
-	prefs.sound ^= SOUND_HEARTBEAT
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_HEARTBEAT)
-		to_chat(src, "You will now hear heartbeat sounds.")
-	else
-		to_chat(src, "You will no longer hear heartbeat sounds.")
-		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)
-		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)
-	feedback_add_details("admin_verb","Thb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-// This needs a toggle because you people are awful and spammed terrible music
-/client/verb/toggle_instruments()
-	set name = "Hear/Silence Instruments"
-	set category = "Preferences"
-	set desc = "Toggles hearing musical instruments like the violin and piano"
-	prefs.sound ^= SOUND_INSTRUMENTS
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_INSTRUMENTS)
-		to_chat(src, "You will now hear people playing musical instruments.")
-	else
-		to_chat(src, "You will no longer hear musical instruments.")
-	feedback_add_details("admin_verb","TInstru") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggle_media()
-	set name = "Hear/Silence Streaming"
-	set category = "Preferences"
-	set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)"
-
-	prefs.sound ^= SOUND_STREAMING
-	prefs.save_preferences(src)
-	to_chat(usr, "You will [(prefs.sound & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media.")
-	if(!media) return
-	if(prefs.sound & SOUND_STREAMING)
-		media.update_music()
-	else
-		media.stop_music()
-
-/client/verb/setup_character()
-	set name = "Game Preferences"
-	set category = "Preferences"
-	set desc = "Allows you to access the Setup Character screen. Changes to your character won't take effect until next round, but other changes will."
-	prefs.current_tab = 1
+//toggles
+/client/verb/toggle_ghost_ears()
+	set name = "Show/Hide GhostEars"
+	set category = "Preferences"
+	set desc = ".Toggle Between seeing all mob speech, and only speech of nearby mobs"
+	prefs.toggles ^= CHAT_GHOSTEARS
+	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].")
+	prefs.save_preferences(src)
+	feedback_add_details("admin_verb","TGE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_ghost_sight()
+	set name = "Show/Hide GhostSight"
+	set category = "Preferences"
+	set desc = ".Toggle Between seeing all mob emotes, and only emotes of nearby mobs"
+	prefs.toggles ^= CHAT_GHOSTSIGHT
+	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].")
+	prefs.save_preferences(src)
+	feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_ghost_radio()
+	set name = "Enable/Disable GhostRadio"
+	set category = "Preferences"
+	set desc = ".Toggle between hearing all radio chatter, or only from nearby speakers"
+	prefs.toggles ^= CHAT_GHOSTRADIO
+	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"].")
+	prefs.save_preferences(src)
+	feedback_add_details("admin_verb","TGR")
+
+/client/proc/toggle_hear_radio()
+	set name = "Show/Hide RadioChatter"
+	set category = "Preferences"
+	set desc = "Toggle seeing radiochatter from radios and speakers"
+	if(!holder) return
+	prefs.toggles ^= CHAT_RADIO
+	prefs.save_preferences(src)
+	to_chat(usr, "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers")
+	feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggleadminhelpsound()
+	set name = "Hear/Silence Adminhelps"
+	set category = "Preferences"
+	set desc = "Toggle hearing a notification when admin PMs are recieved"
+	if(!holder)	return
+	prefs.sound ^= SOUND_ADMINHELP
+	prefs.save_preferences(src)
+	to_chat(usr, "You will [(prefs.sound & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.")
+	feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/deadchat() // Deadchat toggle is usable by anyone.
+	set name = "Show/Hide Deadchat"
+	set category = "Preferences"
+	set desc ="Toggles seeing deadchat"
+	prefs.toggles ^= CHAT_DEAD
+	prefs.save_preferences(src)
+
+	if(src.holder)
+		to_chat(src, "You will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.")
+	else
+		to_chat(src, "As a ghost, you will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.")
+
+	feedback_add_details("admin_verb","TDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/toggleprayers()
+	set name = "Show/Hide Prayers"
+	set category = "Preferences"
+	set desc = "Toggles seeing prayers"
+	prefs.toggles ^= CHAT_PRAYER
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.")
+	feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/togglescoreboard()
+	set name = "Hide/Display End Round Scoreboard"
+	set category = "Preferences"
+	set desc = "Toggles displaying end of round scoreboard"
+	prefs.toggles ^= DISABLE_SCOREBOARD
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & DISABLE_SCOREBOARD) ? "no longer" : "now"] see the end of round scoreboard.")
+	feedback_add_details("admin_verb","TScoreboard") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/togglekarmareminder()
+	set name = "Hide/Display End Round Karma Reminder"
+	set category = "Preferences"
+	set desc = "Toggles displaying end of round karma reminder"
+	prefs.toggles ^= DISABLE_KARMA_REMINDER
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & DISABLE_KARMA_REMINDER) ? "no longer" : "now"] see the end of round karma reminder.")
+	feedback_add_details("admin_verb","TKarmabugger") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggletitlemusic()
+	set name = "Hear/Silence LobbyMusic"
+	set category = "Preferences"
+	set desc = "Toggles hearing the GameLobby music"
+	prefs.sound ^= SOUND_LOBBY
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_LOBBY)
+		to_chat(src, "You will now hear music in the game lobby.")
+		if(istype(mob, /mob/new_player))
+			playtitlemusic()
+	else
+		to_chat(src, "You will no longer hear music in the game lobby.")
+		if(istype(mob, /mob/new_player))
+			src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)// stop the jamsz
+
+	feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/togglemidis()
+	set name = "Hear/Silence Midis"
+	set category = "Preferences"
+	set desc = "Toggles hearing sounds uploaded by admins"
+	prefs.sound ^= SOUND_MIDI
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_MIDI)
+		to_chat(src, "You will now hear any sounds uploaded by admins.")
+	else
+		var/sound/break_sound = sound(null, repeat = 0, wait = 0, channel = 777)
+		break_sound.priority = 250
+		src << break_sound //breaks the client's sound output on channel 777
+
+		to_chat(src, "You will no longer hear sounds uploaded by admins; any currently playing midis have been disabled.")
+	feedback_add_details("admin_verb","TMidi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/listen_ooc()
+	set name = "Show/Hide OOC"
+	set category = "Preferences"
+	set desc = "Toggles seeing OutOfCharacter chat"
+	prefs.toggles ^= CHAT_OOC
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.")
+	feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
+/client/verb/listen_looc()
+	set name = "Show/Hide LOOC"
+	set category = "Preferences"
+	set desc = "Toggles seeing Local OutOfCharacter chat"
+	prefs.toggles ^= CHAT_LOOC
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.")
+	feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
+/client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful
+	set name = "Hear/Silence Ambience"
+	set category = "Preferences"
+	set desc = "Toggles hearing ambient sound effects"
+	prefs.sound ^= SOUND_AMBIENCE
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_AMBIENCE)
+		to_chat(src, "You will now hear ambient sounds.")
+	else
+		to_chat(src, "You will no longer hear ambient sounds.")
+		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)
+	feedback_add_details("admin_verb","TAmbi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/Toggle_Buzz() //No more headaches because headphones bump up shipambience.ogg to insanity levels.
+	set name = "Hear/Silence White Noise"
+	set category = "Preferences"
+	set desc = "Toggles hearing ambient white noise"
+	prefs.sound ^= SOUND_BUZZ
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_BUZZ)
+		to_chat(src, "You will now hear ambient white noise.")
+	else
+		to_chat(src, "You will no longer hear ambient white noise.")
+		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)
+	feedback_add_details("admin_verb","TBuzz") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
+/client/verb/Toggle_Heartbeat() //to toggle off heartbeat sounds, in case they get too annoying
+	set name = "Hear/Silence Heartbeat"
+	set category = "Preferences"
+	set desc = "Toggles hearing heart beating sound effects"
+	prefs.sound ^= SOUND_HEARTBEAT
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_HEARTBEAT)
+		to_chat(src, "You will now hear heartbeat sounds.")
+	else
+		to_chat(src, "You will no longer hear heartbeat sounds.")
+		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)
+		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)
+	feedback_add_details("admin_verb","Thb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+// This needs a toggle because you people are awful and spammed terrible music
+/client/verb/toggle_instruments()
+	set name = "Hear/Silence Instruments"
+	set category = "Preferences"
+	set desc = "Toggles hearing musical instruments like the violin and piano"
+	prefs.sound ^= SOUND_INSTRUMENTS
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_INSTRUMENTS)
+		to_chat(src, "You will now hear people playing musical instruments.")
+	else
+		to_chat(src, "You will no longer hear musical instruments.")
+	feedback_add_details("admin_verb","TInstru") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_media()
+	set name = "Hear/Silence Streaming"
+	set category = "Preferences"
+	set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)"
+
+	prefs.sound ^= SOUND_STREAMING
+	prefs.save_preferences(src)
+	to_chat(usr, "You will [(prefs.sound & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media.")
+	if(!media) return
+	if(prefs.sound & SOUND_STREAMING)
+		media.update_music()
+	else
+		media.stop_music()
+
+/client/verb/setup_character()
+	set name = "Game Preferences"
+	set category = "Preferences"
+	set desc = "Allows you to access the Setup Character screen. Changes to your character won't take effect until next round, but other changes will."
+	prefs.current_tab = 1
 	prefs.ShowChoices(usr)
\ No newline at end of file
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 8d6595b73ff..281537c5f77 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -31,7 +31,7 @@
 /obj/item/clothing/mob_can_equip(M as mob, slot)
 
 	//if we can equip the item anyway, don't bother with species_restricted (aslo cuts down on spam)
-	if (!..())
+	if(!..())
 		return 0
 
 	if(species_restricted && istype(M,/mob/living/carbon/human))
@@ -66,12 +66,12 @@
 			species_restricted = list(target_species)
 
 	//Set icon
-	if (sprite_sheets && (target_species in sprite_sheets))
+	if(sprite_sheets && (target_species in sprite_sheets))
 		icon_override = sprite_sheets[target_species]
 	else
 		icon_override = initial(icon_override)
 
-	if (sprite_sheets_obj && (target_species in sprite_sheets_obj))
+	if(sprite_sheets_obj && (target_species in sprite_sheets_obj))
 		icon = sprite_sheets_obj[target_species]
 	else
 		icon = initial(icon)
@@ -79,14 +79,14 @@
 //Ears: currently only used for headsets and earmuffs
 /obj/item/clothing/ears
 	name = "ears"
-	w_class = 1.0
+	w_class = 1
 	throwforce = 2
 	slot_flags = SLOT_EARS
 
 /obj/item/clothing/ears/attack_hand(mob/user as mob)
-	if (!user) return
+	if(!user) return
 
-	if (src.loc != user || !istype(user,/mob/living/carbon/human))
+	if(src.loc != user || !istype(user,/mob/living/carbon/human))
 		..()
 		return
 
@@ -110,7 +110,7 @@
 
 	user.unEquip(src)
 
-	if (O)
+	if(O)
 		user.put_in_hands(O)
 		O.add_fingerprint(user)
 
@@ -119,7 +119,7 @@
 
 /obj/item/clothing/ears/offear
 	name = "Other ear"
-	w_class = 5.0
+	w_class = 5
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "block"
 	slot_flags = SLOT_EARS | SLOT_TWOEARS
@@ -144,7 +144,7 @@
 /obj/item/clothing/glasses
 	name = "glasses"
 	icon = 'icons/obj/clothing/glasses.dmi'
-	w_class = 2.0
+	w_class = 2
 	flags = GLASSESCOVERSEYES
 	slot_flags = SLOT_EYES
 	materials = list(MAT_GLASS = 250)
@@ -171,7 +171,7 @@ BLIND     // can't see anything
 /obj/item/clothing/gloves
 	name = "gloves"
 	gender = PLURAL //Carn: for grammarically correct text-parsing
-	w_class = 2.0
+	w_class = 2
 	icon = 'icons/obj/clothing/gloves.dmi'
 	siemens_coefficient = 0.50
 	body_parts_covered = HANDS
@@ -212,8 +212,8 @@ BLIND     // can't see anything
 
 /obj/item/clothing/under/proc/set_sensors(mob/user as mob)
 	var/mob/M = user
-	if (istype(M, /mob/dead/)) return
-	if (user.stat || user.restrained()) return
+	if(istype(M, /mob/dead/)) return
+	if(user.stat || user.restrained()) return
 	if(has_sensor >= 2)
 		to_chat(user, "The controls are locked.")
 		return 0
@@ -228,7 +228,7 @@ BLIND     // can't see anything
 		return
 	sensor_mode = modes.Find(switchMode) - 1
 
-	if (src.loc == user)
+	if(src.loc == user)
 		switch(sensor_mode)
 			if(0)
 				to_chat(user, "You disable your suit's remote sensing equipment.")
@@ -243,7 +243,7 @@ BLIND     // can't see anything
 			if(H.w_uniform == src)
 				H.update_suit_sensors()
 
-	else if (istype(src.loc, /mob))
+	else if(istype(src.loc, /mob))
 		switch(sensor_mode)
 			if(0)
 				for(var/mob/V in viewers(user, 1))
@@ -316,14 +316,13 @@ BLIND     // can't see anything
 					flags |= MASKCOVERSMOUTH
 				if(initial(flags) & AIRTIGHT) //If the mask is airtight and thus, one that you'd be able to run internals from yet can't because it was adjusted, make it airtight again.
 					flags |= AIRTIGHT
-			if(H.head == src)
-				if(flags_inv == HIDEFACE) //Means that only things like bandanas and balaclavas will be affected since they obscure the identity of the wearer.
-					if(H.l_hand && H.r_hand) //If both hands are occupied, drop the object on the ground.
-						user.unEquip(src)
-					else //Otherwise, put it in an available hand, the active one preferentially.
-						src.loc = user
-						H.head = null
-						user.put_in_hands(src)
+			if(H.head == src && flags_inv == HIDEFACE) //Means that only things like bandanas and balaclavas will be affected since they obscure the identity of the wearer.
+				if(H.l_hand && H.r_hand) //If both hands are occupied, drop the object on the ground.
+					user.unEquip(src)
+				else //Otherwise, put it in an available hand, the active one preferentially.
+					src.loc = user
+					H.head = null
+					user.put_in_hands(src)
 		else
 			icon_state += "_up"
 			to_chat(user, "You push \the [src] out of the way.")
@@ -332,13 +331,10 @@ BLIND     // can't see anything
 			mask_adjusted = 1
 			if(adjusted_flags)
 				slot_flags = adjusted_flags
-			if(ishuman(user))
-				if(H.internal)
-					if(user.wear_mask == src) /*If the user was wearing the mask providing internals on their face at the time it was adjusted, turn off internals.
-												Otherwise, they adjusted it while it was in their hands or some such so we won't be needing to turn off internals.*/
-						if(H.internals)
-							H.internals.icon_state = "internal0"
-						H.internal = null
+			if(ishuman(user) && H.internal && user.wear_mask == src && H.internals) /*If the user was wearing the mask providing internals on their face at the time it was adjusted, turn off internals.
+																					Otherwise, they adjusted it while it was in their hands or some such so we won't be needing to turn off internals.*/
+				H.internals.icon_state = "internal0"
+				H.internal = null
 			if(flags_inv & HIDEFACE) //Means that only things like bandanas and balaclavas will be affected since they obscure the identity of the wearer.
 				flags_inv &= ~HIDEFACE /*Done after the above to avoid having to do a check for initial(src.flags_inv == HIDEFACE).
 										This reveals the user's face since the bandana will now be going on their head.*/
@@ -346,14 +342,13 @@ BLIND     // can't see anything
 				flags &= ~MASKCOVERSMOUTH
 			if(flags & AIRTIGHT) //If the mask was airtight, it won't be anymore since you just pushed it off your face.
 				flags &= ~AIRTIGHT
-			if(user.wear_mask == src)
-				if(initial(flags_inv) == HIDEFACE) //Means that you won't have to take off and put back on simple things like breath masks which, realistically, can just be pulled down off your face.
-					if(H.l_hand && H.r_hand) //If both hands are occupied, drop the object on the ground.
-						user.unEquip(src)
-					else //Otherwise, put it in an available hand, the active one preferentially.
-						src.loc = user
-						user.wear_mask = null
-						user.put_in_hands(src)
+			if(user.wear_mask == src && initial(flags_inv) == HIDEFACE) //Means that you won't have to take off and put back on simple things like breath masks which, realistically, can just be pulled down off your face.
+				if(H.l_hand && H.r_hand) //If both hands are occupied, drop the object on the ground.
+					user.unEquip(src)
+				else //Otherwise, put it in an available hand, the active one preferentially.
+					src.loc = user
+					user.wear_mask = null
+					user.put_in_hands(src)
 		usr.update_inv_wear_mask()
 		usr.update_inv_head()
 
@@ -452,6 +447,7 @@ BLIND     // can't see anything
 	var/suit_adjusted = 0
 	var/ignore_suitadjust = 1
 	var/adjust_flavour = null
+	var/list/hide_tail_by_species = null
 
 //Proc that opens and closes jackets.
 /obj/item/clothing/suit/proc/adjustsuit(var/mob/user)
@@ -496,6 +492,15 @@ BLIND     // can't see anything
 	else
 		to_chat(user, "<span class='notice'>You attempt to button up the velcro on \the [src], before promptly realising how retarded you are.</span>")
 
+/obj/item/clothing/suit/equipped(var/mob/living/carbon/human/user, var/slot) //Handle tail-hiding on a by-species basis.
+	if(ishuman(user) && hide_tail_by_species && slot == slot_wear_suit)
+		if(user.species.name in hide_tail_by_species)
+			if(!(flags_inv & HIDETAIL)) //Hide the tail if the user's species is in the hide_tail_by_species list and the tail isn't already hidden.
+				flags_inv |= HIDETAIL
+		else
+			if(!(initial(flags_inv) & HIDETAIL) && (flags_inv & HIDETAIL)) //Otherwise, remove the HIDETAIL flag if it wasn't already in the flags_inv to start with.
+				flags_inv &= ~HIDETAIL
+
 /obj/item/clothing/suit/verb/openjacket(var/mob/user) //The verb you can use to adjust jackets.
 	set name = "Open/Close Jacket"
 	set category = "Object"
@@ -521,7 +526,7 @@ BLIND     // can't see anything
 	flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL
 	item_state = "s_helmet"
 	permeability_coefficient = 0.01
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 50)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
@@ -543,8 +548,8 @@ BLIND     // can't see anything
 	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank)
-	slowdown = 2
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
+	slowdown = 1
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 50)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
@@ -561,7 +566,7 @@ BLIND     // can't see anything
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	permeability_coefficient = 0.90
 	slot_flags = SLOT_ICLOTHING
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/uniform.dmi',
@@ -586,7 +591,7 @@ BLIND     // can't see anything
 		return 0
 	if(accessories.len && (A.slot in list("utility","armband")))
 		for(var/obj/item/clothing/accessory/AC in accessories)
-			if (AC.slot == A.slot)
+			if(AC.slot == A.slot)
 				return 0
 
 /obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
@@ -619,18 +624,18 @@ BLIND     // can't see anything
 			A.attack_hand(user)
 		return
 
-	if (ishuman(usr) && src.loc == user)	//make it harder to accidentally undress yourself
+	if(ishuman(usr) && src.loc == user)	//make it harder to accidentally undress yourself
 		return
 
 	..()
 
 /obj/item/clothing/under/MouseDrop(obj/over_object as obj)
-	if (ishuman(usr))
+	if(ishuman(usr))
 		//makes sure that the clothing is equipped so that we can't drag it into our hand from miles away.
-		if (!(src.loc == usr))
+		if(!(src.loc == usr))
 			return
 
-		if (!( usr.restrained() ) && !( usr.stat ) && ( over_object ))
+		if(!( usr.restrained() ) && !( usr.stat ) && ( over_object ))
 			switch(over_object.name)
 				if("r_hand")
 					usr.unEquip(src)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index bad4a3dabc5..673685c4fc4 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -1,7 +1,7 @@
 /obj/item/clothing/glasses
 	name = "glasses"
 	icon = 'icons/obj/clothing/glasses.dmi'
-	//w_class = 2.0
+	//w_class = 2
 	//flags = GLASSESCOVERSEYES
 	//slot_flags = SLOT_EYES
 	//var/vision_flags = 0
@@ -18,7 +18,7 @@
 		name = "prescription [name]"
 
 /obj/item/clothing/glasses/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if (user.stat || user.restrained() || !ishuman(user))
+	if(user.stat || user.restrained() || !ishuman(user))
 		return ..()
 	var/mob/living/carbon/human/H = user
 	if(prescription_upgradable)
@@ -158,6 +158,7 @@
 	desc = "Such a dapper eyepiece!"
 	icon_state = "monocle"
 	item_state = "headset" // lol
+	prescription_upgradable = 1
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/eyes.dmi',
@@ -220,6 +221,7 @@
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/eyes.dmi'
 		)
+	prescription_upgradable = 1
 
 /obj/item/clothing/glasses/sunglasses
 	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."
@@ -424,6 +426,7 @@
 	desc = "Used for seeing walls, floors, and stuff through anything."
 	icon_state = "meson"
 	origin_tech = "magnets=3;syndicate=4"
+	prescription_upgradable = 1
 
 /obj/item/clothing/glasses/thermal/monocle
 	name = "Thermoncle"
@@ -499,4 +502,4 @@
 				desc = "Just who the hell do you think I am?!"
 				name = "gar glasses"
 				icon_state = "gar"
-				item_state = "gar"
\ No newline at end of file
+				item_state = "gar"
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 8756290ad20..4c6fed0eec4 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -73,7 +73,6 @@
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
 	icon_state = "securityhud"
 	var/global/list/jobs[0]
-	flash_protect = 1
 	HUDType = DATA_HUD_SECURITY_ADVANCED
 	species_fit = list("Vox")
 	sprite_sheets = list(
@@ -84,11 +83,12 @@
 /obj/item/clothing/glasses/hud/security/chameleon
 	name = "Chamleon Security HUD"
 	desc = "A stolen security HUD integrated with Syndicate chameleon technology. Toggle to disguise the HUD. Provides flash protection."
+	flash_protect = 1
 
 /obj/item/clothing/glasses/hud/security/chameleon/attack_self(mob/user)
 	chameleon(user)
 
-/obj/item/clothing/glasses/hud/security/jensenshades
+/obj/item/clothing/glasses/hud/security/sunglasses/jensenshades
 	name = "augmented shades"
 	desc = "Polarized bioneural eyewear, designed to augment your vision."
 	icon_state = "jensenshades"
@@ -109,6 +109,7 @@
 	desc = "Sunglasses with a HUD."
 	icon_state = "sunhud"
 	darkness_view = 1
+	flash_protect = 1
 	tint = 1
 	prescription_upgradable = 1
 
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 060dd1ca47c..d98ee1d0154 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -47,4 +47,11 @@
 	name = "batgloves"
 	icon_state = "bmgloves"
 	item_state = "bmgloves"
-	item_color="bmgloves"
\ No newline at end of file
+	item_color="bmgloves"
+
+/obj/item/clothing/gloves/cursedclown
+	name = "cursed white gloves"
+	desc = "These things smell terrible, and they're all lumpy. Gross."
+	icon_state = "latex"
+	item_state = "lgloves"
+	flags = NODROP
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 5dc555a10d7..48e2ccb7f95 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -7,7 +7,7 @@
 	var/brightness_on = 4 //luminosity when on
 	var/on = 0
 	item_color = "yellow" //Determines used sprites: hardhat[on]_[color] and hardhat[on]_[color]2 (lying down sprite)
-	armor = list(melee = 30, bullet = 5, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20)
+	armor = list(melee = 15, bullet = 5, laser = 20, energy = 10, bomb = 20, bio = 10, rad = 20)
 	flags_inv = 0
 	action_button_name = "Toggle Helmet Light"
 
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index a9e8bbdb7e2..17058cc23b5 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -4,7 +4,7 @@
 	icon_state = "helmetmaterials"
 	flags = HEADCOVERSEYES | HEADBANGPROTECT
 	item_state = "helmetmaterials"
-	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 	flags_inv = HIDEEARS|HIDEEYES
 	cold_protection = HEAD
 	min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
@@ -69,7 +69,7 @@
 	desc = "A bulletproof helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
 	icon_state = "swat"
 	item_state = "swat-alt"
-	armor = list(melee = 25, bullet = 80, laser = 10, energy = 10, bomb = 40, bio = 0, rad = 0)
+	armor = list(melee = 15, bullet = 40, laser = 10, energy = 10, bomb = 40, bio = 0, rad = 0)
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/helmet.dmi',
@@ -82,7 +82,7 @@
 	icon_state = "riot"
 	item_state = "helmet"
 	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | HEADBANGPROTECT
-	armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 41, bullet = 15, laser = 5, energy = 5, bomb = 5, bio = 2, rad = 0)
 	flags_inv = HIDEEARS
 	strip_delay = 80
 
@@ -91,9 +91,8 @@
 	desc = "A classic metal helmet."
 	icon_state = "knight_green"
 	item_state = "knight_green"
-	flags = BLOCKHAIR | HEADCOVERSEYES | HEADCOVERSMOUTH
-	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
-	flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | HIDEFACE
+	flags = BLOCKHAIR|HEADCOVERSEYES|HEADCOVERSMOUTH
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 
 /obj/item/clothing/head/helmet/justice
 	name = "helmet of justice"
@@ -120,7 +119,7 @@
 	icon_state = "swat"
 	flags = HEADCOVERSEYES
 	item_state = "swat"
-	armor = list(melee = 80, bullet = 60, laser = 50, energy = 25, bomb = 50, bio = 10, rad = 0)
+	armor = list(melee = 40, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 90, rad = 20)
 	flags_inv = HIDEEARS|HIDEEYES
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
@@ -145,7 +144,7 @@
 	icon_state = "thunderdome"
 	flags = HEADCOVERSEYES
 	item_state = "thunderdome"
-	armor = list(melee = 80, bullet = 60, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0)
+	armor = list(melee = 40, bullet = 30, laser = 25, energy = 10, bomb = 25, bio = 10, rad = 0)
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	heat_protection = HEAD
@@ -181,7 +180,7 @@ obj/item/clothing/head/helmet/redtaghelm
 	icon_state = "redtaghelm"
 	flags = HEADCOVERSEYES
 	item_state = "redtaghelm"
-	armor = list(melee = 30, bullet = 10, laser = 20, energy = 10, bomb = 20, bio = 0, rad = 0)
+	armor = list(melee = 15, bullet = 10, laser = 20, energy = 10, bomb = 20, bio = 0, rad = 0)
 	// Offer about the same protection as a hardhat.
 	flags_inv = HIDEEARS|HIDEEYES
 
@@ -191,7 +190,7 @@ obj/item/clothing/head/helmet/bluetaghelm
 	icon_state = "bluetaghelm"
 	flags = HEADCOVERSEYES
 	item_state = "bluetaghelm"
-	armor = list(melee = 30, bullet = 10, laser = 20, energy = 10, bomb = 20, bio = 0, rad = 0)
+	armor = list(melee = 15, bullet = 10, laser = 20, energy = 10, bomb = 20, bio = 0, rad = 0)
 	// Offer about the same protection as a hardhat.
 	flags_inv = HIDEEARS|HIDEEYES
 
@@ -203,19 +202,19 @@ obj/item/clothing/head/blob
 	flags = HEADCOVERSEYES|HEADCOVERSMOUTH
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 
-/obj/item/clothing/head/helmet/knight/blue
+/obj/item/clothing/head/helmet/riot/knight/blue
 	icon_state = "knight_blue"
 	item_state = "knight_blue"
 
-/obj/item/clothing/head/helmet/knight/yellow
+/obj/item/clothing/head/helmet/riot/knight/yellow
 	icon_state = "knight_yellow"
 	item_state = "knight_yellow"
 
-/obj/item/clothing/head/helmet/knight/red
+/obj/item/clothing/head/helmet/riot/knight/red
 	icon_state = "knight_red"
 	item_state = "knight_red"
 
-/obj/item/clothing/head/helmet/knight/templar
+/obj/item/clothing/head/helmet/riot/knight/templar
 	name = "crusader helmet"
 	desc = "Deus Vult."
 	icon_state = "knight_templar"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 9da40760327..9492b7839ac 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -15,7 +15,7 @@
 	icon_state = "captain"
 	desc = "It's good being the king."
 	item_state = "caphat"
-	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 	strip_delay = 60
 
 //Captain: no longer space-worthy
@@ -29,7 +29,7 @@
 	name = "head of personnel's cap"
 	icon_state = "hopcap"
 	desc = "The symbol of true bureaucratic micromanagement."
-	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 //Nanotrasen Representative
 /obj/item/clothing/head/ntrep
@@ -57,7 +57,7 @@
 	desc = "Someone who wears this will look very smart."
 	icon_state = "detective"
 	allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy/candy_corn, /obj/item/weapon/pen)
-	armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 25, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 
 //Mime
 /obj/item/clothing/head/beret
@@ -70,7 +70,7 @@
 	name = "head of security cap"
 	desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge."
 	icon_state = "hoscap"
-	armor = list(melee = 80, bullet = 60, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0)
+	armor = list(melee = 40, bullet = 30, laser = 25, energy = 10, bomb = 25, bio = 10, rad = 0)
 	strip_delay = 80
 
 /obj/item/clothing/head/HoS/beret
@@ -82,7 +82,7 @@
 	name = "warden's police hat"
 	desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
 	icon_state = "policehelm"
-	armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 	strip_delay = 60
 
 /obj/item/clothing/head/officer
@@ -90,20 +90,21 @@
 	desc = "A red cap with an old-fashioned badge on the front for establishing that you are, in fact, the law."
 	icon_state = "customshelm"
 	item_state = "customshelm"
-	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
+	strip_delay = 60
 
 /obj/item/clothing/head/beret/sec
 	name = "security beret"
 	desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
 	icon_state = "beret_officer"
-	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 	strip_delay = 60
 
 /obj/item/clothing/head/beret/sec/warden
 	name = "warden's beret"
 	desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
 	icon_state = "beret_warden"
-	armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 /obj/item/clothing/head/beret/eng
 	name = "engineering beret"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 88af8bf4dd3..dda3f5f902c 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -5,7 +5,7 @@
 	icon_state = "centcom"
 	desc = "It's good to be emperor."
 	item_state = "centhat"
-	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0)
 	strip_delay = 80
 
 /obj/item/clothing/head/hairflower
@@ -325,7 +325,7 @@
 	throwforce = 3.0
 	throw_speed = 2
 	throw_range = 5
-	w_class = 2.0
+	w_class = 2
 	attack_verb = list("warned", "cautioned", "smashed")
 
 /obj/item/clothing/head/griffin
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 0fbb39e6f1b..21c493bf66c 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -20,7 +20,7 @@
 	materials = list(MAT_METAL=1750, MAT_GLASS=400)
 	flash_protect = 2
 	tint = 2
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
 	action_button_name = "flip welding helmet"
 	species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin")
@@ -96,13 +96,13 @@
 		if(M.l_hand == src || M.r_hand == src || M.head == src)
 			location = M.loc
 
-	if (istype(location, /turf))
+	if(istype(location, /turf))
 		location.hotspot_expose(700, 1)
 
 /obj/item/clothing/head/cakehat/attack_self(mob/user as mob)
 	if(status > 1)	return
 	src.onfire = !( src.onfire )
-	if (src.onfire)
+	if(src.onfire)
 		src.force = 3
 		src.damtype = "fire"
 		src.icon_state = "cake1"
@@ -149,7 +149,7 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 
 	action_button_name = "Toggle Pumpkin Light"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	brightness_on = 2 //luminosity when on
 
 
@@ -161,7 +161,7 @@
 	item_color = "reindeer"
 	flags_inv = 0
 	action_button_name = "Toggle Nose Light"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	brightness_on = 1 //luminosity when on
 
 
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index e14057b32b1..e7dae7d04da 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -90,7 +90,7 @@
 	desc = "It's baseball hat in tasteful red colour."
 	icon_state = "secsoft"
 	item_color = "sec"
-	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 	strip_delay = 60
 
 /obj/item/clothing/head/soft/sec/corp
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 6f6d0f03446..c1124386acc 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -4,7 +4,7 @@
 	icon_state = "gas_alt"
 	flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
-	w_class = 3.0
+	w_class = 3
 	item_state = "gas_alt"
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
@@ -27,7 +27,7 @@
 	materials = list(MAT_METAL=4000, MAT_GLASS=2000)
 	flash_protect = 2
 	tint = 2
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	origin_tech = "materials=2;engineering=2"
 	action_button_name = "Toggle Welding Helmet"
 
@@ -66,7 +66,7 @@
 	icon_state = "bane_mask"
 	flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
-	w_class = 3.0
+	w_class = 3
 	item_state = "bane_mask"
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
@@ -78,7 +78,7 @@
 	desc = "A modernised version of the classic design, this mask will not only filter out toxins but it can also be connected to an air supply."
 	icon_state = "plaguedoctor"
 	item_state = "gas_mask"
-	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 75, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 2, energy = 2, bomb = 0, bio = 75, rad = 0)
 
 /obj/item/clothing/mask/gas/swat
 	name = "\improper SWAT mask"
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index d9817add99f..ca5a267c6a4 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -63,7 +63,7 @@
 	flags = MASKCOVERSMOUTH
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.01
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 25, rad = 0)
 	action_button_name = "Adjust Sterile Mask"
 	ignore_maskadjust = 0
 	species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin")
@@ -275,3 +275,28 @@ obj/item/clothing/mask/bandana/purple
 	icon_state = "bandblack"
 	item_color = "black"
 	desc = "It's a black bandana."
+
+/obj/item/clothing/mask/cursedclown
+	name = "cursed clown mask"
+	desc = "This is a very, very odd looking mask."
+	icon = 'icons/goonstation/objects/clothing/mask.dmi'
+	icon_state = "cursedclown"
+	item_state = "cclown_hat"
+	icon_override = 'icons/goonstation/mob/clothing/mask.dmi'
+	lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
+	righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
+	flags = NODROP
+
+/obj/item/clothing/mask/cursedclown/equipped(mob/user, slot)
+	..()
+	var/mob/living/carbon/human/H = user
+	if(istype(H) && slot == slot_wear_mask)
+		to_chat(H, "<span class='danger'>[src] grips your face!</span>")
+		if(H.mind && H.mind.assigned_role != "Cluwne")
+			H.makeCluwne()
+
+/obj/item/clothing/mask/cursedclown/suicide_act(mob/user)
+	user.visible_message("<span class='danger'>[user] gazes into the eyes of [src]. [src] gazes back!</span>")
+	spawn(10)
+		user.gib()
+	return BRUTELOSS
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index 1b7ea8fc4c9..22437ec451e 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -88,7 +88,7 @@
 	item_color = "orange"
 
 /obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
-	if (src.chained)
+	if(src.chained)
 		src.chained = null
 		src.slowdown = SHOES_SLOWDOWN
 		new /obj/item/weapon/restraints/handcuffs( user.loc )
@@ -97,8 +97,8 @@
 
 /obj/item/clothing/shoes/orange/attackby(obj/H, loc, params)
 	..()
-	if (istype(H, /obj/item/weapon/restraints/handcuffs) && !chained && !(H.flags & NODROP))
-		if (src.icon_state != "orange") return
+	if(istype(H, /obj/item/weapon/restraints/handcuffs) && !chained && !(H.flags & NODROP))
+		if(src.icon_state != "orange") return
 		qdel(H)
 		src.chained = 1
 		src.slowdown = 15
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 72d00a4abf1..9a2f3fcade3 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -21,7 +21,7 @@
 	can_cut_open = 1
 	icon_state = "jackboots"
 	item_state = "jackboots"
-	armor = list(melee = 50, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 10, rad = 0)
+	armor = list(melee = 25, bullet = 25, laser = 25, energy = 25, bomb = 50, bio = 10, rad = 0)
 	species_restricted = null //Syndicate tech means even Tajarans can kick ass with these
 	strip_delay = 70
 
@@ -29,7 +29,7 @@
 	name = "\improper SWAT shoes"
 	desc = "High speed, no drag combat boots."
 	permeability_coefficient = 0.01
-	armor = list(melee = 80, bullet = 60, laser = 50, energy = 50, bomb = 50, bio = 30, rad = 30)
+	armor = list(melee = 40, bullet = 30, laser = 25, energy = 25, bomb = 50, bio = 30, rad = 30)
 	flags = NOSLIP
 
 /obj/item/clothing/shoes/sandal
@@ -207,3 +207,14 @@
 	item_color = "fancysandal"
 	species_restricted = null
 
+/obj/item/clothing/shoes/cursedclown
+	name = "cursed clown shoes"
+	desc = "Moldering clown flip flops. They're neon green for some reason."
+	icon = 'icons/goonstation/objects/clothing/feet.dmi'
+	icon_state = "cursedclown"
+	item_state = "cclown_shoes"
+	icon_override = 'icons/goonstation/mob/clothing/feet.dmi'
+	lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
+	righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
+	flags = NODROP
+	shoe_sound = "clownstep"
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index d5fcbdf3251..e231922de92 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -2,8 +2,6 @@
 /obj/item/clothing/head/helmet/space/skrell
 	name = "Skrellian helmet"
 	desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl."
-	armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
-	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	species_restricted = list("Skrell","Human")
 
 /obj/item/clothing/head/helmet/space/skrell/white
@@ -19,10 +17,6 @@
 /obj/item/clothing/suit/space/skrell
 	name = "Skrellian hardsuit"
 	desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
-	armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
-	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	species_restricted = list("Skrell","Human")
 
 /obj/item/clothing/suit/space/skrell/white
@@ -37,9 +31,6 @@
 
 //Unathi space gear. Huge and restrictive.
 /obj/item/clothing/head/helmet/space/unathi
-	armor = list(melee = 40, bullet = 30, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 50)
-	heat_protection = HEAD
-	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	species_restricted = list("Unathi")
 
 /obj/item/clothing/head/helmet/space/unathi/helmet_cheap
@@ -50,10 +41,6 @@
 	item_color = "unathi_helm_cheap"
 
 /obj/item/clothing/suit/space/unathi
-	armor = list(melee = 40, bullet = 30, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 50)
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
-	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	species_restricted = list("Unathi")
 
 /obj/item/clothing/suit/space/unathi/rig_cheap
@@ -61,7 +48,6 @@
 	desc = "A cheap NT knock-off of a Unathi battle-rig. Looks like a fish, moves like a fish, steers like a cow."
 	icon_state = "rig-unathi-cheap"
 	item_state = "rig-unathi-cheap"
-	slowdown = 3
 
 /obj/item/clothing/head/helmet/space/unathi/breacher
 	name = "breacher helm"
@@ -76,15 +62,13 @@
 	icon_state = "unathi_breacher"
 	item_state = "unathi_breacher"
 	item_color = "unathi_breacher"
-	slowdown = 1
 
 // Vox space gear (vaccuum suit, low pressure armour)
 // Can't be equipped by any other species due to bone structure and vox cybernetics.
 /obj/item/clothing/suit/space/vox
 	w_class = 3
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
-	slowdown = 2
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 40, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	species_restricted = list("Vox", "Vox Armalis")
@@ -94,7 +78,7 @@
 		)
 
 /obj/item/clothing/head/helmet/space/vox
-	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 40, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
 	flags = HEADCOVERSEYES|STOPSPRESSUREDMAGE
 	species_restricted = list("Vox","Vox Armalis")
 	sprite_sheets = list(
@@ -211,7 +195,7 @@
 		if(!ishuman(user))
 			return
 		var/mob/living/carbon/human/H = user
-		if (H.shoes != src)
+		if(H.shoes != src)
 			to_chat(user, "You will have to put on the [src] before you can do that.")
 			return
 
@@ -233,7 +217,7 @@
 
 /obj/item/clothing/shoes/magboots/vox/examine(mob/user)
 	..(user)
-	if (magpulse)
+	if(magpulse)
 		to_chat(user, "It would be hard to take these off without relaxing your grip first.")//theoretically this message should only be seen by the wearer when the claws are equipped.
 
 
diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm
index a7f8baf7a7a..9d2b2a06198 100644
--- a/code/modules/clothing/spacesuits/breaches.dm
+++ b/code/modules/clothing/spacesuits/breaches.dm
@@ -106,7 +106,7 @@ var/global/list/breach_burn_descriptors = list(
 		if(existing.damtype != damtype)
 			continue
 
-		if (existing.class < 5)
+		if(existing.class < 5)
 			var/needs = 5 - existing.class
 			if(amount < needs)
 				existing.class += amount
@@ -120,7 +120,7 @@ var/global/list/breach_burn_descriptors = list(
 			else if(existing.damtype == BURN)
 				T.visible_message("<span class = 'warning'>\The [existing.descriptor] on [src] widens!</span>")
 
-	if (amount)
+	if(amount)
 		//Spawn a new breach.
 		var/datum/breach/B = new()
 		breaches += B
@@ -200,7 +200,7 @@ var/global/list/breach_burn_descriptors = list(
 			to_chat(user, "\red How do you intend to patch a hardsuit while someone is wearing it?")
 			return
 
-		if (!damage || ! brute_damage)
+		if(!damage || ! brute_damage)
 			to_chat(user, "There is no structural damage on \the [src] to repair.")
 			return
 
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index 334e659302b..96ae6519d5d 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -23,7 +23,6 @@
 	icon_state = "chronosuit"
 	item_state = "chronosuit"
 	action_button_name = "Toggle Chronosuit"
-	slowdown = 2
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 30, bio = 90, rad = 90)
 	var/obj/item/clothing/head/helmet/space/chronos/helmet = null
 	var/obj/effect/chronos_cam/camera = null
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 91824a9856e..d5c4d5626bb 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -4,7 +4,7 @@
 	desc = "A helmet worn by members of the Nanotrasen Emergency Response Team. Armoured and space ready."
 	icon_state = "rig0-ert_commander"
 	item_state = "helm-command"
-	armor = list(melee = 50, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60)
+	armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
 	rig_restrict_helmet = 0 // ERT helmets can be taken on and off at will.
 	var/obj/machinery/camera/camera
 	strip_delay = 130
@@ -30,8 +30,7 @@
 	item_state = "suit-command"
 	w_class = 3
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
-	slowdown = 1
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60)
+	armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
 	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/crowbar, \
 	/obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/device/multitool, \
 	/obj/item/device/radio, /obj/item/device/analyzer, /obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse, \
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index aab36bb04cb..1c7deb94970 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -6,7 +6,7 @@
 	desc = "A special helmet designed for only the most fashionable of military figureheads."
 	flags_inv = HIDEFACE
 	permeability_coefficient = 0.01
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
+	armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
 	species_restricted = list("exclude", "Diona", "Wryn")
 	species_fit = list("Vox")
 	sprite_sheets = list(
@@ -14,10 +14,13 @@
 		"Drask" = 'icons/mob/species/drask/helmet.dmi'
 		)
 /obj/item/clothing/head/helmet/space/capspace/equipped(var/mob/living/carbon/human/user, var/slot)
-	if (ishuman(user) && user.species.name == "Vox")
-		flags &= ~BLOCKHAIR
-	else
-		flags |= BLOCKHAIR
+	if(ishuman(user) && slot == slot_head)
+		if(user.species.name == "Vox")
+			if(flags & BLOCKHAIR)
+				flags &= ~BLOCKHAIR
+		else
+			if((initial(flags) & BLOCKHAIR) && !(flags & BLOCKHAIR))
+				flags |= BLOCKHAIR
 
 /obj/item/clothing/suit/space/captain
 	name = "captain's space suit"
@@ -26,8 +29,7 @@
 	item_state = "capspacesuit"
 	w_class = 4
 	allowed = list(/obj/item/weapon/tank, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs)
-	slowdown = 1
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
+	armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
 	species_restricted = list("exclude", "Diona", "Wryn")
 	species_fit = list("Vox")
 	sprite_sheets = list(
@@ -56,8 +58,7 @@
 	icon_state = "deathsquad"
 	item_state = "swat_suit"
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank,/obj/item/weapon/kitchen/knife/combat)
-	armor = list(melee = 80, bullet = 80, laser = 50,energy = 50, bomb = 100, bio = 100, rad = 100)
-	slowdown = 1
+	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
 	max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
 	unacidable = 1
 	strip_delay = 130
@@ -69,14 +70,14 @@
 	icon_state = "heavy"
 	item_state = "swat_suit"
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank,/obj/item/weapon/kitchen/knife/combat)
-	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
+	armor = list(melee = 40, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 90, rad = 20)
 	strip_delay = 120
 
 /obj/item/clothing/head/helmet/space/deathsquad/beret
 	name = "officer's beret"
 	desc = "An armored beret commonly used by special operations officers."
 	icon_state = "beret_officer"
-	armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 65, bullet = 55, laser = 35, energy = 20, bomb = 30, bio = 30, rad = 30)
 
 /obj/item/clothing/suit/space/deathsquad/officer
 	name = "officer jacket"
@@ -101,7 +102,8 @@
 	icon_state = "santa"
 	item_state = "santa"
 	slowdown = 0
-	flags = ONESIZEFITSALL | STOPSPRESSUREDMAGE
+	flags = STOPSPRESSUREDMAGE
+	flags_size = ONESIZEFITSALL
 	allowed = list(/obj/item) //for stuffing exta special presents
 
 
@@ -111,7 +113,7 @@
 	desc = "Yarr."
 	icon_state = "pirate"
 	item_state = "pirate"
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 30, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
 	flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
 	strip_delay = 40
 	put_on_delay = 20
@@ -124,7 +126,7 @@
 	w_class = 3
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
 	slowdown = 0
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 30, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
 	strip_delay = 40
 	put_on_delay = 20
 
@@ -146,8 +148,7 @@
 	icon_state = "spacenew"
 	item_state = "s_suit"
 	desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies."
-	slowdown = 1
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 
 /obj/item/clothing/head/helmet/space/eva
 	name = "EVA helmet"
@@ -155,7 +156,7 @@
 	item_state = "s_helmet"
 	desc = "A lightweight space helmet with the basic ability to protect the wearer from the vacuum of space during emergencies."
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flash_protect = 0
 
 //Mime's Hardsuit
@@ -192,7 +193,7 @@
 	desc = "An advanced, space-proof helmet. It appears to be modeled after an old-world eagle."
 	icon_state = "griffinhat"
 	item_state = "griffinhat"
-	armor = list(melee = 40, bullet = 40, laser = 30, energy = 25, bomb = 100, bio = 100, rad = 100)
+	armor = list(melee = 20, bullet = 40, laser = 30, energy = 25, bomb = 100, bio = 100, rad = 100)
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
 	unacidable = 1
 	strip_delay = 130
@@ -203,8 +204,7 @@
 	icon_state = "freedom"
 	item_state = "freedom"
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
-	armor = list(melee = 40, bullet = 40, laser = 30,energy = 25, bomb = 100, bio = 100, rad = 100)
-	slowdown = 1
+	armor = list(melee = 20, bullet = 40, laser = 30, energy = 25, bomb = 100, bio = 100, rad = 100)
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
 	unacidable = 1
 	strip_delay = 130
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index fd4122c56ec..b5498726203 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -5,13 +5,13 @@
 	desc = "A special containment suit designed to protect a plasmaman's volatile body from outside exposure and quickly extinguish it in emergencies."
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_casing,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
 	slowdown = 0
-	armor = list(melee = 0, bullet = 0, laser = 0 ,energy = 0, bomb = 0, bio = 100, rad = 20)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES
 	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	species_restricted = list("Plasmaman")
-	flags = STOPSPRESSUREDMAGE  | PLASMAGUARD
+	flags = STOPSPRESSUREDMAGE
 
 	icon_state = "plasmaman_suit"
 	item_state = "plasmaman_suit"
@@ -38,7 +38,7 @@
 /obj/item/clothing/head/helmet/space/eva/plasmaman
 	name = "plasmaman helmet"
 	desc = "A special containment helmet designed to protect a plasmaman's volatile body from outside exposure and quickly extinguish it in emergencies."
-	flags = STOPSPRESSUREDMAGE | PLASMAGUARD
+	flags = STOPSPRESSUREDMAGE
 	species_restricted = list("Plasmaman")
 
 	icon_state = "plasmaman_helmet0"
@@ -185,14 +185,14 @@
 /obj/item/clothing/suit/space/eva/plasmaman/miner
 	name = "plasmaman miner suit"
 	icon_state = "plasmamanMiner_suit"
-	armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
-	slowdown = 2
+	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
+	slowdown = 1
 
 /obj/item/clothing/head/helmet/space/eva/plasmaman/miner
 	name = "plasmaman miner helmet"
 	icon_state = "plasmamanMiner_helmet0"
 	base_state = "plasmamanMiner_helmet"
-	armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
+	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
 
 
 // MEDSCI
@@ -266,13 +266,13 @@
 /obj/item/clothing/suit/space/eva/plasmaman/security
 	name = "plasmaman security suit"
 	icon_state = "plasmamanSecurity_suit"
-	armor = list(melee = 30, bullet = 15, laser = 30,energy = 10, bomb = 10, bio = 100, rad = 50)
+	armor = list(melee = 15, bullet = 15, laser = 15, energy = 10, bomb = 10, bio = 100, rad = 50)
 
 /obj/item/clothing/head/helmet/space/eva/plasmaman/security
 	name = "plasmaman security helmet"
 	icon_state = "plasmamanSecurity_helmet0"
 	base_state = "plasmamanSecurity_helmet"
-	armor = list(melee = 30, bullet = 15, laser = 30,energy = 10, bomb = 10, bio = 100, rad = 50)
+	armor = list(melee = 15, bullet = 15, laser = 15, energy = 10, bomb = 10, bio = 100, rad = 50)
 
 /obj/item/clothing/suit/space/eva/plasmaman/security/hos
 	name = "plasmaman head of security suit"
diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index ce73bb13a24..a656feeb08f 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -55,7 +55,6 @@
 	desc = "A special space suit for environments that might pose hazards beyond just the vacuum of space. Provides more protection than a standard space suit."
 	icon_state = "rig-engineering"
 	item_state = "eng_hardsuit"
-	slowdown = 2
 	armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/t_scanner, /obj/item/weapon/rcd)
 	siemens_coefficient = 0
@@ -247,7 +246,6 @@
 	desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
 	icon_state = "rig-engineering"
 	item_state = "eng_hardsuit"
-	slowdown = 2
 	armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/t_scanner, /obj/item/weapon/rcd)
 
@@ -279,14 +277,14 @@
 	item_state = "mining_helm"
 	item_color = "mining"
 	flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE
-	armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
+	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
 
 /obj/item/clothing/suit/space/rig/mining
 	icon_state = "rig-mining"
 	name = "mining hardsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating."
 	item_state = "mining_hardsuit"
-	armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
+	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/pickaxe)
 
 
@@ -297,7 +295,7 @@
 	icon_state = "hardsuit1-syndi"
 	item_state = "syndie_helm"
 	item_color = "syndi"
-	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
+	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
 	on = 1
 	flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL
 	action_button_name = "Toggle Helmet Mode"
@@ -339,11 +337,10 @@
 	icon_state = "hardsuit1-syndi"
 	item_state = "syndie_hardsuit"
 	item_color = "syndi"
-	slowdown = 1
 	w_class = 3
 	var/on = 1
 	action_button_name = "Toggle Hardsuit Mode"
-	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
+	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
 
 /obj/item/clothing/suit/space/rig/syndi/update_icon()
@@ -379,7 +376,7 @@
 	desc = "An elite version of the syndicate helmet, with improved armour and fire shielding. It is in travel mode. Property of Gorlex Marauders."
 	icon_state = "hardsuit0-syndielite"
 	item_color = "syndielite"
-	armor = list(melee = 80, bullet = 70, laser = 50, energy = 25, bomb = 55, bio = 100, rad = 70)
+	armor = list(melee = 60, bullet = 60, laser = 50, energy = 25, bomb = 55, bio = 100, rad = 70)
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
 	sprite_sheets = null
@@ -398,7 +395,7 @@
 	desc = "An elite version of the syndicate hardsuit, with improved armour and fire shielding. It is in travel mode."
 	icon_state = "hardsuit0-syndielite"
 	item_color = "syndielite"
-	armor = list(melee = 80, bullet = 70, laser = 50, energy = 25, bomb = 55, bio = 100, rad = 70)
+	armor = list(melee = 60, bullet = 60, laser = 50, energy = 25, bomb = 55, bio = 100, rad = 70)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
 	sprite_sheets = null
@@ -420,7 +417,7 @@
 	item_state = "wiz_helm"
 	item_color = "wiz"
 	unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles!
-	armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
+	armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 35, bio = 100, rad = 50)
 	heat_protection = HEAD												//Uncomment to enable firesuit protection
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
 	unacidable = 1
@@ -431,10 +428,9 @@
 	name = "gem-encrusted hardsuit"
 	desc = "A bizarre gem-encrusted suit that radiates magical energies."
 	item_state = "wiz_hardsuit"
-	slowdown = 1
 	w_class = 3
 	unacidable = 1
-	armor = list(melee = 40, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 100, rad = 50)
+	armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 35, bio = 100, rad = 50)
 	allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS					//Uncomment to enable firesuit protection
 	max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
@@ -458,7 +454,6 @@
 	name = "medical hardsuit"
 	desc = "A special helmet designed for work in a hazardous, low pressure environment. Built with lightweight materials for extra comfort."
 	item_state = "medical_hardsuit"
-	slowdown = 1
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/device/rad_laser)
 	armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50)
 
@@ -469,7 +464,7 @@
 	icon_state = "rig0-sec"
 	item_state = "sec_helm"
 	item_color = "sec"
-	armor = list(melee = 30, bullet = 15, laser = 30,energy = 10, bomb = 10, bio = 100, rad = 50)
+	armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50)
 
 /obj/item/clothing/suit/space/rig/security
 	icon_state = "rig-sec"
@@ -507,7 +502,7 @@
 	icon_state = "rig0-singuloth"
 	item_state = "singuloth_helm"
 	item_color = "singuloth"
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 100)
+	armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 100)
 
 /obj/item/clothing/suit/space/rig/singuloth
 	icon_state = "rig-singuloth"
@@ -515,4 +510,100 @@
 	desc = "This is a ceremonial armor from the chapter of the Singuloth Knights. It's made of pure forged adamantium."
 	item_state = "singuloth_hardsuit"
 	flags = STOPSPRESSUREDMAGE
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 100)
+	armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 100)
+
+
+/obj/item/clothing/head/helmet/space/rig/security/hos
+	name = "head of security's hardsuit helmet"
+	desc = "a special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
+	icon_state = "hardsuit0-hos"
+	item_color = "hos"
+	armor = list(melee = 45, bullet = 25, laser = 30,energy = 10, bomb = 25, bio = 100, rad = 50)
+	sprite_sheets = null
+
+
+/obj/item/clothing/suit/space/rig/security/hos
+	icon_state = "hardsuit-hos"
+	name = "head of security's hardsuit"
+	desc = "A special bulky suit that protects against hazardous, low pressure environments. Has an additional layer of armor."
+	armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
+	sprite_sheets = null
+
+
+/////////////SHIELDED//////////////////////////////////
+
+/obj/item/clothing/suit/space/rig/shielded
+	name = "shielded hardsuit"
+	desc = "A hardsuit with built in energy shielding. Will rapidly recharge when not under fire."
+	icon_state = "hardsuit-hos"
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank, /obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs)
+	armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50)
+	var/current_charges = 3
+	var/max_charges = 3 //How many charges total the shielding has
+	var/recharge_delay = 200 //How long after we've been shot before we can start recharging. 20 seconds here
+	var/recharge_cooldown = 0 //Time since we've last been shot
+	var/recharge_rate = 1 //How quickly the shield recharges once it starts charging
+	var/shield_state = "shield-old"
+	var/shield_on = "shield-old"
+	sprite_sheets = null
+
+/obj/item/clothing/suit/space/rig/shielded/hit_reaction(mob/living/carbon/human/owner, attack_text)
+	if(current_charges > 0)
+		var/datum/effect/system/spark_spread/s = new
+		s.set_up(2, 1, src)
+		s.start()
+		owner.visible_message("<span class='danger'>[owner]'s shields deflect [attack_text] in a shower of sparks!</span>")
+		current_charges--
+		recharge_cooldown = world.time + recharge_delay
+		processing_objects |= src
+		if(current_charges <= 0)
+			owner.visible_message("[owner]'s shield overloads!")
+			shield_state = "broken"
+			owner.update_inv_wear_suit()
+		return 1
+	return 0
+
+
+/obj/item/clothing/suit/space/rig/shielded/Destroy()
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/item/clothing/suit/space/rig/shielded/process()
+	if(world.time > recharge_cooldown && current_charges < max_charges)
+		current_charges = Clamp((current_charges + recharge_rate), 0, max_charges)
+		playsound(loc, 'sound/magic/Charge.ogg', 50, 1)
+		if(current_charges == max_charges)
+			playsound(loc, 'sound/machines/ding.ogg', 50, 1)
+			processing_objects.Remove(src)
+		shield_state = "[shield_on]"
+		if(istype(loc, /mob/living/carbon/human))
+			var/mob/living/carbon/human/C = loc
+			C.update_inv_wear_suit()
+
+//////Syndicate Version
+
+/obj/item/clothing/suit/space/rig/shielded/syndi
+	name = "blood-red hardsuit"
+	desc = "An advanced hardsuit with built in energy shielding."
+	icon_state = "hardsuit1-syndi"
+	item_state = "syndie_hardsuit"
+	item_color = "syndi"
+	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
+	slowdown = 0
+	sprite_sheets = list(
+		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
+		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
+		"Skrell" = 'icons/mob/species/skrell/suit.dmi',
+		"Vox" = 'icons/mob/species/vox/suit.dmi',
+		"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
+		"Drask" = 'icons/mob/species/drask/suit.dmi'
+		)
+
+/obj/item/clothing/head/helmet/space/rig/shielded/syndi
+	name = "blood-red hardsuit helmet"
+	desc = "An advanced hardsuit helmet with built in energy shielding."
+	icon_state = "hardsuit1-syndi"
+	item_state = "syndie_helm"
+	item_color = "syndi"
+	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 66a0e62a39b..fccf464607b 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -17,7 +17,7 @@
 	w_class = 4
 
 	// These values are passed on to all component pieces.
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
+	armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	siemens_coefficient = 0.2
@@ -431,7 +431,7 @@
 			if(!offline)
 				if(istype(wearer))
 					if(flags & NODROP)
-						if (offline_slowdown < 3)
+						if(offline_slowdown < 3)
 							to_chat(wearer, "<span class='danger'>Your suit beeps stridently, and suddenly goes dead.</span>")
 						else
 							to_chat(wearer, "<span class='danger'>Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.</span>")
@@ -576,7 +576,7 @@
 		data["modules"] = module_list
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, ((src.loc != user) ? ai_interface_path : interface_path), interface_title, 480, 550, state = nano_state)
 		ui.set_initial_data(data)
 		ui.open()
@@ -819,7 +819,7 @@
 	take_hit((100/severity_class), "electrical pulse", 1)
 
 /obj/item/weapon/rig/proc/shock(mob/user)
-	if (electrocute_mob(user, cell, src)) //electrocute_mob() handles removing charge from the cell, no need to do that here.
+	if(electrocute_mob(user, cell, src)) //electrocute_mob() handles removing charge from the cell, no need to do that here.
 		spark_system.start()
 		if(user.stunned)
 			return 1
diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm
index 5f43c172a39..8632b6cc472 100644
--- a/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm
@@ -3,13 +3,13 @@
 	desc = "A cheap NT knock-off of an Unathi battle-rig. Looks like a fish, moves like a fish, steers like a cow."
 	suit_type = "NT breacher"
 	icon_state = "breacher_rig_cheap"
-	armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 70, bio = 100, rad = 50)
+	armor = list(melee = 30, bullet = 30, laser = 30, energy = 30, bomb = 45, bio = 100, rad = 50)
 	emp_protection = -20
 	slowdown = 6
 	offline_slowdown = 10
 	vision_restriction = 1
 	offline_vision_restriction = 2
-	
+
 	chest_type = /obj/item/clothing/suit/space/new_rig
 	helm_type = /obj/item/clothing/head/helmet/space/new_rig/unathi
 	boot_type = /obj/item/clothing/shoes/magboots/rig/unathi
@@ -19,7 +19,7 @@
 	desc = "An authentic Unathi breacher chassis. Huge, bulky and absurdly heavy. It must be like wearing a tank."
 	suit_type = "breacher chassis"
 	icon_state = "breacher_rig"
-	armor = list(melee = 90, bullet = 90, laser = 90, energy = 90, bomb = 90, bio = 100, rad = 80) //Takes TEN TIMES as much damage to stop someone in a breacher. In exchange, it's slow.
+	armor = list(melee = 45, bullet = 45, laser = 45, energy = 45, bomb = 45, bio = 100, rad = 75) //Takes TEN TIMES as much damage to stop someone in a breacher. In exchange, it's slow. //Whoever made this was on meth
 	vision_restriction = 0
 
 /obj/item/clothing/head/helmet/space/new_rig/unathi
@@ -27,6 +27,6 @@
 
 /obj/item/clothing/suit/space/new_rig/unathi
 	species_restricted = list("Unathi")
-	
+
 /obj/item/clothing/shoes/magboots/rig/unathi
 	species_restricted = list("Unathi")
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm
index cd37189a080..98adb708ada 100644
--- a/code/modules/clothing/spacesuits/rig/suits/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm
@@ -5,7 +5,7 @@
 	desc = "A sleek and dangerous hardsuit for active combat."
 	icon_state = "security_rig"
 	suit_type = "combat hardsuit"
-	armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)
+	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
 	slowdown = 1
 	offline_slowdown = 3
 	offline_vision_restriction = 1
diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm
index f10a859af9a..4aed2a53f30 100644
--- a/code/modules/clothing/spacesuits/rig/suits/ert.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm
@@ -10,7 +10,7 @@
 
 	req_access = list(access_cent_specops)
 
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
+	armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
 	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/crowbar, \
 	/obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/device/multitool, \
 	/obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \
@@ -27,7 +27,6 @@
 	desc = "A suit worn by the engineering division of an Emergency Response Team. Has orange highlights. Armoured and space ready."
 	suit_type = "ERT engineer"
 	icon_state = "ert_engineer_rig"
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
 	siemens_coefficient = 0
 
 	initial_modules = list(
@@ -68,7 +67,6 @@
 	desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armoured and space ready."
 	suit_type = "heavy asset protection"
 	icon_state = "asset_protection_rig"
-	armor = list(melee = 60, bullet = 50, laser = 50,energy = 40, bomb = 40, bio = 100, rad = 100)
 
 	initial_modules = list(
 		/obj/item/rig_module/ai_container,
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
index fb6b0459a91..0bda9f9288a 100644
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -5,7 +5,6 @@
 	icon_state = "ninja_rig"
 	suit_type = "light suit"
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank,/obj/item/weapon/stock_parts/cell)
-	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 	emp_protection = 10
 	slowdown = 0
 	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm
index 58a66aaa4b1..a7512231641 100644
--- a/code/modules/clothing/spacesuits/rig/suits/merc.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm
@@ -5,7 +5,7 @@
 	desc = "A blood-red hardsuit featuring some fairly illegal technology."
 	icon_state = "merc_rig"
 	suit_type = "crimson hardsuit"
-	armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)
+	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
 	slowdown = 1
 	offline_slowdown = 3
 	offline_vision_restriction = 1
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
index 4ddf6e419f3..a0e236daee7 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -15,7 +15,7 @@
 	suit_type = "augmented suit"
 	desc = "Prepare for paperwork."
 	icon_state = "internalaffairs_rig"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 	slowdown = 0
 	offline_slowdown = 0
@@ -51,7 +51,7 @@
 	suit_type = "industrial hardsuit"
 	desc = "A heavy, powerful rig used by construction crews and mining corporations."
 	icon_state = "engineering_rig"
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 50)
+	armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
 	slowdown = 3
 	offline_slowdown = 10
 	offline_vision_restriction = 2
@@ -80,7 +80,6 @@
 	suit_type = "EVA hardsuit"
 	desc = "A light rig for repairs and maintenance to the outside of habitats and vessels."
 	icon_state = "eva_rig"
-	armor = list(melee = 30, bullet = 10, laser = 20,energy = 25, bomb = 20, bio = 100, rad = 100)
 	slowdown = 0
 	offline_slowdown = 1
 	offline_vision_restriction = 1
@@ -108,7 +107,7 @@
 	suit_type = "advanced voidsuit"
 	desc = "An advanced voidsuit that protects against hazardous, low pressure environments. Shines with a high polish."
 	icon_state = "ce_rig"
-	armor = list(melee = 40, bullet = 10, laser = 30,energy = 25, bomb = 40, bio = 100, rad = 100)
+	armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 90)
 	slowdown = 0
 	offline_slowdown = 0
 	offline_vision_restriction = 0
@@ -150,7 +149,6 @@
 	suit_type = "hazmat hardsuit"
 	desc = "An Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it."
 	icon_state = "science_rig"
-	armor = list(melee = 45, bullet = 5, laser = 45, energy = 80, bomb = 60, bio = 100, rad = 100)
 	slowdown = 1
 	offline_vision_restriction = 1
 
@@ -179,7 +177,7 @@
 	suit_type = "rescue hardsuit"
 	desc = "A durable suit designed for medical rescue in high risk areas."
 	icon_state = "medical_rig"
-	armor = list(melee = 30, bullet = 15, laser = 20, energy = 60, bomb = 30, bio = 100, rad = 100)
+	armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50)
 	slowdown = 1
 	offline_vision_restriction = 1
 
@@ -204,7 +202,7 @@
 	suit_type = "hazard hardsuit"
 	desc = "A Security hardsuit designed for prolonged EVA in dangerous environments."
 	icon_state = "hazard_rig"
-	armor = list(melee = 60, bullet = 40, laser = 30, energy = 15, bomb = 60, bio = 100, rad = 30)
+	armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50)
 	slowdown = 1
 	offline_slowdown = 3
 	offline_vision_restriction = 1
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 4017cb3f1f8..4b8f32f5a74 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -5,7 +5,7 @@
 	icon_state = "syndicate"
 	item_state = "syndicate"
 	desc = "Has a tag: Totally not property of an enemy corporation, honest."
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
 
 /obj/item/clothing/suit/space/syndicate
 	name = "red space suit"
@@ -14,8 +14,7 @@
 	desc = "Has a tag on it: Totally not property of of a hostile corporation, honest!"
 	w_class = 3
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
-	slowdown = 1
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
 
 
 //Green syndicate space suit
diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm
index 91142123450..cce0f4c49b3 100644
--- a/code/modules/clothing/spacesuits/void.dm
+++ b/code/modules/clothing/spacesuits/void.dm
@@ -11,5 +11,4 @@
 	icon_state = "void"
 	item_state = "void"
 	desc = "A high tech, NASA Centcom branch designed, dark red Space suit. Used for AI satellite maintenance."
-	slowdown = 1
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/multitool)
\ No newline at end of file
diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm
index 5b664f21b35..664e1dea237 100644
--- a/code/modules/clothing/suits/alien.dm
+++ b/code/modules/clothing/suits/alien.dm
@@ -1,4 +1,9 @@
 //Unathi clothing.
+/obj/item/clothing/suit/unathi/
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/unathi/robe
 	name = "roughspun robes"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 609e24ca6bf..3715a134e16 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -8,6 +8,10 @@
 	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
 	strip_delay = 60
 	put_on_delay = 40
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/armor/vest
 	name = "armor"
@@ -15,8 +19,8 @@
 	icon_state = "armor"
 	item_state = "armor"
 	blood_overlay_type = "armor"
-	flags = ONESIZEFITSALL
-	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
+	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/armor/vest/jacket
 	name = "military jacket"
@@ -31,8 +35,7 @@
 	icon_state = "armor-combat"
 	item_state = "bulletproof"
 	blood_overlay_type = "armor"
-	flags = ONESIZEFITSALL
-	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/suit/armor/vest/security
 	name = "security armor"
@@ -85,6 +88,8 @@
 	desc = "A vest drenched in the blood of Greytide. It has seen better days."
 	icon_state = "bloody_armor"
 	item_state = "bloody_armor"
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/suit/armor/hos
 	name = "armored coat"
@@ -92,7 +97,7 @@
 	icon_state = "hos"
 	item_state = "hos"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0)
 	flags_inv = HIDEJUMPSUIT
 	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
@@ -115,6 +120,8 @@
 	icon_state = "jensencoat"
 	item_state = "jensencoat"
 	flags_inv = 0
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/suit/armor/vest/warden
 	name = "Warden's armored jacket"
@@ -137,7 +144,7 @@
 	icon_state = "capcarapace"
 	item_state = "armor"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
-	armor = list(melee = 50, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 50, bullet = 40, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/armor/riot
 	name = "Riot Suit"
@@ -147,18 +154,18 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	slowdown = 1
-	armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
 	flags_inv = HIDEJUMPSUIT
 	strip_delay = 80
 	put_on_delay = 60
+	hide_tail_by_species = list("Vox")
 
 /obj/item/clothing/suit/armor/riot/knight
 	name = "plate armour"
 	desc = "A classic suit of plate armour, highly effective at stopping melee attacks."
 	icon_state = "knight_green"
 	item_state = "knight_green"
-	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
+	slowdown = 1
 
 /obj/item/clothing/suit/armor/riot/knight/yellow
 	icon_state = "knight_yellow"
@@ -185,7 +192,7 @@
 	icon_state = "bulletproof"
 	item_state = "armor"
 	blood_overlay_type = "armor"
-	armor = list(melee = 25, bullet = 80, laser = 10, energy = 10, bomb = 40, bio = 0, rad = 0)
+	armor = list(melee = 15, bullet = 80, laser = 10, energy = 10, bomb = 40, bio = 0, rad = 0)
 	strip_delay = 70
 	put_on_delay = 50
 
@@ -195,7 +202,7 @@
 	icon_state = "armor_reflec"
 	item_state = "armor_reflec"
 	blood_overlay_type = "armor"
-	armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 10, laser = 60, energy = 50, bomb = 0, bio = 0, rad = 0)
 	var/hit_reflect_chance = 40
 
 /obj/item/clothing/suit/armor/laserproof/IsReflect(var/def_zone)
@@ -210,46 +217,129 @@
 	icon_state = "detective-armor"
 	item_state = "armor"
 	blood_overlay_type = "armor"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
 
 
 //Reactive armor
-//When the wearer gets hit, this armor will teleport the user a short distance away (to safety or to more danger, no one knows. That's the fun of it!)
 /obj/item/clothing/suit/armor/reactive
-	name = "Reactive Teleport Armor"
-	desc = "Someone seperated our Research Director from his own head!"
-	var/active = 0.0
+	name = "reactive armor"
+	desc = "Doesn't seem to do much for some reason."
+	var/active = 0
 	icon_state = "reactiveoff"
 	item_state = "reactiveoff"
 	blood_overlay_type = "armor"
-	action_button_name = "Toggle Reactive Armor"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	action_button_name = "Toggle Reactive Armor"
+	unacidable = 1
+	hit_reaction_chance = 50
 
-/obj/item/clothing/suit/armor/reactive/IsShield()
+
+/obj/item/clothing/suit/armor/reactive/attack_self(mob/user)
+	active = !(active)
 	if(active)
-		return 1
-	return 0
-
-/obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob)
-	src.active = !( src.active )
-	if (src.active)
-		to_chat(user, "\blue The reactive armor is now active.")
-		src.icon_state = "reactive"
-		src.item_state = "reactive"
+		to_chat(user, "<span class='notice'>[src] is now active.</span>")
+		icon_state = "reactive"
+		item_state = "reactive"
 	else
-		to_chat(user, "\blue The reactive armor is now inactive.")
-		src.icon_state = "reactiveoff"
-		src.item_state = "reactiveoff"
-		src.add_fingerprint(user)
-	return
+		to_chat(user, "<span class='notice'>[src] is now inactive.</span>")
+		icon_state = "reactiveoff"
+		item_state = "reactiveoff"
+		add_fingerprint(user)
+	user.update_inv_wear_suit()
 
 /obj/item/clothing/suit/armor/reactive/emp_act(severity)
 	active = 0
-	src.icon_state = "reactiveoff"
-	src.item_state = "reactiveoff"
+	icon_state = "reactiveoff"
+	item_state = "reactiveoff"
+	if(istype(loc, /mob/living/carbon/human))
+		var/mob/living/carbon/human/C = loc
+		C.update_inv_wear_suit()
 	..()
 
+//When the wearer gets hit, this armor will teleport the user a short distance away (to safety or to more danger, no one knows. That's the fun of it!)
+/obj/item/clothing/suit/armor/reactive/teleport
+	name = "reactive teleport armor"
+	desc = "Someone seperated our Research Director from his own head!"
+	var/tele_range = 6
+
+/obj/item/clothing/suit/armor/reactive/teleport/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
+	if(!active)
+		return 0
+	if(prob(hit_reaction_chance))
+		var/mob/living/carbon/human/H = owner
+		owner.visible_message("<span class='danger'>The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!</span>")
+		var/list/turfs = new/list()
+		for(var/turf/T in orange(tele_range, H))
+			if(istype(T, /turf/space))
+				continue
+			if(T.density)
+				continue
+			if(T.x>world.maxx-tele_range || T.x<tele_range)
+				continue
+			if(T.y>world.maxy-tele_range || T.y<tele_range)
+				continue
+			turfs += T
+		if(!turfs.len)
+			turfs += pick(/turf in orange(tele_range, H))
+		var/turf/picked = pick(turfs)
+		if(!isturf(picked))
+			return
+		if(H.buckled)
+			H.buckled.unbuckle_mob()
+		H.forceMove(picked)
+		return 1
+	return 0
+
+/obj/item/clothing/suit/armor/reactive/fire
+	name = "reactive incendiary armor"
+
+/obj/item/clothing/suit/armor/reactive/fire/hit_reaction(mob/living/carbon/human/owner, attack_text)
+	if(!active)
+		return 0
+	if(prob(hit_reaction_chance))
+		owner.visible_message("<span class='danger'>The [src] blocks the [attack_text], sending out jets of flame!</span>")
+		for(var/mob/living/carbon/C in range(6, owner))
+			if(C != owner)
+				C.fire_stacks += 8
+				C.IgniteMob()
+		owner.fire_stacks = -20
+		return 1
+	return 0
+
+
+/obj/item/clothing/suit/armor/reactive/stealth
+	name = "reactive stealth armor"
+
+/obj/item/clothing/suit/armor/reactive/stealth/hit_reaction(mob/living/carbon/human/owner, attack_text)
+	if(!active)
+		return 0
+	if(prob(hit_reaction_chance))
+		var/mob/living/simple_animal/hostile/illusion/escape/E = new(owner.loc)
+		E.Copy_Parent(owner, 50)
+		E.GiveTarget(owner) //so it starts running right away
+		E.Goto(owner, E.move_to_delay, E.minimum_distance)
+		owner.alpha = 0
+		owner.visible_message("<span class='danger'>[owner] is hit by [attack_text] in the chest!</span>") //We pretend to be hit, since blocking it would stop the message otherwise
+		spawn(40)
+			owner.alpha = initial(owner.alpha)
+		return 1
+
+/obj/item/clothing/suit/armor/reactive/tesla
+	name = "reactive tesla armor"
+
+/obj/item/clothing/suit/armor/reactive/tesla/hit_reaction(mob/living/carbon/human/owner, attack_text)
+	if(!active)
+		return 0
+	if(prob(hit_reaction_chance))
+		owner.visible_message("<span class='danger'>The [src] blocks the [attack_text], sending out arcs of lightning!</span>")
+		for(var/mob/living/M in view(6, owner))
+			if(M == owner)
+				continue
+			owner.Beam(M,icon_state="lightning[rand(1, 12)]",icon='icons/effects/effects.dmi',time=5)
+			M.adjustFireLoss(25)
+			playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
+		return 1
 
 //All of the armor below is mostly unused
 
@@ -266,27 +356,32 @@
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+	species_fit = null
+	sprite_sheets = null
+	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
 
 /obj/item/clothing/suit/armor/heavy
 	name = "heavy armor"
 	desc = "A heavily armored suit that protects against moderate damage."
 	icon_state = "heavy"
 	item_state = "swat_suit"
-	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.90
 	flags = THICKMATERIAL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	slowdown = 3
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	hide_tail_by_species = list("Vox")
 
 /obj/item/clothing/suit/armor/tdome
-	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	flags = THICKMATERIAL
 	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	hide_tail_by_species = list("Vox")
 
 /obj/item/clothing/suit/armor/tdome/red
 	name = "Red Thunderdome Armor"
@@ -306,7 +401,7 @@
 	desc = "A set of armor worn by members of the Nanotrasen Emergency Response Team."
 	icon_state = "ertarmor_cmd"
 	item_state = "armor"
-	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 20, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 30, laser = 30, energy = 30, bomb = 20, bio = 0, rad = 0)
 
 //Commander
 /obj/item/clothing/suit/armor/vest/ert/command
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 3879cc5692c..06fbf32b056 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -5,7 +5,7 @@
 	desc = "A hood that protects the head and face from biological comtaminants."
 	permeability_coefficient = 0.01
 	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR | THICKMATERIAL
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 
 /obj/item/clothing/suit/bio_suit
@@ -16,14 +16,20 @@
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
-	flags = ONESIZEFITSALL | THICKMATERIAL
+	flags = THICKMATERIAL
+	flags_size = ONESIZEFITSALL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	slowdown = 1.0
+	slowdown = 1
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 	strip_delay = 70
 	put_on_delay = 70
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
+	hide_tail_by_species = list("Vox")
 
 //Standard biosuit, orange stripe
 /obj/item/clothing/head/bio_hood/general
@@ -43,9 +49,11 @@
 
 //Security biosuit, grey with red stripe across the chest
 /obj/item/clothing/head/bio_hood/security
+	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 20)
 	icon_state = "bio_security"
 
 /obj/item/clothing/suit/bio_suit/security
+	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 20)
 	icon_state = "bio_security"
 
 
@@ -80,4 +88,6 @@
 	icon_state = "plaguedoctor"
 	item_state = "bio_suit"
 	strip_delay = 40
-	put_on_delay = 20
\ No newline at end of file
+	put_on_delay = 20
+	species_fit = null
+	sprite_sheets = null
\ No newline at end of file
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index f9ce0cd4593..1288d02cbf4 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -25,6 +25,10 @@
 	/obj/item/device/healthanalyzer, /obj/item/device/flashlight, \
 	/obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen,/obj/item/device/rad_laser)
 	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 //Botonist
 /obj/item/clothing/suit/apron
@@ -48,7 +52,7 @@
 	item_state = "bio_suit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 	allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen)
 	species_fit = list("Vox")
 	sprite_sheets = list(
@@ -119,10 +123,6 @@
 	blood_overlay_type = "armor"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	allowed = list(/obj/item/weapon/kitchen/knife)
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
-		)
 
 //Detective
 /obj/item/clothing/suit/storage/det_suit
@@ -133,30 +133,30 @@
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
-	armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi'
 		)
 
 //Forensics
-/obj/item/clothing/suit/storage/forensics
+/obj/item/clothing/suit/storage/det_suit/forensics
 	name = "jacket"
 	desc = "A forensics technician jacket."
 	item_state = "det_suit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
-	armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
+	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+	heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
 
-/obj/item/clothing/suit/storage/forensics/red
+/obj/item/clothing/suit/storage/det_suit/forensics/red
 	name = "red jacket"
 	desc = "A red forensics technician jacket."
 	icon_state = "forensics_red"
 
-/obj/item/clothing/suit/storage/forensics/blue
+/obj/item/clothing/suit/storage/det_suit/forensics/blue
 	name = "blue jacket"
 	desc = "A blue forensics technician jacket."
 	icon_state = "forensics_blue"
@@ -170,10 +170,14 @@
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic)
-	armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 //Engineering
 /obj/item/clothing/suit/storage/hazardvest
@@ -189,6 +193,12 @@
 		)
 
 //Lawyer
+/obj/item/clothing/suit/storage/lawyer
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
+
 /obj/item/clothing/suit/storage/lawyer/blackjacket
 	name = "black suit jacket"
 	desc = "A snappy dress jacket."
@@ -233,6 +243,10 @@
 	suit_adjusted = 1
 	action_button_name = "Button/Unbutton Jacket"
 	adjust_flavour = "unbutton"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/storage/ntrep
 	name = "\improper NanoTrasen Representative jacket"
@@ -244,6 +258,10 @@
 	ignore_suitadjust = 0
 	action_button_name = "Button/Unbutton Jacket"
 	adjust_flavour = "unbutton"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 //Medical
 /obj/item/clothing/suit/storage/fr_jacket
@@ -258,6 +276,10 @@
 	suit_adjusted = 1
 	action_button_name = "Button/Unbutton Jacket"
 	adjust_flavour = "unbutton"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 //Mime
 /obj/item/clothing/suit/suspenders
@@ -266,3 +288,7 @@
 	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "suspenders"
 	blood_overlay_type = "armor" //it's the less thing that I can put here
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 96065432f3d..6926105541d 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -21,66 +21,38 @@
 	desc = "Bluer than the standard model."
 	icon_state = "labcoat_cmo_open"
 	item_state = "labcoat_cmo_open"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
-		)
 
 /obj/item/clothing/suit/storage/labcoat/mad
 	name = "mad scientist's labcoat"
 	desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
 	icon_state = "labcoat_green_open"
 	item_state = "labcoat_green_open"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
-		)
 
 /obj/item/clothing/suit/storage/labcoat/genetics
 	name = "geneticist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder."
 	icon_state = "labcoat_gen_open"
 	item_state = "labcoat_gen_open"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
-		)
 
 /obj/item/clothing/suit/storage/labcoat/chemist
 	name = "chemist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
 	icon_state = "labcoat_chem_open"
 	item_state = "labcoat_chem_open"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
-		)
 
 /obj/item/clothing/suit/storage/labcoat/virologist
 	name = "virologist labcoat"
 	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
 	icon_state = "labcoat_vir_open"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
-		)
 
 /obj/item/clothing/suit/storage/labcoat/science
 	name = "scientist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
 	icon_state = "labcoat_tox_open"
 	item_state = "labcoat_tox_open"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
-		)
 
 /obj/item/clothing/suit/storage/labcoat/mortician
 	name = "coroner labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a black stripe on the shoulder."
 	icon_state = "labcoat_mort_open"
 	item_state = "labcoat_mort_open"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
-		)
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 7985eb06b57..badf323d804 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -16,6 +16,10 @@
 	blood_overlay_type = "armor"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	allowed = list (/obj/item/weapon/gun/energy/laser/bluetag)
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/redtag
 	name = "red laser tag armour"
@@ -25,6 +29,10 @@
 	blood_overlay_type = "armor"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	allowed = list (/obj/item/weapon/gun/energy/laser/redtag)
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /*
  * Costume
@@ -34,13 +42,20 @@
 	desc = "Yarr."
 	icon_state = "pirate_old"
 	item_state = "pirate_old"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/pirate_black
 	name = "black pirate coat"
 	desc = "Yarr."
 	icon_state = "pirate"
 	item_state = "pirate"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/hgpirate
 	name = "pirate captain coat"
@@ -99,7 +114,10 @@
 	item_state = "wcoat"
 	blood_overlay_type = "armor"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/apron/overalls
 	name = "coveralls"
@@ -233,6 +251,10 @@
 	desc = "Your classic, non-racist poncho."
 	icon_state = "classicponcho"
 	item_state = "classicponcho"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/poncho/green
 	name = "green poncho"
@@ -272,7 +294,7 @@
 	item_state = "straight_jacket"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 	strip_delay = 60
 
 /obj/item/clothing/suit/ianshirt
@@ -280,6 +302,10 @@
 	desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in."
 	icon_state = "ianshirt"
 	item_state = "ianshirt"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 //pyjamas
 //originally intended to be pinstripes >.>
@@ -323,12 +349,20 @@
 	desc = "It makes you stand out. Just the opposite of why it's typically worn. Nice try trying to blend in while wearing it."
 	icon_state = "brtrenchcoat"
 	item_state = "brtrenchcoat"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/blacktrenchcoat
 	name = "black trench coat"
 	desc = "That shade of black just makes you look a bit more evil. Good for those mafia types."
 	icon_state = "bltrenchcoat"
 	item_state = "bltrenchcoat"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 
 //actual suits
@@ -403,7 +437,7 @@
 	item_state = "xenos_helm"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 //swimsuit
 /obj/item/clothing/under/swimsuit/
@@ -446,10 +480,10 @@
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 
 /obj/item/clothing/head/mercy_hood
@@ -459,7 +493,7 @@
 	item_state = "mercy_hood"
 	permeability_coefficient = 0.01
 	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 
 /obj/item/clothing/suit/jacket
@@ -473,6 +507,10 @@
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
 	action_button_name = "Zip/Unzip Jacket"
 	adjust_flavour = "unzip"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/jacket/pilot
 	name = "security bomber jacket"
@@ -487,8 +525,8 @@
 	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
 	strip_delay = 60
 	put_on_delay = 40
-	flags = ONESIZEFITSALL
-	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
+	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 	//End of inheritance from Security armour.
 
 /obj/item/clothing/suit/jacket/leather
@@ -504,12 +542,26 @@
 	desc = "A classy clown officer's overcoat, also designed by Hugo Boss."
 	icon_state = "officersuit"
 	item_state = "officersuit"
+	ignore_suitadjust = 0
+	action_button_name = "Button/Unbutton Jacket"
+	adjust_flavour = "unbutton"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/soldiercoat
 	name = "Clown Soldier's Coat"
 	desc = "An overcoat for the clown soldier, to keep him warm during those cold winter nights on the front."
 	icon_state = "soldiersuit"
 	item_state = "soldiersuit"
+	ignore_suitadjust = 0
+	action_button_name = "Button/Unbutton Jacket"
+	adjust_flavour = "unbutton"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/toggle/owlwings
 	name = "owl cloak"
@@ -517,7 +569,7 @@
 	icon_state = "owl_wings"
 	item_state = "owl_wings"
 	body_parts_covered = ARMS
-	armor = list(melee = 5, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite)
 	action_button_name = "Toggle Owl Wings"
 	flags = NODROP
@@ -564,7 +616,7 @@
 	permeability_coefficient = 0.01
 	flags = STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS|HEAD
-	armor = list(melee = 100, bullet = 100, laser = 100,energy = 100, bomb = 100, bio = 100, rad = 100)
+	armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 100, bio = 100, rad = 100)
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS | HEAD
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	heat_protection = UPPER_TORSO | LOWER_TORSO|LEGS|FEET|ARMS|HANDS | HEAD
@@ -605,4 +657,4 @@
 			if(user.reagents.get_reagent_amount("syndicate_nanites") < 15)
 				user.reagents.add_reagent("syndicate_nanites", 15)
 	else
-		processing_objects.Remove(src)
\ No newline at end of file
+		processing_objects.Remove(src)
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index 87520f38856..360c9b2915f 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -14,11 +14,11 @@
 	return ..()
 
 /obj/item/clothing/suit/storage/attack_hand(mob/user as mob)
-	if (pockets.handle_attack_hand(user))
+	if(pockets.handle_attack_hand(user))
 		..(user)
 
 /obj/item/clothing/suit/storage/MouseDrop(obj/over_object as obj)
-	if (pockets.handle_mousedrop(usr, over_object))
+	if(pockets.handle_mousedrop(usr, over_object))
 		..(over_object)
 
 /obj/item/clothing/suit/storage/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -47,6 +47,6 @@
 		L += S.return_inv()
 	for(var/obj/item/weapon/gift/G in src)
 		L += G.gift
-		if (istype(G.gift, /obj/item/weapon/storage))
+		if(istype(G.gift, /obj/item/weapon/storage))
 			L += G.gift:return_inv()
 	return L
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 030d8f3773c..2178821e3fa 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -19,7 +19,7 @@
 	permeability_coefficient = 0.50
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher)
-	slowdown = 1.0
+	slowdown = 1
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
@@ -32,7 +32,10 @@
 /obj/item/clothing/suit/fire/firefighter
 	icon_state = "firesuit"
 	item_state = "firefighter"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/suit/fire/heavy
 	name = "firesuit"
@@ -48,6 +51,10 @@
 	icon_state = "atmos_firesuit"
 	item_state = "firesuit_atmos"
 	max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /*
  * Bomb protection
@@ -57,7 +64,7 @@
 	desc = "Use in case of bomb."
 	icon_state = "bombsuit"
 	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR | THICKMATERIAL
-	armor = list(melee = 40, bullet = 0, laser = 20,energy = 10, bomb = 100, bio = 0, rad = 0)
+	armor = list(melee = 20, bullet = 0, laser = 20, energy = 10, bomb = 100, bio = 0, rad = 0)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	cold_protection = HEAD
 	min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
@@ -77,7 +84,7 @@
 	flags = THICKMATERIAL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	slowdown = 2
-	armor = list(melee = 40, bullet = 0, laser = 20,energy = 10, bomb = 100, bio = 0, rad = 0)
+	armor = list(melee = 20, bullet = 0, laser = 20, energy = 10, bomb = 100, bio = 0, rad = 0)
 	flags_inv = HIDEJUMPSUIT|HIDETAIL
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
@@ -85,6 +92,11 @@
 	min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
 	strip_delay = 70
 	put_on_delay = 70
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
+	hide_tail_by_species = list("Vox")
 
 /obj/item/clothing/head/bomb_hood/security
 	icon_state = "bombsuitsec"
@@ -104,7 +116,7 @@
 	icon_state = "rad"
 	desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
 	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR|THICKMATERIAL
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 60, rad = 100)
 	strip_delay = 60
 	put_on_delay = 60
 
@@ -120,7 +132,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 1.5
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 60, rad = 100)
 	flags_inv = HIDEJUMPSUIT|HIDETAIL
 	strip_delay = 60
 	put_on_delay = 60
\ No newline at end of file
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 21fbbec640d..a8e44f2c363 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -6,7 +6,7 @@
 	item_state = ""	//no inhands
 	item_color = "bluetie"
 	slot_flags = SLOT_TIE
-	w_class = 2.0
+	w_class = 2
 	var/slot = "decor"
 	var/obj/item/clothing/under/has_suit = null		//the suit the tie may be attached to
 	var/image/inv_overlay = null	//overlay used when attached to clothing.
@@ -90,6 +90,10 @@
 	icon_state = "waistcoat"
 	item_state = "waistcoat"
 	item_color = "waistcoat"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/accessory/stethoscope
 	name = "stethoscope"
@@ -232,7 +236,7 @@
 	..()
 
 /obj/item/clothing/accessory/holobadge/emag_act(user as mob)
-	if (emagged)
+	if(emagged)
 		to_chat(user, "\red [src] is already cracked.")
 		return
 	else
@@ -420,15 +424,15 @@
 		return
 	var/list/A = U.accessories
 	var/total = A.len
-	if (total == 1)
+	if(total == 1)
 		return "\a [A[1]]"
-	else if (total == 2)
+	else if(total == 2)
 		return "\a [A[1]] and \a [A[2]]"
 	else
 		var/output = ""
 		var/index = 1
 		var/comma_text = ", "
-		while (index < total)
+		while(index < total)
 			output += "\a [A[index]][comma_text]"
 			index++
 
diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index cc0e47a9563..d792c5df7ac 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -7,7 +7,7 @@
 	var/holster_allow = /obj/item/weapon/gun
 	var/obj/item/weapon/gun/holstered = null
 	action_button_name = "Holster"
-	w_class = 3.0 // so it doesn't fit in pockets
+	w_class = 3 // so it doesn't fit in pockets
 
 //subtypes can override this to specify what can be holstered
 /obj/item/clothing/accessory/holster/proc/can_holster(obj/item/weapon/gun/W)
@@ -67,8 +67,8 @@
 		holstered = null
 
 /obj/item/clothing/accessory/holster/attack_hand(mob/user as mob)
-	if (has_suit)	//if we are part of a suit
-		if (holstered)
+	if(has_suit)	//if we are part of a suit
+		if(holstered)
 			unholster(user)
 		return
 
@@ -78,13 +78,13 @@
 	holster(W, user)
 
 /obj/item/clothing/accessory/holster/emp_act(severity)
-	if (holstered)
+	if(holstered)
 		holstered.emp_act(severity)
 	..()
 
 /obj/item/clothing/accessory/holster/examine(mob/user)
 	..(user)
-	if (holstered)
+	if(holstered)
 		to_chat(user, "A [holstered] is holstered here.")
 	else
 		to_chat(user, "It is empty.")
@@ -106,14 +106,14 @@
 	if(usr.stat) return
 
 	var/obj/item/clothing/accessory/holster/H = null
-	if (istype(src, /obj/item/clothing/accessory/holster))
+	if(istype(src, /obj/item/clothing/accessory/holster))
 		H = src
-	else if (istype(src, /obj/item/clothing/under))
+	else if(istype(src, /obj/item/clothing/under))
 		var/obj/item/clothing/under/S = src
-		if (S.accessories.len)
+		if(S.accessories.len)
 			H = locate() in S.accessories
 
-	if (!H)
+	if(!H)
 		to_chat(usr, "<span class='warning'>Something is very wrong.</span>")
 
 	if(!H.holstered)
diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm
index 4c5997d3330..1848d8fdfb7 100644
--- a/code/modules/clothing/under/accessories/storage.dm
+++ b/code/modules/clothing/under/accessories/storage.dm
@@ -7,7 +7,7 @@
 	var/slots = 3
 	var/obj/item/weapon/storage/internal/hold
 	action_button_name = "View Storage"
-	w_class = 3.0 // so it doesn't fit in pockets
+	w_class = 3 // so it doesn't fit in pockets
 
 /obj/item/clothing/accessory/storage/New()
 	..()
@@ -15,18 +15,18 @@
 	hold.storage_slots = slots
 
 /obj/item/clothing/accessory/storage/attack_hand(mob/user as mob)
-	if (has_suit)	//if we are part of a suit
+	if(has_suit)	//if we are part of a suit
 		hold.open(user)
 		return
 
-	if (hold.handle_attack_hand(user))	//otherwise interact as a regular storage item
+	if(hold.handle_attack_hand(user))	//otherwise interact as a regular storage item
 		..(user)
 
 /obj/item/clothing/accessory/storage/MouseDrop(obj/over_object as obj)
-	if (has_suit)
+	if(has_suit)
 		return
 
-	if (hold.handle_mousedrop(usr, over_object))
+	if(hold.handle_mousedrop(usr, over_object))
 		..(over_object)
 
 /obj/item/clothing/accessory/storage/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -54,12 +54,12 @@
 		L += S.return_inv()
 	for(var/obj/item/weapon/gift/G in src)
 		L += G.gift
-		if (istype(G.gift, /obj/item/weapon/storage))
+		if(istype(G.gift, /obj/item/weapon/storage))
 			L += G.gift:return_inv()
 	return L
 
 /obj/item/clothing/accessory/storage/attack_self(mob/user as mob)
-	if (has_suit)	//if we are part of a suit
+	if(has_suit)	//if we are part of a suit
 		hold.open(user)
 	else
 		to_chat(user, "<span class='notice'>You empty [src].</span>")
@@ -74,6 +74,10 @@
 	desc = "Sturdy mess of synthcotton belts and buckles, ready to share your burden."
 	icon_state = "webbing"
 	item_color = "webbing"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/accessory/storage/black_vest
 	name = "black webbing vest"
diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm
index a2496168b5f..cf74d17de05 100644
--- a/code/modules/clothing/under/chameleon.dm
+++ b/code/modules/clothing/under/chameleon.dm
@@ -7,6 +7,7 @@
 	desc = "It's a plain jumpsuit. It seems to have a small dial on the wrist."
 	origin_tech = "syndicate=3"
 	var/list/clothing_choices = list()
+	armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 	New()
 		..()
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index e0386585f26..886d48932aa 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -16,7 +16,7 @@
 	icon_state = "black"
 	item_state = "bl_suit"
 	item_color = "black"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/blackf
 	name = "feminine black jumpsuit"
@@ -30,17 +30,18 @@
 	icon_state = "blue"
 	item_state = "b_suit"
 	item_color = "blue"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/blue/dodgeball
-	flags = ONESIZEFITSALL | NODROP
+	flags = NODROP
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/green
 	name = "green jumpsuit"
 	icon_state = "green"
 	item_state = "g_suit"
 	item_color = "green"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
@@ -48,10 +49,19 @@
 	icon_state = "grey"
 	item_state = "gy_suit"
 	item_color = "grey"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/grey/greytide
-	flags = ONESIZEFITSALL | NODROP
+	flags = NODROP
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/color/grey/glorf
+	name = "ancient jumpsuit"
+	desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade."
+
+/obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner)
+	owner.forcesay(hit_appends)
+	return 0
 
 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
@@ -59,7 +69,7 @@
 	icon_state = "orange"
 	item_state = "o_suit"
 	item_color = "orange"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/orange/prison
 	name = "orange jumpsuit"
@@ -69,7 +79,7 @@
 	item_color = "orange"
 	has_sensor = 2
 	sensor_mode = 3
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/pink
 	name = "pink jumpsuit"
@@ -77,31 +87,32 @@
 	icon_state = "pink"
 	item_state = "p_suit"
 	item_color = "pink"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/red
 	name = "red jumpsuit"
 	icon_state = "red"
 	item_state = "r_suit"
 	item_color = "red"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/red/dodgeball
-	flags = ONESIZEFITSALL | NODROP
+	flags = NODROP
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
 	icon_state = "white"
 	item_state = "w_suit"
 	item_color = "white"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/yellow
 	name = "yellow jumpsuit"
 	icon_state = "yellow"
 	item_state = "y_suit"
 	item_color = "yellow"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/psyche
 	name = "psychedelic jumpsuit"
@@ -122,7 +133,7 @@
 	name = "aqua jumpsuit"
 	icon_state = "aqua"
 	item_color = "aqua"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/purple
 	name = "purple jumpsuit"
@@ -149,7 +160,7 @@
 	name = "light brown jumpsuit"
 	icon_state = "lightbrown"
 	item_color = "lightbrown"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/brown
 	name = "brown jumpsuit"
@@ -165,7 +176,7 @@
 	name = "dark blue jumpsuit"
 	icon_state = "darkblue"
 	item_color = "darkblue"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/lightred
 	name = "light red jumpsuit"
@@ -176,7 +187,7 @@
 	name = "dark red jumpsuit"
 	icon_state = "darkred"
 	item_color = "darkred"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/red/jersey
 	name = "red team jersey"
@@ -184,7 +195,7 @@
 	icon_state = "redjersey"
 	item_state = "r_suit"
 	item_color = "redjersey"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/color/blue/jersey
 	name = "blue team jersey"
@@ -192,4 +203,4 @@
 	icon_state = "bluejersey"
 	item_state = "b_suit"
 	item_color = "bluejersey"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 78d9428d4b2..68307875b1b 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -6,7 +6,7 @@
 	icon_state = "ba_suit"
 	item_state = "ba_suit"
 	item_color = "ba_suit"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
 	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
@@ -14,7 +14,7 @@
 	icon_state = "captain"
 	item_state = "caparmor"
 	item_color = "captain"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/cargo
 	name = "quartermaster's jumpsuit"
@@ -22,8 +22,15 @@
 	icon_state = "qm"
 	item_state = "lb_suit"
 	item_color = "qm"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
+/obj/item/clothing/under/rank/cargo/skirt
+	name = "quartermaster's jumpskirt"
+	desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
+	icon_state = "qmf"
+	item_color = "qmf"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	flags_size = null
 
 /obj/item/clothing/under/rank/cargotech
 	name = "cargo technician's jumpsuit"
@@ -31,8 +38,14 @@
 	icon_state = "cargotech"
 	item_state = "lb_suit"
 	item_color = "cargo"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
+/obj/item/clothing/under/rank/cargotech/skirt
+	name = "cargo technician's jumpskirt"
+	desc = "Skirrrrrts! They're comfy and easy to wear!"
+	icon_state = "cargof"
+	item_color = "cargof"
+	flags_size = null
 
 /obj/item/clothing/under/rank/chaplain
 	desc = "It's a black jumpsuit, often worn by religious folk."
@@ -40,14 +53,14 @@
 	icon_state = "chaplain"
 	item_state = "bl_suit"
 	item_color = "chapblack"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/chef
 	desc = "It's an apron which is given only to the most <b>hardcore</b> chefs in space."
 	name = "chef's uniform"
 	icon_state = "chef"
 	item_color = "chef"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/clown
 	name = "clown suit"
@@ -55,8 +68,11 @@
 	icon_state = "clown"
 	item_state = "clown"
 	item_color = "clown"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
+/obj/item/clothing/under/rank/clown/hit_reaction()
+	playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
+	return 0
 
 /obj/item/clothing/under/rank/head_of_personnel
 	desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
@@ -64,7 +80,7 @@
 	icon_state = "hop"
 	item_state = "b_suit"
 	item_color = "hop"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/head_of_personnel_whimsy
 	desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
@@ -81,7 +97,7 @@
 	item_state = "g_suit"
 	item_color = "hydroponics"
 	permeability_coefficient = 0.50
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/internalaffairs
 	desc = "The plain, professional attire of an Internal Affairs Agent. The collar is <i>immaculately</i> starched."
@@ -89,7 +105,7 @@
 	icon_state = "internalaffairs"
 	item_state = "internalaffairs"
 	item_color = "internalaffairs"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/ntrep
 	desc = "A well-ironed dress shirt and matching set of black pants."
@@ -97,21 +113,21 @@
 	icon_state = "internalaffairs"
 	item_state = "internalaffairs"
 	item_color = "internalaffairs"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/janitor
 	desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
 	name = "janitor's jumpsuit"
 	icon_state = "janitor"
 	item_color = "janitor"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 
 /obj/item/clothing/under/lawyer
 	desc = "Slick threads."
 	name = "Lawyer suit"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/lawyer/black
 	icon_state = "lawyer_black"
@@ -160,7 +176,7 @@
 	icon_state = "red_suit"
 	item_state = "red_suit"
 	item_color = "red_suit"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/mime
 	name = "mime's outfit"
@@ -168,7 +184,7 @@
 	icon_state = "mime"
 	item_state = "mime"
 	item_color = "mime"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 
 /obj/item/clothing/under/rank/miner
@@ -177,7 +193,7 @@
 	icon_state = "miner"
 	item_state = "miner"
 	item_color = "miner"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/barber
 	desc = "It's a barber's uniform."
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
index 4b91e82b2fc..9b604da7277 100644
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ b/code/modules/clothing/under/jobs/engineering.dm
@@ -5,8 +5,16 @@
 	icon_state = "chiefengineer"
 	item_state = "g_suit"
 	item_color = "chief"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/chief_engineer/skirt
+	desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
+	name = "chief engineer's jumpskirt"
+	icon_state = "chieff"
+	item_color = "chieff"
+	flags_size = null
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/rank/atmospheric_technician
 	desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -14,7 +22,15 @@
 	icon_state = "atmos"
 	item_state = "atmos_suit"
 	item_color = "atmos"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/atmospheric_technician/skirt
+	desc = "It's a jumpskirt worn by atmospheric technicians."
+	name = "atmospheric technician's jumpskirt"
+	icon_state = "atmosf"
+	item_color = "atmosf"
+	flags_size = null
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/rank/engineer
 	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
@@ -22,8 +38,17 @@
 	icon_state = "engine"
 	item_state = "engi_suit"
 	item_color = "engine"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
+	flags_size = ONESIZEFITSALL
+
+
+/obj/item/clothing/under/rank/engineer/skirt
+	desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding."
+	name = "engineer's jumpskirt"
+	icon_state = "enginef"
+	item_color = "enginef"
+	flags_size = null
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/rank/roboticist
 	desc = "It's a slimming black with reinforced seams; great for industrial work."
@@ -31,7 +56,14 @@
 	icon_state = "robotics"
 	item_state = "robotics"
 	item_color = "robotics"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/roboticist/skirt
+	desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work."
+	name = "roboticist's jumpskirt"
+	icon_state = "roboticsf"
+	item_color = "roboticsf"
+	flags_size = null
 
 /obj/item/clothing/under/rank/mechanic
 	desc = "It's a pair of overalls worn by mechanics."
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index b6f83e78beb..a4f4f3c8b9f 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -7,8 +7,8 @@
 	icon_state = "director"
 	item_state = "g_suit"
 	item_color = "director"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/scientist
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
@@ -17,8 +17,15 @@
 	item_state = "w_suit"
 	item_color = "toxinswhite"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/scientist/skirt
+	name = "scientist's jumpskirt"
+	icon_state = "sciencewhitef"
+	item_color = "sciencewhitef"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	flags_size = null
 
 /obj/item/clothing/under/rank/chemist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
@@ -27,8 +34,15 @@
 	item_state = "w_suit"
 	item_color = "chemistrywhite"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/chemist/skirt
+	name = "chemist's jumpskirt"
+	icon_state = "chemistrywhitef"
+	item_color = "chemistrywhitef"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	flags_size = null
 
 /*
  * Medical
@@ -40,8 +54,16 @@
 	item_state = "w_suit"
 	item_color = "cmo"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/chief_medical_officer/skirt
+	desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
+	name = "chief medical officer's jumpskirt"
+	icon_state = "cmof"
+	item_color = "cmof"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	flags_size = null
 
 /obj/item/clothing/under/rank/geneticist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
@@ -50,8 +72,15 @@
 	item_state = "w_suit"
 	item_color = "geneticswhite"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/geneticist/skirt
+	name = "geneticist's jumpskirt"
+	icon_state = "geneticswhitef"
+	item_color = "geneticswhitef"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	flags_size = null
 
 /obj/item/clothing/under/rank/virologist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
@@ -60,8 +89,15 @@
 	item_state = "w_suit"
 	item_color = "virologywhite"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/virologist/skirt
+	name = "virologist's jumpskirt"
+	icon_state = "virologywhitef"
+	item_color = "virologywhitef"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	flags_size = null
 
 /obj/item/clothing/under/rank/nursesuit
 	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
@@ -70,8 +106,8 @@
 	item_state = "nursesuit"
 	item_color = "nursesuit"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/nurse
 	desc = "A dress commonly worn by the nursing staff in the medical department."
@@ -80,8 +116,8 @@
 	item_state = "nurse"
 	item_color = "nurse"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/orderly
 	desc = "A white suit to be worn by orderly people who love orderly things."
@@ -90,8 +126,8 @@
 	item_state = "orderly"
 	item_color = "orderly"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/medical
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
@@ -100,36 +136,43 @@
 	item_state = "w_suit"
 	item_color = "medical"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/medical/skirt
+	name = "medical doctor's jumpskirt"
+	icon_state = "medicalf"
+	item_color = "medicalf"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	flags_size = null
 
 /obj/item/clothing/under/rank/medical/blue
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
 	icon_state = "scrubsblue"
 	item_color = "scrubsblue"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/medical/green
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
 	icon_state = "scrubsgreen"
 	item_color = "scrubsgreen"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/medical/purple
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
 	icon_state = "scrubspurple"
 	item_color = "scrubspurple"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/medical/mortician
 	name = "coroner's scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is as dark as an emo's poetry."
 	icon_state = "scrubsblack"
 	item_color = "scrubsblack"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 //paramedic
 /obj/item/clothing/under/rank/medical/paramedic
@@ -139,8 +182,8 @@
 	item_state = "paramedic"
 	item_color = "paramedic"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/psych
 	desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
@@ -148,7 +191,7 @@
 	icon_state = "psych"
 	item_state = "w_suit"
 	item_color = "psych"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/psych/turtleneck
 	desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
@@ -156,7 +199,7 @@
 	icon_state = "psychturtle"
 	item_state = "b_suit"
 	item_color = "psychturtle"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 
 /*
@@ -169,8 +212,8 @@
 	item_state = "w_suit"
 	item_color = "genetics_new"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/chemist_new
 	desc = "It's made of a special fiber which provides minor protection against biohazards."
@@ -179,8 +222,8 @@
 	item_state = "w_suit"
 	item_color = "chemist_new"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/scientist_new
 	desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
@@ -189,8 +232,8 @@
 	item_state = "w_suit"
 	item_color = "scientist_new"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/virologist_new
 	desc = "Made of a special fiber that gives increased protection against biohazards."
@@ -199,5 +242,5 @@
 	item_state = "w_suit"
 	item_color = "virologist_new"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index d40952e2030..71eb07c89eb 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -15,28 +15,44 @@
 	icon_state = "warden"
 	item_state = "r_suit"
 	item_color = "warden"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
 	strip_delay = 50
 
+/obj/item/clothing/under/rank/warden/skirt
+	desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders."
+	name = "warden's jumpskirt"
+	icon_state = "wardenf"
+	item_state = "r_suit"
+	item_color = "wardenf"
+	flags_size = null
+
 /obj/item/clothing/under/rank/security
 	name = "security officer's jumpsuit"
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
 	icon_state = "security"
 	item_state = "r_suit"
 	item_color = "secred"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
 	strip_delay = 50
 
+/obj/item/clothing/under/rank/security/skirt
+	name = "security officer's jumpskirt"
+	desc = "Standard feminine fashion for Security Officers.  It's made of sturdier material than the standard jumpskirts."
+	icon_state = "secredf"
+	item_state = "r_suit"
+	item_color = "secredf"
+	flags_size = null
+
 /obj/item/clothing/under/rank/dispatch
 	name = "dispatcher's uniform"
 	desc = "A dress shirt and khakis with a security patch sewn on."
 	icon_state = "dispatch"
 	item_state = "dispatch"
 	item_color = "dispatch"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/security2
 	name = "security officer's uniform"
@@ -44,8 +60,9 @@
 	icon_state = "redshirt2"
 	item_state = "r_suit"
 	item_color = "redshirt2"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
+
 /obj/item/clothing/under/rank/security/corp
 	icon_state = "sec_corporate"
 	item_state = "sec_corporate"
@@ -65,8 +82,8 @@
 	icon_state = "detective"
 	item_state = "det"
 	item_color = "detective"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
 	strip_delay = 50
 	species_fit = list("Vox")
 	sprite_sheets = list(
@@ -82,10 +99,18 @@
 	icon_state = "hos"
 	item_state = "r_suit"
 	item_color = "hosred"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = ONESIZEFITSALL
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	flags_size = ONESIZEFITSALL
 	strip_delay = 60
 
+/obj/item/clothing/under/rank/head_of_security/skirt
+	desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
+	name = "head of security's jumpskirt"
+	icon_state = "hosredf"
+	item_state = "r_suit"
+	item_color = "hosredf"
+	flags_size = null
+
 /obj/item/clothing/under/rank/head_of_security/corp
 	icon_state = "hos_corporate"
 	item_state = "hos_corporate"
@@ -98,7 +123,7 @@
 	icon_state = "jensen"
 	item_state = "jensen"
 	item_color = "jensen"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 //Paradise Station
 
@@ -154,5 +179,5 @@
 	item_state = "brig_phys"
 	item_color = "brig_phys"
 	permeability_coefficient = 0.50
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = ONESIZEFITSALL
\ No newline at end of file
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	flags_size = ONESIZEFITSALL
\ No newline at end of file
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 9533d7c4aae..d912a2e289d 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -88,7 +88,7 @@
 	item_state = "g_suit"
 	item_color = "officer"
 	displays_id = 0
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/centcom/captain
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain\" and bears \"N.C.V. Fearless CV-286\" on the left shounder."
@@ -105,7 +105,7 @@
 	item_state = "g_suit"
 	item_color = "officer"
 	displays_id = 0
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/centcom/representative
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears \"N.S.S. Cyberiad\" on the left shounder."
@@ -114,7 +114,7 @@
 	item_state = "g_suit"
 	item_color = "officer"
 	displays_id = 0
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/centcom/diplomatic
 	desc = "A very gaudy and official looking uniform of the Nanotrasen Diplomatic Corps."
@@ -130,7 +130,7 @@
 	icon_state = "ert_uniform"
 	item_state = "bl_suit"
 	item_color = "ert_uniform"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/space
 	name = "\improper NASA jumpsuit"
@@ -156,7 +156,7 @@
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS|HEAD
-	armor = list(melee = 100, bullet = 100, laser = 100,energy = 100, bomb = 100, bio = 100, rad = 100)
+	armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 100, bio = 100, rad = 100)
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS | HEAD
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	heat_protection = UPPER_TORSO | LOWER_TORSO|LEGS|FEET|ARMS|HANDS | HEAD
@@ -231,7 +231,7 @@
 	icon_state = "red_suit"
 	item_state = "r_suit"
 	item_color = "red_suit"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 
 /obj/item/clothing/under/suit_jacket/navy
 	name = "navy suit"
@@ -568,7 +568,7 @@
 	icon_state = "vengine"
 	item_state = "vengine"
 	item_color = "vengine"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
 
 /obj/item/clothing/under/vox_sec
 	name = "Vox Security Jumpsuit"
@@ -576,7 +576,7 @@
 	icon_state = "vred"
 	item_state = "vred"
 	item_color = "vred"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/vox_chem
 	name = "Vox Chemist Jumpsuit"
@@ -584,7 +584,7 @@
 	icon_state = "vchem"
 	item_state = "vchem"
 	item_color = "vchem"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/psyjump
 	name = "Psychic Amp Jumpsuit"
@@ -709,3 +709,15 @@
 			to_chat(user,"<span class='warning'>You can't fit inside while wearing that \the [user.get_item_by_slot(slot_id)].</span>")
 			return 0
 	return 1
+
+/obj/item/clothing/under/cursedclown
+	name = "cursed clown suit"
+	desc = "It wasn't already?"
+	icon = 'icons/goonstation/objects/clothing/uniform.dmi'
+	icon_state = "cursedclown"
+	item_state = "cclown_uniform"
+	item_color = "cursedclown"
+	icon_override = 'icons/goonstation/mob/clothing/uniform.dmi'
+	lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
+	righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
+	flags = NODROP
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index 8beff8f41f3..e39691d857f 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -86,4 +86,4 @@
 	desc = "For those brave enough to weather the breeze."
 	icon_state = "chaps"
 	item_color = "chaps"
-	flags = ONESIZEFITSALL
\ No newline at end of file
+	flags_size = ONESIZEFITSALL
\ No newline at end of file
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index cfe317aaa3b..011f6784362 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -5,7 +5,7 @@
 	item_state = "bl_suit"
 	item_color = "syndicate"
 	has_sensor = 0
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/syndicate/combat
 	name = "combat turtleneck"
diff --git a/code/modules/computer3/buildandrepair.dm b/code/modules/computer3/buildandrepair.dm
index 4ea984d15d1..2165205e354 100644
--- a/code/modules/computer3/buildandrepair.dm
+++ b/code/modules/computer3/buildandrepair.dm
@@ -2,7 +2,7 @@
 /obj/item/part/computer/circuitboard
 	density = 0
 	anchored = 0
-	w_class = 2.0
+	w_class = 2
 	name = "Circuit board"
 	icon = 'icons/obj/module.dmi'
 	icon_state = "id_mod"
diff --git a/code/modules/computer3/component.dm b/code/modules/computer3/component.dm
index 6dac7aebb31..0070c057fcd 100644
--- a/code/modules/computer3/component.dm
+++ b/code/modules/computer3/component.dm
@@ -14,7 +14,7 @@
 	gender = PLURAL
 	icon = 'icons/obj/stock_parts.dmi'
 	icon_state = "hdd1"
-	w_class = 2.0
+	w_class = 2
 
 	var/emagged = 0
 	crit_fail = 0
@@ -116,9 +116,9 @@
 			if(3)
 				if(equip_to_reader(card, L))
 					to_chat(usr, "You insert the card into reader slot")
-				else if (equip_to_writer(card, L) && dualslot)
+				else if(equip_to_writer(card, L) && dualslot)
 					to_chat(usr, "You insert the card into writer slot")
-				else if (dualslot)
+				else if(dualslot)
 					to_chat(usr, "There is already something in both slots.")
 				else
 					to_chat(usr, "There is already something in the reader slot.")
@@ -146,18 +146,18 @@
 		var/mob/living/L = usr
 		switch(slot)
 			if(1)
-				if (remove_reader(L))
+				if(remove_reader(L))
 					to_chat(L, "You remove the card from reader slot")
 				else
 					to_chat(L, "There is no card in the reader slot")
 			if(2)
-				if (remove_writer(L))
+				if(remove_writer(L))
 					to_chat(L, "You remove the card from writer slot")
 				else
 					to_chat(L, "There is no card in the writer slot")
 			if(3)
-				if (remove_reader(L))
-					if (remove_writer(L))
+				if(remove_reader(L))
+					if(remove_writer(L))
 						to_chat(L, "You remove cards from both slots")
 					else
 						to_chat(L, "You remove the card from reader slot")
@@ -167,10 +167,10 @@
 					else
 						to_chat(L, "There are no cards in both slots")
 			if(4)
-				if (!remove_reader(L))
-					if (remove_writer(L))
+				if(!remove_reader(L))
+					if(remove_writer(L))
 						to_chat(L, "You remove the card from writer slot")
-					else if (!dualslot)
+					else if(!dualslot)
 						to_chat(L, "There is no card in the reader slot")
 					else
 						to_chat(L, "There are no cards in both slots")
diff --git a/code/modules/computer3/computer.dm b/code/modules/computer3/computer.dm
index 75252b33107..eca1207c692 100644
--- a/code/modules/computer3/computer.dm
+++ b/code/modules/computer3/computer.dm
@@ -212,15 +212,15 @@
 				qdel(src)
 				return
 			if(2.0)
-				if (prob(25))
+				if(prob(25))
 					qdel(src)
 					return
-				if (prob(50))
+				if(prob(50))
 					for(var/x in verbs)
 						verbs -= x
 					set_broken()
 			if(3.0)
-				if (prob(25))
+				if(prob(25))
 					for(var/x in verbs)
 						verbs -= x
 					set_broken()
@@ -229,7 +229,7 @@
 
 
 	blob_act()
-		if (prob(75))
+		if(prob(75))
 			set_broken()
 			density = 0
 
@@ -443,7 +443,7 @@
 
 	//Returns percentage of battery charge remaining. Returns -1 if no battery is installed.
 	proc/check_battery_status()
-		if (battery)
+		if(battery)
 			var/obj/item/weapon/stock_parts/cell/B = battery
 			return round(B.charge / (B.maxcharge / 100))
 		else
diff --git a/code/modules/computer3/computers/aifixer.dm b/code/modules/computer3/computers/aifixer.dm
index a52e40a0d54..7e1f3959e9f 100644
--- a/code/modules/computer3/computers/aifixer.dm
+++ b/code/modules/computer3/computers/aifixer.dm
@@ -19,7 +19,7 @@
 		if(!computer.cradle.occupant)
 			overlay.icon_state = "ai-fixer-empty"
 		else
-			if (computer.cradle.occupant.health >= 0 && computer.cradle.occupant.stat != 2)
+			if(computer.cradle.occupant.health >= 0 && computer.cradle.occupant.stat != 2)
 				overlay.icon_state = "ai-fixer-full"
 			else
 				overlay.icon_state = "ai-fixer-404"
@@ -39,34 +39,34 @@
 
 	proc/aifixer_menu()
 		var/dat = ""
-		if (computer.cradle.occupant)
+		if(computer.cradle.occupant)
 			var/laws
 			dat += "<h3>Stored AI: [computer.cradle.occupant.name]</h3>"
 			dat += "<b>System integrity:</b> [(computer.cradle.occupant.health+100)/2]%<br>"
 
-			if (computer.cradle.occupant.laws.zeroth)
+			if(computer.cradle.occupant.laws.zeroth)
 				laws += "<b>0:</b> [computer.cradle.occupant.laws.zeroth]<BR>"
 
 			var/number = 1
-			for (var/index = 1, index <= computer.cradle.occupant.laws.inherent.len, index++)
+			for(var/index = 1, index <= computer.cradle.occupant.laws.inherent.len, index++)
 				var/law = computer.cradle.occupant.laws.inherent[index]
-				if (length(law) > 0)
+				if(length(law) > 0)
 					laws += "<b>[number]:</b> [law]<BR>"
 					number++
 
-			for (var/index = 1, index <= computer.cradle.occupant.laws.supplied.len, index++)
+			for(var/index = 1, index <= computer.cradle.occupant.laws.supplied.len, index++)
 				var/law = computer.cradle.occupant.laws.supplied[index]
-				if (length(law) > 0)
+				if(length(law) > 0)
 					laws += "<b>[number]:</b> [law]<BR>"
 					number++
 
 			dat += "<b>Laws:</b><br>[laws]<br>"
 
-			if (computer.cradle.occupant.stat == 2)
+			if(computer.cradle.occupant.stat == 2)
 				dat += "<span class='bad'>AI non-functional</span>"
 			else
 				dat += "<span class='good'>AI functional</span>"
-			if (!computer.cradle.busy)
+			if(!computer.cradle.busy)
 				dat += "<br><br>[topic_link(src,"fix","Begin Reconstruction")]"
 			else
 				dat += "<br><br>Reconstruction in process, please wait.<br>"
@@ -77,7 +77,7 @@
 		if(!interactable() || !computer.cradle || ..(href,href_list))
 			return
 
-		if ("fix" in href_list)
+		if("fix" in href_list)
 			var/mob/living/silicon/ai/occupant = computer.cradle.occupant
 			if(!occupant) return
 
@@ -85,7 +85,7 @@
 			computer.overlays += image('icons/obj/computer.dmi', "ai-fixer-on")
 
 			var/i = 0
-			while (occupant.health < 100)
+			while(occupant.health < 100)
 				if(!computer || (computer.stat&~MAINT)) // takes some time, keep checking
 					break
 
@@ -94,7 +94,7 @@
 				occupant.adjustToxLoss(-1)
 				occupant.adjustBruteLoss(-1)
 				occupant.updatehealth()
-				if (occupant.health >= 0 && computer.cradle.occupant.stat == 2)
+				if(occupant.health >= 0 && computer.cradle.occupant.stat == 2)
 					occupant.stat = 0
 					occupant.lying = 0
 					dead_mob_list -= occupant
diff --git a/code/modules/computer3/computers/arcade.dm b/code/modules/computer3/computers/arcade.dm
index 6949bfff107..29ada5126c3 100644
--- a/code/modules/computer3/computers/arcade.dm
+++ b/code/modules/computer3/computers/arcade.dm
@@ -76,7 +76,7 @@
 	dat += "<br><center><h3>[temp]</h3></center>"
 	dat += "<br><center>Health: [player_hp] | Magic: [player_mp] | Enemy Health: [enemy_hp]</center>"
 
-	if (gameover)
+	if(gameover)
 		dat += "<center><b>[topic_link(src,"newgame","New Game")]"
 	else
 		dat += "<center><b>[topic_link(src,"attack","Attack")] | [topic_link(src,"heal","Heal")] | [topic_link(src,"charge","Recharge Power")]"
@@ -89,8 +89,8 @@
 /datum/file/program/arcade/Topic(href, list/href_list)
 	if(!interactable() || ..(href,href_list))
 		return
-	if (!blocked && !gameover)
-		if ("attack" in href_list)
+	if(!blocked && !gameover)
+		if("attack" in href_list)
 			blocked = 1
 			var/attackamt = rand(2,6)
 			temp = "You attack for [attackamt] damage!"
@@ -102,7 +102,7 @@
 			enemy_hp -= attackamt
 			arcade_action()
 
-		else if ("heal" in href_list)
+		else if("heal" in href_list)
 			blocked = 1
 			var/pointamt = rand(1,3)
 			var/healamt = rand(6,8)
@@ -117,7 +117,7 @@
 			computer.updateUsrDialog()
 			arcade_action()
 
-		else if ("charge" in href_list)
+		else if("charge" in href_list)
 			blocked = 1
 			var/chargeamt = rand(4,7)
 			temp = "You regain [chargeamt] points"
@@ -129,7 +129,7 @@
 			sleep(10)
 			arcade_action()
 
-	if ("newgame" in href_list) //Reset everything
+	if("newgame" in href_list) //Reset everything
 		temp = "New Round"
 		player_hp = 30
 		player_mp = 10
@@ -141,25 +141,25 @@
 
 
 /datum/file/program/arcade/proc/arcade_action()
-	if ((enemy_mp <= 0) || (enemy_hp <= 0))
+	if((enemy_mp <= 0) || (enemy_hp <= 0))
 		if(!gameover)
 			gameover = 1
 			temp = "[enemy_name] has fallen! Rejoice!"
 			if(computer.toybox)
 				computer.toybox.dispense()
 
-	else if ((enemy_mp <= 5) && (prob(70)))
+	else if((enemy_mp <= 5) && (prob(70)))
 		var/stealamt = rand(2,3)
 		temp = "[enemy_name] steals [stealamt] of your power!"
 		player_mp -= stealamt
 
-		if (player_mp <= 0)
+		if(player_mp <= 0)
 			gameover = 1
 			sleep(10)
 			temp = "You have been drained! GAME OVER"
 			feedback_inc("arcade_loss_mana_normal")
 
-	else if ((enemy_hp <= 10) && (enemy_mp > 4))
+	else if((enemy_hp <= 10) && (enemy_mp > 4))
 		temp = "[enemy_name] heals for 4 health!"
 		enemy_hp += 4
 		enemy_mp -= 4
@@ -169,7 +169,7 @@
 		temp = "[enemy_name] attacks for [attackamt] damage!"
 		player_hp -= attackamt
 
-	if ((player_mp <= 0) || (player_hp <= 0))
+	if((player_mp <= 0) || (player_hp <= 0))
 		gameover = 1
 		temp = "You have been crushed! GAME OVER"
 		feedback_inc("arcade_loss_hp_normal")
diff --git a/code/modules/computer3/computers/atmos_alert.dm b/code/modules/computer3/computers/atmos_alert.dm
index 1d834565cac..894286d334b 100644
--- a/code/modules/computer3/computers/atmos_alert.dm
+++ b/code/modules/computer3/computers/atmos_alert.dm
@@ -41,7 +41,7 @@
 		priority_alarms -= zone
 		if(severity=="severe")
 			priority_alarms += zone
-		else if (severity=="minor")
+		else if(severity=="minor")
 			minor_alarms += zone
 		update_icon()
 		return
diff --git a/code/modules/computer3/computers/camera.dm b/code/modules/computer3/computers/camera.dm
index 7cf5fd0439a..cb31379a59f 100644
--- a/code/modules/computer3/computers/camera.dm
+++ b/code/modules/computer3/computers/camera.dm
@@ -181,7 +181,7 @@
 
 	//proc/camera_list(var/datum/file/camnet_key/key)
 	get_machines(var/datum/file/camnet_key/key)
-		if (!computer || computer.z > 6)
+		if(!computer || computer.z > 6)
 			return null
 
 		var/list/L = list()
diff --git a/code/modules/computer3/computers/card.dm b/code/modules/computer3/computers/card.dm
index 978d597144e..1a6fe38a46e 100644
--- a/code/modules/computer3/computers/card.dm
+++ b/code/modules/computer3/computers/card.dm
@@ -181,7 +181,7 @@
 		// assume linked_db since called by interact()
 		var/crew = ""
 		var/list/L = list()
-		for (var/datum/data/record/t in data_core.general)
+		for(var/datum/data/record/t in data_core.general)
 			var/R = t.fields["name"] + " - " + t.fields["rank"]
 			L += R
 		for(var/R in sortList(L))
@@ -269,7 +269,7 @@
 				computer.cardslot.insert(card,1)
 
 		if("print" in href_list)
-			if (printing)
+			if(printing)
 				return
 
 			printing = 1
@@ -277,7 +277,7 @@
 			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( computer.loc )
 			P.info = "<B>Crew Manifest:</B><BR>"
 			var/list/L = list()
-			for (var/datum/data/record/t in data_core.general)
+			for(var/datum/data/record/t in data_core.general)
 				var/R = t.fields["name"] + " - " + t.fields["rank"]
 				L += R
 			for(var/R in sortList(L))
diff --git a/code/modules/computer3/computers/cloning.dm b/code/modules/computer3/computers/cloning.dm
index f90ba3e57e3..73978ad6aed 100644
--- a/code/modules/computer3/computers/cloning.dm
+++ b/code/modules/computer3/computers/cloning.dm
@@ -35,29 +35,29 @@
 			scanner	= locate(/obj/machinery/dna_scannernew) in nearby
 			pod1	= locate(/obj/machinery/clonepod) in nearby
 
-		if (pod1)
+		if(pod1)
 			pod1.connected = src // Some variable the pod needs
 
 	proc/ScanningMenu()
-		if (isnull(scanner))
+		if(isnull(scanner))
 			return "<font class='bad'>ERROR: No Scanner detected!</font><br>"
 
 		var/dat = "<h3>Scanner Functions</h3>"
 		dat += "<div class='statusDisplay'>"
 
-		if (!scanner.occupant)
+		if(!scanner.occupant)
 			dat += "Scanner Unoccupied"
 		else if(loading)
 			dat += "[scanner.occupant] => Scanning..."
 		else
-			if (scanner.occupant.ckey != scantemp_ckey)
+			if(scanner.occupant.ckey != scantemp_ckey)
 				scantemp = "Ready to Scan"
 				scantemp_ckey = scanner.occupant.ckey
 			dat += "[scanner.occupant] => [scantemp]"
 
 		dat += "</div>"
 
-		if (scanner.occupant)
+		if(scanner.occupant)
 			dat += topic_link(src,"scan","Start Scan") + "<br>"
 			if(scanner.locked)
 				dat += topic_link(src,"lock","Unlock Scanner")
@@ -68,12 +68,12 @@
 
 		// Footer
 		dat += "<h3>Database Functions</h3>"
-		if (records.len > 0)
+		if(records.len > 0)
 			dat += topic_link(src,"menu=2","View Records ([records.len])") + "<br>"
 		else
 			dat += fake_link("View Records (0)")
 
-		if (has_disk)
+		if(has_disk)
 			dat += topic_link(src,"eject_disk","Eject Disk") + "<br>"
 		return dat
 
@@ -88,7 +88,7 @@
 		var/dat = "<h3>Selected Record</h3>"
 		to_chat(dat += topic_link(src,"menu=2",", Back") + "<br><br>")
 
-		if (!active_record)
+		if(!active_record)
 			dat += "<font class='bad'>Record not found.</font>"
 		else
 			dat += "<h4>[active_record.fields["name"]]</h4>"
@@ -96,7 +96,7 @@
 
 			var/obj/item/weapon/implant/health/H = locate(active_record.fields["imp"])
 
-			if ((H) && (istype(H)))
+			if((H) && (istype(H)))
 				dat += "<b>Health Implant Data:</b><br />[H.sensehealth()]<br><br />"
 			else
 				dat += "<font class='bad'>Unable to locate Health Implant.</font><br /><br />"
@@ -104,11 +104,11 @@
 			dat += "<b>Unique Identifier:</b><br /><span class='highlight'>[active_record.fields["UI"]]</span><br>"
 			dat += "<b>Structural Enzymes:</b><br /><span class='highlight'>[active_record.fields["SE"]]</span><br>"
 
-			if (has_disk)
+			if(has_disk)
 				dat += "<div class='block'>"
 				dat += "<h4>Inserted Disk</h4>"
 				dat += "<b>Contents:</b> "
-				if (computer.floppy.inserted.files.len == 0)
+				if(computer.floppy.inserted.files.len == 0)
 					dat += "<i>Empty</i>"
 				else
 					for(var/datum/file/data/genome/G in computer.floppy.inserted.files)
@@ -170,9 +170,9 @@
 		if(loading || !interactable())
 			return
 
-		if (href_list["menu"])
+		if(href_list["menu"])
 			menu = text2num(href_list["menu"])
-		else if (("scan" in href_list) && !isnull(scanner))
+		else if(("scan" in href_list) && !isnull(scanner))
 			scantemp = ""
 
 			loading = 1
@@ -186,16 +186,16 @@
 
 
 			//No locking an open scanner.
-		else if (("lock" in href_list) && !isnull(scanner))
-			if ((!scanner.locked) && (scanner.occupant))
+		else if(("lock" in href_list) && !isnull(scanner))
+			if((!scanner.locked) && (scanner.occupant))
 				scanner.locked = 1
 			else
 				scanner.locked = 0
 
-		else if ("view_rec" in href_list)
+		else if("view_rec" in href_list)
 			active_record = locate(href_list["view_rec"])
 			if(istype(active_record,/datum/data/record))
-				if ( !active_record.fields["ckey"] || active_record.fields["ckey"] == "" )
+				if( !active_record.fields["ckey"] || active_record.fields["ckey"] == "" )
 					del(active_record)
 					temp = "<font class='bad'>Record Corrupt</font>"
 				else
@@ -204,16 +204,16 @@
 				active_record = null
 				temp = "Record missing."
 
-		else if ("del_rec" in href_list)
-			if ((!active_record) || (menu < 3))
+		else if("del_rec" in href_list)
+			if((!active_record) || (menu < 3))
 				return
-			if (menu == 3) //If we are viewing a record, confirm deletion
+			if(menu == 3) //If we are viewing a record, confirm deletion
 				temp = "Delete record?"
 				menu = 4
 
-			else if (menu == 4)
+			else if(menu == 4)
 				var/obj/item/weapon/card/id/C = usr.get_active_hand()
-				if (istype(C)||istype(C, /obj/item/device/pda))
+				if(istype(C)||istype(C, /obj/item/device/pda))
 					if(check_access(C))
 						temp = "[active_record.fields["name"]] => Record deleted."
 						records.Remove(active_record)
@@ -222,7 +222,7 @@
 					else
 						temp = "<font class='bad'>Access Denied.</font>"
 
-		else if ("eject_disk" in href_list)
+		else if("eject_disk" in href_list)
 			if(computer.floppy)
 				computer.floppy.eject_disk()
 
@@ -243,7 +243,7 @@
 				if(/datum/file/data/genome/cloning)
 					active_record = G:record
 		else if("savefile" in href_list)
-			if (!active_record || !computer || !computer.floppy)
+			if(!active_record || !computer || !computer.floppy)
 				temp = "<font class='bad'>Save error.</font>"
 				computer.updateUsrDialog()
 				return
@@ -272,10 +272,10 @@
 			if(!rval)
 				temp = "<font class='bad'>Disk write error.</font>"
 
-		else if ("refresh" in href_list)
+		else if("refresh" in href_list)
 			computer.updateUsrDialog()
 
-		else if ("clone" in href_list)
+		else if("clone" in href_list)
 			//Look for that player! They better be dead!
 			if(active_record)
 				//Can't clone without someone to clone.  Or a pod.  Or if the pod is busy. Or full of gibs.
@@ -303,22 +303,22 @@
 		return
 
 	proc/scan_mob(mob/living/carbon/human/subject as mob)
-		if ((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna))
+		if((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna))
 			scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
 			return
-		if (!getbrain(subject))
+		if(!getbrain(subject))
 			scantemp = "<font class='bad'>No signs of intelligence detected.</font>"
 			return
-		if (subject.suiciding == 1)
+		if(subject.suiciding == 1)
 			scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>"
 			return
-		if ((!subject.ckey) || (!subject.client))
+		if((!subject.ckey) || (!subject.client))
 			scantemp = "<font class='bad'>Mental interface failure.</font>"
 			return
-		if (NOCLONE in subject.mutations)
+		if(NOCLONE in subject.mutations)
 			scantemp = "<font class='bad'>Mental interface failure.</font>"
 			return
-		if (!isnull(find_record(subject.ckey)))
+		if(!isnull(find_record(subject.ckey)))
 			scantemp = "<font class='average'>Subject already in database.</font>"
 			return
 
@@ -341,7 +341,7 @@
 
 		//Add an implant if needed
 		var/obj/item/weapon/implant/health/imp = locate(/obj/item/weapon/implant/health, subject)
-		if (isnull(imp))
+		if(isnull(imp))
 			imp = new /obj/item/weapon/implant/health(subject)
 			imp.implanted = subject
 			R.fields["imp"] = "\ref[imp]"
@@ -349,7 +349,7 @@
 		else
 			R.fields["imp"] = "\ref[imp]"
 
-		if (!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning.
+		if(!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning.
 			R.fields["mind"] = "\ref[subject.mind]"
 
 		records += R
@@ -358,6 +358,6 @@
 //Find a specific record by key.
 	proc/find_record(var/find_key)
 		for(var/datum/data/record/R in records)
-			if (R.fields["ckey"] == find_key)
+			if(R.fields["ckey"] == find_key)
 				return R
 		return null
diff --git a/code/modules/computer3/computers/communications.dm b/code/modules/computer3/computers/communications.dm
index 23e3bba3e4b..2f02bdcfdb3 100644
--- a/code/modules/computer3/computers/communications.dm
+++ b/code/modules/computer3/computers/communications.dm
@@ -59,7 +59,7 @@
 	Topic(var/href, var/list/href_list)
 		if(!interactable() || !computer.radio || ..(href,href_list) )
 			return
-		if (!(computer.z in config.station_levels))
+		if(!(computer.z in config.station_levels))
 			to_chat(usr, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
 			return
 
@@ -85,7 +85,7 @@
 			var/obj/item/I = M.get_active_hand()
 			I = I.GetID()
 
-			if (istype(I,/obj/item/weapon/card/id))
+			if(istype(I,/obj/item/weapon/card/id))
 				if(access_captain in I.GetAccess())
 					var/old_level = security_level
 					if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN
@@ -146,7 +146,7 @@
 			state = STATE_MESSAGELIST
 		if("viewmessage" in href_list)
 			state = STATE_VIEWMESSAGE
-			if (!currmsg)
+			if(!currmsg)
 				if(href_list["message-num"])
 					currmsg = text2num(href_list["message-num"])
 				else
@@ -247,7 +247,7 @@
 			aistate = STATE_MESSAGELIST
 		if("ai-viewmessage" in href_list)
 			aistate = STATE_VIEWMESSAGE
-			if (!aicurrmsg)
+			if(!aicurrmsg)
 				if(href_list["message-num"])
 					aicurrmsg = text2num(href_list["message-num"])
 				else
@@ -281,16 +281,16 @@
 
 	proc/main_menu()
 		var/dat = ""
-		if (computer.radio.subspace)
+		if(computer.radio.subspace)
 			if(shuttle_master.emergency.mode == SHUTTLE_CALL)
 				var/timeleft = shuttle_master.emergency.timeLeft()
 				dat += "<B>Emergency shuttle</B>\n<BR>\nETA: [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]"
 				refresh = 1
 			else
 				refresh = 0
-		if (authenticated)
+		if(authenticated)
 			dat += "<BR>\[ <A HREF='?src=\ref[src];logout'>Log Out</A> \]"
-			if (authenticated==2)
+			if(authenticated==2)
 				dat += "<BR>\[ <A HREF='?src=\ref[src];announce'>Make An Announcement</A> \]"
 				if(computer.emagged == 0)
 					dat += "<BR>\[ <A HREF='?src=\ref[src];MessageCentcomm'>Send an emergency message to Centcomm</A> \]"
@@ -300,7 +300,7 @@
 
 				dat += "<BR>\[ <A HREF='?src=\ref[src];changeseclevel'>Change alert level</A> \]"
 			/*if(emergency_shuttle.location())
-				if (emergency_shuttle.online())
+				if(emergency_shuttle.online())
 					dat += "<BR>\[ <A HREF='?src=\ref[src];cancelshuttle'>Cancel Shuttle Call</A> \]"
 				else
 					dat += "<BR>\[ <A HREF='?src=\ref[src];callshuttle'>Call Emergency Shuttle</A> \]"*/
@@ -335,16 +335,16 @@
 				for(var/i = 1; i<=messagetitle.len; i++)
 					dat += "<BR><A HREF='?src=\ref[src];viewmessage;message-num=[i]'>[messagetitle[i]]</A>"
 			if(STATE_VIEWMESSAGE)
-				if (currmsg)
+				if(currmsg)
 					dat += "<B>[messagetitle[currmsg]]</B><BR><BR>[messagetext[currmsg]]"
-					if (authenticated)
+					if(authenticated)
 						dat += "<BR><BR>\[ <A HREF='?src=\ref[src];delmessage'>Delete \]"
 				else
 					state = STATE_MESSAGELIST
 					interact()
 					return
 			if(STATE_DELMESSAGE)
-				if (currmsg)
+				if(currmsg)
 					dat += "Are you sure you want to delete this message? \[ <A HREF='?src=\ref[src];delmessage2'>OK</A> | <A HREF='?src=\ref[src];viewmessage'>Cancel</A> \]"
 				else
 					state = STATE_MESSAGELIST
diff --git a/code/modules/computer3/computers/law.dm b/code/modules/computer3/computers/law.dm
index 71d30df68d6..d75a016f680 100644
--- a/code/modules/computer3/computers/law.dm
+++ b/code/modules/computer3/computers/law.dm
@@ -24,7 +24,7 @@
 
 
 	attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob, params)
-		if (user.z > 6)
+		if(user.z > 6)
 			to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
 			return
 		if(istype(module, /obj/item/weapon/aiModule))
@@ -43,7 +43,7 @@
 
 		src.current = select_active_ai(user)
 
-		if (!src.current)
+		if(!src.current)
 			to_chat(usr, "No active AIs detected.")
 		else
 			to_chat(usr, "[src.current.name] selected for law changes.")
@@ -75,7 +75,7 @@
 
 		src.current = freeborg()
 
-		if (!src.current)
+		if(!src.current)
 			to_chat(usr, "No free cyborgs detected.")
 		else
 			to_chat(usr, "[src.current.name] selected for law changes.")
diff --git a/code/modules/computer3/computers/medical.dm b/code/modules/computer3/computers/medical.dm
index 5d283af5b53..27002c264c2 100644
--- a/code/modules/computer3/computers/medical.dm
+++ b/code/modules/computer3/computers/medical.dm
@@ -49,21 +49,21 @@
 		scan = computer.cardslot.reader
 		if(!interactable())
 			return
-		if (computer.z > 6)
+		if(computer.z > 6)
 			to_chat(usr, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
 			return
 		var/dat
 
-		if (temp)
+		if(temp)
 			dat = text("<TT>[src.temp]</TT><BR><BR><A href='?src=\ref[src];temp=1'>Clear Screen</A>")
 		else
 			dat = text("Confirm Identity (R): <A href='?src=\ref[];cardr=1'>[]</A><HR>", src, (scan ? text("[]", scan.name) : "----------"))
-			if (computer.cardslot.dualslot)
+			if(computer.cardslot.dualslot)
 				dat += text("Check Identity (W): <A href='?src=\ref[];cardw=1'>[]</A><BR>", src, (scan2 ? text("[]", scan2.name) : "----------"))
 				if(scan2 && !scan)
 					dat += text("<div class='notice'>Insert card into reader slot to log in.</div><br>")
 
-			if (src.authenticated)
+			if(src.authenticated)
 				switch(src.screen)
 					if(1.0)
 						dat += {"
@@ -86,12 +86,8 @@
 					if(3.0)
 						dat += text("<B>Records Maintenance</B><HR>\n<A href='?src=\ref[];back=1'>Backup To Disk</A><BR>\n<A href='?src=\ref[];u_load=1'>Upload From disk</A><BR>\n<A href='?src=\ref[];del_all=1'>Delete All Records</A><BR>\n<BR>\n<A href='?src=\ref[];screen=1'>Back</A>", src, src, src, src)
 					if(4.0)
-						var/icon/front = new(active1.fields["photo"], dir = SOUTH)
-						var/icon/side = new(active1.fields["photo"], dir = WEST)
-						usr << browse_rsc(front, "front.png")
-						usr << browse_rsc(side, "side.png")
 						dat += "<CENTER><B>Medical Record</B></CENTER><BR>"
-						if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
+						if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
 							dat += "<table><tr><td>Name: [active1.fields["name"]] \
 									ID: [active1.fields["id"]]<BR>\n	\
 									Sex: <A href='?src=\ref[src];field=sex'>[active1.fields["sex"]]</A><BR>\n	\
@@ -99,10 +95,11 @@
 									Fingerprint: <A href='?src=\ref[src];field=fingerprint'>[active1.fields["fingerprint"]]</A><BR>\n	\
 									Physical Status: <A href='?src=\ref[src];field=p_stat'>[active1.fields["p_stat"]]</A><BR>\n	\
 									Mental Status: <A href='?src=\ref[src];field=m_stat'>[active1.fields["m_stat"]]</A><BR></td><td align = center valign = top> \
-									Photo:<br><img src=front.png height=64 width=64 border=5><img src=side.png height=64 width=64 border=5></td></tr></table>"
+									Photo:<br><img src=[active1.fields["photo-south"]] height=64 width=64 border=5> \
+									<img src=[active1.fields["photo-west"]] height=64 width=64 border=5></td></tr></table>"
 						else
 							dat += "<B>General Record Lost!</B><BR>"
-						if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
+						if((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
 							dat += text("<BR>\n<CENTER><B>Medical Data</B></CENTER><BR>\nBlood Type: <A href='?src=\ref[];field=b_type'>[]</A><BR>\nDNA: <A href='?src=\ref[];field=b_dna'>[]</A><BR>\n<BR>\nMinor Disabilities: <A href='?src=\ref[];field=mi_dis'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=mi_dis_d'>[]</A><BR>\n<BR>\nMajor Disabilities: <A href='?src=\ref[];field=ma_dis'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=ma_dis_d'>[]</A><BR>\n<BR>\nAllergies: <A href='?src=\ref[];field=alg'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=alg_d'>[]</A><BR>\n<BR>\nCurrent Diseases: <A href='?src=\ref[];field=cdi'>[]</A> (per disease info placed in log/comment section)<BR>\nDetails: <A href='?src=\ref[];field=cdi_d'>[]</A><BR>\n<BR>\nImportant Notes:<BR>\n\t<A href='?src=\ref[];field=notes'>[]</A><BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src, src.active2.fields["b_type"], src, src.active2.fields["b_dna"], src, src.active2.fields["mi_dis"], src, src.active2.fields["mi_dis_d"], src, src.active2.fields["ma_dis"], src, src.active2.fields["ma_dis_d"], src, src.active2.fields["alg"], src, src.active2.fields["alg_d"], src, src.active2.fields["cdi"], src, src.active2.fields["cdi_d"], src, decode(src.active2.fields["notes"]))
 							var/counter = 1
 							while(src.active2.fields[text("com_[]", counter)])
@@ -157,16 +154,16 @@
 	Topic(href, href_list)
 		if(!interactable() || !computer.cardslot || ..(href,href_list))
 			return
-		if (!( data_core.general.Find(src.active1) ))
+		if(!( data_core.general.Find(src.active1) ))
 			src.active1 = null
-		if (!( data_core.medical.Find(src.active2) ))
+		if(!( data_core.medical.Find(src.active2) ))
 			src.active2 = null
 
-		if (href_list["temp"])
+		if(href_list["temp"])
 			src.temp = null
 
-		if (href_list["cardr"])
-			if (scan)
+		if(href_list["cardr"])
+			if(scan)
 				if(istype(usr,/mob/living/carbon/human) && !usr.get_active_hand())
 					computer.cardslot.remove(1)
 				else
@@ -174,12 +171,12 @@
 				scan = null
 			else
 				var/obj/item/I = usr.get_active_hand()
-				if (istype(I, /obj/item/weapon/card/id))
+				if(istype(I, /obj/item/weapon/card/id))
 					computer.cardslot.insert(I, 1)
 					scan = I
 
-		if (href_list["cardw"])
-			if (scan2)
+		if(href_list["cardw"])
+			if(scan2)
 				if(istype(usr,/mob/living/carbon/human) && !usr.get_active_hand())
 					computer.cardslot.remove(2)
 				else
@@ -187,26 +184,26 @@
 				scan2 = null
 			else
 				var/obj/item/I = usr.get_active_hand()
-				if (istype(I, /obj/item/weapon/card/id))
+				if(istype(I, /obj/item/weapon/card/id))
 					computer.cardslot.insert(I, 2)
 					scan2 = I
 
-		else if (href_list["logout"])
+		else if(href_list["logout"])
 			src.authenticated = null
 			src.screen = null
 			src.active1 = null
 			src.active2 = null
 
-		else if (href_list["login"])
+		else if(href_list["login"])
 
-			if (istype(usr, /mob/living/silicon/ai))
+			if(istype(usr, /mob/living/silicon/ai))
 				src.active1 = null
 				src.active2 = null
 				src.authenticated = usr.name
 				src.rank = "AI"
 				src.screen = 1
 
-			else if (istype(usr, /mob/living/silicon/robot))
+			else if(istype(usr, /mob/living/silicon/robot))
 				src.active1 = null
 				src.active2 = null
 				src.authenticated = usr.name
@@ -214,16 +211,16 @@
 				src.rank = "[R.modtype] [R.braintype]"
 				src.screen = 1
 
-			else if (istype(src.scan, /obj/item/weapon/card/id))
+			else if(istype(src.scan, /obj/item/weapon/card/id))
 				src.active1 = null
 				src.active2 = null
 
-				if (src.check_access(src.scan))
+				if(src.check_access(src.scan))
 					src.authenticated = src.scan.registered_name
 					src.rank = src.scan.assignment
 					src.screen = 1
 
-		if (src.authenticated)
+		if(src.authenticated)
 
 			if(href_list["screen"])
 				src.screen = text2num(href_list["screen"])
@@ -241,125 +238,125 @@
 				src.temp += "<br><b>Spread:</b> [v.fields["spread type"]] "
 				src.temp += "<br><b>Details:</b><br> <A href='?src=\ref[src];field=vir_desc;edit_vir=\ref[v]'>[v.fields["description"]]</A>"
 
-			if (href_list["del_all"])
+			if(href_list["del_all"])
 				src.temp = text("Are you sure you wish to delete all records?<br>\n\t<A href='?src=\ref[];temp=1;del_all2=1'>Yes</A><br>\n\t<A href='?src=\ref[];temp=1'>No</A><br>", src, src)
 
-			if (href_list["del_all2"])
+			if(href_list["del_all2"])
 				for(var/datum/data/record/R in data_core.medical)
 					//R = null
 					qdel(R)
 					//Foreach goto(494)
 				src.temp = "All records deleted."
 
-			if (href_list["field"])
+			if(href_list["field"])
 				var/a1 = src.active1
 				var/a2 = src.active2
 				switch(href_list["field"])
 					if("fingerprint")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							var/t1 = trim(sanitize(copytext(input("Please input fingerprint hash:", "Med. records", src.active1.fields["fingerprint"], null)  as text,1,MAX_MESSAGE_LEN)))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							src.active1.fields["fingerprint"] = t1
 					if("sex")
-						if (istype(src.active1, /datum/data/record))
-							if (src.active1.fields["sex"] == "Male")
+						if(istype(src.active1, /datum/data/record))
+							if(src.active1.fields["sex"] == "Male")
 								src.active1.fields["sex"] = "Female"
 							else
 								src.active1.fields["sex"] = "Male"
 					if("age")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							var/t1 = input("Please input age:", "Med. records", src.active1.fields["age"], null)  as num
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							src.active1.fields["age"] = t1
 					if("mi_dis")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please input minor disabilities list:", "Med. records", src.active2.fields["mi_dis"], null)  as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["mi_dis"] = t1
 					if("mi_dis_d")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please summarize minor dis.:", "Med. records", src.active2.fields["mi_dis_d"], null)  as message,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["mi_dis_d"] = t1
 					if("ma_dis")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please input major diabilities list:", "Med. records", src.active2.fields["ma_dis"], null) as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["ma_dis"] = t1
 					if("ma_dis_d")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please summarize major dis.:", "Med. records", src.active2.fields["ma_dis_d"], null)  as message,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["ma_dis_d"] = t1
 					if("alg")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please state allergies:", "Med. records", src.active2.fields["alg"], null)  as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["alg"] = t1
 					if("alg_d")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please summarize allergies:", "Med. records", src.active2.fields["alg_d"], null)  as message,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["alg_d"] = t1
 					if("cdi")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please state diseases:", "Med. records", src.active2.fields["cdi"], null)  as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["cdi"] = t1
 					if("cdi_d")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please summarize diseases:", "Med. records", src.active2.fields["cdi_d"], null)  as message,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["cdi_d"] = t1
 					if("notes")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							var/t1 = html_encode(trim(copytext(input("Please summarize notes:", "Med. records", html_decode(src.active2.fields["notes"]), null)  as message,1,MAX_MESSAGE_LEN)))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 								return
 							src.active2.fields["notes"] = t1
 					if("p_stat")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							src.temp = text("<B>Physical Condition:</B><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=deceased'>*Deceased*</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=ssd'>*SSD*</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=active'>Active</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=unfit'>Physically Unfit</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=disabled'>Disabled</A><BR>", src, src, src, src, src)
 					if("m_stat")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							src.temp = text("<B>Mental Condition:</B><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=insane'>*Insane*</A><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=unstable'>*Unstable*</A><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=watch'>*Watch*</A><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=stable'>Stable</A><BR>", src, src, src, src)
 					if("b_type")
-						if (istype(src.active2, /datum/data/record))
+						if(istype(src.active2, /datum/data/record))
 							src.temp = text("<B>Blood Type:</B><BR>\n\t<A href='?src=\ref[];temp=1;b_type=an'>A-</A> <A href='?src=\ref[];temp=1;b_type=ap'>A+</A><BR>\n\t<A href='?src=\ref[];temp=1;b_type=bn'>B-</A> <A href='?src=\ref[];temp=1;b_type=bp'>B+</A><BR>\n\t<A href='?src=\ref[];temp=1;b_type=abn'>AB-</A> <A href='?src=\ref[];temp=1;b_type=abp'>AB+</A><BR>\n\t<A href='?src=\ref[];temp=1;b_type=on'>O-</A> <A href='?src=\ref[];temp=1;b_type=op'>O+</A><BR>", src, src, src, src, src, src, src, src)
 					if("b_dna")
-						if (istype(src.active1, /datum/data/record))
+						if(istype(src.active1, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please input DNA hash:", "Med. records", src.active1.fields["dna"], null)  as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							src.active1.fields["dna"] = t1
 					if("vir_name")
 						var/datum/data/record/v = locate(href_list["edit_vir"])
-						if (v)
+						if(v)
 							var/t1 = sanitize(copytext(input("Please input pathogen name:", "VirusDB", v.fields["name"], null)  as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							v.fields["name"] = t1
 					if("vir_desc")
 						var/datum/data/record/v = locate(href_list["edit_vir"])
-						if (v)
+						if(v)
 							var/t1 = sanitize(copytext(input("Please input information about pathogen:", "VirusDB", v.fields["description"], null)  as message,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							v.fields["description"] = t1
 					else
 
-			if (href_list["p_stat"])
-				if (src.active1)
+			if(href_list["p_stat"])
+				if(src.active1)
 					switch(href_list["p_stat"])
 						if("deceased")
 							src.active1.fields["p_stat"] = "*Deceased*"
@@ -372,8 +369,8 @@
 						if("disabled")
 							src.active1.fields["p_stat"] = "Disabled"
 
-			if (href_list["m_stat"])
-				if (src.active1)
+			if(href_list["m_stat"])
+				if(src.active1)
 					switch(href_list["m_stat"])
 						if("insane")
 							src.active1.fields["m_stat"] = "*Insane*"
@@ -385,8 +382,8 @@
 							src.active1.fields["m_stat"] = "Stable"
 
 
-			if (href_list["b_type"])
-				if (src.active2)
+			if(href_list["b_type"])
+				if(src.active2)
 					switch(href_list["b_type"])
 						if("an")
 							src.active2.fields["b_type"] = "A-"
@@ -406,23 +403,23 @@
 							src.active2.fields["b_type"] = "O+"
 
 
-			if (href_list["del_r"])
-				if (src.active2)
+			if(href_list["del_r"])
+				if(src.active2)
 					src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?<br>\n\t<A href='?src=\ref[];temp=1;del_r2=1'>Yes</A><br>\n\t<A href='?src=\ref[];temp=1'>No</A><br>", src, src)
 
-			if (href_list["del_r2"])
-				if (src.active2)
+			if(href_list["del_r2"])
+				if(src.active2)
 					//src.active2 = null
 					qdel(src.active2)
 
-			if (href_list["d_rec"])
+			if(href_list["d_rec"])
 				var/datum/data/record/R = locate(href_list["d_rec"])
 				var/datum/data/record/M = locate(href_list["d_rec"])
-				if (!( data_core.general.Find(R) ))
+				if(!( data_core.general.Find(R) ))
 					src.temp = "Record Not Found!"
 					return
 				for(var/datum/data/record/E in data_core.medical)
-					if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+					if((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 						M = E
 					else
 						//Foreach continue //goto(2540)
@@ -430,8 +427,8 @@
 				src.active2 = M
 				src.screen = 4
 
-			if (href_list["new"])
-				if ((istype(src.active1, /datum/data/record) && !( istype(src.active2, /datum/data/record) )))
+			if(href_list["new"])
+				if((istype(src.active1, /datum/data/record) && !( istype(src.active2, /datum/data/record) )))
 					var/datum/data/record/R = new /datum/data/record(  )
 					R.fields["name"] = src.active1.fields["name"]
 					R.fields["id"] = src.active1.fields["id"]
@@ -451,63 +448,63 @@
 					src.active2 = R
 					src.screen = 4
 
-			if (href_list["add_c"])
-				if (!( istype(src.active2, /datum/data/record) ))
+			if(href_list["add_c"])
+				if(!( istype(src.active2, /datum/data/record) ))
 					return
 				var/a2 = src.active2
 				var/t1 = sanitize(copytext(input("Add Comment:", "Med. records", null, null)  as message,1,MAX_MESSAGE_LEN))
-				if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
+				if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
 					return
 				var/counter = 1
 				while(src.active2.fields[text("com_[]", counter)])
 					counter++
 				src.active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
 
-			if (href_list["del_c"])
-				if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))
+			if(href_list["del_c"])
+				if((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))
 					src.active2.fields[text("com_[]", href_list["del_c"])] = "<B>Deleted</B>"
 
-			if (href_list["search"])
+			if(href_list["search"])
 				var/t1 = input("Search String: (Name, DNA, or ID)", "Med. records", null, null)  as text
-				if ((!( t1 ) || usr.stat || !( src.authenticated ) || usr.restrained() || ((!interactable()) && (!istype(usr, /mob/living/silicon)))))
+				if((!( t1 ) || usr.stat || !( src.authenticated ) || usr.restrained() || ((!interactable()) && (!istype(usr, /mob/living/silicon)))))
 					return
 				src.active1 = null
 				src.active2 = null
 				t1 = lowertext(t1)
 				for(var/datum/data/record/R in data_core.medical)
-					if ((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])))
+					if((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])))
 						src.active2 = R
 					else
 						//Foreach continue //goto(3229)
-				if (!( src.active2 ))
+				if(!( src.active2 ))
 					src.temp = text("Could not locate record [].", t1)
 				else
 					for(var/datum/data/record/E in data_core.general)
-						if ((E.fields["name"] == src.active2.fields["name"] || E.fields["id"] == src.active2.fields["id"]))
+						if((E.fields["name"] == src.active2.fields["name"] || E.fields["id"] == src.active2.fields["id"]))
 							src.active1 = E
 						else
 							//Foreach continue //goto(3334)
 					src.screen = 4
 
-			if (href_list["print_p"])
-				if (!( src.printing ))
+			if(href_list["print_p"])
+				if(!( src.printing ))
 					src.printing = 1
 					var/datum/data/record/record1 = null
 					var/datum/data/record/record2 = null
-					if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
+					if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
 						record1 = active1
-					if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
+					if((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
 						record2 = active2
 					sleep(50)
 					var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( computer.loc )
 					P.info = "<CENTER><B>Medical Record</B></CENTER><BR>"
-					if (record1)
+					if(record1)
 						P.info += text("Name: [] ID: []<BR>\nSex: []<BR>\nAge: []<BR>\nFingerprint: []<BR>\nPhysical Status: []<BR>\nMental Status: []<BR>", record1.fields["name"], record1.fields["id"], record1.fields["sex"], record1.fields["age"], record1.fields["fingerprint"], record1.fields["p_stat"], record1.fields["m_stat"])
 						P.name = text("Medical Record ([])", record1.fields["name"])
 					else
 						P.info += "<B>General Record Lost!</B><BR>"
 						P.name = "Medical Record"
-					if (record2)
+					if(record2)
 						P.info += text("<BR>\n<CENTER><B>Medical Data</B></CENTER><BR>\nBlood Type: []<BR>\nDNA: []<BR>\n<BR>\nMinor Disabilities: []<BR>\nDetails: []<BR>\n<BR>\nMajor Disabilities: []<BR>\nDetails: []<BR>\n<BR>\nAllergies: []<BR>\nDetails: []<BR>\n<BR>\nCurrent Diseases: [] (per disease info placed in log/comment section)<BR>\nDetails: []<BR>\n<BR>\nImportant Notes:<BR>\n\t[]<BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", record2.fields["b_type"], record2.fields["b_dna"], record2.fields["mi_dis"], record2.fields["mi_dis_d"], record2.fields["ma_dis"], record2.fields["ma_dis_d"], record2.fields["alg"], record2.fields["alg_d"], record2.fields["cdi"], record2.fields["cdi_d"], decode(record2.fields["notes"]))
 						var/counter = 1
 						while(record2.fields[text("com_[]", counter)])
diff --git a/code/modules/computer3/computers/message.dm b/code/modules/computer3/computers/message.dm
index cb9d27dd0b9..cf40e7f3a0c 100644
--- a/code/modules/computer3/computers/message.dm
+++ b/code/modules/computer3/computers/message.dm
@@ -242,7 +242,7 @@
 		if(!interactable() || ..(href,href_list))
 			return
 
-		if ("auth" in href_list)
+		if("auth" in href_list)
 			if(auth)
 				auth = 0
 				screen = 0
@@ -255,10 +255,10 @@
 						message = incorrectkey
 
 		//Turn the server on/off.
-		if ("active" in href_list)
+		if("active" in href_list)
 			if(auth) linkedServer.active = !linkedServer.active
 		//Find a server
-		if ("find" in href_list)
+		if("find" in href_list)
 			if(message_servers && message_servers.len > 1)
 				src.linkedServer = input(usr,"Please select a server.", "Select a server.", null) as null|anything in message_servers
 				message = "<span class='alert'>NOTICE: Server selected.</span>"
@@ -269,7 +269,7 @@
 				message = noserver
 
 		//View the logs - KEY REQUIRED
-		if ("view" in href_list)
+		if("view" in href_list)
 			if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
@@ -277,7 +277,7 @@
 					src.screen = 1
 
 		//Clears the logs - KEY REQUIRED
-		if ("clear" in href_list)
+		if("clear" in href_list)
 			if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
@@ -285,7 +285,7 @@
 					src.linkedServer.pda_msgs = list()
 					message = "<span class='notice'>NOTICE: Logs cleared.</span>"
 		//Clears the request console logs - KEY REQUIRED
-		if ("clearr" in href_list)
+		if("clearr" in href_list)
 			if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
@@ -293,7 +293,7 @@
 					src.linkedServer.rc_msgs = list()
 					message = "<span class='notice'>NOTICE: Logs cleared.</span>"
 		//Change the password - KEY REQUIRED
-		if ("pass" in href_list)
+		if("pass" in href_list)
 			if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
@@ -313,7 +313,7 @@
 							message = incorrectkey
 
 		//Hack the Console to get the password
-		if ("hack" in href_list)
+		if("hack" in href_list)
 			if((istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot)) && (usr.mind.special_role && usr.mind.original == usr))
 				src.hacking = 1
 				src.screen = 2
@@ -323,7 +323,7 @@
 					if(src && src.linkedServer && usr)
 						BruteForce(usr)
 		//Delete the log.
-		if ("delete" in href_list)
+		if("delete" in href_list)
 			//Are they on the view logs screen?
 			if(screen == 1)
 				if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
@@ -332,7 +332,7 @@
 					src.linkedServer.pda_msgs -= locate(href_list["delete"])
 					message = "<span class='notice'>NOTICE: Log Deleted!</span>"
 		//Delete the request console log.
-		if ("deleter" in href_list)
+		if("deleter" in href_list)
 			//Are they on the view logs screen?
 			if(screen == 4)
 				if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
@@ -341,14 +341,14 @@
 					src.linkedServer.rc_msgs -= locate(href_list["deleter"])
 					message = "<span class='notice'>NOTICE: Log Deleted!</span>"
 		//Create a custom message
-		if ("msg" in href_list)
+		if("msg" in href_list)
 			if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 			else
 				if(auth)
 					src.screen = 3
 		//Fake messaging selection - KEY REQUIRED
-		if ("select" in href_list)
+		if("select" in href_list)
 			if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
 				message = noserver
 				screen = 0
@@ -400,17 +400,17 @@
 							return src.attack_hand(usr)
 
 						var/obj/item/device/pda/PDARec = null
-						for (var/obj/item/device/pda/P in PDAs)
-							if (!P.owner || P.toff || P.hidden)	continue
+						for(var/obj/item/device/pda/P in PDAs)
+							if(!P.owner || P.toff || P.hidden)	continue
 							if(P.owner == customsender)
 								PDARec = P
 						//Sender isn't faking as someone who exists
 						if(isnull(PDARec))
 							src.linkedServer.send_pda_message("[customrecepient.owner]", "[customsender]","[custommessage]")
 							customrecepient.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[customrecepient];choice=Message;target=\ref[src]'>[customsender]</a> ([customjob]):</b></i><br>[custommessage]<br>"
-							if (!customrecepient.silent)
+							if(!customrecepient.silent)
 								playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
-								for (var/mob/O in hearers(3, customrecepient.loc))
+								for(var/mob/O in hearers(3, customrecepient.loc))
 									O.show_message(text("[bicon(customrecepient)] *[customrecepient.ttone]*"))
 								if( customrecepient.loc && ishuman(customrecepient.loc) )
 									var/mob/living/carbon/human/H = customrecepient.loc
@@ -423,9 +423,9 @@
 						else
 							src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]")
 							customrecepient.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[customrecepient];choice=Message;target=\ref[PDARec]'>[PDARec.owner]</a> ([customjob]):</b></i><br>[custommessage]<br>"
-							if (!customrecepient.silent)
+							if(!customrecepient.silent)
 								playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
-								for (var/mob/O in hearers(3, customrecepient.loc))
+								for(var/mob/O in hearers(3, customrecepient.loc))
 									O.show_message(text("[bicon(customrecepient)] *[customrecepient.ttone]*"))
 								if( customrecepient.loc && ishuman(customrecepient.loc) )
 									var/mob/living/carbon/human/H = customrecepient.loc
@@ -447,6 +447,6 @@
 
 //			to_chat(usr, href_list["select"])
 
-		if ("back" in href_list)
+		if("back" in href_list)
 			src.screen = 0
 	interact()
\ No newline at end of file
diff --git a/code/modules/computer3/computers/prisonshuttle.dm b/code/modules/computer3/computers/prisonshuttle.dm
index 119dbc350a4..e7dd5c650ac 100644
--- a/code/modules/computer3/computers/prisonshuttle.dm
+++ b/code/modules/computer3/computers/prisonshuttle.dm
@@ -40,12 +40,12 @@ var/prison_shuttle_timeleft = 0
 			if(do_after(user, 20, target = src))
 				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 				var/obj/item/part/board/circuit/prison_shuttle/M = new /obj/item/part/board/circuit/prison_shuttle( A )
-				for (var/obj/C in src)
+				for(var/obj/C in src)
 					C.loc = src.loc
 				A.circuit = M
 				A.anchored = 1
 
-				if (src.stat & BROKEN)
+				if(src.stat & BROKEN)
 					to_chat(user, "\blue The broken glass falls out.")
 					new /obj/item/trash/shard( src.loc )
 					A.state = 3
@@ -75,7 +75,7 @@ var/prison_shuttle_timeleft = 0
 		user.set_machine(src)
 		post_signal("prison")
 		var/dat
-		if (src.temp)
+		if(src.temp)
 			dat = src.temp
 		else
 			dat += {"<b>Location:</b> [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "Moving to station ([prison_shuttle_timeleft] Secs.)":prison_shuttle_at_station ? "Station":"Dock"]<BR>
@@ -95,11 +95,11 @@ var/prison_shuttle_timeleft = 0
 		if(..())
 			return
 
-		if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
+		if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
 			usr.set_machine(src)
 
-		if (href_list["sendtodock"])
-			if (!prison_can_move())
+		if(href_list["sendtodock"])
+			if(!prison_can_move())
 				to_chat(usr, "\red The prison shuttle is unable to leave.")
 				return
 			if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
@@ -112,8 +112,8 @@ var/prison_shuttle_timeleft = 0
 			spawn(0)
 				prison_process()
 
-		else if (href_list["sendtostation"])
-			if (!prison_can_move())
+		else if(href_list["sendtostation"])
+			if(!prison_can_move())
 				to_chat(usr, "\red The prison shuttle is unable to leave.")
 				return
 			if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
@@ -126,7 +126,7 @@ var/prison_shuttle_timeleft = 0
 			spawn(0)
 				prison_process()
 
-		else if (href_list["mainmenu"])
+		else if(href_list["mainmenu"])
 			src.temp = null
 
 		src.add_fingerprint(usr)
@@ -141,13 +141,13 @@ var/prison_shuttle_timeleft = 0
 /*
 	proc/prison_break()
 		switch(prison_break)
-			if (0)
+			if(0)
 				if(!prison_shuttle_at_station || prison_shuttle_moving_to_prison) return
 
 				prison_shuttle_moving_to_prison = 1
 				prison_shuttle_at_station = prison_shuttle_at_station
 
-				if (!prison_shuttle_moving_to_prison || !prison_shuttle_moving_to_station)
+				if(!prison_shuttle_moving_to_prison || !prison_shuttle_moving_to_station)
 					prison_shuttle_time = world.timeofday + PRISON_MOVETIME
 				spawn(0)
 					prison_process()
@@ -183,9 +183,9 @@ var/prison_shuttle_timeleft = 0
 
 			if(0)
 				prison_shuttle_at_station = 1
-				if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
+				if(prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
 
-				if (!prison_can_move())
+				if(!prison_can_move())
 					to_chat(usr, "\red The prison shuttle is unable to leave.")
 					return
 
@@ -212,9 +212,9 @@ var/prison_shuttle_timeleft = 0
 
 			if(1)
 				prison_shuttle_at_station = 0
-				if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
+				if(prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
 
-				if (!prison_can_move())
+				if(!prison_can_move())
 					to_chat(usr, "\red The prison shuttle is unable to leave.")
 					return
 
diff --git a/code/modules/computer3/computers/robot.dm b/code/modules/computer3/computers/robot.dm
index 002750b49c1..9e9e4b29fac 100644
--- a/code/modules/computer3/computers/robot.dm
+++ b/code/modules/computer3/computers/robot.dm
@@ -34,7 +34,7 @@
 		if(!interactable() || computer.z > 6)
 			return
 		var/dat
-		if (src.temp)
+		if(src.temp)
 			dat = "<TT>[src.temp]</TT><BR><BR><A href='?src=\ref[src];temp=1'>Clear Screen</A>"
 		else
 			if(screen == 0)
@@ -44,10 +44,10 @@
 			if(screen == 1)
 				for(var/mob/living/silicon/robot/R in mob_list)
 					if(istype(usr, /mob/living/silicon/ai))
-						if (R.connected_ai != usr)
+						if(R.connected_ai != usr)
 							continue
 					if(istype(usr, /mob/living/silicon/robot))
-						if (R != usr)
+						if(R != usr)
 							continue
 					if(R.scrambledcodes)
 						continue
@@ -55,11 +55,11 @@
 					dat += "[R.name] |"
 					if(R.stat)
 						dat += " Not Responding |"
-					else if (!R.canmove)
+					else if(!R.canmove)
 						dat += " Locked Down |"
 					else
 						dat += " Operating Normally |"
-					if (!R.canmove)
+					if(!R.canmove)
 					else if(R.cell)
 						dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |"
 					else
@@ -72,7 +72,7 @@
 						dat += " Slaved to [R.connected_ai.name] |"
 					else
 						dat += " Independent from AI |"
-					if (istype(usr, /mob/living/silicon))
+					if(istype(usr, /mob/living/silicon))
 						if(issilicon(usr) && is_special_character(usr) && !R.emagged)
 							dat += "<A href='?src=\ref[src];magbot=\ref[R]'>(<i>Hack</i>)</A> "
 					dat += "<A href='?src=\ref[src];stopbot=\ref[R]'>(<i>[R.canmove ? "Lockdown" : "Release"]</i>)</A> "
@@ -105,19 +105,19 @@
 		if(!interactable() || ..(href,href_list))
 			return
 
-		if ("killall" in href_list)
+		if("killall" in href_list)
 			src.temp = {"Destroy Robots?<BR>
 			<BR><B><A href='?src=\ref[src];do_killall'>\[Swipe ID to initiate destruction sequence\]</A></B><BR>
 			<A href='?src=\ref[src];temp=1'>Cancel</A>"}
 
-		if ("do_killall" in href_list)
+		if("do_killall" in href_list)
 			var/obj/item/weapon/card/id/I = usr.get_active_hand()
-			if (istype(I, /obj/item/device/pda))
+			if(istype(I, /obj/item/device/pda))
 				var/obj/item/device/pda/pda = I
 				I = pda.id
-			if (istype(I))
+			if(istype(I))
 				if(src.check_access(I))
-					if (!status)
+					if(!status)
 						message_admins("\blue [key_name_admin(usr)] has initiated the global cyborg killswitch!")
 						log_game("\blue [key_name(usr)] has initiated the global cyborg killswitch!")
 						src.status = 1
@@ -127,23 +127,23 @@
 				else
 					to_chat(usr, "\red Access Denied.")
 
-		if ("stop" in href_list)
+		if("stop" in href_list)
 			src.temp = {"
 			Stop Robot Destruction Sequence?<BR>
 			<BR><A href='?src=\ref[src];stop2=1'>Yes</A><BR>
 			<A href='?src=\ref[src];temp=1'>No</A>"}
 
-		if ("stop2" in href_list)
+		if("stop2" in href_list)
 			src.stop = 1
 			src.temp = null
 			src.status = 0
 
-		if ("reset" in href_list)
+		if("reset" in href_list)
 			src.timeleft = 60
 
-		if ("temp" in href_list)
+		if("temp" in href_list)
 			src.temp = null
-		if ("screen" in href_list)
+		if("screen" in href_list)
 			switch(href_list["screen"])
 				if("0")
 					screen = 0
@@ -151,7 +151,7 @@
 					screen = 1
 				if("2")
 					screen = 2
-		if ("killbot" in href_list)
+		if("killbot" in href_list)
 			if(computer.allowed(usr))
 				var/mob/living/silicon/robot/R = locate(href_list["killbot"])
 				if(R)
@@ -169,7 +169,7 @@
 			else
 				to_chat(usr, "\red Access Denied.")
 
-		if ("stopbot" in href_list)
+		if("stopbot" in href_list)
 			if(computer.allowed(usr))
 				var/mob/living/silicon/robot/R = locate(href_list["stopbot"])
 				if(R && istype(R)) // Extra sancheck because of input var references
@@ -179,7 +179,7 @@
 							message_admins("\blue [key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
 							log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
 							R.canmove = !R.canmove
-							if (R.lockcharge)
+							if(R.lockcharge)
 							//	R.cell.charge = R.lockcharge
 								R.lockcharge = !R.lockcharge
 								to_chat(R, "Your lockdown has been lifted!")
@@ -191,7 +191,7 @@
 			else
 				to_chat(usr, "\red Access Denied.")
 
-		if ("magbot" in href_list)
+		if("magbot" in href_list)
 			if(computer.allowed(usr))
 				var/mob/living/silicon/robot/R = locate(href_list["magbot"])
 				if(R)
diff --git a/code/modules/computer3/computers/scanconsole.dm b/code/modules/computer3/computers/scanconsole.dm
index fa88ae24b36..1ccc06bde90 100644
--- a/code/modules/computer3/computers/scanconsole.dm
+++ b/code/modules/computer3/computers/scanconsole.dm
@@ -279,7 +279,7 @@
 				var/rejuvenators = round(occupant.reagents.get_reagent_amount("inaprovaline") / REJUVENATORS_MAX * 100)
 				status_html += "<div class='line'><div class='statusLabel'>Rejuvenators:</div><div class='progressBar'><div style='width: [rejuvenators]%;' class='progressFill highlight'></div></div><div class='statusValue'>[occupant.reagents.get_reagent_amount("inaprovaline")] units</div></div>"
 
-			if (dna_summary)
+			if(dna_summary)
 				status_html += "<div class='line'><div class='statusLabel'>Unique Enzymes :</div><div class='statusValue'><span class='highlight'>[uppertext(occupant.dna.unique_enzymes)]</span></div></div>"
 				status_html += "<div class='line'><div class='statusLabel'>Unique Identifier:</div><div class='statusValue'><span class='highlight'>[occupant.dna.uni_identity]</span></div></div>"
 				status_html += "<div class='line'><div class='statusLabel'>Structural Enzymes:</div><div class='statusValue'><span class='highlight'>[occupant.dna.struc_enzymes]</span></div></div>"
@@ -384,7 +384,7 @@
 	proc/emitter_menu()
 		to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "<br>")
 		dat += "<h3>Radiation Emitter Settings</h3>"
-		if (viable)
+		if(viable)
 			dat += topic_link(src,"pulse","Pulse Radiation")
 		else
 			dat += fake_link("Pulse Radiation")
@@ -454,7 +454,7 @@
 					updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
 					scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE)
 				if("ui-f")
-					if	(prob(20+radstrength))
+					if(prob(20+radstrength))
 						randmutb(scanner.occupant)
 						domutcheck(scanner.occupant,scanner)
 					else
@@ -466,8 +466,8 @@
 					var/se = scanner.occupant.dna.struc_enzymes
 					var/targetblock = se_block
 
-					if (!(se_block in list(2,8,10,12)) && prob (20)) // shifts the target slightly
-						if (se_block <= 5)
+					if(!(se_block in list(2,8,10,12)) && prob (20)) // shifts the target slightly
+						if(se_block <= 5)
 							targetblock++
 						else
 							targetblock--
@@ -484,7 +484,7 @@
 					domutcheck(scanner.occupant,scanner)
 					scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE)
 				if("se-f")
-					if	(prob(80-radduration))
+					if(prob(80-radduration))
 						randmutb(scanner.occupant)
 						domutcheck(scanner.occupant,scanner)
 					else
@@ -493,7 +493,7 @@
 					scanner.occupant.apply_effect((radstrength*2)+radduration, IRRADIATE)
 
 				if(null)
-					if (prob(95))
+					if(prob(95))
 						if(prob(75))
 							randmutb(scanner.occupant)
 						else
@@ -517,7 +517,7 @@
 		if(istype(H))
 			var/inap = H.reagents.get_reagent_amount("inaprovaline") // oh my *god* this section was ugly before I shortened it
 
-			if (inap < (REJUVENATORS_MAX - REJUVENATORS_INJECT))
+			if(inap < (REJUVENATORS_MAX - REJUVENATORS_INJECT))
 				H.reagents.add_reagent("inaprovaline", REJUVENATORS_INJECT)
 			else
 				H.reagents.add_reagent("inaprovaline", max(REJUVENATORS_MAX - inap,0))
@@ -534,32 +534,32 @@
 	var/viable_occupant = (occupant && occupant.dna && !(NOCLONE in occupant.mutations))
 	var/mob/living/carbon/human/human_occupant = scanner.occupant
 
-	if (href_list["screen"]) // Passing a screen is only a request, we set current_screen here but it can be overridden below if necessary
+	if(href_list["screen"]) // Passing a screen is only a request, we set current_screen here but it can be overridden below if necessary
 		current_screen = href_list["screen"]
 
-	if (!viable_occupant) // If there is no viable occupant only allow certain screens
+	if(!viable_occupant) // If there is no viable occupant only allow certain screens
 		var/allowed_no_occupant_screens = list("mainmenu", "radsetmenu", "buffermenu") //These are the screens which will be allowed if there's no occupant
-		if (!(current_screen in allowed_no_occupant_screens))
+		if(!(current_screen in allowed_no_occupant_screens))
 			href_list = new /list(0) // clear list of options
 			current_screen = "mainmenu"
 
 
-	if (!current_screen) // If no screen is set default to mainmenu
+	if(!current_screen) // If no screen is set default to mainmenu
 		current_screen = "mainmenu"
 
 
-	if (!scanner) //Is the scanner not connected?
+	if(!scanner) //Is the scanner not connected?
 		scanner_status_html = "<span class='bad'>ERROR: No DNA Scanner connected.</span>"
 		current_screen = null // blank does not exist in the switch below, so no screen will be outputted
 		updateUsrDialog()
 		return
 
 	usr.set_machine(src)
-	if (href_list["locked"])
-		if (scanner.occupant)
+	if(href_list["locked"])
+		if(scanner.occupant)
 			scanner.locked = !( scanner.locked )
 	////////////////////////////////////////////////////////
-	if (href_list["genpulse"])
+	if(href_list["genpulse"])
 		if(!viable_occupant)//Makes sure someone is in there (And valid) before trying anything
 			temp_html = text("No viable occupant detected.")//More than anything, this just acts as a sanity check in case the option DOES appear for whatever reason
 			//usr << browse(temp_html, "window=scannernew;size=550x650")
@@ -574,10 +574,10 @@
 			var/lock_state = scanner.locked
 			scanner.locked = 1//lock it
 			sleep(10*radduration)
-			if (!scanner.occupant)
+			if(!scanner.occupant)
 				temp_html = null
 				return null
-			if (prob(95))
+			if(prob(95))
 				if(prob(75))
 					randmutb(scanner.occupant)
 				else
@@ -591,59 +591,59 @@
 			scanner.locked = lock_state
 			temp_html = null
 			dopage(src,"screen=radsetmenu")
-	if (href_list["radleplus"])
+	if(href_list["radleplus"])
 		if(!viable_occupant)
 			temp_html = text("No viable occupant detected.")
 			popup.set_content(temp_html)
 			popup.open()
-		if (radduration < 20)
+		if(radduration < 20)
 			radduration++
 			radduration++
 		dopage(src,"screen=radsetmenu")
-	if (href_list["radleminus"])
+	if(href_list["radleminus"])
 		if(!viable_occupant)
 			temp_html = text("No viable occupant detected.")
 			popup.set_content(temp_html)
 			popup.open()
-		if (radduration > 2)
+		if(radduration > 2)
 			radduration--
 			radduration--
 		dopage(src,"screen=radsetmenu")
-	if (href_list["radinplus"])
-		if (radstrength < 10)
+	if(href_list["radinplus"])
+		if(radstrength < 10)
 			radstrength++
 		dopage(src,"screen=radsetmenu")
-	if (href_list["radinminus"])
-		if (radstrength > 1)
+	if(href_list["radinminus"])
+		if(radstrength > 1)
 			radstrength--
 		dopage(src,"screen=radsetmenu")
 	////////////////////////////////////////////////////////
-	if (href_list["unimenuplus"])
-		if (ui_block < 13)
+	if(href_list["unimenuplus"])
+		if(ui_block < 13)
 			ui_block++
 		else
 			ui_block = 1
 		dopage(src,"screen=unimenu")
-	if (href_list["unimenuminus"])
-		if (ui_block > 1)
+	if(href_list["unimenuminus"])
+		if(ui_block > 1)
 			ui_block--
 		else
 			ui_block = 13
 		dopage(src,"screen=unimenu")
-	if (href_list["unimenusubplus"])
-		if (subblock < 3)
+	if(href_list["unimenusubplus"])
+		if(subblock < 3)
 			subblock++
 		else
 			subblock = 1
 		dopage(src,"screen=unimenu")
-	if (href_list["unimenusubminus"])
-		if (subblock > 1)
+	if(href_list["unimenusubminus"])
+		if(subblock > 1)
 			subblock--
 		else
 			subblock = 3
 		dopage(src,"screen=unimenu")
-	if (href_list["unimenutargetplus"])
-		if (unitarget < 15)
+	if(href_list["unimenutargetplus"])
+		if(unitarget < 15)
 			unitarget++
 			unitargethex = unitarget
 			switch(unitarget)
@@ -663,8 +663,8 @@
 			unitarget = 0
 			unitargethex = 0
 		dopage(src,"screen=unimenu")
-	if (href_list["unimenutargetminus"])
-		if (unitarget > 0)
+	if(href_list["unimenutargetminus"])
+		if(unitarget > 0)
 			unitarget--
 			unitargethex = unitarget
 			switch(unitarget)
@@ -682,15 +682,15 @@
 			unitarget = 15
 			unitargethex = "F"
 		dopage(src,"screen=unimenu")
-	if (href_list["uimenuset"] && href_list["uimenusubset"]) // This chunk of code updates selected block / sub-block based on click
+	if(href_list["uimenuset"] && href_list["uimenusubset"]) // This chunk of code updates selected block / sub-block based on click
 		var/menuset = text2num(href_list["uimenuset"])
 		var/menusubset = text2num(href_list["uimenusubset"])
-		if ((menuset <= 13) && (menuset >= 1))
+		if((menuset <= 13) && (menuset >= 1))
 			ui_block = menuset
-		if ((menusubset <= 3) && (menusubset >= 1))
+		if((menusubset <= 3) && (menusubset >= 1))
 			subblock = menusubset
 		dopage(src, "unimenu")
-	if (href_list["unipulse"])
+	if(href_list["unipulse"])
 		if(scanner.occupant)
 			var/block
 			var/newblock
@@ -703,22 +703,22 @@
 			var/lock_state = scanner.locked
 			scanner.locked = 1//lock it
 			sleep(10*radduration)
-			if (!scanner.occupant)
+			if(!scanner.occupant)
 				temp_html = null
 				return null
 			///
-			if (prob((80 + (radduration / 2))))
+			if(prob((80 + (radduration / 2))))
 				block = miniscrambletarget(num2text(unitarget), radstrength, radduration)
 				newblock = null
-				if (subblock == 1) newblock = block + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),2,1) + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),3,1)
-				if (subblock == 2) newblock = getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),1,1) + block + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),3,1)
-				if (subblock == 3) newblock = getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),1,1) + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),2,1) + block
+				if(subblock == 1) newblock = block + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),2,1) + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),3,1)
+				if(subblock == 2) newblock = getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),1,1) + block + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),3,1)
+				if(subblock == 3) newblock = getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),1,1) + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),2,1) + block
 				tstructure2 = setblock(scanner.occupant.dna.uni_identity, ui_block, newblock,3)
 				scanner.occupant.dna.uni_identity = tstructure2
 				updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
 				scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE)
 			else
-				if	(prob(20+radstrength))
+				if(prob(20+radstrength))
 					randmutb(scanner.occupant)
 					domutcheck(scanner.occupant,scanner)
 				else
@@ -729,61 +729,61 @@
 		dopage(src,"screen=unimenu")
 
 	////////////////////////////////////////////////////////
-	if (href_list["rejuv"])
+	if(href_list["rejuv"])
 		if(!viable_occupant)
 			temp_html = text("No viable occupant detected.")
 			popup.set_content(temp_html)
 			popup.open()
 		else
 			if(human_occupant)
-				if (human_occupant.reagents.get_reagent_amount("inaprovaline") < REJUVENATORS_MAX)
-					if (human_occupant.reagents.get_reagent_amount("inaprovaline") < (REJUVENATORS_MAX - REJUVENATORS_INJECT))
+				if(human_occupant.reagents.get_reagent_amount("inaprovaline") < REJUVENATORS_MAX)
+					if(human_occupant.reagents.get_reagent_amount("inaprovaline") < (REJUVENATORS_MAX - REJUVENATORS_INJECT))
 						human_occupant.reagents.add_reagent("inaprovaline", REJUVENATORS_INJECT)
 					else
 						human_occupant.reagents.add_reagent("inaprovaline", round(REJUVENATORS_MAX - human_occupant.reagents.get_reagent_amount("inaprovaline")))
 //				to_chat(usr, text("Occupant now has [] units of rejuvenation in his/her bloodstream.", human_occupant.reagents.get_reagent_amount("inaprovaline")))
 
 	////////////////////////////////////////////////////////
-	if (href_list["strucmenuplus"])
-		if (se_block < 14)
+	if(href_list["strucmenuplus"])
+		if(se_block < 14)
 			se_block++
 		else
 			se_block = 1
 		dopage(src,"screen=strucmenu")
-	if (href_list["strucmenuminus"])
-		if (se_block > 1)
+	if(href_list["strucmenuminus"])
+		if(se_block > 1)
 			se_block--
 		else
 			se_block = 14
 		dopage(src,"screen=strucmenu")
-	if (href_list["strucmenusubplus"])
-		if (subblock < 3)
+	if(href_list["strucmenusubplus"])
+		if(subblock < 3)
 			subblock++
 		else
 			subblock = 1
 		dopage(src,"screen=strucmenu")
-	if (href_list["strucmenusubminus"])
-		if (subblock > 1)
+	if(href_list["strucmenusubminus"])
+		if(subblock > 1)
 			subblock--
 		else
 			subblock = 3
 		dopage(src,"screen=strucmenu")
-	if (href_list["semenuset"] && href_list["semenusubset"]) // This chunk of code updates selected block / sub-block based on click (se stands for strutural enzymes)
+	if(href_list["semenuset"] && href_list["semenusubset"]) // This chunk of code updates selected block / sub-block based on click (se stands for strutural enzymes)
 		var/menuset = text2num(href_list["semenuset"])
 		var/menusubset = text2num(href_list["semenusubset"])
-		if ((menuset <= 14) && (menuset >= 1))
+		if((menuset <= 14) && (menuset >= 1))
 			se_block = menuset
-		if ((menusubset <= 3) && (menusubset >= 1))
+		if((menusubset <= 3) && (menusubset >= 1))
 			subblock = menusubset
 		dopage(src, "strucmenu")
-	if (href_list["strucpulse"])
+	if(href_list["strucpulse"])
 		var/block
 		var/newblock
 		var/tstructure2
 		var/oldblock
 		var/lock_state = scanner.locked
 		scanner.locked = 1//lock it
-		if (viable_occupant)
+		if(viable_occupant)
 			block = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),subblock,1)
 
 			temp_html = text("Working ... Please wait ([] Seconds)", radduration)
@@ -795,18 +795,18 @@
 			return null
 		///
 		if(viable_occupant)
-			if (prob((80 + (radduration / 2))))
-				if ((se_block != 2 || se_block != 12 || se_block != 8 || se_block || 10) && prob (20))
+			if(prob((80 + (radduration / 2))))
+				if((se_block != 2 || se_block != 12 || se_block != 8 || se_block || 10) && prob (20))
 					oldblock = se_block
 					block = miniscramble(block, radstrength, radduration)
 					newblock = null
-					if (se_block > 1 && se_block < 5)
+					if(se_block > 1 && se_block < 5)
 						se_block++
-					else if (se_block > 5 && se_block < 14)
+					else if(se_block > 5 && se_block < 14)
 						se_block--
-					if (subblock == 1) newblock = block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
-					if (subblock == 2) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
-					if (subblock == 3) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + block
+					if(subblock == 1) newblock = block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
+					if(subblock == 2) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
+					if(subblock == 3) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + block
 					tstructure2 = setblock(scanner.occupant.dna.struc_enzymes, se_block, newblock,3)
 					scanner.occupant.dna.struc_enzymes = tstructure2
 					domutcheck(scanner.occupant,scanner)
@@ -816,15 +816,15 @@
 				//
 					block = miniscramble(block, radstrength, radduration)
 					newblock = null
-					if (subblock == 1) newblock = block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
-					if (subblock == 2) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
-					if (subblock == 3) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + block
+					if(subblock == 1) newblock = block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
+					if(subblock == 2) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
+					if(subblock == 3) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + block
 					tstructure2 = setblock(scanner.occupant.dna.struc_enzymes, se_block, newblock,3)
 					scanner.occupant.dna.struc_enzymes = tstructure2
 					domutcheck(scanner.occupant,scanner)
 					scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE)
 			else
-				if	(prob(80-radduration))
+				if(prob(80-radduration))
 					randmutb(scanner.occupant)
 					domutcheck(scanner.occupant,scanner)
 				else
@@ -836,21 +836,21 @@
 		dopage(src,"screen=strucmenu")
 
 	////////////////////////////////////////////////////////
-	if (href_list["b1addui"])
+	if(href_list["b1addui"])
 		if(scanner.occupant && scanner.occupant.dna)
 			buffer1iue = 0
 			buffer1 = scanner.occupant.dna.uni_identity
-			if (!istype(scanner.occupant,/mob/living/carbon/human))
+			if(!istype(scanner.occupant,/mob/living/carbon/human))
 				buffer1owner = scanner.occupant.name
 			else
 				buffer1owner = scanner.occupant.real_name
 			buffer1label = "Unique Identifier"
 			buffer1type = "ui"
 			dopage(src,"screen=buffermenu")
-	if (href_list["b1adduiue"])
+	if(href_list["b1adduiue"])
 		if(scanner.occupant && scanner.occupant.dna)
 			buffer1 = scanner.occupant.dna.uni_identity
-			if (!istype(scanner.occupant,/mob/living/carbon/human))
+			if(!istype(scanner.occupant,/mob/living/carbon/human))
 				buffer1owner = scanner.occupant.name
 			else
 				buffer1owner = scanner.occupant.real_name
@@ -858,10 +858,10 @@
 			buffer1type = "ui"
 			buffer1iue = 1
 			dopage(src,"screen=buffermenu")
-	if (href_list["b2adduiue"])
+	if(href_list["b2adduiue"])
 		if(scanner.occupant && scanner.occupant.dna)
 			buffer2 = scanner.occupant.dna.uni_identity
-			if (!istype(scanner.occupant,/mob/living/carbon/human))
+			if(!istype(scanner.occupant,/mob/living/carbon/human))
 				buffer2owner = scanner.occupant.name
 			else
 				buffer2owner = scanner.occupant.real_name
@@ -869,10 +869,10 @@
 			buffer2type = "ui"
 			buffer2iue = 1
 			dopage(src,"screen=buffermenu")
-	if (href_list["b3adduiue"])
+	if(href_list["b3adduiue"])
 		if(scanner.occupant && scanner.occupant.dna)
 			buffer3 = scanner.occupant.dna.uni_identity
-			if (!istype(scanner.occupant,/mob/living/carbon/human))
+			if(!istype(scanner.occupant,/mob/living/carbon/human))
 				buffer3owner = scanner.occupant.name
 			else
 				buffer3owner = scanner.occupant.real_name
@@ -880,141 +880,141 @@
 			buffer3type = "ui"
 			buffer3iue = 1
 			dopage(src,"screen=buffermenu")
-	if (href_list["b2addui"])
+	if(href_list["b2addui"])
 		if(scanner.occupant && scanner.occupant.dna)
 			buffer2iue = 0
 			buffer2 = scanner.occupant.dna.uni_identity
-			if (!istype(scanner.occupant,/mob/living/carbon/human))
+			if(!istype(scanner.occupant,/mob/living/carbon/human))
 				buffer2owner = scanner.occupant.name
 			else
 				buffer2owner = scanner.occupant.real_name
 			buffer2label = "Unique Identifier"
 			buffer2type = "ui"
 			dopage(src,"screen=buffermenu")
-	if (href_list["b3addui"])
+	if(href_list["b3addui"])
 		if(scanner.occupant && scanner.occupant.dna)
 			buffer3iue = 0
 			buffer3 = scanner.occupant.dna.uni_identity
-			if (!istype(scanner.occupant,/mob/living/carbon/human))
+			if(!istype(scanner.occupant,/mob/living/carbon/human))
 				buffer3owner = scanner.occupant.name
 			else
 				buffer3owner = scanner.occupant.real_name
 			buffer3label = "Unique Identifier"
 			buffer3type = "ui"
 			dopage(src,"screen=buffermenu")
-	if (href_list["b1addse"])
+	if(href_list["b1addse"])
 		if(scanner.occupant && scanner.occupant.dna)
 			buffer1iue = 0
 			buffer1 = scanner.occupant.dna.struc_enzymes
-			if (!istype(scanner.occupant,/mob/living/carbon/human))
+			if(!istype(scanner.occupant,/mob/living/carbon/human))
 				buffer1owner = scanner.occupant.name
 			else
 				buffer1owner = scanner.occupant.real_name
 			buffer1label = "Structural Enzymes"
 			buffer1type = "se"
 			dopage(src,"screen=buffermenu")
-	if (href_list["b2addse"])
+	if(href_list["b2addse"])
 		if(scanner.occupant && scanner.occupant.dna)
 			buffer2iue = 0
 			buffer2 = scanner.occupant.dna.struc_enzymes
-			if (!istype(scanner.occupant,/mob/living/carbon/human))
+			if(!istype(scanner.occupant,/mob/living/carbon/human))
 				buffer2owner = scanner.occupant.name
 			else
 				buffer2owner = scanner.occupant.real_name
 			buffer2label = "Structural Enzymes"
 			buffer2type = "se"
 			dopage(src,"screen=buffermenu")
-	if (href_list["b3addse"])
+	if(href_list["b3addse"])
 		if(scanner.occupant && scanner.occupant.dna)
 			buffer3iue = 0
 			buffer3 = scanner.occupant.dna.struc_enzymes
-			if (!istype(scanner.occupant,/mob/living/carbon/human))
+			if(!istype(scanner.occupant,/mob/living/carbon/human))
 				buffer3owner = scanner.occupant.name
 			else
 				buffer3owner = scanner.occupant.real_name
 			buffer3label = "Structural Enzymes"
 			buffer3type = "se"
 			dopage(src,"screen=buffermenu")
-	if (href_list["b1clear"])
+	if(href_list["b1clear"])
 		buffer1 = null
 		buffer1owner = null
 		buffer1label = null
 		buffer1iue = null
 		dopage(src,"screen=buffermenu")
-	if (href_list["b2clear"])
+	if(href_list["b2clear"])
 		buffer2 = null
 		buffer2owner = null
 		buffer2label = null
 		buffer2iue = null
 		dopage(src,"screen=buffermenu")
-	if (href_list["b3clear"])
+	if(href_list["b3clear"])
 		buffer3 = null
 		buffer3owner = null
 		buffer3label = null
 		buffer3iue = null
 		dopage(src,"screen=buffermenu")
-	if (href_list["b1label"])
+	if(href_list["b1label"])
 		buffer1label = sanitize(input("New Label:","Edit Label","Infos here"))
 		dopage(src,"screen=buffermenu")
-	if (href_list["b2label"])
+	if(href_list["b2label"])
 		buffer2label = sanitize(input("New Label:","Edit Label","Infos here"))
 		dopage(src,"screen=buffermenu")
-	if (href_list["b3label"])
+	if(href_list["b3label"])
 		buffer3label = sanitize(input("New Label:","Edit Label","Infos here"))
 		dopage(src,"screen=buffermenu")
-	if (href_list["b1transfer"])
-		if (!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna)
+	if(href_list["b1transfer"])
+		if(!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna)
 			return
-		if (buffer1type == "ui")
-			if (buffer1iue)
+		if(buffer1type == "ui")
+			if(buffer1iue)
 				scanner.occupant.real_name = buffer1owner
 				scanner.occupant.name = buffer1owner
 			scanner.occupant.dna.uni_identity = buffer1
 			updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
-		else if (buffer1type == "se")
+		else if(buffer1type == "se")
 			scanner.occupant.dna.struc_enzymes = buffer1
 			domutcheck(scanner.occupant,scanner)
 		temp_html = "Transfered."
 		scanner.occupant.apply_effect(rand(20,50), IRRADIATE)
 
-	if (href_list["b2transfer"])
-		if (!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna)
+	if(href_list["b2transfer"])
+		if(!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna)
 			return
-		if (buffer2type == "ui")
-			if (buffer2iue)
+		if(buffer2type == "ui")
+			if(buffer2iue)
 				scanner.occupant.real_name = buffer2owner
 				scanner.occupant.name = buffer2owner
 			scanner.occupant.dna.uni_identity = buffer2
 			updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
-		else if (buffer2type == "se")
+		else if(buffer2type == "se")
 			scanner.occupant.dna.struc_enzymes = buffer2
 			domutcheck(scanner.occupant,scanner)
 		temp_html = "Transfered."
 		scanner.occupant.apply_effect(rand(20,50), IRRADIATE)
 
-	if (href_list["b3transfer"])
-		if (!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna)
+	if(href_list["b3transfer"])
+		if(!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna)
 			return
-		if (buffer3type == "ui")
-			if (buffer3iue)
+		if(buffer3type == "ui")
+			if(buffer3iue)
 				scanner.occupant.real_name = buffer3owner
 				scanner.occupant.name = buffer3owner
 			scanner.occupant.dna.uni_identity = buffer3
 			updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
-		else if (buffer3type == "se")
+		else if(buffer3type == "se")
 			scanner.occupant.dna.struc_enzymes = buffer3
 			domutcheck(scanner.occupant,scanner)
 		temp_html = "Transfered."
 		scanner.occupant.apply_effect(rand(20,50), IRRADIATE)
 
-	if (href_list["b1injector"])
-		if (injectorready)
+	if(href_list["b1injector"])
+		if(injectorready)
 			var/obj/item/tool/medical/dnainjector/I = new /obj/item/tool/medical/dnainjector
 			I.dna = buffer1
 			I.dnatype = buffer1type
 			I.loc = loc
 			I.name += " ([buffer1label])"
-			if (buffer1iue) I.ue = buffer1owner //lazy haw haw
+			if(buffer1iue) I.ue = buffer1owner //lazy haw haw
 			temp_html = "Injector created."
 
 			injectorready = 0
@@ -1023,14 +1023,14 @@
 		else
 			temp_html = "Replicator not ready yet."
 
-	if (href_list["b2injector"])
-		if (injectorready)
+	if(href_list["b2injector"])
+		if(injectorready)
 			var/obj/item/tool/medical/dnainjector/I = new /obj/item/tool/medical/dnainjector
 			I.dna = buffer2
 			I.dnatype = buffer2type
 			I.loc = loc
 			I.name += " ([buffer2label])"
-			if (buffer2iue) I.ue = buffer2owner //lazy haw haw
+			if(buffer2iue) I.ue = buffer2owner //lazy haw haw
 			temp_html = "Injector created."
 
 			injectorready = 0
@@ -1039,14 +1039,14 @@
 		else
 			temp_html = "Replicator not ready yet."
 
-	if (href_list["b3injector"])
-		if (injectorready)
+	if(href_list["b3injector"])
+		if(injectorready)
 			var/obj/item/tool/medical/dnainjector/I = new /obj/item/tool/medical/dnainjector
 			I.dna = buffer3
 			I.dnatype = buffer3type
 			I.loc = loc
 			I.name += " ([buffer3label])"
-			if (buffer3iue) I.ue = buffer3owner //lazy haw haw
+			if(buffer3iue) I.ue = buffer3owner //lazy haw haw
 			temp_html = "Injector created."
 
 			injectorready = 0
@@ -1056,11 +1056,11 @@
 			temp_html = "Replicator not ready yet."
 
 	////////////////////////////////////////////////////////
-	if (href_list["load_disk"])
+	if(href_list["load_disk"])
 		var/buffernum = text2num(href_list["load_disk"])
-		if ((buffernum > 3) || (buffernum < 1))
+		if((buffernum > 3) || (buffernum < 1))
 			return
-		if ((isnull(diskette)) || (!diskette.data) || (diskette.data == ""))
+		if((isnull(diskette)) || (!diskette.data) || (diskette.data == ""))
 			return
 		switch(buffernum)
 			if(1)
@@ -1080,11 +1080,11 @@
 				buffer3owner = diskette.owner
 		temp_html = "Data loaded."
 
-	if (href_list["save_disk"])
+	if(href_list["save_disk"])
 		var/buffernum = text2num(href_list["save_disk"])
-		if ((buffernum > 3) || (buffernum < 1))
+		if((buffernum > 3) || (buffernum < 1))
 			return
-		if ((isnull(diskette)) || (diskette.read_only))
+		if((isnull(diskette)) || (diskette.read_only))
 			return
 		switch(buffernum)
 			if(1)
@@ -1106,8 +1106,8 @@
 				diskette.owner = buffer3owner
 				diskette.name = "data disk - '[buffer3owner]'"
 		temp_html = "Data saved."
-	if (href_list["eject_disk"])
-		if (!diskette)
+	if(href_list["eject_disk"])
+		if(!diskette)
 			return
 		diskette.loc = get_turf(src)
 		diskette = null
@@ -1115,9 +1115,9 @@
 
 	temp_html = temp_header_html
 	switch(current_screen)
-		if ("mainmenu")
+		if("mainmenu")
 			temp_html += "<h3>Main Menu</h3>"
-			if (viable_occupant) //is there REALLY someone in there who can be modified?
+			if(viable_occupant) //is there REALLY someone in there who can be modified?
 				temp_html += text("<A href='?src=\ref[];screen=unimenu'>Modify Unique Identifier</A><br />", src)
 				temp_html += text("<A href='?src=\ref[];screen=strucmenu'>Modify Structural Enzymes</A><br /><br />", src)
 			else
@@ -1126,7 +1126,7 @@
 			temp_html += text("<A href='?src=\ref[];screen=radsetmenu'>Radiation Emitter Settings</A><br /><br />", src)
 			temp_html += text("<A href='?src=\ref[];screen=buffermenu'>Transfer Buffer</A><br /><br />", src)
 
-		if ("unimenu")
+		if("unimenu")
 			if(!viable_occupant)
 				temp_html = text("No viable occupant detected.")
 				popup.set_content(temp_html)
@@ -1141,7 +1141,7 @@
 				temp_html += "<B>Modify Block</B><br />"
 				temp_html += "<A href='?src=\ref[src];unipulse=1'>Irradiate</A></div>"
 
-		if ("strucmenu")
+		if("strucmenu")
 			if(!viable_occupant)
 				temp_html = text("No viable occupant detected.")
 				popup.set_content(temp_html)
@@ -1155,61 +1155,61 @@
 				temp_html += "<B>Modify Block</B><br />"
 				temp_html += "<A href='?src=\ref[src];strucpulse=1'>Irradiate</A></div>"
 
-		if ("radsetmenu")
+		if("radsetmenu")
 			temp_html = "<A href='?src=\ref[src];screen=mainmenu'><< Main Menu</A><br />"
 			temp_html += "<h3>Radiation Emitter Settings</h3>"
-			if (viable_occupant)
+			if(viable_occupant)
 				temp_html += text("<A href='?src=\ref[];genpulse=1'>Pulse Radiation</A>", src)
 			else
 				temp_html += "<span class='linkOff'>Pulse Radiation</span>"
 			temp_html += "<br /><br />Radiation Duration: <A href='?src=\ref[src];radleminus=1'>-</A> <font color='green'><B>[radduration]</B></FONT> <A href='?src=\ref[src];radleplus=1'>+</A><br />"
 			temp_html += "Radiation Intensity: <A href='?src=\ref[src];radinminus=1'>-</A> <font color='green'><B>[radstrength]</B></FONT> <A href='?src=\ref[src];radinplus=1'>+</A><br /><br />"
 
-		if ("buffermenu")
+		if("buffermenu")
 			temp_html = "<A href='?src=\ref[src];screen=mainmenu'><< Main Menu</A><br />"
 			temp_html += "<h3>Transfer Buffer</h3>"
 			temp_html += "<h4>Buffer 1:</h4>"
-			if (!(buffer1))
+			if(!(buffer1))
 				temp_html += "<i>Buffer Empty</i><br />"
 			else
 				temp_html += text("Data: <font class='highlight'>[]</FONT><br />", buffer1)
 				temp_html += text("By: <font class='highlight'>[]</FONT><br />", buffer1owner)
 				temp_html += text("Label: <font class='highlight'>[]</FONT><br />", buffer1label)
-			if (viable_occupant) temp_html += text("Save : <A href='?src=\ref[];b1addui=1'>UI</A> - <A href='?src=\ref[];b1adduiue=1'>UI+UE</A> - <A href='?src=\ref[];b1addse=1'>SE</A><br />", src, src, src)
-			if (buffer1) temp_html += text("Transfer to: <A href='?src=\ref[];b1transfer=1'>Occupant</A> - <A href='?src=\ref[];b1injector=1'>Injector</A><br />", src, src)
-			//if (buffer1) temp_html += text("<A href='?src=\ref[];b1iso=1'>Isolate Block</A><br />", src)
-			if (buffer1) temp_html += "Disk: <A href='?src=\ref[src];save_disk=1'>Save To</a> | <A href='?src=\ref[src];load_disk=1'>Load From</a><br />"
-			if (buffer1) temp_html += text("<A href='?src=\ref[];b1label=1'>Edit Label</A><br />", src)
-			if (buffer1) temp_html += text("<A href='?src=\ref[];b1clear=1'>Clear Buffer</A><br /><br />", src)
-			if (!buffer1) temp_html += "<br />"
+			if(viable_occupant) temp_html += text("Save : <A href='?src=\ref[];b1addui=1'>UI</A> - <A href='?src=\ref[];b1adduiue=1'>UI+UE</A> - <A href='?src=\ref[];b1addse=1'>SE</A><br />", src, src, src)
+			if(buffer1) temp_html += text("Transfer to: <A href='?src=\ref[];b1transfer=1'>Occupant</A> - <A href='?src=\ref[];b1injector=1'>Injector</A><br />", src, src)
+			//if(buffer1) temp_html += text("<A href='?src=\ref[];b1iso=1'>Isolate Block</A><br />", src)
+			if(buffer1) temp_html += "Disk: <A href='?src=\ref[src];save_disk=1'>Save To</a> | <A href='?src=\ref[src];load_disk=1'>Load From</a><br />"
+			if(buffer1) temp_html += text("<A href='?src=\ref[];b1label=1'>Edit Label</A><br />", src)
+			if(buffer1) temp_html += text("<A href='?src=\ref[];b1clear=1'>Clear Buffer</A><br /><br />", src)
+			if(!buffer1) temp_html += "<br />"
 			temp_html += "<h4>Buffer 2:</h4>"
-			if (!(buffer2))
+			if(!(buffer2))
 				temp_html += "<i>Buffer Empty</i><br />"
 			else
 				temp_html += text("Data: <font class='highlight'>[]</FONT><br />", buffer2)
 				temp_html += text("By: <font class='highlight'>[]</FONT><br />", buffer2owner)
 				temp_html += text("Label: <font class='highlight'>[]</FONT><br />", buffer2label)
-			if (viable_occupant) temp_html += text("Save : <A href='?src=\ref[];b2addui=1'>UI</A> - <A href='?src=\ref[];b2adduiue=1'>UI+UE</A> - <A href='?src=\ref[];b2addse=1'>SE</A><br />", src, src, src)
-			if (buffer2) temp_html += text("Transfer to: <A href='?src=\ref[];b2transfer=1'>Occupant</A> - <A href='?src=\ref[];b2injector=1'>Injector</A><br />", src, src)
-			//if (buffer2) temp_html += text("<A href='?src=\ref[];b2iso=1'>Isolate Block</A><br />", src)
-			if (buffer2) temp_html += "Disk: <A href='?src=\ref[src];save_disk=2'>Save To</a> | <A href='?src=\ref[src];load_disk=2'>Load From</a><br />"
-			if (buffer2) temp_html += text("<A href='?src=\ref[];b2label=1'>Edit Label</A><br />", src)
-			if (buffer2) temp_html += text("<A href='?src=\ref[];b2clear=1'>Clear Buffer</A><br /><br />", src)
-			if (!buffer2) temp_html += "<br />"
+			if(viable_occupant) temp_html += text("Save : <A href='?src=\ref[];b2addui=1'>UI</A> - <A href='?src=\ref[];b2adduiue=1'>UI+UE</A> - <A href='?src=\ref[];b2addse=1'>SE</A><br />", src, src, src)
+			if(buffer2) temp_html += text("Transfer to: <A href='?src=\ref[];b2transfer=1'>Occupant</A> - <A href='?src=\ref[];b2injector=1'>Injector</A><br />", src, src)
+			//if(buffer2) temp_html += text("<A href='?src=\ref[];b2iso=1'>Isolate Block</A><br />", src)
+			if(buffer2) temp_html += "Disk: <A href='?src=\ref[src];save_disk=2'>Save To</a> | <A href='?src=\ref[src];load_disk=2'>Load From</a><br />"
+			if(buffer2) temp_html += text("<A href='?src=\ref[];b2label=1'>Edit Label</A><br />", src)
+			if(buffer2) temp_html += text("<A href='?src=\ref[];b2clear=1'>Clear Buffer</A><br /><br />", src)
+			if(!buffer2) temp_html += "<br />"
 			temp_html += "<h4>Buffer 3:</h4>"
-			if (!(buffer3))
+			if(!(buffer3))
 				temp_html += "<i>Buffer Empty</i><br />"
 			else
 				temp_html += text("Data: <font class='highlight'>[]</FONT><br />", buffer3)
 				temp_html += text("By: <font class='highlight'>[]</FONT><br />", buffer3owner)
 				temp_html += text("Label: <font class='highlight'>[]</FONT><br />", buffer3label)
-			if (viable_occupant) temp_html += text("Save : <A href='?src=\ref[];b3addui=1'>UI</A> - <A href='?src=\ref[];b3adduiue=1'>UI+UE</A> - <A href='?src=\ref[];b3addse=1'>SE</A><br />", src, src, src)
-			if (buffer3) temp_html += text("Transfer to: <A href='?src=\ref[];b3transfer=1'>Occupant</A> - <A href='?src=\ref[];b3injector=1'>Injector</A><br />", src, src)
-			//if (buffer3) temp_html += text("<A href='?src=\ref[];b3iso=1'>Isolate Block</A><br />", src)
-			if (buffer3) temp_html += "Disk: <A href='?src=\ref[src];save_disk=3'>Save To</a> | <A href='?src=\ref[src];load_disk=3'>Load From</a><br />"
-			if (buffer3) temp_html += text("<A href='?src=\ref[];b3label=1'>Edit Label</A><br />", src)
-			if (buffer3) temp_html += text("<A href='?src=\ref[];b3clear=1'>Clear Buffer</A><br /><br />", src)
-			if (!buffer3) temp_html += "<br />"
+			if(viable_occupant) temp_html += text("Save : <A href='?src=\ref[];b3addui=1'>UI</A> - <A href='?src=\ref[];b3adduiue=1'>UI+UE</A> - <A href='?src=\ref[];b3addse=1'>SE</A><br />", src, src, src)
+			if(buffer3) temp_html += text("Transfer to: <A href='?src=\ref[];b3transfer=1'>Occupant</A> - <A href='?src=\ref[];b3injector=1'>Injector</A><br />", src, src)
+			//if(buffer3) temp_html += text("<A href='?src=\ref[];b3iso=1'>Isolate Block</A><br />", src)
+			if(buffer3) temp_html += "Disk: <A href='?src=\ref[src];save_disk=3'>Save To</a> | <A href='?src=\ref[src];load_disk=3'>Load From</a><br />"
+			if(buffer3) temp_html += text("<A href='?src=\ref[];b3label=1'>Edit Label</A><br />", src)
+			if(buffer3) temp_html += text("<A href='?src=\ref[];b3clear=1'>Clear Buffer</A><br /><br />", src)
+			if(!buffer3) temp_html += "<br />"
 	temp_html += temp_footer_html
 
 	if(viable_occupant && !scanner_status_html && occupant) //is there REALLY someone in there?
@@ -1219,7 +1219,7 @@
 			var/rejuvenators = round(human_occupant.reagents.get_reagent_amount("inaprovaline") / REJUVENATORS_MAX * 100)
 			scanner_status_html += "<div class='line'><div class='statusLabel'>Rejuvenators:</div><div class='progressBar'><div style='width: [rejuvenators]%;' class='progressFill highlight'></div></div><div class='statusValue'>[human_occupant.reagents.get_reagent_amount("inaprovaline")] units</div></div>"
 
-		if (current_screen == "mainmenu")
+		if(current_screen == "mainmenu")
 			scanner_status_html += "<div class='line'><div class='statusLabel'>Unique Enzymes :</div><div class='statusValue'><span class='highlight'>[uppertext(occupant.dna.unique_enzymes)]</span></div></div>"
 			scanner_status_html += "<div class='line'><div class='statusLabel'>Unique Identifier:</div><div class='statusValue'><span class='highlight'>[occupant.dna.uni_identity]</span></div></div>"
 			scanner_status_html += "<div class='line'><div class='statusLabel'>Structural Enzymes:</div><div class='statusValue'><span class='highlight'>[occupant.dna.struc_enzymes]</span></div></div>"
@@ -1228,7 +1228,7 @@
 
 	var/occupant_status = "Scanner Unoccupied"
 	if(occupant && occupant.dna) //is there REALLY someone in there?
-		if (!istype(occupant,/mob/living/carbon/human))
+		if(!istype(occupant,/mob/living/carbon/human))
 			sleep(1)
 		if(NOCLONE in occupant.mutations)
 			occupant_status = "<span class='bad'>Invalid DNA structure</span>"
@@ -1246,14 +1246,14 @@
 	dat += "<div class='statusDisplay'>[occupant_status][scanner_status_html]</div>"
 
 	var/scanner_access_text = "Lock Scanner"
-	if (scanner.locked)
+	if(scanner.locked)
 		scanner_access_text = "Unlock Scanner"
 
 	dat += "<A href='?src=\ref[src];'>Scan</A> "
 
-	if (occupant && occupant.dna)
+	if(occupant && occupant.dna)
 		dat += "<A href='?src=\ref[src];locked=1'>[scanner_access_text]</A> "
-		if (human_occupant)
+		if(human_occupant)
 			dat += "<A href='?src=\ref[src];rejuv=1'>Inject Rejuvenators</A><br />"
 		else
 			dat += "<span class='linkOff'>Inject Rejuvenators</span><br />"
@@ -1261,12 +1261,12 @@
 		dat += "<span class='linkOff'>[scanner_access_text]</span> "
 		dat += "<span class='linkOff'>Inject Rejuvenators</span><br />"
 
-	if (!isnull(diskette))
+	if(!isnull(diskette))
 		dat += text("<A href='?src=\ref[];eject_disk=1'>Eject Disk</A><br />", src)
 
 	dat += "<br />"
 
-	if (temp_html)
+	if(temp_html)
 		dat += temp_html
 
 	popup.set_content(dat)
diff --git a/code/modules/computer3/computers/security.dm b/code/modules/computer3/computers/security.dm
index ebb218b5cee..ce6184178bf 100644
--- a/code/modules/computer3/computers/security.dm
+++ b/code/modules/computer3/computers/security.dm
@@ -51,26 +51,26 @@
 		usr.set_machine(src)
 		scan = computer.cardslot.reader
 
-		if (computer.cardslot.dualslot)
+		if(computer.cardslot.dualslot)
 			scan2 = computer.cardslot.writer
 
 		if(!interactable())
 			return
 
-		if (computer.z > 6)
+		if(computer.z > 6)
 			to_chat(usr, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
 			return
 		var/dat
 
-		if (temp)
+		if(temp)
 			dat = text("<TT>[]</TT><BR><BR><A href='?src=\ref[];choice=Clear Screen'>Clear Screen</A>", temp, src)
 		else
 			dat = text("Confirm Identity (R): <A href='?src=\ref[];choice=Confirm Identity R'>[]</A><HR>", src, (scan ? text("[]", scan.name) : "----------"))
-			if (computer.cardslot.dualslot)
+			if(computer.cardslot.dualslot)
 				dat += text("Check Identity (W): <A href='?src=\ref[];choice=Confirm Identity W'>[]</A><BR>", src, (scan2 ? text("[]", scan2.name) : "----------"))
 				if(scan2 && !scan)
 					dat += text("<div class='notice'>Insert card into reader slot to log in.</div><br>")
-			if (authenticated)
+			if(authenticated)
 				switch(screen)
 					if(1.0)
 						dat += {"
@@ -96,7 +96,7 @@
 							for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order))
 								var/crimstat = ""
 								for(var/datum/data/record/E in data_core.security)
-									if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
+									if((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
 										crimstat = E.fields["criminal"]
 								var/background
 								switch(crimstat)
@@ -126,11 +126,7 @@
 						dat += "<BR><A href='?src=\ref[src];choice=Delete All Records'>Delete All Records</A><BR><BR><A href='?src=\ref[src];choice=Return'>Back</A>"
 					if(3.0)
 						dat += "<CENTER><B>Security Record</B></CENTER><BR>"
-						if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
-							var/icon/front = new(active1.fields["photo"], dir = SOUTH)
-							var/icon/side = new(active1.fields["photo"], dir = WEST)
-							usr << browse_rsc(front, "front.png")
-							usr << browse_rsc(side, "side.png")
+						if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
 							dat += text("<table><tr><td>	\
 							Name: <A href='?src=\ref[src];choice=Edit Field;field=name'>[active1.fields["name"]]</A><BR> \
 							ID: <A href='?src=\ref[src];choice=Edit Field;field=id'>[active1.fields["id"]]</A><BR>\n	\
@@ -140,11 +136,11 @@
 							Fingerprint: <A href='?src=\ref[src];choice=Edit Field;field=fingerprint'>[active1.fields["fingerprint"]]</A><BR>\n	\
 							Physical Status: [active1.fields["p_stat"]]<BR>\n	\
 							Mental Status: [active1.fields["m_stat"]]<BR></td>	\
-							<td align = center valign = top>Photo:<br><img src=front.png height=80 width=80 border=4>	\
-							<img src=side.png height=80 width=80 border=4></td></tr></table>")
+							<td align = center valign = top>Photo:<br><img src=[active1.fields["photo-south"]] height=80 width=80 border=4>	\
+							<img src=[active1.fields["photo-west"]] height=80 width=80 border=4></td></tr></table>")
 						else
 							dat += "<B>General Record Lost!</B><BR>"
-						if ((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
+						if((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
 							dat += text("<BR>\n<CENTER><B>Security Data</B></CENTER><BR>\nCriminal Status: <A href='?src=\ref[];choice=Edit Field;field=criminal'>[]</A><BR>\n<BR>\nMinor Crimes: <A href='?src=\ref[];choice=Edit Field;field=mi_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];choice=Edit Field;field=mi_crim_d'>[]</A><BR>\n<BR>\nMajor Crimes: <A href='?src=\ref[];choice=Edit Field;field=ma_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];choice=Edit Field;field=ma_crim_d'>[]</A><BR>\n<BR>\nImportant Notes:<BR>\n\t<A href='?src=\ref[];choice=Edit Field;field=notes'>[]</A><BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src, active2.fields["criminal"], src, active2.fields["mi_crim"], src, active2.fields["mi_crim_d"], src, active2.fields["ma_crim"], src, active2.fields["ma_crim_d"], src, decode(active2.fields["notes"]))
 							var/counter = 1
 							while(active2.fields[text("com_[]", counter)])
@@ -219,9 +215,9 @@ What a mess.*/
 	Topic(href, href_list)
 		if(!interactable() || !computer.cardslot || ..(href,href_list))
 			return
-		if (!( data_core.general.Find(active1) ))
+		if(!( data_core.general.Find(active1) ))
 			active1 = null
-		if (!( data_core.security.Find(active2) ))
+		if(!( data_core.security.Find(active2) ))
 			active2 = null
 		switch(href_list["choice"])
 // SORTING!
@@ -240,13 +236,13 @@ What a mess.*/
 			if("Clear Screen")
 				temp = null
 
-			if ("Return")
+			if("Return")
 				screen = 1
 				active1 = null
 				active2 = null
 
 			if("Confirm Identity R")
-				if (scan)
+				if(scan)
 					if(istype(usr,/mob/living/carbon/human) && !usr.get_active_hand())
 						computer.cardslot.remove(1)
 					else
@@ -254,12 +250,12 @@ What a mess.*/
 					scan = null
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id))
+					if(istype(I, /obj/item/weapon/card/id))
 						computer.cardslot.insert(I, 1)
 						scan = I
 
 			if("Confirm Identity W")
-				if (scan2)
+				if(scan2)
 					if(istype(usr,/mob/living/carbon/human) && !usr.get_active_hand())
 						computer.cardslot.remove(2)
 					else
@@ -267,7 +263,7 @@ What a mess.*/
 					scan2 = null
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id))
+					if(istype(I, /obj/item/weapon/card/id))
 						computer.cardslot.insert(I, 2)
 						scan2 = I
 
@@ -278,20 +274,20 @@ What a mess.*/
 				active2 = null
 
 			if("Log In")
-				if (istype(usr, /mob/living/silicon/ai))
+				if(istype(usr, /mob/living/silicon/ai))
 					src.active1 = null
 					src.active2 = null
 					src.authenticated = usr.name
 					src.rank = "AI"
 					src.screen = 1
-				else if (istype(usr, /mob/living/silicon/robot))
+				else if(istype(usr, /mob/living/silicon/robot))
 					src.active1 = null
 					src.active2 = null
 					src.authenticated = usr.name
 					var/mob/living/silicon/robot/R = usr
 					src.rank = "[R.modtype] [R.braintype]"
 					src.screen = 1
-				else if (istype(scan, /obj/item/weapon/card/id))
+				else if(istype(scan, /obj/item/weapon/card/id))
 					active1 = null
 					active2 = null
 					if(authenticate())
@@ -301,7 +297,7 @@ What a mess.*/
 //RECORD FUNCTIONS
 			if("Search Records")
 				var/t1 = input("Search String: (Partial Name or ID or Fingerprints or Rank)", "Secure. records", null, null)  as text
-				if ((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || !interactable()))
+				if((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || !interactable()))
 					return
 				Perp = new/list()
 				t1 = lowertext(t1)
@@ -318,7 +314,7 @@ What a mess.*/
 				for(var/i = 1, i<=Perp.len, i+=2)
 					for(var/datum/data/record/E in data_core.security)
 						var/datum/data/record/R = Perp[i]
-						if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
+						if((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
 							Perp[i+1] = E
 				tempname = t1
 				screen = 4
@@ -328,56 +324,56 @@ What a mess.*/
 				active1 = null
 				active2 = null
 
-			if ("Browse Record")
+			if("Browse Record")
 				var/datum/data/record/R = locate(href_list["d_rec"])
 				var/S = locate(href_list["d_rec"])
-				if (!( data_core.general.Find(R) ))
+				if(!( data_core.general.Find(R) ))
 					temp = "Record Not Found!"
 				else
 					for(var/datum/data/record/E in data_core.security)
-						if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+						if((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 							S = E
 					active1 = R
 					active2 = S
 					screen = 3
 
-/*			if ("Search Fingerprints")
+/*			if("Search Fingerprints")
 				var/t1 = input("Search String: (Fingerprint)", "Secure. records", null, null)  as text
-				if ((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || (!interactable()) && (!istype(usr, /mob/living/silicon))))
+				if((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || (!interactable()) && (!istype(usr, /mob/living/silicon))))
 					return
 				active1 = null
 				active2 = null
 				t1 = lowertext(t1)
 				for(var/datum/data/record/R in data_core.general)
-					if (lowertext(R.fields["fingerprint"]) == t1)
+					if(lowertext(R.fields["fingerprint"]) == t1)
 						active1 = R
-				if (!( active1 ))
+				if(!( active1 ))
 					temp = text("Could not locate record [].", t1)
 				else
 					for(var/datum/data/record/E in data_core.security)
-						if ((E.fields["name"] == active1.fields["name"] || E.fields["id"] == active1.fields["id"]))
+						if((E.fields["name"] == active1.fields["name"] || E.fields["id"] == active1.fields["id"]))
 							active2 = E
 					screen = 3	*/
 
-			if ("Print Record")
-				if (!( printing ))
+			if("Print Record")
+				if(!( printing ))
 					printing = 1
 					var/datum/data/record/record1 = null
 					var/datum/data/record/record2 = null
-					if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
+					if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
 						record1 = active1
-					if ((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
+					if((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
 						record2 = active2
 					sleep(50)
 					var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( computer.loc )
 					P.info = "<CENTER><B>Security Record</B></CENTER><BR>"
-					if (record1)
+					if(record1)
 						P.info += text("Name: [] ID: []<BR>\nSex: []<BR>\nAge: []<BR>\nFingerprint: []<BR>\nPhysical Status: []<BR>\nMental Status: []<BR>", record1.fields["name"], record1.fields["id"], record1.fields["sex"], record1.fields["age"], record1.fields["fingerprint"], record1.fields["p_stat"], record1.fields["m_stat"])
 						P.name = text("Security Record ([])", record1.fields["name"])
 					else
 						P.info += "<B>General Record Lost!</B><BR>"
 						P.name = "Security Record"
-					if (record2)
+					if(record2)
 						P.info += text("<BR>\n<CENTER><B>Security Data</B></CENTER><BR>\nCriminal Status: []<BR>\n<BR>\nMinor Crimes: []<BR>\nDetails: []<BR>\n<BR>\nMajor Crimes: []<BR>\nDetails: []<BR>\n<BR>\nImportant Notes:<BR>\n\t[]<BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", record2.fields["criminal"], record2.fields["mi_crim"], record2.fields["mi_crim_d"], record2.fields["ma_crim"], record2.fields["ma_crim_d"], decode(record2.fields["notes"]))
 						var/counter = 1
 						while(record2.fields[text("com_[]", counter)])
@@ -389,47 +385,47 @@ What a mess.*/
 					printing = null
 					computer.updateUsrDialog()
 //RECORD DELETE
-			if ("Delete All Records")
+			if("Delete All Records")
 				temp = ""
 				temp += "Are you sure you wish to delete all Security records?<br>"
 				temp += "<a href='?src=\ref[src];choice=Purge All Records'>Yes</a><br>"
 				temp += "<a href='?src=\ref[src];choice=Clear Screen'>No</a>"
 
-			if ("Purge All Records")
+			if("Purge All Records")
 				for(var/datum/data/record/R in data_core.security)
 					qdel(R)
 				temp = "All Security records deleted."
 
-			if ("Add Entry")
-				if (!( istype(active2, /datum/data/record) ))
+			if("Add Entry")
+				if(!( istype(active2, /datum/data/record) ))
 					return
 				var/a2 = active2
 				var/t1 = sanitize(copytext(input("Add Comment:", "Secure. records", null, null)  as message,1,MAX_MESSAGE_LEN))
-				if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+				if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 					return
 				var/counter = 1
 				while(active2.fields[text("com_[]", counter)])
 					counter++
 				active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
 
-			if ("Delete Record (ALL)")
-				if (active1)
+			if("Delete Record (ALL)")
+				if(active1)
 					temp = "<h5>Are you sure you wish to delete the record (ALL)?</h5>"
 					temp += "<a href='?src=\ref[src];choice=Delete Record (ALL) Execute'>Yes</a><br>"
 					temp += "<a href='?src=\ref[src];choice=Clear Screen'>No</a>"
 
-			if ("Delete Record (Security)")
-				if (active2)
+			if("Delete Record (Security)")
+				if(active2)
 					temp = "<h5>Are you sure you wish to delete the record (Security Portion Only)?</h5>"
 					temp += "<a href='?src=\ref[src];choice=Delete Record (Security) Execute'>Yes</a><br>"
 					temp += "<a href='?src=\ref[src];choice=Clear Screen'>No</a>"
 
-			if ("Delete Entry")
-				if ((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])]))
+			if("Delete Entry")
+				if((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])]))
 					active2.fields[text("com_[]", href_list["del_c"])] = "<B>Deleted</B>"
 //RECORD CREATE
-			if ("New Record (Security)")
-				if ((istype(active1, /datum/data/record) && !( istype(active2, /datum/data/record) )))
+			if("New Record (Security)")
+				if((istype(active1, /datum/data/record) && !( istype(active2, /datum/data/record) )))
 					var/datum/data/record/R = new /datum/data/record()
 					R.fields["name"] = active1.fields["name"]
 					R.fields["id"] = active1.fields["id"]
@@ -444,7 +440,7 @@ What a mess.*/
 					active2 = R
 					screen = 3
 
-			if ("New Record (General)")
+			if("New Record (General)")
 				var/datum/data/record/G = new /datum/data/record()
 				G.fields["name"] = "New Record"
 				G.fields["id"] = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6))
@@ -461,72 +457,72 @@ What a mess.*/
 				active2 = null
 
 //FIELD FUNCTIONS
-			if ("Edit Field")
+			if("Edit Field")
 				var/a1 = active1
 				var/a2 = active2
 				switch(href_list["field"])
 					if("name")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null)  as text
-							if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
+							if((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
 								return
 							active1.fields["name"] = t1
 					if("id")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please input id:", "Secure. records", active1.fields["id"], null)  as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["id"] = t1
 					if("fingerprint")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null)  as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["fingerprint"] = t1
 					if("sex")
-						if (istype(active1, /datum/data/record))
-							if (active1.fields["sex"] == "Male")
+						if(istype(active1, /datum/data/record))
+							if(active1.fields["sex"] == "Male")
 								active1.fields["sex"] = "Female"
 							else
 								active1.fields["sex"] = "Male"
 					if("age")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = input("Please input age:", "Secure. records", active1.fields["age"], null)  as num
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["age"] = t1
 					if("mi_crim")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please input minor crimes list:", "Secure. records", active2.fields["mi_crim"], null)  as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["mi_crim"] = t1
 					if("mi_crim_d")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please summarize minor crimes:", "Secure. records", active2.fields["mi_crim_d"], null)  as message,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["mi_crim_d"] = t1
 					if("ma_crim")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please input major crimes list:", "Secure. records", active2.fields["ma_crim"], null)  as text,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["ma_crim"] = t1
 					if("ma_crim_d")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please summarize major crimes:", "Secure. records", active2.fields["ma_crim_d"], null)  as message,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["ma_crim_d"] = t1
 					if("notes")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							var/t1 = trim(sanitize(copytext(input("Please summarize minor crimes:", "Secure. records", active2.fields["mi_crim_d"], null)  as message,1,MAX_MESSAGE_LEN)))
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
 								return
 							active2.fields["notes"] = t1
 					if("criminal")
-						if (istype(active2, /datum/data/record))
+						if(istype(active2, /datum/data/record))
 							temp = "<h5>Criminal Status:</h5>"
 							temp += "<ul>"
 							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=none'>None</a></li>"
@@ -538,7 +534,7 @@ What a mess.*/
 					if("rank")
 						var/list/L = list( "Head of Personnel", "Captain", "AI" )
 						//This was so silly before the change. Now it actually works without beating your head against the keyboard. /N
-						if ((istype(active1, /datum/data/record) && L.Find(rank)))
+						if((istype(active1, /datum/data/record) && L.Find(rank)))
 							temp = "<h5>Rank:</h5>"
 							temp += "<ul>"
 							for(var/rank in joblist)
@@ -547,9 +543,9 @@ What a mess.*/
 						else
 							alert(usr, "You do not have the required rank to do this!")
 					if("species")
-						if (istype(active1, /datum/data/record))
+						if(istype(active1, /datum/data/record))
 							var/t1 = sanitize(copytext(input("Please enter race:", "General records", active1.fields["species"], null)  as message,1,MAX_MESSAGE_LEN))
-							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+							if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
 								return
 							active1.fields["species"] = t1
 
@@ -557,14 +553,14 @@ What a mess.*/
 			else//To properly clear as per clear screen.
 				temp=null
 				switch(href_list["choice"])
-					if ("Change Rank")
-						if (active1)
+					if("Change Rank")
+						if(active1)
 							active1.fields["rank"] = href_list["rank"]
 							if(href_list["rank"] in joblist)
 								active1.fields["real_rank"] = href_list["real_rank"]
 
-					if ("Change Criminal Status")
-						if (active2)
+					if("Change Criminal Status")
+						if(active2)
 
 							switch(href_list["criminal2"])
 								if("none")
@@ -580,18 +576,18 @@ What a mess.*/
 						for(var/mob/living/carbon/human/H in mob_list)
 							H.sec_hud_set_security_status()
 
-					if ("Delete Record (Security) Execute")
-						if (active2)
+					if("Delete Record (Security) Execute")
+						if(active2)
 							qdel(active2)
 
-					if ("Delete Record (ALL) Execute")
-						if (active1)
+					if("Delete Record (ALL) Execute")
+						if(active1)
 							for(var/datum/data/record/R in data_core.medical)
-								if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
+								if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
 									qdel(R)
 								else
 							qdel(active1)
-						if (active2)
+						if(active2)
 							qdel(active2)
 					else
 						temp = "This function does not appear to be working at the moment. Our apologies."
diff --git a/code/modules/computer3/computers/shuttle.dm b/code/modules/computer3/computers/shuttle.dm
index 236de564868..70bdb133137 100644
--- a/code/modules/computer3/computers/shuttle.dm
+++ b/code/modules/computer3/computers/shuttle.dm
@@ -13,12 +13,12 @@
 
 	attackby(var/obj/item/card/W as obj, var/mob/user as mob, params)
 		if(stat & (BROKEN|NOPOWER))	return
-		if ((!( istype(W, /obj/item/card) ) || !( ticker ) || emergency_shuttle.location != 1 || !( user )))	return
-		if (istype(W, /obj/item/card/id)||istype(W, /obj/item/device/pda))
-			if (istype(W, /obj/item/device/pda))
+		if((!( istype(W, /obj/item/card) ) || !( ticker ) || emergency_shuttle.location != 1 || !( user )))	return
+		if(istype(W, /obj/item/card/id)||istype(W, /obj/item/device/pda))
+			if(istype(W, /obj/item/device/pda))
 				var/obj/item/device/pda/pda = W
 				W = pda.id
-			if (!W:access) //no access
+			if(!W:access) //no access
 				to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
 				return
 
@@ -38,7 +38,7 @@
 				if("Authorize")
 					src.authorized -= W:registered_name
 					src.authorized += W:registered_name
-					if (src.auth_need - src.authorized.len > 0)
+					if(src.auth_need - src.authorized.len > 0)
 						message_admins("[key_name_admin(user)] has authorized early shuttle launch")
 						log_game("[user.ckey] has authorized early shuttle launch")
 						to_chat(world, text("\blue <B>Alert: [] authorizations needed until shuttle is launched early</B>", src.auth_need - src.authorized.len))
@@ -63,7 +63,7 @@
 		return
 		
 	emag_act(user as mob)
-		if (!emagged)
+		if(!emagged)
 			var/choice = alert(user, "Would you like to launch the shuttle?","Shuttle control", "Launch", "Cancel")
 
 			if(!emagged && emergency_shuttle.location == 1)
diff --git a/code/modules/computer3/computers/specops_shuttle.dm b/code/modules/computer3/computers/specops_shuttle.dm
index 8281a30479f..fa64036857d 100644
--- a/code/modules/computer3/computers/specops_shuttle.dm
+++ b/code/modules/computer3/computers/specops_shuttle.dm
@@ -55,9 +55,9 @@ var/specops_shuttle_timeleft = 0
 	specops_shuttle_moving_to_centcom = 0
 
 	specops_shuttle_at_station = 1
-	if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
+	if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
 
-	if (!specops_can_move())
+	if(!specops_can_move())
 		to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
 		return
 
@@ -179,7 +179,7 @@ var/specops_shuttle_timeleft = 0
 		to_chat(user, "\red Access Denied.")
 		return
 
-	if (sent_strike_team == 0)
+	if(sent_strike_team == 0)
 		to_chat(usr, "\red The strike team has not yet deployed.")
 		return
 
@@ -188,7 +188,7 @@ var/specops_shuttle_timeleft = 0
 
 	user.set_machine(src)
 	var/dat
-	if (temp)
+	if(temp)
 		dat = temp
 	else
 		dat += {"
@@ -208,19 +208,19 @@ var/specops_shuttle_timeleft = 0
 	if(..())
 		return
 
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 
-	if (href_list["sendtodock"])
+	if(href_list["sendtodock"])
 		if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
 
 		to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return.")
 		return
 
-	else if (href_list["sendtostation"])
+	else if(href_list["sendtostation"])
 		if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
 
-		if (!specops_can_move())
+		if(!specops_can_move())
 			to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
 			return
 
@@ -238,7 +238,7 @@ var/specops_shuttle_timeleft = 0
 		spawn(0)
 			specops_process()
 
-	else if (href_list["mainmenu"])
+	else if(href_list["mainmenu"])
 		temp = null
 
 	add_fingerprint(usr)
diff --git a/code/modules/computer3/computers/station_alert.dm b/code/modules/computer3/computers/station_alert.dm
index 850bfc83c5b..f026f36a8bb 100644
--- a/code/modules/computer3/computers/station_alert.dm
+++ b/code/modules/computer3/computers/station_alert.dm
@@ -16,18 +16,18 @@
 			return
 		var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
 		dat += "<A HREF='?src=\ref[user];mach_close=alerts'>Close</A><br><br>"
-		for (var/cat in src.alarms)
+		for(var/cat in src.alarms)
 			dat += text("<B>[]</B><BR>\n", cat)
 			var/list/L = src.alarms[cat]
-			if (L.len)
-				for (var/alarm in L)
+			if(L.len)
+				for(var/alarm in L)
 					var/list/alm = L[alarm]
 					var/area/A = alm[1]
 					var/list/sources = alm[3]
 					dat += "<NOBR>"
 					dat += "&bull; "
 					dat += "[A.name]"
-					if (sources.len > 1)
+					if(sources.len > 1)
 						dat += text(" - [] sources", sources.len)
 					dat += "</NOBR><BR>\n"
 			else
@@ -49,20 +49,20 @@
 
 	proc/triggerAlarm(var/class, area/A, var/O, var/alarmsource)
 		var/list/L = src.alarms[class]
-		for (var/I in L)
-			if (I == A.name)
+		for(var/I in L)
+			if(I == A.name)
 				var/list/alarm = L[I]
 				var/list/sources = alarm[3]
-				if (!(alarmsource in sources))
+				if(!(alarmsource in sources))
 					sources += alarmsource
 				return 1
 		var/obj/machinery/camera/C = null
 		var/list/CL = null
-		if (O && istype(O, /list))
+		if(O && istype(O, /list))
 			CL = O
-			if (CL.len == 1)
+			if(CL.len == 1)
 				C = CL[1]
-		else if (O && istype(O, /obj/machinery/camera))
+		else if(O && istype(O, /obj/machinery/camera))
 			C = O
 		L[A.name] = list(A, (C) ? C : O, list(alarmsource))
 		return 1
@@ -71,13 +71,13 @@
 	proc/cancelAlarm(var/class, area/A as area, obj/origin)
 		var/list/L = src.alarms[class]
 		var/cleared = 0
-		for (var/I in L)
-			if (I == A.name)
+		for(var/I in L)
+			if(I == A.name)
 				var/list/alarm = L[I]
 				var/list/srcs  = alarm[3]
-				if (origin in srcs)
+				if(origin in srcs)
 					srcs -= origin
-				if (srcs.len == 0)
+				if(srcs.len == 0)
 					cleared = 1
 					L -= I
 		return !cleared
@@ -86,7 +86,7 @@
 
 	process()
 		var/active_alarms = 0
-		for (var/cat in src.alarms)
+		for(var/cat in src.alarms)
 			var/list/L = src.alarms[cat]
 			if(L.len) active_alarms = 1
 		if(active_alarms)
diff --git a/code/modules/computer3/computers/syndicate_specops_shuttle.dm b/code/modules/computer3/computers/syndicate_specops_shuttle.dm
index f490cd3c822..c9a61b2dfad 100644
--- a/code/modules/computer3/computers/syndicate_specops_shuttle.dm
+++ b/code/modules/computer3/computers/syndicate_specops_shuttle.dm
@@ -55,9 +55,9 @@ var/syndicate_elite_shuttle_timeleft = 0
 	syndicate_elite_shuttle_moving_to_mothership = 0
 
 	syndicate_elite_shuttle_at_station = 1
-	if (syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
+	if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
 
-	if (!syndicate_elite_can_move())
+	if(!syndicate_elite_can_move())
 		to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
 		return
 
@@ -192,7 +192,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 		to_chat(user, "\red Access Denied.")
 		return
 
-//	if (sent_syndicate_strike_team == 0)
+//	if(sent_syndicate_strike_team == 0)
 //		to_chat(usr, "\red The strike team has not yet deployed.")
 //		return
 
@@ -201,7 +201,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 
 	user.set_machine(src)
 	var/dat
-	if (temp)
+	if(temp)
 		dat = temp
 	else
 		dat  = {"<b>Location:</b> [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]<BR>
@@ -220,19 +220,19 @@ var/syndicate_elite_shuttle_timeleft = 0
 	if(..())
 		return
 
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 
-	if (href_list["sendtodock"])
+	if(href_list["sendtodock"])
 		if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
 
 		to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.")
 		return
 
-	else if (href_list["sendtostation"])
+	else if(href_list["sendtostation"])
 		if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
 
-		if (!specops_can_move())
+		if(!specops_can_move())
 			to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
 			return
 
@@ -251,7 +251,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 			syndicate_elite_process()
 
 
-	else if (href_list["mainmenu"])
+	else if(href_list["mainmenu"])
 		temp = null
 
 	add_fingerprint(usr)
diff --git a/code/modules/computer3/computers/welcome.dm b/code/modules/computer3/computers/welcome.dm
index 11695ce5322..203c5922289 100644
--- a/code/modules/computer3/computers/welcome.dm
+++ b/code/modules/computer3/computers/welcome.dm
@@ -10,7 +10,6 @@
 
 
 	interact()
-		usr.set_machine(src)
 		if(!interactable())
 			return
 		var/dat = ""
diff --git a/code/modules/computer3/lapvend.dm b/code/modules/computer3/lapvend.dm
index 3834efd635a..ee436ee3cc0 100644
--- a/code/modules/computer3/lapvend.dm
+++ b/code/modules/computer3/lapvend.dm
@@ -29,7 +29,7 @@
 
 
 /obj/machinery/lapvend/blob_act()
-	if (prob(50))
+	if(prob(50))
 		spawn(0)
 			qdel(src)
 		return
@@ -82,7 +82,7 @@
 		dat += "<b>Total: [total()]</b><br>"
 		if(cardreader == 1)
 			dat += "<A href='?src=\ref[src];choice=single_rem'>Card Reader: (single) (50)</a><br>"
-		else if (cardreader == 2)
+		else if(cardreader == 2)
 			dat += "<A href='?src=\ref[src];choice=dual_rem'>Card Reader: (double) (125)</a><br>"
 		else
 			dat += "Card Reader: None<br>"
@@ -106,9 +106,9 @@
 			dat += "<A href='?src=\ref[src];choice=cable_rem'>Network card: Powernet (25)</a><br>"
 		else
 			dat += "Network card: None<br>"
-		if (power == 0)
+		if(power == 0)
 			dat += "Power source: Regular<br>"
-		else if (power == 1)
+		else if(power == 1)
 			dat += "<A href='?src=\ref[src];choice=high_rem'>Power source: Extended (175)</a><br>"
 		else
 			dat += "<A href='?src=\ref[src];choice=super_rem'>Power source: Unreal (250)</a><br>"
@@ -133,41 +133,41 @@
 
 
 /obj/machinery/lapvend/Topic(href, href_list)
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
 		usr.set_machine(src)
 	switch(href_list["choice"])
 		if("single_add")
 			cardreader = 1
-		if ("dual_add")
+		if("dual_add")
 			cardreader = 2
-		if ("floppy_add")
+		if("floppy_add")
 			floppy = 1
-		if ("radio_add")
+		if("radio_add")
 			radionet = 1
-		if ("camnet_add")
+		if("camnet_add")
 			camera = 1
-		if ("area_add")
+		if("area_add")
 			network = 1
-		if ("prox_add")
+		if("prox_add")
 			network = 2
-		if ("cable_add")
+		if("cable_add")
 			network = 3
-		if ("high_add")
+		if("high_add")
 			power = 1
-		if ("super_add")
+		if("super_add")
 			power = 2
 
-		if ("single_rem" || "dual_rem")
+		if("single_rem" || "dual_rem")
 			cardreader = 0
-		if ("floppy_rem")
+		if("floppy_rem")
 			floppy = 0
-		if ("radio_rem")
+		if("radio_rem")
 			radionet = 0
-		if ("camnet_rem")
+		if("camnet_rem")
 			camera = 0
-		if ("area_rem" || "prox_rem" || "cable_rem")
+		if("area_rem" || "prox_rem" || "cable_rem")
 			network = 0
-		if ("high_rem" || "super_rem")
+		if("high_rem" || "super_rem")
 			power = 0
 
 		if("vend")
@@ -194,23 +194,23 @@
 		newlap.spawn_parts += (/obj/item/part/computer/networking/radio)
 	if(camera == 1)
 		newlap.spawn_parts += (/obj/item/part/computer/networking/cameras)
-	if (network == 1)
+	if(network == 1)
 		newlap.spawn_parts += (/obj/item/part/computer/networking/area)
-	if (network == 2)
+	if(network == 2)
 		newlap.spawn_parts += (/obj/item/part/computer/networking/prox)
-	if (network == 3)
+	if(network == 3)
 		newlap.spawn_parts += (/obj/item/part/computer/networking/cable)
-	if (power == 1)
+	if(power == 1)
 		qdel(newlap.battery)
 		newlap.battery = new /obj/item/weapon/stock_parts/cell/high(newlap)
-	if (power == 2)
+	if(power == 2)
 		qdel(newlap.battery)
 		newlap.battery = new /obj/item/weapon/stock_parts/cell/super(newlap)
 
 	newlap.spawn_parts()
 
 /obj/machinery/lapvend/proc/scan_card(var/obj/item/weapon/card/I)
-	if (istype(I, /obj/item/weapon/card/id))
+	if(istype(I, /obj/item/weapon/card/id))
 		var/obj/item/weapon/card/id/C = I
 		visible_message("<span class='info'>[usr] swipes a card through [src].</span>")
 		if(vendor_account)
@@ -312,7 +312,7 @@
 		newlap.spawn_files += (/datum/file/program/communications)
 	if((access_medical in C.access) || (access_forensics_lockers in C.access)) //Gives detective the medical records program, but not the crew monitoring one.
 		newlap.spawn_files += (/datum/file/program/med_data)
-		if (access_medical in C.access)
+		if(access_medical in C.access)
 			newlap.spawn_files += (/datum/file/program/crew)
 	if(access_engine in C.access)
 		newlap.spawn_files += (/datum/file/program/powermon)
@@ -359,7 +359,7 @@
 
 
 /obj/machinery/lapvend/proc/reimburse(var/obj/item/weapon/card/I)
-	if (istype(I, /obj/item/weapon/card/id))
+	if(istype(I, /obj/item/weapon/card/id))
 		var/obj/item/weapon/card/id/C = I
 		visible_message("<span class='info'>[usr] swipes a card through [src].</span>")
 		if(vendor_account)
diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm
index 8a9d5803529..a7309803c1b 100644
--- a/code/modules/crafting/guncrafting.dm
+++ b/code/modules/crafting/guncrafting.dm
@@ -71,7 +71,7 @@
 	..()
 	if(istype(I, /obj/item/stack/packageWrap))
 		var/obj/item/stack/packageWrap/C = I
-		if (C.use(5))
+		if(C.use(5))
 			var/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/W = new /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
 			user.unEquip(src)
 			user.put_in_hands(W)
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index ab8670b3b05..21596308172 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -17,7 +17,7 @@
 	icon_state = "tatgun"
 	force = 0
 	throwforce = 0
-	w_class = 1.0
+	w_class = 1
 	var/used = 0
 	var/tattoo_name = "tiger stripe tattoo" // Tat name for visible messages
 	var/tattoo_icon = "Tiger Body" // body_accessory.dmi, new icons defined in sprite_accessories.dm
@@ -92,7 +92,7 @@
 	sharp = 0
 	edge = 0
 
-/obj/item/weapon/claymore/fluff/IsShield()
+/obj/item/weapon/claymore/fluff/hit_reaction()
 	return 0
 
 /obj/item/weapon/crowbar/fluff/zelda_creedy_1 // Zomgponies: Griffin Rowley
@@ -212,6 +212,8 @@
 	desc = "A labcoat with a few markings denoting it as the labcoat of roboticist."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "aeneasrinil_open"
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/suit/jacket/fluff/kidosvest // Anxipal: Kido Qasteth
 	name = "Kido's Vest"
@@ -222,6 +224,8 @@
 	ignore_suitadjust = 1
 	action_button_name = null
 	adjust_flavour = null
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/suit/fluff/kluys // Kluys: Cripty Pandaen
 	name = "Nano Fibre Jacket"
@@ -259,6 +263,8 @@
 	desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "labcoat_red_open"
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/suit/fluff/stobarico_greatcoat // Stobarico: F.U.R.R.Y
 	name = "\improper F.U.R.R.Y's Nanotrasen Greatcoat"
@@ -333,6 +339,8 @@
 	ignore_suitadjust = 1
 	action_button_name = null
 	adjust_flavour = null
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/under/fluff/fox
 	name = "Aeronautics Jumpsuit"
@@ -410,7 +418,7 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "chronx_robe"
 	item_state = "chronx_robe"
-	flags = ONESIZEFITSALL
+	flags_size = ONESIZEFITSALL
 	action_button_name = "Transform Robes"
 	adjust_flavour = "untransform"
 	ignore_suitadjust = 0
@@ -440,6 +448,8 @@
 	icon = 'icons/obj/clothing/ties.dmi'
 	icon_state = "vest_black"
 	item_state = "vest_black"
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/under/pants/fluff/combat
 	name = "combat pants"
@@ -455,6 +465,8 @@
 	item_state = "elliot_windbreaker_open"
 	adjust_flavour = "unzip"
 	suit_adjusted = 1
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/device/fluff/tattoo_gun/elliot_cybernetic_tat
 	desc = "A cheap plastic tattoo application pen.<br>This one seems heavily used."
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index d0b350b9b1e..345bf6e164e 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -48,7 +48,7 @@
 				to_chat(M, "<span class='notice'>Your [Item.name] has been added to your [M.back.name].</span>")
 		if(ok == 0)
 			for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
-				if (S.contents.len < S.storage_slots)
+				if(S.contents.len < S.storage_slots)
 					Item.loc = S
 					ok = 1
 					to_chat(M, "<span class='notice'>Your [Item.name] has been added to your [S.name].</span>")
@@ -58,7 +58,7 @@
 		if(newname)
 			Item.name = newname
 
-		if (ok == 0) // Finally, since everything else failed, place it on the ground
+		if(ok == 0) // Finally, since everything else failed, place it on the ground
 			Item.loc = get_turf(M.loc)
 
 		HackProperties(Item,propadjust)
diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm
index 4654e0ab665..6f62a7eecac 100644
--- a/code/modules/detective_work/evidence.dm
+++ b/code/modules/detective_work/evidence.dm
@@ -21,6 +21,10 @@
 	if(!istype(I) || I.anchored == 1)
 		return
 
+	if(istype(I, /obj/item/weapon/storage/box))
+		to_chat(user, "<span class='notice'>This box is too big to fit in the evidence bag.</span>")
+		return
+
 	if(istype(I, /obj/item/weapon/evidencebag))
 		to_chat(user, "<span class='notice'>You find putting an evidence bag in another evidence bag to be slightly absurd.</span>")
 		return 1 //now this is podracing
diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm
index 3a5e19169c0..58c1c31a3b8 100644
--- a/code/modules/detective_work/scanner.dm
+++ b/code/modules/detective_work/scanner.dm
@@ -7,7 +7,7 @@
 	desc = "Used to remotely scan objects and biomass for DNA and fingerprints. Can print a report of the findings."
 	icon = 'icons/goonstation/objects/objects.dmi'
 	icon_state = "detscanner"
-	w_class = 3.0
+	w_class = 3
 	item_state = "electronic"
 	flags = CONDUCT | NOBLUDGEON
 	slot_flags = SLOT_BELT
@@ -18,7 +18,7 @@
 /obj/item/device/detective_scanner/attack_self(var/mob/user)
 	var/search = input(user, "Enter name, fingerprint or blood DNA.", "Find record", "")
 
-	if (!search || user.stat || user.incapacitated())
+	if(!search || user.stat || user.incapacitated())
 		return
 
 	search = lowertext(search)
@@ -29,21 +29,21 @@
 
 	// I really, really wish I didn't have to split this into two seperate loops. But the datacore is awful.
 
-	for (var/record in data_core.general)
+	for(var/record in data_core.general)
 		var/datum/data/record/S = record
 		if(S && (search == lowertext(S.fields["fingerprint"]) || search == lowertext(S.fields["name"])))
 			name = S.fields["name"]
 			fingerprint = S.fields["fingerprint"]
 			continue
 
-	for (var/record in data_core.medical)
+	for(var/record in data_core.medical)
 		var/datum/data/record/M = record
-		if (M && ( search == lowertext(M.fields["b_dna"]) || name == M.fields["name"]) )
+		if(M && ( search == lowertext(M.fields["b_dna"]) || name == M.fields["name"]) )
 			dna = M.fields["b_dna"]
 
 			if(fingerprint == "FINGERPRINT NOT FOUND") // We have searched by DNA, and do not have the relevant information from the fingerprint records.
 				name = M.fields["name"]
-				for (var/gen_record in data_core.general)
+				for(var/gen_record in data_core.general)
 					var/datum/data/record/S = gen_record
 					if(S && (name == S.fields["name"]))
 						fingerprint = S.fields["fingerprint"]
@@ -132,7 +132,7 @@
 		if(ishuman(A))
 
 			var/mob/living/carbon/human/H = A
-			if (istype(H.dna, /datum/dna) && !H.gloves)
+			if(istype(H.dna, /datum/dna) && !H.gloves)
 				fingerprints += md5(H.dna.uni_identity)
 
 		else if(!ismob(A))
@@ -170,7 +170,7 @@
 				found_something = 1
 
 			// Blood
-			if (blood && blood.len)
+			if(blood && blood.len)
 				sleep(30)
 				add_log("<span class='info'><B>Blood:</B></span>")
 				found_something = 1
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index a8134a82f66..bc7ef8b118e 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -364,7 +364,7 @@ log transactions
 
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id))
+					if(istype(I, /obj/item/weapon/card/id))
 						usr.drop_item()
 						I.loc = src
 						held_card = I
diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm
index 844c5ca8bbf..9fac3da39d0 100644
--- a/code/modules/economy/Accounts.dm
+++ b/code/modules/economy/Accounts.dm
@@ -318,7 +318,7 @@ var/global/list/all_money_accounts = list()
 
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id))
+					if(istype(I, /obj/item/weapon/card/id))
 						var/obj/item/weapon/card/id/C = I
 						usr.drop_item()
 						C.loc = src
diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm
index b5cb77880f6..1293d92b2b3 100644
--- a/code/modules/economy/Accounts_DB.dm
+++ b/code/modules/economy/Accounts_DB.dm
@@ -18,7 +18,7 @@
 /obj/machinery/computer/account_database/proc/get_access_level(var/mob/user)
 	if(user.can_admin_interact())
 		return 2
-	if (!held_card)
+	if(!held_card)
 		return 0
 	if(access_cent_commander in held_card.access)
 		return 2
@@ -91,14 +91,14 @@
 	data["transactions"] = null
 	data["accounts"] = null
 
-	if (detailed_account_view)
+	if(detailed_account_view)
 		data["account_number"] = detailed_account_view.account_number
 		data["owner_name"] = detailed_account_view.owner_name
 		data["money"] = detailed_account_view.money
 		data["suspended"] = detailed_account_view.suspended
 
 		var/list/trx[0]
-		for (var/datum/transaction/T in detailed_account_view.transaction_log)
+		for(var/datum/transaction/T in detailed_account_view.transaction_log)
 			trx.Add(list(list(\
 				"date" = T.date, \
 				"time" = T.time, \
@@ -107,7 +107,7 @@
 				"amount" = T.amount, \
 				"source_terminal" = T.source_terminal)))
 
-		if (trx.len > 0)
+		if(trx.len > 0)
 			data["transactions"] = trx
 
 	var/list/accounts[0]
@@ -119,11 +119,11 @@
 			"suspended"=D.suspended ? "SUSPENDED" : "",\
 			"account_index"=i)))
 
-	if (accounts.len > 0)
+	if(accounts.len > 0)
 		data["accounts"] = accounts
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "accounts_terminal.tmpl", src.name, 400, 640)
 		ui.set_initial_data(data)
 		ui.open()
@@ -142,7 +142,7 @@
 
 		else
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/weapon/card/id))
+			if(istype(I, /obj/item/weapon/card/id))
 				var/obj/item/weapon/card/id/C = I
 				usr.drop_item()
 				C.forceMove(src)
@@ -220,7 +220,7 @@
 				var/text
 				playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1)
 				var/obj/item/weapon/paper/P = new(loc)
-				if (detailed_account_view)
+				if(detailed_account_view)
 					P.name = "account #[detailed_account_view.account_number] details"
 					var/title = "Account #[detailed_account_view.account_number] Details"
 					text = {"
@@ -242,7 +242,7 @@
 							<tbody>
 						"}
 
-					for (var/datum/transaction/T in detailed_account_view.transaction_log)
+					for(var/datum/transaction/T in detailed_account_view.transaction_log)
 						text += {"
 									<tr>
 										<td>[T.date] [T.time]</td>
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index fbb7bb4af7a..275456e0d4f 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -175,26 +175,26 @@
 					reconnect_database()
 				if(linked_db && linked_account)
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card))
+					if(istype(I, /obj/item/weapon/card))
 						scan_card(I)
 				else
 					to_chat(usr, "[bicon(src)]<span class='warning'>Unable to link accounts.</span>")
 			if("reset")
 				//reset the access code - requires HoP/captain access
 				var/obj/item/I = usr.get_active_hand()
-				if (istype(I, /obj/item/weapon/card))
+				if(istype(I, /obj/item/weapon/card))
 					var/obj/item/weapon/card/id/C = I
 					if(access_cent_commander in C.access || access_hop in C.access || access_captain in C.access)
 						access_code = 0
 						to_chat(usr, "[bicon(src)]<span class='info'>Access code reset to 0.</span>")
-				else if (istype(I, /obj/item/weapon/card/emag))
+				else if(istype(I, /obj/item/weapon/card/emag))
 					access_code = 0
 					to_chat(usr, "[bicon(src)]<span class='info'>Access code reset to 0.</span>")
 
 	src.attack_self(usr)
 
 /obj/item/device/eftpos/proc/scan_card(var/obj/item/weapon/card/I)
-	if (istype(I, /obj/item/weapon/card/id))
+	if(istype(I, /obj/item/weapon/card/id))
 		var/obj/item/weapon/card/id/C = I
 		visible_message("<span class='info'>[usr] swipes a card through [src].</span>")
 		if(transaction_locked && !transaction_paid)
diff --git a/code/modules/economy/utils.dm b/code/modules/economy/utils.dm
index 5ef9a033b6d..4fc67aa6c78 100644
--- a/code/modules/economy/utils.dm
+++ b/code/modules/economy/utils.dm
@@ -16,7 +16,7 @@
 /obj/proc/get_card_account(var/obj/item/weapon/card/I, var/mob/user=null, var/terminal_name="", var/transaction_purpose="", var/require_pin=0)
 	if(terminal_name=="")
 		terminal_name=src.name
-	if (istype(I, /obj/item/weapon/card/id))
+	if(istype(I, /obj/item/weapon/card/id))
 		var/obj/item/weapon/card/id/C = I
 		var/attempt_pin=0
 		var/datum/money_account/D = get_money_account(C.associated_account_number)
diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm
index 1b8bd092ee2..9bbab68b637 100644
--- a/code/modules/error_handler/error_viewer.dm
+++ b/code/modules/error_handler/error_viewer.dm
@@ -112,7 +112,8 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null
 
 	// Show the error to admins with debug messages turned on, but only if one
 	//  from the same source hasn't been shown too recently
-	if(error_source.next_message_at <= world.time)
+	// (Also, make sure config is initialized, or log_debug will runtime)
+	if(config && error_source.next_message_at <= world.time)
 		var/const/viewtext = "\[view]" // Nesting these in other brackets went poorly
 		log_debug("Runtime in [e.file],[e.line]: [html_encode(e.name)] [error_entry.makeLink(viewtext)]")
 		error_source.next_message_at = world.time + ERROR_MSG_DELAY
diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm
index 82a4da4cc15..13d7478aab3 100644
--- a/code/modules/events/anomaly_bluespace.dm
+++ b/code/modules/events/anomaly_bluespace.dm
@@ -42,7 +42,7 @@
 
 				var/y_distance = TO.y - FROM.y
 				var/x_distance = TO.x - FROM.x
-				for (var/atom/movable/A in range(12, FROM )) // iterate thru list of mobs in the area
+				for(var/atom/movable/A in range(12, FROM )) // iterate thru list of mobs in the area
 					if(istype(A, /obj/item/device/radio/beacon)) continue // don't teleport beacons because that's just insanely stupid
 					if(A.anchored) continue
 
diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm
index a4f620fccdf..13b5c884131 100644
--- a/code/modules/events/carp_migration.dm
+++ b/code/modules/events/carp_migration.dm
@@ -34,9 +34,9 @@
 	num_groups = min(num_groups, spawn_locations.len)
 	
 	var/i = 1
-	while (i <= num_groups)
+	while(i <= num_groups)
 		var/group_size = rand(group_size_min, group_size_max)
-		for (var/j = 1, j <= group_size, j++)
+		for(var/j = 1, j <= group_size, j++)
 			var/carptype = /mob/living/simple_animal/hostile/carp
 			if(prob(5))
 				carptype = /mob/living/simple_animal/hostile/carp/megacarp
diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm
index b7f1fb660c8..20f7f9955eb 100644
--- a/code/modules/events/dust.dm
+++ b/code/modules/events/dust.dm
@@ -73,7 +73,7 @@
 			for(var/mob/M in range(10, src))
 				if(!M.stat && !istype(M, /mob/living/silicon/ai))
 					shake_camera(M, 3, 1)
-		if (A)
+		if(A)
 			playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
 
 			if(ismob(A))
diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm
index 85ffa86f25f..00b7f76fc3e 100644
--- a/code/modules/events/event_manager.dm
+++ b/code/modules/events/event_manager.dm
@@ -337,18 +337,18 @@
 
 	var/list/event_areas = list()
 
-	for (var/areapath in the_station_areas)
+	for(var/areapath in the_station_areas)
 		event_areas += typesof(areapath)
-	for (var/areapath in safe_areas)
+	for(var/areapath in safe_areas)
 		event_areas -= typesof(areapath)
-	for (var/areapath in danger_areas)
+	for(var/areapath in danger_areas)
 		event_areas += typesof(areapath)
 
-	while (event_areas.len > 0)
+	while(event_areas.len > 0)
 		var/list/event_turfs = null
 		candidate = locate(pick_n_take(event_areas))
 		event_turfs = get_area_turfs(candidate)
-		if (event_turfs.len > 0)
+		if(event_turfs.len > 0)
 			break
 
 	return candidate
diff --git a/code/modules/events/holidays/Holidays.dm b/code/modules/events/holidays/Holidays.dm
index e06c7764a39..8b219e77d8a 100644
--- a/code/modules/events/holidays/Holidays.dm
+++ b/code/modules/events/holidays/Holidays.dm
@@ -2,7 +2,7 @@
 var/global/Holiday = null
 
 //Just thinking ahead! Here's the foundations to a more robust Holiday event system.
-//It's easy as hell to add stuff. Just set Holiday to something using the switch (or something else)
+//It's easy as hell to add stuff. Just set Holiday to something using the switch(or something else)
 //then use if(Holiday == "MyHoliday") to make stuff happen on that specific day only
 //Please, Don't spam stuff up with easter eggs, I'd rather somebody just delete this than people cause
 //the game to lag even more in the name of one-day content.
diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm
index eb2007944dd..3012b0f9535 100644
--- a/code/modules/events/immovable_rod.dm
+++ b/code/modules/events/immovable_rod.dm
@@ -54,11 +54,11 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 		x = clong.x
 		y = clong.y
 
-	if (istype(clong, /turf) || istype(clong, /obj))
+	if(istype(clong, /turf) || istype(clong, /obj))
 		if(clong.density)
 			clong.ex_act(2)
 
-	else if (istype(clong, /mob))
+	else if(istype(clong, /mob))
 		if(istype(clong, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = clong
 			H.visible_message("<span class='danger'>[H.name] is penetrated by an immovable rod!</span>" , "<span class='userdanger'>The rod penetrates you!</span>" , "<span class ='danger'>You hear a CLANG!</span>")
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index bba7949a600..20a53a4413f 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -492,7 +492,7 @@
 
 /proc/generate_static_ion_law()
 	/var/list/players = list()
-	for (var/mob/living/carbon/human/player in player_list)
+	for(var/mob/living/carbon/human/player in player_list)
 		if(	!player.mind || player.mind.assigned_role == "MODE" || player.client.inactivity > MinutesToTicks(10))
 			continue
 		players += player.real_name
diff --git a/code/modules/events/meaty_ores.dm b/code/modules/events/meaty_ores.dm
index d13a1b9ad34..df56749734e 100644
--- a/code/modules/events/meaty_ores.dm
+++ b/code/modules/events/meaty_ores.dm
@@ -26,7 +26,7 @@
 			for(var/mob/M in range(10, src))
 				if(!M.stat && !istype(M, /mob/living/silicon/ai))
 					shake_camera(M, 3, 1)
-	if (A)
+	if(A)
 		playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
 		walk(src,0)
 		invisibility = 101
diff --git a/code/modules/events/money_spam.dm b/code/modules/events/money_spam.dm
index 94f27958b9b..061a1c9efa7 100644
--- a/code/modules/events/money_spam.dm
+++ b/code/modules/events/money_spam.dm
@@ -9,7 +9,7 @@
 
 /datum/event/pda_spam/proc/pick_message_server()
 	if(message_servers)
-		for (var/obj/machinery/message_server/MS in message_servers)
+		for(var/obj/machinery/message_server/MS in message_servers)
 			if(MS.active)
 				useMS = MS
 				break
@@ -31,7 +31,7 @@
 			for(var/obj/item/device/pda/check_pda in PDAs)
 				var/datum/data/pda/app/messenger/check_m = check_pda.find_program(/datum/data/pda/app/messenger)
 
-				if (!check_m || !check_m.can_receive())
+				if(!check_m || !check_m.can_receive())
 					continue
 				viables.Add(check_pda)
 
@@ -92,12 +92,12 @@
 					"You have won tickets to the newest romantic comedy 16 RULES OF LOVE!",\
 					"You have won tickets to the newest thriller THE CULT OF THE SLEEPING ONE!")
 
-			if (useMS.send_pda_message("[P.owner]", sender, message))	//Message been filtered by spam filter.
+			if(useMS.send_pda_message("[P.owner]", sender, message))	//Message been filtered by spam filter.
 				return
 
 			last_spam_time = world.time
 
-			if (prob(50)) //Give the AI an increased chance to intercept the message
+			if(prob(50)) //Give the AI an increased chance to intercept the message
 				for(var/mob/living/silicon/ai/ai in mob_list)
 					// Allows other AIs to intercept the message but the AI won't intercept their own message.
 					if(ai.aiPDA != P && ai.aiPDA != src)
diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm
index f798e9984d4..5afddd49d23 100644
--- a/code/modules/events/radiation_storm.dm
+++ b/code/modules/events/radiation_storm.dm
@@ -49,7 +49,7 @@
 					H.apply_effect((rand(15,35)),IRRADIATE,0)
 					if(prob(5))
 						H.apply_effect((rand(40,70)),IRRADIATE,0)
-						if (prob(75))
+						if(prob(75))
 							randmutb(H) // Applies bad mutation
 							domutcheck(H,null,1)
 						else
diff --git a/code/modules/fish/fish_eggs.dm b/code/modules/fish/fish_eggs.dm
index e4283718a53..493f3dcf1db 100644
--- a/code/modules/fish/fish_eggs.dm
+++ b/code/modules/fish/fish_eggs.dm
@@ -4,7 +4,7 @@
 	desc = "Eggs laid by a fish. This cluster seems... empty?"
 	icon = 'icons/obj/fish_items.dmi'
 	icon_state = "eggs"
-	w_class = 2.0
+	w_class = 2
 	var/fish_type = null			//Holds the name of the fish that the egg is for
 
 /obj/item/fish_eggs/New()
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index 00659104480..0266f06df90 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -23,7 +23,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
 	icon_state = "egg_scoop"
 	slot_flags = SLOT_BELT
 	throwforce = 0
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 7
 
@@ -34,7 +34,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
 	icon_state = "net"
 	slot_flags = SLOT_BELT
 	throwforce = 0
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 7
 
@@ -48,7 +48,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
 	icon = 'icons/obj/fish_items.dmi'
 	icon_state = "fish_food"
 	throwforce = 1
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 7
 
@@ -59,7 +59,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
 	icon_state = "brush"
 	slot_flags = SLOT_BELT
 	throwforce = 0
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 7
 	attack_verb = list("scrubbed", "brushed", "scraped")
@@ -103,7 +103,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
 	icon = 'icons/obj/fish_items.dmi'
 	icon_state = "fish"
 	throwforce = 1
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 7
 	force = 1
diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm
index 6da71b3adb2..005fce56df0 100644
--- a/code/modules/fish/fishtank.dm
+++ b/code/modules/fish/fishtank.dm
@@ -415,7 +415,7 @@
 		examine_message += "\The [src] is about three-quarters filled. "
 	else if(water_level < water_capacity)
 		examine_message += "\The [src] is nearly full! "
-	else if (water_level == water_capacity)
+	else if(water_level == water_capacity)
 		examine_message += "\The [src] is full! "
 
 	examine_message += "<br>Cleanliness level: "
@@ -558,7 +558,7 @@
 
 /obj/machinery/fishtank/attack_slime(mob/living/user as mob)
 	var/mob/living/carbon/slime/S = user
-	if (!S.is_adult)
+	if(!S.is_adult)
 		return
 	attack_generic(user, rand(10, 15))
 
@@ -567,7 +567,7 @@
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
 		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
 		destroy()
-	else if (usr.a_intent == I_HARM)
+	else if(usr.a_intent == I_HARM)
 		user.changeNext_move(CLICK_CD_MELEE)
 		playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
 		usr.visible_message("<span class='danger'>[usr.name] bangs against the [src.name]!</span>", \
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index c284660fe04..42eda2be496 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -376,7 +376,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 		if(!(locate(clone.l_hand) in non_fakeattack_weapons))
 			clone_weapon = clone.l_hand.name
 			F.weap = clone.l_hand
-	else if (clone.r_hand)
+	else if(clone.r_hand)
 		if(!(locate(clone.r_hand) in non_fakeattack_weapons))
 			clone_weapon = clone.r_hand.name
 			F.weap = clone.r_hand
diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm
index 5a40ea1934a..acce72c7f7a 100644
--- a/code/modules/flufftext/TextFilters.dm
+++ b/code/modules/flufftext/TextFilters.dm
@@ -33,7 +33,7 @@ proc/NewStutter(phrase,stunned)
 	if(stunned) i = split_phrase.len
 	for(,i > 0,i--) //Pick a few words to stutter on.
 
-		if (!unstuttered_words.len)
+		if(!unstuttered_words.len)
 			break
 		var/word = pick(unstuttered_words)
 		unstuttered_words -= word //Remove from unstuttered words so we don't stutter it again.
diff --git a/code/modules/food/cooker.dm b/code/modules/food/cooker.dm
index 40e04817209..706ea0e367b 100644
--- a/code/modules/food/cooker.dm
+++ b/code/modules/food/cooker.dm
@@ -9,16 +9,18 @@
 	var/on = 0
 	var/onicon = null
 	var/officon = null
+	var/openicon = null
 	var/thiscooktype = null
 	var/burns = 0				// whether a machine burns something - if it does, you probably want to add the cooktype to /snacks/badrecipe
 	var/firechance = 0
 	var/cooktime = 0
 	var/foodcolor = null
 	var/has_specials = 0		//Set to 1 if the machine has specials to check, otherwise leave it at 0
+	var/upgradeable = 0			//Set to 1 if the machine supports upgrades / deconstruction, or else it will ignore stuff like screwdrivers and parts exchangers
 
 // checks if the snack has been cooked in a certain way
 /obj/machinery/cooker/proc/checkCooked(obj/item/weapon/reagent_containers/food/snacks/D)
-	if (D.cooktype[thiscooktype])
+	if(D.cooktype[thiscooktype])
 		return 1
 	return 0
 
@@ -65,7 +67,7 @@
 	var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread()    // burning things makes smoke!
 	smoke.set_up(5, 0, src)
 	smoke.start()
-	if (prob(firechance))
+	if(prob(firechance))
 		var/turf/location = get_turf(src)
 		var/obj/effect/decal/cleanable/liquid_fuel/oil = new(location)
 		oil.name = "fat"
@@ -91,9 +93,24 @@
 	return type
 
 /obj/machinery/cooker/attackby(obj/item/I, mob/user, params)
+	if(upgradeable)
+	//Not all cooker types currently support build/upgrade stuff, so not all of it will work well with this
+	//Until we decide whether or not we want to bring back the cereal maker or old grill/oven in some form, this initial check will have to suffice
+		if(isscrewdriver(I))
+			default_deconstruction_screwdriver(user, openicon, officon, I)
+			return
+		if(iscrowbar(I))
+			default_deconstruction_crowbar(I)
+			return
+		if(istype(I, /obj/item/weapon/storage/part_replacer))
+			exchange_parts(user, I)
+			return
 	if(stat & (NOPOWER|BROKEN))
 		return
-	if (!checkValid(I, user))
+	if(panel_open)
+		to_chat(user, "<span class='warning'>Close the panel first!</span>")
+		return
+	if(!checkValid(I, user))
 		return
 	if(!burns)
 		if(istype(I, /obj/item/weapon/reagent_containers/food/snacks))
diff --git a/code/modules/food/customizables.dm b/code/modules/food/customizables.dm
index ff1ff9f6ad5..d14731f9add 100644
--- a/code/modules/food/customizables.dm
+++ b/code/modules/food/customizables.dm
@@ -425,24 +425,24 @@
 			continue
 
 
-		if (istype(ing, /obj/item/weapon/reagent_containers/food/snacks/customizable))				// split the ingredients into ones with basenames (sandwich, burger, etc) and ones without, keeping track of how many of each there are
+		if(istype(ing, /obj/item/weapon/reagent_containers/food/snacks/customizable))				// split the ingredients into ones with basenames (sandwich, burger, etc) and ones without, keeping track of how many of each there are
 			var/obj/item/weapon/reagent_containers/food/snacks/customizable/gettype = ing
-			if (unsortedtypes[gettype.basename])
+			if(unsortedtypes[gettype.basename])
 				unsortedtypes[gettype.basename]++
-				if (unsortedtypes[gettype.basename] > ct)
+				if(unsortedtypes[gettype.basename] > ct)
 					ct = unsortedtypes[gettype.basename]
 			else
 				(unsortedtypes[gettype.basename]) = 1
-				if (unsortedtypes[gettype.basename] > ct)
+				if(unsortedtypes[gettype.basename] > ct)
 					ct = unsortedtypes[gettype.basename]
 		else
 			if(unsorteditems[ing.name])
 				unsorteditems[ing.name]++
-				if (unsorteditems[ing.name] > ci)
+				if(unsorteditems[ing.name] > ci)
 					ci = unsorteditems[ing.name]
 			else
 				unsorteditems[ing.name] = 1
-				if (unsorteditems[ing.name] > ci)
+				if(unsorteditems[ing.name] > ci)
 					ci = unsorteditems[ing.name]
 
 	sorteditems = sortlist(unsorteditems, ci)				//order both types going from the lowest number to the highest number
@@ -450,30 +450,30 @@
 
 	for(var/ings in sorteditems)			   //add the non-basename items to the name, sorting out the , and the and
 		c++
-		if (c == sorteditems.len - 1)
+		if(c == sorteditems.len - 1)
 			seperator = " and "
-		else if (c == sorteditems.len)
+		else if(c == sorteditems.len)
 			seperator = " "
 		else
 			seperator = ", "
 
-		if (sorteditems[ings] > levels.len)
+		if(sorteditems[ings] > levels.len)
 			sorteditems[ings] = levels.len
 
-		if (sorteditems[ings] <= 1)
+		if(sorteditems[ings] <= 1)
 			sendback +="[ings][seperator]"
 		else
 			sendback +="[levels[sorteditems[ings]]] [ings][seperator]"
 
-	for (var/ingtype in sortedtypes)   // now add the types basenames, keeping the src one seperate so it can go on the end
-		if (sortedtypes[ingtype] > levels.len)
+	for(var/ingtype in sortedtypes)   // now add the types basenames, keeping the src one seperate so it can go on the end
+		if(sortedtypes[ingtype] > levels.len)
 			sortedtypes[ingtype] = levels.len
-		if (ingtype == basename)
-			if (sortedtypes[ingtype] < levels.len)
+		if(ingtype == basename)
+			if(sortedtypes[ingtype] < levels.len)
 				sortedtypes[ingtype]++
 			endpart = "[levels[sortedtypes[ingtype]]] decker [basename]"
 			continue
-		if (sortedtypes[ingtype] >= 2)
+		if(sortedtypes[ingtype] >= 2)
 			sendback += "[levels[sortedtypes[ingtype]]] decker [ingtype] "
 		else
 			sendback += "[ingtype] "
@@ -491,7 +491,7 @@
 	var/sorted[0]
 	for(var/i = 1, i<= highest, i++)
 		for(var/it in unsorted)
-			if (unsorted[it] == i)
+			if(unsorted[it] == i)
 				sorted[it] = i
 	return sorted
 
diff --git a/code/modules/food/deep_fryer.dm b/code/modules/food/deep_fryer.dm
index 96e5fb94c57..b5aaef15fec 100644
--- a/code/modules/food/deep_fryer.dm
+++ b/code/modules/food/deep_fryer.dm
@@ -10,8 +10,34 @@
 	foodcolor = "#FFAD33"
 	officon = "fryer_off"
 	onicon = "fryer_on"
+	openicon = "fryer_open"
 	has_specials = 1
+	upgradeable = 1
 
+/obj/machinery/cooker/deepfryer/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/deepfryer(null)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
+	component_parts += new /obj/item/stack/cable_coil(null, 5)
+	RefreshParts()
+
+/obj/machinery/cooker/deepfryer/upgraded/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/deepfryer(null)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null)
+	component_parts += new /obj/item/stack/cable_coil(null, 5)
+	RefreshParts()
+
+/obj/machinery/cooker/deepfryer/RefreshParts()
+	var/E = 0
+	for(var/obj/item/weapon/stock_parts/micro_laser/L in component_parts)
+		E += L.rating
+	E -= 2		//Standard parts is 0 (1+1-2), Tier 4 parts is 6 (4+4-2)
+	cooktime = (200 - (E * 20))		//Effectively each laser improves cooktime by 20 per rating beyond the first (200 base, 80 max upgrade)
 
 /obj/machinery/cooker/deepfryer/gettype()
 	var/obj/item/weapon/reagent_containers/food/snacks/deepfryholder/type = new(get_turf(src))
@@ -20,13 +46,13 @@
 /obj/machinery/cooker/deepfryer/checkSpecials(obj/item/I)
 	if(!I)
 		return 0
-	for (var/Type in subtypesof(/datum/deepfryer_special))
+	for(var/Type in subtypesof(/datum/deepfryer_special))
 		var/datum/deepfryer_special/P = new Type()
 		if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/grown))
 			var/obj/item/weapon/reagent_containers/food/snacks/grown/G = I
 			if(G.seed.kitchen_tag != P.input)
 				continue
-		else if (!istype(I, P.input))
+		else if(!istype(I, P.input))
 			continue
 		return P
 	return 0
diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm
index 105bc4d0282..9ee3ff3343e 100644
--- a/code/modules/food/recipes_oven.dm
+++ b/code/modules/food/recipes_oven.dm
@@ -185,9 +185,9 @@
 		return being_cooked
 	check_items(var/obj/container as obj)
 		. = ..()
-		if (.)
+		if(.)
 			var/obj/item/weapon/paper/paper = locate() in container
-			if (!paper || !paper.info)
+			if(!paper || !paper.info)
 				return -1
 		return .
 
diff --git a/code/modules/garbage_collection/garbage_collector.dm b/code/modules/garbage_collection/garbage_collector.dm
index aa8933c42de..844b7f2dd38 100644
--- a/code/modules/garbage_collection/garbage_collector.dm
+++ b/code/modules/garbage_collection/garbage_collector.dm
@@ -129,14 +129,14 @@ var/global/datum/controller/process/garbage_collector/garbageCollector
 				return
 			if(QDEL_HINT_IWILLGC)   //functionally the same as the above. qdel should assume the object will gc on its own, and not check it.
 				return
-			if (QDEL_HINT_HARDDEL_NOW)  //qdel should assume this object won't gc, and hard del it post haste.
+			if(QDEL_HINT_HARDDEL_NOW)  //qdel should assume this object won't gc, and hard del it post haste.
 				D.hard_deleted = -1 // -1 means "this hard del skipped the queue", used for profiling
 				del(D)
 				if(garbageCollector)
 					garbageCollector.dels_count++
-			if (QDEL_HINT_PUTINPOOL)  //qdel will put this object in the pool.
+			if(QDEL_HINT_PUTINPOOL)  //qdel will put this object in the pool.
 				PlaceInPool(D,0)
-			if (QDEL_HINT_FINDREFERENCE)//qdel will, if TESTING is enabled, display all references to this object, then queue the object for deletion.
+			if(QDEL_HINT_FINDREFERENCE)//qdel will, if TESTING is enabled, display all references to this object, then queue the object for deletion.
 				#ifdef TESTING
 				D.find_references(remove_from_queue = FALSE)
 				#endif
@@ -148,9 +148,9 @@ var/global/datum/controller/process/garbage_collector/garbageCollector
 
 // Returns 1 if the object has been queued for deletion.
 /proc/qdeleted(var/datum/D)
-	if (!istype(D))
+	if(!istype(D))
 		return 0
-	if (!isnull(D.gcDestroyed))
+	if(!isnull(D.gcDestroyed))
 		return 1
 	return 0
 
diff --git a/code/modules/garbage_collection/gc_testing.dm b/code/modules/garbage_collection/gc_testing.dm
index 25fc4bef495..686b39a8542 100644
--- a/code/modules/garbage_collection/gc_testing.dm
+++ b/code/modules/garbage_collection/gc_testing.dm
@@ -71,17 +71,17 @@ var/global/list/ghdels_profiled = list()
 		code = 2
 	switch(code)
 		if(0) // Directly deleted (skipped the GC queue entirely)
-			if (!("[type]" in dels_profiled))
+			if(!("[type]" in dels_profiled))
 				dels_profiled["[type]"] = 0
 
 			dels_profiled["[type]"] += 1
 		if(1) // Hard-deleted by the GC
-			if (!("[type]" in ghdels_profiled))
+			if(!("[type]" in ghdels_profiled))
 				ghdels_profiled["[type]"] = 0
 
 			ghdels_profiled["[type]"] += 1
 		if(2) // qdel'd and garbage collected by BYOND
-			if (!("[type]" in gdels_profiled))
+			if(!("[type]" in gdels_profiled))
 				gdels_profiled["[type]"] = 0
 
 			gdels_profiled["[type]"] += 1
@@ -117,7 +117,7 @@ var/global/list/ghdels_profiled = list()
 		L.Swap(i,s)
 
 	var/dat = "<table border='1' id='[anchorid]'><tr><th colspan='2'>[header]</th></tr>"
-	for (var/t in L)
+	for(var/t in L)
 		dat +="<tr><td>[L[t]]</td><td>[t]</td></tr>"
 	dat += "</table>"
 	return dat
diff --git a/code/modules/holiday/christmas.dm b/code/modules/holiday/christmas.dm
index 765792e5da1..7dccff585d8 100644
--- a/code/modules/holiday/christmas.dm
+++ b/code/modules/holiday/christmas.dm
@@ -61,5 +61,5 @@
 	icon_state = "xmashat"
 	desc = "A crappy paper hat that you are REQUIRED to wear."
 	flags_inv = 0
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index b6dc4eee727..23a5447f1d4 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -254,7 +254,7 @@
 					for(var/i=0,i<2,i++)
 						var/obj/item/stack/sheet/wood/NG = new (user.loc)
 						NG.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
-						for (var/obj/item/stack/sheet/wood/G in user.loc)
+						for(var/obj/item/stack/sheet/wood/G in user.loc)
 							if(G==NG)
 								continue
 							if(G.amount>=G.max_amount)
@@ -325,7 +325,7 @@
 			else
 				user.visible_message("<span class='danger'>[M] has been attacked with [src] by [user]!</span>")
 
-			if (hitsound)
+			if(hitsound)
 				playsound(loc, hitsound, 50, 1, -1)
 			switch(damtype)
 				if("brute")
@@ -407,7 +407,7 @@
 				for(var/i=0,i<2,i++)
 					var/obj/item/stack/tile/grass/G = new (user.loc)
 					G.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
-					for (var/obj/item/stack/tile/grass/NG in user.loc)
+					for(var/obj/item/stack/tile/grass/NG in user.loc)
 						if(G==NG)
 							continue
 						if(NG.amount>=NG.max_amount)
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index 40ecc2938e9..39e94160275 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -110,7 +110,7 @@
 	icon = 'icons/obj/trash.dmi'
 	icon_state = "corncob"
 	item_state = "corncob"
-	w_class = 2.0
+	w_class = 2
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
@@ -129,7 +129,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "banana_peel"
 	item_state = "banana_peel"
-	w_class = 2.0
+	w_class = 2
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
@@ -143,7 +143,7 @@
 	icon = 'icons/obj/harvest.dmi'
 	icon_state = "sunflower"
 	item_state = "sunflower"
-	w_class = 2.0
+	w_class = 2
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
@@ -161,7 +161,7 @@
 	icon = 'icons/obj/harvest.dmi'
 	icon_state = "novaflower"
 	item_state = "sunflower"
-	w_class = 2.0
+	w_class = 2
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
diff --git a/code/modules/hydroponics/hydro_reagents.dm b/code/modules/hydroponics/hydro_reagents.dm
index 5e5cb819b98..db19d0832c9 100644
--- a/code/modules/hydroponics/hydro_reagents.dm
+++ b/code/modules/hydroponics/hydro_reagents.dm
@@ -5,7 +5,7 @@
 	flags = OPENCONTAINER | NOBLUDGEON
 	slot_flags = SLOT_BELT
 	throwforce = 4
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 2
 	throw_range = 10
 	var/toxicity = 4
@@ -93,7 +93,7 @@
 	icon_state = "bottle16"
 	flags = OPENCONTAINER
 	possible_transfer_amounts = null
-	w_class = 2.0
+	w_class = 2
 
 	var/fertilizer //Reagent contained, if any.
 
diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm
index b820a7ad35f..42323841094 100644
--- a/code/modules/hydroponics/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines.dm
@@ -3,7 +3,7 @@
 	desc = "A small disk used for carrying data on plant genetics."
 	icon = 'icons/obj/hydroponics_machines.dmi'
 	icon_state = "disk"
-	w_class = 1.0
+	w_class = 1
 
 	var/list/genes = list()
 	var/genesource = "unknown"
@@ -151,7 +151,7 @@
 
 /obj/machinery/botany/extractor/RefreshParts()
 	var/tier = 1
-	for (var/obj/item/weapon/stock_parts/scanning_module/S in component_parts)
+	for(var/obj/item/weapon/stock_parts/scanning_module/S in component_parts)
 		tier = S.rating
 	degrade_lower = 25 - (tier * 5)		//Tier 1: 20, Tier 4: 5
 	degrade_upper = 70 - (tier * 10)	//Tier 1: 60, Tier 4: 30
@@ -191,7 +191,7 @@
 		data["sourceName"] = 0
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "botany_isolator.tmpl", "Lysis-isolation Centrifuge UI", 470, 450)
 		ui.set_initial_data(data)
 		ui.open()
@@ -302,7 +302,7 @@
 
 /obj/machinery/botany/editor/RefreshParts()
 	var/tier = 1
-	for (var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
 		tier = M.rating
 	degrade_lower = 6 - tier		//Tier 1: 5, Tier 4: 1
 	degrade_upper = 11 - tier		//Tier 1: 10, Tier 4: 6
@@ -341,7 +341,7 @@
 		data["loaded"] = 0
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "botany_editor.tmpl", "Bioballistic Delivery UI", 470, 450)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index c97238b490d..1749181b329 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -5,7 +5,7 @@ var/global/list/plant_seed_sprites = list()
 	name = "packet of seeds"
 	icon = 'icons/obj/seeds.dmi'
 	icon_state = "blank"
-	w_class = 2.0
+	w_class = 2
 
 	var/seed_type
 	var/datum/seed/seed
diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index fe905595677..fa5b8e311f3 100644
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -13,7 +13,7 @@
 	src.ID = ID
 
 /datum/seed_pile/proc/matches(var/obj/item/seeds/O)
-	if (O.seed == seed_type)
+	if(O.seed == seed_type)
 		return 1
 	return 0
 
@@ -52,52 +52,52 @@
 	interact(user)
 
 /obj/machinery/seed_storage/interact(mob/user as mob)
-	if (..())
+	if(..())
 		return
 
-	if (!initialized)
+	if(!initialized)
 		for(var/typepath in starting_seeds)
 			var/amount = starting_seeds[typepath]
 			if(isnull(amount)) amount = 1
 
-			for (var/i = 1 to amount)
+			for(var/i = 1 to amount)
 				var/O = new typepath
 				add(O)
 		initialized = 1
 
 	var/dat = "<center><h1>Seed storage contents</h1></center>"
-	if (piles.len == 0)
+	if(piles.len == 0)
 		dat += "<font color='red'>No seeds</font>"
 	else
 		dat += "<table style='text-align:center;border-style:solid;border-width:1px;padding:4px'><tr><td>Name</td>"
 		dat += "<td>Variety</td>"
-		if ("stats" in scanner)
+		if("stats" in scanner)
 			dat += "<td>E</td><td>Y</td><td>M</td><td>Pr</td><td>Pt</td><td>Harvest</td>"
-		if ("temperature" in scanner)
+		if("temperature" in scanner)
 			dat += "<td>Temp</td>"
-		if ("light" in scanner)
+		if("light" in scanner)
 			dat += "<td>Light</td>"
-		if ("soil" in scanner)
+		if("soil" in scanner)
 			dat += "<td>Nutri</td><td>Water</td>"
 		dat += "<td>Notes</td><td>Amount</td><td></td></tr>"
-		for (var/datum/seed_pile/S in piles)
+		for(var/datum/seed_pile/S in piles)
 			var/datum/seed/seed = S.seed_type
 			if(!seed)
 				continue
 			dat += "<tr>"
 			dat += "<td>[seed.seed_name]</td>"
 			dat += "<td>#[seed.uid]</td>"
-			if ("stats" in scanner)
+			if("stats" in scanner)
 				dat += "<td>[seed.get_trait(TRAIT_ENDURANCE)]</td><td>[seed.get_trait(TRAIT_YIELD)]</td><td>[seed.get_trait(TRAIT_MATURATION)]</td><td>[seed.get_trait(TRAIT_PRODUCTION)]</td><td>[seed.get_trait(TRAIT_POTENCY)]</td>"
 				if(seed.get_trait(TRAIT_HARVEST_REPEAT))
 					dat += "<td>Multiple</td>"
 				else
 					dat += "<td>Single</td>"
-			if ("temperature" in scanner)
+			if("temperature" in scanner)
 				dat += "<td>[seed.get_trait(TRAIT_IDEAL_HEAT)] K</td>"
-			if ("light" in scanner)
+			if("light" in scanner)
 				dat += "<td>[seed.get_trait(TRAIT_IDEAL_LIGHT)] L</td>"
-			if ("soil" in scanner)
+			if("soil" in scanner)
 				if(seed.get_trait(TRAIT_REQUIRES_NUTRIENTS))
 					if(seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) < 0.05)
 						dat += "<td>Low</td>"
@@ -128,17 +128,17 @@
 					dat += "VINE "
 				if(2)
 					dat	+= "<font color='red'>VINE </font>"
-			if ("pressure" in scanner)
+			if("pressure" in scanner)
 				if(seed.get_trait(TRAIT_LOWKPA_TOLERANCE) < 20)
 					dat += "LP "
 				if(seed.get_trait(TRAIT_HIGHKPA_TOLERANCE) > 220)
 					dat += "HP "
-			if ("temperature" in scanner)
+			if("temperature" in scanner)
 				if(seed.get_trait(TRAIT_HEAT_TOLERANCE) > 30)
 					dat += "TEMRES "
 				else if(seed.get_trait(TRAIT_HEAT_TOLERANCE) < 10)
 					dat += "TEMSEN "
-			if ("light" in scanner)
+			if("light" in scanner)
 				if(seed.get_trait(TRAIT_LIGHT_TOLERANCE) > 10)
 					dat += "LIGRES "
 				else if(seed.get_trait(TRAIT_LIGHT_TOLERANCE) < 3)
@@ -157,7 +157,7 @@
 				dat += "WEEDRES "
 			if(seed.get_trait(TRAIT_PARASITE))
 				dat += "PAR "
-			if ("temperature" in scanner)
+			if("temperature" in scanner)
 				if(seed.get_trait(TRAIT_ALTER_TEMP) > 0)
 					dat += "TEMP+ "
 				if(seed.get_trait(TRAIT_ALTER_TEMP) < 0)
@@ -174,27 +174,27 @@
 	onclose(user, "seedstorage")
 
 /obj/machinery/seed_storage/Topic(var/href, var/list/href_list)
-	if (..())
+	if(..())
 		return
 	var/task = href_list["task"]
 	var/ID = text2num(href_list["id"])
 
-	for (var/datum/seed_pile/N in piles)
-		if (N.ID == ID)
-			if (task == "vend")
+	for(var/datum/seed_pile/N in piles)
+		if(N.ID == ID)
+			if(task == "vend")
 				var/obj/O = pick(N.seeds)
-				if (O)
+				if(O)
 					--N.amount
 					N.seeds -= O
-					if (N.amount <= 0 || N.seeds.len <= 0)
+					if(N.amount <= 0 || N.seeds.len <= 0)
 						piles -= N
 						qdel(N)
 					O.loc = src.loc
 				else
 					piles -= N
 					qdel(N)
-			else if (task == "purge")
-				for (var/obj/O in N.seeds)
+			else if(task == "purge")
+				for(var/obj/O in N.seeds)
 					qdel(O)
 					piles -= N
 					qdel(N)
@@ -202,17 +202,17 @@
 	updateUsrDialog()
 
 /obj/machinery/seed_storage/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if (istype(O, /obj/item/seeds))
+	if(istype(O, /obj/item/seeds))
 		add(O)
 		user.visible_message("[user] puts \the [O.name] into \the [src].", "You put \the [O] into \the [src].")
 		return
-	else if (istype(O, /obj/item/weapon/storage/bag/plants))
+	else if(istype(O, /obj/item/weapon/storage/bag/plants))
 		var/obj/item/weapon/storage/P = O
 		var/loaded = 0
 		for(var/obj/item/seeds/G in P.contents)
 			++loaded
 			add(G)
-		if (loaded)
+		if(loaded)
 			user.visible_message("[user] puts the seeds from \the [O.name] into \the [src].", "You put the seeds from \the [O.name] into \the [src].")
 		else
 			to_chat(user, "<span class='notice'>There are no seeds in \the [O.name].</span>")
@@ -223,7 +223,7 @@
 		to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].")
 
 /obj/machinery/seed_storage/proc/add(var/obj/item/seeds/O as obj)
-	if (istype(O.loc, /mob))
+	if(istype(O.loc, /mob))
 		var/mob/user = O.loc
 		user.drop_item(O)
 	else if(istype(O.loc,/obj/item/weapon/storage))
@@ -233,8 +233,8 @@
 	O.loc = src
 	var/newID = 0
 
-	for (var/datum/seed_pile/N in piles)
-		if (N.matches(O))
+	for(var/datum/seed_pile/N in piles)
+		if(N.matches(O))
 			++N.amount
 			N.seeds += (O)
 			return
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index c26d5b98bad..21dc0dad4af 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -259,11 +259,11 @@
 			die_off()
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				die_off()
 				return
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				die_off()
 				return
 		else
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 74a8d7824dc..b45fd4070fe 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -112,7 +112,7 @@
 
 /obj/machinery/portable_atmospherics/hydroponics/RefreshParts()
 	var/tmp_capacity = 0
-	for (var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
+	for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
 		tmp_capacity += M.rating
 	maxwater = tmp_capacity * 50 // Up to 300
 	maxnutri = tmp_capacity * 5 // Up to 30
@@ -427,7 +427,7 @@
 
 	//--FalseIncarnate
 	//Check if held item is an open container
-	if (O.is_open_container())
+	if(O.is_open_container())
 		//Check if container is of the "glass" subtype (includes buckets, beakers, vials)
 		if(istype(O, /obj/item/weapon/reagent_containers/glass))
 			var/obj/item/weapon/reagent_containers/glass/C = O
@@ -471,7 +471,7 @@
 			update_icon()
 
 		//Check if container is any spray container
-		else if (istype(O, /obj/item/weapon/reagent_containers/spray))
+		else if(istype(O, /obj/item/weapon/reagent_containers/spray))
 			var/obj/item/weapon/reagent_containers/spray/S = O
 			//Check if there is a plant in the tray
 			if(seed)
@@ -537,7 +537,7 @@
 
 		var/obj/item/weapon/reagent_containers/syringe/S = O
 
-		if (S.mode == 1)
+		if(S.mode == 1)
 			if(seed)
 				return ..()
 			else
@@ -551,7 +551,7 @@
 				to_chat(user, "There's nothing to draw something from.")
 			return 1
 
-	else if (istype(O, /obj/item/seeds))
+	else if(istype(O, /obj/item/seeds))
 
 		if(!seed)
 
@@ -579,7 +579,7 @@
 		else
 			to_chat(user, "<span class='danger'>\The [src] already has seeds in it!</span>")
 
-	else if (istype(O, /obj/item/weapon/minihoe))  // The minihoe
+	else if(istype(O, /obj/item/weapon/minihoe))  // The minihoe
 
 		if(weedlevel > 0)
 			user.visible_message("<span class='danger'>[user] starts uprooting the weeds.</span>", "<span class='danger'>You remove the weeds from the [src].</span>")
@@ -588,12 +588,12 @@
 		else
 			to_chat(user, "<span class='danger'>This plot is completely devoid of weeds. It doesn't need uprooting.</span>")
 
-	else if (istype(O, /obj/item/weapon/storage/bag/plants))
+	else if(istype(O, /obj/item/weapon/storage/bag/plants))
 
 		attack_hand(user)
 
 		var/obj/item/weapon/storage/bag/plants/S = O
-		for (var/obj/item/weapon/reagent_containers/food/snacks/grown/G in locate(user.x,user.y,user.z))
+		for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in locate(user.x,user.y,user.z))
 			if(!S.can_be_inserted(G))
 				return
 			S.handle_item_insertion(G, 1)
@@ -608,8 +608,8 @@
 		anchored = !anchored
 		to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].")
 
-	else if ((istype(O, /obj/item/weapon/tank) && !( src.destroyed )))
-		if (src.holding)
+	else if((istype(O, /obj/item/weapon/tank) && !( src.destroyed )))
+		if(src.holding)
 			to_chat(user, "\blue There is alreadu a tank loaded into the [src].")
 			return
 		var/obj/item/weapon/tank/T = O
diff --git a/code/modules/hydroponics/trays/tray_apiary.dm b/code/modules/hydroponics/trays/tray_apiary.dm
index 25a2698d274..9ecf2bcb2fc 100644
--- a/code/modules/hydroponics/trays/tray_apiary.dm
+++ b/code/modules/hydroponics/trays/tray_apiary.dm
@@ -36,7 +36,7 @@
 		if(!yieldmod)
 			yieldmod += 1
 //			to_chat(world, "Yield increased by 1, from 0, to a total of [myseed.yield]")
-		else if (prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2...
+		else if(prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2...
 			yieldmod += 1
 //			to_chat(world, "Yield increased by 1, to a total of [myseed.yield]")
 	else
diff --git a/code/modules/hydroponics/trays/tray_process.dm b/code/modules/hydroponics/trays/tray_process.dm
index 855d053008c..d272e49f0c8 100644
--- a/code/modules/hydroponics/trays/tray_process.dm
+++ b/code/modules/hydroponics/trays/tray_process.dm
@@ -24,7 +24,7 @@
 
 	// There's a chance for a weed explosion to happen if the weeds take over.
 	// Plants that are themselves weeds (weed_tolerance > 10) are unaffected.
-	if (weedlevel >= 10 && prob(10))
+	if(weedlevel >= 10 && prob(10))
 		if(!seed || weedlevel >= seed.get_trait(TRAIT_WEED_TOLERANCE))
 			weed_invasion()
 
@@ -81,7 +81,7 @@
 	T.air_update_turf()
 
 	// If we're attached to a pipenet, then we should let the pipenet know we might have modified some gasses
-	if (closed_system && connected_port)
+	if(closed_system && connected_port)
 		connected_port.parent.update = 1
 
 	// Toxin levels beyond the plant's tolerance cause damage, but
@@ -98,7 +98,7 @@
 		if(seed.get_trait(TRAIT_CARNIVOROUS))
 			health += HYDRO_SPEED_MULTIPLIER
 			pestlevel -= HYDRO_SPEED_MULTIPLIER
-		else if (pestlevel >= seed.get_trait(TRAIT_PEST_TOLERANCE))
+		else if(pestlevel >= seed.get_trait(TRAIT_PEST_TOLERANCE))
 			health -= HYDRO_SPEED_MULTIPLIER
 
 	// Some plants thrive and live off of weeds.
@@ -106,7 +106,7 @@
 		if(seed.get_trait(TRAIT_PARASITE))
 			health += HYDRO_SPEED_MULTIPLIER
 			weedlevel -= HYDRO_SPEED_MULTIPLIER
-		else if (weedlevel >= seed.get_trait(TRAIT_WEED_TOLERANCE))
+		else if(weedlevel >= seed.get_trait(TRAIT_WEED_TOLERANCE))
 			health -= HYDRO_SPEED_MULTIPLIER
 
 	// Handle life and death.
diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm
index 8f7e4f5e836..e4f68e6d106 100644
--- a/code/modules/hydroponics/trays/tray_reagents.dm
+++ b/code/modules/hydroponics/trays/tray_reagents.dm
@@ -11,7 +11,7 @@
 
 		var/reagent_total = reagents.get_reagent_amount(R.id)
 
-		//These are here because they have checks that would clutter up the switch statement cases, and thus get handled after the switch (readability)
+		//These are here because they have checks that would clutter up the switch statement cases, and thus get handled after the switch(readability)
 		var/water_value = 0
 		var/health_value = 0
 		var/production_stat_value = 0
diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index 1dea731ff54..b1ee10cc075 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -313,7 +313,8 @@
 	throw_range = 3
 	w_class = 4
 	var/extend = 1
-	flags = NOSHIELD | CONDUCT
+	flags = CONDUCT
+	armour_penetration = 20
 	slot_flags = SLOT_BACK
 	origin_tech = "materials=2;combat=2"
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
@@ -336,9 +337,9 @@
 	edge = 0
 	throw_speed = 2
 	throw_range = 3
-	w_class = 2.0
+	w_class = 2
 	extend = 0
-	flags = NOSHIELD
+	armour_penetration = 20
 	slot_flags = SLOT_BELT
 	origin_tech = "materials=3;combat=3"
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
@@ -373,7 +374,7 @@
 		H.update_inv_l_hand()
 		H.update_inv_r_hand()
 	add_fingerprint(user)
-	if (!blood_DNA) return
+	if(!blood_DNA) return
 	if(blood_overlay && (blood_DNA.len >= 1)) //updates blood overlay, if any
 		overlays.Cut()//this might delete other item overlays as well but eeeeeeeh
 
@@ -396,7 +397,7 @@
 	anchored = 0.0
 	var/matter = 0
 	var/mode = 1
-	w_class = 3.0
+	w_class = 3
 
 /obj/item/weapon/bananapeel
 	name = "banana peel"
@@ -404,7 +405,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "banana_peel"
 	item_state = "banana_peel"
-	w_class = 1.0
+	w_class = 1
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
@@ -415,7 +416,7 @@
 	icon = 'icons/obj/harvest.dmi'
 	icon_state = "corncob"
 	item_state = "corncob"
-	w_class = 1.0
+	w_class = 1
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm
index 9c40f005a21..fa765fd244b 100644
--- a/code/modules/karma/karma.dm
+++ b/code/modules/karma/karma.dm
@@ -182,7 +182,7 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
 	dat += "<HR>"
 
 	switch(karma_tab)
-		if (0) // Job Unlocks
+		if(0) // Job Unlocks
 			dat += {"
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=1'>Unlock Barber -- 5KP</a><br>
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=2'>Unlock Brig Physician -- 5KP</a><br>
@@ -193,7 +193,7 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=7'>Unlock Magistrate -- 45KP</a><br>
 			"}
 
-		if (1) // Species Unlocks
+		if(1) // Species Unlocks
 			dat += {"
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy2=1'>Unlock Machine People -- 15KP</a><br>
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy2=2'>Unlock Kidan -- 30KP</a><br>
@@ -204,7 +204,7 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy2=6'>Unlock Plasmaman -- 100KP</a><br>
 			"}
 
-		if (2) // Karma Refunds
+		if(2) // Karma Refunds
 			var/list/refundable = list()
 			var/list/purchased = checkpurchased()
 			if("Tajaran Ambassador" in purchased)
diff --git a/code/modules/library/computers/base.dm b/code/modules/library/computers/base.dm
index b24c7e7dbbf..360cda83d74 100644
--- a/code/modules/library/computers/base.dm
+++ b/code/modules/library/computers/base.dm
@@ -19,8 +19,8 @@
 	if(stat & (BROKEN | NOPOWER))
 		return 1
 
-	if (!Adjacent(user))
-		if (!issilicon(user) && !isobserver(user))
+	if(!Adjacent(user))
+		if(!issilicon(user) && !isobserver(user))
 			user.unset_machine()
 			user << browse(null, "window=library")
 			return 1
diff --git a/code/modules/library/computers/checkout.dm b/code/modules/library/computers/checkout.dm
index 2746aed857e..ff62f15c276 100644
--- a/code/modules/library/computers/checkout.dm
+++ b/code/modules/library/computers/checkout.dm
@@ -435,7 +435,7 @@
 			return
 
 		if(bibledelay)
-			for (var/mob/V in hearers(src))
+			for(var/mob/V in hearers(src))
 				V.show_message("<b>[src]</b>'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
 		else
 			bibledelay = 1
@@ -456,7 +456,7 @@
 		return
 	var/obj/item/weapon/book/B = new newbook.path(loc)
 
-	if (!newbook.programmatic)
+	if(!newbook.programmatic)
 		B.name = "Book: [newbook.title]"
 		B.title = newbook.title
 		B.author = newbook.author
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index f7729af3578..2f0acea4433 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -69,7 +69,7 @@
 			if("brute")
 				health -= O.force * 0.75
 			else
-		if (health <= 0)
+		if(health <= 0)
 			visible_message("<span class=warning>The bookcase is smashed apart!</span>")
 			new /obj/item/stack/sheet/wood(get_turf(src))
 			new /obj/item/stack/sheet/wood(get_turf(src))
@@ -288,7 +288,7 @@
 	icon_state ="scanner"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 1.0
+	w_class = 1
 	var/obj/machinery/computer/library/checkout/computer // Associated computer - Modes 1 to 3 use this
 	var/obj/item/weapon/book/book	 //  Currently scanned book
 	var/mode = 0 					// 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index d128e22c0f6..0ca98c921d8 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -181,7 +181,7 @@
 	attack_verb = list("smashed", "slammed", "whacked", "thwacked")
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "bostaff0"
-
+	block_chance = 50
 
 /obj/item/weapon/twohanded/bostaff/update_icon()
 	icon_state = "bostaff[wielded]"
@@ -239,8 +239,7 @@
 			return ..()
 	return ..()
 
-/obj/item/weapon/twohanded/bostaff/IsShield()
+/obj/item/weapon/twohanded/bostaff/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
 	if(wielded)
-		return 1
-	else
-		return 0
\ No newline at end of file
+		return ..()
+	return 0
\ No newline at end of file
diff --git a/code/modules/media/jukebox.dm b/code/modules/media/jukebox.dm
index 623241ca491..ae33c38dcc4 100644
--- a/code/modules/media/jukebox.dm
+++ b/code/modules/media/jukebox.dm
@@ -183,12 +183,12 @@ var/global/loopModeNames=list(
 		to_chat(usr, "\red You touch the bluescreened menu. Nothing happens. You feel dumber.")
 		return
 
-	if (href_list["power"])
+	if(href_list["power"])
 		playing=!playing
 		update_music()
 		update_icon()
 
-	if (href_list["playlist"])
+	if(href_list["playlist"])
 		if(!check_reload())
 			to_chat(usr, "\red You must wait 60 seconds between playlist reloads.")
 			return
@@ -199,12 +199,12 @@ var/global/loopModeNames=list(
 		update_music()
 		update_icon()
 
-	if (href_list["song"])
+	if(href_list["song"])
 		current_song=Clamp(text2num(href_list["song"]),1,playlist.len)
 		update_music()
 		update_icon()
 
-	if (href_list["mode"])
+	if(href_list["mode"])
 		loop_mode = (loop_mode % JUKEMODE_COUNT) + 1
 
 	return attack_hand(usr)
diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm
index d78afc6f9f2..d7a3edda003 100644
--- a/code/modules/media/mediamanager.dm
+++ b/code/modules/media/mediamanager.dm
@@ -70,7 +70,7 @@ if(vlc.attachEvent) {
 			M.update_music()
 
 /mob/proc/update_music()
-	if (client && client.media)
+	if(client && client.media)
 		client.media.update_music()
 	//else
 	//	testing("[src] - client: [client?"Y":"N"]; client.media: [client && client.media ? "Y":"N"]")
@@ -124,7 +124,7 @@ to_chat(#define MP_DEBUG(x) owner, x)
 		var/targetURL = ""
 		var/targetStartTime = 0
 
-		if (!owner)
+		if(!owner)
 			//testing("owner is null")
 			return
 
@@ -141,7 +141,7 @@ to_chat(#define MP_DEBUG(x) owner, x)
 		//else
 		//	testing("M is not playing or null.")
 
-		if (url != targetURL || abs(targetStartTime - start_time) > 1)
+		if(url != targetURL || abs(targetStartTime - start_time) > 1)
 			url = targetURL
 			start_time = targetStartTime
 			send_update()
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index 3e9580ef14b..cd229550880 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -156,12 +156,12 @@
 		to_chat(user, "<span class='notice'>The crate is locked with a Deca-code lock.</span>")
 		var/input = input(usr, "Enter [codelen] digits.", "Deca-Code Lock", "") as text
 		if(in_range(src, user))
-			if (input == code)
+			if(input == code)
 				to_chat(user, "<span class='notice'>The crate unlocks!</span>")
 				locked = 0
 				overlays.Cut()
 				overlays += "securecrateg"
-			else if (input == null || length(input) != codelen)
+			else if(input == null || length(input) != codelen)
 				to_chat(user, "<span class='notice'>You leave the crate alone.</span>")
 			else
 				to_chat(user, "<span class='warning'>A red light flashes.</span>")
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index a8ac5e1a88c..83f9c871f44 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -7,7 +7,7 @@
 	flags = CONDUCT
 	force = 1
 	throwforce = 2
-	w_class = 1.0
+	w_class = 1
 	var/string_attached
 	var/list/sideslist = list("heads","tails")
 	var/cmineral = null
@@ -105,7 +105,7 @@
 			to_chat(user, "<span class='notice'>There already is a string attached to this coin.</span>")
 			return
 
-		if (CC.use(1))
+		if(CC.use(1))
 			overlays += image('icons/obj/items.dmi',"coin_string_overlay")
 			string_attached = 1
 			to_chat(user, "<span class='notice'>You attach a string to the coin.</span>")
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 148ea595f04..c20259c6198 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -84,9 +84,9 @@
 		var/i = 0
 		if(T)
 			for(var/obj/item/weapon/ore/O in T)
-				if (i >= ore_pickup_rate)
+				if(i >= ore_pickup_rate)
 					break
-				else if (!O || !O.refined_type)
+				else if(!O || !O.refined_type)
 					continue
 				else
 					process_sheet(O)
@@ -95,16 +95,16 @@
 			var/obj/structure/ore_box/B = locate() in T
 			if(B)
 				for(var/obj/item/weapon/ore/O in B.contents)
-					if (i >= ore_pickup_rate)
+					if(i >= ore_pickup_rate)
 						break
-					else if (!O || !O.refined_type)
+					else if(!O || !O.refined_type)
 						continue
 					else
 						process_sheet(O)
 						i++
 
 /obj/machinery/mineral/ore_redemption/attackby(var/obj/item/weapon/W, var/mob/user, params)
-	if (!powered())
+	if(!powered())
 		return
 	if(istype(W,/obj/item/weapon/card/id))
 		var/obj/item/weapon/card/id/I = usr.get_active_hand()
@@ -425,7 +425,7 @@
 	if(href_list["purchase"])
 		if(istype(inserted_id))
 			var/datum/data/mining_equipment/prize = locate(href_list["purchase"])
-			if (!prize || !(prize in prize_list))
+			if(!prize || !(prize in prize_list))
 				return
 			if(prize.cost > inserted_id.mining_points)
 			else
@@ -521,7 +521,7 @@
 	icon_state = "Jaunter"
 	item_state = "electronic"
 	throwforce = 0
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 5
 	origin_tech = "bluespace=2"
@@ -677,7 +677,7 @@
 /obj/item/weapon/mining_drone_cube
 	name = "mining drone cube"
 	desc = "Compressed mining drone, ready for deployment. Just press the button to activate!"
-	w_class = 2.0
+	w_class = 2
 	icon = 'icons/obj/aibots.dmi'
 	icon_state = "minedronecube"
 	item_state = "electronic"
@@ -902,7 +902,7 @@
 	icon_state = "lazarus_hypo"
 	item_state = "hypo"
 	throwforce = 0
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 5
 	var/loaded = 1
@@ -962,7 +962,7 @@
 	name = "mining scanner"
 	icon_state = "mining1"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = 2
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	var/cooldown = 0
@@ -993,7 +993,7 @@
 	name = "advanced mining scanner"
 	icon_state = "mining0"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = 2
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	var/cooldown = 0
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index 47c9c45dbc3..ce6dcc15eb1 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -28,7 +28,7 @@
 			t = d.id_tag
 			if(t == src.door_tag)
 				src.release_door = d
-		if (machine && (release_door || !use_release_door))
+		if(machine && (release_door || !use_release_door))
 			machine.CONSOLE = src
 		else
 			qdel(src)
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index b83a2001bb0..23bf8ab532f 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -13,7 +13,7 @@
 	..()
 	spawn(7)
 		src.machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir))
-		if (machine)
+		if(machine)
 			machine.CONSOLE = src
 		else
 			qdel(src)
@@ -24,7 +24,7 @@
 	//iron
 	if(machine.ore_iron || machine.ore_glass || machine.ore_plasma || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_mime || machine.ore_adamantine)
 		if(machine.ore_iron)
-			if (machine.selected_iron==1)
+			if(machine.selected_iron==1)
 				dat += text("<A href='?src=\ref[src];sel_iron=no'><font color='green'>Smelting</font></A> ")
 			else
 				dat += text("<A href='?src=\ref[src];sel_iron=yes'><font color='red'>Not smelting</font></A> ")
@@ -34,7 +34,7 @@
 
 		//sand - glass
 		if(machine.ore_glass)
-			if (machine.selected_glass==1)
+			if(machine.selected_glass==1)
 				dat += text("<A href='?src=\ref[src];sel_glass=no'><font color='green'>Smelting</font></A> ")
 			else
 				dat += text("<A href='?src=\ref[src];sel_glass=yes'><font color='red'>Not smelting</font></A> ")
@@ -44,7 +44,7 @@
 
 		//plasma
 		if(machine.ore_plasma)
-			if (machine.selected_plasma==1)
+			if(machine.selected_plasma==1)
 				dat += text("<A href='?src=\ref[src];sel_plasma=no'><font color='green'>Smelting</font></A> ")
 			else
 				dat += text("<A href='?src=\ref[src];sel_plasma=yes'><font color='red'>Not smelting</font></A> ")
@@ -54,7 +54,7 @@
 
 		//uranium
 		if(machine.ore_uranium)
-			if (machine.selected_uranium==1)
+			if(machine.selected_uranium==1)
 				dat += text("<A href='?src=\ref[src];sel_uranium=no'><font color='green'>Smelting</font></A> ")
 			else
 				dat += text("<A href='?src=\ref[src];sel_uranium=yes'><font color='red'>Not smelting</font></A> ")
@@ -64,7 +64,7 @@
 
 		//gold
 		if(machine.ore_gold)
-			if (machine.selected_gold==1)
+			if(machine.selected_gold==1)
 				dat += text("<A href='?src=\ref[src];sel_gold=no'><font color='green'>Smelting</font></A> ")
 			else
 				dat += text("<A href='?src=\ref[src];sel_gold=yes'><font color='red'>Not smelting</font></A> ")
@@ -74,7 +74,7 @@
 
 		//silver
 		if(machine.ore_silver)
-			if (machine.selected_silver==1)
+			if(machine.selected_silver==1)
 				dat += text("<A href='?src=\ref[src];sel_silver=no'><font color='green'>Smelting</font></A> ")
 			else
 				dat += text("<A href='?src=\ref[src];sel_silver=yes'><font color='red'>Not smelting</font></A> ")
@@ -84,7 +84,7 @@
 
 		//diamond
 		if(machine.ore_diamond)
-			if (machine.selected_diamond==1)
+			if(machine.selected_diamond==1)
 				dat += text("<A href='?src=\ref[src];sel_diamond=no'><font color='green'>Smelting</font></A> ")
 			else
 				dat += text("<A href='?src=\ref[src];sel_diamond=yes'><font color='red'>Not smelting</font></A> ")
@@ -94,7 +94,7 @@
 
 		//bananium
 		if(machine.ore_clown)
-			if (machine.selected_clown==1)
+			if(machine.selected_clown==1)
 				dat += text("<A href='?src=\ref[src];sel_clown=no'><font color='green'>Smelting</font></A> ")
 			else
 				dat += text("<A href='?src=\ref[src];sel_clown=yes'><font color='red'>Not smelting</font></A> ")
@@ -104,7 +104,7 @@
 
 		//tranquillite
 		if(machine.ore_mime)
-			if (machine.selected_mime==1)
+			if(machine.selected_mime==1)
 				dat += text("<A href='?src=\ref[src];sel_mime=no'><font color='green'>Smelting</font></A> ")
 			else
 				dat += text("<A href='?src=\ref[src];sel_mime=yes'><font color='red'>Not smelting</font></A> ")
@@ -115,7 +115,7 @@
 
 		//On or off
 		dat += text("Machine is currently ")
-		if (machine.on==1)
+		if(machine.on==1)
 			dat += text("<A href='?src=\ref[src];set_on=off'>On</A> ")
 		else
 			dat += text("<A href='?src=\ref[src];set_on=on'>Off</A> ")
@@ -131,52 +131,52 @@
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(href_list["sel_iron"])
-		if (href_list["sel_iron"] == "yes")
+		if(href_list["sel_iron"] == "yes")
 			machine.selected_iron = 1
 		else
 			machine.selected_iron = 0
 	if(href_list["sel_glass"])
-		if (href_list["sel_glass"] == "yes")
+		if(href_list["sel_glass"] == "yes")
 			machine.selected_glass = 1
 		else
 			machine.selected_glass = 0
 	if(href_list["sel_plasma"])
-		if (href_list["sel_plasma"] == "yes")
+		if(href_list["sel_plasma"] == "yes")
 			machine.selected_plasma = 1
 		else
 			machine.selected_plasma = 0
 	if(href_list["sel_uranium"])
-		if (href_list["sel_uranium"] == "yes")
+		if(href_list["sel_uranium"] == "yes")
 			machine.selected_uranium = 1
 		else
 			machine.selected_uranium = 0
 	if(href_list["sel_gold"])
-		if (href_list["sel_gold"] == "yes")
+		if(href_list["sel_gold"] == "yes")
 			machine.selected_gold = 1
 		else
 			machine.selected_gold = 0
 	if(href_list["sel_silver"])
-		if (href_list["sel_silver"] == "yes")
+		if(href_list["sel_silver"] == "yes")
 			machine.selected_silver = 1
 		else
 			machine.selected_silver = 0
 	if(href_list["sel_diamond"])
-		if (href_list["sel_diamond"] == "yes")
+		if(href_list["sel_diamond"] == "yes")
 			machine.selected_diamond = 1
 		else
 			machine.selected_diamond = 0
 	if(href_list["sel_clown"])
-		if (href_list["sel_clown"] == "yes")
+		if(href_list["sel_clown"] == "yes")
 			machine.selected_clown = 1
 		else
 			machine.selected_clown = 0
 	if(href_list["sel_mime"])
-		if (href_list["sel_mime"] == "yes")
+		if(href_list["sel_mime"] == "yes")
 			machine.selected_mime = 1
 		else
 			machine.selected_mime = 0
 	if(href_list["set_on"])
-		if (href_list["set_on"] == "on")
+		if(href_list["set_on"] == "on")
 			machine.on = 1
 		else
 			machine.on = 0
@@ -216,82 +216,82 @@
 
 /obj/machinery/mineral/processing_unit/process()
 	var/i
-	for (i = 0; i < 10; i++)
-		if (on)
-			if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
-				if (ore_glass > 0)
+	for(i = 0; i < 10; i++)
+		if(on)
+			if(selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
+				if(ore_glass > 0)
 					ore_glass--;
 					generate_mineral(/obj/item/stack/sheet/glass)
 				else
 					on = 0
 				continue
-			if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0)
-				if (ore_glass > 0 && ore_iron > 0)
+			if(selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0)
+				if(ore_glass > 0 && ore_iron > 0)
 					ore_glass--;
 					ore_iron--;
 					generate_mineral(/obj/item/stack/sheet/rglass)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
-				if (ore_gold > 0)
+			if(selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
+				if(ore_gold > 0)
 					ore_gold--;
 					generate_mineral(/obj/item/stack/sheet/mineral/gold)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
-				if (ore_silver > 0)
+			if(selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
+				if(ore_silver > 0)
 					ore_silver--;
 					generate_mineral(/obj/item/stack/sheet/mineral/silver)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
-				if (ore_diamond > 0)
+			if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
+				if(ore_diamond > 0)
 					ore_diamond--;
 					generate_mineral(/obj/item/stack/sheet/mineral/diamond)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
-				if (ore_plasma > 0)
+			if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
+				if(ore_plasma > 0)
 					ore_plasma--;
 					generate_mineral(/obj/item/stack/sheet/mineral/plasma)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
-				if (ore_uranium > 0)
+			if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
+				if(ore_uranium > 0)
 					ore_uranium--;
 					generate_mineral(/obj/item/stack/sheet/mineral/uranium)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0)
-				if (ore_iron > 0)
+			if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0)
+				if(ore_iron > 0)
 					ore_iron--;
 					generate_mineral(/obj/item/stack/sheet/metal)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0)
-				if (ore_iron > 0 && ore_plasma > 0)
+			if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0)
+				if(ore_iron > 0 && ore_plasma > 0)
 					ore_iron--;
 					ore_plasma--;
 					generate_mineral(/obj/item/stack/sheet/plasteel)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 1 && selected_mime == 0)
-				if (ore_clown > 0)
+			if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 1 && selected_mime == 0)
+				if(ore_clown > 0)
 					ore_clown--;
 					generate_mineral(/obj/item/stack/sheet/mineral/bananium)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 1)
-				if (ore_mime > 0)
+			if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 1)
+				if(ore_mime > 0)
 					ore_mime--;
 					generate_mineral(/obj/item/stack/sheet/mineral/tranquillite)
 				else
@@ -299,16 +299,16 @@
 				continue
 			//THESE TWO ARE CODED FOR URIST TO USE WHEN HE GETS AROUND TO IT.
 			//They were coded on 18 Feb 2012. If you're reading this in 2015, then firstly congratulations on the world not ending on 21 Dec 2012 and secondly, Urist is apparently VERY lazy. ~Errorage
-			/*if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
-				if (ore_uranium >= 2 && ore_diamond >= 1)
+			/*if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
+				if(ore_uranium >= 2 && ore_diamond >= 1)
 					ore_uranium -= 2
 					ore_diamond -= 1
 					generate_mineral(/obj/item/stack/sheet/mineral/adamantine)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
-				if (ore_silver >= 1 && ore_plasma >= 3)
+			if(selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
+				if(ore_silver >= 1 && ore_plasma >= 3)
 					ore_silver -= 1
 					ore_plasma -= 3
 					generate_mineral(/obj/item/stack/sheet/mineral/mythril)
@@ -321,53 +321,53 @@
 
 			var/b = 1 //this part checks if all required ores are available
 
-			if (!(selected_gold || selected_silver ||selected_diamond || selected_uranium | selected_plasma || selected_iron || selected_iron))
+			if(!(selected_gold || selected_silver ||selected_diamond || selected_uranium | selected_plasma || selected_iron || selected_iron))
 				b = 0
 
-			if (selected_gold == 1)
-				if (ore_gold <= 0)
+			if(selected_gold == 1)
+				if(ore_gold <= 0)
 					b = 0
-			if (selected_silver == 1)
-				if (ore_silver <= 0)
+			if(selected_silver == 1)
+				if(ore_silver <= 0)
 					b = 0
-			if (selected_diamond == 1)
-				if (ore_diamond <= 0)
+			if(selected_diamond == 1)
+				if(ore_diamond <= 0)
 					b = 0
-			if (selected_uranium == 1)
-				if (ore_uranium <= 0)
+			if(selected_uranium == 1)
+				if(ore_uranium <= 0)
 					b = 0
-			if (selected_plasma == 1)
-				if (ore_plasma <= 0)
+			if(selected_plasma == 1)
+				if(ore_plasma <= 0)
 					b = 0
-			if (selected_iron == 1)
-				if (ore_iron <= 0)
+			if(selected_iron == 1)
+				if(ore_iron <= 0)
 					b = 0
-			if (selected_glass == 1)
-				if (ore_glass <= 0)
+			if(selected_glass == 1)
+				if(ore_glass <= 0)
 					b = 0
-			if (selected_clown == 1)
-				if (ore_clown <= 0)
+			if(selected_clown == 1)
+				if(ore_clown <= 0)
 					b = 0
-			if (selected_mime == 1)
-				if (ore_mime <= 0)
+			if(selected_mime == 1)
+				if(ore_mime <= 0)
 					b = 0
 
-			if (b) //if they are, deduct one from each, produce slag and shut the machine off
-				if (selected_gold == 1)
+			if(b) //if they are, deduct one from each, produce slag and shut the machine off
+				if(selected_gold == 1)
 					ore_gold--
-				if (selected_silver == 1)
+				if(selected_silver == 1)
 					ore_silver--
-				if (selected_diamond == 1)
+				if(selected_diamond == 1)
 					ore_diamond--
-				if (selected_uranium == 1)
+				if(selected_uranium == 1)
 					ore_uranium--
-				if (selected_plasma == 1)
+				if(selected_plasma == 1)
 					ore_plasma--
-				if (selected_iron == 1)
+				if(selected_iron == 1)
 					ore_iron--
-				if (selected_clown == 1)
+				if(selected_clown == 1)
 					ore_clown--
-				if (selected_mime == 1)
+				if(selected_mime == 1)
 					ore_mime--
 				generate_mineral(/obj/item/weapon/ore/slag)
 				on = 0
@@ -384,39 +384,39 @@
 			n++
 			if(n>10)
 				break
-			if (istype(O,/obj/item/weapon/ore/iron))
+			if(istype(O,/obj/item/weapon/ore/iron))
 				ore_iron++;
 				O.loc = null
 				continue
-			if (istype(O,/obj/item/weapon/ore/glass))
+			if(istype(O,/obj/item/weapon/ore/glass))
 				ore_glass++;
 				O.loc = null
 				continue
-			if (istype(O,/obj/item/weapon/ore/diamond))
+			if(istype(O,/obj/item/weapon/ore/diamond))
 				ore_diamond++;
 				O.loc = null
 				continue
-			if (istype(O,/obj/item/weapon/ore/plasma))
+			if(istype(O,/obj/item/weapon/ore/plasma))
 				ore_plasma++
 				O.loc = null
 				continue
-			if (istype(O,/obj/item/weapon/ore/gold))
+			if(istype(O,/obj/item/weapon/ore/gold))
 				ore_gold++
 				O.loc = null
 				continue
-			if (istype(O,/obj/item/weapon/ore/silver))
+			if(istype(O,/obj/item/weapon/ore/silver))
 				ore_silver++
 				O.loc = null
 				continue
-			if (istype(O,/obj/item/weapon/ore/uranium))
+			if(istype(O,/obj/item/weapon/ore/uranium))
 				ore_uranium++
 				O.loc = null
 				continue
-			if (istype(O,/obj/item/weapon/ore/bananium))
+			if(istype(O,/obj/item/weapon/ore/bananium))
 				ore_clown++
 				O.loc = null
 				continue
-			if (istype(O,/obj/item/weapon/ore/tranquillite))
+			if(istype(O,/obj/item/weapon/ore/tranquillite))
 				ore_mime++
 				O.loc = null
 				continue
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index 5f315648c10..44d7b037869 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -13,7 +13,7 @@
 	..()
 	spawn(7)
 		src.machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
-		if (machine)
+		if(machine)
 			machine.CONSOLE = src
 		else
 			qdel(src)
diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm
index 5ae7f376cb0..5214c8caec8 100644
--- a/code/modules/mining/machine_unloading.dm
+++ b/code/modules/mining/machine_unloading.dm
@@ -15,14 +15,14 @@
 	if(T)
 		var/limit
 		for(var/obj/structure/ore_box/B in T)
-			for (var/obj/item/weapon/ore/O in B)
+			for(var/obj/item/weapon/ore/O in B)
 				B.contents -= O
 				unload_mineral(O)
 				limit++
-				if (limit>=10)
+				if(limit>=10)
 					return
 		for(var/obj/item/I in T)
 			unload_mineral(I)
 			limit++
-			if (limit>=10)
+			if(limit>=10)
 				return
\ No newline at end of file
diff --git a/code/modules/mining/manufacturing.dm b/code/modules/mining/manufacturing.dm
index 429b0ee42bc..36464c2d7c7 100644
--- a/code/modules/mining/manufacturing.dm
+++ b/code/modules/mining/manufacturing.dm
@@ -39,26 +39,26 @@
 
 	process()
 		..()
-		if (src.working) use_power(src.powconsumption)
+		if(src.working) use_power(src.powconsumption)
 
 	ex_act(severity)
 		switch(severity)
 			if(1.0) qdel(src)
 			if(2.0)
-				if (prob(60)) stat |= BROKEN
+				if(prob(60)) stat |= BROKEN
 			if(3.0)
-				if (prob(30)) stat |= BROKEN
+				if(prob(30)) stat |= BROKEN
 		return
 
 	blob_act()
-		if (prob(25)) del src
+		if(prob(25)) del src
 		return
 
 	power_change()
 		if(stat & BROKEN) icon_state = "fab-broken"
 		else
 			if( powered() )
-				if (src.working) src.icon_state = "fab-active"
+				if(src.working) src.icon_state = "fab-active"
 				else src.icon_state = "fab-idle"
 				stat &= ~NOPOWER
 			else
@@ -92,31 +92,31 @@
 		var/AMTfabr = 0
 
 		for(var/obj/item/weapon/ore/O in src.contents)
-			if (istype(O,/obj/item/weapon/ore/iron)) AMTmaux++
-			if (istype(O,/obj/item/weapon/ore/glass)) AMTmoli++
-			if (istype(O,/obj/item/weapon/ore/silver)) AMTphar++
-			if (istype(O,/obj/item/weapon/ore/diamond)) AMTclar++
-			if (istype(O,/obj/item/weapon/ore/gold)) AMTbohr++
-			if (istype(O,/obj/item/weapon/ore/coal)) AMTereb++
-			if (istype(O,/obj/item/weapon/ore/uranium)) AMTcere++
-			if (istype(O,/obj/item/weapon/ore/plasma)) AMTplas++
-			if (istype(O,/obj/item/weapon/ore/osmium)) AMTuqil++
-			if (istype(O,/obj/item/weapon/ore/hydrogen)) AMTtele++
-			if (istype(O,/obj/item/weapon/ore/fabric)) AMTfabr++
+			if(istype(O,/obj/item/weapon/ore/iron)) AMTmaux++
+			if(istype(O,/obj/item/weapon/ore/glass)) AMTmoli++
+			if(istype(O,/obj/item/weapon/ore/silver)) AMTphar++
+			if(istype(O,/obj/item/weapon/ore/diamond)) AMTclar++
+			if(istype(O,/obj/item/weapon/ore/gold)) AMTbohr++
+			if(istype(O,/obj/item/weapon/ore/coal)) AMTereb++
+			if(istype(O,/obj/item/weapon/ore/uranium)) AMTcere++
+			if(istype(O,/obj/item/weapon/ore/plasma)) AMTplas++
+			if(istype(O,/obj/item/weapon/ore/osmium)) AMTuqil++
+			if(istype(O,/obj/item/weapon/ore/hydrogen)) AMTtele++
+			if(istype(O,/obj/item/weapon/ore/fabric)) AMTfabr++
 
 		dat += "<B>Available Minerals</B><BR>"
-		if (AMTmaux) dat += "<A href='?src=\ref[src];eject=1'><B>Iron:</B></A> [AMTmaux]<br>"
-		if (AMTmoli) dat += "<A href='?src=\ref[src];eject=2'><B>Glass:</B></A> [AMTmoli]<br>"
-		if (AMTphar) dat += "<A href='?src=\ref[src];eject=3'><B>Silver:</B></A> [AMTphar]<br>"
-		if (AMTclar) dat += "<A href='?src=\ref[src];eject=4'><B>Diamond:</B></A> [AMTclar]<br>"
-		if (AMTbohr) dat += "<A href='?src=\ref[src];eject=5'><B>Gold:</B></A> [AMTbohr]<br>"
-		if (AMTereb) dat += "<A href='?src=\ref[src];eject=6'><B>Coal:</B></A> [AMTereb]<br>"
-		if (AMTcere) dat += "<A href='?src=\ref[src];eject=7'><B>Uranium:</B></A> [AMTcere]<br>"
-		if (AMTplas) dat += "<A href='?src=\ref[src];eject=8'><B>Plasma:</B></A> [AMTplas]<br>"
-		if (AMTuqil) dat += "<A href='?src=\ref[src];eject=9'><B>Platinum:</B></A> [AMTuqil]<br>"
-		if (AMTtele) dat += "<A href='?src=\ref[src];eject=10'><B>Hydrogen:</B></A> [AMTtele]<br>"
-		if (AMTfabr) dat += "<A href='?src=\ref[src];eject=11'><B>Fabric:</B></A> [AMTfabr]<br>"
-		if (!AMTmaux && !AMTmoli && !AMTphar && !AMTclar && !AMTbohr && !AMTereb && !AMTcere && !AMTplas && !AMTuqil && !AMTtele && !AMTfabr)
+		if(AMTmaux) dat += "<A href='?src=\ref[src];eject=1'><B>Iron:</B></A> [AMTmaux]<br>"
+		if(AMTmoli) dat += "<A href='?src=\ref[src];eject=2'><B>Glass:</B></A> [AMTmoli]<br>"
+		if(AMTphar) dat += "<A href='?src=\ref[src];eject=3'><B>Silver:</B></A> [AMTphar]<br>"
+		if(AMTclar) dat += "<A href='?src=\ref[src];eject=4'><B>Diamond:</B></A> [AMTclar]<br>"
+		if(AMTbohr) dat += "<A href='?src=\ref[src];eject=5'><B>Gold:</B></A> [AMTbohr]<br>"
+		if(AMTereb) dat += "<A href='?src=\ref[src];eject=6'><B>Coal:</B></A> [AMTereb]<br>"
+		if(AMTcere) dat += "<A href='?src=\ref[src];eject=7'><B>Uranium:</B></A> [AMTcere]<br>"
+		if(AMTplas) dat += "<A href='?src=\ref[src];eject=8'><B>Plasma:</B></A> [AMTplas]<br>"
+		if(AMTuqil) dat += "<A href='?src=\ref[src];eject=9'><B>Platinum:</B></A> [AMTuqil]<br>"
+		if(AMTtele) dat += "<A href='?src=\ref[src];eject=10'><B>Hydrogen:</B></A> [AMTtele]<br>"
+		if(AMTfabr) dat += "<A href='?src=\ref[src];eject=11'><B>Fabric:</B></A> [AMTfabr]<br>"
+		if(!AMTmaux && !AMTmoli && !AMTphar && !AMTclar && !AMTbohr && !AMTereb && !AMTcere && !AMTplas && !AMTuqil && !AMTtele && !AMTfabr)
 			dat += "No minerals currently loaded.<br>"
 
 		dat += {"<HR>
@@ -126,42 +126,42 @@
 			dat += {"<BR><A href='?src=\ref[src];disp=\ref[A]'>
 			<b><u>[A.name]</u></b></A><br>
 			<b>Cost:</b> [A.amount1] [A.cname1]"}
-			if (A.cost2) dat += ", [A.amount2] [A.cname2]"
-			if (A.cost3) dat += ", [A.amount3] [A.cname3]"
+			if(A.cost2) dat += ", [A.amount2] [A.cname2]"
+			if(A.cost3) dat += ", [A.amount3] [A.cname3]"
 			dat += "<br><b>Time:</b> [A.time] Seconds<br>"
 
 		for(var/datum/manufacture/A in src.download)
 			dat += {"<BR><A href='?src=\ref[src];disp=\ref[A]'>
 			<b><u>[A.name]</u></b></A> (Downloaded)<br>
 			<b>Cost:</b> [A.amount1] [A.cname1]"}
-			if (A.cost2) dat += ", [A.amount2] [A.cname2]"
-			if (A.cost3) dat += ", [A.amount3] [A.cname3]"
+			if(A.cost2) dat += ", [A.amount2] [A.cname2]"
+			if(A.cost3) dat += ", [A.amount3] [A.cname3]"
 			dat += "<br><b>Time:</b> [A.time] Seconds<br>"
 
 		for(var/datum/manufacture/A in src.diskload)
 			dat += {"<BR><A href='?src=\ref[src];disp=\ref[A]'>
 			<b><u>[A.name]</u></b></A> (Disk)<br>
 			<b>Cost:</b> [A.amount1] [A.cname1]"}
-			if (A.cost2) dat += ", [A.amount2] [A.cname2]"
-			if (A.cost3) dat += ", [A.amount3] [A.cname3]"
+			if(A.cost2) dat += ", [A.amount2] [A.cname2]"
+			if(A.cost3) dat += ", [A.amount3] [A.cname3]"
 			dat += "<br><b>Time:</b> [A.time] Seconds<br>"
 
-		if (src.hacked)
+		if(src.hacked)
 			for(var/datum/manufacture/A in src.hidden)
 				dat += {"<BR><A href='?src=\ref[src];disp=\ref[A]'>
 				<b><u>[A.name]</u></b></A> (Secret)<br>
 				<b>Cost:</b> [A.amount1] [A.cname1]"}
-				if (A.cost2) dat += ", [A.amount2] [A.cname2]"
-				if (A.cost3) dat += ", [A.amount3] [A.cname3]"
+				if(A.cost2) dat += ", [A.amount2] [A.cname2]"
+				if(A.cost3) dat += ", [A.amount3] [A.cname3]"
 				dat += "<br><b>Time:</b> [A.time] Seconds<br>"
 
 		dat += "<hr>"
 
-		if (src.dl_list)
+		if(src.dl_list)
 			dat += {"<A href='?src=\ref[src];download=1'>Download Available Schematics</A><BR>
 			<A href='?src=\ref[src];delete=2'>Clear Downloaded Schematics</A><BR>"}
 
-		if (src.acceptdisk)
+		if(src.acceptdisk)
 			dat += {"<A href='?src=\ref[src];delete=1'>Clear Disk Schematics</A><BR>"}
 
 		user << browse(dat, "window=manufact;size=400x500")
@@ -173,45 +173,45 @@
 		if(usr.stat || usr.restrained())
 			return
 
-		if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))))
+		if((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))))
 			usr.machine = src
 
-			if (href_list["download"])
+			if(href_list["download"])
 				to_chat(if(!src.dl_list) usr, "\red This unit is not capable of downloading any additional schematics.")
 				else
 					var/amtdl = 0
 					//var/dontload = 0
-					if (src.dl_list == "robotics")
+					if(src.dl_list == "robotics")
 						/*for(var/i = robotics_research.starting_tier, i <= robotics_research.max_tiers, i++)
 							for(var/datum/roboresearch/X in robotics_research.researched_items[i])
-								for (var/datum/manufacture/S in X.schematics)
-									for (var/datum/manufacture/A in src.download)
-										if (istype(S,A)) dontload = 1
-									if (!dontload)
+								for(var/datum/manufacture/S in X.schematics)
+									for(var/datum/manufacture/A in src.download)
+										if(istype(S,A)) dontload = 1
+									if(!dontload)
 										src.download += new S.type(src)
 										amtdl++
 									else dontload = 0*/
-						to_chat(if (amtdl) usr, "\blue [amtdl] new schematics downloaded from Robotics Research Database.")
+						to_chat(if(amtdl) usr, "\blue [amtdl] new schematics downloaded from Robotics Research Database.")
 						to_chat(else usr, "\red No new schematics currently available in Robotics Research Database.")
 
-			if (href_list["delete"])
+			if(href_list["delete"])
 				var/operation = text2num(href_list["delete"])
 				if(operation == 1) // Clear Disk Schematics
 					var/amtgone = 0
 					for(var/datum/manufacture/D in src.diskload)
 						src.diskload-= D
 						amtgone++
-					to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.")
+					to_chat(if(amtgone) usr, "\blue Cleared [amtgone] schematics from database.")
 					to_chat(else usr, "\red No disk-loaded schematics detected in database.")
 				if(operation == 2) // Clear Download Schematics
 					var/amtgone = 0
 					for(var/datum/manufacture/D in src.download)
 						src.download-= D
 						amtgone++
-					to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.")
+					to_chat(if(amtgone) usr, "\blue Cleared [amtgone] schematics from database.")
 					to_chat(else usr, "\red No downloaded schematics detected in database.")
 
-			if (href_list["eject"])
+			if(href_list["eject"])
 				var/operation = text2num(href_list["eject"])
 				var/ejectamt = 0
 				var/ejecting = null
@@ -233,22 +233,22 @@
 				sleep(3)
 				ejectamt = input(usr,"How many units do you want to eject?","Eject Materials") as num
 				for(var/obj/item/weapon/ore/O in src.contents)
-					if (ejectamt <= 0) break
-					if (istype(O, ejecting))
+					if(ejectamt <= 0) break
+					if(istype(O, ejecting))
 						O.loc = usr.loc
 						ejectamt--
 
-			if (href_list["disp"])
+			if(href_list["disp"])
 				var/datum/manufacture/I = locate(href_list["disp"])
 				// Material Check
 				var/A1 = 0
 				var/A2 = 0
 				var/A3 = 0
 				for(var/obj/item/weapon/ore/O in src.contents)
-					if (istype(O,I.cost1)) A1++
-					if (istype(O,I.cost2)) A2++
-					if (istype(O,I.cost3)) A3++
-				if (A1 < I.amount1 || A2 < I.amount2 || A3 < I.amount3)
+					if(istype(O,I.cost1)) A1++
+					if(istype(O,I.cost2)) A2++
+					if(istype(O,I.cost3)) A3++
+				if(A1 < I.amount1 || A2 < I.amount2 || A3 < I.amount3)
 					to_chat(usr, "\red Insufficient materials to manufacture that item.")
 					return
 				// Consume Mats
@@ -256,13 +256,13 @@
 				var/C2 = I.amount2
 				var/C3 = I.amount3
 				for(var/obj/item/weapon/ore/O in src.contents)
-					if (istype(O,I.cost1) && C1)
+					if(istype(O,I.cost1) && C1)
 						del O
 						C1--
-					if (istype(O,I.cost2) && C2)
+					if(istype(O,I.cost2) && C2)
 						del O
 						C2--
-					if (istype(O,I.cost3) && C3)
+					if(istype(O,I.cost3) && C3)
 						del O
 						C3--
 				// Manufacture Item
@@ -272,16 +272,16 @@
 				var/powconsume = round(1500*worktime/3)
 				/*for(var/i = robotics_research.starting_tier, i <= robotics_research.max_tiers, i++)
 					for(var/datum/roboresearch/a in robotics_research.researched_items[i])
-						if (a.manubonus)
+						if(a.manubonus)
 							worktime -= a.timebonus
-							if (a.multiplier != 0) worktime /= a.multiplier
+							if(a.multiplier != 0) worktime /= a.multiplier
 							powconsume -= a.powbonus*/
-				if (worktime < 1) worktime = 1
+				if(worktime < 1) worktime = 1
 				src.powconsumption = powconsume
 				src.updateUsrDialog()
 				sleep(worktime)
 				var/make = I.create
-				while (make > 0)
+				while(make > 0)
 					new I.item(src.loc)
 					make--
 				src.working = 0
@@ -298,24 +298,24 @@
 			var/obj/item/stack/sheet/STACK = W
 			for(var/mob/O in viewers(user, null)) O.show_message(text("\blue [] loads [] into the [].", user, W, src), 1)
 			if(istype(STACK, /obj/item/stack/sheet/metal))
-				for (var/amt = STACK.amount, amt > 0, amt--) new /obj/item/weapon/ore/iron(src)
+				for(var/amt = STACK.amount, amt > 0, amt--) new /obj/item/weapon/ore/iron(src)
 			if(istype(STACK, /obj/item/stack/sheet/plasteel))
-				for (var/amt = STACK.amount, amt > 0, amt--)
+				for(var/amt = STACK.amount, amt > 0, amt--)
 					new /obj/item/weapon/ore/iron(src)
 					new /obj/item/weapon/ore/plasma(src)
 			if(istype(STACK, /obj/item/stack/sheet/glass))
-				for (var/amt = STACK.amount, amt > 0, amt--) new /obj/item/weapon/ore/glass(src)
+				for(var/amt = STACK.amount, amt > 0, amt--) new /obj/item/weapon/ore/glass(src)
 			if(istype(STACK, /obj/item/stack/sheet/rglass))
-				for (var/amt = STACK.amount, amt > 0, amt--)
+				for(var/amt = STACK.amount, amt > 0, amt--)
 					new /obj/item/weapon/ore/iron(src)
 					new /obj/item/weapon/ore/glass(src)
 			load = 2
-		//else if (istype(W, /obj/item/weapon/plant/wheat/metal))
+		//else if(istype(W, /obj/item/weapon/plant/wheat/metal))
 		//	new /obj/item/weapon/ore/iron(src)
 		//	load = 2
 		/*else if(istype(W, /obj/item/stack/cable_coil/))
 			for(var/mob/O in viewers(user, null)) O.show_message(text("\blue [] loads [] into the [].", user, W, src), 1)
-			for (var/amt = W:amount, amt > 0, amt--)
+			for(var/amt = W:amount, amt > 0, amt--)
 				new /obj/item/weapon/ore/silver(src)
 				amt--
 			load = 2*/
@@ -324,7 +324,7 @@
 			load = 2
 		else if(istype(W, /obj/item/stack/rods))
 			var/obj/item/stack/RODS = W
-			for (var/amt = RODS.amount, amt > 0, amt--) new /obj/item/weapon/ore/iron(src)
+			for(var/amt = RODS.amount, amt > 0, amt--) new /obj/item/weapon/ore/iron(src)
 			load = 2
 		else if(istype(W, /obj/item/clothing/))
 			if(istype(W, /obj/item/clothing/under/))
@@ -337,78 +337,78 @@
 					if(istype(W,/obj/item/clothing/suit/space/)) new /obj/item/weapon/ore/fabric(src)
 					load = 2
 		else if(istype(W, /obj/item/weapon/disk/data/schematic))
-			to_chat(if (!src.acceptdisk) user, "\red This unit is unable to accept disks.")
+			to_chat(if(!src.acceptdisk) user, "\red This unit is unable to accept disks.")
 			else
 				var/amtload = 0
 				var/dontload = 0
-				for (var/datum/manufacture/WS in W:schematics)
-					for (var/datum/manufacture/A in src.available)
-						if (istype(WS,A)) dontload = 1
-					for (var/datum/manufacture/B in src.download)
-						if (istype(WS,B)) dontload = 1
-					for (var/datum/manufacture/C in src.diskload)
-						if (istype(WS,C)) dontload = 1
-					for (var/datum/manufacture/D in src.hidden)
-						if (istype(WS,D) && src.hacked) dontload = 1
-					if (!dontload)
+				for(var/datum/manufacture/WS in W:schematics)
+					for(var/datum/manufacture/A in src.available)
+						if(istype(WS,A)) dontload = 1
+					for(var/datum/manufacture/B in src.download)
+						if(istype(WS,B)) dontload = 1
+					for(var/datum/manufacture/C in src.diskload)
+						if(istype(WS,C)) dontload = 1
+					for(var/datum/manufacture/D in src.hidden)
+						if(istype(WS,D) && src.hacked) dontload = 1
+					if(!dontload)
 						src.diskload += new WS.type(src)
 						amtload++
 					else dontload = 0
-				to_chat(if (amtload) user, "\blue [amtload] new schematics downloaded from disk.")
+				to_chat(if(amtload) user, "\blue [amtload] new schematics downloaded from disk.")
 				to_chat(else user, "\red No new schematics available on disk.")
-		else if (istype(W, /obj/item/weapon/storage/bag/ore))
+		else if(istype(W, /obj/item/weapon/storage/bag/ore))
 			for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] uses the []'s automatic ore loader on []!", user, src, W), 1)
 			var/amtload = 0
-			for (var/obj/item/weapon/ore/M in W.contents)
+			for(var/obj/item/weapon/ore/M in W.contents)
 				M.loc = src
 				amtload++
-			to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [W]!")
+			to_chat(if(amtload) user, "\blue [amtload] pieces of ore loaded from [W]!")
 			to_chat(else user, "\red No ore loaded!")
 		else if(istype(W, /obj/item/weapon/card/emag))
 			src.hacked = 1
 			to_chat(user, "\blue You remove the [src]'s product locks!")
 		else ..()
 
-		if (load == 1)
+		if(load == 1)
 			user.unEquip(W)
 			W.loc = src
-			if ((user.client && user.s_active != src))
+			if((user.client && user.s_active != src))
 				user.client.screen -= W
 			W.dropped()
-		else if (load == 2)
+		else if(load == 2)
 			user.unEquip(W)
 			W.dropped()
-			if ((user.client && user.s_active != src))
+			if((user.client && user.s_active != src))
 				user.client.screen -= W
 			del W
 
 		src.updateUsrDialog()
 
 	MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
-		if (istype(O, /obj/structure/closet/crate/))
+		if(istype(O, /obj/structure/closet/crate/))
 			for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] uses the []'s automatic ore loader on []!", user, src, O), 1)
 			var/amtload = 0
-			for (var/obj/item/weapon/ore/M in O.contents)
+			for(var/obj/item/weapon/ore/M in O.contents)
 				M.loc = src
 				amtload++
-			to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [O]!")
+			to_chat(if(amtload) user, "\blue [amtload] pieces of ore loaded from [O]!")
 			to_chat(else user, "\red No ore loaded!")
-		else if (istype(O, /obj/item/weapon/ore/))
+		else if(istype(O, /obj/item/weapon/ore/))
 			for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing ore into []!", user, src), 1)
 			var/staystill = user.loc
 			for(var/obj/item/weapon/ore/M in view(1,user))
 				M.loc = src
 				sleep(3)
-				if (user.loc != staystill) break
+				if(user.loc != staystill) break
 			to_chat(user, "\blue You finish stuffing ore into [src]!")
-		/*else if (istype(O, /obj/item/weapon/plant/wheat/metal))
+		/*else if(istype(O, /obj/item/weapon/plant/wheat/metal))
 			for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing [O] into []!", user, src), 1)
 			var/staystill = user.loc
 			for(var/obj/item/weapon/plant/wheat/metal/M in view(1,user))
 				new /obj/item/weapon/ore/iron(src)
 				del M
 				sleep(3)
-				if (user.loc != staystill) break
+				if(user.loc != staystill) break
 			to_chat(user, "\blue You finish stuffing [O] into [src]!"*/)
 		else ..()
 		src.updateUsrDialog()
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index f1f317789b4..431e6ea028b 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -65,7 +65,7 @@
 	force = 15.0
 	throwforce = 10.0
 	item_state = "pickaxe"
-	w_class = 4.0
+	w_class = 4
 	materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = "materials=1;engineering=1"
@@ -122,7 +122,7 @@
 	icon_state = "smdrill"
 	origin_tech = "materials=6;powerstorage=4;engineering=5;syndicate=3"
 	desc = "Microscopic supermatter crystals cover the head of this tiny drill."
-	w_class = 2.0
+	w_class = 2
 
 /obj/item/weapon/pickaxe/drill/cyborg/diamond //This is the BORG version!
 	name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics.
@@ -166,7 +166,7 @@
 	force = 8.0
 	throwforce = 4.0
 	item_state = "shovel"
-	w_class = 3.0
+	w_class = 3
 	materials = list(MAT_METAL=50)
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
@@ -178,7 +178,7 @@
 	item_state = "spade"
 	force = 5.0
 	throwforce = 7.0
-	w_class = 2.0
+	w_class = 2
 
 
 /**********************Mining car (Crate like thing, not the rail car)**************************/
@@ -199,7 +199,7 @@
 	desc = "It allows you to store and deploy lazarus-injected creatures easier."
 	icon = 'icons/obj/mobcap.dmi'
 	icon_state = "mobcap0"
-	w_class = 1.0
+	w_class = 1
 	throw_range = 20
 	var/mob/living/simple_animal/captured = null
 	var/colorindex = 0
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 41b994b31b6..a76dfa9a699 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -45,10 +45,10 @@ var/global/list/rockTurfEdgeCache = list(
 	..()
 	switch(severity)
 		if(3.0)
-			if (prob(75))
+			if(prob(75))
 				src.gets_drilled(null, 1)
 		if(2.0)
-			if (prob(90))
+			if(prob(90))
 				src.gets_drilled(null, 1)
 		if(1.0)
 			src.gets_drilled(null, 1)
@@ -58,7 +58,7 @@ var/global/list/rockTurfEdgeCache = list(
 	..()
 	mineral_turfs += src
 
-	if (mineralType && mineralAmt && spread && spreadChance)
+	if(mineralType && mineralAmt && spread && spreadChance)
 		for(var/dir in cardinal)
 			if(prob(spreadChance))
 				var/turf/T = get_step(src, dir)
@@ -88,19 +88,19 @@ var/global/list/rockTurfEdgeCache = list(
 	var/turf/T
 	if((istype(get_step(src, NORTH), /turf/simulated/floor)) || (istype(get_step(src, NORTH), /turf/space)))
 		T = get_step(src, NORTH)
-		if (T)
+		if(T)
 			T.overlays += rockTurfEdgeCache[SOUTH_EDGING]
 	if((istype(get_step(src, SOUTH), /turf/simulated/floor)) || (istype(get_step(src, SOUTH), /turf/space)))
 		T = get_step(src, SOUTH)
-		if (T)
+		if(T)
 			T.overlays += rockTurfEdgeCache[NORTH_EDGING]
 	if((istype(get_step(src, EAST), /turf/simulated/floor)) || (istype(get_step(src, EAST), /turf/space)))
 		T = get_step(src, EAST)
-		if (T)
+		if(T)
 			T.overlays += rockTurfEdgeCache[WEST_EDGING]
 	if((istype(get_step(src, WEST), /turf/simulated/floor)) || (istype(get_step(src, WEST), /turf/space)))
 		T = get_step(src, WEST)
-		if (T)
+		if(T)
 			T.overlays += rockTurfEdgeCache[EAST_EDGING]
 
 /turf/simulated/mineral/random
@@ -116,10 +116,10 @@ var/global/list/rockTurfEdgeCache = list(
 
 /turf/simulated/mineral/random/New()
 	..()
-	if (prob(mineralChance))
+	if(prob(mineralChance))
 		var/mName = pickweight(mineralSpawnChanceList) //temp mineral name
 
-		if (mName)
+		if(mName)
 			var/turf/simulated/mineral/M
 			switch(mName)
 				if("Uranium")
@@ -367,13 +367,13 @@ var/global/list/rockTurfEdgeCache = list(
 
 /turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob, params)
 
-	if (!user.IsAdvancedToolUser())
+	if(!user.IsAdvancedToolUser())
 		to_chat(usr, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 
-	if (istype(P, /obj/item/weapon/pickaxe))
+	if(istype(P, /obj/item/weapon/pickaxe))
 		var/turf/T = user.loc
-		if (!( istype(T, /turf) ))
+		if(!( istype(T, /turf) ))
 			return
 
 		if(last_act+P.digspeed > world.time)//prevents message spam
@@ -393,9 +393,9 @@ var/global/list/rockTurfEdgeCache = list(
 	return
 
 /turf/simulated/mineral/proc/gets_drilled()
-	if (mineralType && (src.mineralAmt > 0) && (src.mineralAmt < 11))
+	if(mineralType && (src.mineralAmt > 0) && (src.mineralAmt < 11))
 		var/i
-		for (i=0;i<mineralAmt;i++)
+		for(i=0;i<mineralAmt;i++)
 			new mineralType(src)
 		feedback_add_details("ore_mined","[mineralType]|[mineralAmt]")
 	var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
@@ -465,7 +465,7 @@ var/global/list/rockTurfEdgeCache = list(
 		if(3.0)
 			return
 		if(2.0)
-			if (prob(20))
+			if(prob(20))
 				src.gets_dug()
 		if(1.0)
 			src.gets_dug()
@@ -476,37 +476,37 @@ var/global/list/rockTurfEdgeCache = list(
 	if(!W || !user)
 		return 0
 
-	if ((istype(W, /obj/item/weapon/shovel)))
+	if((istype(W, /obj/item/weapon/shovel)))
 		var/turf/T = user.loc
-		if (!( istype(T, /turf) ))
+		if(!( istype(T, /turf) ))
 			return
 
-		if (dug)
+		if(dug)
 			to_chat(user, "<span class='warning'>This area has already been dug!</span>")
 			return
 
 		to_chat(user, "<span class='notice'>You start digging...</span>")
 
 		sleep(20)
-		if ((user.loc == T && user.get_active_hand() == W))
+		if((user.loc == T && user.get_active_hand() == W))
 			to_chat(user, "<span class='notice'>You dig a hole.</span>")
 			gets_dug()
 			return
 
-	if ((istype(W, /obj/item/weapon/pickaxe)))
+	if((istype(W, /obj/item/weapon/pickaxe)))
 		var/obj/item/weapon/pickaxe/P = W
 		var/turf/T = user.loc
-		if (!( istype(T, /turf) ))
+		if(!( istype(T, /turf) ))
 			return
 
-		if (dug)
+		if(dug)
 			to_chat(user, "<span class='warning'>This area has already been dug!</span>")
 			return
 
 		to_chat(user, "<span class='notice'>You start digging...</span>")
 
 		sleep(P.digspeed)
-		if ((user.loc == T && user.get_active_hand() == W))
+		if((user.loc == T && user.get_active_hand() == W))
 			to_chat(user, "<span class='notice'>You dig a hole.</span>")
 			gets_dug()
 			return
@@ -557,7 +557,7 @@ var/global/list/rockTurfEdgeCache = list(
 	return
 
 /turf/proc/fullUpdateMineralOverlays()
-	for (var/turf/t in range(1,src))
+	for(var/turf/t in range(1,src))
 		t.updateMineralOverlays()
 
 /turf/simulated/floor/plating/airless/asteroid/cave
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index be34465c207..02b69a160d7 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -26,28 +26,28 @@
 	var/turf/T = get_step(src,input_dir)
 	if(T)
 		for(var/obj/item/stack/sheet/O in T)
-			if (istype(O, /obj/item/stack/sheet/mineral/gold))
+			if(istype(O, /obj/item/stack/sheet/mineral/gold))
 				amt_gold += 100 * O.amount
 				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/silver))
+			if(istype(O, /obj/item/stack/sheet/mineral/silver))
 				amt_silver += 100 * O.amount
 				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/diamond))
+			if(istype(O, /obj/item/stack/sheet/mineral/diamond))
 				amt_diamond += 100 * O.amount
 				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/plasma))
+			if(istype(O, /obj/item/stack/sheet/mineral/plasma))
 				amt_plasma += 100 * O.amount
 				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/uranium))
+			if(istype(O, /obj/item/stack/sheet/mineral/uranium))
 				amt_uranium += 100 * O.amount
 				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/metal))
+			if(istype(O, /obj/item/stack/sheet/metal))
 				amt_iron += 100 * O.amount
 				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/bananium))
+			if(istype(O, /obj/item/stack/sheet/mineral/bananium))
 				amt_clown += 100 * O.amount
 				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/tranquillite))
+			if(istype(O, /obj/item/stack/sheet/mineral/tranquillite))
 				amt_mime += 100 * O.amount
 				O.loc = null
 			return
@@ -58,49 +58,49 @@
 	var/dat = "<b>Coin Press</b><br>"
 
 	dat += text("<br><font color='#ffcc00'><b>Gold inserted: </b>[amt_gold]</font> ")
-	if (chosen == "gold")
+	if(chosen == "gold")
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=gold'>Choose</A>")
 	dat += text("<br><font color='#888888'><b>Silver inserted: </b>[amt_silver]</font> ")
-	if (chosen == "silver")
+	if(chosen == "silver")
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=silver'>Choose</A>")
 	dat += text("<br><font color='#555555'><b>Iron inserted: </b>[amt_iron]</font> ")
-	if (chosen == "metal")
+	if(chosen == "metal")
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=metal'>Choose</A>")
 	dat += text("<br><font color='#8888FF'><b>Diamond inserted: </b>[amt_diamond]</font> ")
-	if (chosen == "diamond")
+	if(chosen == "diamond")
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=diamond'>Choose</A>")
 	dat += text("<br><font color='#FF8800'><b>Plasma inserted: </b>[amt_plasma]</font> ")
-	if (chosen == "plasma")
+	if(chosen == "plasma")
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=plasma'>Choose</A>")
 	dat += text("<br><font color='#008800'><b>Uranium inserted: </b>[amt_uranium]</font> ")
-	if (chosen == "uranium")
+	if(chosen == "uranium")
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=uranium'>Choose</A>")
 	if(amt_clown > 0)
 		dat += text("<br><font color='#AAAA00'><b>Bananium inserted: </b>[amt_clown]</font> ")
-		if (chosen == "clown")
+		if(chosen == "clown")
 			dat += text("chosen")
 		else
 			dat += text("<A href='?src=\ref[src];choose=clown'>Choose</A>")
 	if(amt_mime > 0)
 		dat += text("<br><font color='#666666'><b>Tranquillite inserted: </b>[amt_mime]</font> ")
-		if (chosen == "mime")
+		if(chosen == "mime")
 			dat += text("chosen")
 		else
 			dat += text("<A href='?src=\ref[src];choose=mime'>Choose</A>")
 	dat += text("<br><font color='#888888'><b>Adamantine inserted: </b>[amt_adamantine]</font> ")//I don't even know these color codes, so fuck it.
-	if (chosen == "adamantine")
+	if(chosen == "adamantine")
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=adamantine'>Choose</A>")
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index a7a7b4b10df..8972b675e1a 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -7,7 +7,7 @@
 	flags = CONDUCT
 	force = 10.0
 	throwforce = 0
-	w_class = 4.0
+	w_class = 4
 
 /obj/item/weapon/moneybag/attack_hand(user as mob)
 	var/amt_gold = 0
@@ -20,58 +20,58 @@
 	var/amt_mime = 0
 	var/amt_adamantine = 0
 
-	for (var/obj/item/weapon/coin/C in contents)
-		if (istype(C,/obj/item/weapon/coin/diamond))
+	for(var/obj/item/weapon/coin/C in contents)
+		if(istype(C,/obj/item/weapon/coin/diamond))
 			amt_diamond++
-		if (istype(C,/obj/item/weapon/coin/plasma))
+		if(istype(C,/obj/item/weapon/coin/plasma))
 			amt_plasma++
-		if (istype(C,/obj/item/weapon/coin/iron))
+		if(istype(C,/obj/item/weapon/coin/iron))
 			amt_iron++
-		if (istype(C,/obj/item/weapon/coin/silver))
+		if(istype(C,/obj/item/weapon/coin/silver))
 			amt_silver++
-		if (istype(C,/obj/item/weapon/coin/gold))
+		if(istype(C,/obj/item/weapon/coin/gold))
 			amt_gold++
-		if (istype(C,/obj/item/weapon/coin/uranium))
+		if(istype(C,/obj/item/weapon/coin/uranium))
 			amt_uranium++
-		if (istype(C,/obj/item/weapon/coin/clown))
+		if(istype(C,/obj/item/weapon/coin/clown))
 			amt_clown++
-		if (istype(C,/obj/item/weapon/coin/mime))
+		if(istype(C,/obj/item/weapon/coin/mime))
 			amt_mime++
-		if (istype(C,/obj/item/weapon/coin/adamantine))
+		if(istype(C,/obj/item/weapon/coin/adamantine))
 			amt_adamantine++
 
 	var/dat = text("<b>The contents of the moneybag reveal...</b><br>")
-	if (amt_gold)
+	if(amt_gold)
 		dat += text("Gold coins: [amt_gold] <A href='?src=\ref[src];remove=gold'>Remove one</A><br>")
-	if (amt_silver)
+	if(amt_silver)
 		dat += text("Silver coins: [amt_silver] <A href='?src=\ref[src];remove=silver'>Remove one</A><br>")
-	if (amt_iron)
+	if(amt_iron)
 		dat += text("Metal coins: [amt_iron] <A href='?src=\ref[src];remove=iron'>Remove one</A><br>")
-	if (amt_diamond)
+	if(amt_diamond)
 		dat += text("Diamond coins: [amt_diamond] <A href='?src=\ref[src];remove=diamond'>Remove one</A><br>")
-	if (amt_plasma)
+	if(amt_plasma)
 		dat += text("Plasma coins: [amt_plasma] <A href='?src=\ref[src];remove=plasma'>Remove one</A><br>")
-	if (amt_uranium)
+	if(amt_uranium)
 		dat += text("Uranium coins: [amt_uranium] <A href='?src=\ref[src];remove=uranium'>Remove one</A><br>")
-	if (amt_clown)
+	if(amt_clown)
 		dat += text("Bananium coins: [amt_clown] <A href='?src=\ref[src];remove=clown'>Remove one</A><br>")
-	if (amt_mime)
+	if(amt_mime)
 		dat += text("Tranquillite coins: [amt_mime] <A href='?src=\ref[src];remove=mime'>Remove one</A><br>")
-	if (amt_adamantine)
+	if(amt_adamantine)
 		dat += text("Adamantine coins: [amt_adamantine] <A href='?src=\ref[src];remove=adamantine'>Remove one</A><br>")
 	user << browse("[dat]", "window=moneybag")
 
 /obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
-	if (istype(W, /obj/item/weapon/coin))
+	if(istype(W, /obj/item/weapon/coin))
 		var/obj/item/weapon/coin/C = W
 		if(!user.drop_item())
 			return
 		to_chat(user, "<span class='notice'>You add the [C.name] into the bag.</span>")
 		contents += C
-	if (istype(W, /obj/item/weapon/moneybag))
+	if(istype(W, /obj/item/weapon/moneybag))
 		var/obj/item/weapon/moneybag/C = W
-		for (var/obj/O in C.contents)
+		for(var/obj/O in C.contents)
 			contents += O;
 		to_chat(user, "<span class='notice'>You empty the [C.name] into the bag.</span>")
 	return
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 7d6750c4be4..20c154d3d4c 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -10,11 +10,11 @@
 	pressure_resistance = 5*ONE_ATMOSPHERE
 
 /obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/ore))
+	if(istype(W, /obj/item/weapon/ore))
 		if(!user.drop_item())
 			return
 		W.loc = src
-	if (istype(W, /obj/item/weapon/storage))
+	if(istype(W, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
 		S.hide_from(usr)
 		for(var/obj/item/weapon/ore/O in S.contents)
@@ -34,48 +34,48 @@
 	var/amt_mime = 0
 	var/amt_bluespace = 0
 
-	for (var/obj/item/weapon/ore/C in contents)
-		if (istype(C,/obj/item/weapon/ore/diamond))
+	for(var/obj/item/weapon/ore/C in contents)
+		if(istype(C,/obj/item/weapon/ore/diamond))
 			amt_diamond++
-		if (istype(C,/obj/item/weapon/ore/glass))
+		if(istype(C,/obj/item/weapon/ore/glass))
 			amt_glass++
-		if (istype(C,/obj/item/weapon/ore/plasma))
+		if(istype(C,/obj/item/weapon/ore/plasma))
 			amt_plasma++
-		if (istype(C,/obj/item/weapon/ore/iron))
+		if(istype(C,/obj/item/weapon/ore/iron))
 			amt_iron++
-		if (istype(C,/obj/item/weapon/ore/silver))
+		if(istype(C,/obj/item/weapon/ore/silver))
 			amt_silver++
-		if (istype(C,/obj/item/weapon/ore/gold))
+		if(istype(C,/obj/item/weapon/ore/gold))
 			amt_gold++
-		if (istype(C,/obj/item/weapon/ore/uranium))
+		if(istype(C,/obj/item/weapon/ore/uranium))
 			amt_uranium++
-		if (istype(C,/obj/item/weapon/ore/bananium))
+		if(istype(C,/obj/item/weapon/ore/bananium))
 			amt_clown++
-		if (istype(C,/obj/item/weapon/ore/tranquillite))
+		if(istype(C,/obj/item/weapon/ore/tranquillite))
 			amt_mime++
-		if (istype(C,/obj/item/weapon/ore/bluespace_crystal))
+		if(istype(C,/obj/item/weapon/ore/bluespace_crystal))
 			amt_bluespace++
 
 	var/dat = text("<b>The contents of the ore box reveal...</b><br>")
-	if (amt_gold)
+	if(amt_gold)
 		dat += text("Gold ore: [amt_gold]<br>")
-	if (amt_silver)
+	if(amt_silver)
 		dat += text("Silver ore: [amt_silver]<br>")
-	if (amt_iron)
+	if(amt_iron)
 		dat += text("Metal ore: [amt_iron]<br>")
-	if (amt_glass)
+	if(amt_glass)
 		dat += text("Sand: [amt_glass]<br>")
-	if (amt_diamond)
+	if(amt_diamond)
 		dat += text("Diamond ore: [amt_diamond]<br>")
-	if (amt_plasma)
+	if(amt_plasma)
 		dat += text("Plasma ore: [amt_plasma]<br>")
-	if (amt_uranium)
+	if(amt_uranium)
 		dat += text("Uranium ore: [amt_uranium]<br>")
-	if (amt_clown)
+	if(amt_clown)
 		dat += text("Bananium ore: [amt_clown]<br>")
-	if (amt_mime)
+	if(amt_mime)
 		dat += text("Tranquillite ore: [amt_mime]<br>")
-	if (amt_bluespace)
+	if(amt_bluespace)
 		dat += text("Bluespace crystals: [amt_bluespace]<br>")
 
 	dat += text("<br><br><A href='?src=\ref[src];removeall=1'>Empty box</A>")
@@ -88,7 +88,7 @@
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(href_list["removeall"])
-		for (var/obj/item/weapon/ore/O in contents)
+		for(var/obj/item/weapon/ore/O in contents)
 			contents -= O
 			O.loc = src.loc
 		to_chat(usr, "<span class='notice'>You empty the box.</span>")
@@ -122,7 +122,7 @@ obj/structure/ore_box/ex_act(severity, target)
 		to_chat(usr, "<span class='warning'>The ore box is empty.</span>")
 		return
 
-	for (var/obj/item/weapon/ore/O in contents)
+	for(var/obj/item/weapon/ore/O in contents)
 		contents -= O
 		O.loc = src.loc
 	to_chat(usr, "<span class='notice'>You empty the ore box.</span>")
diff --git a/code/modules/mob/dead/observer/login.dm b/code/modules/mob/dead/observer/login.dm
index f6fcac54798..7e3d3f6c4bf 100644
--- a/code/modules/mob/dead/observer/login.dm
+++ b/code/modules/mob/dead/observer/login.dm
@@ -1,6 +1,6 @@
 /mob/dead/observer/Login()
 	..()
-	if (ghostimage)
+	if(ghostimage)
 		ghostimage.icon_state = src.icon_state
 	updateghostimages()
 	
diff --git a/code/modules/mob/dead/observer/logout.dm b/code/modules/mob/dead/observer/logout.dm
index f80f0100cfc..aa72e364aa0 100644
--- a/code/modules/mob/dead/observer/logout.dm
+++ b/code/modules/mob/dead/observer/logout.dm
@@ -1,5 +1,5 @@
 /mob/dead/observer/Logout()
-	if (client)
+	if(client)
 		client.images -= ghost_darkness_images
 	..()
 	spawn(0)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index f389c2376f3..497e1ed18bc 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -49,7 +49,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 		T = get_turf(body)				//Where is the body located?
 		attack_log = body.attack_log	//preserve our attack logs by copying them to our ghost
 
-		if (ishuman(body))
+		if(ishuman(body))
 			var/mob/living/carbon/human/H = body
 			icon = H.stand_icon
 			overlays = H.overlays_standing
@@ -94,7 +94,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 		var/mob/M = following
 		M.following_mobs -= src
 	following = null
-	if (ghostimage)
+	if(ghostimage)
 		ghost_darkness_images -= ghostimage
 		qdel(ghostimage)
 		ghostimage = null
@@ -135,7 +135,7 @@ Works together with spawning an observer, noted above.
 		if(ghost.can_reenter_corpse)
 			respawnable_list += ghost
 		ghost.key = key
-		if(!ghost.client.holder && !config.antag_hud_allowed)    // For new ghosts we remove the verb from even showing up if it's not allowed.
+		if(!(ghost.client && ghost.client.holder) && !config.antag_hud_allowed)    // For new ghosts we remove the verb from even showing up if it's not allowed.
 			ghost.verbs -= /mob/dead/observer/verb/toggle_antagHUD  // Poor guys, don't know what they are missing!
 		return ghost
 
@@ -201,7 +201,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 /mob/dead/observer/Stat()
 	..()
 	statpanel("Status")
-	if (client.statpanel == "Status")
+	if(client.statpanel == "Status")
 		show_stat_station_time()
 		if(ticker)
 			if(ticker.mode)
@@ -373,6 +373,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(!target)
 		return
 
+	if(!get_turf(target))
+		return
+
 	if(target != src)
 		if(following && following == target)
 			return
@@ -422,7 +425,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	if(istype(usr, /mob/dead/observer)) //Make sure they're an observer!
 
-		if (!target)//Make sure we actually have a target
+		if(!target)//Make sure we actually have a target
 			return
 		else
 			var/mob/M = getmobs()[target] //Destination mob
@@ -465,7 +468,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(!istype(usr, /mob/dead/observer)) return
 
 	// Shamelessly copied from the Gas Analyzers
-	if (!( istype(usr.loc, /turf) ))
+	if(!( istype(usr.loc, /turf) ))
 		return
 
 	var/datum/gas_mixture/environment = usr.loc.return_air()
@@ -522,8 +525,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 //this is called when a ghost is drag clicked to something.
 /mob/dead/observer/MouseDrop(atom/over)
 	if(!usr || !over) return
-	if (isobserver(usr) && usr.client && usr.client.holder)
-		if (usr.client.holder.cmd_ghost_drag(src,over))
+	if(isobserver(usr) && usr.client && usr.client.holder)
+		if(usr.client.holder.cmd_ghost_drag(src,over))
 			return
 
 	return ..()
@@ -551,17 +554,17 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		return
 		..()
 
-	if (href_list["track"])
+	if(href_list["track"])
 		var/atom/target = locate(href_list["track"])
 		if(target)
 			ManualFollow(target)
 
-	if (href_list["follow"])
+	if(href_list["follow"])
 		var/atom/target = locate(href_list["follow"])
 		if(target)
 			ManualFollow(target)
 
-	if (href_list["jump"])
+	if(href_list["jump"])
 		var/mob/target = locate(href_list["jump"])
 		var/mob/A = usr;
 		to_chat(A, "Teleporting to [target]...")
@@ -610,27 +613,27 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	updateghostsight()
 
 /mob/dead/observer/proc/updateghostsight()
-	if (!seedarkness)
+	if(!seedarkness)
 		see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 	else
 		see_invisible = SEE_INVISIBLE_OBSERVER
-		if (!ghostvision)
+		if(!ghostvision)
 			see_invisible = SEE_INVISIBLE_LIVING;
 	updateghostimages()
 
 /proc/updateallghostimages()
-	for (var/mob/dead/observer/O in player_list)
+	for(var/mob/dead/observer/O in player_list)
 		O.updateghostimages()
 
 /mob/dead/observer/proc/updateghostimages()
-	if (!client)
+	if(!client)
 		return
-	if (seedarkness || !ghostvision)
+	if(seedarkness || !ghostvision)
 		client.images -= ghost_darkness_images
 	else
 		//add images for the 60inv things ghosts can normally see when darkness is enabled so they can see them now
 		client.images |= ghost_darkness_images
-		if (ghostimage)
+		if(ghostimage)
 			client.images -= ghostimage //remove ourself
 
 /mob/proc/can_admin_interact()
diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm
index a6269b96d36..fb5b7735633 100644
--- a/code/modules/mob/dead/observer/say.dm
+++ b/code/modules/mob/dead/observer/say.dm
@@ -1,21 +1,39 @@
 /mob/dead/observer/say(var/message)
 	message = sanitize(copytext(message, 1, MAX_MESSAGE_LEN))
 
-	if (!message)
+	if(!message)
 		return
 
 	log_say("Ghost/[src.key] : [message]")
 
-	if (src.client)
+	if(src.client)
 		if(src.client.prefs.muted & MUTE_DEADCHAT)
 			to_chat(src, "\red You cannot talk in deadchat (muted).")
 			return
 
-		if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
+		if(src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
 			return
 
-	if(copytext(message,1,2) == "*")
-		return emote(copytext(message,2))
-
 	. = src.say_dead(message)
 
+
+/mob/dead/observer/emote(var/act, var/type, var/message)
+	message = sanitize(copytext(message, 1, MAX_MESSAGE_LEN))
+
+	if(!message)
+		return
+
+	if(act != "me")
+		return
+
+	log_emote("Ghost/[src.key] : [message]")
+
+	if(src.client)
+		if(src.client.prefs.muted & MUTE_DEADCHAT)
+			to_chat(src, "\red You cannot emote in deadchat (muted).")
+			return
+
+		if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT))
+			return
+
+	. = src.emote_dead(message)
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
new file mode 100644
index 00000000000..ecdc6a0220a
--- /dev/null
+++ b/code/modules/mob/emote.dm
@@ -0,0 +1,125 @@
+#define EMOTE_COOLDOWN 20		//Time in deciseconds that the cooldown lasts
+
+//Emote Cooldown System (it's so simple!)
+/mob/proc/handle_emote_CD(cooldown = EMOTE_COOLDOWN)
+	if(emote_cd == 2) return 1			// Cooldown emotes were disabled by an admin, prevent use
+	if(src.emote_cd == 1) return 1		// Already on CD, prevent use
+
+	src.emote_cd = 1		// Starting cooldown
+	spawn(cooldown)
+		if(emote_cd == 2) return 1		// Don't reset if cooldown emotes were disabled by an admin during the cooldown
+		src.emote_cd = 0				// Cooldown complete, ready for more!
+
+	return 0		// Proceed with emote
+//--FalseIncarnate
+
+// All mobs should have custom emote, really..
+/mob/proc/custom_emote(var/m_type=1,var/message = null)
+
+	if(stat || !use_me && usr == src)
+		if(usr)
+			to_chat(usr, "You are unable to emote.")
+		return
+
+	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
+	if(m_type == 2 && muzzled) return
+
+	var/input
+	if(!message)
+		input = sanitize(copytext(input(src,"Choose an emote to display.") as text|null,1,MAX_MESSAGE_LEN))
+	else
+		input = message
+	if(input)
+		message = "<B>[src]</B> [input]"
+	else
+		return
+
+
+	if(message)
+		log_emote("[name]/[key] : [message]")
+
+ //Hearing gasp and such every five seconds is not good emotes were not global for a reason.
+ // Maybe some people are okay with that.
+
+		for(var/mob/M in player_list)
+			if(!M.client)
+				continue //skip monkeys and leavers
+			if(istype(M, /mob/new_player))
+				continue
+			if(findtext(message," snores.")) //Because we have so many sleeping people.
+				break
+			if(M.stat == 2 && (M.client.prefs.toggles & CHAT_GHOSTSIGHT) && !(M in viewers(src,null)))
+				M.show_message(message)
+
+
+		// Type 1 (Visual) emotes are sent to anyone in view of the item
+		if(m_type & 1)
+			var/list/can_see = get_mobs_in_view(1,src)  //Allows silicon & mmi mobs carried around to see the emotes of the person carrying them around.
+			can_see |= viewers(src,null)
+			for(var/mob/O in can_see)
+
+				if(O.status_flags & PASSEMOTES)
+
+					for(var/obj/item/weapon/holder/H in O.contents)
+						H.show_message(message, m_type)
+
+					for(var/mob/living/M in O.contents)
+						M.show_message(message, m_type)
+
+				O.show_message(message, m_type)
+
+		// Type 2 (Audible) emotes are sent to anyone in hear range
+		// of the *LOCATION* -- this is important for pAIs to be heard
+		else if(m_type & 2)
+			for(var/mob/O in get_mobs_in_view(7,src))
+
+				if(O.status_flags & PASSEMOTES)
+
+					for(var/obj/item/weapon/holder/H in O.contents)
+						H.show_message(message, m_type)
+
+					for(var/mob/living/M in O.contents)
+						M.show_message(message, m_type)
+
+				O.show_message(message, m_type)
+
+/mob/proc/emote_dead(var/message)
+
+	if(client.prefs.muted & MUTE_DEADCHAT)
+		to_chat(src, "\red You cannot send deadchat emotes (muted).")
+		return
+
+	if(!(client.prefs.toggles & CHAT_DEAD))
+		to_chat(src, "\red You have deadchat muted.")
+		return
+
+	if(!src.client.holder)
+		if(!config.dsay_allowed)
+			to_chat(src, "\red Deadchat is globally muted")
+			return
+
+
+	var/input
+	if(!message)
+		input = sanitize(copytext(input(src, "Choose an emote to display.") as text|null, 1, MAX_MESSAGE_LEN))
+	else
+		input = message
+
+	if(input)
+		message = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <b>[src]</b> [message]</span>"
+	else
+		return
+
+
+	if(message)
+		log_emote("Ghost/[src.key] : [message]")
+
+		for(var/mob/M in player_list)
+			if(istype(M, /mob/new_player))
+				continue
+
+			if(check_rights(R_ADMIN|R_MOD, 0, M) && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to admins/mods
+				to_chat(M, message)
+
+			else if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to regular ghosts with deadchat toggled on
+				M.show_message(message, 2)
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 47004016a2b..d0bed142a38 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -11,13 +11,13 @@
 
 	//make sure the air can transmit speech - hearer's side
 	var/turf/T = get_turf(src)
-	if ((T) && (!(istype(src, /mob/dead/observer)))) //Ghosts can hear even in vacuum.
+	if((T) && (!(istype(src, /mob/dead/observer)))) //Ghosts can hear even in vacuum.
 		var/datum/gas_mixture/environment = T.return_air()
 		var/pressure = (environment)? environment.return_pressure() : 0
 		if(pressure < SOUND_MINIMUM_PRESSURE && get_dist(speaker, src) > 1)
 			return
 
-		if (pressure < ONE_ATMOSPHERE*0.4) //sound distortion pressure, to help clue people in that the air is thin, even if it isn't a vacuum yet
+		if(pressure < ONE_ATMOSPHERE*0.4) //sound distortion pressure, to help clue people in that the air is thin, even if it isn't a vacuum yet
 			italics = 1
 			sound_vol *= 0.5 //muffle the sound a bit, so it's like we're actually talking through contact
 
@@ -26,8 +26,8 @@
 		return
 
 	//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
-	if (language && (language.flags & NONVERBAL))
-		if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
+	if(language && (language.flags & NONVERBAL))
+		if(!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
 			message = stars(message)
 
 	if(!(language && (language.flags & INNATE))) // skip understanding checks for INNATE languages
@@ -73,7 +73,7 @@
 			to_chat(src, "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track][language.format_message(message, verb)]</span>")
 		else
 			to_chat(src, "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track][verb], <span class='message'><span class='body'>\"[message]\"</span></span></span>")
-		if (speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z))
+		if(speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z))
 			var/turf/source = speaker? get_turf(speaker) : get_turf(src)
 			src.playsound_local(source, speech_sound, sound_vol, 1)
 
@@ -92,8 +92,8 @@
 		follow_target = speaker
 
 	//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
-	if (language && (language.flags & NONVERBAL))
-		if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
+	if(language && (language.flags & NONVERBAL))
+		if(!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
 			message = stars(message)
 
 	if(!(language && (language.flags & INNATE))) // skip understanding checks for INNATE languages
@@ -128,7 +128,7 @@
 		var/jobname // the mob's "job"
 		var/mob/living/carbon/human/impersonating //The crewmember being impersonated, if any.
 
-		if (ishuman(speaker))
+		if(ishuman(speaker))
 			var/mob/living/carbon/human/H = speaker
 
 			var/obj/item/weapon/card/id/id = H.wear_id
@@ -143,15 +143,15 @@
 			else
 				jobname = H.get_assignment()
 
-		else if (iscarbon(speaker)) // Nonhuman carbon mob
+		else if(iscarbon(speaker)) // Nonhuman carbon mob
 			jobname = "No ID"
-		else if (isAI(speaker))
+		else if(isAI(speaker))
 			jobname = "AI"
-		else if (isrobot(speaker))
+		else if(isrobot(speaker))
 			jobname = "Cyborg"
-		else if (ispAI(speaker))
+		else if(ispAI(speaker))
 			jobname = "Personal AI"
-		else if (isAutoAnnouncer(speaker))
+		else if(isAutoAnnouncer(speaker))
 			var/mob/living/automatedannouncer/AA = speaker
 			jobname = AA.role
 		else
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 09f8009be75..ed867cd5178 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -48,10 +48,10 @@
 	if(istype(M))
 		M.unEquip(src)
 		to_chat(M, "[src] wriggles out of your grip!")
-		to_chat(src, "You wriggle out of [M]'s grip!")
-	else if(istype(src.loc,/obj/item))
-		to_chat(src, "You struggle free of [src.loc].")
-		src.forceMove(get_turf(src))
+		to_chat(L, "You wriggle out of [M]'s grip!")
+	else if(istype(loc,/obj/item))
+		to_chat(L, "You struggle free of [loc].")
+		forceMove(get_turf(src))
 
 	if(istype(M))
 		for(var/atom/A in M.contents)
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 5d5aea5d47f..2f10ee1022c 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -518,24 +518,24 @@
 	if(!speaker.binarycheck())
 		return
 
-	if (!message)
+	if(!message)
 		return
 
 	var/message_start = "<i><span class='game say'>[name], <span class='name'>[speaker.name]</span>"
 	var/message_body = "<span class='message'>[speaker.say_quote(message)], \"[message]\"</span></span></i>"
 
-	for (var/mob/M in dead_mob_list)
+	for(var/mob/M in dead_mob_list)
 		if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain))
 			var/message_start_dead = "<i><span class='game say'>[name], <span class='name'>[speaker.name] ([ghost_follow_link(speaker, ghost=M)])</span>"
 			M.show_message("[message_start_dead] [message_body]", 2)
 
-	for (var/mob/living/S in living_mob_list)
+	for(var/mob/living/S in living_mob_list)
 
 		if(drone_only && !istype(S,/mob/living/silicon/robot/drone))
 			continue
 		else if(istype(S , /mob/living/silicon/ai))
 			message_start = "<i><span class='game say'>[name], <a href='byond://?src=\ref[S];track=\ref[speaker]'><span class='name'>[speaker.name]</span></a>"
-		else if (!S.binarycheck())
+		else if(!S.binarycheck())
 			continue
 
 		S.show_message("[message_start] [message_body]", 2)
@@ -543,17 +543,11 @@
 	var/list/listening = hearers(1, src)
 	listening -= src
 
-	for (var/mob/living/M in listening)
+	for(var/mob/living/M in listening)
 		if(istype(M, /mob/living/silicon) || M.binarycheck())
 			continue
 		M.show_message("<i><span class='game say'><span class='name'>synthesised voice</span> <span class='message'>beeps, \"beep beep beep\"</span></span></i>",2)
 
-	//robot binary xmitter component power usage
-	if (isrobot(speaker))
-		var/mob/living/silicon/robot/R = speaker
-		var/datum/robot_component/C = R.components["comms"]
-		R.use_power(C.energy_consumption)
-
 /datum/language/binary/drone
 	name = "Drone Talk"
 	desc = "A heavily encoded damage control coordination stream."
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 74e9fbfce93..124a1120df6 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -118,11 +118,11 @@
 
 /mob/living/carbon/alien/handle_mutations_and_radiation()
 	// Aliens love radiation nom nom nom
-	if (radiation)
-		if (radiation > 100)
+	if(radiation)
+		if(radiation > 100)
 			radiation = 100
 
-		if (radiation < 0)
+		if(radiation < 0)
 			radiation = 0
 
 		switch(radiation)
@@ -228,8 +228,8 @@ Proc: AddInfectionImages()
 Des: Gives the client of the alien an image on each infected mob.
 ----------------------------------------*/
 /mob/living/carbon/alien/proc/AddInfectionImages()
-	if (client)
-		for (var/mob/living/C in mob_list)
+	if(client)
+		for(var/mob/living/C in mob_list)
 			if(C.status_flags & XENO_HOST)
 				var/obj/item/organ/internal/body_egg/alien_embryo/A = C.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo)
 				if(A)
@@ -243,7 +243,7 @@ Proc: RemoveInfectionImages()
 Des: Removes all infected images from the alien.
 ----------------------------------------*/
 /mob/living/carbon/alien/proc/RemoveInfectionImages()
-	if (client)
+	if(client)
 		for(var/image/I in client.images)
 			if(dd_hasprefix_case(I.icon_state, "infected"))
 				qdel(I)
diff --git a/code/modules/mob/living/carbon/alien/alien_defenses.dm b/code/modules/mob/living/carbon/alien/alien_defenses.dm
index 397a14fc259..3f2e2d28b78 100644
--- a/code/modules/mob/living/carbon/alien/alien_defenses.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defenses.dm
@@ -6,17 +6,17 @@ As such, they can either help or harm other aliens. Help works like the human he
 In all, this is a lot like the monkey code. /N
 */
 /mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 			sleeping = max(0,sleeping-5)
 			resting = 0
 			AdjustParalysis(-3)
@@ -24,12 +24,12 @@ In all, this is a lot like the monkey code. /N
 			AdjustWeakened(-3)
 			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake it up!</span>")
 
-		if (I_GRAB)
+		if(I_GRAB)
 			src.grabbedby(M)
 			return 1
 
 		else
-			if (health > 0)
+			if(health > 0)
 				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
 				var/damage = 1
 				visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
@@ -57,7 +57,7 @@ In all, this is a lot like the monkey code. /N
 			help_shake_act(M)
 		if(I_GRAB)
 			src.grabbedby(M)
-		if (I_HARM, I_DISARM)
+		if(I_HARM, I_DISARM)
 			return 1
 	return 0
 
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index 9311ab0592f..28439ab0ff2 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -57,10 +57,10 @@ Doesn't work on other aliens/AI.*/
 
 	if(isalien(M))
 		var/amount = input("Amount:", "Transfer Plasma to [M]") as num
-		if (amount)
+		if(amount)
 			amount = abs(round(amount))
 			if(powerc(amount))
-				if (get_dist(src,M) <= 1)
+				if(get_dist(src,M) <= 1)
 					M.adjustPlasma(amount)
 					adjustPlasma(-amount)
 					to_chat(M, "<span class='noticealien'>[src] has transfered [amount] plasma to you.</span>")
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index a5e72059ab8..f0af54a45ab 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -18,8 +18,8 @@
 /mob/living/carbon/alien/humanoid/hunter/handle_regular_hud_updates()
 	..() //-Yvarov
 
-	if (healths)
-		if (stat != 2)
+	if(healths)
+		if(stat != 2)
 			switch(health)
 				if(125 to INFINITY)
 					healths.icon_state = "health0"
@@ -85,7 +85,7 @@
 		leaping = 0
 		update_icons()
 
-/mob/living/carbon/alien/humanoid/hunter/throw_impact(A)
+/mob/living/carbon/alien/humanoid/hunter/throw_impact(atom/A)
 
 	if(!leaping)
 		return ..()
@@ -93,20 +93,26 @@
 	if(A)
 		if(istype(A, /mob/living))
 			var/mob/living/L = A
-			L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
-			if(ishuman(L))
-				var/mob/living/carbon/human/H = L
-				H.apply_effect(5, WEAKEN, H.run_armor_check(null, "melee"))
-			else
-				L.Weaken(5)
-			sleep(2)//Runtime prevention (infinite bump() calls on hulks)
-			step_towards(src,L)
+			var/blocked = 0
+			if(ishuman(A))
+				var/mob/living/carbon/human/H = A
+				if(H.check_shields(90, "the [name]", src, attack_type = THROWN_PROJECTILE_ATTACK))
+					blocked = 1
+			if(!blocked)
+				L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
+				if(ishuman(L))
+					var/mob/living/carbon/human/H = L
+					H.apply_effect(5, WEAKEN, H.run_armor_check(null, "melee"))
+				else
+					L.Weaken(5)
+				sleep(2)//Runtime prevention (infinite bump() calls on hulks)
+				step_towards(src,L)
 
 			toggle_leap(0)
 			pounce_cooldown = !pounce_cooldown
 			spawn(pounce_cooldown_time) //3s by default
 				pounce_cooldown = !pounce_cooldown
-		else
+		else if(A.density && !A.CanPass(src))
 			visible_message("<span class ='danger'>[src] smashes into [A]!</span>", "<span class ='alertalien'>[src] smashes into [A]!</span>")
 			weakened = 2
 
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
index 831d01dbc87..d93fb0a835c 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
@@ -49,8 +49,8 @@
 /mob/living/carbon/alien/humanoid/sentinel/handle_regular_hud_updates()
 	..() //-Yvarov
 
-	if (healths)
-		if (stat != 2)
+	if(healths)
+		if(stat != 2)
 			switch(health)
 				if(150 to INFINITY)
 					healths.icon_state = "health0"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm
new file mode 100644
index 00000000000..05eb2c8e226
--- /dev/null
+++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm
@@ -0,0 +1,115 @@
+/mob/living/carbon/alien/humanoid/emote(var/act,var/m_type=1,var/message = null)
+	var/param = null
+	if(findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+//	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+//		act = copytext(act,1,length(act))	//seriously who the fuck wrote this
+	var/muzzled = is_muzzled()
+	act = lowertext(act)
+	switch(act)
+		if("sign")
+			if(!restrained())
+				var/num = null
+				if(text2num(param))
+					num = "the number [text2num(param)]"
+				if(num)
+					message = "<B>\The [src]</B> signs [num]."
+					m_type = 1
+		if("burp")
+			if(!muzzled)
+				message = "<B>\The [src]</B> burps."
+				m_type = 2
+		if("deathgasp")
+			message = "<B>\The [src]</B> lets out a waning guttural screech, green blood bubbling from its maw..."
+			m_type = 2
+		if("scratch")
+			if(!src.restrained())
+				message = "<B>\The [src]</B> scratches."
+				m_type = 1
+		if("whimper")
+			if(!muzzled)
+				message = "<B>\The [src]</B> whimpers."
+				m_type = 2
+		if("roar")
+			if(!muzzled)
+				message = "<B>\The [src]</B> roars."
+				m_type = 2
+		if("hiss")
+			if(!muzzled)
+				message = "<B>\The [src]</B> hisses."
+				m_type = 2
+		if("tail")
+			message = "<B>\The [src]</B> waves its tail."
+			m_type = 1
+		if("gasp")
+			message = "<B>\The [src]</B> gasps."
+			m_type = 2
+		if("shiver")
+			message = "<B>\The [src]</B> shivers."
+			m_type = 2
+		if("drool")
+			message = "<B>\The [src]</B> drools."
+			m_type = 1
+		if("scretch")
+			if(!muzzled)
+				message = "<B>\The [src]</B> scretches."
+				m_type = 2
+		if("choke")
+			message = "<B>\The [src]</B> chokes."
+			m_type = 2
+		if("moan")
+			message = "<B>\The [src]</B> moans!"
+			m_type = 2
+		if("nod")
+			message = "<B>\The [src]</B> nods its head."
+			m_type = 1
+		if("sit")
+			message = "<B>\The [src]</B> sits down."
+			m_type = 1
+		if("sway")
+			message = "<B>\The [src]</B> sways around dizzily."
+			m_type = 1
+		if("sulk")
+			message = "<B>\The [src]</B> sulks down sadly."
+			m_type = 1
+		if("twitch")
+			message = "<B>\The [src]</B> twitches violently."
+			m_type = 1
+		if("dance")
+			if(!src.restrained())
+				message = "<B>\The [src]</B> dances around happily."
+				m_type = 1
+		if("roll")
+			if(!src.restrained())
+				message = "<B>\The [src]</B> rolls."
+				m_type = 1
+		if("shake")
+			message = "<B>\The [src]</B> shakes its head."
+			m_type = 1
+		if("gnarl")
+			if(!muzzled)
+				message = "<B>\The [src]</B> gnarls and shows its teeth.."
+				m_type = 2
+		if("jump")
+			message = "<B>\The [src]</B> jumps!"
+			m_type = 1
+		if("collapse")
+			Paralyse(2)
+			message = "<B>\The [src]</B> collapses!"
+			m_type = 2
+		if("flip")
+			m_type = 1
+			message = "<B>\The [src]</B> does a flip!"
+			src.SpinAnimation(5,1)
+		if("help")
+			to_chat(src, "burp, flip, deathgasp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper")
+
+	if(!stat)
+		if(act == "roar")
+			playsound(src.loc, 'sound/voice/hiss5.ogg', 40, 1, 1)
+		if(act == "deathgasp")
+			playsound(src.loc, 'sound/voice/hiss6.ogg', 80, 1, 1)
+		..(act, m_type, message)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/humanoid/empress.dm b/code/modules/mob/living/carbon/alien/humanoid/empress.dm
index ffc8e04429e..d2553c9a28f 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/empress.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/empress.dm
@@ -56,8 +56,8 @@
 
 		..() //-Yvarov
 
-		if (src.healths)
-			if (src.stat != 2)
+		if(src.healths)
+			if(src.stat != 2)
 				switch(health)
 					if(250 to INFINITY)
 						src.healths.icon_state = "health0"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 90fe6537759..9996c3eeb89 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -29,22 +29,22 @@
 //This is fine, works the same as a human
 /mob/living/carbon/alien/humanoid/Bump(atom/movable/AM as mob|obj, yes)
 	spawn( 0 )
-		if ((!( yes ) || now_pushing))
+		if((!( yes ) || now_pushing))
 			return
 		now_pushing = 0
 		..()
-		if (!istype(AM, /atom/movable))
+		if(!istype(AM, /atom/movable))
 			return
 
-		if (ismob(AM))
+		if(ismob(AM))
 			var/mob/tmob = AM
 			tmob.LAssailant = src
 
-		if (!now_pushing)
+		if(!now_pushing)
 			now_pushing = 1
-			if (!AM.anchored)
+			if(!AM.anchored)
 				var/t = get_dir(src, AM)
-				if (istype(AM, /obj/structure/window/full))
+				if(istype(AM, /obj/structure/window/full))
 					for(var/obj/structure/window/win in get_step(AM,t))
 						now_pushing = 0
 						return
@@ -55,13 +55,13 @@
 
 /mob/living/carbon/alien/humanoid/movement_delay()
 	var/tally = 0
-	if (istype(src, /mob/living/carbon/alien/humanoid/queen))
+	if(istype(src, /mob/living/carbon/alien/humanoid/queen))
 		tally += 4
-	if (istype(src, /mob/living/carbon/alien/humanoid/drone))
+	if(istype(src, /mob/living/carbon/alien/humanoid/drone))
 		tally += 0
-	if (istype(src, /mob/living/carbon/alien/humanoid/sentinel))
+	if(istype(src, /mob/living/carbon/alien/humanoid/sentinel))
 		tally += 0
-	if (istype(src, /mob/living/carbon/alien/humanoid/hunter))
+	if(istype(src, /mob/living/carbon/alien/humanoid/hunter))
 		tally = -2 // hunters go supersuperfast
 	return (tally + move_delay_add + config.alien_delay)
 
@@ -85,13 +85,13 @@
 
 	var/b_loss = null
 	var/f_loss = null
-	switch (severity)
-		if (1.0)
+	switch(severity)
+		if(1.0)
 			gib()
 			return
 
-		if (2.0)
-			if (!shielded)
+		if(2.0)
+			if(!shielded)
 				b_loss += 60
 
 			f_loss += 60
@@ -101,7 +101,7 @@
 
 		if(3.0)
 			b_loss += 30
-			if (prob(50) && !shielded)
+			if(prob(50) && !shielded)
 				Paralyse(1)
 			ear_damage += 15
 			ear_deaf += 60
@@ -112,13 +112,13 @@
 	updatehealth()
 
 /mob/living/carbon/alien/humanoid/attack_slime(mob/living/carbon/slime/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
 	if(M.Victim) return // can't attack while eating!
 
-	if (stat > -100)
+	if(stat > -100)
 
 		M.do_attack_animation(src)
 		visible_message("<span class='danger'>The [M.name] glomps [src]!</span>", \
@@ -153,7 +153,7 @@
 				"<span class='userdanger'>The [M.name] has shocked [src]!</span>")
 
 				Weaken(power)
-				if (stuttering < power)
+				if(stuttering < power)
 					stuttering = power
 				Stun(power)
 
@@ -161,7 +161,7 @@
 				s.set_up(5, 1, src)
 				s.start()
 
-				if (prob(stunprob) && M.powerlevel >= 8)
+				if(prob(stunprob) && M.powerlevel >= 8)
 					adjustFireLoss(M.powerlevel * rand(6,10))
 
 
@@ -183,11 +183,11 @@
 		updatehealth()
 
 /mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
@@ -196,17 +196,17 @@
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 			help_shake_act(M)
 
-		if (I_GRAB)
+		if(I_GRAB)
 			grabbedby(M)
 
-		if (I_HARM)
+		if(I_HARM)
 			M.do_attack_animation(src)
 			var/damage = rand(1, 9)
-			if (prob(90))
-				if (HULK in M.mutations)//HULK SMASH
+			if(prob(90))
+				if(HULK in M.mutations)//HULK SMASH
 					damage = 15
 					spawn(0)
 						Paralyse(1)
@@ -216,7 +216,7 @@
 				playsound(loc, "punch", 25, 1, -1)
 				visible_message("<span class='danger'>[M] has punched [src]!</span>", \
 						"<span class='userdanger'>[M] has punched [src]!</span>")
-				if ((stat != DEAD) && (damage > 9||prob(5)))//Regular humans have a very small chance of weakening an alien.
+				if((stat != DEAD) && (damage > 9||prob(5)))//Regular humans have a very small chance of weakening an alien.
 					Paralyse(2)
 					visible_message("<span class='danger'>[M] has weakened [src]!</span>", \
 							"<span class='userdanger'>[M] has weakened [src]!</span>", \
@@ -227,15 +227,15 @@
 				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 				visible_message("<span class='danger'>[M] has attempted to punch [src]!</span>")
 
-		if (I_DISARM)
-			if (!lying)
-				if (prob(5))//Very small chance to push an alien down.
+		if(I_DISARM)
+			if(!lying)
+				if(prob(5))//Very small chance to push an alien down.
 					Paralyse(2)
 					playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 					visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
 							"<span class='userdanger'>[M] has pushed down [src]!</span>")
 				else
-					if (prob(50))
+					if(prob(50))
 						drop_item()
 						playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 						visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
@@ -251,11 +251,11 @@ In all, this is a lot like the monkey code. /N
 */
 
 /mob/living/carbon/alien/humanoid/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
@@ -263,7 +263,7 @@ In all, this is a lot like the monkey code. /N
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 			sleeping = max(0,sleeping-5)
 			resting = 0
 			AdjustParalysis(-3)
@@ -272,7 +272,7 @@ In all, this is a lot like the monkey code. /N
 			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake it up!</span>")
 
 		else
-			if (health > 0)
+			if(health > 0)
 				M.do_attack_animation(src)
 				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
 				var/damage = rand(1, 3)
@@ -294,7 +294,7 @@ In all, this is a lot like the monkey code. /N
 
 
 		else
-			if (health > 0)
+			if(health > 0)
 				L.do_attack_animation(src)
 				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
 				var/damage = rand(1, 3)
@@ -310,7 +310,7 @@ In all, this is a lot like the monkey code. /N
 
 
 /mob/living/carbon/alien/humanoid/restrained()
-	if (handcuffed)
+	if(handcuffed)
 		return 1
 	return 0
 
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index b41d5a9705d..d478194bc44 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -15,24 +15,24 @@
 
 
 /mob/living/carbon/alien/humanoid/handle_disabilities()
-	if (disabilities & EPILEPSY)
-		if ((prob(1) && paralysis < 10))
+	if(disabilities & EPILEPSY)
+		if((prob(1) && paralysis < 10))
 			to_chat(src, "<span class='danger'>You have a seizure!</span>")
 			Paralyse(10)
-	if (disabilities & COUGHING)
-		if ((prob(5) && paralysis <= 1))
+	if(disabilities & COUGHING)
+		if((prob(5) && paralysis <= 1))
 			drop_item()
 			spawn( 0 )
 				emote("cough")
 				return
-	if (disabilities & TOURETTES)
-		if ((prob(10) && paralysis <= 1))
+	if(disabilities & TOURETTES)
+		if((prob(10) && paralysis <= 1))
 			Stun(10)
 			spawn( 0 )
 				emote("twitch")
 				return
-	if (disabilities & NERVOUS)
-		if (prob(10))
+	if(disabilities & NERVOUS)
+		if(prob(10))
 			stuttering = max(10, stuttering)
 
 /mob/living/carbon/alien/humanoid/proc/adjust_body_temperature(current, loc_temp, boost)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index 2b5060468a1..e2862184b79 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -34,8 +34,8 @@
 /mob/living/carbon/alien/humanoid/queen/handle_regular_hud_updates()
 	..() //-Yvarov
 
-	if (healths)
-		if (stat != DEAD)
+	if(healths)
+		if(stat != DEAD)
 			switch(health)
 				if(250 to INFINITY)
 					healths.icon_state = "health0"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
index fb489552f78..898d23de066 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
@@ -56,7 +56,7 @@
 
 /mob/living/carbon/alien/humanoid/regenerate_icons()
 	..()
-	if (notransform)	return
+	if(notransform)	return
 
 	update_inv_head(0,0)
 	update_inv_wear_suit(0,0)
@@ -103,7 +103,7 @@
 				t_suit = "armor"
 			standing.overlays	+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_suit]blood")
 
-		if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
+		if(istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
 			unEquip(handcuffed)
 			drop_r_hand()
 			drop_l_hand()
@@ -115,7 +115,7 @@
 
 
 /mob/living/carbon/alien/humanoid/update_inv_head(var/update_icons=1)
-	if (head)
+	if(head)
 		var/t_state = head.item_state
 		if(!t_state)	t_state = head.icon_state
 		var/image/standing	= image("icon" = 'icons/mob/mob.dmi', "icon_state" = "[t_state]")
diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm
new file mode 100644
index 00000000000..01d834b07cf
--- /dev/null
+++ b/code/modules/mob/living/carbon/alien/larva/emote.dm
@@ -0,0 +1,126 @@
+/mob/living/carbon/alien/larva/emote(var/act,var/m_type=1,var/message = null)
+	var/param = null
+	if(findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+	var/muzzled = is_muzzled()
+	act = lowertext(act)
+	switch(act)
+		if("me")
+			if(silent)
+				return
+			if(src.client)
+				if(client.prefs.muted & MUTE_IC)
+					to_chat(src, "\red You cannot send IC messages (muted).")
+					return
+				if(src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+			if(stat)
+				return
+			if(!(message))
+				return
+			return custom_emote(m_type, message)
+
+		if("custom")
+			return custom_emote(m_type, message)
+		if("sign")
+			if(!src.restrained())
+				message = text("<B>The alien</B> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
+				m_type = 1
+		if("burp")
+			if(!muzzled)
+				message = "<B>[src]</B> burps."
+				m_type = 2
+		if("scratch")
+			if(!src.restrained())
+				message = "<B>The [src.name]</B> scratches."
+				m_type = 1
+		if("whimper")
+			if(!muzzled)
+				message = "<B>The [src.name]</B> whimpers."
+				m_type = 2
+//		if("roar")
+//			if(!muzzled)
+//				message = "<B>The [src.name]</B> roars." Commenting out since larva shouldn't roar /N
+//				m_type = 2
+		if("tail")
+			message = "<B>The [src.name]</B> waves its tail."
+			m_type = 1
+		if("gasp")
+			message = "<B>The [src.name]</B> gasps."
+			m_type = 2
+		if("shiver")
+			message = "<B>The [src.name]</B> shivers."
+			m_type = 2
+		if("drool")
+			message = "<B>The [src.name]</B> drools."
+			m_type = 1
+		if("scretch")
+			if(!muzzled)
+				message = "<B>The [src.name]</B> scretches."
+				m_type = 2
+		if("choke")
+			message = "<B>The [src.name]</B> chokes."
+			m_type = 2
+		if("moan")
+			message = "<B>The [src.name]</B> moans!"
+			m_type = 2
+		if("nod")
+			message = "<B>The [src.name]</B> nods its head."
+			m_type = 1
+//		if("sit")
+//			message = "<B>The [src.name]</B> sits down." //Larvan can't sit down, /N
+//			m_type = 1
+		if("sway")
+			message = "<B>The [src.name]</B> sways around dizzily."
+			m_type = 1
+		if("sulk")
+			message = "<B>The [src.name]</B> sulks down sadly."
+			m_type = 1
+		if("twitch")
+			message = "<B>The [src.name]</B> twitches violently."
+			m_type = 1
+		if("dance")
+			if(!src.restrained())
+				message = "<B>The [src.name]</B> dances around happily."
+				m_type = 1
+		if("roll")
+			if(!src.restrained())
+				message = "<B>The [src.name]</B> rolls."
+				m_type = 1
+		if("shake")
+			message = "<B>The [src.name]</B> shakes its head."
+			m_type = 1
+		if("gnarl")
+			if(!muzzled)
+				message = "<B>The [src.name]</B> gnarls and shows its teeth.."
+				m_type = 2
+		if("jump")
+			message = "<B>The [src.name]</B> jumps!"
+			m_type = 1
+		if("hiss_")
+			message = "<B>The [src.name]</B> hisses softly."
+			m_type = 1
+		if("collapse")
+			Paralyse(2)
+			message = text("<B>[]</B> collapses!", src)
+			m_type = 2
+		if("help")
+			to_chat(src, "burp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper")
+		else
+			to_chat(src, text("Invalid Emote: []", act))
+	if((message && src.stat == 0))
+		log_emote("[name]/[key] : [message]")
+		if(m_type & 1)
+			for(var/mob/O in viewers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(703)
+		else
+			for(var/mob/O in hearers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(746)
+	return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index a513ab76a90..c8bd8765a97 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -31,7 +31,7 @@
 /mob/living/carbon/alien/larva/Bump(atom/movable/AM as mob|obj, yes)
 
 	spawn( 0 )
-		if ((!( yes ) || now_pushing))
+		if((!( yes ) || now_pushing))
 			return
 		now_pushing = 1
 		if(ismob(AM))
@@ -48,11 +48,11 @@
 
 		now_pushing = 0
 		..()
-		if (!( istype(AM, /atom/movable) ))
+		if(!( istype(AM, /atom/movable) ))
 			return
-		if (!( now_pushing ))
+		if(!( now_pushing ))
 			now_pushing = 1
-			if (!( AM.anchored ))
+			if(!( AM.anchored ))
 				var/t = get_dir(src, AM)
 				step(AM, t)
 			now_pushing = null
@@ -76,12 +76,12 @@
 
 	var/b_loss = null
 	var/f_loss = null
-	switch (severity)
-		if (1.0)
+	switch(severity)
+		if(1.0)
 			gib()
 			return
 
-		if (2.0)
+		if(2.0)
 
 			b_loss += 60
 
@@ -92,7 +92,7 @@
 
 		if(3.0)
 			b_loss += 30
-			if (prob(50))
+			if(prob(50))
 				Paralyse(1)
 			ear_damage += 15
 			ear_deaf += 60
@@ -123,14 +123,14 @@
 
 
 /mob/living/carbon/alien/larva/attack_slime(mob/living/carbon/slime/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
 	if(M.Victim)
 		return // can't attack while eating!
 
-	if (stat != DEAD)
+	if(stat != DEAD)
 		M.do_attack_animation(src)
 		visible_message("<span class='danger'>The [M.name] glomps [src]!</span>", \
 				"<span class='userdanger'>The [M.name] glomps [src]!</span>")
@@ -148,11 +148,11 @@
 	return
 
 /mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
@@ -160,17 +160,17 @@
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 			help_shake_act(M)
 
-		if (I_GRAB)
+		if(I_GRAB)
 			grabbedby(M)
 
 		else
 			M.do_attack_animation(src)
 			var/damage = rand(1, 9)
-			if (prob(90))
-				if (HULK in M.mutations)
+			if(prob(90))
+				if(HULK in M.mutations)
 					damage += 5
 					spawn(0)
 						Paralyse(1)
@@ -180,7 +180,7 @@
 				playsound(loc, "punch", 25, 1, -1)
 				visible_message("<span class='danger'>[M] has kicked [src]!</span>", \
 						"<span class='userdanger'>[M] has kicked [src]!</span>")
-				if ((stat != DEAD) && (damage > 4.9))
+				if((stat != DEAD) && (damage > 4.9))
 					Paralyse(rand(5,10))
 					visible_message("<span class='danger'>[M] has weakened [src]!</span>", \
 							"<span class='userdanger'>[M] has weakened [src]!</span>", \
@@ -194,11 +194,11 @@
 	return
 
 /mob/living/carbon/alien/larva/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
@@ -206,7 +206,7 @@
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 			sleeping = max(0,sleeping-5)
 			resting = 0
 			AdjustParalysis(-3)
@@ -215,7 +215,7 @@
 			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake it up!</span>")
 
 		else
-			if (health > 0)
+			if(health > 0)
 				M.do_attack_animation(src)
 				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
 				var/damage = 1
diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm
index 44351eb792a..678e4211b0d 100644
--- a/code/modules/mob/living/carbon/alien/larva/powers.dm
+++ b/code/modules/mob/living/carbon/alien/larva/powers.dm
@@ -7,17 +7,17 @@
 	if(stat != CONSCIOUS)
 		return
 
-	if (layer != TURF_LAYER+0.2)
+	if(layer != TURF_LAYER+0.2)
 		layer = TURF_LAYER+0.2
 		to_chat(src, text("<span class='noticealien'>You are now hiding.</span>"))
 		for(var/mob/O in oviewers(src, null))
-			if ((O.client && !( O.blinded )))
+			if((O.client && !( O.blinded )))
 				to_chat(O, text("<B>[] scurries to the ground!</B>", src))
 	else
 		layer = MOB_LAYER
 		to_chat(src, text("\green You have stopped hiding."))
 		for(var/mob/O in oviewers(src, null))
-			if ((O.client && !( O.blinded )))
+			if((O.client && !( O.blinded )))
 				to_chat(O, text("[] slowly peaks up from the ground...", src))
 
 /mob/living/carbon/alien/larva/verb/evolve()
diff --git a/code/modules/mob/living/carbon/alien/larva/update_icons.dm b/code/modules/mob/living/carbon/alien/larva/update_icons.dm
index 104811c4fc1..697d6413c02 100644
--- a/code/modules/mob/living/carbon/alien/larva/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/larva/update_icons.dm
@@ -12,11 +12,11 @@
 
 	if(stat == DEAD)
 		icon_state = "larva[state]_dead"
-	else if (handcuffed || legcuffed) //This should be an overlay. Who made this an icon_state?
+	else if(handcuffed || legcuffed) //This should be an overlay. Who made this an icon_state?
 		icon_state = "larva[state]_cuff"
 	else if(stat == UNCONSCIOUS || lying || resting)
 		icon_state = "larva[state]_sleep"
-	else if (stunned)
+	else if(stunned)
 		icon_state = "larva[state]_stun"
 	else
 		icon_state = "larva[state]"
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index f0935c520ce..6ea16fc24a1 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -52,7 +52,7 @@ var/const/MAX_ACTIVE_TIME = 400
 			to_chat(user, "<span class='boldannounce'>[src] is not moving.</span>")
 		if(CONSCIOUS)
 			to_chat(user, "<span class='boldannounce'>[src] seems to be active!</span>")
-	if (sterile)
+	if(sterile)
 		to_chat(user, "<span class='boldannounce'>It looks like the proboscis has been removed.</span>")
 
 /obj/item/clothing/mask/facehugger/attackby(obj/item/O,mob/m, params)
@@ -148,7 +148,7 @@ var/const/MAX_ACTIVE_TIME = 400
 		target.equip_to_slot(src, slot_wear_mask,,0)
 		if(!sterile)
 			M.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
-	else if (iscorgi(M))
+	else if(iscorgi(M))
 		var/mob/living/simple_animal/pet/corgi/C = M
 		loc = C
 		C.facehugger = src
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 8e6da1eca78..d558e50a1b4 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -23,29 +23,29 @@
 		return ..()
 
 	say_understands(var/other)//Goddamn is this hackish, but this say code is so odd
-		if (istype(other, /mob/living/silicon/ai))
+		if(istype(other, /mob/living/silicon/ai))
 			if(!(container && istype(container, /obj/item/device/mmi)))
 				return 0
 			else
 				return 1
-		if (istype(other, /mob/living/silicon/decoy))
+		if(istype(other, /mob/living/silicon/decoy))
 			if(!(container && istype(container, /obj/item/device/mmi)))
 				return 0
 			else
 				return 1
-		if (istype(other, /mob/living/silicon/pai))
+		if(istype(other, /mob/living/silicon/pai))
 			if(!(container && istype(container, /obj/item/device/mmi)))
 				return 0
 			else
 				return 1
-		if (istype(other, /mob/living/silicon/robot))
+		if(istype(other, /mob/living/silicon/robot))
 			if(!(container && istype(container, /obj/item/device/mmi)))
 				return 0
 			else
 				return 1
-		if (istype(other, /mob/living/carbon/human))
+		if(istype(other, /mob/living/carbon/human))
 			return 1
-		if (istype(other, /mob/living/carbon/slime))
+		if(istype(other, /mob/living/carbon/slime))
 			return 1
 		return ..()
 
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index 92c04ca0066..f75cfee8f9b 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -4,7 +4,7 @@
 	max_damage = 200
 	icon_state = "brain2"
 	force = 1.0
-	w_class = 2.0
+	w_class = 2
 	throwforce = 1.0
 	throw_speed = 3
 	throw_range = 5
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
new file mode 100644
index 00000000000..23a609131f2
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -0,0 +1,51 @@
+/mob/living/carbon/brain/emote(var/act,var/m_type=1,var/message = null)
+	if(!(container && istype(container, /obj/item/device/mmi)))//No MMI, no emotes
+		return
+
+	if(findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
+	if(src.stat == DEAD)
+		return
+	act = lowertext(act)
+	switch(act)
+
+		if("alarm")
+			to_chat(src, "You sound an alarm.")
+			message = "<B>\The [src]</B> sounds an alarm."
+			m_type = 2
+		if("alert")
+			to_chat(src, "You let out a distressed noise.")
+			message = "<B>\The [src]</B> lets out a distressed noise."
+			m_type = 2
+		if("notice")
+			to_chat(src, "You play a loud tone.")
+			message = "<B>\The [src]</B> plays a loud tone."
+			m_type = 2
+		if("flash")
+			message = "The lights on <B>\the [src]</B> flash quickly."
+			m_type = 1
+		if("blink")
+			message = "<B>\The [src]</B> blinks."
+			m_type = 1
+		if("whistle")
+			to_chat(src, "You whistle.")
+			message = "<B>\The [src]</B> whistles."
+			m_type = 2
+		if("beep")
+			to_chat(src, "You beep.")
+			message = "<B>\The [src]</B> beeps."
+			m_type = 2
+		if("boop")
+			to_chat(src, "You boop.")
+			message = "<B>\The [src]</B> boops."
+			m_type = 2
+		if("help")
+			to_chat(src, "alarm, alert, notice, flash,blink, whistle, beep, boop")
+
+	if(message && !stat)
+		..(act, m_type, message)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index 63eb38e607f..40273bf66ad 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -65,13 +65,13 @@
 /mob/living/carbon/brain/handle_vision()
 	..()
 
-	if (stat == 2 || (XRAY in src.mutations))
+	if(stat == 2 || (XRAY in src.mutations))
 		sight |= SEE_TURFS
 		sight |= SEE_MOBS
 		sight |= SEE_OBJS
 		see_in_dark = 8
 		see_invisible = SEE_INVISIBLE_LEVEL_TWO
-	else if (stat != 2)
+	else if(stat != 2)
 		sight &= ~SEE_TURFS
 		sight &= ~SEE_MOBS
 		sight &= ~SEE_OBJS
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index f37faf32750..7b04e52f69b 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -64,7 +64,7 @@
 		if(!C || brainmob.key || 0 == searching)	return		//handle logouts that happen whilst the alert is waiting for a response, and responses issued after a brain has been located.
 		if(response == "Yes")
 			transfer_personality(C.mob)
-		else if (response == "Never for this round")
+		else if(response == "Never for this round")
 			C.prefs.be_special -= ROLE_POSIBRAIN
 
 // This should not ever happen, but let's be safe
@@ -99,7 +99,7 @@
 	src.brainmob.mind.assigned_role = "Positronic Brain"
 
 	var/turf/T = get_turf_or_move(src.loc)
-	for (var/mob/M in viewers(T))
+	for(var/mob/M in viewers(T))
 		M.show_message("\blue The positronic brain chimes quietly.")
 	icon_state = "posibrain-occupied"
 
@@ -110,7 +110,7 @@
 	icon_state = "posibrain"
 
 	var/turf/T = get_turf_or_move(src.loc)
-	for (var/mob/M in viewers(T))
+	for(var/mob/M in viewers(T))
 		M.show_message("\blue The positronic brain buzzes quietly, and the golden lights fade away. Perhaps you could try again?")
 
 /obj/item/device/mmi/posibrain/Topic(href,href_list)
@@ -144,11 +144,12 @@
 
 
 /obj/item/device/mmi/posibrain/examine(mob/user)
+	to_chat(user, "<span class='info'>*---------*</span>")
 	if(!..(user))
+		to_chat(user, "<span class='info'>*---------*</span>")
 		return
 
-	var/msg = "<span class='info'>*---------*\nThis is [bicon(src)] \a <EM>[src]</EM>!\n[desc]\n"
-	msg += "<span class='warning'>"
+	var/msg = "<span class='info'>"
 
 	if(src.brainmob && src.brainmob.key)
 		switch(src.brainmob.stat)
@@ -158,7 +159,7 @@
 			if(DEAD)			msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
 	else
 		msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
-	msg += "<span class='info'>*---------*</span>"
+	msg += "*---------*</span>"
 	to_chat(user, msg)
 
 /obj/item/device/mmi/posibrain/emp_act(severity)
@@ -192,7 +193,7 @@
 		volunteer(O)
 	else
 		var/turf/T = get_turf_or_move(src.loc)
-		for (var/mob/M in viewers(T))
+		for(var/mob/M in viewers(T))
 			M.show_message("\blue The positronic brain pings softly.")
 
 /obj/item/device/mmi/posibrain/ipc
diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm
index 03d6906b876..a343d245424 100644
--- a/code/modules/mob/living/carbon/brain/say.dm
+++ b/code/modules/mob/living/carbon/brain/say.dm
@@ -1,6 +1,6 @@
 //TODO: Convert this over for languages.
 /mob/living/carbon/brain/say(var/message, var/datum/language/speaking = null)
-	if (silent)
+	if(silent)
 		return
 
 	if(!(container && istype(container, /obj/item/device/mmi)))
@@ -24,9 +24,9 @@
 		if("headset")
 			var/radio_worked = 0 // If any of the radios our brainmob could use functioned, this is set true so that we don't use any others
 			// I'm doing it this way so that if the mecha radio fails for some reason, a radio MMI still has the built-in fallback
-			if (container && istype(container,/obj/item/device/mmi))
+			if(container && istype(container,/obj/item/device/mmi))
 				var/obj/item/device/mmi/c = container
-				if (!radio_worked && c.mecha)
+				if(!radio_worked && c.mecha)
 					var/obj/mecha/metalgear = c.mecha
 					if(metalgear.radio)
 						radio_worked = metalgear.radio.talk_into(src, message, message_mode, verb, speaking)
@@ -36,7 +36,7 @@
 					if(R.radio)
 						radio_worked = R.radio.talk_into(src, message, message_mode, verb, speaking)
 			return radio_worked
-		if ("whisper")
+		if("whisper")
 			whisper_say(message, speaking, alt_name)
 			return 1
 		else return 0
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index f9afba579fb..1fea808c660 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -25,7 +25,7 @@
 	return ..()
 
 /mob/living/carbon/blob_act()
-	if (stat == DEAD)
+	if(stat == DEAD)
 		return
 	else
 		show_message("<span class='userdanger'>The blob attacks!</span>")
@@ -65,7 +65,7 @@
 			if(istype(src, /mob/living/carbon/human))
 				var/mob/living/carbon/human/H = src
 				var/obj/item/organ/external/organ = H.get_organ("chest")
-				if (istype(organ))
+				if(istype(organ))
 					if(organ.take_damage(d, 0))
 						H.UpdateDamageIcon()
 
@@ -119,7 +119,7 @@
 				if(stun)
 					adjustToxLoss(-3)
 			T = get_step(T, dir)
-			if (is_blocked_turf(T))
+			if(is_blocked_turf(T))
 				break
 	return 1
 
@@ -168,7 +168,7 @@
 		if(!tesla_shock || (tesla_shock && siemens_coeff > 0.5))
 			Stun(3)
 			Weaken(3)
-	if (shock_damage > 200)
+	if(shock_damage > 200)
 		src.visible_message(
 			"<span class='danger'>[src] was arc flashed by the [source]!</span>", \
 			"<span class='userdanger'>The [source] arc flashes and electrocutes you!</span>", \
@@ -213,7 +213,7 @@
 		swap_hand()
 
 /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
-	if (src.health >= config.health_threshold_crit)
+	if(src.health >= config.health_threshold_crit)
 		if(src == M && istype(src, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = src
 			src.visible_message( \
@@ -261,11 +261,11 @@
 				"<span class='notice'>You shake [src], but they are unresponsive. Probably suffering from SSD.</span>")
 			if(lying) // /vg/: For hugs. This is how update_icon figgers it out, anyway.  - N3X15
 				var/t_him = "it"
-				if (src.gender == MALE)
+				if(src.gender == MALE)
 					t_him = "him"
-				else if (src.gender == FEMALE)
+				else if(src.gender == FEMALE)
 					t_him = "her"
-				if (istype(src,/mob/living/carbon/human) && src:w_uniform)
+				if(istype(src,/mob/living/carbon/human) && src:w_uniform)
 					var/mob/living/carbon/human/H = src
 					H.w_uniform.add_fingerprint(M)
 				src.sleeping = max(0,src.sleeping-5)
@@ -498,7 +498,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 //Throwing stuff
 
 /mob/living/carbon/proc/toggle_throw_mode()
-	if (in_throw_mode)
+	if(in_throw_mode)
 		throw_mode_off()
 	else
 		throw_mode_on()
@@ -565,7 +565,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	return 1
 
 /mob/living/carbon/restrained()
-	if (handcuffed)
+	if(handcuffed)
 		return 1
 	return
 
@@ -890,51 +890,51 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 				wear_mask)
 
 /mob/living/carbon/proc/uncuff()
-	if (handcuffed)
+	if(handcuffed)
 		var/obj/item/weapon/W = handcuffed
 		handcuffed = null
-		if (buckled && buckled.buckle_requires_restraints)
+		if(buckled && buckled.buckle_requires_restraints)
 			buckled.unbuckle_mob()
 		update_handcuffed()
-		if (client)
+		if(client)
 			client.screen -= W
-		if (W)
+		if(W)
 			W.loc = loc
 			W.dropped(src)
-			if (W)
+			if(W)
 				W.layer = initial(W.layer)
 				W.plane = initial(W.plane)
-	if (legcuffed)
+	if(legcuffed)
 		var/obj/item/weapon/W = legcuffed
 		legcuffed = null
 		update_inv_legcuffed()
-		if (client)
+		if(client)
 			client.screen -= W
-		if (W)
+		if(W)
 			W.loc = loc
 			W.dropped(src)
-			if (W)
+			if(W)
 				W.layer = initial(W.layer)
 				W.plane = initial(W.plane)
 
 
 /mob/living/carbon/proc/slip(var/description, var/stun, var/weaken, var/tilesSlipped, var/walkSafely, var/slipAny)
-	if (flying || buckled || (walkSafely && m_intent == "walk"))
+	if(flying || buckled || (walkSafely && m_intent == "walk"))
 		return
-	if ((lying) && (!(tilesSlipped)))
+	if((lying) && (!(tilesSlipped)))
 		return
-	if (!(slipAny))
-		if (istype(src, /mob/living/carbon/human))
+	if(!(slipAny))
+		if(istype(src, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = src
-			if ((isobj(H.shoes) && H.shoes.flags & NOSLIP) || H.species.bodyflags & FEET_NOSLIP)
+			if((isobj(H.shoes) && H.shoes.flags & NOSLIP) || H.species.bodyflags & FEET_NOSLIP)
 				return
-	if (tilesSlipped)
+	if(tilesSlipped)
 		for(var/t = 0, t<=tilesSlipped, t++)
 			spawn (t) step(src, src.dir)
 	stop_pulling()
 	to_chat(src, "<span class='notice'>You slipped on the [description]!</span>")
 	playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
-	if (stun)
+	if(stun)
 		Stun(stun)
 	Weaken(weaken)
 	return 1
@@ -966,15 +966,15 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	if(istype(toEat, /obj/item/weapon/reagent_containers/food/pill))
 		to_chat(src, "<span class='notify'>You [toEat.apply_method] [toEat].</span>")
 	else
-		if (fullness <= 50)
+		if(fullness <= 50)
 			to_chat(src, "<span class='warning'>You hungrily chew out a piece of [toEat] and gobble it!</span>")
-		else if (fullness > 50 && fullness <= 150)
+		else if(fullness > 50 && fullness <= 150)
 			to_chat(src, "<span class='notice'>You hungrily begin to eat [toEat].</span>")
-		else if (fullness > 150 && fullness <= 350)
+		else if(fullness > 150 && fullness <= 350)
 			to_chat(src, "<span class='notice'>You take a bite of [toEat].</span>")
-		else if (fullness > 350 && fullness <= 550)
+		else if(fullness > 350 && fullness <= 550)
 			to_chat(src, "<span class='notice'>You unwillingly chew a bit of [toEat].</span>")
-		else if (fullness > (550 * (1 + overeatduration / 2000)))	// The more you eat - the more you can eat
+		else if(fullness > (550 * (1 + overeatduration / 2000)))	// The more you eat - the more you can eat
 			to_chat(src, "<span class='warning'>You cannot force any more of [toEat] to go down your throat.</span>")
 			return 0
 	return 1
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 5ac5d796897..d3606b12b8a 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -111,7 +111,7 @@
 			if(istype(I,/mob/living/simple_animal/borer))
 				B = I
 	if(B)
-		if(!B.ckey && ckey && B.controlling)
+		if(B.controlling && B.host == src)
 			B.detatch()
 
 		verbs -= /mob/living/carbon/proc/release_control
@@ -144,10 +144,11 @@
 	var/obj/item/organ/external/head/H = get_organ("head")
 	if(SKELETON in src.mutations)	return
 
-	if(H.f_style)
-		H.f_style = "Shaved"
-	if(H.h_style)
-		H.h_style = "Bald"
+	if(istype(H))
+		if(H.f_style)
+			H.f_style = "Shaved"
+		if(H.h_style)
+			H.h_style = "Bald"
 	update_fhair(0)
 	update_hair(0)
 
@@ -162,10 +163,11 @@
 	var/obj/item/organ/external/head/H = organs_by_name["head"]
 	if(HUSK in mutations)	return
 
-	if(H.f_style)
-		H.f_style = "Shaved"		//we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE
-	if(H.h_style)
-		H.h_style = "Bald"
+	if(istype(H))
+		if(H.f_style)
+			H.f_style = "Shaved"		//we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE
+		if(H.h_style)
+			H.h_style = "Bald"
 	update_fhair(0)
 	update_hair(0)
 
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
new file mode 100644
index 00000000000..40c935188cf
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -0,0 +1,889 @@
+/mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null,var/force)
+
+	if(stat == DEAD)
+		return // No screaming bodies
+
+	var/param = null
+	if(findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	var/muzzled = is_muzzled()
+	if(sdisabilities & MUTE || silent)
+		muzzled = 1
+	//var/m_type = 1
+
+	for(var/obj/item/weapon/implant/I in src)
+		if(I.implanted)
+			I.trigger(act, src)
+
+	var/miming = 0
+	if(mind)
+		miming = mind.miming
+
+	//Emote Cooldown System (it's so simple!)
+	// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
+	var/on_CD = 0
+	act = lowertext(act)
+	switch(act)
+		//Cooldown-inducing emotes
+		if("ping", "pings", "buzz", "buzzes", "beep", "beeps", "yes", "no", "buzz2")
+			if(species.name == "Machine")		//Only Machines can beep, ping, and buzz, yes, no, and make a silly sad trombone noise.
+				on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm
+			else								//Everyone else fails, skip the emote attempt
+				return
+		if("drone","drones","hum","hums","rumble","rumbles")
+			if(species.name == "Drask")		//Only Drask can make whale noises
+				on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm
+			else
+				return
+		if("squish", "squishes")
+			var/found_slime_bodypart = 0
+
+			if(species.name == "Slime People")	//Only Slime People can squish
+				on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm'
+				found_slime_bodypart = 1
+			else
+				for(var/obj/item/organ/external/L in organs) // if your limbs are squishy you can squish too!
+					if(L.dna.species in list("Slime People"))
+						on_CD = handle_emote_CD()
+						found_slime_bodypart = 1
+						break
+
+			if(!found_slime_bodypart)								//Everyone else fails, skip the emote attempt
+				return
+		if("scream", "screams")
+			on_CD = handle_emote_CD(50) //longer cooldown
+		if("fart", "farts", "flip", "flips", "snap", "snaps")
+			on_CD = handle_emote_CD()				//proc located in code\modules\mob\emote.dm
+		//Everything else, including typos of the above emotes
+		else
+			on_CD = 0	//If it doesn't induce the cooldown, we won't check for the cooldown
+
+	if(on_CD == 1)		// Check if we need to suppress the emote attempt.
+		return			// Suppress emote, you're still cooling off.
+
+	switch(act)
+		if("me")									//OKAY SO RANT TIME, THIS FUCKING HAS TO BE HERE OR A SHITLOAD OF THINGS BREAK
+			return custom_emote(m_type, message)	//DO YOU KNOW WHY SHIT BREAKS? BECAUSE SO MUCH OLDCODE CALLS mob.emote("me",1,"whatever_the_fuck_it_wants_to_emote")
+													//WHO THE FUCK THOUGHT THAT WAS A GOOD FUCKING IDEA!?!?
+
+		if("ping", "pings")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> pings at [param]."
+			else
+				message = "<B>[src]</B> pings."
+			playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+			m_type = 2
+
+		if("buzz2")
+			message = "<B>[src]</B> emits an irritated buzzing sound."
+			playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
+			m_type = 2
+
+		if("buzz", "buzzes")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> buzzes at [param]."
+			else
+				message = "<B>[src]</B> buzzes."
+			playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+			m_type = 2
+
+		if("beep", "beeps")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> beeps at [param]."
+			else
+				message = "<B>[src]</B> beeps."
+			playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+			m_type = 2
+
+		if("drone", "drones", "hum", "hums", "rumble", "rumbles")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> drones at [param]."
+			else
+				message = "<B>[src]</B> rumbles."
+			playsound(src.loc, 'sound/voice/DraskTalk.ogg', 50, 0)
+			m_type = 2
+
+		if("squish", "squishes")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> squishes at [param]."
+			else
+				message = "<B>[src]</B> squishes."
+			playsound(src.loc, 'sound/effects/slime_squish.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
+			m_type = 2
+
+		if("yes")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> emits an affirmative blip at [param]."
+			else
+				message = "<B>[src]</B> emits an affirmative blip."
+			playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0)
+			m_type = 2
+
+		if("no")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> emits a negative blip at [param]."
+			else
+				message = "<B>[src]</B> emits a negative blip."
+			playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0)
+			m_type = 2
+
+		if("wag", "wags")
+			if(body_accessory)
+				if(body_accessory.try_restrictions(src))
+					message = "<B>[src]</B> starts wagging \his tail."
+					start_tail_wagging(1)
+
+			else if(species.bodyflags & TAIL_WAGGING)
+				if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
+					message = "<B>[src]</B> starts wagging \his tail."
+					src.start_tail_wagging(1)
+				else
+					return
+			else
+				return
+			m_type = 1
+
+		if("swag", "swags")
+			if(species.bodyflags & TAIL_WAGGING || body_accessory)
+				message = "<B>[src]</B> stops wagging \his tail."
+				src.stop_tail_wagging(1)
+			else
+				return
+			m_type = 1
+
+		if("airguitar")
+			if(!src.restrained())
+				message = "<B>[src]</B> is strumming the air and headbanging like a safari chimp."
+				m_type = 1
+
+		if("blink", "blinks")
+			message = "<B>[src]</B> blinks."
+			m_type = 1
+
+		if("blink_r", "blinks_r")
+			message = "<B>[src]</B> blinks rapidly."
+			m_type = 1
+
+		if("bow", "bows")
+			if(!src.buckled)
+				var/M = null
+				if(param)
+					for(var/mob/A in view(null, null))
+						if(param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if(param)
+					message = "<B>[src]</B> bows to [param]."
+				else
+					message = "<B>[src]</B> bows."
+			m_type = 1
+
+		if("salute", "salutes")
+			if(!src.buckled)
+				var/M = null
+				if(param)
+					for(var/mob/A in view(null, null))
+						if(param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if(param)
+					message = "<B>[src]</B> salutes to [param]."
+				else
+					message = "<B>[src]</b> salutes."
+			m_type = 1
+
+		if("choke", "chokes")
+			if(miming)
+				message = "<B>[src]</B> clutches \his throat desperately!"
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> chokes!"
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a strong noise."
+					m_type = 2
+
+		if("burp", "burps")
+			if(miming)
+				message = "<B>[src]</B> opens their mouth rather obnoxiously."
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> burps."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a peculiar noise."
+					m_type = 2
+		if("clap", "claps")
+			if(!src.restrained())
+				message = "<B>[src]</B> claps."
+				m_type = 2
+				if(miming)
+					m_type = 1
+		if("flap", "flaps")
+			if(!src.restrained())
+				message = "<B>[src]</B> flaps \his wings."
+				m_type = 2
+				if(miming)
+					m_type = 1
+
+		if("flip", "flips")
+			m_type = 1
+			if(!src.restrained())
+				var/M = null
+				if(param)
+					for(var/mob/A in view(1, null))
+						if(param == A.name)
+							M = A
+							break
+				if(M == src)
+					M = null
+
+				if(M)
+					if(lying || weakened)
+						message = "<B>[src]</B> flops and flails around on the floor."
+					else
+						message = "<B>[src]</B> flips in [M]'s general direction."
+						SpinAnimation(5,1)
+				else
+					if(lying || weakened)
+						message = "<B>[src]</B> flops and flails around on the floor."
+					else
+						var/obj/item/weapon/grab/G
+						if(istype(get_active_hand(), /obj/item/weapon/grab))
+							G = get_active_hand()
+						if(G && G.affecting)
+							if(buckled || G.affecting.buckled)
+								return
+							var/turf/oldloc = loc
+							var/turf/newloc = G.affecting.loc
+							if(isturf(oldloc) && isturf(newloc))
+								SpinAnimation(5,1)
+								forceMove(newloc)
+								G.affecting.forceMove(oldloc)
+								message = "<B>[src]</B> flips over [G.affecting]!"
+						else
+							message = "<B>[src]</B> does a flip!"
+							SpinAnimation(5,1)
+
+		if("aflap", "aflaps")
+			if(!src.restrained())
+				message = "<B>[src]</B> flaps \his wings ANGRILY!"
+				m_type = 2
+				if(miming)
+					m_type = 1
+
+		if("drool", "drools")
+			message = "<B>[src]</B> drools."
+			m_type = 1
+
+		if("eyebrow")
+			message = "<B>[src]</B> raises an eyebrow."
+			m_type = 1
+
+		if("chuckle", "chuckles")
+			if(miming)
+				message = "<B>[src]</B> appears to chuckle."
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> chuckles."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a noise."
+					m_type = 2
+
+		if("twitch", "twitches")
+			message = "<B>[src]</B> twitches violently."
+			m_type = 1
+
+		if("twitch_s", "twitches_s")
+			message = "<B>[src]</B> twitches."
+			m_type = 1
+
+		if("faint", "faints")
+			message = "<B>[src]</B> faints."
+			if(src.sleeping)
+				return //Can't faint while asleep
+			src.sleeping += 1
+			m_type = 1
+
+		if("cough", "coughs")
+			if(miming)
+				message = "<B>[src]</B> appears to cough!"
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> coughs!"
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a strong noise."
+					m_type = 2
+
+		if("frown", "frowns")
+			message = "<B>[src]</B> frowns."
+			m_type = 1
+
+		if("nod", "nods")
+			message = "<B>[src]</B> nods."
+			m_type = 1
+
+		if("blush", "blushes")
+			message = "<B>[src]</B> blushes."
+			m_type = 1
+
+		if("wave", "waves")
+			message = "<B>[src]</B> waves."
+			m_type = 1
+
+		if("quiver", "quivers")
+			message = "<B>[src]</B> quivers."
+			m_type = 1
+
+		if("gasp", "gasps")
+			if(miming)
+				message = "<B>[src]</B> appears to be gasping!"
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> gasps!"
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a weak noise."
+					m_type = 2
+
+		if("deathgasp", "deathgasps")
+			message = "<B>[src]</B> [species.death_message]"
+			m_type = 1
+
+		if("giggle", "giggles")
+			if(miming)
+				message = "<B>[src]</B> giggles silently!"
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> giggles."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a noise."
+					m_type = 2
+
+		if("glare", "glares")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> glares at [param]."
+			else
+				message = "<B>[src]</B> glares."
+			m_type = 1
+
+		if("stare", "stares")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> stares at [param]."
+			else
+				message = "<B>[src]</B> stares."
+			m_type = 1
+
+		if("look", "looks")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> looks at [param]."
+			else
+				message = "<B>[src]</B> looks."
+			m_type = 1
+
+		if("grin", "grins")
+			message = "<B>[src]</B> grins."
+			m_type = 1
+
+		if("cry", "cries")
+			if(miming)
+				message = "<B>[src]</B> cries."
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> cries."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a weak noise. \He frowns."
+					m_type = 2
+
+		if("sigh", "sighs")
+			if(miming)
+				message = "<B>[src]</B> sighs."
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> sighs."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a weak noise."
+					m_type = 2
+
+		if("laugh", "laughs")
+			if(miming)
+				message = "<B>[src]</B> acts out a laugh."
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> laughs."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a noise."
+					m_type = 2
+
+		if("mumble", "mumbles")
+			message = "<B>[src]</B> mumbles!"
+			m_type = 2
+			if(miming)
+				m_type = 1
+
+		if("grumble", "grumbles")
+			if(miming)
+				message = "<B>[src]</B> grumbles!"
+				m_type = 1
+			if(!muzzled)
+				message = "<B>[src]</B> grumbles!"
+				m_type = 2
+			else
+				message = "<B>[src]</B> makes a noise."
+				m_type = 2
+
+		if("groan", "groans")
+			if(miming)
+				message = "<B>[src]</B> appears to groan!"
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> groans!"
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a loud noise."
+					m_type = 2
+
+		if("moan", "moans")
+			if(miming)
+				message = "<B>[src]</B> appears to moan!"
+				m_type = 1
+			else
+				message = "<B>[src]</B> moans!"
+				m_type = 2
+
+		if("johnny")
+			var/M
+			if(param)
+				M = param
+			if(!M)
+				param = null
+			else
+				if(miming)
+					message = "<B>[src]</B> takes a drag from a cigarette and blows \"[M]\" out in smoke."
+					m_type = 1
+				else
+					message = "<B>[src]</B> says, \"[M], please. They had a family.\" [src.name] takes a drag from a cigarette and blows their name out in smoke."
+					m_type = 2
+
+		if("point", "points")
+			if(!src.restrained())
+				var/atom/M = null
+				if(param)
+					for(var/atom/A as mob|obj|turf in view())
+						if(param == A.name)
+							M = A
+							break
+
+				if(!M)
+					message = "<B>[src]</B> points."
+				else
+					pointed(M)
+			m_type = 1
+
+		if("raise", "raises")
+			if(!src.restrained())
+				message = "<B>[src]</B> raises a hand."
+			m_type = 1
+
+		if("shake", "shakes")
+			message = "<B>[src]</B> shakes \his head."
+			m_type = 1
+
+		if("shrug", "shrugs")
+			message = "<B>[src]</B> shrugs."
+			m_type = 1
+
+		if("signal", "signals")
+			if(!src.restrained())
+				var/t1 = round(text2num(param))
+				if(isnum(t1))
+					if(t1 <= 5 && (!src.r_hand || !src.l_hand))
+						message = "<B>[src]</B> raises [t1] finger\s."
+					else if(t1 <= 10 && (!src.r_hand && !src.l_hand))
+						message = "<B>[src]</B> raises [t1] finger\s."
+			m_type = 1
+
+		if("smile", "smiles")
+			message = "<B>[src]</B> smiles."
+			m_type = 1
+
+		if("shiver", "shivers")
+			message = "<B>[src]</B> shivers."
+			m_type = 2
+			if(miming)
+				m_type = 1
+
+		if("pale", "pales")
+			message = "<B>[src]</B> goes pale for a second."
+			m_type = 1
+
+		if("tremble", "trembles")
+			message = "<B>[src]</B> trembles."
+			m_type = 1
+
+		if("sneeze", "sneezes")
+			if(miming)
+				message = "<B>[src]</B> sneezes."
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> sneezes."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a strange noise."
+					m_type = 2
+
+		if("sniff", "sniffs")
+			message = "<B>[src]</B> sniffs."
+			m_type = 2
+			if(miming)
+				m_type = 1
+
+		if("snore", "snores")
+			if(miming)
+				message = "<B>[src]</B> sleeps soundly."
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> snores."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a noise."
+					m_type = 2
+
+		if("whimper", "whimpers")
+			if(miming)
+				message = "<B>[src]</B> appears hurt."
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> whimpers."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a weak noise."
+					m_type = 2
+
+		if("wink", "winks")
+			message = "<B>[src]</B> winks."
+			m_type = 1
+
+		if("yawn", "yawns")
+			if(!muzzled)
+				message = "<B>[src]</B> yawns."
+				m_type = 2
+				if(miming)
+					m_type = 1
+
+		if("collapse", "collapses")
+			Paralyse(2)
+			message = "<B>[src]</B> collapses!"
+			m_type = 2
+			if(miming)
+				m_type = 1
+
+		if("hug", "hugs")
+			m_type = 1
+			if(!src.restrained())
+				var/M = null
+				if(param)
+					for(var/mob/A in view(1, null))
+						if(param == A.name)
+							M = A
+							break
+				if(M == src)
+					M = null
+
+				if(M)
+					message = "<B>[src]</B> hugs [M]."
+				else
+					message = "<B>[src]</B> hugs \himself."
+
+		if("handshake")
+			m_type = 1
+			if(!src.restrained() && !src.r_hand)
+				var/mob/M = null
+				if(param)
+					for(var/mob/A in view(1, null))
+						if(param == A.name)
+							M = A
+							break
+				if(M == src)
+					M = null
+
+				if(M)
+					if(M.canmove && !M.r_hand && !M.restrained())
+						message = "<B>[src]</B> shakes hands with [M]."
+					else
+						message = "<B>[src]</B> holds out \his hand to [M]."
+
+		if("dap", "daps")
+			m_type = 1
+			if(!src.restrained())
+				var/M = null
+				if(param)
+					for(var/mob/A in view(1, null))
+						if(param == A.name)
+							M = A
+							break
+				if(M)
+					message = "<B>[src]</B> gives daps to [M]."
+				else
+					message = "<B>[src]</B> sadly can't find anybody to give daps to, and daps \himself. Shameful."
+
+		if("slap", "slaps")
+			m_type = 1
+			if(!src.restrained())
+				var/M = null
+				if(param)
+					for(var/mob/A in view(1, null))
+						if(param == A.name)
+							M = A
+							break
+				if(M)
+					message = "\red <B>[src]</B> slaps [M] across the face. Ouch!"
+					playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+				else
+					message = "\red <B>[src]</B> slaps \himself!"
+					playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+					src.adjustFireLoss(4)
+
+		if("scream", "screams")
+			if(miming)
+				message = "<B>[src]</B> acts out a scream!"
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> [species.scream_verb]!"
+					m_type = 2
+					if(gender == FEMALE)
+						playsound(src.loc, "[species.female_scream_sound]", 80, 1, 0, pitch = get_age_pitch())
+					else
+						playsound(src.loc, "[species.male_scream_sound]", 80, 1, 0, pitch = get_age_pitch()) //default to male screams if no gender is present.
+
+				else
+					message = "<B>[src]</B> makes a very loud noise."
+					m_type = 2
+
+
+		if("snap", "snaps")
+			if(prob(95))
+				m_type = 2
+				var/mob/living/carbon/human/H = src
+				var/obj/item/organ/external/L = H.get_organ("l_hand")
+				var/obj/item/organ/external/R = H.get_organ("r_hand")
+				var/left_hand_good = 0
+				var/right_hand_good = 0
+				if(L && (!(L.status & ORGAN_DESTROYED)) && (!(L.status & ORGAN_SPLINTED)) && (!(L.status & ORGAN_BROKEN)))
+					left_hand_good = 1
+				if(R && (!(R.status & ORGAN_DESTROYED)) && (!(R.status & ORGAN_SPLINTED)) && (!(R.status & ORGAN_BROKEN)))
+					right_hand_good = 1
+
+				if(!left_hand_good && !right_hand_good)
+					to_chat(usr, "You need at least one hand in good working order to snap your fingers.")
+					return
+
+				message = "<b>[src]</b> snaps \his fingers."
+				playsound(src.loc, 'sound/effects/fingersnap.ogg', 50, 1, -3)
+			else
+				message = "<span class='danger'><b>[src]</b> snaps \his fingers right off!</span>"
+				playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+
+
+		// Needed for M_TOXIC_FART
+		if("fart", "farts")
+			if(reagents.has_reagent("simethicone"))
+				return
+//			playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
+			if(locate(/obj/item/weapon/storage/bible) in get_turf(src))
+				to_chat(viewers(src), "<span class='warning'><b>[src] farts on the Bible!</b></span>")
+				to_chat(viewers(src), "<span class='notice'><b>A mysterious force smites [src]!</b></span>")
+				var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+				s.set_up(3, 1, src)
+				s.start()
+				src.gib()
+			else if(TOXIC_FARTS in mutations)
+				message = "<b>[src]</b> unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart."
+			else
+				message = "<b>[src]</b> [pick("passes wind","farts")]."
+			m_type = 2
+
+			var/turf/location = get_turf(src)
+			var/aoe_range=2 // Default
+
+			// Process toxic farts first.
+			if(TOXIC_FARTS in mutations)
+				for(var/mob/M in range(location,aoe_range))
+					if(M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
+						continue
+					// Now, we don't have this:
+					//new /obj/effects/fart_cloud(T,L)
+					if(M == src)
+						continue
+					M.reagents.add_reagent("jenkem", 1)
+
+		if("help")
+			var/emotelist = "aflap(s), airguitar, blink(s), blink(s)_r, blush(es), bow(s)-(none)/mob, burp(s), choke(s), chuckle(s), clap(s), collapse(s), cough(s),cry, cries, custom, dap(s)(none)/mob," \
+			+ " deathgasp(s), drool(s), eyebrow,fart(s), faint(s), flap(s), flip(s), frown(s), gasp(s), giggle(s), glare(s)-(none)/mob, grin(s), groan(s), grumble(s), handshake-mob, hug(s)-(none)/mob," \
+			+ " glare(s)-(none)/mob, grin(s), johnny, laugh(s), look(s)-(none)/mob, moan(s), mumble(s), nod(s), pale(s), point(s)-atom, quiver(s), raise(s), salute(s)-(none)/mob, scream(s), shake(s)," \
+			+ " shiver(s), shrug(s), sigh(s), signal(s)-#1-10,slap(s)-(none)/mob, smile(s),snap(s), sneeze(s), sniff(s), snore(s), stare(s)-(none)/mob, swag(s), tremble(s), twitch(es), twitch(es)_s," \
+			+ " wag(s), wave(s),  whimper(s), wink(s), yawn(s)"
+			if(species.name == "Machine")
+				emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob"
+			else if(species.name == "Slime People")
+				emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob"
+			to_chat(src, emotelist)
+
+		else
+			to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
+
+
+
+
+
+	if(message) //Humans are special fucking snowflakes and have 735 lines of emotes, they get to handle their own emotes, not call the parent
+		log_emote("[name]/[key] : [message]")
+
+ //Hearing gasp and such every five seconds is not good emotes were not global for a reason.
+ // Maybe some people are okay with that.
+
+		for(var/mob/M in dead_mob_list)
+			if(!M.client || istype(M, /mob/new_player))
+				continue //skip monkeys, leavers and new players
+			if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTSIGHT) && !(M in viewers(src,null)))
+				M.show_message(message)
+
+		switch(m_type)
+			if(1)
+				visible_message(message)
+			if(2)
+				audible_message(message)
+
+/mob/living/carbon/human/verb/pose()
+	set name = "Set Pose"
+	set desc = "Sets a description which will be shown when someone examines you."
+	set category = "IC"
+
+	pose = sanitize(copytext(input(usr, "This is [src]. \He is...", "Pose", null)  as text, 1, MAX_MESSAGE_LEN))
+
+/mob/living/carbon/human/verb/set_flavor()
+	set name = "Set Flavour Text"
+	set desc = "Sets an extended description of your character's features."
+	set category = "IC"
+
+	update_flavor_text()
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index d8307e5056c..491d291c252 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -58,14 +58,14 @@
 
 	var/displayed_species = get_species()
 	for(var/obj/item/clothing/C in src)			//Disguise checks
-		if (C == src.head || C == src.wear_suit || C == src.wear_mask || C == src.w_uniform || C == src.belt || C == src.back)
+		if(C == src.head || C == src.wear_suit || C == src.wear_mask || C == src.w_uniform || C == src.belt || C == src.back)
 			if(C.species_disguise)
 				displayed_species = C.species_disguise
-	if (skipjumpsuit && skipface || (displayed_species in nospecies)) //either obscured or on the nospecies list
+	if(skipjumpsuit && skipface || (displayed_species in nospecies)) //either obscured or on the nospecies list
 		msg += "!\n"    //omit the species when examining
-	else if (displayed_species == "Slime People") //snowflakey because Slime People are defined as a plural
+	else if(displayed_species == "Slime People") //snowflakey because Slime People are defined as a plural
 		msg += ", a slime person!\n"
-	else if (displayed_species == "Unathi") //DAMN YOU, VOWELS
+	else if(displayed_species == "Unathi") //DAMN YOU, VOWELS
 		msg += ", a unathi!\n"
 	else
 		msg += ", \a [lowertext(displayed_species)]!\n"
@@ -157,7 +157,7 @@
 			msg += "<span class='warning'>[t_He] [t_is] wearing [bicon(shoes)] [shoes.gender==PLURAL?"some":"a"] [shoes.blood_color != "#030303" ? "blood-stained":"oil-stained"] [shoes.name] on [t_his] feet!</span>\n"
 		else
 			msg += "[t_He] [t_is] wearing [bicon(shoes)] \a [shoes] on [t_his] feet.\n"
-	else if (blood_DNA)
+	else if(blood_DNA)
 		msg += "<span class='warning'>[t_He] [t_has] [feet_blood_color != "#030303" ? "blood-stained":"oil-stained"] feet!</span>\n"
 
 
@@ -221,7 +221,7 @@
 	var/distance = get_dist(user,src)
 	if(istype(user, /mob/dead/observer) || user.stat == 2) // ghosts can see anything
 		distance = 1
-	if (src.stat)
+	if(src.stat)
 		msg += "<span class='warning'>[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.</span>\n"
 		if((stat == 2 || src.health <= config.health_threshold_crit) && distance <= 3)
 			msg += "<span class='warning'>[t_He] does not appear to be breathing.</span>\n"
@@ -462,9 +462,9 @@
 			perpname = name
 
 		if(perpname)
-			for (var/datum/data/record/E in data_core.general)
+			for(var/datum/data/record/E in data_core.general)
 				if(E.fields["name"] == perpname)
-					for (var/datum/data/record/R in data_core.security)
+					for(var/datum/data/record/R in data_core.security)
 						if(R.fields["id"] == E.fields["id"])
 							criminal = R.fields["criminal"]
 
@@ -484,10 +484,10 @@
 		else
 			perpname = src.name
 
-		for (var/datum/data/record/E in data_core.general)
-			if (E.fields["name"] == perpname)
-				for (var/datum/data/record/R in data_core.general)
-					if (R.fields["id"] == E.fields["id"])
+		for(var/datum/data/record/E in data_core.general)
+			if(E.fields["name"] == perpname)
+				for(var/datum/data/record/R in data_core.general)
+					if(R.fields["id"] == E.fields["id"])
 						medical = R.fields["p_stat"]
 
 		msg += "<span class = 'deptradio'>Physical status:</span> <a href='?src=\ref[src];medical=1'>\[[medical]\]</a>\n"
@@ -497,7 +497,7 @@
 	if(print_flavor_text()) msg += "[print_flavor_text()]\n"
 
 	msg += "*---------*</span>"
-	if (pose)
+	if(pose)
 		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
 			pose = addtext(pose,".") //Makes sure all emotes end with a period.
 		msg += "\n[t_He] is [pose]"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 1bc79c16242..0147feea2f0 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -203,15 +203,14 @@
 				now_pushing = 0
 				return
 
-		if(tmob.r_hand && istype(tmob.r_hand, /obj/item/weapon/shield/riot))
-			if(prob(99))
-				now_pushing = 0
-				return
 
-		if(tmob.l_hand && istype(tmob.l_hand, /obj/item/weapon/shield/riot))
-			if(prob(99))
-				now_pushing = 0
-				return
+		//anti-riot equipment is also anti-push
+		if(tmob.r_hand && (prob(tmob.r_hand.block_chance * 2)) && !istype(tmob.r_hand, /obj/item/clothing))
+			now_pushing = 0
+			return
+		if(tmob.l_hand && (prob(tmob.l_hand.block_chance * 2)) && !istype(tmob.l_hand, /obj/item/clothing))
+			now_pushing = 0
+			return
 
 		if(!(tmob.status_flags & CANPUSH))
 			now_pushing = 0
@@ -414,16 +413,16 @@
 		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
 		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
-		if(check_shields(damage, "the [M.name]"))
+		if(check_shields(damage, "the [M.name]", null, MELEE_ATTACK, M.armour_penetration))
 			return 0
 		var/dam_zone = pick("head", "chest", "groin", "l_arm", "l_hand", "r_arm", "r_hand", "l_leg", "l_foot", "r_leg", "r_foot")
 		var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone))
-		var/armor = run_armor_check(affecting, "melee")
+		var/armor = run_armor_check(affecting, "melee", armour_penetration = M.armour_penetration)
 
 		var/obj/item/organ/external/affected = src.get_organ(dam_zone)
 		if(affected)
 			affected.add_autopsy_data(M.name, damage) // Add the mob's name to the autopsy data
-		apply_damage(damage,M.melee_damage_type, affecting, armor, M.name)
+		apply_damage(damage, M.melee_damage_type, affecting, armor)
 		updatehealth()
 
 /mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L as mob)
@@ -461,7 +460,7 @@
 		else
 			damage = rand(5, 25)
 
-		if(check_shields(damage, "the [M.name]"))
+		if(check_shields(damage, "the [M.name]", null, MELEE_ATTACK))
 			return 0
 
 		var/dam_zone = pick("head", "chest", "groin", "l_arm", "l_hand", "r_arm", "r_hand", "l_leg", "l_foot", "r_leg", "r_foot")
@@ -489,11 +488,11 @@
 					M.powerlevel = 0
 
 				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
+					if((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>The [M.name] has shocked []!</B>", src), 1)
 
 				Weaken(power)
-				if (stuttering < power)
+				if(stuttering < power)
 					stuttering = power
 				Stun(power)
 
@@ -501,7 +500,7 @@
 				s.set_up(5, 1, src)
 				s.start()
 
-				if (prob(stunprob) && M.powerlevel >= 8)
+				if(prob(stunprob) && M.powerlevel >= 8)
 					adjustFireLoss(M.powerlevel * rand(6,10))
 
 
@@ -511,9 +510,9 @@
 
 
 /mob/living/carbon/human/restrained()
-	if (handcuffed)
+	if(handcuffed)
 		return 1
-	if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
+	if(istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
 		return 1
 	return 0
 
@@ -634,8 +633,8 @@
 // Get rank from ID, ID inside PDA, PDA, ID in wallet, etc.
 /mob/living/carbon/human/proc/get_authentification_rank(var/if_no_id = "No id", var/if_no_job = "No job")
 	var/obj/item/device/pda/pda = wear_id
-	if (istype(pda))
-		if (pda.id)
+	if(istype(pda))
+		if(pda.id)
 			return pda.id.rank
 		else
 			return pda.ownrank
@@ -651,16 +650,16 @@
 /mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job")
 	var/obj/item/device/pda/pda = wear_id
 	var/obj/item/weapon/card/id/id = wear_id
-	if (istype(pda))
-		if (pda.id && istype(pda.id, /obj/item/weapon/card/id))
+	if(istype(pda))
+		if(pda.id && istype(pda.id, /obj/item/weapon/card/id))
 			. = pda.id.assignment
 		else
 			. = pda.ownjob
-	else if (istype(id))
+	else if(istype(id))
 		. = id.assignment
 	else
 		return if_no_id
-	if (!.)
+	if(!.)
 		. = if_no_job
 	return
 
@@ -669,12 +668,12 @@
 /mob/living/carbon/human/proc/get_authentification_name(var/if_no_id = "Unknown")
 	var/obj/item/device/pda/pda = wear_id
 	var/obj/item/weapon/card/id/id = wear_id
-	if (istype(pda))
-		if (pda.id)
+	if(istype(pda))
+		if(pda.id)
 			. = pda.id.registered_name
 		else
 			. = pda.owner
-	else if (istype(id))
+	else if(istype(id))
 		. = id.registered_name
 	else
 		return if_no_id
@@ -715,9 +714,9 @@
 /mob/living/carbon/human/proc/get_idcard()
 	var/obj/item/weapon/card/id/id = wear_id
 	var/obj/item/device/pda/pda = wear_id
-	if (istype(pda) && pda.id)
+	if(istype(pda) && pda.id)
 		id = pda.id
-	if (istype(id))
+	if(istype(id))
 		return id
 
 //Removed the horrible safety parameter. It was only being used by ninja code anyways.
@@ -828,7 +827,7 @@
 						U.accessories -= A
 						update_inv_w_uniform()
 
-	if (href_list["criminal"])
+	if(href_list["criminal"])
 		if(hasHUD(usr,"security"))
 
 			var/modified = 0
@@ -843,10 +842,10 @@
 				perpname = name
 
 			if(perpname)
-				for (var/datum/data/record/E in data_core.general)
-					if (E.fields["name"] == perpname)
-						for (var/datum/data/record/R in data_core.security)
-							if (R.fields["id"] == E.fields["id"])
+				for(var/datum/data/record/E in data_core.general)
+					if(E.fields["name"] == perpname)
+						for(var/datum/data/record/R in data_core.security)
+							if(R.fields["id"] == E.fields["id"])
 
 								var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel")
 
@@ -866,7 +865,7 @@
 			if(!modified)
 				to_chat(usr, "\red Unable to locate a data core entry for this person.")
 
-	if (href_list["secrecord"])
+	if(href_list["secrecord"])
 		if(hasHUD(usr,"security"))
 			var/perpname = "wot"
 			var/read = 0
@@ -879,10 +878,10 @@
 					perpname = tempPda.owner
 			else
 				perpname = src.name
-			for (var/datum/data/record/E in data_core.general)
-				if (E.fields["name"] == perpname)
-					for (var/datum/data/record/R in data_core.security)
-						if (R.fields["id"] == E.fields["id"])
+			for(var/datum/data/record/E in data_core.general)
+				if(E.fields["name"] == perpname)
+					for(var/datum/data/record/R in data_core.security)
+						if(R.fields["id"] == E.fields["id"])
 							if(hasHUD(usr,"security"))
 								to_chat(usr, "<b>Name:</b> [R.fields["name"]]	<b>Criminal Status:</b> [R.fields["criminal"]]")
 								to_chat(usr, "<b>Minor Crimes:</b> [R.fields["mi_crim"]]")
@@ -896,7 +895,7 @@
 			if(!read)
 				to_chat(usr, "\red Unable to locate a data core entry for this person.")
 
-	if (href_list["secrecordComment"])
+	if(href_list["secrecordComment"])
 		if(hasHUD(usr,"security"))
 			var/perpname = "wot"
 			var/read = 0
@@ -909,24 +908,24 @@
 					perpname = tempPda.owner
 			else
 				perpname = src.name
-			for (var/datum/data/record/E in data_core.general)
-				if (E.fields["name"] == perpname)
-					for (var/datum/data/record/R in data_core.security)
-						if (R.fields["id"] == E.fields["id"])
+			for(var/datum/data/record/E in data_core.general)
+				if(E.fields["name"] == perpname)
+					for(var/datum/data/record/R in data_core.security)
+						if(R.fields["id"] == E.fields["id"])
 							if(hasHUD(usr,"security"))
 								read = 1
 								var/counter = 1
 								while(R.fields[text("com_[]", counter)])
 									to_chat(usr, text("[]", R.fields[text("com_[]", counter)]))
 									counter++
-								if (counter == 1)
+								if(counter == 1)
 									to_chat(usr, "No comment found")
 								to_chat(usr, "<a href='?src=\ref[src];secrecordadd=`'>\[Add comment\]</a>")
 
 			if(!read)
 				to_chat(usr, "\red Unable to locate a data core entry for this person.")
 
-	if (href_list["secrecordadd"])
+	if(href_list["secrecordadd"])
 		if(hasHUD(usr,"security"))
 			var/perpname = "wot"
 			if(wear_id)
@@ -937,13 +936,13 @@
 					perpname = tempPda.owner
 			else
 				perpname = src.name
-			for (var/datum/data/record/E in data_core.general)
-				if (E.fields["name"] == perpname)
-					for (var/datum/data/record/R in data_core.security)
-						if (R.fields["id"] == E.fields["id"])
+			for(var/datum/data/record/E in data_core.general)
+				if(E.fields["name"] == perpname)
+					for(var/datum/data/record/R in data_core.security)
+						if(R.fields["id"] == E.fields["id"])
 							if(hasHUD(usr,"security"))
 								var/t1 = sanitize(copytext(input("Add Comment:", "Sec. records", null, null)  as message,1,MAX_MESSAGE_LEN))
-								if ( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"security")) )
+								if( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"security")) )
 									return
 								var/counter = 1
 								while(R.fields[text("com_[]", counter)])
@@ -958,7 +957,7 @@
 									var/mob/living/silicon/ai/U = usr
 									R.fields[text("com_[counter]")] = text("Made by [U.name] (artificial intelligence) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
 
-	if (href_list["medical"])
+	if(href_list["medical"])
 		if(hasHUD(usr,"medical"))
 			var/perpname = "wot"
 			var/modified = 0
@@ -972,10 +971,10 @@
 			else
 				perpname = src.name
 
-			for (var/datum/data/record/E in data_core.general)
-				if (E.fields["name"] == perpname)
-					for (var/datum/data/record/R in data_core.general)
-						if (R.fields["id"] == E.fields["id"])
+			for(var/datum/data/record/E in data_core.general)
+				if(E.fields["name"] == perpname)
+					for(var/datum/data/record/R in data_core.general)
+						if(R.fields["id"] == E.fields["id"])
 							var/setmedical = input(usr, "Specify a new medical status for this person.", "Medical HUD", R.fields["p_stat"]) in list("*SSD*", "*Deceased*", "Physically Unfit", "Active", "Disabled", "Cancel")
 
 							if(hasHUD(usr,"medical"))
@@ -996,7 +995,7 @@
 			if(!modified)
 				to_chat(usr, "\red Unable to locate a data core entry for this person.")
 
-	if (href_list["medrecord"])
+	if(href_list["medrecord"])
 		if(hasHUD(usr,"medical"))
 			var/perpname = "wot"
 			var/read = 0
@@ -1009,10 +1008,10 @@
 					perpname = tempPda.owner
 			else
 				perpname = src.name
-			for (var/datum/data/record/E in data_core.general)
-				if (E.fields["name"] == perpname)
-					for (var/datum/data/record/R in data_core.medical)
-						if (R.fields["id"] == E.fields["id"])
+			for(var/datum/data/record/E in data_core.general)
+				if(E.fields["name"] == perpname)
+					for(var/datum/data/record/R in data_core.medical)
+						if(R.fields["id"] == E.fields["id"])
 							if(hasHUD(usr,"medical"))
 								to_chat(usr, "<b>Name:</b> [R.fields["name"]]	<b>Blood Type:</b> [R.fields["b_type"]]")
 								to_chat(usr, "<b>DNA:</b> [R.fields["b_dna"]]")
@@ -1027,7 +1026,7 @@
 			if(!read)
 				to_chat(usr, "\red Unable to locate a data core entry for this person.")
 
-	if (href_list["medrecordComment"])
+	if(href_list["medrecordComment"])
 		if(hasHUD(usr,"medical"))
 			var/perpname = "wot"
 			var/read = 0
@@ -1040,24 +1039,24 @@
 					perpname = tempPda.owner
 			else
 				perpname = src.name
-			for (var/datum/data/record/E in data_core.general)
-				if (E.fields["name"] == perpname)
-					for (var/datum/data/record/R in data_core.medical)
-						if (R.fields["id"] == E.fields["id"])
+			for(var/datum/data/record/E in data_core.general)
+				if(E.fields["name"] == perpname)
+					for(var/datum/data/record/R in data_core.medical)
+						if(R.fields["id"] == E.fields["id"])
 							if(hasHUD(usr,"medical"))
 								read = 1
 								var/counter = 1
 								while(R.fields[text("com_[]", counter)])
 									to_chat(usr, text("[]", R.fields[text("com_[]", counter)]))
 									counter++
-								if (counter == 1)
+								if(counter == 1)
 									to_chat(usr, "No comment found")
 								to_chat(usr, "<a href='?src=\ref[src];medrecordadd=`'>\[Add comment\]</a>")
 
 			if(!read)
 				to_chat(usr, "\red Unable to locate a data core entry for this person.")
 
-	if (href_list["medrecordadd"])
+	if(href_list["medrecordadd"])
 		if(hasHUD(usr,"medical"))
 			var/perpname = "wot"
 			if(wear_id)
@@ -1068,13 +1067,13 @@
 					perpname = tempPda.owner
 			else
 				perpname = src.name
-			for (var/datum/data/record/E in data_core.general)
-				if (E.fields["name"] == perpname)
-					for (var/datum/data/record/R in data_core.medical)
-						if (R.fields["id"] == E.fields["id"])
+			for(var/datum/data/record/E in data_core.general)
+				if(E.fields["name"] == perpname)
+					for(var/datum/data/record/R in data_core.medical)
+						if(R.fields["id"] == E.fields["id"])
 							if(hasHUD(usr,"medical"))
 								var/t1 = sanitize(copytext(input("Add Comment:", "Med. records", null, null)  as message,1,MAX_MESSAGE_LEN))
-								if ( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"medical")) )
+								if( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"medical")) )
 									return
 								var/counter = 1
 								while(R.fields[text("com_[]", counter)])
@@ -1086,11 +1085,11 @@
 									var/mob/living/silicon/robot/U = usr
 									R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
 
-	if (href_list["lookitem"])
+	if(href_list["lookitem"])
 		var/obj/item/I = locate(href_list["lookitem"])
 		src.examinate(I)
 
-	if (href_list["lookmob"])
+	if(href_list["lookmob"])
 		var/mob/M = locate(href_list["lookmob"])
 		src.examinate(M)
 	. = ..()
@@ -1195,7 +1194,7 @@
 	if(!affecting)
 		. = 0
 		fail_msg = "They are missing that limb."
-	else if (affecting.status & ORGAN_ROBOT)
+	else if(affecting.status & ORGAN_ROBOT)
 		. = 0
 		fail_msg = "That limb is robotic."
 	else
@@ -1324,7 +1323,7 @@
 		mutations.Remove(HUSK)
 
 	if(!client || !key) //Don't boot out anyone already in the mob.
-		for (var/obj/item/organ/internal/brain/H in world)
+		for(var/obj/item/organ/internal/brain/H in world)
 			if(H.brainmob)
 				if(H.brainmob.real_name == src.real_name)
 					if(H.brainmob.mind)
@@ -1359,30 +1358,30 @@
 	var/germs = 0
 	var/tdamage = 0
 	var/ticks = 0
-	while (germs < 2501 && ticks < 100000 && round(damage/10)*20)
+	while(germs < 2501 && ticks < 100000 && round(damage/10)*20)
 		diary << "VIRUS TESTING: [ticks] : germs [germs] tdamage [tdamage] prob [round(damage/10)*20]"
 		ticks++
-		if (prob(round(damage/10)*20))
+		if(prob(round(damage/10)*20))
 			germs++
-		if (germs == 100)
+		if(germs == 100)
 			to_chat(world, "Reached stage 1 in [ticks] ticks")
-		if (germs > 100)
-			if (prob(10))
+		if(germs > 100)
+			if(prob(10))
 				damage++
 				germs++
-		if (germs == 1000)
+		if(germs == 1000)
 			to_chat(world, "Reached stage 2 in [ticks] ticks")
-		if (germs > 1000)
+		if(germs > 1000)
 			damage++
 			germs++
-		if (germs == 2500)
+		if(germs == 2500)
 			to_chat(world, "Reached stage 3 in [ticks] ticks")
 	to_chat(world, "Mob took [tdamage] tox damage")
 */
 //returns 1 if made bloody, returns 0 otherwise
 
 /mob/living/carbon/human/add_blood(mob/living/carbon/human/M as mob)
-	if (!..())
+	if(!..())
 		return 0
 	//if this blood isn't already in the list, add it
 	if(blood_DNA[M.dna.unique_enzymes])
@@ -1620,32 +1619,32 @@
 	set name = "Write in blood"
 	set desc = "Use blood on your hands to write a short message on the floor or a wall, murder mystery style."
 
-	if (usr != src)
+	if(usr != src)
 		return 0 //something is terribly wrong
 
-	if (!bloody_hands)
+	if(!bloody_hands)
 		verbs -= /mob/living/carbon/human/proc/bloody_doodle
 
-	if (src.gloves)
+	if(src.gloves)
 		to_chat(src, "<span class='warning'>Your [src.gloves] are getting in the way.</span>")
 		return
 
 	var/turf/simulated/T = src.loc
-	if (!istype(T)) //to prevent doodling out of mechs and lockers
+	if(!istype(T)) //to prevent doodling out of mechs and lockers
 		to_chat(src, "<span class='warning'>You cannot reach the floor.</span>")
 		return
 
 	var/direction = input(src,"Which way?","Tile selection") as anything in list("Here","North","South","East","West")
-	if (direction != "Here")
+	if(direction != "Here")
 		T = get_step(T,text2dir(direction))
-	if (!istype(T))
+	if(!istype(T))
 		to_chat(src, "<span class='warning'>You cannot doodle there.</span>")
 		return
 
 	var/num_doodles = 0
-	for (var/obj/effect/decal/cleanable/blood/writing/W in T)
+	for(var/obj/effect/decal/cleanable/blood/writing/W in T)
 		num_doodles++
-	if (num_doodles > 4)
+	if(num_doodles > 4)
 		to_chat(src, "<span class='warning'>There is no space to write on!</span>")
 		return
 
@@ -1653,11 +1652,11 @@
 
 	var/message = stripped_input(src,"Write a message. It cannot be longer than [max_length] characters.","Blood writing", "")
 
-	if (message)
+	if(message)
 		var/used_blood_amount = round(length(message) / 30, 1)
 		bloody_hands = max(0, bloody_hands - used_blood_amount) //use up some blood
 
-		if (length(message) > max_length)
+		if(length(message) > max_length)
 			message += "-"
 			to_chat(src, "<span class='warning'>You ran out of blood to write with!</span>")
 
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 33cb567ba4a..deca4948b29 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -1,5 +1,5 @@
 /mob/living/carbon/human/attack_hand(mob/living/carbon/human/M as mob)
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
@@ -10,7 +10,7 @@
 	var/mob/living/carbon/human/H = M
 	if(istype(H))
 		var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
-		if (H.hand)
+		if(H.hand)
 			temp = H.organs_by_name["l_hand"]
 		if(!temp || !temp.is_usable())
 			to_chat(H, "\red You can't use your hand.")
@@ -18,10 +18,9 @@
 
 	..()
 
-	if((M != src) && check_shields(0, M.name))
+	if((M != src) && M.a_intent != "help" && check_shields(0, M.name, attack_type = UNARMED_ATTACK))
 		add_logs(src, M, "attempted to touch")
-		M.do_attack_animation(src)
-		visible_message("\red <B>[M] attempted to touch [src]!</B>")
+		visible_message("<span class='warning'>[M] attempted to touch [src]!</span>")
 		return 0
 
 		if(istype(M.gloves , /obj/item/clothing/gloves/boxing/hologlove))
@@ -185,7 +184,7 @@
 					w_uniform.add_fingerprint(M)
 				var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
 				var/randn = rand(1, 100)
-				if (randn <= 25)
+				if(randn <= 25)
 					apply_effect(2, WEAKEN, run_armor_check(affecting, "melee"))
 					playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 					visible_message("\red <B>[M] has pushed [src]!</B>")
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 88e655beb0e..54cceec0635 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -26,6 +26,7 @@
 		update_revive()
 	med_hud_set_health()
 	med_hud_set_status()
+	handle_hud_icons()
 
 /mob/living/carbon/human/adjustBrainLoss(var/amount)
 	if(status_flags & GODMODE)
@@ -103,7 +104,7 @@
 	if(species && species.brute_mod)
 		amount = amount*species.brute_mod
 
-	if (organ_name in organs_by_name)
+	if(organ_name in organs_by_name)
 		var/obj/item/organ/external/O = get_organ(organ_name)
 
 		if(amount > 0)
@@ -117,7 +118,7 @@
 	if(species && species.burn_mod)
 		amount = amount*species.burn_mod
 
-	if (organ_name in organs_by_name)
+	if(organ_name in organs_by_name)
 		var/obj/item/organ/external/O = get_organ(organ_name)
 
 		if(amount > 0)
@@ -383,7 +384,7 @@ This function restores all organs.
 					var/list/attack_bubble_recipients = list()
 					var/mob/living/user
 					for(var/mob/O in viewers(user, src))
-						if (O.client && !(O.blinded))
+						if(O.client && !(O.blinded))
 							attack_bubble_recipients.Add(O.client)
 					spawn(0)
 						var/image/dmgIcon = image('icons/effects/hit_blips.dmi', src, "dmg[rand(1,2)]",MOB_LAYER+1)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 3a935e5e449..55fd52ada9e 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -32,7 +32,7 @@ emp_act
 			return -1 // complete projectile permutation
 
 	//Shields
-	if(check_shields(P.damage, "the [P.name]", P))
+	if(check_shields(P.damage, "the [P.name]", P, PROJECTILE_ATTACK, P.armour_penetration))
 		P.on_hit(src, 100, def_zone)
 		return 2
 
@@ -41,7 +41,7 @@ emp_act
 		return
 
 	//Shrapnel
-	if (P.damage_type == BRUTE)
+	if(P.damage_type == BRUTE)
 		var/armor = getarmor_organ(organ, "bullet")
 		if((P.embed && prob(20 + max(P.damage - armor, -10))))
 			var/obj/item/weapon/shard/shrapnel/SP = new()
@@ -91,7 +91,7 @@ emp_act
 
 //this proc returns the Siemens coefficient of electrical resistivity for a particular external organ.
 /mob/living/carbon/human/proc/get_siemens_coefficient_organ(var/obj/item/organ/external/def_zone)
-	if (!def_zone)
+	if(!def_zone)
 		return 1.0
 
 	var/siemens_coefficient = 1.0
@@ -132,40 +132,24 @@ emp_act
 
 //End Here
 
-/mob/living/carbon/human/proc/check_shields(var/damage = 0, var/attack_text = "the attack", var/obj/item/O)
-	if(O)
-		if(O.flags & NOSHIELD) //weapon ignores shields altogether
-			return 0
-	if(l_hand && istype(l_hand, /obj/item/weapon))//Current base is the prob(50-d/3)
-		var/obj/item/weapon/I = l_hand
-		if(I.IsShield() && (prob(50 - round(damage / 3))))
-			visible_message("<span class='danger'>[src] blocks [attack_text] with [l_hand]!</span>", \
-							"<span class='userdanger'>[src] blocks [attack_text] with [l_hand]!</span>")
+/mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", atom/movable/AM, attack_type = MELEE_ATTACK, armour_penetration = 0)
+	var/block_chance_modifier = round(damage / -3)
+
+	if(l_hand && !istype(l_hand, /obj/item/clothing))
+		var/final_block_chance = l_hand.block_chance - (Clamp((armour_penetration-l_hand.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
+		if(l_hand.hit_reaction(src, attack_text, final_block_chance, damage, attack_type))
 			return 1
-	if(r_hand && istype(r_hand, /obj/item/weapon))
-		var/obj/item/weapon/I = r_hand
-		if(I.IsShield() && (prob(50 - round(damage / 3))))
-			visible_message("<span class='danger'>[src] blocks [attack_text] with [r_hand]!</span>", \
-							"<span class='userdanger'>[src] blocks [attack_text] with [r_hand]!</span>")
+	if(r_hand && !istype(r_hand, /obj/item/clothing))
+		var/final_block_chance = r_hand.block_chance - (Clamp((armour_penetration-r_hand.armour_penetration)/2,0,100)) + block_chance_modifier //Need to reset the var so it doesn't carry over modifications between attempts
+		if(r_hand.hit_reaction(src, attack_text, final_block_chance, damage, attack_type))
 			return 1
-	if(wear_suit && istype(wear_suit, /obj/item/))
-		var/obj/item/I = wear_suit
-		if(I.IsShield() && (prob(50)))
-			visible_message("<span class='danger'>The reactive teleport system flings [src] clear of [attack_text]!</span>", \
-							"<span class='userdanger'>The reactive teleport system flings [src] clear of [attack_text]!</span>")
-			var/list/turfs = new/list()
-			for(var/turf/T in orange(6, src))
-				if(istype(T,/turf/space)) continue
-				if(T.density) continue
-				if(T.x>world.maxx-6 || T.x<6)	continue
-				if(T.y>world.maxy-6 || T.y<6)	continue
-				turfs += T
-			if(!turfs.len) turfs += pick(/turf in orange(6, src))
-			var/turf/picked = pick(turfs)
-			if(!isturf(picked)) return
-			if(buckled)
-				buckled.unbuckle_mob()
-			src.loc = picked
+	if(wear_suit)
+		var/final_block_chance = wear_suit.block_chance - (Clamp((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
+		if(wear_suit.hit_reaction(src, attack_text, final_block_chance, damage, attack_type))
+			return 1
+	if(w_uniform)
+		var/final_block_chance = w_uniform.block_chance - (Clamp((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
+		if(w_uniform.hit_reaction(src, attack_text, final_block_chance, damage, attack_type))
 			return 1
 	return 0
 
@@ -221,7 +205,7 @@ emp_act
 
 	if(user != src)
 		user.do_attack_animation(src)
-		if(check_shields(I.force, "the [I.name]", I))
+		if(check_shields(I.force, "the [I.name]", I, MELEE_ATTACK, I.armour_penetration))
 			return 0
 
 	if(istype(I,/obj/item/weapon/card/emag))
@@ -236,7 +220,7 @@ emp_act
 	var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].", armour_penetration = I.armour_penetration)
 	var/weapon_sharp = is_sharp(I)
 	var/weapon_edge = has_edge(I)
-	if ((weapon_sharp || weapon_edge) && prob(getarmor(user.zone_sel.selecting, "melee")))
+	if((weapon_sharp || weapon_edge) && prob(getarmor(user.zone_sel.selecting, "melee")))
 		weapon_sharp = 0
 		weapon_edge = 0
 
@@ -299,9 +283,9 @@ emp_act
 		forcesay(hit_appends)	//forcesay checks stat already
 
 /*	//Melee weapon embedded object code. Commented out, as most people on the forums seem to find this annoying and think it does not contribute to general gameplay. - Dave
-	if (I.damtype == BRUTE && !I.is_robot_module())
+	if(I.damtype == BRUTE && !I.is_robot_module())
 		var/damage = I.force
-		if (armor)
+		if(armor)
 			damage /= armor+1
 
 		//blunt objects should really not be embedding in things unless a huge amount of force is involved
@@ -315,63 +299,56 @@ emp_act
 
 //this proc handles being hit by a thrown atom
 /mob/living/carbon/human/hitby(atom/movable/AM as mob|obj,var/speed = 5)
-	if(istype(AM,/obj/))
-		var/obj/O = AM
+	if(istype(AM, /obj/item))
+		var/obj/item/I = AM
 
 		if(in_throw_mode && !get_active_hand() && speed <= 5)	//empty active hand and we're in throw mode
 			if(canmove && !restrained())
-				if(isturf(O.loc))
-					put_in_active_hand(O)
-					visible_message("<span class='warning'>[src] catches [O]!</span>")
+				if(isturf(I.loc))
+					put_in_active_hand(I)
+					visible_message("<span class='warning'>[src] catches [I]!</span>")
 					throw_mode_off()
 					return
 
 		var/zone = ran_zone("chest", 65)
 		var/dtype = BRUTE
-		if(istype(O,/obj/item/weapon))
-			var/obj/item/weapon/W = O
+		if(istype(I, /obj/item/weapon))
+			var/obj/item/weapon/W = I
 			dtype = W.damtype
-		var/throw_damage = O.throwforce*(speed/5)
+		var/throw_damage = I.throwforce*(speed/5)
 
-		/*
-		if(!zone)
-			visible_message("\blue \The [O] misses [src] narrowly!")
-			return
-		*/
-		O.throwing = 0		//it hit, so stop moving
+		I.throwing = 0		//it hit, so stop moving
 
-		if ((O.thrower != src) && check_shields(throw_damage, "[O]"))
+		if((I.thrower != src) && check_shields(throw_damage, "\the [I.name]", I, THROWN_PROJECTILE_ATTACK))
 			return
 
 		var/obj/item/organ/external/affecting = get_organ(zone)
 		if(!affecting)
-			var/missverb = (O.gender == PLURAL) ? "whizz" : "whizzes"
-			visible_message("<span class='notice'>\The [O] [missverb] past [src]'s missing [parse_zone(zone)]!</span>",
-				"<span class='notice'>\The [O] [missverb] past your missing [parse_zone(zone)]!</span>")
+			var/missverb = (I.gender == PLURAL) ? "whizz" : "whizzes"
+			visible_message("<span class='notice'>\The [I] [missverb] past [src]'s missing [parse_zone(zone)]!</span>",
+				"<span class='notice'>\The [I] [missverb] past your missing [parse_zone(zone)]!</span>")
 			return
 		var/hit_area = affecting.name
 
-		src.visible_message("\red [src] has been hit in the [hit_area] by [O].")
-		var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].") //I guess "melee" is the best fit here
+		src.visible_message("\red [src] has been hit in the [hit_area] by [I].")
+		var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].", I.armour_penetration) //I guess "melee" is the best fit here
 
+		apply_damage(throw_damage, dtype, zone, armor, is_sharp(I), has_edge(I), I)
 
-		apply_damage(throw_damage, dtype, zone, armor, is_sharp(O), has_edge(O), O)
-
-		if(ismob(O.thrower))
-			var/mob/M = O.thrower
+		if(ismob(I.thrower))
+			var/mob/M = I.thrower
 			if(M)
-				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [O], thrown by [key_name(M)]</font>")
-				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [key_name(src)] with a thrown [O]</font>")
+				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [I], thrown by [key_name(M)]</font>")
+				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [key_name(src)] with a thrown [I]</font>")
 				if(!istype(src,/mob/living/simple_animal/mouse))
-					msg_admin_attack("[key_name_admin(src)] was hit by a [O], thrown by [key_name_admin(M)]")
+					msg_admin_attack("[key_name_admin(src)] was hit by a [I], thrown by [key_name_admin(M)]")
 
 		//thrown weapon embedded object code.
-		if(dtype == BRUTE && istype(O,/obj/item))
-			var/obj/item/I = O
-			if (!I.is_robot_module())
+		if(dtype == BRUTE && istype(I))
+			if(!I.is_robot_module())
 				var/sharp = is_sharp(I)
 				var/damage = throw_damage
-				if (armor)
+				if(armor)
 					damage /= armor+1
 
 				//blunt objects should really not be embedding in things unless a huge amount of force is involved
@@ -384,10 +361,10 @@ emp_act
 					affecting.embed(I)
 
 		// Begin BS12 momentum-transfer code.
-		if(O.throw_source && speed >= 15)
-			var/obj/item/weapon/W = O
+		if(I.throw_source && speed >= 15)
+			var/obj/item/weapon/W = I
 			var/momentum = speed/2
-			var/dir = get_dir(O.throw_source, src)
+			var/dir = get_dir(I.throw_source, src)
 
 			visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!")
 			src.throw_at(get_edge_target_turf(src,dir),1,momentum)
@@ -399,14 +376,14 @@ emp_act
 
 				if(T)
 					src.loc = T
-					visible_message("<span class='warning'>[src] is pinned to the wall by [O]!</span>","<span class='warning'>You are pinned to the wall by [O]!</span>")
+					visible_message("<span class='warning'>[src] is pinned to the wall by [I]!</span>","<span class='warning'>You are pinned to the wall by [I]!</span>")
 					src.anchored = 1
-					src.pinned += O
+					src.pinned += I
 
 
 /mob/living/carbon/human/proc/bloody_hands(var/mob/living/source, var/amount = 2)
 
-	if (gloves)
+	if(gloves)
 		gloves.add_blood(source)
 		gloves:transfer_blood = amount
 		gloves:bloody_hands_mob = source
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 6f106f5e125..3af93392326 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -80,4 +80,4 @@ var/global/default_martial_art = new/datum/martial_art
 	var/fire_dmi = 'icons/mob/OnFire.dmi'
 	var/fire_sprite = "Standing"
 
-	var/datum/body_accessory/body_accessory = null
\ No newline at end of file
+	var/datum/body_accessory/body_accessory = null
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 5d79e3f6237..aa115ad8c4c 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -24,7 +24,7 @@
 		tally += (health_deficiency / 25)
 
 	var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80
-	if (hungry >= 70)
+	if(hungry >= 70)
 		tally += hungry/50
 
 	if(wear_suit)
@@ -46,7 +46,7 @@
 
 	if(FAT in src.mutations)
 		tally += 1.5
-	if (bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
+	if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
 		tally += (BODYTEMP_COLD_DAMAGE_LIMIT - bodytemperature) / COLD_SLOWDOWN_FACTOR
 
 	tally += 2*stance_damage //damaged/missing feet or legs is slow
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 56838b8d14e..aa0724c5c80 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -42,45 +42,45 @@
 			E.process()
 			number_wounds += E.number_wounds
 
-			if (!lying && world.time - l_move_time < 15)
+			if(!lying && world.time - l_move_time < 15)
 			//Moving around with fractured ribs won't do you any good
-				if (E.is_broken() && E.internal_organs && E.internal_organs.len && prob(15))
+				if(E.is_broken() && E.internal_organs && E.internal_organs.len && prob(15))
 					var/obj/item/organ/internal/I = pick(E.internal_organs)
 					custom_pain("You feel broken bones moving in your [E.name]!", 1)
 					I.take_damage(rand(3,5))
 
 				//Moving makes open wounds get infected much faster
-				if (E.wounds.len)
+				if(E.wounds.len)
 					for(var/datum/wound/W in E.wounds)
-						if (W.infection_check())
+						if(W.infection_check())
 							W.germ_level += 1
 
 
 /mob/living/carbon/human/proc/handle_stance()
 	// Don't need to process any of this if they aren't standing anyways
 	// unless their stance is damaged, and we want to check if they should stay down
-	if (!stance_damage && (lying || resting) && (life_tick % 4) == 0)
+	if(!stance_damage && (lying || resting) && (life_tick % 4) == 0)
 		return
 
 	stance_damage = 0
 
 	// Buckled to a bed/chair. Stance damage is forced to 0 since they're sitting on something solid
-	if (istype(buckled, /obj/structure/stool/bed))
+	if(istype(buckled, /obj/structure/stool/bed))
 		return
 
 	for(var/limb_tag in list("l_leg","r_leg","l_foot","r_foot"))
 		var/obj/item/organ/external/E = organs_by_name[limb_tag]
 		if(!E || (E.status & (ORGAN_DESTROYED|ORGAN_DEAD)) || E.is_malfunctioning())
 			stance_damage += 2 // let it fail even if just foot&leg. Also malfunctioning happens sporadically so it should impact more when it procs
-		else if (E.is_broken() || !E.is_usable())
+		else if(E.is_broken() || !E.is_usable())
 			stance_damage += 1
 
 	// Canes and crutches help you stand (if the latter is ever added)
 	// One cane mitigates a broken leg+foot, or a missing foot.
 	// Two canes are needed for a lost leg. If you are missing both legs, canes aren't gonna help you.
-	if (l_hand && istype(l_hand, /obj/item/weapon/cane))
+	if(l_hand && istype(l_hand, /obj/item/weapon/cane))
 		stance_damage -= 2
-	if (r_hand && istype(r_hand, /obj/item/weapon/cane))
+	if(r_hand && istype(r_hand, /obj/item/weapon/cane))
 		stance_damage -= 2
 
 	if(stance_damage < 0)
@@ -100,7 +100,7 @@
 	if(!l_hand && !r_hand)
 		return
 
-	for (var/obj/item/organ/external/E in organs)
+	for(var/obj/item/organ/external/E in organs)
 		if(!E || !E.can_grasp || (E.status & ORGAN_SPLINTED))
 			continue
 
@@ -163,7 +163,7 @@ I use this to standardize shadowling dethrall code
 -- Crazylemon
 */
 /mob/living/carbon/human/proc/named_organ_parent(var/organ_name)
-	if (!get_int_organ(organ_name))
+	if(!get_int_organ(organ_name))
 		return null
 	var/obj/item/organ/internal/O = get_int_organ(organ_name)
 	return O.parent_organ
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm
index c1b22e721f2..41d16e18eb8 100644
--- a/code/modules/mob/living/carbon/human/interactive/functions.dm
+++ b/code/modules/mob/living/carbon/human/interactive/functions.dm
@@ -460,7 +460,7 @@
 		var/global/list/available_recipes
 		if(!available_recipes)
 			available_recipes = list()
-			for (var/type in subtypesof(/datum/recipe))
+			for(var/type in subtypesof(/datum/recipe))
 				var/datum/recipe/recipe = new type
 				if(recipe.result) // Ignore recipe subtypes that lack a result
 					available_recipes += recipe
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index bde2c900636..47448a73262 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -39,10 +39,10 @@
 
 
 /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1)
-	for (var/slot in slots)
-		if (equip_to_slot_if_possible(W, slots[slot], del_on_fail = 0))
+	for(var/slot in slots)
+		if(equip_to_slot_if_possible(W, slots[slot], del_on_fail = 0))
 			return slot
-	if (del_on_fail)
+	if(del_on_fail)
 		qdel(W)
 	return null
 
@@ -150,7 +150,7 @@
 	else if(I == r_ear)
 		r_ear = null
 		update_inv_ears()
-	else if (I == l_ear)
+	else if(I == l_ear)
 		l_ear = null
 		update_inv_ears()
 	else if(I == shoes)
@@ -423,7 +423,7 @@
 	if(istype(I, /obj/item/clothing/under) || istype(I, /obj/item/clothing/suit))
 		if(FAT in mutations)
 			//testing("[M] TOO FAT TO WEAR [src]!")
-			if(!(I.flags & ONESIZEFITSALL))
+			if(!(I.flags_size & ONESIZEFITSALL))
 				if(!disable_warning)
 					to_chat(src, "<span class='alert'>You're too fat to wear the [I].</span>")
 				return 0
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index a41f787a49c..d877c983e1e 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -78,8 +78,8 @@
 
 
 /mob/living/carbon/human/handle_disabilities()
-	if (disabilities & EPILEPSY)
-		if ((prob(1) && paralysis < 1))
+	if(disabilities & EPILEPSY)
+		if((prob(1) && paralysis < 1))
 			visible_message("<span class='danger'>[src] starts having a seizure!</span>","<span class='alert'>You have a seizure!</span>")
 			Paralyse(10)
 			Jitter(1000)
@@ -89,13 +89,13 @@
 		if(prob(1) && hallucination < 1)
 			hallucination += 20
 
-	if (disabilities & COUGHING)
-		if ((prob(5) && paralysis <= 1))
+	if(disabilities & COUGHING)
+		if((prob(5) && paralysis <= 1))
 			drop_item()
 			emote("cough")
-	if (disabilities & TOURETTES)
+	if(disabilities & TOURETTES)
 		speech_problem_flag = 1
-		if ((prob(10) && paralysis <= 1))
+		if((prob(10) && paralysis <= 1))
 			Stun(10)
 			switch(rand(1, 3))
 				if(1)
@@ -108,12 +108,12 @@
 			animate(src, pixel_x = pixel_x + x_offset, pixel_y = pixel_y + y_offset, time = 1)
 			animate(pixel_x = initial(pixel_x) , pixel_y = initial(pixel_y), time = 1)
 
-	if (disabilities & NERVOUS)
+	if(disabilities & NERVOUS)
 		speech_problem_flag = 1
-		if (prob(10))
+		if(prob(10))
 			stuttering = max(10, stuttering)
 
-	if (getBrainLoss() >= 60 && stat != 2)
+	if(getBrainLoss() >= 60 && stat != 2)
 		speech_problem_flag = 1
 		if(prob(3))
 			var/list/s1 = list("IM A PONY NEEEEEEIIIIIIIIIGH",
@@ -174,13 +174,28 @@
 		if(!gene.block)
 			continue
 		if(gene.is_active(src))
-		/*	if (prob(10) && prob(gene.instability))
-				adjustCloneLoss(1) */
 			speech_problem_flag = 1
 			gene.OnMobLife(src)
+	if(gene_stability < 85)
+		var/instability = DEFAULT_GENE_STABILITY - gene_stability
+		if(prob(instability / 10))
+			adjustFireLoss(min(6, instability / 12))
+			to_chat(src, "<span class='danger'>You feel like your skin is burning and bubbling off!</span>")
+		if(gene_stability < 70)
+			if(prob(instability / 12))
+				adjustCloneLoss(min(5, instability / 15))
+				to_chat(src, "<span class='danger'>You feel as if your body is warping.</span>")
+			if(prob(instability / 10))
+				adjustToxLoss(min(6, instability / 12))
+				to_chat(src, "<span class='danger'>You feel weak and nauseous.</span>")
+			if(gene_stability < 40 && prob(1))
+				to_chat(src, "<span class='biggerdanger'>You feel incredibly sick... Something isn't right!</span>")
+				spawn(300)
+					if(gene_stability < 40)
+						gib()
 
 	if(!(species.flags & RADIMMUNE))
-		if (radiation)
+		if(radiation)
 
 			if(get_int_organ(/obj/item/organ/internal/nucleation/resonant_crystal))
 				var/rads = radiation/25
@@ -191,14 +206,14 @@
 					to_chat(src, "<span class='notice'>You feel relaxed.</span>")
 				return
 
-			if (radiation > 100)
+			if(radiation > 100)
 				radiation = 100
 				Weaken(10)
 				if(!lying)
 					to_chat(src, "<span class='alert'>You feel weak.</span>")
 					emote("collapse")
 
-			if (radiation < 0)
+			if(radiation < 0)
 				radiation = 0
 
 			else
@@ -693,10 +708,10 @@
 				update_inv_wear_suit()
 
 	// nutrition decrease
-	if (nutrition > 0 && stat != 2)
+	if(nutrition > 0 && stat != 2)
 		nutrition = max (0, nutrition - HUNGER_FACTOR)
 
-	if (nutrition > 450)
+	if(nutrition > 450)
 		if(overeatduration < 800) //capped so people don't take forever to unfat
 			overeatduration++
 
@@ -707,10 +722,10 @@
 			else
 				overeatduration -= 2
 
-	if (drowsyness)
+	if(drowsyness)
 		drowsyness--
 		eye_blurry = max(2, eye_blurry)
-		if (prob(5))
+		if(prob(5))
 			sleeping += 1
 			Paralyse(5)
 
@@ -756,7 +771,7 @@
 				alcohol_strength *= 5
 
 		if(alcohol_strength >= slur_start) //slurring
-			if (!slurring) slurring = 1
+			if(!slurring) slurring = 1
 			slurring = drunk
 		if(alcohol_strength >= brawl_start) //the drunken martial art
 			if(!istype(martial_art, /datum/martial_art/drunk_brawling))
@@ -766,7 +781,7 @@
 			if(istype(martial_art, /datum/martial_art/drunk_brawling))
 				martial_art.remove(src)
 		if(alcohol_strength >= confused_start && prob(33)) //confused walking
-			if (!confused) confused = 1
+			if(!confused) confused = 1
 			confused = max(confused+(3/sober_str),0)
 		if(alcohol_strength >= blur_start) //blurry eyes
 			eye_blurry = max(eye_blurry, 10/sober_str)
@@ -778,7 +793,7 @@
 			if(alcohol_strength >= pass_out)
 				Paralyse(5 / sober_str)
 				drowsyness = max(drowsyness, 30/sober_str)
-				if (L)
+				if(L)
 					L.take_damage(0.1, 1)
 				adjustToxLoss(0.1)
 		else //stuff only for synthetics
@@ -951,7 +966,7 @@
 /mob/living/carbon/human/handle_random_events()
 	// Puke if toxloss is too high
 	if(!stat)
-		if (getToxLoss() >= 45 && nutrition > 20)
+		if(getToxLoss() >= 45 && nutrition > 20)
 			lastpuke ++
 			if(lastpuke >= 25) // about 25 second delay I guess
 				Stun(5)
@@ -961,7 +976,7 @@
 				playsound(loc, 'sound/effects/splat.ogg', 50, 1)
 
 				var/turf/location = loc
-				if (istype(location, /turf/simulated))
+				if(istype(location, /turf/simulated))
 					location.add_vomit_floor(src, 1)
 
 				nutrition -= 20
@@ -1016,17 +1031,17 @@
 
 	if(shock_stage >=60)
 		if(shock_stage == 60) custom_emote(1,"falls limp.")
-		if (prob(2))
+		if(prob(2))
 			to_chat(src, "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!"))
 			Weaken(20)
 
 	if(shock_stage >= 80)
-		if (prob(5))
+		if(prob(5))
 			to_chat(src, "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!"))
 			Weaken(20)
 
 	if(shock_stage >= 120)
-		if (prob(2))
+		if(prob(2))
 			to_chat(src, "<font color='red'><b>"+pick("You black out!", "You feel like you could die any moment now.", "You're about to lose consciousness."))
 			Paralyse(5)
 
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 840b500de01..552daf2ba48 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -47,21 +47,21 @@
 		return 1
 
 	//These only pertain to common. Languages are handled by mob/say_understands()
-	if (!speaking)
-		if (istype(other, /mob/living/simple_animal/diona))
+	if(!speaking)
+		if(istype(other, /mob/living/simple_animal/diona))
 			if(other.languages.len >= 2) //They've sucked down some blood and can speak common now.
 				return 1
-		if (istype(other, /mob/living/silicon))
+		if(istype(other, /mob/living/silicon))
 			return 1
-		if (istype(other, /mob/living/simple_animal/bot))
+		if(istype(other, /mob/living/simple_animal/bot))
 			return 1
-		if (istype(other, /mob/living/carbon/brain))
+		if(istype(other, /mob/living/carbon/brain))
 			return 1
-		if (istype(other, /mob/living/carbon/slime))
+		if(istype(other, /mob/living/carbon/slime))
 			return 1
 
 	//This is already covered by mob/say_understands()
-	//if (istype(other, /mob/living/simple_animal))
+	//if(istype(other, /mob/living/simple_animal))
 	//	if((other.universal_speak && !speaking) || src.universal_speak || src.universal_understand)
 	//		return 1
 	//	return 0
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index 922810e758d..d5a0125f052 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -66,7 +66,7 @@
 	item_color = "golem"
 	has_sensor = 0
 	flags = ABSTRACT | NODROP
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/golem
 	name = "adamantine shell"
@@ -75,7 +75,8 @@
 	item_state = "golem"
 	body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES
-	flags = ONESIZEFITSALL | ABSTRACT | NODROP | THICKMATERIAL
+	flags = ABSTRACT | NODROP | THICKMATERIAL
+	flags_size = ONESIZEFITSALL
 	armor = list(melee = 55, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/shoes/golem
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 003e1969d33..40fcfb738b8 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -125,7 +125,7 @@
 	H.equip_or_collect(new/obj/item/weapon/tank/plasma/plasmaman(H), tank_slot) // Bigger plasma tank from Raggy.
 	to_chat(H, "<span class='notice'>You are now running on plasma internals from the [H.s_store] in your [tank_slot_name].  You must breathe plasma in order to survive, and are extremely flammable.</span>")
 	H.internal = H.get_item_by_slot(tank_slot)
-	if (H.internals)
+	if(H.internals)
 		H.internals.icon_state = "internal1"
 
 // Plasmamen are so fucking different that they need their own proc.
diff --git a/code/modules/mob/living/carbon/human/species/shadow.dm b/code/modules/mob/living/carbon/human/species/shadow.dm
index 55701b52d1c..fa7dadfebcb 100644
--- a/code/modules/mob/living/carbon/human/species/shadow.dm
+++ b/code/modules/mob/living/carbon/human/species/shadow.dm
@@ -33,5 +33,5 @@
 
 		if(light_amount > 2) //if there's enough light, start dying
 			H.take_overall_damage(1,1)
-		else if (light_amount < 2) //heal in the dark
+		else if(light_amount < 2) //heal in the dark
 			H.heal_overall_damage(1,1)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index ad0d5b18c61..ee889a09bab 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -393,7 +393,7 @@
 	return
 
 /datum/species/proc/remove_abilities(var/mob/living/carbon/human/H)
-	for (var/proc/ability in species_abilities)
+	for(var/proc/ability in species_abilities)
 		H.verbs -= ability
 	return
 
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index 626412f79d8..589b43433e0 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -364,7 +364,7 @@
 		H.equip_or_collect(new /obj/item/weapon/tank/emergency_oxygen/vox(H), slot_l_hand)
 	to_chat(H, "<span class='notice'>You are now running on nitrogen internals from the [H.l_hand] in your hand. Your species finds oxygen toxic, so you must breathe nitrogen only.</span>")
 	H.internal = H.l_hand
-	if (H.internals)
+	if(H.internals)
 		H.internals.icon_state = "internal1"
 
 /datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 628ea630555..a9ff3a2c025 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -600,7 +600,7 @@ var/global/list/damage_icon_parts = list()
 		var/image/standing	= image("icon_state" = "[t_color]_s")
 
 		if(FAT in mutations)
-			if(w_uniform.flags&ONESIZEFITSALL)
+			if(w_uniform.flags_size & ONESIZEFITSALL)
 				standing.icon	= 'icons/mob/uniform_fat.dmi'
 			else
 				to_chat(src, "\red You burst out of \the [w_uniform]!")
@@ -623,7 +623,12 @@ var/global/list/damage_icon_parts = list()
 			for(var/obj/item/clothing/accessory/A in w_uniform:accessories)
 				var/tie_color = A.item_color
 				if(!tie_color) tie_color = A.icon_state
-				standing.overlays	+= image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]")
+				if(A.icon_override)
+					standing.overlays += image("icon" = A.icon_override, "icon_state" = "[A.icon_state]")
+				else if(A.sprite_sheets && A.sprite_sheets[species.name])
+					standing.overlays += image("icon" = A.sprite_sheets[species.name], "icon_state" = "[A.icon_state]")
+				else
+					standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]")
 
 		overlays_standing[UNIFORM_LAYER]	= standing
 	else
@@ -632,10 +637,10 @@ var/global/list/damage_icon_parts = list()
 		for( var/obj/item/thing in list(r_store, l_store, wear_id, wear_pda, belt) )						//
 			if(thing)																			//
 				unEquip(thing)																	//
-				if (client)																		//
+				if(client)																		//
 					client.screen -= thing														//
 																								//
-				if (thing)																		//
+				if(thing)																		//
 					thing.loc = loc																//
 					thing.dropped(src)															//
 					thing.layer = initial(thing.layer)
@@ -889,7 +894,6 @@ var/global/list/damage_icon_parts = list()
 
 
 /mob/living/carbon/human/update_inv_wear_suit(var/update_icons=1)
-
 	if(client && hud_used)
 		var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_suit]
 		if(inv)
@@ -907,7 +911,7 @@ var/global/list/damage_icon_parts = list()
 		else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
 			standing = image("icon" = wear_suit.sprite_sheets[species.name], "icon_state" = "[wear_suit.icon_state]")
 		else if(FAT in mutations)
-			if(wear_suit.flags&ONESIZEFITSALL)
+			if(wear_suit.flags_size & ONESIZEFITSALL)
 				standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]")
 			else
 				to_chat(src, "\red You burst out of \the [wear_suit]!")
@@ -1257,13 +1261,25 @@ var/global/list/damage_icon_parts = list()
 
 //Adds a collar overlay above the helmet layer if the suit has one
 //	Suit needs an identically named sprite in icons/mob/collar.dmi
+//  For suits with species_fit and sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/species/[species_name_here]/collar.dmi.
 /mob/living/carbon/human/proc/update_collar(var/update_icons=1)
 	var/icon/C = new('icons/mob/collar.dmi')
 	var/image/standing = null
 
 	if(wear_suit)
-		if(wear_suit.icon_state in C.IconStates())
-			standing = image("icon" = C, "icon_state" = "[wear_suit.icon_state]")
+		if(wear_suit.icon_override)
+			var/icon_path = "[wear_suit.icon_override]"
+			icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty) so there won't be an issue.
+			var/icon/icon_file = new(icon_path)
+			standing = image("icon" = icon_file, "icon_state" = "[wear_suit.icon_state]")
+		else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
+			var/icon_path = "[wear_suit.sprite_sheets[species.name]]"
+			icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty) so there won't be an issue.
+			var/icon/icon_file = new(icon_path)
+			standing = image("icon" = icon_file, "icon_state" = "[wear_suit.icon_state]")
+		else
+			if(wear_suit.icon_state in C.IconStates())
+				standing = image("icon" = C, "icon_state" = "[wear_suit.icon_state]")
 
 	overlays_standing[COLLAR_LAYER]	= standing
 
@@ -1274,7 +1290,7 @@ var/global/list/damage_icon_parts = list()
 /mob/living/carbon/human/proc/generate_head_icon()
 //gender no longer matters for the mouth, although there should probably be seperate base head icons.
 //	var/g = "m"
-//	if (gender == FEMALE)	g = "f"
+//	if(gender == FEMALE)	g = "f"
 	var/obj/item/organ/external/head/H = get_organ("head")
 	//base icons
 	var/icon/face_lying		= new /icon('icons/mob/human_face.dmi',"bald_l")
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index c26508b1374..671e289ee21 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -448,7 +448,7 @@
 
 /mob/living/carbon/handle_hud_icons_health()
 	if(healths)
-		if (stat != DEAD)
+		if(stat != DEAD)
 			switch(health)
 				if(100 to INFINITY)
 					healths.icon_state = "health0"
diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm
index 43195db4f11..b1c83a1e7c1 100644
--- a/code/modules/mob/living/carbon/shock.dm
+++ b/code/modules/mob/living/carbon/shock.dm
@@ -23,7 +23,7 @@
 	if(istype(src,/mob/living/carbon/human))
 		var/mob/living/carbon/human/M = src
 		for(var/obj/item/organ/external/organ in M.organs)
-			if (!organ)
+			if(!organ)
 				continue
 			else if(organ.status & ORGAN_BROKEN || organ.open)
 				src.traumatic_shock += 15
diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm
new file mode 100644
index 00000000000..c77d5e24a65
--- /dev/null
+++ b/code/modules/mob/living/carbon/slime/emote.dm
@@ -0,0 +1,75 @@
+/mob/living/carbon/slime/emote(var/act, var/m_type=1, var/message = null)
+	if(findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		//param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
+	act = lowertext(act)
+	switch(act) //Alphabetical please
+		if("me")
+			if(silent)
+				return
+			if(src.client)
+				if(client.prefs.muted & MUTE_IC)
+					to_chat(src, "\red You cannot send IC messages (muted).")
+					return
+				if(src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+				if(stat)
+					return
+				if(!(message))
+					return
+				return custom_emote(m_type, message)
+		if("bounce")
+			message = "<B>The [src.name]</B> bounces in place."
+			m_type = 1
+
+		if("custom")
+			return custom_emote(m_type, message)
+
+		if("jiggle")
+			message = "<B>The [src.name]</B> jiggles!"
+			m_type = 1
+
+		if("light")
+			message = "<B>The [src.name]</B> lights up for a bit, then stops."
+			m_type = 1
+
+		if("moan")
+			message = "<B>The [src.name]</B> moans."
+			m_type = 2
+
+		if("shiver")
+			message = "<B>The [src.name]</B> shivers."
+			m_type = 2
+
+		if("sway")
+			message = "<B>The [src.name]</B> sways around dizzily."
+			m_type = 1
+
+		if("twitch")
+			message = "<B>The [src.name]</B> twitches."
+			m_type = 1
+
+		if("vibrate")
+			message = "<B>The [src.name]</B> vibrates!"
+			m_type = 1
+
+		if("help") //This is an exception
+			to_chat(src, "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate")
+
+		else
+			to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
+	if((message && src.stat == 0))
+		if(m_type & 1)
+			for(var/mob/O in viewers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(703)
+		else
+			for(var/mob/O in hearers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(746)
+	return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/slime/examine.dm b/code/modules/mob/living/carbon/slime/examine.dm
index 7d2e2d5e62c..4dd67695e2a 100644
--- a/code/modules/mob/living/carbon/slime/examine.dm
+++ b/code/modules/mob/living/carbon/slime/examine.dm
@@ -1,12 +1,13 @@
 /mob/living/carbon/slime/examine(mob/user)
+	to_chat(user, "<span class='info'>*---------*</span>")
 	..(user)
-	var/msg = ""
-	if (src.stat == DEAD)
+	var/msg = "<span class='info'>"
+	if(src.stat == DEAD)
 		msg += "<span class='deadsay'>It is limp and unresponsive.</span>\n"
 	else
-		if (src.getBruteLoss())
+		if(src.getBruteLoss())
 			msg += "<span class='warning'>"
-			if (src.getBruteLoss() < 40)
+			if(src.getBruteLoss() < 40)
 				msg += "It has some punctures in its flesh!"
 			else
 				msg += "<B>It has severe punctures and tears in its flesh!</B>"
diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm
index 6dce9aba656..d8a89b4d49f 100644
--- a/code/modules/mob/living/carbon/slime/life.dm
+++ b/code/modules/mob/living/carbon/slime/life.dm
@@ -9,7 +9,7 @@
 	if(..())
 		handle_nutrition()
 		handle_targets()
-		if (!ckey)
+		if(!ckey)
 			handle_speech_and_mood()
 
 /mob/living/carbon/slime/proc/AIprocess()  // the master AI process
@@ -17,9 +17,9 @@
 	if(AIproc || stat == DEAD || client) return
 
 	var/hungry = 0
-	if (nutrition < get_starve_nutrition())
+	if(nutrition < get_starve_nutrition())
 		hungry = 2
-	else if (nutrition < get_grow_nutrition() && prob(25) || nutrition < get_hunger_nutrition())
+	else if(nutrition < get_grow_nutrition() && prob(25) || nutrition < get_hunger_nutrition())
 		hungry = 1
 
 	AIproc = 1
@@ -183,19 +183,19 @@
 		adjustCloneLoss(-1)
 		adjustBruteLoss(-1)
 
-	if (src.stat == DEAD)
+	if(src.stat == DEAD)
 		src.lying = 1
 		src.blinded = 1
 	else
-		if (src.paralysis || src.stunned || src.weakened || (status_flags && FAKEDEATH)) //Stunned etc.
-			if (src.stunned > 0)
+		if(src.paralysis || src.stunned || src.weakened || (status_flags && FAKEDEATH)) //Stunned etc.
+			if(src.stunned > 0)
 				AdjustStunned(-1)
 				src.stat = 0
-			if (src.weakened > 0)
+			if(src.weakened > 0)
 				AdjustWeakened(-1)
 				src.lying = 0
 				src.stat = 0
-			if (src.paralysis > 0)
+			if(src.paralysis > 0)
 				AdjustParalysis(-1)
 				src.blinded = 0
 				src.lying = 0
@@ -205,34 +205,34 @@
 			src.lying = 0
 			src.stat = 0
 
-	if (src.stuttering) src.stuttering = 0
+	if(src.stuttering) src.stuttering = 0
 
-	if (src.eye_blind)
+	if(src.eye_blind)
 		src.eye_blind = 0
 		src.blinded = 1
 
-	if (src.ear_deaf > 0) src.ear_deaf = 0
-	if (src.ear_damage < 25)
+	if(src.ear_deaf > 0) src.ear_deaf = 0
+	if(src.ear_damage < 25)
 		src.ear_damage = 0
 
 	src.density = !( src.lying )
 
-	if (src.sdisabilities & BLIND)
+	if(src.sdisabilities & BLIND)
 		src.blinded = 1
-	if (src.sdisabilities & DEAF)
+	if(src.sdisabilities & DEAF)
 		src.ear_deaf = 1
 
-	if (src.eye_blurry > 0)
+	if(src.eye_blurry > 0)
 		src.eye_blurry = 0
 
-	if (src.druggy > 0)
+	if(src.druggy > 0)
 		src.druggy = 0
 
 	return 1
 
 /mob/living/carbon/slime/proc/handle_nutrition()
 
-	if (prob(15))
+	if(prob(15))
 		nutrition -= 1 + is_adult
 
 	if(nutrition <= 0)
@@ -240,7 +240,7 @@
 		if(prob(75))
 			adjustToxLoss(rand(0,5))
 
-	else if (nutrition >= get_grow_nutrition() && amount_grown < 10)
+	else if(nutrition >= get_grow_nutrition() && amount_grown < 10)
 		nutrition -= 20
 		amount_grown++
 
@@ -278,7 +278,7 @@
 
 		if(Target)
 			--target_patience
-			if (target_patience <= 0 || SStun || Discipline || attacked) // Tired of chasing or something draws out attention
+			if(target_patience <= 0 || SStun || Discipline || attacked) // Tired of chasing or something draws out attention
 				target_patience = 0
 				Target = null
 
@@ -286,9 +286,9 @@
 
 		var/hungry = 0 // determines if the slime is hungry
 
-		if (nutrition < get_starve_nutrition())
+		if(nutrition < get_starve_nutrition())
 			hungry = 2
-		else if (nutrition < get_grow_nutrition() && prob(25) || nutrition < get_hunger_nutrition())
+		else if(nutrition < get_grow_nutrition() && prob(25) || nutrition < get_hunger_nutrition())
 			hungry = 1
 
 		if(hungry == 2 && !client) // if a slime is starving, it starts losing its friends
@@ -340,26 +340,26 @@
 								Target = C
 								break
 
-			if (Target)
+			if(Target)
 				target_patience = rand(5,7)
-				if (is_adult)
+				if(is_adult)
 					target_patience += 3
 
 		if(!Target) // If we have no target, we are wandering or following orders
-			if (Leader)
-				if (holding_still)
+			if(Leader)
+				if(holding_still)
 					holding_still = max(holding_still - 1, 0)
 				else if(canmove && isturf(loc))
 					step_to(src, Leader)
 
 			else if(hungry)
-				if (holding_still)
+				if(holding_still)
 					holding_still = max(holding_still - hungry, 0)
 				else if(canmove && isturf(loc) && prob(50))
 					step(src, pick(cardinal))
 
 			else
-				if (holding_still)
+				if(holding_still)
 					holding_still = max(holding_still - 1, 0)
 				else if(canmove && isturf(loc) && prob(33))
 					step(src, pick(cardinal))
@@ -370,85 +370,85 @@
 /mob/living/carbon/slime/proc/handle_speech_and_mood()
 	//Mood starts here
 	var/newmood = ""
-	if (rabid || attacked) newmood = "angry"
-	else if (Target) newmood = "mischevous"
+	if(rabid || attacked) newmood = "angry"
+	else if(Target) newmood = "mischevous"
 
-	if (!newmood)
-		if (Discipline && prob(25))
+	if(!newmood)
+		if(Discipline && prob(25))
 			newmood = "pout"
-		else if (prob(1))
+		else if(prob(1))
 			newmood = pick("sad", ":3", "pout")
 
-	if ((mood == "sad" || mood == ":3" || mood == "pout") && !newmood)
-		if (prob(75)) newmood = mood
+	if((mood == "sad" || mood == ":3" || mood == "pout") && !newmood)
+		if(prob(75)) newmood = mood
 
-	if (newmood != mood) // This is so we don't redraw them every time
+	if(newmood != mood) // This is so we don't redraw them every time
 		mood = newmood
 		regenerate_icons()
 
 	//Speech understanding starts here
 	var/to_say
-	if (speech_buffer.len > 0)
+	if(speech_buffer.len > 0)
 		var/who = speech_buffer[1] // Who said it?
 		var/phrase = speech_buffer[2] // What did they say?
-		if ((findtext(phrase, num2text(number)) || findtext(phrase, "slimes"))) // Talking to us
-			if (findtext(phrase, "hello") || findtext(phrase, "hi"))
+		if((findtext(phrase, num2text(number)) || findtext(phrase, "slimes"))) // Talking to us
+			if(findtext(phrase, "hello") || findtext(phrase, "hi"))
 				to_say = pick("Hello...", "Hi...")
-			else if (findtext(phrase, "follow"))
-				if (Leader)
-					if (Leader == who) // Already following him
+			else if(findtext(phrase, "follow"))
+				if(Leader)
+					if(Leader == who) // Already following him
 						to_say = pick("Yes...", "Lead...", "Following...")
-					else if (Friends[who] > Friends[Leader]) // VIVA
+					else if(Friends[who] > Friends[Leader]) // VIVA
 						Leader = who
 						to_say = "Yes... I follow [who]..."
 					else
 						to_say = "No... I follow [Leader]..."
 				else
-					if (Friends[who] > 2)
+					if(Friends[who] > 2)
 						Leader = who
 						to_say = "I follow..."
 					else // Not friendly enough
 						to_say = pick("No...", "I won't follow...")
-			else if (findtext(phrase, "stop"))
-				if (Victim) // We are asked to stop feeding
-					if (Friends[who] > 4)
+			else if(findtext(phrase, "stop"))
+				if(Victim) // We are asked to stop feeding
+					if(Friends[who] > 4)
 						Victim = null
 						Target = null
-						if (Friends[who] < 7)
+						if(Friends[who] < 7)
 							--Friends[who]
 							to_say = "Grrr..." // I'm angry but I do it
 						else
 							to_say = "Fine..."
-				else if (Target) // We are asked to stop chasing
-					if (Friends[who] > 3)
+				else if(Target) // We are asked to stop chasing
+					if(Friends[who] > 3)
 						Target = null
-						if (Friends[who] < 6)
+						if(Friends[who] < 6)
 							--Friends[who]
 							to_say = "Grrr..." // I'm angry but I do it
 						else
 							to_say = "Fine..."
-				else if (Leader) // We are asked to stop following
-					if (Leader == who)
+				else if(Leader) // We are asked to stop following
+					if(Leader == who)
 						to_say = "Yes... I'll stay..."
 						Leader = null
 					else
-						if (Friends[who] > Friends[Leader])
+						if(Friends[who] > Friends[Leader])
 							Leader = null
 							to_say = "Yes... I'll stop..."
 						else
 							to_say = "No... I'll keep following..."
-			else if (findtext(phrase, "stay"))
-				if (Leader)
-					if (Leader == who)
+			else if(findtext(phrase, "stay"))
+				if(Leader)
+					if(Leader == who)
 						holding_still = Friends[who] * 10
 						to_say = "Yes... Staying..."
-					else if (Friends[who] > Friends[Leader])
+					else if(Friends[who] > Friends[Leader])
 						holding_still = (Friends[who] - Friends[Leader]) * 10
 						to_say = "Yes... Staying..."
 					else
 						to_say = "No... I'll keep following..."
 				else
-					if (Friends[who] > 2)
+					if(Friends[who] > 2)
 						holding_still = Friends[who] * 10
 						to_say = "Yes... Staying..."
 					else
@@ -456,7 +456,7 @@
 		speech_buffer = list()
 
 	//Speech starts here
-	if (to_say)
+	if(to_say)
 		say (to_say)
 	else if(prob(1))
 		emote(pick("bounce","sway","light","vibrate","jiggle"))
@@ -465,83 +465,83 @@
 		var/slimes_near = -1 // Don't count myself
 		var/dead_slimes = 0
 		var/friends_near = list()
-		for (var/mob/living/carbon/M in view(7,src))
-			if (isslime(M))
+		for(var/mob/living/carbon/M in view(7,src))
+			if(isslime(M))
 				++slimes_near
-				if (M.stat == DEAD)
+				if(M.stat == DEAD)
 					++dead_slimes
-			if (M in Friends)
+			if(M in Friends)
 				t += 20
 				friends_near += M
-		if (nutrition < get_hunger_nutrition()) t += 10
-		if (nutrition < get_starve_nutrition()) t += 10
-		if (prob(2) && prob(t))
+		if(nutrition < get_hunger_nutrition()) t += 10
+		if(nutrition < get_starve_nutrition()) t += 10
+		if(prob(2) && prob(t))
 			var/phrases = list()
-			if (Target) phrases += "[Target]... looks tasty..."
-			if (nutrition < get_starve_nutrition())
+			if(Target) phrases += "[Target]... looks tasty..."
+			if(nutrition < get_starve_nutrition())
 				phrases += "So... hungry..."
 				phrases += "Very... hungry..."
 				phrases += "Need... food..."
 				phrases += "Must... eat..."
-			else if (nutrition < get_hunger_nutrition())
+			else if(nutrition < get_hunger_nutrition())
 				phrases += "Hungry..."
 				phrases += "Where is the food?"
 				phrases += "I want to eat..."
 			phrases += "Rawr..."
 			phrases += "Blop..."
 			phrases += "Blorble..."
-			if (rabid || attacked)
+			if(rabid || attacked)
 				phrases += "Hrr..."
 				phrases += "Nhuu..."
 				phrases += "Unn..."
-			if (mood == ":3")
+			if(mood == ":3")
 				phrases += "Purr..."
-			if (attacked)
+			if(attacked)
 				phrases += "Grrr..."
-			if (getToxLoss() > 30)
+			if(getToxLoss() > 30)
 				phrases += "Cold..."
-			if (getToxLoss() > 60)
+			if(getToxLoss() > 60)
 				phrases += "So... cold..."
 				phrases += "Very... cold..."
-			if (getToxLoss() > 90)
+			if(getToxLoss() > 90)
 				phrases += "..."
 				phrases += "C... c..."
-			if (Victim)
+			if(Victim)
 				phrases += "Nom..."
 				phrases += "Tasty..."
-			if (powerlevel > 3) phrases += "Bzzz..."
-			if (powerlevel > 5) phrases += "Zap..."
-			if (powerlevel > 8) phrases += "Zap... Bzz..."
-			if (mood == "sad") phrases += "Bored..."
-			if (slimes_near) phrases += "Brother..."
-			if (slimes_near > 1) phrases += "Brothers..."
-			if (dead_slimes) phrases += "What happened?"
-			if (!slimes_near)
+			if(powerlevel > 3) phrases += "Bzzz..."
+			if(powerlevel > 5) phrases += "Zap..."
+			if(powerlevel > 8) phrases += "Zap... Bzz..."
+			if(mood == "sad") phrases += "Bored..."
+			if(slimes_near) phrases += "Brother..."
+			if(slimes_near > 1) phrases += "Brothers..."
+			if(dead_slimes) phrases += "What happened?"
+			if(!slimes_near)
 				phrases += "Lonely..."
-			for (var/M in friends_near)
+			for(var/M in friends_near)
 				phrases += "[M]... friend..."
-				if (nutrition < get_hunger_nutrition())
+				if(nutrition < get_hunger_nutrition())
 					phrases += "[M]... feed me..."
 			say (pick(phrases))
 
 /mob/living/carbon/slime/proc/get_max_nutrition() // Can't go above it
-	if (is_adult) return 1200
+	if(is_adult) return 1200
 	else return 1000
 
 /mob/living/carbon/slime/proc/get_grow_nutrition() // Above it we grow, below it we can eat
-	if (is_adult) return 1000
+	if(is_adult) return 1000
 	else return 800
 
 /mob/living/carbon/slime/proc/get_hunger_nutrition() // Below it we will always eat
-	if (is_adult) return 600
+	if(is_adult) return 600
 	else return 500
 
 /mob/living/carbon/slime/proc/get_starve_nutrition() // Below it we will eat before everything else
-	if (is_adult) return 300
+	if(is_adult) return 300
 	else return 200
 
 /mob/living/carbon/slime/proc/will_hunt(var/hunger = -1) // Check for being stopped from feeding and chasing
-	if (hunger == 2 || rabid || attacked) return 1
-	if (Leader) return 0
-	if (holding_still) return 0
+	if(hunger == 2 || rabid || attacked) return 1
+	if(Leader) return 0
+	if(holding_still) return 0
 	return 1
diff --git a/code/modules/mob/living/carbon/slime/say.dm b/code/modules/mob/living/carbon/slime/say.dm
index 50311ace49e..6d47231792b 100644
--- a/code/modules/mob/living/carbon/slime/say.dm
+++ b/code/modules/mob/living/carbon/slime/say.dm
@@ -2,27 +2,27 @@
 	var/verb = "telepathically chirps"
 	var/ending = copytext(text, length(text))
 
-	if (ending == "?")
+	if(ending == "?")
 		verb = "telepathically asks"
-	else if (ending == "!")
+	else if(ending == "!")
 		verb = "telepathically cries"
 
 	return verb
 
 /mob/living/carbon/slime/say_understands(var/other)
-	if (istype(other, /mob/living/carbon/slime))
+	if(istype(other, /mob/living/carbon/slime))
 		return 1
 	return ..()
 
 /mob/living/carbon/slime/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "", var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol)
-	if (speaker in Friends)
+	if(speaker in Friends)
 		speech_buffer = list()
 		speech_buffer.Add(speaker)
 		speech_buffer.Add(lowertext(html_decode(message)))
 	..()
 
 /mob/living/carbon/slime/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="", var/atom/follow_target)
-	if (speaker in Friends)
+	if(speaker in Friends)
 		speech_buffer = list()
 		speech_buffer.Add(speaker)
 		speech_buffer.Add(lowertext(html_decode(message)))
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index 9ed50676e75..634e9865e45 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -75,12 +75,12 @@
 /mob/living/carbon/slime/regenerate_icons()
 	icon_state = "[colour] [is_adult ? "adult" : "baby"] slime"
 	overlays.len = 0
-	if (mood)
+	if(mood)
 		overlays += image('icons/mob/slimes.dmi', icon_state = "aslime-[mood]")
 	..()
 
 /mob/living/carbon/slime/movement_delay()
-	if (bodytemperature >= 330.23) // 135 F
+	if(bodytemperature >= 330.23) // 135 F
 		return -1	// slimes become supercharged at high temperatures
 
 	var/tally = 0
@@ -88,7 +88,7 @@
 	var/health_deficiency = (100 - health)
 	if(health_deficiency >= 45) tally += (health_deficiency / 25)
 
-	if (bodytemperature < 183.222)
+	if(bodytemperature < 183.222)
 		tally += (283.222 - bodytemperature) / 10 * 1.75
 
 	if(reagents)
@@ -104,7 +104,7 @@
 	return tally + config.slime_delay
 
 /mob/living/carbon/slime/Bump(atom/movable/AM as mob|obj, yes)
-	if ((!(yes) || now_pushing))
+	if((!(yes) || now_pushing))
 		return
 	now_pushing = 1
 
@@ -121,7 +121,7 @@
 			if(prob(probab))
 				if(istype(AM, /obj/structure/window) || istype(AM, /obj/structure/grille))
 					if(nutrition <= get_hunger_nutrition() && !Atkcool)
-						if (is_adult || prob(5))
+						if(is_adult || prob(5))
 							AM.attack_slime(src)
 							spawn()
 								Atkcool = 1
@@ -143,13 +143,13 @@
 
 	now_pushing = 0
 	..()
-	if (!istype(AM, /atom/movable))
+	if(!istype(AM, /atom/movable))
 		return
-	if (!( now_pushing ))
+	if(!( now_pushing ))
 		now_pushing = 1
-		if (!( AM.anchored ))
+		if(!( AM.anchored ))
 			var/t = get_dir(src, AM)
-			if (istype(AM, /obj/structure/window))
+			if(istype(AM, /obj/structure/window))
 				if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
 					for(var/obj/structure/window/win in get_step(AM,t))
 						now_pushing = 0
@@ -169,7 +169,7 @@
 	else
 		stat(null, "Health: [round((health / 150) * 100)]%")
 
-	if (client.statpanel == "Status")
+	if(client.statpanel == "Status")
 		stat(null, "Nutrition: [nutrition]/[get_max_nutrition()]")
 		if(amount_grown >= 10)
 			if(is_adult)
@@ -197,12 +197,12 @@
 
 	var/b_loss = null
 	var/f_loss = null
-	switch (severity)
-		if (1.0)
+	switch(severity)
+		if(1.0)
 			qdel(src)
 			return
 
-		if (2.0)
+		if(2.0)
 
 			b_loss += 60
 			f_loss += 60
@@ -231,13 +231,13 @@
 	return
 
 /mob/living/carbon/slime/attack_slime(mob/living/carbon/slime/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (Victim) return // can't attack while eating!
+	if(Victim) return // can't attack while eating!
 
-	if (health > -100)
+	if(health > -100)
 
 		M.do_attack_animation(src)
 		visible_message("<span class='danger'> The [M.name] has glomped [src]!</span>", \
@@ -292,11 +292,11 @@
 				adjustBruteLoss(damage)
 
 /mob/living/carbon/slime/attack_hand(mob/living/carbon/human/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
@@ -377,10 +377,10 @@
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 			help_shake_act(M)
 
-		if (I_GRAB)
+		if(I_GRAB)
 			grabbedby(M)
 
 		else
@@ -388,8 +388,8 @@
 			var/damage = rand(1, 9)
 
 			attacked += 10
-			if (prob(90))
-				if (HULK in M.mutations)
+			if(prob(90))
+				if(HULK in M.mutations)
 					damage += 15
 					if(Victim || Target)
 						Victim = null
@@ -418,25 +418,25 @@
 
 
 /mob/living/carbon/slime/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
 	switch(M.a_intent)
-		if (I_HELP)
+		if(I_HELP)
 			visible_message("<span class='notice'>[M] caresses [src] with its scythe like arm.</span>")
 
-		if (I_HARM)
+		if(I_HARM)
 			M.do_attack_animation(src)
-			if (prob(95))
+			if(prob(95))
 				attacked += 10
 				playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
 				var/damage = rand(15, 30)
-				if (damage >= 25)
+				if(damage >= 25)
 					damage = rand(20, 40)
 					visible_message("<span class='danger'>[M] has attacked [name]!</span>", \
 							"<span class='userdanger'>[M] has attacked [name]!</span>")
@@ -450,10 +450,10 @@
 				visible_message("<span class='danger'>[M] has attempted to lunge at [name]!</span>", \
 						"<span class='userdanger'>[M] has attempted to lunge at [name]!</span>")
 
-		if (I_GRAB)
+		if(I_GRAB)
 			grabbedby(M)
 
-		if (I_DISARM)
+		if(I_DISARM)
 			M.do_attack_animation(src)
 			playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
 			var/damage = 5
@@ -499,7 +499,7 @@
 				if(S.next_step(user, src))
 					return 1
 	if(istype(W,/obj/item/stack/sheet/mineral/plasma)) //Lets you feed slimes plasma.
-		if (user in Friends)
+		if(user in Friends)
 			++Friends[user]
 		else
 			Friends[user] = 1
@@ -580,8 +580,8 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 
 /mob/living/carbon/slime/proc/apply_water()
 	adjustToxLoss(rand(15,20))
-	if (!client)
-		if (Target) // Like cats
+	if(!client)
+		if(Target) // Like cats
 			Target = null
 			++Discipline
 	return
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 82f865621da..1bdc8e9eb57 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -95,7 +95,7 @@
 		if(paralysis)
 			stat = UNCONSCIOUS
 
-		else if (status_flags & FAKEDEATH)
+		else if(status_flags & FAKEDEATH)
 			stat = UNCONSCIOUS
 
 		else
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index bd360456009..4e2007872a2 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -55,7 +55,7 @@
 
 /mob/living/verb/succumb()
 	set hidden = 1
-	if (InCritical())
+	if(InCritical())
 		attack_log += "[src] has ["succumbed to death"] with [round(health, 0.1)] points of health!"
 		adjustOxyLoss(health - config.health_threshold_dead)
 		updatehealth()
@@ -271,7 +271,7 @@
 /mob/living/proc/get_organ_target()
 	var/mob/shooter = src
 	var/t = shooter:zone_sel.selecting
-	if ((t in list( "eyes", "mouth" )))
+	if((t in list( "eyes", "mouth" )))
 		t = "head"
 	var/obj/item/organ/external/def_zone = ran_zone(t)
 	return def_zone
@@ -323,12 +323,12 @@
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
 
-		if (C.handcuffed && !initial(C.handcuffed))
+		if(C.handcuffed && !initial(C.handcuffed))
 			C.unEquip(C.handcuffed)
 		C.handcuffed = initial(C.handcuffed)
 		C.update_handcuffed()
 
-		if (C.legcuffed && !initial(C.legcuffed))
+		if(C.legcuffed && !initial(C.legcuffed))
 			C.unEquip(C.legcuffed)
 		C.legcuffed = initial(C.legcuffed)
 		C.update_inv_legcuffed()
@@ -440,26 +440,26 @@
 	return
 
 /mob/living/Move(atom/newloc, direct)
-	if (buckled && buckled.loc != newloc) //not updating position
-		if (!buckled.anchored)
+	if(buckled && buckled.loc != newloc) //not updating position
+		if(!buckled.anchored)
 			return buckled.Move(newloc, direct)
 		else
 			return 0
 
-	if (restrained())
+	if(restrained())
 		stop_pulling()
 
 
 	var/t7 = 1
-	if (restrained())
+	if(restrained())
 		for(var/mob/living/M in range(src, 1))
-			if ((M.pulling == src && M.stat == 0 && !( M.restrained() )))
+			if((M.pulling == src && M.stat == 0 && !( M.restrained() )))
 				t7 = null
 	if(t7 && pulling && (get_dist(src, pulling) <= 1 || pulling.loc == loc))
 		var/turf/T = loc
 		. = ..()
 
-		if (pulling && pulling.loc)
+		if(pulling && pulling.loc)
 			if(!( isturf(pulling.loc) ))
 				stop_pulling()
 				return
@@ -473,46 +473,46 @@
 			stop_pulling()
 			return
 
-		if (!restrained())
+		if(!restrained())
 			var/diag = get_dir(src, pulling)
-			if ((diag - 1) & diag)
+			if((diag - 1) & diag)
 			else
 				diag = null
-			if ((get_dist(src, pulling) > 1 || diag))
-				if (isliving(pulling))
+			if((get_dist(src, pulling) > 1 || diag))
+				if(isliving(pulling))
 					var/mob/living/M = pulling
 					var/ok = 1
-					if (locate(/obj/item/weapon/grab, M.grabbed_by))
-						if (prob(75))
+					if(locate(/obj/item/weapon/grab, M.grabbed_by))
+						if(prob(75))
 							var/obj/item/weapon/grab/G = pick(M.grabbed_by)
-							if (istype(G, /obj/item/weapon/grab))
+							if(istype(G, /obj/item/weapon/grab))
 								for(var/mob/O in viewers(M, null))
 									O.show_message(text("\red [] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1)
 								//G = null
 								qdel(G)
 						else
 							ok = 0
-						if (locate(/obj/item/weapon/grab, M.grabbed_by.len))
+						if(locate(/obj/item/weapon/grab, M.grabbed_by.len))
 							ok = 0
-					if (ok)
+					if(ok)
 						var/atom/movable/t = M.pulling
 						M.stop_pulling()
 
-						if (M.lying && (prob(M.getBruteLoss() / 6)))
+						if(M.lying && (prob(M.getBruteLoss() / 6)))
 							var/turf/location = M.loc
-							if (istype(location, /turf/simulated))
+							if(istype(location, /turf/simulated))
 								location.add_blood(M)
 						pulling.Move(T, get_dir(pulling, T))
 						if(M)
 							M.start_pulling(t)
 				else
-					if (pulling)
+					if(pulling)
 						pulling.Move(T, get_dir(pulling, T))
 	else
 		stop_pulling()
 		. = ..()
 
-	if (s_active && !( s_active in contents ) && get_turf(s_active) != get_turf(src))	//check !( s_active in contents ) first so we hopefully don't have to call get_turf() so much.
+	if(s_active && !( s_active in contents ) && get_turf(s_active) != get_turf(src))	//check !( s_active in contents ) first so we hopefully don't have to call get_turf() so much.
 		s_active.close(src)
 
 	if(.) // did we actually move?
@@ -854,7 +854,7 @@
 	return tally
 
 /mob/living/proc/can_use_guns(var/obj/item/weapon/gun/G)
-	if (G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
+	if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
 		to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return 0
 	return 1
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index cc50408148e..2049d5fd21d 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -43,7 +43,7 @@
 	var/armor = run_armor_check(def_zone, P.flag, armour_penetration = P.armour_penetration)
 	var/proj_sharp = is_sharp(P)
 	var/proj_edge = has_edge(P)
-	if ((proj_sharp || proj_edge) && prob(getarmor(def_zone, P.flag)))
+	if((proj_sharp || proj_edge) && prob(getarmor(def_zone, P.flag)))
 		proj_sharp = 0
 		proj_edge = 0
 
@@ -62,49 +62,40 @@
 
 //this proc handles being hit by a thrown atom
 /mob/living/hitby(atom/movable/AM as mob|obj,var/speed = 5)//Standardization and logging -Sieve
-	if(istype(AM,/obj/))
-		var/obj/O = AM
+	if(istype(AM, /obj/item))
+		var/obj/item/I = AM
 		var/zone = ran_zone("chest", 65)//Hits a random part of the body, geared towards the chest
 		var/dtype = BRUTE
-		if(istype(O,/obj/item/weapon))
-			var/obj/item/weapon/W = O
+		if(istype(I, /obj/item/weapon))
+			var/obj/item/weapon/W = I
 			dtype = W.damtype
-			if (W.hitsound && W.throwforce > 0)
+			if(W.hitsound && W.throwforce > 0)
 				playsound(loc, W.hitsound, 30, 1, -1)
 
 		//run to-hit check here
 
-		var/throw_damage = O.throwforce*(speed/5)
+		var/throw_damage = I.throwforce*(speed/5)
 
-		//var/miss_chance = 15
-		//if (O.throw_source)
-			//var/distance = get_dist(O.throw_source, loc)
-			//miss_chance = min(15*(distance-2), 0)
-		/*
-		if (prob(miss_chance))
-			visible_message("\blue \The [O] misses [src] narrowly!")
-			return
-		*/
-		src.visible_message("\red [src] has been hit by [O].")
-		var/armor = run_armor_check(zone, "melee")
+		src.visible_message("\red [src] has been hit by [I].")
+		var/armor = run_armor_check(zone, "melee", "Your armor has protected your [parse_zone(zone)].", "Your armor has softened hit to your [parse_zone(zone)].", I.armour_penetration)
 
-		apply_damage(throw_damage, dtype, zone, armor, is_sharp(O), has_edge(O), O)
+		apply_damage(throw_damage, dtype, zone, armor, is_sharp(I), has_edge(I), I)
 
-		O.throwing = 0		//it hit, so stop moving
+		I.throwing = 0		//it hit, so stop moving
 
-		if(ismob(O.thrower))
-			var/mob/M = O.thrower
+		if(ismob(I.thrower))
+			var/mob/M = I.thrower
 			if(M)
-				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [O], thrown by [key_name(M)]</font>")
-				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [key_name(src)] with a thrown [O]</font>")
+				attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [I], thrown by [key_name(M)]</font>")
+				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [key_name(src)] with a thrown [I]</font>")
 				if(!istype(src,/mob/living/simple_animal/mouse))
-					msg_admin_attack("[key_name_admin(src)] was hit by a [O], thrown by [key_name_admin(M)]")
+					msg_admin_attack("[key_name_admin(src)] was hit by a [I], thrown by [key_name_admin(M)]")
 
 		// Begin BS12 momentum-transfer code.
-		if(O.throw_source && speed >= 15)
-			var/obj/item/weapon/W = O
+		if(I.throw_source && speed >= 15)
+			var/obj/item/weapon/W = I
 			var/momentum = speed/2
-			var/dir = get_dir(O.throw_source, src)
+			var/dir = get_dir(I.throw_source, src)
 
 			visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!")
 			src.throw_at(get_edge_target_turf(src,dir),1,momentum)
@@ -113,16 +104,16 @@
 
 			if(W.sharp) //Projectile is suitable for pinning.
 				//Handles embedding for non-humans and simple_animals.
-				O.loc = src
-				src.embedded += O
+				I.loc = src
+				embedded += I
 
 				var/turf/T = near_wall(dir,2)
 
 				if(T)
 					src.loc = T
-					visible_message("<span class='warning'>[src] is pinned to the wall by [O]!</span>","<span class='warning'>You are pinned to the wall by [O]!</span>")
+					visible_message("<span class='warning'>[src] is pinned to the wall by [I]!</span>","<span class='warning'>You are pinned to the wall by [I]!</span>")
 					src.anchored = 1
-					src.pinned += O
+					src.pinned += I
 
 /mob/living/mech_melee_attack(obj/mecha/M)
 	if(M.occupant.a_intent == I_HARM)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index ce73ae369c0..d4e6d613d9c 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -54,4 +54,6 @@
 
 	var/list/butcher_results = null
 
-	var/list/surgeries = list()	//a list of surgery datums. generally empty, they're added when the player wants them.
\ No newline at end of file
+	var/list/surgeries = list()	//a list of surgery datums. generally empty, they're added when the player wants them.
+
+	var/gene_stability = DEFAULT_GENE_STABILITY
diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm
index b79d822d80b..71e26e60858 100644
--- a/code/modules/mob/living/logout.dm
+++ b/code/modules/mob/living/logout.dm
@@ -1,6 +1,6 @@
 /mob/living/Logout()
 	..()
-	if (mind)
+	if(mind)
 		if(!key) //key and mind have become seperated. I believe this is for when a staff member aghosts.
 			mind.active = 0	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
 		//This causes instant sleep and tags a player as SSD. See life.dm for furthering SSD.
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index ca22eac68bd..876a1d9c98b 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -28,7 +28,8 @@ var/list/department_radio_keys = list(
 	  ":T" = "Syndicate",	"#T" = "Syndicate",		".T" = "Syndicate",
 	  ":U" = "Supply",		"#U" = "Supply",		".U" = "Supply",
 	  ":Z" = "Service",		"#Z" = "Service",		".Z" = "Service",
-	  ":P" = "AI Private",	"#P" = "AI Private",	".P" = "AI Private"
+	  ":P" = "AI Private",	"#P" = "AI Private",	".P" = "AI Private",
+	  ":-" = "Special Ops",		"#-" = "Special Ops",		".-" = "Special Ops"
 )
 
 
@@ -48,14 +49,14 @@ proc/get_radio_key_from_channel(var/channel)
 
 /mob/living/proc/binarycheck()
 
-	if (istype(src, /mob/living/silicon/pai))
+	if(istype(src, /mob/living/silicon/pai))
 		return
 
-	if (!ishuman(src))
+	if(!ishuman(src))
 		return
 
 	var/mob/living/carbon/human/H = src
-	if (H.l_ear || H.r_ear)
+	if(H.l_ear || H.r_ear)
 		var/obj/item/device/radio/headset/dongle
 		if(istype(H.l_ear,/obj/item/device/radio/headset))
 			dongle = H.l_ear
@@ -138,8 +139,8 @@ proc/get_radio_key_from_channel(var/channel)
 		return emote(copytext(message,2))
 
 	//parse the radio code and consume it
-	if (message_mode)
-		if (message_mode == "headset")
+	if(message_mode)
+		if(message_mode == "headset")
 			message = copytext(message,2)	//it would be really nice if the parse procs could do this for us.
 		else
 			message = copytext(message,3)
@@ -206,18 +207,18 @@ proc/get_radio_key_from_channel(var/channel)
 		for(var/mob/living/M in hearers(5, src))
 			if((M != src) && msg)
 				M.show_message(msg)
-			if (speech_sound)
+			if(speech_sound)
 				sound_vol *= 0.5
 
 	var/turf/T = get_turf(src)
 
 	//handle nonverbal and sign languages here
-	if (speaking)
-		if (speaking.flags & NONVERBAL)
-			if (prob(30))
+	if(speaking)
+		if(speaking.flags & NONVERBAL)
+			if(prob(30))
 				src.custom_emote(1, "[pick(speaking.signlang_verb)].")
 
-		if (speaking.flags & SIGNLANG)
+		if(speaking.flags & SIGNLANG)
 			return say_signlang(message, pick(speaking.signlang_verb), speaking)
 
 	var/list/listening = list()
@@ -230,7 +231,7 @@ proc/get_radio_key_from_channel(var/channel)
 		if(pressure < SOUND_MINIMUM_PRESSURE)
 			message_range = 1
 
-		if (pressure < ONE_ATMOSPHERE*0.4) //sound distortion pressure, to help clue people in that the air is thin, even if it isn't a vacuum yet
+		if(pressure < ONE_ATMOSPHERE*0.4) //sound distortion pressure, to help clue people in that the air is thin, even if it isn't a vacuum yet
 			italics = 1
 			sound_vol *= 0.5 //muffle the sound a bit, so it's like we're actually talking through contact
 
@@ -250,9 +251,9 @@ proc/get_radio_key_from_channel(var/channel)
 				listening_obj |= O
 
 		for(var/mob/M in player_list)
-			if (!M.client)
+			if(!M.client)
 				continue //skip monkeys and leavers
-			if (istype(M, /mob/new_player))
+			if(istype(M, /mob/new_player))
 				continue
 			if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS) && src.client) // src.client is so that ghosts don't have to listen to mice
 				listening |= M
@@ -283,7 +284,7 @@ proc/get_radio_key_from_channel(var/channel)
 	return 1
 
 /mob/living/proc/say_signlang(var/message, var/verb="gestures", var/datum/language/language)
-	for (var/mob/O in viewers(src, null))
+	for(var/mob/O in viewers(src, null))
 		O.hear_signlang(message, verb, language, src)
 	return 1
 
@@ -293,6 +294,34 @@ proc/get_radio_key_from_channel(var/channel)
 /mob/living/proc/GetVoice()
 	return name
 
+/mob/living/emote(var/act, var/type, var/message) //emote code is terrible, this is so that anything that isn't
+	if(stat)	return 0                          //already snowflaked to shit can call the parent and handle emoting sanely
+
+	if(..(act, type, message))
+		return 1
+
+	if(act && type && message) //parent call
+		log_emote("[name]/[key] : [message]")
+
+		for(var/mob/M in dead_mob_list)
+			if(!M.client || istype(M, /mob/new_player))
+				continue //skip monkeys, leavers and new players //who the hell knows why new players are in the dead mob list
+
+			if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTSIGHT) && !(M in viewers(src,null)))
+				M.show_message(message)
+
+		switch(type)
+			if(1) //Visible
+				visible_message(message)
+				return 1
+			if(2) //Audible
+				audible_message(message)
+				return 1
+
+	else //everything else failed, emote is probably invalid
+		if(act == "help")	return //except help, because help is handled individually
+		to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
+
 /mob/living/whisper(message as text)
 	message = trim_strip_html_properly(message)
 
@@ -424,7 +453,7 @@ proc/get_radio_key_from_channel(var/channel)
 
 	if(watching.len)
 		var/rendered = "<span class='game say'><span class='name'>[src.name]</span> [not_heard].</span>"
-		for (var/mob/M in watching)
+		for(var/mob/M in watching)
 			M.show_message(rendered, 2)
 
 	log_whisper("[src.name]/[src.key] : [message]")
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 812d2e8df58..96cef960c8f 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -26,10 +26,10 @@ var/list/ai_verbs_default = list(
 //Not sure why this is necessary...
 /proc/AutoUpdateAI(obj/subject)
 	var/is_in_use = 0
-	if (subject!=null)
+	if(subject!=null)
 		for(var/A in ai_list)
 			var/mob/living/silicon/ai/M = A
-			if ((M.client && M.machine == subject))
+			if((M.client && M.machine == subject))
 				is_in_use = 1
 				subject.attack_ai(M)
 	return is_in_use
@@ -121,8 +121,8 @@ var/list/ai_verbs_default = list(
 	var/pickedName = null
 	while(!pickedName)
 		pickedName = pick(ai_names)
-		for (var/mob/living/silicon/ai/A in mob_list)
-			if (A.real_name == pickedName && possibleNames.len > 1) //fixing the theoretically possible infinite loop
+		for(var/mob/living/silicon/ai/A in mob_list)
+			if(A.real_name == pickedName && possibleNames.len > 1) //fixing the theoretically possible infinite loop
 				possibleNames -= pickedName
 				pickedName = null
 
@@ -138,7 +138,7 @@ var/list/ai_verbs_default = list(
 	proc_holder_list = new()
 
 	if(L)
-		if (istype(L, /datum/ai_laws))
+		if(istype(L, /datum/ai_laws))
 			laws = L
 	else
 		make_laws()
@@ -154,7 +154,7 @@ var/list/ai_verbs_default = list(
 
 	aiCamera = new/obj/item/device/camera/siliconcam/ai_camera(src)
 
-	if (istype(loc, /turf))
+	if(istype(loc, /turf))
 		add_ai_verbs(src)
 
 	//Languages
@@ -176,12 +176,12 @@ var/list/ai_verbs_default = list(
 	add_language("Clownish", 0)
 
 	if(!safety)//Only used by AIize() to successfully spawn an AI.
-		if (!B)//If there is no player/brain inside.
+		if(!B)//If there is no player/brain inside.
 			new/obj/structure/AIcore/deactivated(loc)//New empty terminal.
 			qdel(src)//Delete AI.
 			return
 		else
-			if (B.brainmob.mind)
+			if(B.brainmob.mind)
 				B.brainmob.mind.transfer_to(src)
 
 			on_mob_init()
@@ -219,7 +219,7 @@ var/list/ai_verbs_default = list(
 
 	to_chat(src, radio_text)
 
-	if (!(ticker && ticker.mode && (mind in ticker.mode.malf_ai)))
+	if(!(ticker && ticker.mode && (mind in ticker.mode.malf_ai)))
 		show_laws()
 		to_chat(src, "<b>These laws may be changed by other players, or by you being the traitor.</b>")
 
@@ -306,7 +306,7 @@ var/list/ai_verbs_default = list(
 
 		//if(icon_state == initial(icon_state))
 	var/icontype = ""
-	if (custom_sprite == 1) icontype = ("Custom")//automagically selects custom sprite if one is available
+	if(custom_sprite == 1) icontype = ("Custom")//automagically selects custom sprite if one is available
 	else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Blue", "Clown", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static", "Red October", "Sparkles", "ANIMA", "President", "NT")
 	switch(icontype)
 		if("Custom") icon_state = "[src.ckey]-ai"
@@ -340,9 +340,9 @@ var/list/ai_verbs_default = list(
 /mob/living/silicon/ai/show_malf_ai()
 	if(ticker.mode.name == "AI malfunction")
 		var/datum/game_mode/malfunction/malf = ticker.mode
-		for (var/datum/mind/malfai in malf.malf_ai)
-			if (mind == malfai) // are we the evil one?
-				if (malf.apcs >= 3)
+		for(var/datum/mind/malfai in malf.malf_ai)
+			if(mind == malfai) // are we the evil one?
+				if(malf.apcs >= 3)
 					stat(null, "Time until station control secured: [max(malf.AI_win_timeleft/(malf.apcs/3), 0)] seconds")
 
 // this verb lets the ai see the stations manifest
@@ -436,13 +436,13 @@ var/list/ai_verbs_default = list(
 	ai_announcement()
 
 /mob/living/silicon/ai/check_eye(var/mob/user as mob)
-	if (!current)
+	if(!current)
 		return null
 	user.reset_view(current)
 	return 1
 
 /mob/living/silicon/ai/blob_act()
-	if (stat != 2)
+	if(stat != 2)
 		adjustBruteLoss(60)
 		updatehealth()
 		return 1
@@ -452,7 +452,7 @@ var/list/ai_verbs_default = list(
 	return 0
 
 /mob/living/silicon/ai/emp_act(severity)
-	if (prob(30))
+	if(prob(30))
 		switch(pick(1,2))
 			if(1)
 				view_core()
@@ -467,11 +467,11 @@ var/list/ai_verbs_default = list(
 		if(1.0)
 			gib()
 		if(2.0)
-			if (stat != 2)
+			if(stat != 2)
 				adjustBruteLoss(60)
 				adjustFireLoss(60)
 		if(3.0)
-			if (stat != 2)
+			if(stat != 2)
 				adjustBruteLoss(30)
 
 	return
@@ -481,21 +481,21 @@ var/list/ai_verbs_default = list(
 	if(usr != src)
 		return
 	..()
-	if (href_list["mach_close"])
-		if (href_list["mach_close"] == "aialerts")
+	if(href_list["mach_close"])
+		if(href_list["mach_close"] == "aialerts")
 			viewalerts = 0
 		var/t1 = text("window=[]", href_list["mach_close"])
 		unset_machine()
 		src << browse(null, t1)
-	if (href_list["switchcamera"])
+	if(href_list["switchcamera"])
 		switchCamera(locate(href_list["switchcamera"])) in cameranet.cameras
-	if (href_list["showalerts"])
+	if(href_list["showalerts"])
 		subsystem_alarm_monitor()
 	if(href_list["show_paper"])
 		if(last_paper_seen)
 			src << browse(last_paper_seen, "window=show_paper")
 	//Carn: holopad requests
-	if (href_list["jumptoholopad"])
+	if(href_list["jumptoholopad"])
 		var/obj/machinery/hologram/holopad/H = locate(href_list["jumptoholopad"])
 		if(stat == CONSCIOUS)
 			if(H)
@@ -507,7 +507,7 @@ var/list/ai_verbs_default = list(
 		play_vox_word(href_list["say_word"], null, src)
 		return
 
-	if (href_list["track"])
+	if(href_list["track"])
 		var/mob/living/target = locate(href_list["track"]) in mob_list
 		if(target && target.can_track())
 			ai_actual_track(target)
@@ -515,7 +515,7 @@ var/list/ai_verbs_default = list(
 			to_chat(src, "<span class='warning'>Target is not on or near any active cameras on the station.</span>")
 		return
 
-	if (href_list["trackbot"])
+	if(href_list["trackbot"])
 		var/mob/living/simple_animal/bot/target = locate(href_list["trackbot"]) in simple_animal_list
 		if(target)
 			ai_actual_track(target)
@@ -523,7 +523,7 @@ var/list/ai_verbs_default = list(
 			to_chat(src, "<span class='warning'>Target is not on or near any active cameras on the station.</span>")
 		return
 
-	if (href_list["callbot"]) //Command a bot to move to a selected location.
+	if(href_list["callbot"]) //Command a bot to move to a selected location.
 		Bot = locate(href_list["callbot"]) in simple_animal_list
 		if(!Bot || Bot.remote_disabled || src.control_disabled)
 			return //True if there is no bot found, the bot is manually emagged, or the AI is carded with wireless off.
@@ -531,17 +531,17 @@ var/list/ai_verbs_default = list(
 		to_chat(src, "<span class='notice'>Set your waypoint by clicking on a valid location free of obstructions.</span>")
 		return
 
-	if (href_list["interface"]) //Remotely connect to a bot!
+	if(href_list["interface"]) //Remotely connect to a bot!
 		Bot = locate(href_list["interface"]) in simple_animal_list
 		if(!Bot || Bot.remote_disabled || src.control_disabled)
 			return
 		Bot.attack_ai(src)
 
-	if (href_list["botrefresh"]) //Refreshes the bot control panel.
+	if(href_list["botrefresh"]) //Refreshes the bot control panel.
 		botcall()
 		return
 
-	if (href_list["ai_take_control"]) //Mech domination
+	if(href_list["ai_take_control"]) //Mech domination
 		var/obj/mecha/M = locate(href_list["ai_take_control"])
 		if(controlled_mech)
 			to_chat(src, "You are already loaded into an onboard computer!")
@@ -549,17 +549,17 @@ var/list/ai_verbs_default = list(
 		if(M)
 			M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself.
 
-	else if (href_list["faketrack"])
+	else if(href_list["faketrack"])
 		var/mob/target = locate(href_list["track"]) in mob_list
 		var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list
 		if(A && target)
 
 			A.cameraFollow = target
 			to_chat(A, "Now tracking [target.name] on camera.")
-			if (usr.machine == null)
+			if(usr.machine == null)
 				usr.machine = usr
 
-			while (src.cameraFollow == target)
+			while(src.cameraFollow == target)
 				to_chat(usr, "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb).")
 				sleep(40)
 				continue
@@ -575,23 +575,23 @@ var/list/ai_verbs_default = list(
 
 
 /mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 			visible_message("<span class='notice'>[M] caresses [src]'s plating with its scythe like arm.</span>")
 
 		else //harm
 			M.do_attack_animation(src)
 			var/damage = rand(10, 20)
-			if (prob(90))
+			if(prob(90))
 				playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 				visible_message("<span class='danger'>[M] has slashed at [src]!</span>",\
 								"<span class='userdanger'>[M] has slashed at [src]!</span>")
@@ -644,7 +644,7 @@ var/list/ai_verbs_default = list(
 	d += "<A HREF=?src=\ref[src];botrefresh=\ref[Bot]>Query network status</A><br>"
 	d += "<table width='100%'><tr><td width='40%'><h3>Name</h3></td><td width='20%'><h3>Status</h3></td><td width='30%'><h3>Location</h3></td><td width='10%'><h3>Control</h3></td></tr>"
 
-	for (var/mob/living/simple_animal/bot/Bot in simple_animal_list)
+	for(var/mob/living/simple_animal/bot/Bot in simple_animal_list)
 		if((Bot.z in ai_allowed_Zlevel) && !Bot.remote_disabled) //Only non-emagged bots on the allowed Z-level are detected!
 			bot_area = get_area(Bot)
 			d += "<tr><td width='30%'>[Bot.hacked ? "<span class='bad'>(!) </span>[Bot.name]" : Bot.name] ([Bot.model])</td>"
@@ -686,7 +686,7 @@ var/list/ai_verbs_default = list(
 	if(!tracking)
 		cameraFollow = null
 
-	if (!C || stat == DEAD) //C.can_use())
+	if(!C || stat == DEAD) //C.can_use())
 		return 0
 
 	if(!src.eyeobj)
@@ -716,7 +716,7 @@ var/list/ai_verbs_default = list(
 
 	var/mob/living/silicon/ai/U = usr
 
-	for (var/obj/machinery/camera/C in cameranet.cameras)
+	for(var/obj/machinery/camera/C in cameranet.cameras)
 		if(!C.can_use())
 			continue
 
@@ -770,7 +770,7 @@ var/list/ai_verbs_default = list(
 	if(check_unable())
 		return
 
-	for (var/obj/machinery/M in machines) //change status
+	for(var/obj/machinery/M in machines) //change status
 		if(istype(M, /obj/machinery/ai_status_display))
 			var/obj/machinery/ai_status_display/AISD = M
 			AISD.emotion = emote
@@ -852,10 +852,10 @@ var/list/ai_verbs_default = list(
 
 	camera_light_on = !camera_light_on
 
-	if (!camera_light_on)
+	if(!camera_light_on)
 		to_chat(src, "Camera lights deactivated.")
 
-		for (var/obj/machinery/camera/C in lit_cameras)
+		for(var/obj/machinery/camera/C in lit_cameras)
 			C.set_light(0)
 			lit_cameras = list()
 
@@ -888,19 +888,19 @@ var/list/ai_verbs_default = list(
 	var/list/obj/machinery/camera/add = list()
 	var/list/obj/machinery/camera/remove = list()
 	var/list/obj/machinery/camera/visible = list()
-	for (var/datum/camerachunk/CC in eyeobj.visibleCameraChunks)
-		for (var/obj/machinery/camera/C in CC.cameras)
-			if (!C.can_use() || get_dist(C, eyeobj) > 7)
+	for(var/datum/camerachunk/CC in eyeobj.visibleCameraChunks)
+		for(var/obj/machinery/camera/C in CC.cameras)
+			if(!C.can_use() || get_dist(C, eyeobj) > 7)
 				continue
 			visible |= C
 
 	add = visible - lit_cameras
 	remove = lit_cameras - visible
 
-	for (var/obj/machinery/camera/C in remove)
+	for(var/obj/machinery/camera/C in remove)
 		lit_cameras -= C //Removed from list before turning off the light so that it doesn't check the AI looking away.
 		C.Togglelight(0)
-	for (var/obj/machinery/camera/C in add)
+	for(var/obj/machinery/camera/C in add)
 		C.Togglelight(1)
 		lit_cameras |= C
 
@@ -936,7 +936,7 @@ var/list/ai_verbs_default = list(
 		return
 
 	to_chat(src, "Accessing Subspace Transceiver control...")
-	if (src.aiRadio)
+	if(src.aiRadio)
 		src.aiRadio.interact(src)
 
 
@@ -952,7 +952,7 @@ var/list/ai_verbs_default = list(
 			if(H.digitalcamo)
 				to_chat(src, "Unable to locate an airlock")
 				return
-		if (!near_camera(target))
+		if(!near_camera(target))
 			to_chat(src, "Target is not near any active cameras.")
 			return
 		var/obj/machinery/door/airlock/tobeopened
@@ -1012,7 +1012,7 @@ var/list/ai_verbs_default = list(
 			to_chat(user, "<span class='warning'>No intelligence patterns detected.</span>")//No more magical carding of empty cores, AI RETURN TO BODY!!!11
 
 			return
-		if (mind.special_role == "malfunction") //AI MALF!!
+		if(mind.special_role == "malfunction") //AI MALF!!
 			to_chat(user, "<span class='boldannounce'>ERROR</span>: Remote transfer interface disabled.")//Do ho ho ho~
 
 			return
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index b0b0f44d0e6..d0293d7f50b 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -1,7 +1,7 @@
 /mob/living/silicon/ai/death(gibbed)
 	if(stat == DEAD)	return
 	stat = DEAD
-	if (src.custom_sprite == 1)//check for custom AI sprite, defaulting to blue screen if no.
+	if(src.custom_sprite == 1)//check for custom AI sprite, defaulting to blue screen if no.
 		icon_state = "[ckey]-ai-crash"
 	else icon_state = "ai-crash"
 	update_canmove()
@@ -21,7 +21,7 @@
 	for(var/obj/machinery/ai_status_display/O in world) //change status
 		spawn( 0 )
 		O.mode = 2
-		if (istype(loc, /obj/item/device/aicard))
+		if(istype(loc, /obj/item/device/aicard))
 			loc.icon_state = "aicard-404"
 
 	timeofdeath = worldtime2text()
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index d65e6e0d7d8..c2358c9b237 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -1,24 +1,26 @@
 /mob/living/silicon/ai/examine(mob/user)
+	to_chat(user, "<span class='info'>*---------*</span>")
 	if(!..(user))
+		to_chat(user, "<span class='info'>*---------*</span>")
 		return
 
-	var/msg = ""
-	if (src.stat == DEAD)
+	var/msg = "<span class='info'>"
+	if(src.stat == DEAD)
 		msg += "<span class='deadsay'>It appears to be powered-down.</span>\n"
 	else
 		msg += "<span class='warning'>"
-		if (src.getBruteLoss())
-			if (src.getBruteLoss() < 30)
+		if(src.getBruteLoss())
+			if(src.getBruteLoss() < 30)
 				msg += "It looks slightly dented.\n"
 			else
 				msg += "<B>It looks severely dented!</B>\n"
-		if (src.getFireLoss())
-			if (src.getFireLoss() < 30)
+		if(src.getFireLoss())
+			if(src.getFireLoss() < 30)
 				msg += "It looks slightly charred.\n"
 			else
 				msg += "<B>Its casing is melted and heat-warped!</B>\n"
 
-		if (src.stat == UNCONSCIOUS)
+		if(src.stat == UNCONSCIOUS)
 			msg += "It is non-responsive and displaying the text: \"RUNTIME: Sensory Overload, stack 26/3\".\n"
 		msg += "</span>"
 	msg += "*---------*</span>"
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 317aae2dd6b..00435fdd17a 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -50,7 +50,7 @@
 		var/mob/living/silicon/ai/AI = usr
 		if(AI.eyeobj && AI.client.eye == AI.eyeobj)
 			AI.cameraFollow = null
-			if (isturf(src.loc) || isturf(src))
+			if(isturf(src.loc) || isturf(src))
 				AI.eyeobj.setLoc(src)
 
 // AI MOVEMENT
@@ -82,7 +82,7 @@
 
 	//user.unset_machine() //Uncomment this if it causes problems.
 	//user.lightNearbyCamera()
-	if (user.camera_light_on)
+	if(user.camera_light_on)
 		user.light_cameras()
 
 // Return to the Core.
diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm
index 74816aeeb89..4ce1dbda48c 100755
--- a/code/modules/mob/living/silicon/ai/laws.dm
+++ b/code/modules/mob/living/silicon/ai/laws.dm
@@ -6,7 +6,7 @@
 /mob/living/silicon/ai/show_laws(var/everyone = 0)
 	var/who
 
-	if (everyone)
+	if(everyone)
 		who = world
 	else
 		who = src
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index dabaf2c4153..f82db9b4662 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -12,7 +12,7 @@
 	updatehealth()
 	update_gravity(mob_has_gravity())
 
-	if (health <= config.health_threshold_dead)
+	if(health <= config.health_threshold_dead)
 		death()
 		return 0
 
@@ -102,7 +102,7 @@
 					var/PRP
 					for(PRP = 1, PRP <= 4, PRP++)
 						for(var/obj/machinery/power/apc/APC in my_area)
-							if (!(APC.stat & BROKEN))
+							if(!(APC.stat & BROKEN))
 								theAPC = APC
 								break
 
@@ -116,7 +116,7 @@
 							return
 
 						if(my_area.power_equip)
-							if (!istype(T, /turf/space))
+							if(!istype(T, /turf/space))
 								to_chat(src, "Alert cancelled. Power has been restored without our assistance.")
 								aiRestorePowerRoutine = 0
 								clear_fullscreen("blind")
diff --git a/code/modules/mob/living/silicon/ai/logout.dm b/code/modules/mob/living/silicon/ai/logout.dm
index 09bc93bf349..acc6220bc46 100644
--- a/code/modules/mob/living/silicon/ai/logout.dm
+++ b/code/modules/mob/living/silicon/ai/logout.dm
@@ -3,7 +3,7 @@
 	for(var/obj/machinery/ai_status_display/O in world) //change status
 		O.mode = 0
 	if(!isturf(loc))
-		if (client)
+		if(client)
 			client.eye = loc
 			client.perspective = EYE_PERSPECTIVE
 	src.view_core()
diff --git a/code/modules/mob/living/silicon/decoy/life.dm b/code/modules/mob/living/silicon/decoy/life.dm
index d62d5d15dae..ade3c535506 100644
--- a/code/modules/mob/living/silicon/decoy/life.dm
+++ b/code/modules/mob/living/silicon/decoy/life.dm
@@ -1,8 +1,8 @@
 /mob/living/silicon/decoy/Life()
-	if (src.stat == 2)
+	if(src.stat == 2)
 		return
 	else
-		if (src.health <= config.health_threshold_dead && src.stat != 2)
+		if(src.health <= config.health_threshold_dead && src.stat != 2)
 			death()
 			return
 
diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm
new file mode 100644
index 00000000000..9e95b9cefaa
--- /dev/null
+++ b/code/modules/mob/living/silicon/emote.dm
@@ -0,0 +1,127 @@
+/mob/living/silicon/emote(var/act, var/m_type=1, var/message = null)
+	var/param = null
+	if(findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	//Emote Cooldown System (it's so simple!)
+	// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
+	var/on_CD = 0
+	act = lowertext(act)
+	switch(act)
+		//Cooldown-inducing emotes
+		if("scream", "screams")
+			on_CD = handle_emote_CD(50) //longer cooldown
+		if("ping","pings","buzz","buzzs","buzzes","beep","beeps","yes","no", "buzz2")
+			//halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
+			on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm
+		//Everything else, including typos of the above emotes
+		else
+			on_CD = 0	//If it doesn't induce the cooldown, we won't check for the cooldown
+
+	if(on_CD == 1)		// Check if we need to suppress the emote attempt.
+		return			// Suppress emote, you're still cooling off.
+	//--FalseIncarnate
+
+	switch(act)
+		if("ping","pings")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> pings at [param]."
+			else
+				message = "<B>[src]</B> pings."
+			playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+			m_type = 2
+
+		if("buzz","buzzs","buzzes")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> buzzes at [param]."
+			else
+				message = "<B>[src]</B> buzzes."
+			playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+			m_type = 2
+
+		if("beep","beeps")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> beeps at [param]."
+			else
+				message = "<B>[src]</B> beeps."
+			playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+			m_type = 2
+
+		if("yes")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> emits an affirmative blip at [param]."
+			else
+				message = "<B>[src]</B> emits an affirmative blip."
+			playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0)
+			m_type = 2
+
+		if("no")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> emits a negative blip at [param]."
+			else
+				message = "<B>[src]</B> emits a negative blip."
+			playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0)
+			m_type = 2
+
+		if("scream", "screams")
+			message = "<B>[src]</B> screams!"
+			playsound(src.loc, 'sound/goonstation/voice/robot_scream.ogg', 80, 0)
+			m_type = 2
+
+		if("buzz2")
+			message = "<B>[src]</B> emits an irritated buzzing sound."
+			playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
+			m_type = 2
+
+
+		if("help")
+			to_chat(src, "yes, no, beep, ping, buzz, scream, buzz2")
+
+	..(act, m_type, message)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index 30784e61b93..b49aa82625c 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -3,7 +3,7 @@
 	var/list/additional_law_channels = list("State" = "")
 
 /mob/living/silicon/proc/laws_sanity_check()
-	if (!src.laws)
+	if(!src.laws)
 		laws = new base_law_type
 
 /mob/living/silicon/proc/has_zeroth_law()
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index 0f938ab31b0..92055b813ab 100644
--- a/code/modules/mob/living/silicon/pai/death.dm
+++ b/code/modules/mob/living/silicon/pai/death.dm
@@ -6,7 +6,7 @@
 		force_fold_out()
 
 	var/turf/T = get_turf_or_move(loc)
-	for (var/mob/M in viewers(T))
+	for(var/mob/M in viewers(T))
 		M.show_message("<span class=warning>[src] emits a dull beep before it loses power and collapses.</span>", 3, "<span class=warning>You hear a dull beep followed by the sound of glass crunching.</span>", 2)
 	name = "pAI debris"
 	desc = "The unfortunate remains of some poor personal AI device."
diff --git a/code/modules/mob/living/silicon/pai/emote.dm b/code/modules/mob/living/silicon/pai/emote.dm
new file mode 100644
index 00000000000..a418c0972d5
--- /dev/null
+++ b/code/modules/mob/living/silicon/pai/emote.dm
@@ -0,0 +1,2 @@
+/mob/living/silicon/pai/emote(var/act, var/m_type=1, var/message = null)
+	..(act, m_type, message)
diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm
deleted file mode 100644
index 814efb1899b..00000000000
--- a/code/modules/mob/living/silicon/pai/examine.dm
+++ /dev/null
@@ -1,25 +0,0 @@
-/mob/living/silicon/pai/examine(mob/user) //removed as it was pointless...moved to the pai-card instead.
-	/*..(user) //This is totally pointless because this mob is contained inside a card!
-
-	var/msg = ""
-	if (src.stat == DEAD)
-		msg += "<span class='deadsay'>It appears to be offline.</span>\n"
-	else
-		msg += "<span class='warning'>"
-		if (src.getBruteLoss())
-			if (src.getBruteLoss() < 30)
-				msg += "It looks slightly dented.\n"
-			else
-				msg += "<B>Its casing appears cracked and broken!</B>\n"
-		if (src.getFireLoss())
-			if (src.getFireLoss() < 30)
-				msg += "It looks slightly charred!\n"
-			else
-				msg += "<B>Its casing is melted and heat-warped!</B>\n"
-		if (src.stat == UNCONSCIOUS)
-			msg += "It doesn't seem to be responding and its text-output is lagging.\n"
-		msg += "</span>"
-	msg += "*---------*</span>"
-
-	to_chat(user, msg)
-	*/
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index ac8e20238d3..c0e4c2f275b 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -13,7 +13,7 @@
 		if(cable)
 			if(get_dist(src, cable) > 1)
 				var/turf/T = get_turf_or_move(loc)
-				for (var/mob/M in viewers(T))
+				for(var/mob/M in viewers(T))
 					M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
 				qdel(src.cable)
 				cable = null
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 635efadcaba..6e062860eed 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -127,21 +127,21 @@
 /mob/living/silicon/pai/Stat()
 	..()
 	statpanel("Status")
-	if (src.client.statpanel == "Status")
+	if(src.client.statpanel == "Status")
 		show_silenced()
 
-	if (proc_holder_list.len)//Generic list for proc_holder objects.
+	if(proc_holder_list.len)//Generic list for proc_holder objects.
 		for(var/obj/effect/proc_holder/P in proc_holder_list)
 			statpanel("[P.panel]","",P)
 
 /mob/living/silicon/pai/check_eye(var/mob/user as mob)
-	if (!src.current)
+	if(!src.current)
 		return null
 	user.reset_view(src.current)
 	return 1
 
 /mob/living/silicon/pai/blob_act()
-	if (src.stat != 2)
+	if(src.stat != 2)
 		src.adjustBruteLoss(60)
 		src.updatehealth()
 		return 1
@@ -166,7 +166,7 @@
 	to_chat(src, "<font color=green><b>Communication circuit overload. Shutting down and reloading communication circuits - speech and messaging functionality will be unavailable until the reboot is complete.</b></font>")
 	if(prob(20))
 		var/turf/T = get_turf_or_move(src.loc)
-		for (var/mob/M in viewers(T))
+		for(var/mob/M in viewers(T))
 			M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
 		return src.death(0)
 
@@ -191,15 +191,15 @@
 
 	switch(severity)
 		if(1.0)
-			if (src.stat != 2)
+			if(src.stat != 2)
 				adjustBruteLoss(100)
 				adjustFireLoss(100)
 		if(2.0)
-			if (src.stat != 2)
+			if(src.stat != 2)
 				adjustBruteLoss(60)
 				adjustFireLoss(60)
 		if(3.0)
-			if (src.stat != 2)
+			if(src.stat != 2)
 				adjustBruteLoss(30)
 
 	return
@@ -223,28 +223,28 @@
 		updatehealth()
 
 /mob/living/silicon/pai/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(src.loc, /turf) && istype(src.loc.loc, /area/start))
+	if(istype(src.loc, /turf) && istype(src.loc.loc, /area/start))
 		to_chat(M, "You cannot attack someone in the spawn area.")
 		return
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
+				if((O.client && !( O.blinded )))
 					O.show_message(text("\blue [M] caresses [src]'s casing with its scythe like arm."), 1)
 
 		else //harm
 			M.do_attack_animation(src)
 			var/damage = rand(10, 20)
-			if (prob(90))
+			if(prob(90))
 				playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
+					if((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
 				if(prob(8))
 					flash_eyes(affect_silicon = 1)
@@ -253,17 +253,17 @@
 			else
 				playsound(src.loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
 				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
+					if((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
 	return
 
 /mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C)
 	usr:cameraFollow = null
-	if (!C)
+	if(!C)
 		src.unset_machine()
 		src.reset_view(null)
 		return 0
-	if (stat == 2 || !C.status || !(src.network in C.network)) return 0
+	if(stat == 2 || !C.status || !(src.network in C.network)) return 0
 
 	// ok, we're alive, camera is good and in our network...
 
@@ -306,7 +306,7 @@
 		to_chat(usr, "You can't change your camera network because you are dead!")
 		return
 
-	for (var/obj/machinery/camera/C in Cameras)
+	for(var/obj/machinery/camera/C in Cameras)
 		if(!C.status)
 			continue
 		else
@@ -441,9 +441,9 @@
 /mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/stack/nanopaste))
 		var/obj/item/stack/nanopaste/N = W
-		if (stat == DEAD)
+		if(stat == DEAD)
 			to_chat(user, "<span class='danger'>\The [src] is beyond help, at this point.</span>")
-		else if (getBruteLoss() || getFireLoss())
+		else if(getBruteLoss() || getFireLoss())
 			adjustBruteLoss(-15)
 			adjustFireLoss(-15)
 			updatehealth()
@@ -466,10 +466,15 @@
 	return
 
 /mob/living/silicon/pai/attack_hand(mob/user as mob)
-	if(stat == 2) return
-	visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
-	spawn(1)
-		close_up()
+	if(stat == DEAD)
+		return
+	if(user.a_intent == I_HELP)
+		user.visible_message("<span class='notice'>[user] pets [src].</span>")
+		playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+	else
+		visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
+		spawn(1)
+			close_up()
 
 //I'm not sure how much of this is necessary, but I would rather avoid issues.
 /mob/living/silicon/pai/proc/close_up()
@@ -521,30 +526,31 @@
 	density = 0 //this is reset every canmove update otherwise
 
 /mob/living/silicon/pai/examine(mob/user)
+	to_chat(user, "<span class='info'>*---------*</span>")
 	..(user)
 
-	var/msg = ""
+	var/msg = "<span class='info'>"
 
 	switch(src.stat)
 		if(CONSCIOUS)
 			if(!src.client)	msg += "\nIt appears to be in stand-by mode." //afk
 		if(UNCONSCIOUS)		msg += "\n<span class='warning'>It doesn't seem to be responding.</span>"
 		if(DEAD)			msg += "\n<span class='deadsay'>It looks completely unsalvageable.</span>"
-	msg += "\n*---------*</span>"
 
-	if(print_flavor_text()) msg += "\n[print_flavor_text()]\n"
+	if(print_flavor_text()) msg += "\n[print_flavor_text()]"
 
-	if (pose)
+	if(pose)
 		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
 			pose = addtext(pose,".") //Makes sure all emotes end with a period.
 		msg += "\nIt is [pose]"
+	msg += "\n*---------*</span>"
 
 	to_chat(user, msg)
 
 /mob/living/silicon/pai/bullet_act(var/obj/item/projectile/Proj)
 	..(Proj)
 	updatehealth()
-	if (stat != 2)
+	if(stat != 2)
 		spawn(1)
 			close_up()
 	return 2
diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm
index 49b7e394d44..d089b76a3fb 100644
--- a/code/modules/mob/living/silicon/pai/personality.dm
+++ b/code/modules/mob/living/silicon/pai/personality.dm
@@ -32,12 +32,12 @@
 // returns 0 if savefile did not exist
 
 /datum/paiCandidate/proc/savefile_load(mob/user, var/silent = 1)
-	if (IsGuestKey(user.key))
+	if(IsGuestKey(user.key))
 		return 0
 
 	var/path = savefile_path(user)
 
-	if (!fexists(path))
+	if(!fexists(path))
 		return 0
 
 	var/savefile/F = new /savefile(path)
@@ -47,9 +47,9 @@
 	var/version = null
 	F["version"] >> version
 
-	if (isnull(version) || version != 1)
+	if(isnull(version) || version != 1)
 		fdel(path)
-		if (!silent)
+		if(!silent)
 			alert(user, "Your savefile was incompatible with this version and was deleted.")
 		return 0
 
diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index 379b40d2919..2e6548ef2c4 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -374,7 +374,7 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 			if(!C)	return		//handle logouts that happen whilst the alert is waiting for a response.
 			if(response == "Yes")
 				recruitWindow(C.mob)
-			else if (response == "Never for this round")
+			else if(response == "Never for this round")
 				var/warning = alert(C, "Are you sure? This action will be undoable and you will need to wait until next round.", "You sure?", "Yes", "No")
 				if(warning == "Yes")
 					asked[C.key] = INFINITY
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index e85345db226..539832d9c08 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -85,7 +85,7 @@ var/global/list/default_pai_software = list()
 	data["current_emotion"] = card.current_emotion
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "pai_interface.tmpl", "pAI Software Interface", 450, 600)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index dbed9015220..3e15e7118d9 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -65,7 +65,7 @@
 			var/answer = input(M, "[P] is requesting a DNA sample from you. Will you allow it to confirm your identity?", "[P] Check DNA", "No") in list("Yes", "No")
 			if(answer == "Yes")
 				var/turf/T = get_turf_or_move(P.loc)
-				for (var/mob/v in viewers(T))
+				for(var/mob/v in viewers(T))
 					v.show_message("<span class='notice'>[M] presses \his thumb against [P].</span>", 3, "<span class='notice'>[P] makes a sharp clicking sound as it extracts DNA material from [M].</span>", 2)
 				var/datum/dna/dna = M.dna
 				to_chat(P, "<font color = red><h3>[M]'s UE string : [dna.unique_enzymes]</h3></font>")
@@ -296,7 +296,7 @@
 						return
 					t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
 					t = readd_quotes(t)
-					if (!t)
+					if(!t)
 						return
 
 					M.current_room.topic = t
@@ -329,7 +329,7 @@
 							return
 						t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
 						t = readd_quotes(t)
-						if (!t || !P.pda.can_use())
+						if(!t || !P.pda.can_use())
 							return
 
 						target.post(M, t)
@@ -380,12 +380,12 @@
 			if(record)
 				var/datum/data/record/R = record
 				var/datum/data/record/M = null
-				if (!( data_core.general.Find(R) ))
+				if(!( data_core.general.Find(R) ))
 					P.medical_cannotfind = 1
 				else
 					P.medical_cannotfind = 0
 					for(var/datum/data/record/E in data_core.medical)
-						if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+						if((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 							M = E
 					P.medicalActive1 = R
 					P.medicalActive2 = M
@@ -434,14 +434,14 @@
 			if(record)
 				var/datum/data/record/R = record
 				var/datum/data/record/S = null
-				if (!( data_core.general.Find(R) ))
+				if(!( data_core.general.Find(R) ))
 					P.securityActive1 = null
 					P.securityActive2 = null
 					P.security_cannotfind = 1
 				else
 					P.security_cannotfind = 0
 					for(var/datum/data/record/E in data_core.security)
-						if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+						if((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 							S = E
 					P.securityActive1 = R
 					P.securityActive2 = S
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index c6ae0f57ddf..f51325f546b 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -7,8 +7,8 @@
 	var/toggled = 1
 	var/brute_damage = 0
 	var/electronics_damage = 0
-	var/energy_consumption = 0
 	var/max_damage = 30
+	var/component_disabled = 0
 	var/mob/living/silicon/robot/owner
 
 // The actual device object that has to be installed for this.
@@ -51,28 +51,22 @@
 	electronics_damage = max(0, electronics_damage - electronics)
 
 /datum/robot_component/proc/is_powered()
-	return (installed == 1) && (brute_damage + electronics_damage < max_damage) && (!energy_consumption || powered)
+	return (installed == 1) && (brute_damage + electronics_damage < max_damage) && (powered)
 
 
 /datum/robot_component/proc/consume_power()
 	if(toggled == 0)
 		powered = 0
 		return
-	if(owner.cell.charge >= energy_consumption)
-		owner.cell.use(energy_consumption)
-		powered = 1
-	else
-		powered = 0
+	powered = 1
 
 /datum/robot_component/armour
 	name = "armour plating"
-	energy_consumption = 0
 	external_type = /obj/item/robot_parts/robot_component/armour
 	max_damage = 100
 
 /datum/robot_component/actuator
 	name = "actuator"
-	energy_consumption = 1
 	external_type = /obj/item/robot_parts/robot_component/actuator
 	max_damage = 50
 
@@ -87,24 +81,20 @@
 /datum/robot_component/radio
 	name = "radio"
 	external_type = /obj/item/robot_parts/robot_component/radio
-	energy_consumption = 1
 	max_damage = 40
 
 /datum/robot_component/binary_communication
 	name = "binary communication device"
 	external_type = /obj/item/robot_parts/robot_component/binary_communication_device
-	energy_consumption = 0
 	max_damage = 30
 
 /datum/robot_component/camera
 	name = "camera"
 	external_type = /obj/item/robot_parts/robot_component/camera
-	energy_consumption = 1
 	max_damage = 40
 
 /datum/robot_component/diagnosis_unit
 	name = "self-diagnosis unit"
-	energy_consumption = 1
 	external_type = /obj/item/robot_parts/robot_component/diagnosis_unit
 	max_damage = 30
 
@@ -121,7 +111,13 @@
 
 /mob/living/silicon/robot/proc/is_component_functioning(module_name)
 	var/datum/robot_component/C = components[module_name]
-	return C && C.installed == 1 && C.toggled && C.is_powered()
+	return C && C.installed == 1 && C.toggled && C.is_powered() && !C.component_disabled
+
+/mob/living/silicon/robot/proc/disable_component(module_name, duration)
+	var/datum/robot_component/D = get_component(module_name)
+	D.component_disabled++
+	spawn(duration)
+		D.component_disabled--
 
 // Returns component by it's string name
 /mob/living/silicon/robot/proc/get_component(var/component_name)
@@ -175,7 +171,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 3
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 5
 	throw_range = 10
 	origin_tech = "magnets=1;biotech=1"
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 9a5c1a9f4d5..7b7713c8540 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -111,11 +111,11 @@
 		to_chat(user, "\red The maintenance drone chassis not compatible with \the [W].")
 		return
 
-	else if (istype(W, /obj/item/weapon/crowbar))
+	else if(istype(W, /obj/item/weapon/crowbar))
 		to_chat(user, "The machine is hermetically sealed. You can't open the case.")
 		return
 
-	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
+	else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
 
 		if(stat == 2)
 
@@ -253,6 +253,8 @@
 
 /mob/living/silicon/robot/drone/proc/request_player()
 	for(var/mob/dead/observer/O in player_list)
+		if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+			continue
 		if(jobban_isbanned(O,"nonhumandept") || jobban_isbanned(O,"Drone"))
 			continue
 		if(O.client)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index 151fc6de51d..d450d508bd3 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -26,7 +26,7 @@
 	set desc = "Allows you to hide beneath tables or certain items. Toggled on or off."
 	set category = "Drone"
 
-	if (layer != TURF_LAYER+0.2)
+	if(layer != TURF_LAYER+0.2)
 		layer = TURF_LAYER+0.2
 		to_chat(src, text("\blue You are now hiding."))
 	else
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index 5e7077f7000..f9be6f13413 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -57,10 +57,10 @@
 		to_chat(usr, "\red Access denied.")
 		return
 
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 
-	if (href_list["setarea"])
+	if(href_list["setarea"])
 
 		//Probably should consider using another list, but this one will do.
 		var/t_area = input("Select the area to ping.", "Set Target Area", null) as null|anything in TAGGERLOCATIONS
@@ -71,14 +71,14 @@
 		drone_call_area = t_area
 		to_chat(usr, "\blue You set the area selector to [drone_call_area].")
 
-	else if (href_list["ping"])
+	else if(href_list["ping"])
 
 		to_chat(usr, "\blue You issue a maintenance request for all active drones, highlighting [drone_call_area].")
 		for(var/mob/living/silicon/robot/drone/D in world)
 			if(D.client && D.stat == 0)
 				to_chat(D, "-- Maintenance drone presence requested in: [drone_call_area].")
 
-	else if (href_list["resync"])
+	else if(href_list["resync"])
 
 		var/mob/living/silicon/robot/drone/D = locate(href_list["resync"])
 
@@ -86,7 +86,7 @@
 			to_chat(usr, "\red You issue a law synchronization directive for the drone.")
 			D.law_resync()
 
-	else if (href_list["shutdown"])
+	else if(href_list["shutdown"])
 
 		var/mob/living/silicon/robot/drone/D = locate(href_list["shutdown"])
 
@@ -96,7 +96,7 @@
 			log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.")
 			D.shut_down()
 
-	else if (href_list["search_fab"])
+	else if(href_list["search_fab"])
 		if(dronefab)
 			return
 
@@ -111,7 +111,7 @@
 
 		to_chat(usr, "\red Unable to locate drone fabricator.")
 
-	else if (href_list["toggle_fab"])
+	else if(href_list["toggle_fab"])
 
 		if(!dronefab)
 			return
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index b5026a882fe..b6a932a52ec 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -222,7 +222,7 @@
 
 	for(var/obj/W in T)
 		//Different classes of items give different commodities.
-		if (istype(W,/obj/item/weapon/cigbutt))
+		if(istype(W,/obj/item/weapon/cigbutt))
 			stored_comms["plastic"]++
 		else if(istype(W,/obj/effect/spider/spiderling))
 			stored_comms["wood"]++
@@ -270,7 +270,7 @@
 			stored_comms["glass"]++
 			stored_comms["glass"]++
 			stored_comms["glass"]++
-		else if (istype(W,/obj/item/weapon/light/tube) || istype(W,/obj/item/weapon/light/bulb))
+		else if(istype(W,/obj/item/weapon/light/tube) || istype(W,/obj/item/weapon/light/bulb))
 			stored_comms["glass"]++
 		else
 			continue
@@ -310,11 +310,11 @@
 	var/tools = "<B>Tools and devices</B><BR>"
 	var/resources = "<BR><B>Resources</B><BR>"
 
-	for (var/O in module.modules)
+	for(var/O in module.modules)
 
 		var/module_string = ""
 
-		if (!O)
+		if(!O)
 			module_string += text("<B>Resource depleted</B><BR>")
 		else if(activated(O))
 			module_string += text("[O]: <B>Activated</B><BR>")
@@ -328,8 +328,8 @@
 
 	dat += tools
 
-	if (emagged)
-		if (!module.emag)
+	if(emagged)
+		if(!module.emag)
 			dat += text("<B>Resource depleted</B><BR>")
 		else if(activated(module.emag))
 			dat += text("[module.emag]: <B>Activated</B><BR>")
@@ -344,7 +344,7 @@
 /mob/living/silicon/robot/drone/use_power()
 
 	..()
-	if(!src.has_power || !decompiler)
+	if(low_power_mode || !decompiler)
 		return
 
 	//The decompiler replenishes drone stores from hoovered-up junk each tick.
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
index 881fde51dee..3a316b0140b 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
@@ -19,7 +19,7 @@
 	..()
 
 /obj/machinery/drone_fabricator/power_change()
-	if (powered())
+	if(powered())
 		stat &= ~NOPOWER
 	else
 		icon_state = "drone_fab_nopower"
@@ -88,10 +88,10 @@
 		to_chat(src, "\red That verb is not currently permitted.")
 		return
 
-	if (!src.stat)
+	if(!src.stat)
 		return
 
-	if (usr != src)
+	if(usr != src)
 		return 0 //something is terribly wrong
 
 	if(jobban_isbanned(src,"nonhumandept") || jobban_isbanned(src,"Drone"))
@@ -128,7 +128,7 @@
 		pluralcheck = " [deathtimeminutes] minutes and"
 	var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
 
-	if (deathtime < 6000 && joinedasobserver == 0)
+	if(deathtime < 6000 && joinedasobserver == 0)
 		to_chat(usr, "You have been dead for[pluralcheck] [deathtimeseconds] seconds.")
 		to_chat(usr, "<span class='warning'>You must wait 10 minutes to respawn as a drone!</span>")
 		return
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
index 9ce0b6c027e..5d00d45f97c 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
@@ -1,15 +1,15 @@
 /mob/living/silicon/robot/drone/say(var/message)
 	if(local_transmit)
-		if (src.client)
+		if(src.client)
 			if(client.prefs.muted & MUTE_IC)
 				to_chat(src, "You cannot send IC messages (muted).")
 				return 0
-			if (src.client.handle_spam_prevention(message,MUTE_IC))
+			if(src.client.handle_spam_prevention(message,MUTE_IC))
 				return 0
 
 		message = sanitize(message)
 
-		if (stat == 2)
+		if(stat == 2)
 			return say_dead(message)
 
 		if(copytext(message,1,2) == "*")
@@ -21,7 +21,7 @@
 				return L.broadcast(src,trim(copytext(message,2)))
 
 		//Must be concious to speak
-		if (stat)
+		if(stat)
 			return 0
 
 		var/list/listeners = hearers(5,src)
@@ -31,8 +31,8 @@
 			if(D.client && D.local_transmit)
 				to_chat(D, "<b>[src]</b> transmits, \"[message]\"")
 
-		for (var/mob/M in player_list)
-			if (istype(M, /mob/new_player))
+		for(var/mob/M in player_list)
+			if(istype(M, /mob/new_player))
 				continue
 			else if(M.stat == 2 && M.client && M.client.prefs.toggles & CHAT_GHOSTEARS)
 				to_chat(M, "<b>[src]</b> transmits, \"[message]\"")
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
new file mode 100644
index 00000000000..bf7f413708f
--- /dev/null
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -0,0 +1,174 @@
+/mob/living/silicon/robot/emote(var/act, var/m_type=1, var/message = null)
+	var/param = null
+	if(findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	//Emote Cooldown System (it's so simple!)
+	// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
+	var/on_CD = 0
+	act = lowertext(act)
+	switch(act)
+		//Cooldown-inducing emotes
+		if("law","flip","flips","halt")		//halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
+			on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm
+		//Everything else, including typos of the above emotes
+		else
+			on_CD = 0	//If it doesn't induce the cooldown, we won't check for the cooldown
+
+	if(on_CD == 1)		// Check if we need to suppress the emote attempt.
+		return			// Suppress emote, you're still cooling off.
+	//--FalseIncarnate
+
+	switch(act)
+
+		if("salute","salutes")
+			if(!src.buckled)
+				var/M = null
+				if(param)
+					for(var/mob/A in view(null, null))
+						if(param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if(param)
+					message = "<B>[src]</B> salutes to [param]."
+				else
+					message = "<B>[src]</b> salutes."
+			m_type = 1
+		if("bow","bows")
+			if(!src.buckled)
+				var/M = null
+				if(param)
+					for(var/mob/A in view(null, null))
+						if(param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if(param)
+					message = "<B>[src]</B> bows to [param]."
+				else
+					message = "<B>[src]</B> bows."
+			m_type = 1
+
+		if("clap","claps")
+			if(!src.restrained())
+				message = "<B>[src]</B> claps."
+				m_type = 2
+		if("flap","flaps")
+			if(!src.restrained())
+				message = "<B>[src]</B> flaps its wings."
+				m_type = 2
+
+		if("aflap","aflaps")
+			if(!src.restrained())
+				message = "<B>[src]</B> flaps its wings ANGRILY!"
+				m_type = 2
+
+		if("twitch")
+			message = "<B>[src]</B> twitches violently."
+			m_type = 1
+
+		if("twitch_s","twitches")
+			message = "<B>[src]</B> twitches."
+			m_type = 1
+
+		if("nod","nods")
+			message = "<B>[src]</B> nods."
+			m_type = 1
+
+		if("deathgasp")
+			message = "<B>[src]</B> shudders violently for a moment, then becomes motionless, its eyes slowly darkening."
+			m_type = 1
+
+		if("glare","glares")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> glares at [param]."
+			else
+				message = "<B>[src]</B> glares."
+
+		if("stare","stares")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> stares at [param]."
+			else
+				message = "<B>[src]</B> stares."
+
+		if("look","looks")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> looks at [param]."
+			else
+				message = "<B>[src]</B> looks."
+			m_type = 1
+
+
+		if("law")
+			if(istype(module,/obj/item/weapon/robot_module/security))
+				message = "<B>[src]</B> shows its legal authorization barcode."
+
+				playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0)
+				m_type = 2
+			else
+				to_chat(src, "You are not THE LAW, pal.")
+
+		if("halt")
+			if(istype(module,/obj/item/weapon/robot_module/security))
+				message = "<B>[src]</B>'s speakers skreech, \"Halt! Security!\"."
+
+				playsound(src.loc, 'sound/voice/halt.ogg', 50, 0)
+				m_type = 2
+			else
+				to_chat(src, "You are not security.")
+
+		if("flip","flips")
+			m_type = 1
+			message = "<B>[src]</B> does a flip!"
+			src.SpinAnimation(5,1)
+
+		if("help")
+			to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitches, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look,\n law, halt")
+
+	..(act, m_type, message)
+
+/mob/living/silicon/robot/verb/powerwarn()
+	set category = "Robot Commands"
+	set name = "Power Warning"
+
+	if(!is_component_functioning("power cell") || !cell || !cell.charge)
+		visible_message("The power warning light on <span class='name'>[src]</span> flashes urgently.",\
+						 "You announce you are operating in low power mode.")
+		playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
+	else
+		to_chat(src, "<span class='warning'>You can only use this emote when you're out of charge.</span>")
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm
index 546bdd2eb6c..cb207932a9a 100644
--- a/code/modules/mob/living/silicon/robot/examine.dm
+++ b/code/modules/mob/living/silicon/robot/examine.dm
@@ -1,45 +1,51 @@
 /mob/living/silicon/robot/examine(mob/user)
+	to_chat(user, "<span class='info'>*---------*</span>")
 	..(user)
 
-	var/msg = ""
+	var/msg = "<span class='info'>"
 	var/obj/act_module = get_active_hand()
 	if(act_module)
 		msg += "It is holding [bicon(act_module)] \a [act_module].\n"
 	msg += "<span class='warning'>"
-	if (src.getBruteLoss())
-		if (src.getBruteLoss() < 75)
+	if(getBruteLoss())
+		if(getBruteLoss() < maxHealth*0.5)
 			msg += "It looks slightly dented.\n"
 		else
 			msg += "<B>It looks severely dented!</B>\n"
-	if (src.getFireLoss())
-		if (src.getFireLoss() < 75)
+	if(getFireLoss())
+		if(getFireLoss() < maxHealth*0.5)
 			msg += "It looks slightly charred.\n"
 		else
 			msg += "<B>It looks severely burnt and heat-warped!</B>\n"
-	if (src.fire_stacks < 0)
+	if(health < -maxHealth*0.5)
+		msg += "It looks barely operational.\n"
+	if(fire_stacks < 0)
 		msg += "It's covered in water.\n"
-	if (src.fire_stacks > 0)
+	else if(fire_stacks > 0)
 		msg += "It's coated in something flammable.\n"
 	msg += "</span>"
 
 	if(opened)
 		msg += "<span class='warning'>Its cover is open and the power cell is [cell ? "installed" : "missing"].</span>\n"
 	else
-		msg += "Its cover is closed.\n"
+		msg += "Its cover is closed[locked ? "" : ", and looks unlocked"].\n"
 
-	if(!has_power)
-		msg += "<span class='warning'>It appears to be running on backup power.</span>\n"
+	if(cell && cell.charge <= 0)
+		msg += "<span class='warning'>Its battery indicator is blinking red!</span>\n"
 
-	switch(src.stat)
+	switch(stat)
 		if(CONSCIOUS)
-			if(!src.client)	msg += "It appears to be in stand-by mode.\n" //afk
-		if(UNCONSCIOUS)		msg += "<span class='warning'>It doesn't seem to be responding.</span>\n"
-		if(DEAD)			msg += "<span class='deadsay'>It looks completely unsalvageable.</span>\n"
+			if(!client)
+				msg += "It appears to be in stand-by mode.\n" //afk
+		if(UNCONSCIOUS)
+			msg += "<span class='warning'>It doesn't seem to be responding.</span>\n"
+		if(DEAD)
+			msg += "<span class='deadsay'>It looks like its system is corrupted and requires a reset.</span>\n"
 	msg += "*---------*</span>"
 
 	if(print_flavor_text()) msg += "\n[print_flavor_text()]\n"
 
-	if (pose)
+	if(pose)
 		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
 			pose = addtext(pose,".") //Makes sure all emotes end with a period.
 		msg += "\nIt is [pose]"
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index 7e824eeb279..d843203ebc3 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -45,7 +45,7 @@
 	if(activated(O))
 		to_chat(src, "Already activated")
 		return
-	if (is_component_functioning("power cell") && cell)
+	if(is_component_functioning("power cell") && cell)
 		if(istype(O, /obj/item/borg))
 			var/obj/item/borg/B = O
 			if(B.powerneeded)
diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
index bc575831537..2a62a0b1cc4 100644
--- a/code/modules/mob/living/silicon/robot/laws.dm
+++ b/code/modules/mob/living/silicon/robot/laws.dm
@@ -7,12 +7,12 @@
 	laws_sanity_check()
 	var/who
 
-	if (everyone)
+	if(everyone)
 		who = world
 	else
 		who = src
 	if(lawupdate)
-		if (connected_ai)
+		if(connected_ai)
 			if(connected_ai.stat || connected_ai.control_disabled)
 				to_chat(src, "<b>AI signal lost, unable to sync laws.</b>")
 
@@ -30,11 +30,11 @@
 	to_chat(who, "<b>Obey these laws:</b>")
 	laws.show_laws(who)
 	// TODO: Update to new antagonist system.
-	if (mind && (mind.special_role == "traitor" && mind.original == src) && connected_ai)
+	if(mind && (mind.special_role == "traitor" && mind.original == src) && connected_ai)
 		to_chat(who, "<b>Remember, [connected_ai.name] is technically your master, but your objective comes first.</b>")
-	else if (connected_ai)
+	else if(connected_ai)
 		to_chat(who, "<b>Remember, [connected_ai.name] is your master, other AIs can be ignored.</b>")
-	else if (emagged)
+	else if(emagged)
 		to_chat(who, "<b>Remember, you are not required to listen to the AI.</b>")
 	else
 		to_chat(who, "<b>Remember, you are not bound to any AI, you are not required to listen to them.</b>")
@@ -43,7 +43,7 @@
 /mob/living/silicon/robot/lawsync()
 	laws_sanity_check()
 	var/datum/ai_laws/master = connected_ai && lawupdate ? connected_ai.laws : null
-	if (master)
+	if(master)
 		master.sync(src)
 	..()
 	return
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index fa534b66123..90dc2a059ac 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -2,14 +2,14 @@
 	set invisibility = 0
 	set background = BACKGROUND_ENABLED
 
-	if (src.notransform)
+	if(src.notransform)
 		return
 
 	//Status updates, death etc.
 	clamp_values()
 
 	if(..())
-		use_power()
+		handle_robot_cell()
 		process_locks()
 		process_queued_alarms()
 
@@ -20,57 +20,32 @@
 	sleeping = 0
 	ear_deaf = 0
 
+/mob/living/silicon/robot/proc/handle_robot_cell()
+	if(stat != DEAD)
+		if(!is_component_functioning("power cell") || !cell)
+			Paralyse(2)
+			uneq_all()
+			low_power_mode = 1
+			update_headlamp()
+			diag_hud_set_borgcell()
+			return
+		if(low_power_mode)
+			if(is_component_functioning("power cell") && cell && cell.charge)
+				low_power_mode = 0
+				update_headlamp()
+		else if(stat == CONSCIOUS)
+			use_power()
 
 /mob/living/silicon/robot/proc/use_power()
-	if (stat == DEAD)
-		return
-	else if (is_component_functioning("power cell") && cell)
-		if(module)
-			for(var/obj/item/borg/B in get_all_slots())
-				if(B.powerneeded)
-					if((cell.charge * 100 / cell.maxcharge) < B.powerneeded)
-						to_chat(src, "Deactivating [B.name] due to lack of power!")
-						uneq_module(B)
-		if(cell.charge <= 0)
+	if(is_component_functioning("power cell") && cell && cell.charge)
+		if(cell.charge <= 100)
 			uneq_all()
-			update_headlamp(1)
-			stat = UNCONSCIOUS
-			has_power = 0
-			for(var/V in components)
-				var/datum/robot_component/C = components[V]
-				if(C.name == "actuator") // Let drained robots move, disable the rest
-					continue
-				C.consume_power()
-		else if(cell.charge <= 100)
-			uneq_all()
-			cell.use(1)
-		else
-			if(module_state_1)
-				cell.use(4)
-			if(module_state_2)
-				cell.use(4)
-			if(module_state_3)
-				cell.use(4)
-
-			for(var/V in components)
-				var/datum/robot_component/C = components[V]
-				C.consume_power()
-
-			var/amt = Clamp((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
-			cell.use(amt) //Usage table: 1/tick if off/lowest setting, 4 = 4/tick, 6 = 8/tick, 8 = 12/tick, 10 = 16/tick
-
-			if(!is_component_functioning("actuator"))
-				Paralyse(3)
-			eye_blind = 0
-			// Please, PLEASE be careful with statements like this - make sure they're not
-			// dead beforehand, for example -- Crazylemon
-			stat = CONSCIOUS
-			has_power = 1
+		var/amt = Clamp((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
+		cell.use(amt) //Usage table: 1/tick if off/lowest setting, 4 = 4/tick, 6 = 8/tick, 8 = 12/tick, 10 = 16/tick
 	else
 		uneq_all()
-		stat = UNCONSCIOUS
-		update_headlamp(1)
-		Paralyse(3)
+		low_power_mode = 1
+		update_headlamp()
 	diag_hud_set_borgcell()
 
 /mob/living/silicon/robot/handle_regular_status_updates()
@@ -232,7 +207,7 @@
 
 
 /mob/living/silicon/robot/proc/update_items()
-	if (client)
+	if(client)
 		for(var/obj/I in get_all_slots())
 			client.screen |= I
 	if(module_state_1)
diff --git a/code/modules/mob/living/silicon/robot/photos.dm b/code/modules/mob/living/silicon/robot/photos.dm
index 33f739c41c9..88bf9c50990 100644
--- a/code/modules/mob/living/silicon/robot/photos.dm
+++ b/code/modules/mob/living/silicon/robot/photos.dm
@@ -1,12 +1,12 @@
 /mob/living/silicon/robot/proc/photosync()
 	var/obj/item/device/camera/siliconcam/master_cam = connected_ai ? connected_ai.aiCamera : null
-	if (!master_cam)
+	if(!master_cam)
 		return
 
 	var/synced
 	synced = 0
 	for(var/datum/picture/z in aiCamera.aipictures)
-		if (!(master_cam.aipictures.Find(z)))
+		if(!(master_cam.aipictures.Find(z)))
 			aiCamera.printpicture(null, z)
 			synced = 1
 	if(synced)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 81c781b51ff..cc586d37bb7 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -61,7 +61,7 @@ var/list/robot_verbs_default = list(
 	var/datum/effect/system/ion_trail_follow/ion_trail = null
 	var/datum/effect/system/spark_spread/spark_system//So they can initialize sparks whenever/N
 	var/jeton = 0
-	var/has_power = 1
+	var/low_power_mode = 0 //whether the robot has no charge left.
 	var/weapon_lock = 0
 	var/weaponlock_time = 120
 	var/lawupdate = 1 //Cyborgs will sync their laws with their AI by default
@@ -168,7 +168,7 @@ var/list/robot_verbs_default = list(
 		setup_PDA()
 
 		//We also need to update name of internal camera.
-		if (camera)
+		if(camera)
 			camera.c_tag = newname
 
 		//Check for custom sprite
@@ -221,7 +221,7 @@ var/list/robot_verbs_default = list(
 
 // setup the PDA and its name
 /mob/living/silicon/robot/proc/setup_PDA()
-	if (!rbPDA)
+	if(!rbPDA)
 		rbPDA = new(src)
 	rbPDA.set_name_and_job(real_name, braintype)
 	if(scrambledcodes)
@@ -231,8 +231,6 @@ var/list/robot_verbs_default = list(
 
 /mob/living/silicon/robot/binarycheck()
 	if(is_component_functioning("comms"))
-		var/datum/robot_component/RC = get_component("comms")
-		use_power(RC.energy_consumption)
 		return 1
 	return 0
 
@@ -375,7 +373,7 @@ var/list/robot_verbs_default = list(
 	module.add_subsystems(src)
 
 	//Custom_sprite check and entry
-	if (custom_sprite == 1)
+	if(custom_sprite == 1)
 		module_sprites["Custom"] = "[src.ckey]-[modtype]"
 
 	hands.icon_state = lowertext(module.module_type)
@@ -411,9 +409,9 @@ var/list/robot_verbs_default = list(
 		return null
 
 	var/dat = "<HEAD><TITLE>[src.name] Self-Diagnosis Report</TITLE></HEAD><BODY>\n"
-	for (var/V in components)
+	for(var/V in components)
 		var/datum/robot_component/C = components[V]
-		dat += "<b>[C.name]</b><br><table><tr><td>Power consumption</td><td>[C.energy_consumption]</td></tr><tr><td>Brute Damage:</td><td>[C.brute_damage]</td></tr><tr><td>Electronics Damage:</td><td>[C.electronics_damage]</td></tr><tr><td>Powered:</td><td>[(!C.energy_consumption || C.is_powered()) ? "Yes" : "No"]</td></tr><tr><td>Toggled:</td><td>[ C.toggled ? "Yes" : "No"]</td></table><br>"
+		dat += "<b>[C.name]</b><br><table><tr><td>Brute Damage:</td><td>[C.brute_damage]</td></tr><tr><td>Electronics Damage:</td><td>[C.electronics_damage]</td></tr><tr><td>Powered:</td><td>[C.is_powered() ? "Yes" : "No"]</td></tr><tr><td>Toggled:</td><td>[ C.toggled ? "Yes" : "No"]</td></table><br>"
 
 	return dat
 
@@ -467,7 +465,7 @@ var/list/robot_verbs_default = list(
 	src.verbs -= silicon_subsystems
 
 /mob/living/silicon/robot/blob_act()
-	if (stat != 2)
+	if(stat != 2)
 		adjustBruteLoss(60)
 		updatehealth()
 		return 1
@@ -481,7 +479,7 @@ var/list/robot_verbs_default = list(
 	..()
 	if(ticker && ticker.mode.name == "AI malfunction")
 		var/datum/game_mode/malfunction/malf = ticker.mode
-		for (var/datum/mind/malfai in malf.malf_ai)
+		for(var/datum/mind/malfai in malf.malf_ai)
 			if(connected_ai)
 				if(connected_ai.mind == malfai)
 					if(malf.apcs >= 3)
@@ -495,7 +493,7 @@ var/list/robot_verbs_default = list(
 /mob/living/silicon/robot/proc/show_jetpack_pressure()
 	// if you have a jetpack, show the internal tank pressure
 	var/obj/item/weapon/tank/jetpack/current_jetpack = installed_jetpack()
-	if (current_jetpack)
+	if(current_jetpack)
 		stat("Internal Atmosphere Info", current_jetpack.name)
 		stat("Tank Pressure", current_jetpack.air_contents.return_pressure())
 
@@ -519,7 +517,7 @@ var/list/robot_verbs_default = list(
 /mob/living/silicon/robot/Stat()
 	..()
 	statpanel("Status")
-	if (client.statpanel == "Status")
+	if(client.statpanel == "Status")
 		show_cell_power()
 		show_jetpack_pressure()
 
@@ -533,11 +531,11 @@ var/list/robot_verbs_default = list(
 			gib()
 			return
 		if(2.0)
-			if (stat != 2)
+			if(stat != 2)
 				adjustBruteLoss(60)
 				adjustFireLoss(60)
 		if(3.0)
-			if (stat != 2)
+			if(stat != 2)
 				adjustBruteLoss(30)
 	return
 
@@ -551,7 +549,7 @@ var/list/robot_verbs_default = list(
 
 /mob/living/silicon/robot/Bump(atom/movable/AM as mob|obj, yes)
 	spawn( 0 )
-		if ((!( yes ) || now_pushing))
+		if((!( yes ) || now_pushing))
 			return
 		now_pushing = 1
 		if(ismob(AM))
@@ -566,13 +564,13 @@ var/list/robot_verbs_default = list(
 				return
 		now_pushing = 0
 		..()
-		if (!istype(AM, /atom/movable))
+		if(!istype(AM, /atom/movable))
 			return
-		if (!now_pushing)
+		if(!now_pushing)
 			now_pushing = 1
-			if (!AM.anchored)
+			if(!AM.anchored)
 				var/t = get_dir(src, AM)
-				if (istype(AM, /obj/structure/window/full))
+				if(istype(AM, /obj/structure/window/full))
 					for(var/obj/structure/window/win in get_step(AM,t))
 						now_pushing = 0
 						return
@@ -582,7 +580,7 @@ var/list/robot_verbs_default = list(
 	return
 
 /mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/restraints/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do
+	if(istype(W, /obj/item/weapon/restraints/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do
 		return
 
 	if(opened) // Are they trying to insert something?
@@ -604,15 +602,15 @@ var/list/robot_verbs_default = list(
 
 				return
 
-	if (istype(W, /obj/item/weapon/weldingtool) && user.a_intent == I_HELP)
+	if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent == I_HELP)
 		if(W == module_active)
 			return
-		if (!getBruteLoss())
+		if(!getBruteLoss())
 			to_chat(user, "<span class='notice'>Nothing to fix!</span>")
 			return
 		var/obj/item/weapon/weldingtool/WT = W
 		user.changeNext_move(CLICK_CD_MELEE)
-		if (WT.remove_fuel(0))
+		if(WT.remove_fuel(0))
 			playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 			adjustBruteLoss(-30)
 			updatehealth()
@@ -624,7 +622,7 @@ var/list/robot_verbs_default = list(
 
 
 	else if(istype(W, /obj/item/stack/cable_coil) && user.a_intent == I_HELP && (wiresexposed || istype(src,/mob/living/silicon/robot/drone)))
-		if (!getFireLoss())
+		if(!getFireLoss())
 			to_chat(user, "<span class='notice'>Nothing to fix!</span>")
 			return
 		var/obj/item/stack/cable_coil/coil = W
@@ -634,7 +632,7 @@ var/list/robot_verbs_default = list(
 		coil.use(1)
 		user.visible_message("<span class='alert'>\The [user] fixes some of the burnt wires on \the [src] with \the [coil].</span>")
 
-	else if (istype(W, /obj/item/weapon/crowbar))	// crowbar means open or close the cover
+	else if(istype(W, /obj/item/weapon/crowbar))	// crowbar means open or close the cover
 		if(opened)
 			if(cell)
 				to_chat(user, "You close the cover.")
@@ -693,7 +691,7 @@ var/list/robot_verbs_default = list(
 				opened = 1
 				update_icons()
 
-	else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened)	// trying to put a cell inside
+	else if(istype(W, /obj/item/weapon/stock_parts/cell) && opened)	// trying to put a cell inside
 		var/datum/robot_component/C = components["power cell"]
 		if(wiresexposed)
 			to_chat(user, "Close the panel first.")
@@ -713,8 +711,8 @@ var/list/robot_verbs_default = list(
 			C.electronics_damage = 0
 			diag_hud_set_borgcell()
 
-	else if (istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/multitool))
-		if (wiresexposed)
+	else if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/multitool))
+		if(wiresexposed)
 			wires.Interact(user)
 		else
 			to_chat(user, "You can't reach the wiring.")
@@ -737,7 +735,7 @@ var/list/robot_verbs_default = list(
 		else
 			to_chat(user, "Unable to locate a radio.")
 
-	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))			// trying to unlock the interface with an ID card
+	else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))			// trying to unlock the interface with an ID card
 		if(emagged)//still allow them to open the cover
 			to_chat(user, "The interface seems slightly damaged")
 		if(opened)
@@ -847,28 +845,28 @@ var/list/robot_verbs_default = list(
 				to_chat(usr, "You unlock your cover.")
 
 /mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+	if(istype(loc, /turf) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
 		return
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
+				if((O.client && !( O.blinded )))
 					O.show_message(text("<span class='notice'>[M] caresses [src]'s plating with its scythe like arm.</span>"), 1)
 
-		if (I_GRAB)
+		if(I_GRAB)
 			grabbedby(M)
 
-		if (I_HARM)
+		if(I_HARM)
 			M.do_attack_animation(src)
 			var/damage = rand(10, 20)
-			if (prob(90))
+			if(prob(90))
 				playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 				visible_message("<span class='danger'>[M] has slashed at [src]!</span>",\
 								"<span class='userdanger'>[M] has slashed at [src]!</span>")
@@ -881,10 +879,10 @@ var/list/robot_verbs_default = list(
 				visible_message("<span class='danger'>[M] took a swipe at [src]!</span>", \
 								"<span class='userdanger'>[M] took a swipe at [src]!</span>")
 
-		if (I_DISARM)
+		if(I_DISARM)
 			if(!(lying))
 				M.do_attack_animation(src)
-				if (prob(85))
+				if(prob(85))
 					Stun(7)
 					step(src,get_dir(M,src))
 					spawn(5)
@@ -960,7 +958,7 @@ var/list/robot_verbs_default = list(
 			diag_hud_set_borgcell()
 
 	if(!opened && (!istype(user, /mob/living/silicon)))
-		if (user.a_intent == I_HELP)
+		if(user.a_intent == I_HELP)
 			user.visible_message("<span class='notice'>[user] pets [src]!</span>", \
 								"<span class='notice'>You pet [src]!</span>")
 
@@ -992,7 +990,7 @@ var/list/robot_verbs_default = list(
 /mob/living/silicon/robot/update_icons()
 
 	overlays.Cut()
-	if(stat != DEAD && !(paralysis || stunned || weakened)) //Not dead, not stunned.
+	if(stat != DEAD && !(paralysis || stunned || weakened || low_power_mode)) //Not dead, not stunned.
 		overlays += "eyes-[icon_state]"
 	else
 		overlays -= "eyes"
@@ -1015,7 +1013,7 @@ var/list/robot_verbs_default = list(
 
 	var/combat = list("Combat","Peacekeeper")
 	if(modtype in combat)
-		if (base_icon == "")
+		if(base_icon == "")
 			base_icon = icon_state
 		if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
 			icon_state = "[base_icon]-roll"
@@ -1050,14 +1048,14 @@ var/list/robot_verbs_default = list(
 	<B>Installed Modules</B><BR><BR>
 
 	<table border='0'>"}
-	for (var/obj in module.modules)
-		if (!obj)
+	for(var/obj in module.modules)
+		if(!obj)
 			dat += text("<tr><td><B>Resource depleted</B></td></tr>")
 		else if(activated(obj))
 			dat += text("<tr><td>[obj]</td><td><B>Activated</B></td></tr>")
 		else
 			dat += text("<tr><td>[obj]</td><td><A HREF=?src=\ref[src];act=\ref[obj]>Activate</A></td></tr>")
-	if (emagged)
+	if(emagged)
 		if(activated(module.emag))
 			dat += text("<tr><td>[module.emag]</td><td><B>Activated</B></td></tr>")
 		else
@@ -1081,31 +1079,31 @@ var/list/robot_verbs_default = list(
 	if(usr != src)
 		return 1
 
-	if (href_list["mach_close"])
+	if(href_list["mach_close"])
 		var/t1 = text("window=[href_list["mach_close"]]")
 		unset_machine()
 		src << browse(null, t1)
 		return 1
 
-	if (href_list["showalerts"])
+	if(href_list["showalerts"])
 		subsystem_alarm_monitor()
 		return 1
 
-	if (href_list["mod"])
+	if(href_list["mod"])
 		var/obj/item/O = locate(href_list["mod"])
-		if (istype(O) && (O.loc == src))
+		if(istype(O) && (O.loc == src))
 			O.attack_self(src)
 		return 1
 
-	if (href_list["act"])
+	if(href_list["act"])
 		var/obj/item/O = locate(href_list["act"])
-		if (!istype(O) || !(O.loc == src || O.loc == src.module))
+		if(!istype(O) || !(O.loc == src || O.loc == src.module))
 			return 1
 
 		activate_module(O)
 		installed_modules()
 
-	if (href_list["deact"])
+	if(href_list["deact"])
 		var/obj/item/O = locate(href_list["deact"])
 		if(activated(O))
 			if(module_state_1 == O)
@@ -1130,7 +1128,7 @@ var/list/robot_verbs_default = list(
 	radio.interact(src)//Just use the radio's Topic() instead of bullshit special-snowflake code
 
 /mob/living/silicon/robot/proc/control_headlamp()
-	if(stat || lamp_recharging)
+	if(stat || lamp_recharging || low_power_mode)
 		to_chat(src, "<span class='danger'>This function is currently offline.</span>")
 		return
 
@@ -1142,7 +1140,7 @@ var/list/robot_verbs_default = list(
 /mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0, var/cooldown = 100)
 	set_light(0)
 
-	if(lamp_intensity && (turn_off || stat))
+	if(lamp_intensity && (turn_off || stat || low_power_mode))
 		to_chat(src, "<span class='danger'>Your headlamp has been deactivated.</span>")
 		lamp_intensity = 0
 		lamp_recharging = 1
@@ -1173,7 +1171,7 @@ var/list/robot_verbs_default = list(
 			var/turf/tile = loc
 			if(isturf(tile))
 				tile.clean_blood()
-				if (istype(tile, /turf/simulated))
+				if(istype(tile, /turf/simulated))
 					var/turf/simulated/S = tile
 					S.dirt = 0
 				for(var/A in tile)
@@ -1246,7 +1244,7 @@ var/list/robot_verbs_default = list(
 	set src = usr
 
 	var/obj/item/W = get_active_hand()
-	if (W)
+	if(W)
 		W.attack_self(src)
 
 	return
@@ -1271,7 +1269,7 @@ var/list/robot_verbs_default = list(
 
 	var/icontype
 
-	if (custom_sprite == 1)
+	if(custom_sprite == 1)
 		icontype = "Custom"
 		triesleft = 0
 	else
@@ -1292,7 +1290,7 @@ var/list/robot_verbs_default = list(
 
 	update_icons()
 
-	if (triesleft >= 1)
+	if(triesleft >= 1)
 		var/choice = input("Look at your icon - is this what you want?") in list("Yes","No")
 		if(choice=="No")
 			choose_icon(triesleft, module_sprites)
@@ -1329,7 +1327,7 @@ var/list/robot_verbs_default = list(
 		sync()
 
 /mob/living/silicon/robot/adjustOxyLoss(var/amount)
-	if (suiciding)
+	if(suiciding)
 		..()
 
 /mob/living/silicon/robot/regenerate_icons()
@@ -1470,3 +1468,11 @@ var/list/robot_verbs_default = list(
 	status_flags &= ~CANPUSH
 
 	notify_ai(2)
+
+/mob/living/silicon/robot/emp_act(severity)
+	..()
+	switch(severity)
+		if(1)
+			disable_component("comms", 160)
+		if(2)
+			disable_component("comms", 60)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm
index 70d6cf86bb9..2ef7f30e45b 100644
--- a/code/modules/mob/living/silicon/robot/robot_damage.dm
+++ b/code/modules/mob/living/silicon/robot/robot_damage.dm
@@ -4,7 +4,7 @@
 		stat = CONSCIOUS
 		return
 	health = maxHealth - (getOxyLoss() + getFireLoss() + getBruteLoss())
-	if (stat == DEAD && health > 0)
+	if(stat == DEAD && health > 0)
 		update_revive()
 		var/mob/dead/observer/ghost = get_ghost()
 		if(ghost)
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index 13c48d03ac5..84c07ee7c20 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -17,7 +17,7 @@
 			select_colour(user)
 
 		if("Mode")
-			if (mode == 1)
+			if(mode == 1)
 				mode = 2
 			else
 				mode = 1
@@ -30,10 +30,10 @@
 // see code\modules\paperwork\paper.dm line 62
 
 /obj/item/weapon/pen/multi/robopen/proc/RenamePaper(mob/user as mob,obj/paper as obj)
-	if ( !user || !paper )
+	if( !user || !paper )
 		return
 	var/n_name = input(user, "What would you like to label the paper?", "Paper Labelling", null)  as text
-	if ( !user || !paper )
+	if( !user || !paper )
 		return
 
 	n_name = copytext(n_name, 1, 32)
@@ -87,7 +87,7 @@
 	set src in range(0)
 
 	var/N = input("How much damage should the shield absorb?") in list("5","10","25","50","75","100")
-	if (N)
+	if(N)
 		shield_level = text2num(N)/100
 
 /obj/item/borg/combat/mobility
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 7fb1ba0a8aa..3eb032726bf 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -2,7 +2,7 @@
 	name = "robot module"
 	icon = 'icons/obj/module.dmi'
 	icon_state = "std_module"
-	w_class = 100.0
+	w_class = 100
 	item_state = "electronic"
 	flags = CONDUCT
 
@@ -230,7 +230,7 @@
 	src.modules += new /obj/item/device/flash/cyborg(src)
 	src.modules += new /obj/item/weapon/soap/nanotrasen(src)
 	src.modules += new /obj/item/weapon/storage/bag/trash/cyborg(src)
-	src.modules += new /obj/item/weapon/mop(src)
+	src.modules += new /obj/item/weapon/mop/advanced/cyborg(src)
 	src.modules += new /obj/item/device/lightreplacer(src)
 	src.modules += new /obj/item/weapon/holosign_creator(src)
 	src.emag = new /obj/item/weapon/reagent_containers/spray(src)
@@ -507,7 +507,7 @@
 
 //checks whether this item is a module of the robot it is located in.
 /obj/item/proc/is_robot_module()
-	if (!istype(src.loc, /mob/living/silicon/robot))
+	if(!istype(src.loc, /mob/living/silicon/robot))
 		return 0
 
 	var/mob/living/silicon/robot/R = src.loc
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index 94ae02a56ce..7f25a743fc7 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -20,7 +20,7 @@
 	if(message_mode == "department")
 		return holopad_talk(message, verb, speaking)
 	else if(message_mode)
-		if (aiRadio.disabledAi || aiRestorePowerRoutine || stat)
+		if(aiRadio.disabledAi || aiRestorePowerRoutine || stat)
 			to_chat(src, "<span class='danger'>System Error - Transceiver Disabled.</span>")
 			return 0
 		if(message_mode == "general")
@@ -41,9 +41,9 @@
 /mob/living/silicon/say_quote(var/text)
 	var/ending = copytext(text, length(text))
 
-	if (ending == "?")
+	if(ending == "?")
 		return speak_query
-	else if (ending == "!")
+	else if(ending == "!")
 		return speak_exclamation
 
 	return speak_statement
@@ -54,14 +54,14 @@
 
 /mob/living/silicon/say_understands(var/other,var/datum/language/speaking = null)
 	//These only pertain to common. Languages are handled by mob/say_understands()
-	if (!speaking)
-		if (istype(other, /mob/living/carbon))
+	if(!speaking)
+		if(istype(other, /mob/living/carbon))
 			return 1
-		if (istype(other, /mob/living/silicon))
+		if(istype(other, /mob/living/silicon))
 			return 1
-		if (istype(other, /mob/living/simple_animal/bot))
+		if(istype(other, /mob/living/simple_animal/bot))
 			return 1
-		if (istype(other, /mob/living/carbon/brain))
+		if(istype(other, /mob/living/carbon/brain))
 			return 1
 	return ..()
 
@@ -72,7 +72,7 @@
 
 	message = trim(message)
 
-	if (!message)
+	if(!message)
 		return
 
 	var/obj/machinery/hologram/holopad/T = src.holo
@@ -113,7 +113,7 @@
 
 	message = trim(message)
 
-	if (!message)
+	if(!message)
 		return
 
 	var/obj/machinery/hologram/holopad/T = src.holo
@@ -128,6 +128,13 @@
 		return
 	return 1
 
+/mob/living/silicon/ai/emote(var/act, var/type, var/message)
+	var/obj/machinery/hologram/holopad/T = src.holo
+	if(T && T.hologram && T.master == src) //Is the AI using a holopad?
+		src.holopad_emote(message)
+	else //Emote normally, then.
+		..()
+
 #undef IS_AI
 #undef IS_ROBOT
 #undef IS_PAI
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index e6fc318335b..c3dd1b71ae4 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -130,7 +130,7 @@
 /proc/islinked(var/mob/living/silicon/robot/bot, var/mob/living/silicon/ai/ai)
 	if(!istype(bot) || !istype(ai))
 		return 0
-	if (bot.connected_ai == ai)
+	if(bot.connected_ai == ai)
 		return 1
 	return 0
 
@@ -163,15 +163,15 @@
 	return universal_speak || (speaking in src.speech_synthesizer_langs)	//need speech synthesizer support to vocalize a language
 
 /mob/living/silicon/add_language(var/language, var/can_speak=1)
-	if (..(language) && can_speak)
+	if(..(language) && can_speak)
 		speech_synthesizer_langs.Add(all_languages[language])
 		return 1
 
 /mob/living/silicon/remove_language(var/rem_language)
 	..(rem_language)
 
-	for (var/datum/language/L in speech_synthesizer_langs)
-		if (L.name == rem_language)
+	for(var/datum/language/L in speech_synthesizer_langs)
+		if(L.name == rem_language)
 			speech_synthesizer_langs -= L
 
 /mob/living/silicon/check_languages()
@@ -209,7 +209,7 @@
 	onclose(src, "airoster")
 
 /mob/living/silicon/Bump(atom/movable/AM as mob|obj, yes)  //Allows the AI to bump into mobs if it's itself pushed
-        if ((!( yes ) || now_pushing))
+        if((!( yes ) || now_pushing))
                 return
         now_pushing = 1
         if(ismob(AM))
@@ -219,13 +219,13 @@
                         return
         now_pushing = 0
         ..()
-        if (!istype(AM, /atom/movable))
+        if(!istype(AM, /atom/movable))
                 return
-        if (!now_pushing)
+        if(!now_pushing)
                 now_pushing = 1
-                if (!AM.anchored)
+                if(!AM.anchored)
                         var/t = get_dir(src, AM)
-                        if (istype(AM, /obj/structure/window))
+                        if(istype(AM, /obj/structure/window))
                                 if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
                                         for(var/obj/structure/window/win in get_step(AM,t))
                                                 now_pushing = 0
@@ -278,16 +278,16 @@
 	var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) in list("Security", "Medical","Diagnostic","Disable")
 	remove_med_sec_hud()
 	switch(sensor_type)
-		if ("Security")
+		if("Security")
 			add_sec_hud()
 			to_chat(src, "<span class='notice'>Security records overlay enabled.</span>")
-		if ("Medical")
+		if("Medical")
 			add_med_hud()
 			to_chat(src, "<span class='notice'>Life signs monitor overlay enabled.</span>")
-		if ("Diagnostic")
+		if("Diagnostic")
 			add_diag_hud()
 			to_chat(src, "<span class='notice'>Robotics diagnostic overlay enabled.</span>")
-		if ("Disable")
+		if("Disable")
 			to_chat(src, "Sensor augmentations disabled.")
 
 /mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised)
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index ca5ca8fa33f..39d54ab1696 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -325,7 +325,7 @@
 		else
 			to_chat(user, "<span class='notice'>You attempt to pull [paicard] free...</span>")
 			if(do_after(user, 30, target = src))
-				if (paicard)
+				if(paicard)
 					user.visible_message("<span class='notice'>[user] uses [W] to pull [paicard] out of [bot_name]!</span>","<span class='notice'>You pull [paicard] out of [bot_name] with [W].</span>")
 					ejectpai(user)
 	else
@@ -417,7 +417,7 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
 */
 /mob/living/simple_animal/bot/proc/scan(scan_type, old_target, scan_range = DEFAULT_SCAN_RANGE)
 	var/final_result
-	for (var/scan in shuffle(view(scan_range, src))) //Search for something in range!
+	for(var/scan in shuffle(view(scan_range, src))) //Search for something in range!
 		if(!istype(scan, scan_type)) //Check that the thing we found is the type we want!
 			continue //If not, keep searching!
 		if( (scan in ignore_list) || (scan == old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 34888dd3488..497393cf5d7 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -323,7 +323,7 @@ Auto Patrol[]"},
 		return
 	anchored = 0
 	threatlevel = 0
-	for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
+	for(var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
 		if((C.stat) || (C.handcuffed))
 			continue
 
diff --git a/code/modules/mob/living/simple_animal/bot/emote.dm b/code/modules/mob/living/simple_animal/bot/emote.dm
new file mode 100644
index 00000000000..1bf29d14178
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/bot/emote.dm
@@ -0,0 +1,120 @@
+/mob/living/simple_animal/bot/emote(var/act, var/m_type=1, var/message = null)
+	var/param = null
+	if(findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
+	//Emote Cooldown System (it's so simple!)
+	// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
+	var/on_CD = 0
+	act = lowertext(act)
+	switch(act)
+		//Cooldown-inducing emotes
+		if("scream", "screams")
+			on_CD = handle_emote_CD(50) //longer cooldown
+		if("ping","buzz","beep","yes","no")		//halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
+			on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm
+		//Everything else, including typos of the above emotes
+		else
+			on_CD = 0	//If it doesn't induce the cooldown, we won't check for the cooldown
+
+	if(on_CD == 1)		// Check if we need to suppress the emote attempt.
+		return			// Suppress emote, you're still cooling off.
+	//--FalseIncarnate
+
+	switch(act)
+		if("ping")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> pings at [param]."
+			else
+				message = "<B>[src]</B> pings."
+			playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+			m_type = 2
+
+		if("buzz")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> buzzes at [param]."
+			else
+				message = "<B>[src]</B> buzzes."
+			playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+			m_type = 2
+
+		if("beep")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> beeps at [param]."
+			else
+				message = "<B>[src]</B> beeps."
+			playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+			m_type = 2
+
+		if("yes")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> emits an affirmative blip at [param]."
+			else
+				message = "<B>[src]</B> emits an affirmative blip."
+			playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0)
+			m_type = 2
+
+		if("no")
+			var/M = null
+			if(param)
+				for(var/mob/A in view(null, null))
+					if(param == A.name)
+						M = A
+						break
+			if(!M)
+				param = null
+
+			if(param)
+				message = "<B>[src]</B> emits a negative blip at [param]."
+			else
+				message = "<B>[src]</B> emits a negative blip."
+			playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0)
+			m_type = 2
+
+		if("scream", "screams")
+			message = "<B>[src]</B> screams!"
+			playsound(src.loc, 'sound/goonstation/voice/robot_scream.ogg', 80, 0)
+			m_type = 2
+
+	..(act, m_type, message)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 45af81affb5..bb62af5ce35 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -106,8 +106,8 @@
 		visible_message("[user] crowbars out the power cell from [src].",
 						"<span class='notice'>You pry the powercell out of [src].</span>")
 		update_controls()
-	else if (istype(I, /obj/item/weapon/wrench))
-		if (health < maxHealth)
+	else if(istype(I, /obj/item/weapon/wrench))
+		if(health < maxHealth)
 			adjustBruteLoss(-25)
 			updatehealth()
 			user.visible_message(
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 284584406c2..f89b0a1760f 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -385,7 +385,7 @@ Auto Patrol: []"},
 
 /mob/living/simple_animal/bot/secbot/proc/look_for_perp()
 	anchored = 0
-	for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
+	for(var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
 		if((C.stat) || (C.handcuffed))
 			continue
 
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index c894b014a87..4cbf3dd91ce 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -40,12 +40,13 @@
 	return
 
 /mob/living/simple_animal/construct/examine(mob/user)
+	to_chat(user, "<span class='info'>*---------*</span>")
 	..(user)
 
-	var/msg = ""
-	if (src.health < src.maxHealth)
+	var/msg = "<span class='info'>"
+	if(src.health < src.maxHealth)
 		msg += "<span class='warning'>"
-		if (src.health >= src.maxHealth/2)
+		if(src.health >= src.maxHealth/2)
 			msg += "It looks slightly dented.\n"
 		else
 			msg += "<B>It looks severely dented!</B>\n"
@@ -251,7 +252,7 @@
 	set category = "Behemoth"
 	set name = "Summon Cultist (300)"
 	set desc = "Teleport a cultist to your location"
-	if (istype(usr,/mob/living/simple_animal/constructbehemoth))
+	if(istype(usr,/mob/living/simple_animal/constructbehemoth))
 
 		if(usr.energy<300)
 			to_chat(usr, "\red You do not have enough power stored!")
@@ -263,12 +264,12 @@
 		usr.energy -= 300
 	var/list/mob/living/cultists = new
 	for(var/datum/mind/H in ticker.mode.cult)
-		if (istype(H.current,/mob/living))
+		if(istype(H.current,/mob/living))
 			cultists+=H.current
 			var/mob/cultist = input("Choose the one who you want to summon", "Followers of Geometer") as null|anything in (cultists - usr)
 			if(!cultist)
 				return
-			if (cultist == usr) //just to be sure.
+			if(cultist == usr) //just to be sure.
 				return
 			cultist.loc = usr.loc
 			usr.visible_message("/red [cultist] appears in a flash of red light as [usr] glows with power")*/
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 0f685c2d69c..04e6c0d7a2f 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -80,8 +80,8 @@
 				custom_emote(1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.")
 			return
 
-	if (istype(O, /obj/item/weapon/razor))
-		if (shaved)
+	if(istype(O, /obj/item/weapon/razor))
+		if(shaved)
 			to_chat(user, "<span class='warning'>You can't shave this corgi, it's already been shaved!</span>")
 			return
 		user.visible_message("[user] starts to shave [src] using \the [O].", "<span class='notice'>You start to shave [src] using \the [O]...</span>")
@@ -437,13 +437,13 @@
 					step_to(src,movement_target,1)
 
 					if(movement_target)		//Not redundant due to sleeps, Item can be gone in 6 decisecomds
-						if (movement_target.loc.x < src.x)
+						if(movement_target.loc.x < src.x)
 							dir = WEST
-						else if (movement_target.loc.x > src.x)
+						else if(movement_target.loc.x > src.x)
 							dir = EAST
-						else if (movement_target.loc.y < src.y)
+						else if(movement_target.loc.y < src.y)
 							dir = SOUTH
-						else if (movement_target.loc.y > src.y)
+						else if(movement_target.loc.y > src.y)
 							dir = NORTH
 						else
 							dir = SOUTH
@@ -471,7 +471,7 @@
 /mob/living/simple_animal/pet/corgi/Ian/Bump(atom/movable/AM as mob|obj, yes)
 
 	spawn( 0 )
-		if ((!( yes ) || now_pushing))
+		if((!( yes ) || now_pushing))
 			return
 		now_pushing = 1
 		if(ismob(AM))
@@ -488,13 +488,13 @@
 			tmob.LAssailant = src
 		now_pushing = 0
 		..()
-		if (!( istype(AM, /atom/movable) ))
+		if(!( istype(AM, /atom/movable) ))
 			return
-		if (!( now_pushing ))
+		if(!( now_pushing ))
 			now_pushing = 1
-			if (!( AM.anchored ))
+			if(!( AM.anchored ))
 				var/t = get_dir(src, AM)
-				if (istype(AM, /obj/structure/window/full))
+				if(istype(AM, /obj/structure/window/full))
 					for(var/obj/structure/window/win in get_step(AM,t))
 						now_pushing = 0
 						return
@@ -622,7 +622,7 @@
 
 /mob/living/simple_animal/pet/corgi/Ian/borgi/proc/explode()
 	for(var/mob/M in viewers(src, null))
-		if (M.client)
+		if(M.client)
 			M.show_message("\red [src] makes an odd whining noise.")
 	sleep(10)
 	explosion(get_turf(src), 0, 1, 4, 7)
@@ -631,7 +631,7 @@
 /mob/living/simple_animal/pet/corgi/Ian/borgi/proc/shootAt(var/atom/movable/target)
 	var/turf/T = get_turf(src)
 	var/turf/U = get_turf(target)
-	if (!T || !U)
+	if(!T || !U)
 		return
 	var/obj/item/projectile/beam/A = new /obj/item/projectile/beam(loc)
 	A.icon = 'icons/effects/genetics.dmi'
@@ -647,7 +647,7 @@
 	..()
 	if(emagged && prob(25))
 		var/mob/living/carbon/target = locate() in view(10,src)
-		if (target)
+		if(target)
 			shootAt(target)
 
 	//spark for no reason
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
index dc687743197..a20c7b73d5f 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
@@ -4,7 +4,7 @@
 	set category = "Corgi"
 	to_chat(src, text("[pick("You dance around","You chase your tail")]."))
 	for(var/mob/O in oviewers(src, null))
-		if ((O.client && !( O.blinded )))
+		if((O.client && !( O.blinded )))
 			to_chat(O, text("[] [pick("dances around","chases its tail")].", src))
 	for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
 		dir = i
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 31da301ce57..5d409814940 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -69,7 +69,7 @@
 					if(MED.amount <= 0)
 						qdel(MED)
 					for(var/mob/M in viewers(src, null))
-						if ((M.client && !( M.blinded )))
+						if((M.client && !( M.blinded )))
 							M.show_message("\blue [user] applies the [MED] on [src]")
 		else
 			to_chat(user, "\blue this [src] is dead, medical items won't bring it back to life.")
@@ -77,12 +77,12 @@
 		if(O.force)
 			health -= O.force
 			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
+				if((M.client && !( M.blinded )))
 					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
 		else
 			to_chat(usr, "\red This weapon is ineffective, it does no damage.")
 			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
+				if((M.client && !( M.blinded )))
 					M.show_message("\red [user] gently taps [src] with the [O]. ")
 
 /mob/living/simple_animal/crab/Topic(href, href_list)
diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm
index 125061f9275..8bb2ea57f85 100644
--- a/code/modules/mob/living/simple_animal/friendly/diona.dm
+++ b/code/modules/mob/living/simple_animal/friendly/diona.dm
@@ -191,7 +191,7 @@
 	adult.real_name = pick(diona_names)	//I hate this being here of all places but unfortunately dna is based on real_name!
 	adult.rename_self("diona")
 
-	for (var/obj/item/W in src.contents)
+	for(var/obj/item/W in src.contents)
 		src.unEquip(W)
 
 	qdel(src)
@@ -249,3 +249,26 @@
 /mob/living/simple_animal/diona/put_in_active_hand(obj/item/W)
 	to_chat(src, "<span class='warning'>You don't have any hands!</span>")
 	return
+
+/mob/living/simple_animal/diona/emote(var/act, var/m_type=1, var/message = null)
+	if(stat)
+		return
+
+	var/on_CD = 0
+	act = lowertext(act)
+	switch(act)
+		if("chirp")
+			on_CD = handle_emote_CD()
+		else
+			on_CD = 0
+
+	if(on_CD == 1)
+		return
+
+	switch(act) //IMPORTANT: Emotes MUST NOT CONFLICT anywhere along the chain.
+		if("chirp")
+			message = "<B>\The [src]</B> chirps!"
+			m_type = 2 //audible
+			playsound(src, 'sound/misc/nymphchirp.ogg', 40, 1, 1)
+
+	..(act, m_type, message)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 346a04e7851..06fb36b5787 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -194,7 +194,9 @@
 	if(.)
 		amount_grown += rand(1,2)
 		if(amount_grown >= 100)
-			new /mob/living/simple_animal/chicken(src.loc)
+			var/mob/living/simple_animal/chicken/C = new /mob/living/simple_animal/chicken(loc)
+			if(mind)
+				mind.transfer_to(C)
 			qdel(src)
 
 var/const/MAX_CHICKENS = 50
diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm
index eac1a448571..6bbadd7e8d5 100644
--- a/code/modules/mob/living/simple_animal/friendly/slime.dm
+++ b/code/modules/mob/living/simple_animal/friendly/slime.dm
@@ -18,7 +18,7 @@
 /mob/living/simple_animal/slime/Bump(atom/movable/AM as mob|obj, yes)
 
 	spawn( 0 )
-		if ((!( yes ) || now_pushing))
+		if((!( yes ) || now_pushing))
 			return
 		now_pushing = 1
 		if(ismob(AM))
@@ -35,13 +35,13 @@
 			tmob.LAssailant = src
 		now_pushing = 0
 		..()
-		if (!( istype(AM, /atom/movable) ))
+		if(!( istype(AM, /atom/movable) ))
 			return
-		if (!( now_pushing ))
+		if(!( now_pushing ))
 			now_pushing = 1
-			if (!( AM.anchored ))
+			if(!( AM.anchored ))
 				var/t = get_dir(src, AM)
-				if (istype(AM, /obj/structure/window/full))
+				if(istype(AM, /obj/structure/window/full))
 					for(var/obj/structure/window/win in get_step(AM,t))
 						now_pushing = 0
 						return
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 9e2e33d7c4e..4ddfa827dc3 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -84,9 +84,9 @@
 		src.update_icon()
 		return 1
 
-	if (istype(O, /obj/item/weapon/weldingtool))
+	if(istype(O, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = O
-		if (WT.remove_fuel(0))
+		if(WT.remove_fuel(0))
 			if(health < maxHealth)
 				health += pick(1,1,1,2,2,3)
 				if(health > maxHealth)
@@ -100,7 +100,7 @@
 			to_chat(user, "Need more welding fuel!")
 			return
 	else if(istype(O, /obj/item/weapon/card/id)||istype(O, /obj/item/device/pda))
-		if (!mmi)
+		if(!mmi)
 			to_chat(user, "\red There's no reason to swipe your ID - the spiderbot has no brain to remove.")
 			return 0
 
@@ -128,20 +128,20 @@
 	else
 		if(O.force)
 			var/damage = O.force
-			if (O.damtype == STAMINA)
+			if(O.damtype == STAMINA)
 				damage = 0
 			adjustBruteLoss(damage)
 			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
+				if((M.client && !( M.blinded )))
 					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
 		else
 			to_chat(usr, "\red This weapon is ineffective, it does no damage.")
 			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
+				if((M.client && !( M.blinded )))
 					M.show_message("\red [user] gently taps [src] with the [O]. ")
 
 /mob/living/simple_animal/spiderbot/emag_act(user as mob)
-	if (emagged)
+	if(emagged)
 		to_chat(user, "\red [src] is already overloaded - better run.")
 		return 0
 	else
@@ -163,7 +163,7 @@
 
 /mob/living/simple_animal/spiderbot/proc/explode() //When emagged.
 	for(var/mob/M in viewers(src, null))
-		if ((M.client && !( M.blinded )))
+		if((M.client && !( M.blinded )))
 			M.show_message("\red [src] makes an odd warbling noise, fizzles, and explodes.")
 	explosion(get_turf(loc), -1, -1, 3, 5)
 	eject_brain()
diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm
new file mode 100644
index 00000000000..c4a71cca618
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/illusion.dm
@@ -0,0 +1,75 @@
+/mob/living/simple_animal/hostile/illusion
+	name = "illusion"
+	desc = "It's a fake!"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "static"
+	icon_living = "static"
+	icon_dead = "null"
+	melee_damage_lower = 5
+	melee_damage_upper = 5
+	a_intent = "harm"
+	attacktext = "gores"
+	maxHealth = 100
+	health = 100
+	speed = 0
+	faction = list("illusion")
+	var/life_span = INFINITY //how long until they despawn
+	var/mob/living/parent_mob
+	var/multiply_chance = 0 //if we multiply on hit
+
+
+/mob/living/simple_animal/hostile/illusion/Life()
+	..()
+	if(world.time > life_span)
+		death()
+
+/mob/living/simple_animal/hostile/illusion/death(gibbed)
+	..()
+	visible_message("<span class='danger'>\The [src] vanishes into thin air! It was a fake!</span>")
+	ghostize()
+	qdel(src)
+
+/mob/living/simple_animal/hostile/illusion/proc/Copy_Parent(mob/living/original, life = 50, health = 100, damage = 0, replicate = 0 )
+	appearance = original.appearance
+	parent_mob = original
+	dir = original.dir
+	life_span = world.time+life
+	melee_damage_lower = damage
+	melee_damage_upper = damage
+	multiply_chance = replicate
+	faction -= "neutral"
+	transform = initial(transform)
+	pixel_y = initial(pixel_y)
+	pixel_x = initial(pixel_x)
+
+/mob/living/simple_animal/hostile/illusion/examine(mob/user)
+	if(parent_mob)
+		parent_mob.examine(user)
+	else
+		return ..()
+
+
+/mob/living/simple_animal/hostile/illusion/AttackingTarget()
+	..()
+	if(istype(target, /mob/living) && prob(multiply_chance))
+		var/mob/living/L = target
+		if(L.stat == DEAD)
+			return
+		var/mob/living/simple_animal/hostile/illusion/M = new(loc)
+		M.faction = faction.Copy()
+		M.Copy_Parent(parent_mob, 80, health/2, melee_damage_upper, multiply_chance/2)
+		M.GiveTarget(L)
+
+///////Actual Types/////////
+
+/mob/living/simple_animal/hostile/illusion/escape
+	retreat_distance = 10
+	minimum_distance = 10
+	melee_damage_lower = 0
+	melee_damage_upper = 0
+	speed = -1
+	environment_smash = 0
+
+
+/mob/living/simple_animal/hostile/illusion/escape/AttackingTarget()
+	return
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 6d2efd88010..287c3aaa69d 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -456,8 +456,8 @@
 		if(istype(target, /obj/item/clothing/suit/space/rig/mining) || istype(target, /obj/item/clothing/head/helmet/space/rig/mining) || istype(target, /obj/item/clothing/suit/space/eva/plasmaman/miner) || istype(target, /obj/item/clothing/head/helmet/space/eva/plasmaman/miner))
 			var/obj/item/clothing/C = target
 			var/current_armor = C.armor
-			if(current_armor.["melee"] < 80)
-				current_armor.["melee"] = min(current_armor.["melee"] + 10, 80)
+			if(current_armor.["melee"] < 60)
+				current_armor.["melee"] = min(current_armor.["melee"] + 10, 60)
 				to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
 				qdel(src)
 			else
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 32bdf5fc772..72388af0037 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -39,6 +39,7 @@
 	icon_living = "syndicatemelee"
 	attacktext = "slashes"
 	attack_sound = 'sound/weapons/bladeslice.ogg'
+	armour_penetration = 28
 	status_flags = 0
 	loot = list(/obj/effect/landmark/mobcorpse/syndicatesoldier, /obj/item/weapon/melee/energy/sword/saber/red, /obj/item/weapon/shield/energy)
 
@@ -46,7 +47,7 @@
 	if(O.force)
 		if(prob(80))
 			var/damage = O.force
-			if (O.damtype == STAMINA)
+			if(O.damtype == STAMINA)
 				damage = 0
 			health -= damage
 			visible_message("\red \b [src] has been attacked with the [O] by [user]. ")
diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm
index 0029bbec7fd..1fc2df4cf76 100644
--- a/code/modules/mob/living/simple_animal/posessed_object.dm
+++ b/code/modules/mob/living/simple_animal/posessed_object.dm
@@ -19,8 +19,8 @@
 	var/obj/item/possessed_item
 
 
-/mob/living/simple_animal/possessed_object/examine()
-	possessed_item.examine()
+/mob/living/simple_animal/possessed_object/examine(mob/user)
+	possessed_item.examine(user)
 	if(health > (maxHealth / 30))
 		to_chat(usr, "<span class='warning'>[src] appears to be floating without any support!</span>")
 	else
@@ -77,7 +77,7 @@
 /mob/living/simple_animal/possessed_object/New(var/atom/loc as obj)
 	..()
 
-	if (!istype(loc, /obj/item)) // Some silly motherfucker spawned us directly via the game panel.
+	if(!istype(loc, /obj/item)) // Some silly motherfucker spawned us directly via the game panel.
 		message_admins("<span class='adminnotice'>Posessed object improperly spawned, deleting.</span>") // So silly admins with debug off will see the message too and not spam these things.
 		log_debug("[src] spawned manually, no object to assign attributes to.")
 		qdel()
diff --git a/code/modules/mob/living/simple_animal/powers.dm b/code/modules/mob/living/simple_animal/powers.dm
index 934c93bb3ad..9177b61ea2d 100644
--- a/code/modules/mob/living/simple_animal/powers.dm
+++ b/code/modules/mob/living/simple_animal/powers.dm
@@ -6,15 +6,15 @@
 	if(stat != CONSCIOUS)
 		return
 
-	if (layer != TURF_LAYER+0.2)
+	if(layer != TURF_LAYER+0.2)
 		layer = TURF_LAYER+0.2
 		to_chat(src, text("\green You are now hiding."))
 		for(var/mob/O in oviewers(src, null))
-			if ((O.client && !( O.blinded )))
+			if((O.client && !( O.blinded )))
 				to_chat(O, text("<B>[] scurries to the ground!</B>", src))
 	else
 		layer = MOB_LAYER
 		to_chat(src, text("\green You have stopped hiding."))
 		for(var/mob/O in oviewers(src, null))
-			if ((O.client && !( O.blinded )))
+			if((O.client && !( O.blinded )))
 				to_chat(O, text("[] slowly peaks up from the ground...", src))
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 9aff96b1fcf..736b6c9b599 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -41,15 +41,15 @@
 		else
 			if(O.force)
 				var/damage = O.force
-				if (O.damtype == STAMINA)
+				if(O.damtype == STAMINA)
 					damage = 0
 				health -= damage
 				for(var/mob/M in viewers(src, null))
-					if ((M.client && !( M.blinded )))
+					if((M.client && !( M.blinded )))
 						M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
 			else
 				to_chat(usr, "\red This weapon is ineffective, it does no damage.")
 				for(var/mob/M in viewers(src, null))
-					if ((M.client && !( M.blinded )))
+					if((M.client && !( M.blinded )))
 						M.show_message("\red [user] gently taps [src] with the [O]. ")
 		return
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 9eee62d810a..362846dfd4a 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -49,6 +49,7 @@
 	//LETTING SIMPLE ANIMALS ATTACK? WHAT COULD GO WRONG. Defaults to zero so Ian can still be cuddly
 	var/melee_damage_lower = 0
 	var/melee_damage_upper = 0
+	var/armour_penetration = 0 //How much armour they ignore, as a flat reduction from the targets armour value
 	var/melee_damage_type = BRUTE //Damage type of a simple mob's melee attack, should it do damage.
 	var/list/damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) // 1 for full damage , 0 for none , -1 for 1:1 heal from that source
 	var/attacktext = "attacks"
@@ -307,14 +308,14 @@
 	switch(M.a_intent)
 
 		if(I_HELP)
-			if (health > 0)
+			if(health > 0)
 				visible_message("<span class='notice'> [M] [response_help] [src].</span>")
 				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 
 		if(I_GRAB)
-			if (M == src || anchored)
+			if(M == src || anchored)
 				return
-			if (!(status_flags & CANPUSH))
+			if(!(status_flags & CANPUSH))
 				return
 
 			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
@@ -340,10 +341,10 @@
 
 	switch(M.a_intent)
 
-		if (I_HELP)
+		if(I_HELP)
 
 			visible_message("<span class='notice'>[M] caresses [src] with its scythe like arm.</span>")
-		if (I_GRAB)
+		if(I_GRAB)
 			grabbedby(M)
 
 		if(I_HARM, I_DISARM)
@@ -376,13 +377,13 @@
 
 
 /mob/living/simple_animal/attack_slime(mob/living/carbon/slime/M as mob)
-	if (!ticker)
+	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
 	if(M.Victim) return // can't attack while eating!
 
-	if (health > 0)
+	if(health > 0)
 		M.do_attack_animation(src)
 		visible_message("<span class='danger'>[M.name] glomps [src]!</span>", \
 				"<span class='userdanger'>[M.name] glomps [src]!</span>")
@@ -439,14 +440,13 @@
 			if(O.force)
 				if(O.force >= force_threshold)
 					damage = O.force
-					if (O.damtype == STAMINA)
+					if(O.damtype == STAMINA)
 						damage = 0
 					visible_message("<span class='danger'>[user] has [O.attack_verb.len ? "[pick(O.attack_verb)]": "attacked"] [src] with [O]!</span>",\
 									"<span class='userdanger'>[user] has [O.attack_verb.len ? "[pick(O.attack_verb)]": "attacked"] you with [O]!</span>")
 				else
 					visible_message("<span class='danger'>[O] bounces harmlessly off of [src].</span>",\
 									"<span class='userdanger'>[O] bounces harmlessly off of [src].</span>")
-				playsound(loc, O.hitsound, 50, 1, -1)
 			else
 				user.visible_message("<span class='warning'>[user] gently taps [src] with [O].</span>",\
 									"<span class='warning'>This weapon is ineffective, it does no damage.</span>")
@@ -481,12 +481,12 @@
 
 /mob/living/simple_animal/ex_act(severity)
 	..()
-	switch (severity)
-		if (1.0)
+	switch(severity)
+		if(1.0)
 			gib()
 			return
 
-		if (2.0)
+		if(2.0)
 			adjustBruteLoss(60)
 
 
@@ -526,17 +526,17 @@
 /mob/living/simple_animal/proc/CanAttack(var/atom/the_target)
 	if(see_invisible < the_target.invisibility)
 		return 0
-	if (isliving(the_target))
+	if(isliving(the_target))
 		var/mob/living/L = the_target
 		if(L.stat != CONSCIOUS)
 			return 0
-	if (istype(the_target, /obj/mecha))
+	if(istype(the_target, /obj/mecha))
 		var/obj/mecha/M = the_target
-		if (M.occupant)
+		if(M.occupant)
 			return 0
-	if (istype(the_target,/obj/spacepod))
+	if(istype(the_target,/obj/spacepod))
 		var/obj/spacepod/S = the_target
-		if (S.pilot)
+		if(S.pilot)
 			return 0
 	return 1
 
diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm
index 23def05f072..a6eb14fb25d 100644
--- a/code/modules/mob/living/simple_animal/tribbles.dm
+++ b/code/modules/mob/living/simple_animal/tribbles.dm
@@ -91,7 +91,7 @@ var/global/totaltribbles = 0   //global variable so it updates for all tribbles,
 	icon = 'icons/mob/tribbles.dmi'
 	icon_state = "tribble1"
 	item_state = "tribble1"
-	w_class = 10.0
+	w_class = 10
 	var/gestation = 0
 
 /obj/item/toy/tribble/attack_self(mob/user as mob) //hug that tribble (and play a sound if we add one)
@@ -115,7 +115,7 @@ var/global/totaltribbles = 0   //global variable so it updates for all tribbles,
 	if(istype(O, /obj/item/weapon/scalpel) && src.gestation != null)
 		gestation = null
 		to_chat(user, "<span class='notice'>You neuter the tribble so that it can no longer re-produce.</span>")
-	else if (istype(O, /obj/item/weapon/cautery) && src.gestation == null)
+	else if(istype(O, /obj/item/weapon/cautery) && src.gestation == null)
 		gestation = 0
 		to_chat(user, "<span class='notice'>You fuse some recently cut tubes together, it should be able to reproduce again.</span>")
 
@@ -136,16 +136,16 @@ var/global/totaltribbles = 0   //global variable so it updates for all tribbles,
 
 /obj/structure/tribble_cage/ex_act(severity)
 	switch(severity)
-		if (1)
+		if(1)
 			new /obj/item/weapon/shard( src.loc )
 			Break()
 			qdel(src)
-		if (2)
-			if (prob(50))
+		if(2)
+			if(prob(50))
 				src.health -= 15
 				src.healthcheck()
-		if (3)
-			if (prob(50))
+		if(3)
+			if(prob(50))
 				src.health -= 5
 				src.healthcheck()
 
@@ -158,15 +158,15 @@ var/global/totaltribbles = 0   //global variable so it updates for all tribbles,
 
 
 /obj/structure/tribble_cage/blob_act()
-	if (prob(75))
+	if(prob(75))
 		new /obj/item/weapon/shard( src.loc )
 		Break()
 		qdel(src)
 
 
 /obj/structure/tribble_cage/proc/healthcheck()
-	if (src.health <= 0)
-		if (!( src.destroyed ))
+	if(src.health <= 0)
+		if(!( src.destroyed ))
 			src.density = 0
 			src.destroyed = 1
 			new /obj/item/weapon/shard( src.loc )
@@ -192,12 +192,12 @@ var/global/totaltribbles = 0   //global variable so it updates for all tribbles,
 
 
 /obj/structure/tribble_cage/attack_hand(mob/user as mob)
-	if (src.destroyed)
+	if(src.destroyed)
 		return
 	else
 		to_chat(usr, text("\blue You kick the lab cage."))
 		for(var/mob/O in oviewers())
-			if ((O.client && !( O.blinded )))
+			if((O.client && !( O.blinded )))
 				to_chat(O, text("\red [] kicks the lab cage.", usr))
 		src.health -= 2
 		healthcheck()
diff --git a/code/modules/mob/living/simple_animal/vox.dm b/code/modules/mob/living/simple_animal/vox.dm
index 1a46e46e4e4..ba68a18a12b 100644
--- a/code/modules/mob/living/simple_animal/vox.dm
+++ b/code/modules/mob/living/simple_animal/vox.dm
@@ -35,20 +35,20 @@
 	if(O.force)
 		if(O.force >= 25)
 			var/damage = O.force
-			if (O.damtype == STAMINA)
+			if(O.damtype == STAMINA)
 				damage = 0
 			health -= damage
 			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
+				if((M.client && !( M.blinded )))
 					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
 		else
 			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
+				if((M.client && !( M.blinded )))
 					M.show_message("\red \b The [O] bounces harmlessly off of [src]. ")
 	else
 		to_chat(usr, "\red This weapon is ineffective, it does no damage.")
 		for(var/mob/M in viewers(src, null))
-			if ((M.client && !( M.blinded )))
+			if((M.client && !( M.blinded )))
 				M.show_message("\red [user] gently taps [src] with the [O]. ")
 
 /mob/living/simple_animal/vox/armalis/verb/fire_quill(mob/target as mob in oview())
@@ -62,7 +62,7 @@
 
 	to_chat(src, "\red You launch a razor-sharp quill at [target]!")
 	for(var/mob/O in oviewers())
-		if ((O.client && !( O.blinded )))
+		if((O.client && !( O.blinded )))
 			to_chat(O, "\red [src] launches a razor-sharp quill at [target]!")
 
 	var/obj/item/weapon/quill/Q = new(loc)
@@ -81,7 +81,7 @@
 	icon_state = "quill"
 	item_state = "quill"
 	throwforce = 5
-	w_class = 3.0
+	w_class = 3
 	sharp = 1
 	edge = 0
 
@@ -98,7 +98,7 @@
 	target = input("Select a creature!", "Speak to creature", null, null) as null|anything in targets
 	text = input("What would you like to say?", "Speak to creature", null, null)
 
-	if (!target || !text)
+	if(!target || !text)
 		return
 
 	var/mob/M = targets[target]
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 5cf956e610a..28886862c2f 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -74,10 +74,8 @@
 	add_click_catcher()
 
 	if(viewing_alternate_appearances && viewing_alternate_appearances.len)
-		for(var/aakey in viewing_alternate_appearances)
-			var/datum/alternate_appearance/AA = viewing_alternate_appearances[aakey]
-			if(AA)
-				AA.display_to(list(src))
+		for(var/datum/alternate_appearance/AA in viewing_alternate_appearances)
+			AA.display_to(list(src))
 
 	CallHook("Login", list("client" = src.client, "mob" = src))
 
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index fdc342876dc..43fc3f0b480 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -3,7 +3,7 @@
 	player_list -= src
 	log_access("Logout: [key_name(src)]")
 	if(admin_datums[src.ckey])
-		if (ticker && ticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
+		if(ticker && ticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
 			var/admins_number = admins.len
 
 			message_admins("Admin logout: [key_name_admin(src)]")
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 7bce0e0e0cf..77054087e31 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -23,7 +23,6 @@
 	else
 		living_mob_list += src
 	prepare_huds()
-	emoteHandler = new /datum/emoteHandler(src)
 	..()
 
 /atom/proc/prepare_huds()
@@ -57,20 +56,20 @@
 
 	if(!client)	return
 
-	if (type)
+	if(type)
 		if(type & 1 && (sdisabilities & BLIND || blinded || paralysis) )//Vision related
-			if (!( alt ))
+			if(!( alt ))
 				return
 			else
 				msg = alt
 				type = alt_type
-		if (type & 2 && (sdisabilities & DEAF || ear_deaf))//Hearing related
-			if (!( alt ))
+		if(type & 2 && (sdisabilities & DEAF || ear_deaf))//Hearing related
+			if(!( alt ))
 				return
 			else
 				msg = alt
 				type = alt_type
-				if ((type & 1 && sdisabilities & BLIND))
+				if((type & 1 && sdisabilities & BLIND))
 					return
 	// Added voice muffling for Issue 41.
 	if(stat == UNCONSCIOUS || (sleeping > 0 && stat != 2))
@@ -146,7 +145,7 @@
 
 /mob/proc/findname(msg)
 	for(var/mob/M in mob_list)
-		if (M.real_name == text("[]", msg))
+		if(M.real_name == text("[]", msg))
 			return M
 	return 0
 
@@ -171,7 +170,7 @@
 	var/obj/item/W = get_active_hand()
 
 	if(istype(W))
-		if (istype(W, /obj/item/clothing))
+		if(istype(W, /obj/item/clothing))
 			var/obj/item/clothing/C = W
 			if(C.rig_restrict_helmet)
 				to_chat(src, "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)")// Stop eva helms equipping.
@@ -248,6 +247,7 @@
 					return // Bag could not be placed in players hands.  I don't know what to do here...
 		//Now, B represents a container we can insert W into.
 		B.handle_item_insertion(W,1)
+		return B
 
 //The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot.
 var/list/slot_equipment_priority = list( \
@@ -402,7 +402,7 @@ var/list/slot_equipment_priority = list( \
 			if(slot_w_uniform)
 				if( !(slot_flags & SLOT_ICLOTHING) )
 					return 0
-				if((FAT in H.mutations) && !(flags & ONESIZEFITSALL))
+				if((FAT in H.mutations) && !(flags_size & ONESIZEFITSALL))
 					return 0
 				if(H.w_uniform)
 					if(!(H.w_uniform.flags & NODROP))
@@ -481,7 +481,7 @@ var/list/slot_equipment_priority = list( \
 					return 0
 				return 1
 			if(slot_in_backpack)
-				if (H.back && istype(H.back, /obj/item/weapon/storage/backpack))
+				if(H.back && istype(H.back, /obj/item/weapon/storage/backpack))
 					var/obj/item/weapon/storage/backpack/B = H.back
 					if(B.contents.len < B.storage_slots && w_class <= B.max_w_class)
 						return 1
@@ -490,12 +490,12 @@ var/list/slot_equipment_priority = list( \
 		//END HUMAN
 
 /mob/proc/reset_view(atom/A)
-	if (client)
-		if (istype(A, /atom/movable))
+	if(client)
+		if(istype(A, /atom/movable))
 			client.perspective = EYE_PERSPECTIVE
 			client.eye = A
 		else
-			if (isturf(loc))
+			if(isturf(loc))
 				client.eye = client.mob
 				client.perspective = MOB_PERSPECTIVE
 			else
@@ -546,7 +546,7 @@ var/list/slot_equipment_priority = list( \
 		return 0
 
 	var/tile = get_turf(A)
-	if (!tile)
+	if(!tile)
 		return 0
 
 	changeNext_move(CLICK_CD_POINT)
@@ -559,30 +559,30 @@ var/list/slot_equipment_priority = list( \
 	return 1
 
 /mob/proc/ret_grab(obj/effect/list_container/mobl/L as obj, flag)
-	if ((!( istype(l_hand, /obj/item/weapon/grab) ) && !( istype(r_hand, /obj/item/weapon/grab) )))
-		if (!( L ))
+	if((!( istype(l_hand, /obj/item/weapon/grab) ) && !( istype(r_hand, /obj/item/weapon/grab) )))
+		if(!( L ))
 			return null
 		else
 			return L.container
 	else
-		if (!( L ))
+		if(!( L ))
 			L = new /obj/effect/list_container/mobl( null )
 			L.container += src
 			L.master = src
-		if (istype(l_hand, /obj/item/weapon/grab))
+		if(istype(l_hand, /obj/item/weapon/grab))
 			var/obj/item/weapon/grab/G = l_hand
-			if (!( L.container.Find(G.affecting) ))
+			if(!( L.container.Find(G.affecting) ))
 				L.container += G.affecting
-				if (G.affecting)
+				if(G.affecting)
 					G.affecting.ret_grab(L, 1)
-		if (istype(r_hand, /obj/item/weapon/grab))
+		if(istype(r_hand, /obj/item/weapon/grab))
 			var/obj/item/weapon/grab/G = r_hand
-			if (!( L.container.Find(G.affecting) ))
+			if(!( L.container.Find(G.affecting) ))
 				L.container += G.affecting
-				if (G.affecting)
+				if(G.affecting)
 					G.affecting.ret_grab(L, 1)
-		if (!( flag ))
-			if (L.master == src)
+		if(!( flag ))
+			if(L.master == src)
 				var/list/temp = list(  )
 				temp += L.container
 				//L = null
@@ -602,12 +602,12 @@ var/list/slot_equipment_priority = list( \
 
 	if(hand)
 		var/obj/item/W = l_hand
-		if (W)
+		if(W)
 			W.attack_self(src)
 			update_inv_l_hand()
 	else
 		var/obj/item/W = r_hand
-		if (W)
+		if(W)
 			W.attack_self(src)
 			update_inv_r_hand()
 	return
@@ -647,15 +647,15 @@ var/list/slot_equipment_priority = list( \
 /mob/proc/store_memory(msg as message, popup, sane = 1)
 	msg = copytext(msg, 1, MAX_MESSAGE_LEN)
 
-	if (sane)
+	if(sane)
 		msg = sanitize(msg)
 
-	if (length(memory) == 0)
+	if(length(memory) == 0)
 		memory += msg
 	else
 		memory += "<BR>[msg]"
 
-	if (popup)
+	if(popup)
 		memory()
 
 /mob/proc/update_flavor_text()
@@ -671,7 +671,7 @@ var/list/slot_equipment_priority = list( \
 		flavor_text = msg
 
 /mob/proc/print_flavor_text(var/shrink = 1)
-	if (flavor_text && flavor_text != "")
+	if(flavor_text && flavor_text != "")
 		var/msg = replacetext(flavor_text, "\n", " ")
 		if(lentext(msg) <= 40 || !shrink)
 			return "<span class='notice'>[html_encode(msg)]</span>" //Repeat after me, "I will not give players access to decoded HTML."
@@ -688,11 +688,11 @@ var/list/slot_equipment_priority = list( \
 	set name = "Respawn"
 	set category = "OOC"
 
-	if (!abandon_allowed)
+	if(!abandon_allowed)
 		to_chat(usr, "<span class='warning'>Respawning is disabled.</span>")
 		return
 
-	if (stat != DEAD || !ticker)
+	if(stat != DEAD || !ticker)
 		to_chat(usr, "<span class='boldnotice'>You must be dead to use this!</span>")
 		return
 
@@ -742,7 +742,7 @@ var/list/slot_equipment_priority = list( \
 			continue
 		if(istype(O, /obj/item/weapon/disk/nuclear))
 			var/name = "Nuclear Disk"
-			if (names.Find(name))
+			if(names.Find(name))
 				namecounts[name]++
 				name = "[name] ([namecounts[name]])"
 			else
@@ -752,7 +752,7 @@ var/list/slot_equipment_priority = list( \
 
 		if(istype(O, /obj/singularity))
 			var/name = "Singularity"
-			if (names.Find(name))
+			if(names.Find(name))
 				namecounts[name]++
 				name = "[name] ([namecounts[name]])"
 			else
@@ -763,7 +763,7 @@ var/list/slot_equipment_priority = list( \
 
 	for(var/mob/M in sortAtom(mob_list))
 		var/name = M.name
-		if (names.Find(name))
+		if(names.Find(name))
 			namecounts[name]++
 			name = "[name] ([namecounts[name]])"
 		else
@@ -780,14 +780,14 @@ var/list/slot_equipment_priority = list( \
 	var/ok = "[is_admin ? "Admin Observe" : "Observe"]"
 	eye_name = input("Please, select a player!", ok, null, null) as null|anything in creatures
 
-	if (!eye_name)
+	if(!eye_name)
 		return
 
 	var/mob/mob_eye = creatures[eye_name]
 
 	if(client && mob_eye)
 		client.eye = mob_eye
-		if (is_admin)
+		if(is_admin)
 			client.adminobs = 1
 			if(mob_eye == client.mob || client.eye == client.mob)
 				client.adminobs = 0
@@ -869,9 +869,9 @@ var/list/slot_equipment_priority = list( \
 
 //this and stop_pulling really ought to be /mob/living procs
 /mob/proc/start_pulling(atom/movable/AM)
-	if ( !AM || !src || src==AM || !isturf(AM.loc) )	//if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
+	if( !AM || !src || src==AM || !isturf(AM.loc) )	//if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
 		return
-	if (!( AM.anchored ))
+	if(!( AM.anchored ))
 		AM.add_fingerprint(src)
 
 		// If we're pulling something then drop what we're currently pulling and pull this instead.
@@ -1244,7 +1244,7 @@ mob/proc/yank_out_object()
 			affected.wounds += I
 			H.custom_pain("Something tears wetly in your [affected] as [selection] is pulled free!", 1)
 
-		if (ishuman(U))
+		if(ishuman(U))
 			var/mob/living/carbon/human/human_user = U
 			human_user.bloody_hands(H)
 
@@ -1344,7 +1344,7 @@ mob/proc/yank_out_object()
 	if(stat==DEAD)
 		return
 	var/turf/location = loc
-	if (istype(location, /turf/simulated))
+	if(istype(location, /turf/simulated))
 		if(green)
 			if(!no_text)
 				visible_message("<span class='warning'>[src] vomits up some green goo!</span>","<span class='warning'>You vomit up some green goo!</span>")
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 13d5d7c976e..0786320e9cb 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -167,7 +167,7 @@
 	Unlike the object spell system, it's also possible to attach verb procs from these objects to right-click menus.
 	This requires creating a verb for the object proc holder.
 
-	if (proc_holder_list.len)//Generic list for proc_holder objects.
+	if(proc_holder_list.len)//Generic list for proc_holder objects.
 		for(var/obj/effect/proc_holder/P in proc_holder_list)
 			statpanel("[P.panel]","",P)
 	*/
@@ -233,6 +233,4 @@
 
 	var/datum/vision_override/vision_type = null //Vision override datum.
 
-	var/list/permanent_huds = list()
-
-	var/datum/emoteHandler/emoteHandler
\ No newline at end of file
+	var/list/permanent_huds = list()
\ No newline at end of file
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index e9ee311db76..90f84b7fc74 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -26,7 +26,7 @@
 	plane = HUD_PLANE
 	item_state = "nothing"
 	icon = 'icons/mob/screen_gen.dmi'
-	w_class = 5.0
+	w_class = 5
 
 
 /obj/item/weapon/grab/New(var/mob/user, var/mob/victim)
@@ -54,7 +54,7 @@
 
 	//check if assailant is grabbed by victim as well
 	if(assailant.grabbed_by)
-		for (var/obj/item/weapon/grab/G in assailant.grabbed_by)
+		for(var/obj/item/weapon/grab/G in assailant.grabbed_by)
 			if(G.assailant == affecting && G.affecting == assailant)
 				G.dancing = 1
 				G.adjust_position()
@@ -362,7 +362,7 @@
 						msg_admin_attack("[key_name(assailant)] has pressed his fingers into [key_name(affecting)]'s eyes.")
 						var/obj/item/organ/internal/eyes/eyes = affected.get_int_organ(/obj/item/organ/internal/eyes)
 						eyes.damage += rand(3,4)
-						if (eyes.damage >= eyes.min_broken_damage)
+						if(eyes.damage >= eyes.min_broken_damage)
 							if(M.stat != 2)
 								to_chat(M, "\red You go blind!")*///This is a demonstration of adding a new damaging type based on intent as well as hitzone.
 
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 35318d6ef65..ff29bda1d9d 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -124,12 +124,12 @@ proc/getsensorlevel(A)
 		return 0
 
 /proc/stars(n, pr)
-	if (pr == null)
+	if(pr == null)
 		pr = 25
-	if (pr <= 0)
+	if(pr <= 0)
 		return null
 	else
-		if (pr >= 100)
+		if(pr >= 100)
 			return n
 	var/te = n
 	var/t = ""
@@ -137,7 +137,7 @@ proc/getsensorlevel(A)
 	var/p = null
 	p = 1
 	while(p <= n)
-		if ((copytext(te, p, p + 1) == " " || prob(pr)))
+		if((copytext(te, p, p + 1) == " " || prob(pr)))
 			t = text("[][]", t, copytext(te, p, p + 1))
 		else
 			t = text("[]*", t)
@@ -176,14 +176,14 @@ proc/slur(phrase, var/list/slurletters = ("'"))//use a different list as an inpu
 	p = 1//1 is the start of any word
 	while(p <= n)//while P, which starts at 1 is less or equal to N which is the length.
 		var/n_letter = copytext(te, p, p + 1)//copies text from a certain distance. In this case, only one letter at a time.
-		if (prob(80) && (ckey(n_letter) in list("b","c","d","f","g","h","j","k","l","m","n","p","q","r","s","t","v","w","x","y","z")))
-			if (prob(10))
+		if(prob(80) && (ckey(n_letter) in list("b","c","d","f","g","h","j","k","l","m","n","p","q","r","s","t","v","w","x","y","z")))
+			if(prob(10))
 				n_letter = text("[n_letter]-[n_letter]-[n_letter]-[n_letter]")//replaces the current letter with this instead.
 			else
-				if (prob(20))
+				if(prob(20))
 					n_letter = text("[n_letter]-[n_letter]-[n_letter]")
 				else
-					if (prob(5))
+					if(prob(5))
 						n_letter = null
 					else
 						n_letter = text("[n_letter]-[n_letter]")
@@ -200,14 +200,14 @@ proc/slur(phrase, var/list/slurletters = ("'"))//use a different list as an inpu
 	while(p <= n)//while P, which starts at 1 is less or equal to N which is the length.
 		var/robotletter = pick("@", "!", "#", "$", "%", "&", "?") //for beep boop
 		var/n_letter = copytext(te, p, p + 1)//copies text from a certain distance. In this case, only one letter at a time.
-		if (prob(80) && (ckey(n_letter) in list("b","c","d","f","g","h","j","k","l","m","n","p","q","r","s","t","v","w","x","y","z")))
-			if (prob(10))
+		if(prob(80) && (ckey(n_letter) in list("b","c","d","f","g","h","j","k","l","m","n","p","q","r","s","t","v","w","x","y","z")))
+			if(prob(10))
 				n_letter = text("[n_letter]-[robotletter]-[n_letter]-[n_letter]")//replaces the current letter with this instead.
 			else
-				if (prob(20))
+				if(prob(20))
 					n_letter = text("[n_letter]-[robotletter]-[n_letter]")
 				else
-					if (prob(5))
+					if(prob(5))
 						n_letter = robotletter
 					else
 						n_letter = text("[n_letter]-[n_letter]")
@@ -276,7 +276,7 @@ proc/muffledspeech(phrase)
 
 /proc/findname(msg)
 	for(var/mob/M in mob_list)
-		if (M.real_name == text("[msg]"))
+		if(M.real_name == text("[msg]"))
 			return 1
 	return 0
 
@@ -448,7 +448,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
 						A.overlays += alert_overlay
 
 /mob/proc/switch_to_camera(var/obj/machinery/camera/C)
-	if (!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove))
+	if(!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove))
 		return 0
 	check_eye(src)
 	return 1
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 8d57d115ebe..69e29fa9aa8 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -9,9 +9,9 @@
 		return 1
 	if(ismob(mover))
 		var/mob/moving_mob = mover
-		if ((other_mobs && moving_mob.other_mobs))
+		if((other_mobs && moving_mob.other_mobs))
 			return 1
-		if (mover == buckled_mob)
+		if(mover == buckled_mob)
 			return 1
 	return (!mover.density || !density || lying)
 
@@ -107,7 +107,7 @@
 	set hidden = 1
 	if(!istype(mob, /mob/living/carbon))
 		return
-	if (!mob.stat && isturf(mob.loc) && !mob.restrained())
+	if(!mob.stat && isturf(mob.loc) && !mob.restrained())
 		mob:toggle_throw_mode()
 	else
 		return
@@ -122,9 +122,9 @@
 
 /client/Center()
 	/* No 3D movement in 2D spessman game. dir 16 is Z Up
-	if (isobj(mob.loc))
+	if(isobj(mob.loc))
 		var/obj/O = mob.loc
-		if (mob.canmove)
+		if(mob.canmove)
 			return O.relaymove(mob, 16)
 	*/
 	return
@@ -256,14 +256,14 @@
 					L -= mob
 					var/mob/M = L[1]
 					if(M)
-						if ((get_dist(mob, M) <= 1 || M.loc == mob.loc))
+						if((get_dist(mob, M) <= 1 || M.loc == mob.loc))
 							. = ..()
-							if (isturf(M.loc))
+							if(isturf(M.loc))
 								var/diag = get_dir(mob, M)
-								if ((diag - 1) & diag)
+								if((diag - 1) & diag)
 								else
 									diag = null
-								if ((get_dist(mob, M) > 1 || diag))
+								if((get_dist(mob, M) > 1 || diag))
 									step(M, get_dir(M.loc, T))
 				else
 					for(var/mob/M in L)
@@ -284,11 +284,11 @@
 		else
 			. = ..()
 
-		for (var/obj/item/weapon/grab/G in mob)
-			if (G.state == GRAB_NECK)
+		for(var/obj/item/weapon/grab/G in mob)
+			if(G.state == GRAB_NECK)
 				mob.set_dir(reverse_dir[direct])
 			G.adjust_position()
-		for (var/obj/item/weapon/grab/G in mob.grabbed_by)
+		for(var/obj/item/weapon/grab/G in mob.grabbed_by)
 			G.adjust_position()
 
 		moving = 0
@@ -454,17 +454,17 @@
 	return 0
 
 /mob/proc/Move_Pulled(atom/A)
-	if (!canmove || restrained() || !pulling)
+	if(!canmove || restrained() || !pulling)
 		return
-	if (pulling.anchored)
+	if(pulling.anchored)
 		return
-	if (!pulling.Adjacent(src))
+	if(!pulling.Adjacent(src))
 		return
-	if (A == loc && pulling.density)
+	if(A == loc && pulling.density)
 		return
-	if (!Process_Spacemove(get_dir(pulling.loc, A)))
+	if(!Process_Spacemove(get_dir(pulling.loc, A)))
 		return
-	if (ismob(pulling))
+	if(ismob(pulling))
 		var/mob/M = pulling
 		var/atom/movable/t = M.pulling
 		M.stop_pulling()
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index c92d11925cd..0dfa4ef64fe 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -70,8 +70,8 @@
 	..()
 
 	statpanel("Status")
-	if (client.statpanel == "Status" && ticker)
-		if (ticker.current_state != GAME_STATE_PREGAME)
+	if(client.statpanel == "Status" && ticker)
+		if(ticker.current_state != GAME_STATE_PREGAME)
 			stat(null, "Station Time: [worldtime2text()]")
 	statpanel("Lobby")
 	if(client.statpanel=="Lobby" && ticker)
@@ -275,7 +275,7 @@
 		return 0
 
 /mob/new_player/proc/AttemptLateSpawn(rank,var/spawning_at)
-	if (src != usr)
+	if(src != usr)
 		return 0
 	if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
 		to_chat(usr, "\red The round is either not ready, or has already finished...")
@@ -360,11 +360,11 @@
 
 
 /mob/new_player/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message)
-	if (ticker.current_state == GAME_STATE_PLAYING)
+	if(ticker.current_state == GAME_STATE_PLAYING)
 		var/ailist[] = list()
-		for (var/mob/living/silicon/ai/A in living_mob_list)
+		for(var/mob/living/silicon/ai/A in living_mob_list)
 			ailist += A
-		if (ailist.len)
+		if(ailist.len)
 			var/mob/living/silicon/ai/announcer = pick(ailist)
 			if(character.mind)
 				if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
@@ -385,11 +385,11 @@
 					global_announcer.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
 
 /mob/new_player/proc/AnnounceCyborg(var/mob/living/character, var/rank, var/join_message)
-	if (ticker.current_state == GAME_STATE_PLAYING)
+	if(ticker.current_state == GAME_STATE_PLAYING)
 		var/ailist[] = list()
-		for (var/mob/living/silicon/ai/A in living_mob_list)
+		for(var/mob/living/silicon/ai/A in living_mob_list)
 			ailist += A
-		if (ailist.len)
+		if(ailist.len)
 			var/mob/living/silicon/ai/announcer = pick(ailist)
 			if(character.mind)
 				if((character.mind.special_role != "MODE"))
@@ -472,6 +472,7 @@
 	// Added the new browser window method
 	var/datum/browser/popup = new(src, "latechoices", "Choose Profession", 900, 600)
 	popup.add_stylesheet("playeroptions", 'html/browser/playeroptions.css')
+	popup.add_script("delay_interactivity", 'html/browser/delay_interactivity.js')
 	popup.set_content(dat)
 	popup.open(0) // 0 is passed to open so that it doesn't use the onclose() proc
 
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index 4ce44be1fd8..beb2c255308 100644
--- a/code/modules/mob/new_player/poll.dm
+++ b/code/modules/mob/new_player/poll.dm
@@ -209,12 +209,12 @@
 
 						output += "<br>[optiontext]: <select name='o[optionid]'>"
 						output += "<option value='abstain'>abstain</option>"
-						for (var/j = minvalue; j <= maxvalue; j++)
+						for(var/j = minvalue; j <= maxvalue; j++)
 							if(j == minvalue && descmin)
 								output += "<option value='[j]'>[j] ([descmin])</option>"
-							else if (j == midvalue && descmid)
+							else if(j == midvalue && descmid)
 								output += "<option value='[j]'>[j] ([descmid])</option>"
-							else if (j == maxvalue && descmax)
+							else if(j == maxvalue && descmax)
 								output += "<option value='[j]'>[j] ([descmax])</option>"
 							else
 								output += "<option value='[j]'>[j]</option>"
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 0632e0af5e8..dc0916ee344 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -260,7 +260,7 @@
 
 	// Skin tone
 	if(current_species && (current_species.bodyflags & HAS_SKIN_TONE))
-		if (s_tone >= 0)
+		if(s_tone >= 0)
 			preview_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
 		else
 			preview_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 493fade2ea1..c926fabf2d8 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -30,19 +30,15 @@
 
 /mob/verb/me_verb(message as text)
 	set name = "Me"
-	set category = "Emotes"
-	set desc = "(action) Enter a custom emote."
+	set category = "IC"
 
-	if(!message)
-		return
+	message = strip_html_properly(message)
 
-	message = trim_strip_html_properly(message)
-
-	if(message == "")
-		return
-
-	if(emoteHandler)
-		return emoteHandler.runEmote("me", message)
+	set_typing_indicator(0)
+	if(use_me)
+		custom_emote(usr.emote_type, message)
+	else
+		usr.emote(message)
 
 
 /mob/proc/say_dead(var/message)
@@ -55,11 +51,11 @@
 		to_chat(usr, "<span class='danger'>You have deadchat muted.</span>")
 		return
 
-	say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], <span class='message'>\"[message]\"</span>", src)
+	say_dead_direct("[pick("complains", "moans", "whines", "laments", "blubbers", "salts")], <span class='message'>\"[message]\"</span>", src)
 
 /mob/proc/say_understands(var/mob/other,var/datum/language/speaking = null)
 
-	if (src.stat == 2)		//Dead
+	if(src.stat == 2)		//Dead
 		return 1
 
 	//Universal speak makes everything understandable, for obvious reasons.
@@ -67,14 +63,14 @@
 		return 1
 
 	//Languages are handled after.
-	if (!speaking)
+	if(!speaking)
 		if(!other)
 			return 1
 		if(other.universal_speak)
 			return 1
 		if(isAI(src) && ispAI(other))
 			return 1
-		if (istype(other, src.type) || istype(src, other.type))
+		if(istype(other, src.type) || istype(src, other.type))
 			return 1
 		return 0
 
@@ -104,10 +100,8 @@
 
 
 /mob/proc/emote(var/act, var/type, var/message)
-
-	act = lowertext(act)
-	return emoteHandler.runEmote(act, message, type)
-
+	if(act == "me")
+		return custom_emote(type, message)
 
 
 /mob/proc/get_ear()
@@ -120,9 +114,9 @@
 
 /mob/proc/say_test(var/text)
 	var/ending = copytext(text, length(text))
-	if (ending == "?")
+	if(ending == "?")
 		return "1"
-	else if (ending == "!")
+	else if(ending == "!")
 		return "2"
 	return "0"
 
@@ -149,10 +143,7 @@
 	if(length(message) >= 2)
 		var/language_prefix = trim_right(lowertext(copytext(message, 1 ,4)))
 		var/datum/language/L = language_keys[language_prefix]
-		if (can_speak(L))
+		if(can_speak(L))
 			return L
 
 	return null
-
-/mob/proc/custom_emote(var/m_type=0, var/message = null)
-	return emoteHandler.runEmote("me", message, m_type)
\ No newline at end of file
diff --git a/code/modules/mob/spirit/cultnet.dm b/code/modules/mob/spirit/cultnet.dm
index c3f37f8fdd1..b43ee46b842 100644
--- a/code/modules/mob/spirit/cultnet.dm
+++ b/code/modules/mob/spirit/cultnet.dm
@@ -9,14 +9,14 @@ It reuses a lot of code from the AIEye cameraNetwork. In order to work properly,
 
 /proc/isCultRune(var/viewpoint)
 	var/obj/effect/rune/test_rune = viewpoint
-	if (test_rune)
+	if(test_rune)
 		return TRUE
 	return FALSE
 
 
 /proc/isCultViewpoint(var/viewpoint)
 	var/obj/cult_viewpoint/vp = viewpoint
-	if (vp)
+	if(vp)
 		return TRUE
 	return FALSE
 	
diff --git a/code/modules/mob/spirit/mask/mask.dm b/code/modules/mob/spirit/mask/mask.dm
index 8ae366ef16a..03ba63dbe01 100644
--- a/code/modules/mob/spirit/mask/mask.dm
+++ b/code/modules/mob/spirit/mask/mask.dm
@@ -15,7 +15,7 @@
 	set desc = "Select who you would like to go too."
 
 	var/obj/cult_viewpoint/cultist = pick_cultist()
-	if (cultist)
+	if(cultist)
 		follow_cultist(cultist.owner)
 		cult_log("[key_name_admin(src)] started following [key_name_admin(cultist)].")
 		to_chat(src, "You start following [cultist.get_display_name()].")
@@ -27,8 +27,8 @@
 	set desc = "Push your cultists to do something."
 
 	var/obj/cult_viewpoint/cultist = pick_cultist()
-	if (cultist)
-		if (cultist.owner)
+	if(cultist)
+		if(cultist.owner)
 			var/newUrge = stripped_input(usr, "", "Set Urge", "")
 			cultist.set_urge(newUrge)
 			to_chat(src, "You urge [cultist.owner.name] to [newUrge].")
@@ -40,13 +40,13 @@
 	set desc = "Grant a cultist a name."
 
 	var/obj/cult_viewpoint/cultist = pick_cultist()
-	if (cultist)
+	if(cultist)
 		var/newName = stripped_input(usr, "", "Set Cult Name", "")
-		if (!newName)
+		if(!newName)
 			return
 		cultist.set_cult_name(newName)
 		to_chat(src, "You grant [cultist.owner.name] the secret name of [newName].")
-		if (cultist.owner)
+		if(cultist.owner)
 			cult_log("[key_name_admin(src)] has set [key_name_admin(cultist.owner)] to \'[newName]\'")
 
 
@@ -68,8 +68,8 @@
 	set desc = "Set the favor for a cultist"
 
 	var/obj/cult_viewpoint/cultist = pick_cultist()
-	if (cultist)
-		if (cultist.owner)
+	if(cultist)
+		if(cultist.owner)
 			var/list/favor = list("Pleased", "Displeased", "Indifference")
 			var/emotion = input("Pick your emotion", "Mask", null, null) in favor
 			switch(emotion)
@@ -132,7 +132,7 @@
 	cult_log("[key_name_admin(usr)]says : [input]")
 	flicker_mask(usr)
 	for(var/datum/mind/H in ticker.mode.cult)
-		if (H.current)
+		if(H.current)
 			to_chat(H.current, "<span class='cultspeech'><font size=3><span class='name'>[usr.name]: </span><span class='message'>[input]</span></font></span>")
 	for(var/mob/spirit/spirit in spirits)
 		to_chat(spirit, "<span class='cultspeech'><font size=3><span class='name'>[usr.name]: </span><span class='message'>[input]</span></font></span>")
@@ -193,7 +193,7 @@
 
 	var/talisman = input("Pick a talisman type", "Talisman", null, null) as null|anything in talismans
 	var/imbue_value = talismans[talisman]
-	if (!talisman)
+	if(!talisman)
 		to_chat(usr, "You choose not to create a talisman.")
 		revert_cast(usr)
 		return
@@ -203,20 +203,20 @@
 
 	switch(talisman)
 
-		if ("Teleport")
+		if("Teleport")
 			var/target_rune = input("Pick a teleport target", "Teleport Rune", null, null) as null|anything in engwords
-			if (!target_rune)
+			if(!target_rune)
 				to_chat(usr, "You choose not to create a talisman.")
 				revert_cast(usr)
 				return
 			summon_type = list(/obj/item/weapon/paper/talisman)
 			newVars = list("imbue" = "[target_rune]", "info" = "[target_rune]")
 
-		if ("Soul Stone")
+		if("Soul Stone")
 			summon_type = list(/obj/item/device/soulstone)
 			newVars = list()
 
-		if ("Construct")
+		if("Construct")
 			summon_type = list(/obj/structure/constructshell)
 			newVars = list()
 
diff --git a/code/modules/mob/spirit/movement.dm b/code/modules/mob/spirit/movement.dm
index 65a992c1932..b014fb42927 100644
--- a/code/modules/mob/spirit/movement.dm
+++ b/code/modules/mob/spirit/movement.dm
@@ -35,15 +35,15 @@ mob/spirit/proc/Spirit_Move(direct)
 	var/obj/cult_viewpoint/currentView = getCultViewpoint(target)
 	var/mob/spirit/U = usr
 
-	if (!currentView)
+	if(!currentView)
 		to_chat(U, "As a spirit, you may only track cultists.")
 
 	U.follow_target = target
 	to_chat(U, "Now following [currentView.get_cult_name()].")
 
 	spawn (0)
-		while (U.follow_target == target)
-			if (U.follow_target == null)
+		while(U.follow_target == target)
+			if(U.follow_target == null)
 				return
 			U.setLoc(get_turf(target))
 			sleep(10)
diff --git a/code/modules/mob/spirit/spirit.dm b/code/modules/mob/spirit/spirit.dm
index a8667567d03..a42d9e6817e 100644
--- a/code/modules/mob/spirit/spirit.dm
+++ b/code/modules/mob/spirit/spirit.dm
@@ -26,7 +26,7 @@ mob/spirit
 
 
 mob/spirit/proc/is_active()
-	if (client && client.inactivity <= 10 * 60 * 10)
+	if(client && client.inactivity <= 10 * 60 * 10)
 		return TRUE
 	return FALSE
 
@@ -39,7 +39,7 @@ mob/spirit/New()
 	loc = pick(latejoin)
 
 	// no nameless spirits
-	if (!name)
+	if(!name)
 		name = "Boogyman"
 
 	spirits+=src
@@ -58,10 +58,10 @@ mob/spirit/Topic(href, href_list)
 	..()
 
 	to_chat(usr, "Spirit Href = [href]")
-	for (var/tempref in href_list)
+	for(var/tempref in href_list)
 		to_chat(usr, "Spirit href list [tempref] = [href_list[tempref]]")
 
-	if (href_list["track"])
+	if(href_list["track"])
 		to_chat(usr, "Got to tracking.")
 		var/mob/target = locate(href_list["track"]) in mob_list
 		var/mob/spirit/A = locate(href_list["track2"]) in spirits
diff --git a/code/modules/mob/spirit/viewpoint.dm b/code/modules/mob/spirit/viewpoint.dm
index 90814317124..71ae6299611 100644
--- a/code/modules/mob/spirit/viewpoint.dm
+++ b/code/modules/mob/spirit/viewpoint.dm
@@ -35,7 +35,7 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
 	set desc = "Discover what your god commands of you."
 	set name = "Check Urge"
 	set src in usr
-	if (src.urge)
+	if(src.urge)
 		to_chat(owner, "\red \b You feel the urge to [src.urge]")
 	else
 		to_chat(owner, "\b You feel no supernatural compulsions.")
@@ -48,7 +48,7 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
 	set src in usr
 
 	for(var/mob/spirit/mask/currentMask in spirits)
-		if (currentMask.is_active())
+		if(currentMask.is_active())
 			to_chat(owner, "\red \b You feel the reassuring presence of your god.")
 			to_chat(currentMask, "<span class='cultspeech'><span class='name'><a href='byond://?src=\ref[currentMask];track2=\ref[currentMask];track=\ref[usr]'>[get_display_name()]</a></span><span class='message'> has reached out to you.</span></span>")
 
@@ -95,14 +95,14 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
 
 
 /obj/cult_viewpoint/proc/set_urge(var/newUrge)
-	if (!newUrge)
+	if(!newUrge)
 		src.urge = null
 	src.urge = copytext(newUrge, 1, MAX_MESSAGE_LEN)
 	check_urge()
 
 
 /obj/cult_viewpoint/proc/can_use()
-	if (owner.stat != DEAD)
+	if(owner.stat != DEAD)
 		return TRUE
 	return FALSE
 
@@ -112,15 +112,15 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
 
 
 /obj/cult_viewpoint/proc/get_cult_name()
-	if (cult_name)
+	if(cult_name)
 		return cult_name
 	return "An Unknown Servant"
 
 
 /obj/cult_viewpoint/proc/set_cult_name(var/newName)
-	if (!owner)
+	if(!owner)
 		return FALSE
-	if (newName)
+	if(newName)
 		cult_name = newName
 		to_chat(owner, "\red \b You have been blessed with the secret name of '[newName]'.")
 	else
@@ -131,9 +131,9 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
 /obj/cult_viewpoint/proc/get_display_name()
 	if(istype(src,/obj/effect/rune))
 		return name
-	if (!owner)
+	if(!owner)
 		return
-	if (cult_name)
+	if(cult_name)
 		return cult_name
 	return owner.name
 
@@ -146,13 +146,13 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
 
 	cult_log("[key_name(usr,0)] has tried to become a Mask of Nar'sie.")
 
-	if (!active_mask())
+	if(!active_mask())
 		var/confirm = alert(owner.client, "You are about to become a Mask of Nar'sie.  This will destroy your body, and you will only be able to guide the other cultists through communication. Are you sure?", "Confirm Your Sacrifice", "Yes", "No")
 		if(confirm == "Yes")
 			var/transformation_type = alert(owner.client, "You are about to become a Mask. Do you want it to be subtle or violent?", "Mask", "Subtle", "Violent")
 			if(!active_mask())
 				cult_log("[key_name(usr,0)] has become a Mask of Nar'sie.")
-				if (transformation_type=="Subtle")
+				if(transformation_type=="Subtle")
 					log_admin("[key_name_admin(owner)] has subtly become a Mask of Nar'sie")
 					owner.make_into_mask(0,0)
 				else
@@ -168,13 +168,13 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
 
 /obj/cult_viewpoint/proc/active_mask()
 	for(var/mob/spirit/mask/currentMask in spirits)
-		if (currentMask.is_active())
+		if(currentMask.is_active())
 			return TRUE
 	return FALSE
 
 
 /obj/cult_viewpoint/proc/handle_missing_mask()
-	if (active_mask())
+	if(active_mask())
 		mask_has_been_found()
 	else
 		mask_is_missing()
@@ -182,13 +182,13 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
 
 /obj/cult_viewpoint/proc/mask_has_been_found()
 	for(var/obj/cult_viewpoint/viewpoint in cult_viewpoints)
-		if (viewpoint.verbs.Find(/obj/cult_viewpoint/proc/become_mask))
+		if(viewpoint.verbs.Find(/obj/cult_viewpoint/proc/become_mask))
 			viewpoint.verbs-=/obj/cult_viewpoint/proc/become_mask
 
 
 /obj/cult_viewpoint/proc/mask_is_missing()
 	for(var/obj/cult_viewpoint/viewpoint in cult_viewpoints)
-		if (!viewpoint.verbs.Find(/obj/cult_viewpoint/proc/become_mask))
+		if(!viewpoint.verbs.Find(/obj/cult_viewpoint/proc/become_mask))
 			viewpoint.verbs+=/obj/cult_viewpoint/proc/become_mask
 
 
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index b04c00a6925..98e33ee5f6b 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -8,7 +8,7 @@
 	return ..()
 
 /mob/living/carbon/human/AIize(move=1) // 'move' argument needs defining here too because BYOND is dumb
-	if (notransform)
+	if(notransform)
 		return
 	for(var/t in organs)
 		qdel(t)
@@ -16,7 +16,7 @@
 	return ..(move)
 
 /mob/living/carbon/AIize()
-	if (notransform)
+	if(notransform)
 		return
 	for(var/obj/item/W in src)
 		unEquip(W)
@@ -42,21 +42,21 @@
 
 	var/obj/loc_landmark
 	for(var/obj/effect/landmark/start/sloc in landmarks_list)
-		if (sloc.name != "AI")
+		if(sloc.name != "AI")
 			continue
-		if (locate(/mob/living) in sloc.loc)
+		if(locate(/mob/living) in sloc.loc)
 			continue
 		loc_landmark = sloc
-	if (!loc_landmark)
+	if(!loc_landmark)
 		for(var/obj/effect/landmark/tripai in landmarks_list)
-			if (tripai.name == "tripai")
+			if(tripai.name == "tripai")
 				if(locate(/mob/living) in tripai.loc)
 					continue
 				loc_landmark = tripai
-	if (!loc_landmark)
+	if(!loc_landmark)
 		to_chat(O, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.")
 		for(var/obj/effect/landmark/start/sloc in landmarks_list)
-			if (sloc.name == "AI")
+			if(sloc.name == "AI")
 				loc_landmark = sloc
 
 	O.loc = loc_landmark.loc
@@ -96,7 +96,7 @@
 	new_spirit.key = key
 	new_spirit.loc=loc
 
-	if (should_gib)
+	if(should_gib)
 		spawn(0)
 			src.gib() // gib the body
 	else
@@ -124,7 +124,7 @@
 
 //human -> robot
 /mob/living/carbon/human/proc/Robotize()
-	if (notransform)
+	if(notransform)
 		return
 	for(var/obj/item/W in src)
 		unEquip(W)
@@ -184,7 +184,7 @@
 
 //human -> alien
 /mob/living/carbon/human/proc/Alienize()
-	if (notransform)
+	if(notransform)
 		return
 	for(var/obj/item/W in src)
 		unEquip(W)
@@ -216,7 +216,7 @@
 	return
 
 /mob/living/carbon/human/proc/slimeize(adult as num, reproduce as num)
-	if (notransform)
+	if(notransform)
 		return
 	for(var/obj/item/W in src)
 		unEquip(W)
@@ -252,7 +252,7 @@
 	return
 
 /mob/living/carbon/human/proc/corgize()
-	if (notransform)
+	if(notransform)
 		return
 	for(var/obj/item/W in src)
 		unEquip(W)
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 49d9a7aad48..def65e1859d 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -62,11 +62,11 @@ var/global/image/typing_indicator
 		if(!(client.prefs.toggles & SHOW_TYPING) && !hud_typing)
 			var/temp = winget(client, "input", "text")
 
-			if (temp != last_typed)
+			if(temp != last_typed)
 				last_typed = temp
 				last_typed_time = world.time
 
-			if (world.time > last_typed_time + TYPING_INDICATOR_LIFETIME)
+			if(world.time > last_typed_time + TYPING_INDICATOR_LIFETIME)
 				set_typing_indicator(0)
 				return
 			if(length(temp) > 5 && findtext(temp, "Say \"", 1, 7))
diff --git a/code/modules/nano/interaction/base.dm b/code/modules/nano/interaction/base.dm
index e70b4423705..0db9eb19eeb 100644
--- a/code/modules/nano/interaction/base.dm
+++ b/code/modules/nano/interaction/base.dm
@@ -12,9 +12,9 @@
 	return STATUS_CLOSE
 
 /mob/proc/shared_nano_interaction()
-	if (src.stat || !client)
+	if(src.stat || !client)
 		return STATUS_CLOSE						// no updates, close the interface
-	else if (restrained() || lying || stat || stunned || weakened)
+	else if(restrained() || lying || stat || stunned || weakened)
 		return STATUS_UPDATE					// update only (orange visibility)
 	return STATUS_INTERACTIVE
 	
@@ -26,7 +26,7 @@
 /mob/living/silicon/ai/shared_nano_interaction()
 	if(lacks_power())
 		return STATUS_CLOSE
-	if (check_unable(1, 0))
+	if(check_unable(1, 0))
 		return STATUS_CLOSE
 	return ..()
 
diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm
index ad70ec7f484..a97c693ec94 100644
--- a/code/modules/nano/interaction/default.dm
+++ b/code/modules/nano/interaction/default.dm
@@ -64,15 +64,15 @@
 	return user.shared_living_nano_distance(src_object)
 
 /mob/living/proc/shared_living_nano_distance(var/atom/movable/src_object)
-	if (!(src_object in view(4, src))) 	// If the src object is not in visable, disable updates
+	if(!(src_object in view(4, src))) 	// If the src object is not in visable, disable updates
 		return STATUS_CLOSE
 
 	var/dist = get_dist(src_object, src)
-	if (dist <= 1)
+	if(dist <= 1)
 		return STATUS_INTERACTIVE	// interactive (green visibility)
-	else if (dist <= 2)
+	else if(dist <= 2)
 		return STATUS_UPDATE 		// update only (orange visibility)
-	else if (dist <= 4)
+	else if(dist <= 4)
 		return STATUS_DISABLED 		// no updates, completely disabled (red visibility)
 	return STATUS_CLOSE
 
diff --git a/code/modules/nano/modules/alarm_monitor.dm b/code/modules/nano/modules/alarm_monitor.dm
index 5c38f480a49..b6a8a70780d 100644
--- a/code/modules/nano/modules/alarm_monitor.dm
+++ b/code/modules/nano/modules/alarm_monitor.dm
@@ -81,7 +81,7 @@
 	data["categories"] = categories
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "alarm_monitor.tmpl", "Alarm Monitoring Console", 800, 800, state = state)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm
index 848530c3c1d..a587295b582 100644
--- a/code/modules/nano/modules/crew_monitor.dm
+++ b/code/modules/nano/modules/crew_monitor.dm
@@ -5,7 +5,7 @@
 	if(..()) 
 		return 1
 	var/turf/T = get_turf(nano_host())
-	if (!T || !(T.z in config.player_levels))
+	if(!T || !(T.z in config.player_levels))
 		to_chat(usr, "<span class='warning'>Unable to establish a connection<span>: You're too far away from the station!")
 		return 0
 	if(href_list["track"])
diff --git a/code/modules/nano/modules/human_appearance.dm b/code/modules/nano/modules/human_appearance.dm
index 55027a90852..ee289cfec9b 100644
--- a/code/modules/nano/modules/human_appearance.dm
+++ b/code/modules/nano/modules/human_appearance.dm
@@ -213,7 +213,7 @@
 	data["change_facial_hair_color"] = can_change(APPEARANCE_FACIAL_HAIR_COLOR)
 	data["change_marking_color"] = can_change_markings()
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "appearance_changer.tmpl", "[src]", 800, 450, state = state)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/modules/nano/modules/law_manager.dm b/code/modules/nano/modules/law_manager.dm
index df00504cf1f..9f10759dbe5 100644
--- a/code/modules/nano/modules/law_manager.dm
+++ b/code/modules/nano/modules/law_manager.dm
@@ -170,14 +170,14 @@
 	data["view"] = current_view
 
 	var/channels[0]
-	for (var/ch_name in owner.law_channels())
+	for(var/ch_name in owner.law_channels())
 		channels[++channels.len] = list("channel" = ch_name)
 	data["channel"] = owner.lawchannel
 	data["channels"] = channels
 	data["law_sets"] = package_multiple_laws(data["isAdmin"] ? admin_laws : player_laws)
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "law_manager.tmpl", sanitize("[src] - [owner.name]"), 800, is_malf(user) ? 600 : 400, state = state)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/modules/nano/modules/power_monitor.dm b/code/modules/nano/modules/power_monitor.dm
index f2c9297b1a9..9b9ccc8a060 100644
--- a/code/modules/nano/modules/power_monitor.dm
+++ b/code/modules/nano/modules/power_monitor.dm
@@ -19,7 +19,7 @@
 		data["select_monitor"] = 1
 		data["powermonitors"] = powermonitor_repository.powermonitor_data()
 
-	if (powermonitor && !isnull(powermonitor.powernet))
+	if(powermonitor && !isnull(powermonitor.powernet))
 		if(select_monitor && (powermonitor.stat & (NOPOWER|BROKEN)))
 			powermonitor = null
 			return
@@ -29,7 +29,7 @@
 		data["apcs"] = apc_repository.apc_data(powermonitor)
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "power_monitor.tmpl", "Power Monitoring Console", 800, 700, state = state)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm
index 08f9deffa9f..c463f895158 100644
--- a/code/modules/nano/nanoexternal.dm
+++ b/code/modules/nano/nanoexternal.dm
@@ -13,13 +13,13 @@
 
 	var/datum/nanoui/ui = locate(uiref)
 
-	if (istype(ui))
+	if(istype(ui))
 		ui.close()
 
 		if(ui.ref)
 			var/href = "close=1"
 			src.Topic(href, params2list(href), ui.ref)	// this will direct to the atom's Topic() proc via client.Topic()
-		else if (ui.on_close_logic)
+		else if(ui.on_close_logic)
 			// no atomref specified (or not found)
 			// so just reset the user mob's machine var
 			if(src && src.mob)
diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm
index edf8218731e..355397ef6cf 100644
--- a/code/modules/nano/nanomanager.dm
+++ b/code/modules/nano/nanomanager.dm
@@ -19,13 +19,13 @@
   * @return /nanoui Returns the found ui, for null if none exists
   */
 /datum/nanomanager/proc/try_update_ui(var/mob/user, src_object, ui_key, var/datum/nanoui/ui, data, var/force_open = 0)
-	if (isnull(ui)) // no ui has been passed, so we'll search for one
+	if(isnull(ui)) // no ui has been passed, so we'll search for one
 	{
 		ui = get_open_ui(user, src_object, ui_key)
 	}
-	if (!isnull(ui))
+	if(!isnull(ui))
 		// The UI is already open
-		if (!force_open)
+		if(!force_open)
 			ui.push_data(data)
 			return ui
 		else
@@ -44,15 +44,15 @@
   */
 /datum/nanomanager/proc/get_open_ui(var/mob/user, src_object, ui_key)
 	var/src_object_key = "\ref[src_object]"
-	if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+	if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
 		//testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open")
 		return null
-	else if (isnull(open_uis[src_object_key][ui_key]) || !istype(open_uis[src_object_key][ui_key], /list))
+	else if(isnull(open_uis[src_object_key][ui_key]) || !istype(open_uis[src_object_key][ui_key], /list))
 		//testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open for this object")
 		return null
 
-	for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
-		if (ui.user == user)
+	for(var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
+		if(ui.user == user)
 			return ui
 
 	//testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - ui not found")
@@ -67,12 +67,12 @@
   */
 /datum/nanomanager/proc/update_uis(src_object)
 	var/src_object_key = "\ref[src_object]"
-	if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+	if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
 		return 0
 
 	var/update_count = 0
-	for (var/ui_key in open_uis[src_object_key])
-		for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
+	for(var/ui_key in open_uis[src_object_key])
+		for(var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
 			if(ui && ui.src_object && ui.user && ui.src_object.nano_host())
 				ui.process(1)
 				update_count++
@@ -87,12 +87,12 @@
   */
 /datum/nanomanager/proc/close_uis(src_object)
 	var/src_object_key = "\ref[src_object]"
-	if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+	if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
 		return 0
 
 	var/close_count = 0
-	for (var/ui_key in open_uis[src_object_key])
-		for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
+	for(var/ui_key in open_uis[src_object_key])
+		for(var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
 			if(ui && ui.src_object && ui.user && ui.src_object.nano_host())
 				ui.close()
 				close_count++
@@ -108,12 +108,12 @@
   * @return int The number of uis updated
   */
 /datum/nanomanager/proc/update_user_uis(var/mob/user, src_object = null, ui_key = null)
-	if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
+	if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
 		return 0 // has no open uis
 
 	var/update_count = 0
-	for (var/datum/nanoui/ui in user.open_uis)
-		if ((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
+	for(var/datum/nanoui/ui in user.open_uis)
+		if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
 			ui.process(1)
 			update_count++
 
@@ -129,13 +129,13 @@
   * @return int The number of uis closed
   */
 /datum/nanomanager/proc/close_user_uis(var/mob/user, src_object = null, ui_key = null)
-	if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
+	if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
 		//testing("nanomanager/close_user_uis mob [user.name] has no open uis")
 		return 0 // has no open uis
 
 	var/close_count = 0
-	for (var/datum/nanoui/ui in user.open_uis)
-		if ((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
+	for(var/datum/nanoui/ui in user.open_uis)
+		if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
 			ui.close()
 			close_count++
 
@@ -153,9 +153,9 @@
   */
 /datum/nanomanager/proc/ui_opened(var/datum/nanoui/ui)
 	var/src_object_key = "\ref[ui.src_object]"
-	if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+	if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
 		open_uis[src_object_key] = list(ui.ui_key = list())
-	else if (isnull(open_uis[src_object_key][ui.ui_key]) || !istype(open_uis[src_object_key][ui.ui_key], /list))
+	else if(isnull(open_uis[src_object_key][ui.ui_key]) || !istype(open_uis[src_object_key][ui.ui_key], /list))
 		open_uis[src_object_key][ui.ui_key] = list();
 
 	ui.user.open_uis.Add(ui)
@@ -174,9 +174,9 @@
   */
 /datum/nanomanager/proc/ui_closed(var/datum/nanoui/ui)
 	var/src_object_key = "\ref[ui.src_object]"
-	if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+	if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
 		return 0 // wasn't open
-	else if (isnull(open_uis[src_object_key][ui.ui_key]) || !istype(open_uis[src_object_key][ui.ui_key], /list))
+	else if(isnull(open_uis[src_object_key][ui.ui_key]) || !istype(open_uis[src_object_key][ui.ui_key], /list))
 		return 0 // wasn't open
 
 	processing_uis.Remove(ui)
@@ -214,14 +214,14 @@
   */
 /datum/nanomanager/proc/user_transferred(var/mob/oldMob, var/mob/newMob)
 	//testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]")
-	if (!oldMob || isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0)
+	if(!oldMob || isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0)
 		//testing("nanomanager/user_transferred mob [oldMob.name] has no open uis")
 		return 0 // has no open uis
 
-	if (isnull(newMob.open_uis) || !istype(newMob.open_uis, /list))
+	if(isnull(newMob.open_uis) || !istype(newMob.open_uis, /list))
 		newMob.open_uis = list()
 
-	for (var/datum/nanoui/ui in oldMob.open_uis)
+	for(var/datum/nanoui/ui in oldMob.open_uis)
 		ui.user = newMob
 		newMob.open_uis.Add(ui)
 
diff --git a/code/modules/nano/nanomapgen.dm b/code/modules/nano/nanomapgen.dm
index 62ad6649e20..710083cb158 100644
--- a/code/modules/nano/nanomapgen.dm
+++ b/code/modules/nano/nanomapgen.dm
@@ -25,31 +25,31 @@
 
 /client/proc/nanomapgen_DumpTile(var/startX = 1, var/startY = 1, var/currentZ = 1, var/endX = -1, var/endY = -1)
 
-	if (endX < 0 || endX > world.maxx)
+	if(endX < 0 || endX > world.maxx)
 		endX = world.maxx
 
-	if (endY < 0 || endY > world.maxy)
+	if(endY < 0 || endY > world.maxy)
 		endY = world.maxy
 
-	if (currentZ < 0 || currentZ > world.maxz)
+	if(currentZ < 0 || currentZ > world.maxz)
 		to_chat(usr, "NanoMapGen: <B>ERROR: currentZ ([currentZ]) must be between 1 and [world.maxz]</B>")
 
 		sleep(3)
 		return NANOMAP_TERMINALERR
 
-	if (startX > endX)
+	if(startX > endX)
 		to_chat(usr, "NanoMapGen: <B>ERROR: startX ([startX]) cannot be greater than endX ([endX])</B>")
 
 		sleep(3)
 		return NANOMAP_TERMINALERR
 
-	if (startY > endX)
+	if(startY > endX)
 		to_chat(usr, "NanoMapGen: <B>ERROR: startY ([startY]) cannot be greater than endY ([endY])</B>")
 		sleep(3)
 		return NANOMAP_TERMINALERR
 
 	var/icon/Tile = icon(file("nano/mapbase1024.png"))
-	if (Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION)
+	if(Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION)
 		log_to_dd("NanoMapGen: <B>ERROR: BASE IMAGE DIMENSIONS ARE NOT [NANOMAP_MAX_ICON_DIMENSION]x[NANOMAP_MAX_ICON_DIMENSION]</B>")
 		sleep(3)
 		return NANOMAP_TERMINALERR
@@ -70,7 +70,7 @@
 
 			count++
 
-			if (count % 8000 == 0)
+			if(count % 8000 == 0)
 				log_to_dd("NanoMapGen: <B>[count] tiles done</B>")
 				sleep(1)
 
@@ -84,7 +84,7 @@
 
 	to_chat(usr, "NanoMapGen: <B>Done. File [mapFilename] uploaded to your cache.</B>")
 
-	if (Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION)
+	if(Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION)
 		return NANOMAP_BADOUTPUT
 
 	return NANOMAP_SUCCESS
\ No newline at end of file
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index d1fbdb6a868..7451005d4b2 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -85,13 +85,13 @@ nanoui is used to open and update nano browser uis
 	// add the passed template filename as the "main" template, this is required
 	add_template("main", ntemplate_filename)
 
-	if (ntitle)
+	if(ntitle)
 		title = ntitle
-	if (nwidth)
+	if(nwidth)
 		width = nwidth
-	if (nheight)
+	if(nheight)
 		height = nheight
-	if (nref)
+	if(nref)
 		ref = nref
 
 	add_common_assets()
@@ -123,14 +123,14 @@ nanoui is used to open and update nano browser uis
   * @return nothing
   */
 /datum/nanoui/proc/set_status(state, push_update)
-	if (state != status) // Only update if it is different
-		if (status == STATUS_DISABLED)
+	if(state != status) // Only update if it is different
+		if(status == STATUS_DISABLED)
 			status = state
-			if (push_update)
+			if(push_update)
 				update()
 		else
 			status = state
-			if (push_update || status == 0)
+			if(push_update || status == 0)
 				push_data(null, 1) // Update the UI, force the update in case the status is 0, data is null so that previous data is used
 
  /**
@@ -209,7 +209,7 @@ nanoui is used to open and update nano browser uis
 
 	var/list/send_data = list("config" = config_data)
 
-	if (!isnull(data))
+	if(!isnull(data))
 		send_data["data"] = data
 
 	return send_data
@@ -345,14 +345,14 @@ nanoui is used to open and update nano browser uis
 
 	var/head_content = ""
 
-	for (var/filename in scripts)
+	for(var/filename in scripts)
 		head_content += "<script type='text/javascript' src='[filename]'></script> "
 
-	for (var/filename in stylesheets)
+	for(var/filename in stylesheets)
 		head_content += "<link rel='stylesheet' type='text/css' href='[filename]'> "
 
 	var/template_data_json = "{}" // An empty JSON object
-	if (templates.len > 0)
+	if(templates.len > 0)
 		template_data_json = json_encode(templates)
 
 	var/list/send_data = get_send_data(initial_data)
@@ -371,7 +371,7 @@ nanoui is used to open and update nano browser uis
 			{
 				// We need both jQuery and NanoStateManager to be able to recieve data
 				// At the moment any data received before those libraries are loaded will be lost
-				if (typeof NanoStateManager != 'undefined' && typeof jQuery != 'undefined')
+				if(typeof NanoStateManager != 'undefined' && typeof jQuery != 'undefined')
 				{
 					NanoStateManager.receiveUpdateData(jsonString);
 				}
@@ -406,7 +406,7 @@ nanoui is used to open and update nano browser uis
 	if(!user.client)
 		return
 	var/window_size = ""
-	if (width && height)
+	if(width && height)
 		window_size = "size=[width]x[height];"
 	update_status(0)
 	if(status == STATUS_CLOSE)
@@ -450,7 +450,7 @@ nanoui is used to open and update nano browser uis
   */
 /datum/nanoui/proc/push_data(data, force_push = 0)
 	update_status(0)
-	if (status == STATUS_DISABLED && !force_push)
+	if(status == STATUS_DISABLED && !force_push)
 		return // Cannot update UI, no visibility
 
 	var/list/send_data = get_send_data(data)
@@ -468,7 +468,7 @@ nanoui is used to open and update nano browser uis
   */
 /datum/nanoui/Topic(href, href_list)
 	update_status(0) // update the status
-	if (status != STATUS_INTERACTIVE || user != usr) // If UI is not interactive or usr calling Topic is not the UI user
+	if(status != STATUS_INTERACTIVE || user != usr) // If UI is not interactive or usr calling Topic is not the UI user
 		return
 
 	// This is used to toggle the nano map ui
@@ -481,7 +481,7 @@ nanoui is used to open and update nano browser uis
 		set_map_z_level(text2num(href_list["mapZLevel"]))
 		map_update = 1
 
-	if ((src_object && src_object.Topic(href, href_list, 0, state)) || map_update)
+	if((src_object && src_object.Topic(href, href_list, 0, state)) || map_update)
 		nanomanager.update_uis(src_object) // update all UIs attached to src_object
 
  /**
@@ -493,11 +493,11 @@ nanoui is used to open and update nano browser uis
   * @return nothing
   */
 /datum/nanoui/proc/process(update = 0)
-	if (!src_object || !user)
+	if(!src_object || !user)
 		close()
 		return
 
-	if (status && (update || is_auto_updating))
+	if(status && (update || is_auto_updating))
 		update() // Update the UI (update_status() is called whenever a UI is updated)
 	else
 		update_status(1) // Not updating UI, so lets check here if status has changed
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 5e6a1cbcb32..701c4e7080b 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -5,7 +5,7 @@
 	item_state = "energy_katana"
 	force = 40
 	throwforce = 20
-	armour_penetration = 15
+	armour_penetration = 50
 	var/cooldown = 0 // Because spam aint cool, yo.
 	var/datum/effect/system/spark_spread/spark_system
 
diff --git a/code/modules/ninja/martial_art.dm b/code/modules/ninja/martial_art.dm
index 0903425f89d..35969ab8d5e 100644
--- a/code/modules/ninja/martial_art.dm
+++ b/code/modules/ninja/martial_art.dm
@@ -165,7 +165,7 @@
 	if(user.a_intent == "help") // No special move for help intent.
 		user.pointed(A)
 		return 0
-	if (!(A in range(1,user))) // Is the target within one tile of us?
+	if(!(A in range(1,user))) // Is the target within one tile of us?
 		user.pointed(A)
 		return 0
 
diff --git a/code/modules/ninja/suit/SpiderOS.dm b/code/modules/ninja/suit/SpiderOS.dm
index 871e8215bbd..002e58fbddf 100644
--- a/code/modules/ninja/suit/SpiderOS.dm
+++ b/code/modules/ninja/suit/SpiderOS.dm
@@ -70,7 +70,7 @@
 		if(1)
 			dat += "<h4><img src=sos_5.png> Atmospheric Scan:</h4>"//Headers don't need breaks. They are automatically placed.
 			var/turf/T = get_turf(U.loc)
-			if (isnull(T))
+			if(isnull(T))
 				dat += "Unable to obtain a reading."
 			else
 				var/datum/gas_mixture/environment = T.return_air()
@@ -80,7 +80,7 @@
 
 				dat += "Air Pressure: [round(pressure,0.1)] kPa"
 
-				if (total_moles)
+				if(total_moles)
 					var/o2_level = environment.oxygen/total_moles
 					var/n2_level = environment.nitrogen/total_moles
 					var/co2_level = environment.carbon_dioxide/total_moles
@@ -101,12 +101,12 @@
 			dat += "<h4><img src=sos_6.png> Detected PDAs:</h4>"
 			dat += "<ul>"
 			var/count = 0
-			for (var/obj/item/device/pda/P in get_viewable_pdas())
+			for(var/obj/item/device/pda/P in get_viewable_pdas())
 				dat += "<li><a href='byond://?src=\ref[src];choice=Message;target=\ref[P]'>[P]</a>"
 				dat += "</li>"
 				count++
 			dat += "</ul>"
-			if (count == 0)
+			if(count == 0)
 				dat += "None detected.<br>"
 		if(4)
 			dat += {"
@@ -126,7 +126,7 @@
 					A mix of traitor, changeling, and wizard. Ninjas rely on energy, or electricity to be precise, to keep their suits running (when out of energy, a suit hibernates). Suits gain energy from objects or creatures that contain electrical charge. APCs, cell batteries, rechargers, SMES batteries, cyborgs, mechs, and exposed wires are currently supported. Through energy ninjas gain access to special powers--while all powers are tied to the ninja suit, the most useful of them are verb activated--to help them in their mission.<br>It is a constant struggle for a ninja to remain hidden long enough to recharge the suit and accomplish their objective; despite their arsenal of abilities, ninjas can die like any other. Unlike wizards, ninjas do not possess good crowd control and are typically forced to play more subdued in order to achieve their goals. Some of their abilities are specifically designed to confuse and disorient others.<br>With that said, it should be perfectly possible to completely flip the fuck out and rampage as a ninja.
 					<h5>Their powers:</h5>
 					There are two primary types: Equipment and Abilties. Passive effect are always on. Active effect must be turned on and remain active only when there is energy to do so. Ability costs are listed next to them.
-					<b>Equipment</b>: cannot be tracked by AI (passive), faster speed (passive), stealth (active), vision switch (passive if toggled), voice masking (passive), SpiderOS (passive if toggled), energy drain (passive if toggled).
+					<b>Equipment</b>: cannot be tracked by AI (passive), faster speed (passive), stealth (active), vision switch(passive if toggled), voice masking (passive), SpiderOS (passive if toggled), energy drain (passive if toggled).
 					<ul>
 					<li><i>Voice masking</i> generates a random name the ninja can use over the radio and in-person. Although, the former use is recommended.</li>
 					<li><i>Toggling vision</i> cycles to one of the following: thermal, meson, or darkness vision. The starting mode allows one to scout the identity of those in view, revealing their role. Traitors, revolutionaries, wizards, and other such people will be made known to you.</li>
diff --git a/code/modules/ninja/suit/shoes.dm b/code/modules/ninja/suit/shoes.dm
index c2fb287b9a8..5cb67e73db6 100644
--- a/code/modules/ninja/suit/shoes.dm
+++ b/code/modules/ninja/suit/shoes.dm
@@ -5,7 +5,7 @@
 	icon_state = "s-ninja"
 	permeability_coefficient = 0.01
 	flags = NOSLIP
-	armor = list(melee = 60, bullet = 60, laser = 45,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 60, bullet = 60, laser = 45, energy = 15, bomb = 30, bio = 30, rad = 30)
 	cold_protection = FEET
 	min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
 	heat_protection = FEET
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index 936f947758d..73ac456ebf9 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -15,7 +15,7 @@ Contents:
 	allowed = list(/obj/item/weapon/gun, /obj/item/ammo_box, /obj/item/weapon/melee/baton, /obj/item/weapon/tank, /obj/item/weapon/stock_parts/cell)
 	slowdown = 0
 	unacidable = 1
-	armor = list(melee = 60, bullet = 60, laser = 45,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 60, bullet = 60, laser = 45, energy = 15, bomb = 30, bio = 30, rad = 30)
 
 	var/suitActive = 0
 	var/suitBusy = 0
diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm
index 620c2261782..ad4c64decca 100644
--- a/code/modules/ninja/suit/suit_attackby.dm
+++ b/code/modules/ninja/suit/suit_attackby.dm
@@ -6,7 +6,7 @@
 			var/obj/item/weapon/stock_parts/cell/CELL
 			if(CELL.maxcharge > cell.maxcharge && suitGloves)
 				to_chat(U, "<span class='notice'>Higher maximum capacity detected.\nUpgrading...</span>")
-				if (n_gloves && n_gloves.candrain && do_after(U,s_delay, target = U))
+				if(n_gloves && n_gloves.candrain && do_after(U,s_delay, target = U))
 					U.drop_item()
 					CELL.loc = src
 					CELL.charge = min(CELL.charge+cell.charge, CELL.maxcharge)
diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm
index 643c5b1fbb7..126112c316a 100644
--- a/code/modules/paperwork/carbonpaper.dm
+++ b/code/modules/paperwork/carbonpaper.dm
@@ -12,7 +12,7 @@
 			icon_state = "cpaper_words"
 			return
 		icon_state = "cpaper"
-	else if (copied)
+	else if(copied)
 		if(info)
 			icon_state = "paper_words"
 			return
@@ -30,7 +30,7 @@
 	set category = "Object"
 	set src in usr
 
-	if (copied == 0)
+	if(copied == 0)
 		var/obj/item/weapon/paper/carbon/c = src
 		var/copycontents = html_decode(c.info)
 		var/obj/item/weapon/paper/carbon/copy = new /obj/item/weapon/paper/carbon (usr.loc)
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index fbb26b650a8..e8db4c58110 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -4,7 +4,7 @@
 	icon_state = "clipboard"
 	item_state = "clipboard"
 	throwforce = 0
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 10
 	var/obj/item/weapon/pen/haspen		//The stored pen.
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index c0e7a2bc468..d10e8c9f3f6 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -75,7 +75,7 @@ var/list/alldepartments = list()
 		data["respectcooldown"] = 0
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "faxmachine.tmpl", "Fax Machine UI", 540, 450)
 		ui.set_initial_data(data)
 		ui.open()
@@ -86,12 +86,12 @@ var/list/alldepartments = list()
 
 	if(href_list["send"])
 		if(copyitem && authenticated)
-			if ((destination in admin_departments) || (destination in hidden_admin_departments))
+			if((destination in admin_departments) || (destination in hidden_admin_departments))
 				send_admin_fax(usr, destination)
 			else
 				sendfax(destination,usr)
 
-			if (sendcooldown)
+			if(sendcooldown)
 				spawn(sendcooldown) // cooldown time
 					sendcooldown = 0
 					nanomanager.update_uis(src)
@@ -104,7 +104,7 @@ var/list/alldepartments = list()
 			copyitem = null
 		else
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle))
+			if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle))
 				usr.drop_item()
 				copyitem = I
 				I.loc = src
@@ -135,7 +135,7 @@ var/list/alldepartments = list()
 		if(copyitem)
 			var/n_name = sanitize(copytext(input(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name)  as text, 1, MAX_MESSAGE_LEN))
 			if((copyitem && copyitem.loc == src && usr.stat == 0))
-				if (istype(copyitem, /obj/item/weapon/paper))
+				if(istype(copyitem, /obj/item/weapon/paper))
 					copyitem.name = "[(n_name ? text("[n_name]") : initial(copyitem.name))]"
 					copyitem.desc = "This is a paper titled '" + copyitem.name + "'."
 				else if(istype(copyitem, /obj/item/weapon/photo))
@@ -158,7 +158,7 @@ var/list/alldepartments = list()
 	else
 		if(!card)
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/weapon/card/id))
+			if(istype(I, /obj/item/weapon/card/id))
 				usr.drop_item()
 				I.loc = src
 				scan = I
@@ -180,7 +180,7 @@ var/list/alldepartments = list()
 		if( F.department == destination )
 			success = F.receivefax(copyitem)
 
-	if (success)
+	if(success)
 		var/datum/fax/F = new /datum/fax()
 		F.name = copyitem.name
 		F.from_department = department
@@ -209,11 +209,11 @@ var/list/alldepartments = list()
 	// give the sprite some time to flick
 	sleep(20)
 
-	if (istype(incoming, /obj/item/weapon/paper))
+	if(istype(incoming, /obj/item/weapon/paper))
 		copy(incoming)
-	else if (istype(incoming, /obj/item/weapon/photo))
+	else if(istype(incoming, /obj/item/weapon/photo))
 		photocopy(incoming)
-	else if (istype(incoming, /obj/item/weapon/paper_bundle))
+	else if(istype(incoming, /obj/item/weapon/paper_bundle))
 		bundlecopy(incoming)
 	else
 		return 0
@@ -228,11 +228,11 @@ var/list/alldepartments = list()
 	use_power(200)
 
 	var/obj/item/rcvdcopy
-	if (istype(copyitem, /obj/item/weapon/paper))
+	if(istype(copyitem, /obj/item/weapon/paper))
 		rcvdcopy = copy(copyitem)
-	else if (istype(copyitem, /obj/item/weapon/photo))
+	else if(istype(copyitem, /obj/item/weapon/photo))
 		rcvdcopy = photocopy(copyitem)
-	else if (istype(copyitem, /obj/item/weapon/paper_bundle))
+	else if(istype(copyitem, /obj/item/weapon/paper_bundle))
 		rcvdcopy = bundlecopy(copyitem)
 	else
 		visible_message("[src] beeps, \"Error transmitting message.\"")
@@ -251,9 +251,9 @@ var/list/alldepartments = list()
 
 	//message badmins that a fax has arrived
 	switch(destination)
-		if ("Central Command")
+		if("Central Command")
 			message_admins(sender, "CENTCOM FAX", destination, rcvdcopy, "#006100")
-		if ("Syndicate")
+		if("Syndicate")
 			message_admins(sender, "SYNDICATE FAX", destination, rcvdcopy, "#DC143C")
 	sendcooldown = 1800
 	sleep(50)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index db7a054a693..1f7426a66e9 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -9,7 +9,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "paper"
 	throwforce = 0
-	w_class = 1.0
+	w_class = 1
 	throw_range = 1
 	throw_speed = 1
 	layer = 4
@@ -374,44 +374,44 @@
 		return
 
 	if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/photo))
-		if (istype(P, /obj/item/weapon/paper/carbon))
+		if(istype(P, /obj/item/weapon/paper/carbon))
 			var/obj/item/weapon/paper/carbon/C = P
-			if (!C.iscopy && !C.copied)
+			if(!C.iscopy && !C.copied)
 				to_chat(user, "<span class='notice'>Take off the carbon copy first.</span>")
 				add_fingerprint(user)
 				return
 		var/obj/item/weapon/paper_bundle/B = new(src.loc)
-		if (name != "paper")
+		if(name != "paper")
 			B.name = name
-		else if (P.name != "paper" && P.name != "photo")
+		else if(P.name != "paper" && P.name != "photo")
 			B.name = P.name
 		user.unEquip(P)
-		if (istype(user, /mob/living/carbon/human))
+		if(istype(user, /mob/living/carbon/human))
 			var/mob/living/carbon/human/h_user = user
-			if (h_user.r_hand == src)
+			if(h_user.r_hand == src)
 				h_user.unEquip(src)
 				h_user.put_in_r_hand(B)
-			else if (h_user.l_hand == src)
+			else if(h_user.l_hand == src)
 				h_user.unEquip(src)
 				h_user.put_in_l_hand(B)
-			else if (h_user.l_store == src)
+			else if(h_user.l_store == src)
 				h_user.unEquip(src)
 				B.loc = h_user
 				B.layer = 20
 				B.plane = HUD_PLANE
 				h_user.l_store = B
 				h_user.update_inv_pockets()
-			else if (h_user.r_store == src)
+			else if(h_user.r_store == src)
 				h_user.unEquip(src)
 				B.loc = h_user
 				B.layer = 20
 				B.plane = HUD_PLANE
 				h_user.r_store = B
 				h_user.update_inv_pockets()
-			else if (h_user.head == src)
+			else if(h_user.head == src)
 				h_user.unEquip(src)
 				h_user.put_in_hands(B)
-			else if (!istype(src.loc, /turf))
+			else if(!istype(src.loc, /turf))
 				src.loc = get_turf(h_user)
 				if(h_user.client)	h_user.client.screen -= src
 				h_user.put_in_hands(B)
@@ -676,23 +676,27 @@
 /obj/item/weapon/paper/evilfax/proc/evilpaper_specialaction(var/mob/living/carbon/target)
 	spawn(30)
 		if(istype(target,/mob/living/carbon))
-			if(myeffect == "borging")
+			if(myeffect == "Borgification")
+				to_chat(target,"<span class='userdanger'>You seem to comprehend the AI a little better. Why are your muscles so stiff?</span>")
 				target.ForceContractDisease(new /datum/disease/transformation/robot(0))
-			else if(myeffect == "corgifying")
+			else if(myeffect == "Corgification")
+				to_chat(target,"<span class='userdanger'>You hear distant howling as the world seems to grow bigger around you. Boy, that itch sure is getting worse!</span>")
 				target.ForceContractDisease(new /datum/disease/transformation/corgi(0))
-			else if(myeffect == "firedeath")
+			else if(myeffect == "Death By Fire")
+				to_chat(target,"<span class='userdanger'>You feel hotter than usual. Maybe you should lowe-wait, is that your hand melting?</span>")
 				var/turf/simulated/T = get_turf(target)
 				new /obj/effect/hotspot(T)
 				target.adjustFireLoss(150) // hard crit, the burning takes care of the rest.
-			else if(myeffect == "braindeath")
-				to_chat(target,"<span class='userdanger'>A series of bright lights flash across your vision: COGNITOHAZARD YHWH-3 ACTIVATED</span>")
+			else if(myeffect == "Total Brain Death")
+				to_chat(target,"<span class='userdanger'>You see a message appear in front of you in bright red letters: <b>YHWH-3 ACTIVATED. TERMINATION IN 3 SECONDS</b></span>")
 				target.mutations.Add(NOCLONE)
 				target.adjustBrainLoss(125)
-			else if(myeffect == "honktumor")
+			else if(myeffect == "Honk Tumor")
 				if(!target.get_int_organ(/obj/item/organ/internal/honktumor))
 					var/obj/item/organ/internal/organ = new /obj/item/organ/internal/honktumor
+					to_chat(target,"<span class='userdanger'>Life seems funnier, somehow.</span>")
 					organ.insert(target)
-			else if(myeffect == "demotion")
+			else if(myeffect == "Demotion Notice")
 				command_announcement.Announce("[mytarget] is hereby demoted to the rank of Civilian. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order")
 			else
 				message_admins("Evil paper [src] was activated without a proper effect set! This is a bug.")
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 0cd00015af4..0e472c166be 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -5,7 +5,7 @@
 	icon_state = "paper"
 	item_state = "paper"
 	throwforce = 0
-	w_class = 1.0
+	w_class = 1
 	throw_range = 2
 	throw_speed = 1
 	layer = 4
@@ -21,9 +21,9 @@
 	var/obj/item/weapon/paper/P
 	if(istype(W, /obj/item/weapon/paper))
 		P = W
-		if (istype(P, /obj/item/weapon/paper/carbon))
+		if(istype(P, /obj/item/weapon/paper/carbon))
 			var/obj/item/weapon/paper/carbon/C = P
-			if (!C.iscopy && !C.copied)
+			if(!C.iscopy && !C.copied)
 				to_chat(user, "<span class='notice'>Take off the carbon copy first.</span>")
 				add_fingerprint(user)
 				return
@@ -177,7 +177,7 @@
 			update_icon()
 	else
 		to_chat(usr, "<span class='notice'>You need to hold it in your hands to change pages.</span>")
-	if (istype(src.loc, /mob))
+	if(istype(src.loc, /mob))
 		src.attack_self(src.loc)
 		updateUsrDialog()
 
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index cd3afbd400d..2c5c154bca8 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -48,10 +48,10 @@
 
 
 /obj/item/weapon/paper_bin/attack_hand(mob/user as mob)
-	if (ishuman(user))
+	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
-		if (H.hand)
+		if(H.hand)
 			temp = H.organs_by_name["l_hand"]
 		if(temp && !temp.is_usable())
 			to_chat(H, "<span class='notice'>You try to move your [temp.name], but cannot!")
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 46d080adb6f..79d90c18024 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -17,7 +17,7 @@
 	item_state = "pen"
 	slot_flags = SLOT_BELT | SLOT_EARS
 	throwforce = 0
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 3
 	throw_range = 7
 	materials = list(MAT_METAL=10)
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index d4a2ad141cb..9c4a9d84fd0 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -50,16 +50,16 @@
 			if(toner <= 0)
 				break
 
-			if (istype(copyitem, /obj/item/weapon/paper))
+			if(istype(copyitem, /obj/item/weapon/paper))
 				copy(copyitem)
 				sleep(15)
-			else if (istype(copyitem, /obj/item/weapon/photo))
+			else if(istype(copyitem, /obj/item/weapon/photo))
 				photocopy(copyitem)
 				sleep(15)
-			else if (istype(copyitem, /obj/item/weapon/paper_bundle))
+			else if(istype(copyitem, /obj/item/weapon/paper_bundle))
 				var/obj/item/weapon/paper_bundle/B = bundlecopy(copyitem)
 				sleep(15*B.amount)
-			else if (ass && ass.loc == src.loc)
+			else if(ass && ass.loc == src.loc)
 				copyass()
 				sleep(15)
 			else
@@ -97,13 +97,13 @@
 			if(!camera)
 				return
 			var/datum/picture/selection = camera.selectpicture()
-			if (!selection)
+			if(!selection)
 				return
 
 			playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
 			var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (src.loc)
 			p.construct(selection)
-			if (p.desc == "")
+			if(p.desc == "")
 				p.desc += "Copied by [tempAI.name]"
 			else
 				p.desc += " - Copied by [tempAI.name]"
@@ -188,11 +188,11 @@
 	c.offset_y = copy.offset_y
 	var/list/temp_overlays = copy.overlays       //Iterates through stamps
 	var/image/img                                //and puts a matching
-	for (var/j = 1, j <= temp_overlays.len, j++) //gray overlay onto the copy
+	for(var/j = 1, j <= temp_overlays.len, j++) //gray overlay onto the copy
 		if(copy.ico.len)
-			if (findtext(copy.ico[j], "cap") || findtext(copy.ico[j], "cent"))
+			if(findtext(copy.ico[j], "cap") || findtext(copy.ico[j], "cent"))
 				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-circle")
-			else if (findtext(copy.ico[j], "deny"))
+			else if(findtext(copy.ico[j], "deny"))
 				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-x")
 			else
 				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-dots")
@@ -228,7 +228,17 @@
 	var/icon/temp_img
 	if(!check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on.
 		return
-
+	if(emagged)
+		if(ishuman(ass))
+			var/mob/living/carbon/human/H = ass
+			to_chat(H, "<span class='notice'>Something smells toasty...</span>")
+			var/obj/item/organ/external/G = H.get_organ("groin")
+			G.take_damage(0, 30)
+			spawn(20)
+				H.emote("scream")
+		else
+			to_chat(ass, "<span class='notice'>Something smells toasty...</span>")
+			ass.apply_damage(30, BURN)
 	if(ishuman(ass)) //Suit checks are in check_ass
 		var/mob/living/carbon/human/H = ass
 		temp_img = icon('icons/obj/butts.dmi', H.species.butt_sprite)
@@ -283,7 +293,7 @@
 
 /obj/machinery/photocopier/MouseDrop_T(mob/target, mob/user)
 	check_ass() //Just to make sure that you can re-drag somebody onto it after they moved off.
-	if (!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass)
+	if(!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass)
 		return
 	src.add_fingerprint(user)
 	if(target == user && !user.incapacitated())
@@ -310,6 +320,13 @@
 	else
 		return 1
 
+/obj/machinery/photocopier/emag_act(user as mob)
+	if(!emagged)
+		emagged = 1
+		to_chat(user, "<span class='notice'>You overload the photocopier's laser printing mechanism.</span>")
+	else
+		to_chat(user, "<span class='notice'>The photocopier's laser printing mechanism is already overloaded!</span>")
+
 /obj/item/device/toner
 	name = "toner cartridge"
 	icon_state = "tonercartridge"
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 49b5bf0a05b..00ce925fae0 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -15,7 +15,7 @@
 	desc = "A camera film cartridge. Insert it into a camera to reload it."
 	icon_state = "film"
 	item_state = "electropack"
-	w_class = 1.0
+	w_class = 1
 
 
 /********
@@ -26,7 +26,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "photo"
 	item_state = "paper"
-	w_class = 2.0
+	w_class = 2
 	var/icon/img	//Big photo image
 	var/scribble	//Scribble on the back.
 	var/icon/tiny
@@ -141,7 +141,7 @@
 	desc = "A polaroid camera. 10 photos left."
 	icon_state = "camera"
 	item_state = "electropack"
-	w_class = 2.0
+	w_class = 2
 	slot_flags = SLOT_BELT
 	var/list/matter = list("metal" = 2000)
 	var/pictures_max = 10
@@ -249,7 +249,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 				// Calculate where we are relative to the center of the photo
 				var/xoff = (A.x - center.x) * 32 + center_offset
 				var/yoff = (A.y - center.y) * 32 + center_offset
-				if (istype(A,/atom/movable))
+				if(istype(A,/atom/movable))
 					xoff+=A:step_x
 					yoff+=A:step_y
 				res.Blend(img, blendMode2iconMode(A.blend_mode),  A.pixel_x + xoff, A.pixel_y + yoff)
@@ -489,7 +489,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 	desc = "video camera that can send live feed to the entertainment network."
 	icon_state = "videocam"
 	item_state = "videocam"
-	w_class = 2.0
+	w_class = 2
 	slot_flags = SLOT_BELT
 	materials = list(MAT_METAL=2000)
 	var/on = 0
@@ -523,7 +523,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 		to_chat(user, "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active.")
 
 /obj/item/device/videocam/hear_talk(mob/M as mob, msg)
-	if (camera && on)
+	if(camera && on)
 		if(get_dist(src, M) <= canhear_range)
 			talk_into(M, msg)
 		for(var/obj/machinery/computer/security/telescreen/T in machines)
@@ -531,7 +531,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 				T.audible_message("<span class='game radio'><span class='name'>(Newscaster) [M]</span> says, '[msg]'", hearing_distance = 2)
 
 /obj/item/device/videocam/hear_message(mob/M as mob, msg)
-	if (camera && on)
+	if(camera && on)
 		for(var/obj/machinery/computer/security/telescreen/T in machines)
 			if(T.current == camera)
 				T.audible_message("<span class='game radio'><span class='name'>(Newscaster) [M]</span> [msg]", hearing_distance = 2)
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 44ecc3f1f12..26e397039d8 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -5,7 +5,7 @@
 	icon_state = "stamp-ok"
 	item_state = "stamp"
 	throwforce = 0
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 3
 	throw_range = 7
 	materials = list(MAT_METAL=60)
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index 6ade2b7c76a..3ff212085af 100755
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -10,7 +10,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "pda"
 	item_state = "electronic"
-	w_class = 1.0
+	w_class = 1
 	slot_flags = SLOT_PDA | SLOT_BELT
 
 	//Main variables
@@ -166,7 +166,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "pda.tmpl", title, 630, 600, state = inventory_state)
@@ -218,7 +218,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	var/mob/user = usr
 	var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")
 	var/mob/living/U = usr
-	if (usr.stat == DEAD)
+	if(usr.stat == DEAD)
 		return 0
 	if(!can_use()) //Why reinvent the wheel? There's a proc that does exactly that.
 		U.unset_machine()
@@ -246,7 +246,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				if(A)
 					start_program(A)
 		if("Eject")//Ejects the cart, only done from hub.
-			if (!isnull(cartridge))
+			if(!isnull(cartridge))
 				var/turf/T = loc
 				if(ismob(T))
 					T = T.loc
@@ -263,7 +263,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 						P.unnotify()
 				cartridge = null
 				update_shortcuts()
-		if ("Authenticate")//Checks for ID
+		if("Authenticate")//Checks for ID
 			id_check(usr, 1)
 		if("Retro")
 			retro_mode = !retro_mode
@@ -274,7 +274,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				. = current_app.Topic(href, href_list)
 
 //EXTRA FUNCTIONS===================================
-	if ((honkamt > 0) && (prob(60)))//For clown virus.
+	if((honkamt > 0) && (prob(60)))//For clown virus.
 		honkamt--
 		playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
 
@@ -301,8 +301,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>")
 
 /obj/item/device/pda/proc/remove_id()
-	if (id)
-		if (ismob(loc))
+	if(id)
+		if(ismob(loc))
 			var/mob/M = loc
 			M.put_in_hands(id)
 			to_chat(usr, "<span class='notice'>You remove the ID from the [name].</span>")
@@ -318,7 +318,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	if(issilicon(usr))
 		return
 
-	if ( can_use(usr) )
+	if( can_use(usr) )
 		if(id)
 			remove_id()
 		else
@@ -335,10 +335,10 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	if(issilicon(usr))
 		return
 
-	if ( can_use(usr) )
+	if( can_use(usr) )
 		var/obj/item/weapon/pen/O = locate() in src
 		if(O)
-			if (istype(loc, /mob))
+			if(istype(loc, /mob))
 				var/mob/M = loc
 				if(M.get_active_hand() == null)
 					M.put_in_hands(O)
@@ -353,17 +353,17 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.
 	if(choice == 1)
-		if (id)
+		if(id)
 			remove_id()
 		else
 			var/obj/item/I = user.get_active_hand()
-			if (istype(I, /obj/item/weapon/card/id))
+			if(istype(I, /obj/item/weapon/card/id))
 				user.drop_item()
 				I.forceMove(src)
 				id = I
 	else
 		var/obj/item/weapon/card/I = user.get_active_hand()
-		if (istype(I, /obj/item/weapon/card/id) && I:registered_name)
+		if(istype(I, /obj/item/weapon/card/id) && I:registered_name)
 			var/obj/old_id = id
 			user.drop_item()
 			I.forceMove(src)
@@ -415,7 +415,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			to_chat(user, "<span class='notice'>You slide \the [C] into \the [src].</span>")
 
 /obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob)
-	if (istype(C, /mob/living/carbon) && scanmode)
+	if(istype(C, /mob/living/carbon) && scanmode)
 		scanmode.scan_mob(C, user)
 
 /obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
@@ -426,7 +426,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	if(!src.detonate) return
 	var/turf/T = get_turf(src.loc)
 
-	if (ismob(loc))
+	if(ismob(loc))
 		var/mob/M = loc
 		M.show_message("<span class='danger'>Your [src] explodes!</span>", 1)
 
@@ -440,7 +440,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 /obj/item/device/pda/Destroy()
 	PDAs -= src
 	var/T = get_turf(loc)
-	if (id)
+	if(id)
 		id.forceMove(T)
 	if(pai)
 		pai.forceMove(T)
@@ -472,8 +472,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/proc/set_ringtone()
 	var/t = input("Please enter new ringtone", name, ttone) as text
-	if (in_range(src, usr) && loc == usr)
-		if (t)
+	if(in_range(src, usr) && loc == usr)
+		if(t)
 			if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code)))
 				to_chat(usr, "The PDA softly beeps.")
 				close(usr)
diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm
index bb6bd8e7e63..44cbfee67e1 100644
--- a/code/modules/pda/ai.dm
+++ b/code/modules/pda/ai.dm
@@ -24,9 +24,9 @@
 	if(!M)
 		to_chat(usr, "<span class='warning'>Cannot use messenger!</span>")
 	var/list/plist = M.available_pdas()
-	if (plist)
+	if(plist)
 		var/c = input(usr, "Please select a PDA") as null|anything in sortList(plist)
-		if (!c) // if the user hasn't selected a PDA file we can't send a message
+		if(!c) // if the user hasn't selected a PDA file we can't send a message
 			return
 		var/selected = plist[c]
 		M.create_message(usr, selected)
@@ -74,7 +74,7 @@
 	to_chat(usr, "<span class='notice'>PDA ringer toggled [(M.notify_silent ? "Off" : "On")]!</span>")
 
 /obj/item/device/pda/silicon/attack_self(mob/user as mob)
-	if ((honkamt > 0) && (prob(60)))//For clown virus.
+	if((honkamt > 0) && (prob(60)))//For clown virus.
 		honkamt--
 		playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
 	return
diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm
index 9afb3e52764..55acf9b70eb 100644
--- a/code/modules/pda/cart_apps.dm
+++ b/code/modules/pda/cart_apps.dm
@@ -97,7 +97,7 @@
 /datum/data/pda/app/power/update_ui(mob/user as mob, list/data)
 	update = PDA_APP_UPDATE_SLOW
 
-	if (powmonitor && !isnull(powmonitor.powernet))
+	if(powmonitor && !isnull(powmonitor.powernet))
 		data["records"] = list(
 			"powerconnected" = 1,
 			"poweravail" = powmonitor.powernet.avail,
@@ -143,7 +143,7 @@
 	switch(href_list["choice"])
 		if("Records")
 			var/datum/data/record/R = locate(href_list["target"])
-			if (R && (R in data_core.general))
+			if(R && (R in data_core.general))
 				load_records(R)
 		if("Back")
 			general_records = null
@@ -175,7 +175,7 @@
 	..(R)
 	for(var/A in data_core.medical)
 		var/datum/data/record/E = A
-		if (E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+		if(E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 			medical_records = E
 			break
 
@@ -201,7 +201,7 @@
 	..(R)
 	for(var/A in data_core.security)
 		var/datum/data/record/E = A
-		if (E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+		if(E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 			security_records = E
 			break
 
diff --git a/code/modules/pda/chatroom.dm b/code/modules/pda/chatroom.dm
index d5758b161f4..94185c7cc98 100644
--- a/code/modules/pda/chatroom.dm
+++ b/code/modules/pda/chatroom.dm
@@ -101,7 +101,7 @@ var/list/chatrooms = list(new /datum/chatroom("General Discussion"))
 				var/datum/data/pda/app/chatroom/C = P.find_program(/datum/data/pda/app/chatroom)
 				var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
 
-				if (!P.owner || P == pda || PM.m_hidden || (C in current_room.invites) || (C in current_room.users))
+				if(!P.owner || P == pda || PM.m_hidden || (C in current_room.invites) || (C in current_room.users))
 					continue
 				pdas += list(list(name = "[P.owner] ([P.ownjob])", ref = "\ref[C]"))
 			data["people"] = pdas
@@ -180,7 +180,7 @@ var/list/chatrooms = list(new /datum/chatroom("General Discussion"))
 					return
 				t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
 				t = readd_quotes(t)
-				if (!t || !pda.can_use())
+				if(!t || !pda.can_use())
 					return
 
 				target.post(src, t)
@@ -194,7 +194,7 @@ var/list/chatrooms = list(new /datum/chatroom("General Discussion"))
 					return
 				t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
 				t = readd_quotes(t)
-				if (!t)
+				if(!t)
 					return
 
 				current_room.topic = t
@@ -238,7 +238,7 @@ var/list/chatrooms = list(new /datum/chatroom("General Discussion"))
 				return
 
 			spawn()
-				if (!t || !check_messaging_available() || !pda.can_use())
+				if(!t || !check_messaging_available() || !pda.can_use())
 					return
 
 				// check if already taken
diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm
index 4aaaa0667e7..2b5ce32355d 100644
--- a/code/modules/pda/core_apps.dm
+++ b/code/modules/pda/core_apps.dm
@@ -91,7 +91,7 @@
 		var/pressure = environment.return_pressure()
 		var/total_moles = environment.total_moles()
 
-		if (total_moles)
+		if(total_moles)
 			var/o2_level = environment.oxygen/total_moles
 			var/n2_level = environment.nitrogen/total_moles
 			var/co2_level = environment.carbon_dioxide/total_moles
diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm
index c5f6375f82f..88d6024ba1b 100644
--- a/code/modules/pda/messenger.dm
+++ b/code/modules/pda/messenger.dm
@@ -43,7 +43,7 @@
 			var/obj/item/device/pda/P = A
 			var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
 
-			if (!P.owner || PM.toff || P == pda || PM.m_hidden)
+			if(!P.owner || PM.toff || P == pda || PM.m_hidden)
 				continue
 			if(conversations.Find("\ref[P]"))
 				convopdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "1")))
@@ -123,17 +123,17 @@
 		return
 	t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
 	t = readd_quotes(t)
-	if (!t || !istype(P))
+	if(!t || !istype(P))
 		return
-	if (!in_range(pda, U) && pda.loc != U)
+	if(!in_range(pda, U) && pda.loc != U)
 		return
 
 	var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
 
-	if (!PM || PM.toff || toff)
+	if(!PM || PM.toff || toff)
 		return
 
-	if (last_text && world.time < last_text + 5)
+	if(last_text && world.time < last_text + 5)
 		return
 
 	if(!pda.can_use())
@@ -188,7 +188,7 @@
 	var/list/plist = list()
 	var/list/namecounts = list()
 
-	if (toff)
+	if(toff)
 		to_chat(usr, "Turn on your receiver in order to send messages.")
 		return
 
@@ -200,7 +200,7 @@
 			continue
 
 		var/name = P.owner
-		if (name in names)
+		if(name in names)
 			namecounts[name]++
 			name = text("[name] ([namecounts[name]])")
 		else
diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm
index 98cab31aaf7..8585a26c827 100644
--- a/code/modules/pda/messenger_plugins.dm
+++ b/code/modules/pda/messenger_plugins.dm
@@ -59,7 +59,7 @@
 
 		if(prob(difficulty * 12) || (pda.hidden_uplink))
 			user.show_message("<span class=warning>An error flashes on your [pda].</span>", 1)
-		else if (prob(difficulty * 3))
+		else if(prob(difficulty * 3))
 			user.show_message("<span class=danger>Energy feeds back into your [pda]!</span>", 1)
 			pda.close(user)
 			pda.explode()
diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm
index 6ad7f2b378c..5e7fa98750b 100644
--- a/code/modules/pda/pdas.dm
+++ b/code/modules/pda/pdas.dm
@@ -39,7 +39,7 @@
 	ttone = "honk"
 
 /obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery.
-	if (istype(AM, /mob/living/carbon))
+	if(istype(AM, /mob/living/carbon))
 		var/mob/living/carbon/M =	AM
 		M.slip("pda", 8, 5, 0, 1)
 
diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm
index ae43ce10b3d..108dd4178fa 100644
--- a/code/modules/pda/radio.dm
+++ b/code/modules/pda/radio.dm
@@ -51,7 +51,7 @@
 	frequency.post_signal(src, signal, filter = s_filter)
 
 /obj/item/radio/integrated/receive_signal(datum/signal/signal)
-	if (bot_type && istype(signal.source, /obj/machinery/bot_core) && signal.data["type"] == bot_type)
+	if(bot_type && istype(signal.source, /obj/machinery/bot_core) && signal.data["type"] == bot_type)
 		if(!botlist)
 			botlist = new()
 
@@ -173,7 +173,7 @@
 /obj/item/radio/integrated/signal/initialize()
 	if(!radio_controller)
 		return
-	if (src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ)
+	if(src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ)
 		src.frequency = sanitize_frequency(src.frequency)
 
 	set_frequency(frequency)
diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm
index 0f4fcd79741..837d0c439f5 100644
--- a/code/modules/pda/utilities.dm
+++ b/code/modules/pda/utilities.dm
@@ -67,7 +67,7 @@
 /datum/data/pda/utility/scanmode/dna/scan_mob(mob/living/C as mob, mob/living/user as mob)
 	if(istype(C, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = C
-		if (!istype(H.dna, /datum/dna))
+		if(!istype(H.dna, /datum/dna))
 			to_chat(user, "<span class=notice>No fingerprints found on [H]</span>")
 		else
 			to_chat(user, "<span class=notice>[H]'s Fingerprints: [md5(H.dna.uni_identity)]</span>")
@@ -77,7 +77,7 @@
 	scan_blood(A, user)
 
 /datum/data/pda/utility/scanmode/dna/proc/scan_blood(atom/A, mob/user)
-	if (!A.blood_DNA)
+	if(!A.blood_DNA)
 		to_chat(user, "<span class=notice>No blood found on [A]</span>")
 		if(A.blood_DNA)
 			qdel(A.blood_DNA)
@@ -121,27 +121,27 @@
 	icon = "tachometer"
 
 /datum/data/pda/utility/scanmode/gas/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob)
-	if (istype(A, /obj/item/weapon/tank))
+	if(istype(A, /obj/item/weapon/tank))
 		var/obj/item/weapon/tank/T = A
 		pda.atmosanalyzer_scan(T.air_contents, user, T)
-	else if (istype(A, /obj/machinery/portable_atmospherics))
+	else if(istype(A, /obj/machinery/portable_atmospherics))
 		var/obj/machinery/portable_atmospherics/T = A
 		pda.atmosanalyzer_scan(T.air_contents, user, T)
-	else if (istype(A, /obj/machinery/atmospherics/pipe))
+	else if(istype(A, /obj/machinery/atmospherics/pipe))
 		var/obj/machinery/atmospherics/pipe/T = A
 		pda.atmosanalyzer_scan(T.parent.air, user, T)
-	else if (istype(A, /obj/machinery/power/rad_collector))
+	else if(istype(A, /obj/machinery/power/rad_collector))
 		var/obj/machinery/power/rad_collector/T = A
 		if(T.P)
 			pda.atmosanalyzer_scan(T.P.air_contents, user, T)
-	else if (istype(A, /obj/item/weapon/flamethrower))
+	else if(istype(A, /obj/item/weapon/flamethrower))
 		var/obj/item/weapon/flamethrower/T = A
 		if(T.ptank)
 			pda.atmosanalyzer_scan(T.ptank.air_contents, user, T)
-	else if (istype(A, /obj/machinery/portable_atmospherics/scrubber/huge))
+	else if(istype(A, /obj/machinery/portable_atmospherics/scrubber/huge))
 		var/obj/machinery/portable_atmospherics/scrubber/huge/T = A
 		pda.atmosanalyzer_scan(T.air_contents, user, T)
-	else if (istype(A, /obj/machinery/atmospherics/unary/tank))
+	else if(istype(A, /obj/machinery/atmospherics/unary/tank))
 		var/obj/machinery/atmospherics/unary/tank/T = A
 		pda.atmosanalyzer_scan(T.air_contents, user, T)
 
diff --git a/code/modules/pooling/pool.dm b/code/modules/pooling/pool.dm
index d7ddbbeb082..2d769a020cb 100644
--- a/code/modules/pooling/pool.dm
+++ b/code/modules/pooling/pool.dm
@@ -91,7 +91,7 @@ var/global/list/GlobalPool = list()
 
 	GlobalPool[diver.type] |= diver
 
-	if (destroy)
+	if(destroy)
 		diver.Destroy()
 
 	diver.ResetVars()
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index a66eba09713..0d7bfe6889c 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -112,7 +112,7 @@
 	desc = "Heavy-duty switching circuits for power control."
 	icon = 'icons/obj/module.dmi'
 	icon_state = "power_mod"
-	w_class = 2.0
+	w_class = 2
 	item_state = "electronic"
 	flags = CONDUCT
 
@@ -135,14 +135,14 @@
 
 	// offset 24 pixels in direction of dir
 	// this allows the APC to be embedded in a wall, yet still inside an area
-	if (building)
+	if(building)
 		dir = ndir
 	src.tdir = dir		// to fix Vars bug
 	dir = SOUTH
 
 	pixel_x = (src.tdir & 3)? 0 : (src.tdir == 4 ? 24 : -24)
 	pixel_y = (src.tdir & 3)? (src.tdir ==1 ? 24 : -24) : 0
-	if (building==0)
+	if(building==0)
 		init()
 	else
 		area = src.loc.loc
@@ -158,8 +158,8 @@
 /obj/machinery/power/apc/Destroy()
 	apcs -= src
 	if(malfai && operating)
-		if (ticker.mode.config_tag == "malfunction")
-			if (src.z == ZLEVEL_STATION)
+		if(ticker.mode.config_tag == "malfunction")
+			if(src.z == ZLEVEL_STATION)
 				ticker.mode:apcs--
 	area.power_light = 0
 	area.power_equip = 0
@@ -218,17 +218,17 @@
 		if(opened)
 			if(has_electronics && terminal)
 				to_chat(user, "The cover is [opened==2?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"].")
-			else if (!has_electronics && terminal)
+			else if(!has_electronics && terminal)
 				to_chat(user, "There are some wires but no any electronics.")
-			else if (has_electronics && !terminal)
+			else if(has_electronics && !terminal)
 				to_chat(user, "Electronics installed but not wired.")
-			else /* if (!has_electronics && !terminal) */
+			else /* if(!has_electronics && !terminal) */
 				to_chat(user, "There is no electronics nor connected wires.")
 
 		else
-			if (stat & MAINT)
+			if(stat & MAINT)
 				to_chat(user, "The cover is closed. Something wrong with it: it doesn't work.")
-			else if (malfhack)
+			else if(malfhack)
 				to_chat(user, "The cover is broken. It may be hard to force it open.")
 			else
 				to_chat(user, "The cover is closed.")
@@ -237,7 +237,7 @@
 // also add overlays for indicator lights
 /obj/machinery/power/apc/update_icon()
 
-	if (!status_overlays)
+	if(!status_overlays)
 		status_overlays = 1
 		status_overlays_lock = new
 		status_overlays_charging = new
@@ -359,7 +359,7 @@
 		else if(charging == 2)
 			update_overlay |= APC_UPOVERLAY_CHARGEING2
 
-		if (!equipment)
+		if(!equipment)
 			update_overlay |= APC_UPOVERLAY_EQUIPMENT0
 		else if(equipment == 1)
 			update_overlay |= APC_UPOVERLAY_EQUIPMENT1
@@ -411,20 +411,20 @@
 //attack with an item - open/close cover, insert cell, or (un)lock interface
 /obj/machinery/power/apc/attackby(obj/item/W, mob/living/user, params)
 
-	if (istype(user, /mob/living/silicon) && get_dist(src,user)>1)
+	if(istype(user, /mob/living/silicon) && get_dist(src,user)>1)
 		return src.attack_hand(user)
-	if (istype(W, /obj/item/weapon/crowbar) && opened)
-		if (has_electronics==1)
-			if (terminal)
+	if(istype(W, /obj/item/weapon/crowbar) && opened)
+		if(has_electronics==1)
+			if(terminal)
 				to_chat(user, "<span class='warning'>Disconnect wires first.</span>")
 				return
 			playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
 			to_chat(user, "You are trying to remove the power control board...")//lpeters - fixed grammar issues
 
 			if(do_after(user, 50, target = src))
-				if (has_electronics==1)
+				if(has_electronics==1)
 					has_electronics = 0
-					if ((stat & BROKEN) || malfhack)
+					if((stat & BROKEN) || malfhack)
 						user.visible_message(\
 							"<span class='warning'>[user.name] has broken the power control board inside [src.name]!</span>",\
 							"<span class='notice'>You broke the charred power control board and remove the remains.</span>",
@@ -435,22 +435,22 @@
 							"<span class='warning'>[user.name] has removed the power control board from [src.name]!</span>",\
 							"<span class='notice'>You remove the power control board.</span>")
 						new /obj/item/weapon/apc_electronics(loc)
-		else if (opened!=2) //cover isn't removed
+		else if(opened!=2) //cover isn't removed
 			opened = 0
 			update_icon()
-	else if (istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || malfhack) )
+	else if(istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || malfhack) )
 		if(coverlocked && !(stat & MAINT))
 			to_chat(user, "<span class='warning'>The cover is locked and cannot be opened.</span>")
 			return
 		else
 			opened = 1
 			update_icon()
-	else if	(istype(W, /obj/item/weapon/stock_parts/cell) && opened)	// trying to put a cell inside
+	else if(istype(W, /obj/item/weapon/stock_parts/cell) && opened)	// trying to put a cell inside
 		if(cell)
 			to_chat(user, "There is a power cell already installed.")
 			return
 		else
-			if (stat & MAINT)
+			if(stat & MAINT)
 				to_chat(user, "<span class='warning'>There is no connector for your power cell.</span>")
 				return
 			user.drop_item()
@@ -461,19 +461,19 @@
 				"You insert the power cell.")
 			chargecount = 0
 			update_icon()
-	else if	(istype(W, /obj/item/weapon/screwdriver))	// haxing
+	else if(istype(W, /obj/item/weapon/screwdriver))	// haxing
 		if(opened)
-			if (cell)
+			if(cell)
 				to_chat(user, "<span class='warning'>Close the APC first.</span>")//Less hints more mystery!
 
 				return
 			else
-				if (has_electronics==1 && terminal)
+				if(has_electronics==1 && terminal)
 					has_electronics = 2
 					stat &= ~MAINT
 					playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 					to_chat(user, "You screw the circuit electronics into place.")
-				else if (has_electronics==2)
+				else if(has_electronics==2)
 					has_electronics = 1
 					stat |= MAINT
 					playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
@@ -489,7 +489,7 @@
 			to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]")
 			update_icon()
 
-	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))			// trying to unlock the interface with an ID card
+	else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))			// trying to unlock the interface with an ID card
 		if(emagged)
 			to_chat(user, "The interface is broken.")
 		else if(opened)
@@ -505,8 +505,8 @@
 				update_icon()
 			else
 				to_chat(user, "<span class='warning'>Access denied.</span>")
-	else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2)
-		if (src.loc:intact)
+	else if(istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2)
+		if(src.loc:intact)
 			to_chat(user, "<span class='warning'>You must remove the floor plating in front of the APC first.</span>")
 			return
 		var/obj/item/stack/cable_coil/C = W
@@ -516,10 +516,10 @@
 		to_chat(user, "You start adding cables to the APC frame...")
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		if(do_after(user, 20, target = src))
-			if (C.amount >= 10 && !terminal && opened && has_electronics != 2)
+			if(C.amount >= 10 && !terminal && opened && has_electronics != 2)
 				var/turf/T = get_turf(src)
 				var/obj/structure/cable/N = T.get_cable_node()
-				if (prob(50) && electrocute_mob(usr, N, N))
+				if(prob(50) && electrocute_mob(usr, N, N))
 					var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 					s.set_up(5, 1, src)
 					s.start()
@@ -530,15 +530,15 @@
 					"You add cables to the APC frame.")
 				make_terminal()
 				terminal.connect_to_network()
-	else if (istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2)
-		if (src.loc:intact)
+	else if(istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2)
+		if(src.loc:intact)
 			to_chat(user, "<span class='warning'>You must remove the floor plating in front of the APC first.</span>")
 			return
 		to_chat(user, "You begin to cut the cables...")
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		if(do_after(user, 50, target = src))
 			if(terminal && opened && has_electronics!=2)
-				if (prob(50) && electrocute_mob(usr, terminal.powernet, terminal))
+				if(prob(50) && electrocute_mob(usr, terminal.powernet, terminal))
 					var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 					s.set_up(5, 1, src)
 					s.start()
@@ -546,7 +546,7 @@
 				new /obj/item/stack/cable_coil(loc,10)
 				to_chat(user, "<span class='notice'>You cut the cables and dismantle the power terminal.</span>")
 				qdel(terminal) // qdel
-	else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
+	else if(istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
 		to_chat(user, "You trying to insert the power control board into the frame...")
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		if(do_after(user, 10, target = src))
@@ -554,12 +554,12 @@
 				has_electronics = 1
 				to_chat(user, "<span class='notice'>You place the power control board inside the frame.</span>")
 				qdel(W) // qdel
-	else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
+	else if(istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
 		to_chat(user, "<span class='warning'>You cannot put the board inside, the frame is damaged.</span>")
 		return
-	else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal)
+	else if(istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal)
 		var/obj/item/weapon/weldingtool/WT = W
-		if (WT.get_fuel() < 3)
+		if(WT.get_fuel() < 3)
 			to_chat(user, "<span class='warning'>You need more welding fuel to complete this task.</span>")
 			return
 		user.visible_message("<span class='warning'>[user.name] welds [src].</span>", \
@@ -568,7 +568,7 @@
 		playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
 		if(do_after(user, 50, target = src))
 			if(!src || !WT.remove_fuel(3, user)) return
-			if (emagged || malfhack || (stat & BROKEN) || opened==2)
+			if(emagged || malfhack || (stat & BROKEN) || opened==2)
 				new /obj/item/stack/sheet/metal(loc)
 				user.visible_message(\
 					"<span class='warning'>[src] has been cut apart by [user.name] with the weldingtool.</span>",\
@@ -582,17 +582,17 @@
 					"You hear welding.")
 			qdel(src) // qdel
 			return
-	else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && emagged)
+	else if(istype(W, /obj/item/mounted/frame/apc_frame) && opened && emagged)
 		emagged = 0
-		if (opened==2)
+		if(opened==2)
 			opened = 1
 		user.visible_message(\
 			"<span class='warning'>[user.name] has replaced the damaged APC frontal panel with a new one.</span>",\
 			"You replace the damaged APC frontal panel with a new one.")
 		qdel(W)
 		update_icon()
-	else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && ((stat & BROKEN) || malfhack))
-		if (has_electronics)
+	else if(istype(W, /obj/item/mounted/frame/apc_frame) && opened && ((stat & BROKEN) || malfhack))
+		if(has_electronics)
 			to_chat(user, "You cannot repair this APC until you remove the electronics still inside.")
 			return
 		to_chat(user, "You begin to replace the damaged APC frame...")
@@ -604,11 +604,11 @@
 			stat &= ~BROKEN
 			malfai = null
 			malfhack = 0
-			if (opened==2)
+			if(opened==2)
 				opened = 1
 			update_icon()
 	else
-		if (((stat & BROKEN) || malfhack) \
+		if(((stat & BROKEN) || malfhack) \
 				&& !opened \
 				&& ( \
 					(W.force >= 5 && W.w_class >= 3.0) \
@@ -621,7 +621,7 @@
 				"You hear bang")
 			update_icon()
 		else
-			if (istype(user, /mob/living/silicon))
+			if(istype(user, /mob/living/silicon))
 				return src.attack_hand(user)
 			if (!opened && wiresexposed && \
 				(istype(W, /obj/item/device/multitool) || \
@@ -633,7 +633,7 @@
 				"You hear bang")
 
 /obj/machinery/power/apc/emag_act(user as mob)
-	if (!(emagged || malfhack))		// trying to unlock with an emag card
+	if(!(emagged || malfhack))		// trying to unlock with an emag card
 		if(opened)
 			to_chat(user, "You must close the cover to swipe an ID card.")
 		else if(wiresexposed)
@@ -649,7 +649,7 @@
 
 // attack with hand - remove cell (if cover open) or interact with the APC
 /obj/machinery/power/apc/attack_hand(mob/user)
-//	if (!can_use(user)) This already gets called in interact() and in topic()
+//	if(!can_use(user)) This already gets called in interact() and in topic()
 //		return
 	if(!user)
 		return
@@ -748,11 +748,11 @@
 
 
 /obj/machinery/power/apc/proc/get_malf_status(mob/user)
-	if (ticker && ticker.mode && (user.mind in ticker.mode.malf_ai) && istype(user, /mob/living/silicon/ai))
-		if (src.malfai == (user:parent ? user:parent : user))
-			if (src.occupier == user)
+	if(ticker && ticker.mode && (user.mind in ticker.mode.malf_ai) && istype(user, /mob/living/silicon/ai))
+		if(src.malfai == (user:parent ? user:parent : user))
+			if(src.occupier == user)
 				return 3 // 3 = User is shunted in this APC
-			else if (istype(user.loc, /obj/machinery/power/apc))
+			else if(istype(user.loc, /obj/machinery/power/apc))
 				return 4 // 4 = User is shunted in another APC
 			else
 				return 2 // 2 = APC hacked by user, and user is in its core.
@@ -813,7 +813,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new one
 		ui = new(user, src, ui_key, "apc.tmpl", "[area.name] - APC", 510, data["siliconUser"] ? 535 : 460)
 		// When the UI is first opened this is the data it will use
@@ -830,14 +830,14 @@
 		area.power_light = (lighting > 1)
 		area.power_equip = (equipment > 1)
 		area.power_environ = (environ > 1)
-//		if (area.name == "AI Chamber")
+//		if(area.name == "AI Chamber")
 //			spawn(10)
 //				to_chat(world, " [area.name] [area.power_equip]")
 	else
 		area.power_light = 0
 		area.power_equip = 0
 		area.power_environ = 0
-//		if (area.name == "AI Chamber")
+//		if(area.name == "AI Chamber")
 //			to_chat(world, "[area.power_equip]")
 	area.power_change()
 
@@ -850,7 +850,7 @@
 		return 1
 
 	autoflag = 5
-	if (istype(user, /mob/living/silicon))
+	if(istype(user, /mob/living/silicon))
 		var/mob/living/silicon/ai/AI = user
 		var/mob/living/silicon/robot/robot = user
 		if (                                                             \
@@ -867,11 +867,11 @@
 				user.unset_machine()
 			return 0
 	else
-		if ((!in_range(src, user) || !istype(src.loc, /turf)))
+		if((!in_range(src, user) || !istype(src.loc, /turf)))
 			return 0
 
 	var/mob/living/carbon/human/H = user
-	if (istype(H))
+	if(istype(H))
 		if(H.getBrainLoss() >= 60)
 			for(var/mob/M in viewers(src, null))
 				to_chat(M, "<span class='danger'>[H] stares cluelessly at [src] and drools.</span>")
@@ -904,19 +904,19 @@
 	if(!can_use(usr, 1))
 		return 1
 
-	if (href_list["lock"])
+	if(href_list["lock"])
 		if(!is_authenticated(usr))
 			return
 
 		coverlocked = !coverlocked
 
-	else if (href_list["breaker"])
+	else if(href_list["breaker"])
 		if(!is_authenticated(usr))
 			return
 
 		toggle_breaker()
 
-	else if (href_list["cmode"])
+	else if(href_list["cmode"])
 		if(!is_authenticated(usr))
 			return
 
@@ -925,7 +925,7 @@
 			charging = 0
 			update_icon()
 
-	else if (href_list["eqp"])
+	else if(href_list["eqp"])
 		if(!is_authenticated(usr))
 			return
 
@@ -934,7 +934,7 @@
 		update_icon()
 		update()
 
-	else if (href_list["lgt"])
+	else if(href_list["lgt"])
 		if(!is_authenticated(usr))
 			return
 
@@ -943,7 +943,7 @@
 		update_icon()
 		update()
 
-	else if (href_list["env"])
+	else if(href_list["env"])
 		if(!is_authenticated(usr))
 			return
 
@@ -955,19 +955,19 @@
 		nanomanager.close_user_uis(usr, src)
 
 		return 0
-	else if (href_list["close2"])
+	else if(href_list["close2"])
 		usr << browse(null, "window=apcwires")
 
 		return 0
 
-	else if (href_list["overload"])
+	else if(href_list["overload"])
 		if(istype(usr, /mob/living/silicon) && !aidisabled)
 			src.overload_lighting()
 
-	else if (href_list["malfhack"])
+	else if(href_list["malfhack"])
 		var/mob/living/silicon/ai/malfai = usr
 		if(get_malf_status(malfai)==1)
-			if (malfai.malfhacking)
+			if(malfai.malfhacking)
 				to_chat(malfai, "You are already hacking an APC.")
 				return 0
 			to_chat(malfai, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")
@@ -975,12 +975,12 @@
 			malfai.malfhacking = 1
 			sleep(600)
 			if(src)
-				if (!src.aidisabled)
+				if(!src.aidisabled)
 					malfai.malfhack = null
 					malfai.malfhacking = 0
 					locked = 1
-					if (ticker.mode.config_tag == "malfunction")
-						if ((src.z in config.station_levels)) //if (is_type_in_list(get_area(src), the_station_areas))
+					if(ticker.mode.config_tag == "malfunction")
+						if((src.z in config.station_levels)) //if(is_type_in_list(get_area(src), the_station_areas))
 							ticker.mode:apcs++
 					if(usr:parent)
 						src.malfai = usr:parent
@@ -989,15 +989,15 @@
 					to_chat(malfai, "Hack complete. The APC is now under your exclusive control.")
 					update_icon()
 
-	else if (href_list["occupyapc"])
+	else if(href_list["occupyapc"])
 		if(get_malf_status(usr))
 			malfoccupy(usr)
 
-	else if (href_list["deoccupyapc"])
+	else if(href_list["deoccupyapc"])
 		if(get_malf_status(usr))
 			malfvacate()
 
-	else if (href_list["toggleaccess"])
+	else if(href_list["toggleaccess"])
 		if(istype(usr, /mob/living/silicon))
 			if(emagged || aidisabled || (stat & (BROKEN|MAINT)))
 				to_chat(usr, "The APC does not respond to the command.")
@@ -1011,8 +1011,8 @@
 	operating = !operating
 
 	if(malfai)
-		if (ticker.mode.config_tag == "malfunction")
-			if ((src.z in config.station_levels)) //if (is_type_in_list(get_area(src), the_station_areas))
+		if(ticker.mode.config_tag == "malfunction")
+			if((src.z in config.station_levels)) //if(is_type_in_list(get_area(src), the_station_areas))
 				operating ? ticker.mode:apcs++ : ticker.mode:apcs--
 
 	src.update()
@@ -1044,7 +1044,7 @@
 	src.occupier.verbs += /mob/living/silicon/ai/proc/corereturn
 	src.occupier.verbs += /datum/game_mode/malfunction/proc/takeover
 	src.occupier.cancel_camera()
-	if (seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
+	if(seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
 		for(var/obj/item/weapon/pinpointer/point in world)
 			point.the_disk = src //the pinpointer will detect the shunted AI
 
@@ -1057,7 +1057,7 @@
 		src.occupier.parent.adjustOxyLoss(src.occupier.getOxyLoss())
 		src.occupier.parent.cancel_camera()
 		qdel(src.occupier) // qdel
-		if (seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
+		if(seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
 			for(var/obj/item/weapon/pinpointer/point in world)
 				for(var/datum/mind/AI_mind in ticker.mode.malf_ai)
 					var/mob/living/silicon/ai/A = AI_mind.current // the current mob the mind owns
@@ -1079,7 +1079,7 @@
 	if(!src.malfhack && (src.z in config.station_levels))
 		if(prob(3))
 			src.locked = 1
-			if (src.cell.charge > 0)
+			if(src.cell.charge > 0)
 //				to_chat(world, "<span class='warning'>blew APC in [src.loc.loc]</span>")
 				src.cell.charge = 0
 				cell.corrupt()
@@ -1280,7 +1280,7 @@
 	if(last_lt != lighting || last_eq != equipment || last_en != environ)
 		queue_icon_update()
 		update()
-	else if (last_ch != charging)
+	else if(last_ch != charging)
 		queue_icon_update()
 
 /obj/machinery/power/apc/proc/autoset(var/val, var/on)
@@ -1320,26 +1320,26 @@
 	switch(severity)
 		if(1.0)
 			//set_broken() //now Destroy() do what we need
-			if (cell)
+			if(cell)
 				cell.ex_act(1.0) // more lags woohoo
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				set_broken()
-				if (cell && prob(50))
+				if(cell && prob(50))
 					cell.ex_act(2.0)
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				set_broken()
-				if (cell && prob(25))
+				if(cell && prob(25))
 					cell.ex_act(3.0)
 	return
 
 /obj/machinery/power/apc/blob_act()
-	if (prob(75))
+	if(prob(75))
 		set_broken()
-		if (cell && prob(5))
+		if(cell && prob(5))
 			cell.blob_act()
 
 
@@ -1350,8 +1350,8 @@
 
 /obj/machinery/power/apc/proc/set_broken()
 	if(malfai && operating)
-		if (ticker.mode.config_tag == "malfunction")
-			if ((src.z in config.station_levels)) //if (is_type_in_list(get_area(src), the_station_areas))
+		if(ticker.mode.config_tag == "malfunction")
+			if((src.z in config.station_levels)) //if(is_type_in_list(get_area(src), the_station_areas))
 				ticker.mode:apcs--
 	stat |= BROKEN
 	operating = 0
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 863b231f25a..6a6933db72d 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -128,7 +128,7 @@ By design, d1 is the smallest direction and d2 is the highest
 			to_chat(user, "\red This cable is connected to nearby breaker box. Use breaker box to interact with it.")
 			return */
 
-		if (shock(user, 50))
+		if(shock(user, 50))
 			return
 
 		if(src.d1)	// 0-X cables are 1 unit, X-X cables are 2 units long
@@ -157,7 +157,7 @@ By design, d1 is the smallest direction and d2 is the highest
 
 	else if(istype(W, /obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/coil = W
-		if (coil.get_amount() < 1)
+		if(coil.get_amount() < 1)
 			to_chat(user, "Not enough cable")
 			return
 		coil.cable_join(src, user)
@@ -173,7 +173,7 @@ By design, d1 is the smallest direction and d2 is the highest
 		shock(user, 5, 0.2)
 
 	else
-		if (W.flags & CONDUCT)
+		if(W.flags & CONDUCT)
 			shock(user, 50, 0.7)
 
 	src.add_fingerprint(user)
@@ -182,7 +182,7 @@ By design, d1 is the smallest direction and d2 is the highest
 /obj/structure/cable/proc/shock(mob/user, prb, var/siemens_coeff = 1.0)
 	if(!prob(prb))
 		return 0
-	if (electrocute_mob(user, powernet, src, siemens_coeff))
+	if(electrocute_mob(user, powernet, src, siemens_coeff))
 		var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 		s.set_up(5, 1, src)
 		s.start()
@@ -196,12 +196,12 @@ By design, d1 is the smallest direction and d2 is the highest
 		if(1.0)
 			qdel(src) // qdel
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				new/obj/item/stack/cable_coil(src.loc, src.d1 ? 2 : 1, color)
 				qdel(src) // qdel
 
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				new/obj/item/stack/cable_coil(src.loc, src.d1 ? 2 : 1, color)
 				qdel(src) // qdel
 	return
@@ -341,7 +341,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
 	var/turf/T
 
 ///// Z-Level Stuff
-	/* if (d1 == 11 || d1 == 12)
+	/* if(d1 == 11 || d1 == 12)
 		var/turf/controllerlocation = locate(1, 1, z)
 		for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
 			if(controller.up && d1 == 12)
@@ -466,7 +466,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
 	color = COLOR_RED
 	desc = "A coil of power cable."
 	throwforce = 10
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 2
 	throw_range = 5
 	materials = list(MAT_METAL=10, MAT_GLASS=5)
@@ -485,7 +485,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
 /obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/paramcolor = null)
 	..()
 	src.amount = length
-	if (paramcolor)
+	if(paramcolor)
 		color = paramcolor
 	else
 		color = color
@@ -526,7 +526,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
 	return C
 
 /obj/item/stack/cable_coil/update_icon()
-	if (!color)
+	if(!color)
 		color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
 		color = color
 	if(amount == 1)
@@ -541,9 +541,9 @@ obj/structure/cable/proc/cableColor(var/colorC)
 
 /obj/item/stack/cable_coil/proc/update_wclass()
 	if(amount == 1)
-		w_class = 1.0
+		w_class = 1
 	else
-		w_class = 2.0
+		w_class = 2
 
 /obj/item/stack/cable_coil/examine(mob/user)
 	if(!..(user, 1))
@@ -674,8 +674,8 @@ obj/structure/cable/proc/cableColor(var/colorC)
 
 		use(1)
 
-		if (C.shock(user, 50))
-			if (prob(50)) //fail
+		if(C.shock(user, 50))
+			if(prob(50)) //fail
 				new/obj/item/stack/cable_coil(C.loc, 1, C.color)
 				qdel(C) // qdel
 
@@ -738,8 +738,8 @@ obj/structure/cable/proc/cableColor(var/colorC)
 
 			use(1)
 
-			if (NC.shock(user, 50))
-				if (prob(50)) //fail
+			if(NC.shock(user, 50))
+				if(prob(50)) //fail
 					new/obj/item/stack/cable_coil(NC.loc, 1, NC.color)
 					qdel(NC) // qdel
 
@@ -786,8 +786,8 @@ obj/structure/cable/proc/cableColor(var/colorC)
 
 		use(1)
 
-		if (C.shock(user, 50))
-			if (prob(50)) //fail
+		if(C.shock(user, 50))
+			if(prob(50)) //fail
 				new/obj/item/stack/cable_coil(C.loc, 2, C.color)
 				qdel(C) // qdel
 				return
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 6e61be2a257..e2e97437b68 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -98,13 +98,13 @@
  * 10000-cell	explosion(T, -1, 1, 3, 3)
  * 15000-cell	explosion(T, -1, 2, 4, 4)
  * */
-	if (charge==0)
+	if(charge==0)
 		return
 	var/devastation_range = -1 //round(charge/11000)
 	var/heavy_impact_range = round(sqrt(charge)/60)
 	var/light_impact_range = round(sqrt(charge)/30)
 	var/flash_range = light_impact_range
-	if (light_impact_range==0)
+	if(light_impact_range==0)
 		rigged = 0
 		corrupt()
 		return
@@ -119,12 +119,12 @@
 /obj/item/weapon/stock_parts/cell/proc/corrupt()
 	charge /= 2
 	maxcharge /= 2
-	if (prob(10))
+	if(prob(10))
 		rigged = 1 //broken batterys are dangerous
 
 /obj/item/weapon/stock_parts/cell/emp_act(severity)
 	charge -= 1000 / severity
-	if (charge < 0)
+	if(charge < 0)
 		charge = 0
 	if(reliability != 100 && prob(50/severity))
 		reliability -= 10 / severity
@@ -137,16 +137,16 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
-			if (prob(50))
+			if(prob(50))
 				corrupt()
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				qdel(src)
 				return
-			if (prob(25))
+			if(prob(25))
 				corrupt()
 	return
 
@@ -154,34 +154,34 @@
 	ex_act(1)
 
 /obj/item/weapon/stock_parts/cell/proc/get_electrocute_damage()
-	switch (charge)
-/*		if (9000 to INFINITY)
+	switch(charge)
+/*		if(9000 to INFINITY)
 			return min(rand(90,150),rand(90,150))
-		if (2500 to 9000-1)
+		if(2500 to 9000-1)
 			return min(rand(70,145),rand(70,145))
-		if (1750 to 2500-1)
+		if(1750 to 2500-1)
 			return min(rand(35,110),rand(35,110))
-		if (1500 to 1750-1)
+		if(1500 to 1750-1)
 			return min(rand(30,100),rand(30,100))
-		if (750 to 1500-1)
+		if(750 to 1500-1)
 			return min(rand(25,90),rand(25,90))
-		if (250 to 750-1)
+		if(250 to 750-1)
 			return min(rand(20,80),rand(20,80))
-		if (100 to 250-1)
+		if(100 to 250-1)
 			return min(rand(20,65),rand(20,65))*/
-		if (5000000 to INFINITY)
+		if(5000000 to INFINITY)
 			return min(rand(200,300),rand(200,300))
-		if (4000000 to 5000000-1)
+		if(4000000 to 5000000-1)
 			return min(rand(80,180),rand(80,180))
-		if (1000000 to 4000000-1)
+		if(1000000 to 4000000-1)
 			return min(rand(50,160),rand(50,160))
-		if (200000 to 1000000-1)
+		if(200000 to 1000000-1)
 			return min(rand(25,80),rand(25,80))
-		if (100000 to 200000-1)//Ave powernet
+		if(100000 to 200000-1)//Ave powernet
 			return min(rand(20,60),rand(20,60))
-		if (50000 to 100000-1)
+		if(50000 to 100000-1)
 			return min(rand(15,40),rand(15,40))
-		if (1000 to 50000-1)
+		if(1000 to 50000-1)
 			return min(rand(10,20),rand(10,20))
 		else
 			return 0
diff --git a/code/modules/power/engine.dm b/code/modules/power/engine.dm
index 1d7a97406e4..bf05e7cd2d4 100644
--- a/code/modules/power/engine.dm
+++ b/code/modules/power/engine.dm
@@ -9,7 +9,7 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				ChangeTurf(/turf/space)
 				qdel(src)
 				return
@@ -17,7 +17,7 @@
 	return
 
 /turf/simulated/floor/engine/blob_act()
-	if (prob(25))
+	if(prob(25))
 		ChangeTurf(/turf/space)
 		qdel(src)
 		return
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index 0f19ce0990e..3c344f8dd30 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -92,9 +92,9 @@
 				air1.temperature = air1.temperature - energy_transfer/air1_heat_capacity
 
 	//Transfer the air
-	if (air1)
+	if(air1)
 		circ1.air2.merge(air1)
-	if (air2)
+	if(air2)
 		circ2.air2.merge(air2)
 
 	//Update the gas networks
@@ -137,7 +137,7 @@
 
 
 /obj/machinery/power/generator/interact(mob/user)
-	if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
+	if( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
 		user.unset_machine()
 		user << browse(null, "window=teg")
 		return
@@ -195,7 +195,7 @@
 	set name = "Rotate Generator (Clockwise)"
 	set src in view(1)
 
-	if (usr.stat || usr.restrained()  || anchored)
+	if(usr.stat || usr.restrained()  || anchored)
 		return
 
 	src.dir = turn(src.dir, 90)
@@ -205,7 +205,7 @@
 	set name = "Rotate Generator (Counterclockwise)"
 	set src in view(1)
 
-	if (usr.stat || usr.restrained()  || anchored)
+	if(usr.stat || usr.restrained()  || anchored)
 		return
 
 	src.dir = turn(src.dir, -90)
\ No newline at end of file
diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm
index 46a6fe20320..6d2daf9f58c 100644
--- a/code/modules/power/generator_type2.dm
+++ b/code/modules/power/generator_type2.dm
@@ -100,7 +100,7 @@
 
 
 /obj/machinery/power/generator_type2/interact(mob/user)
-	if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
+	if( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
 		user.unset_machine()
 		user << browse(null, "window=teg")
 		return
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 04ffbc5c0a4..3a0a0b1df2a 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -123,7 +123,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
 		O.main_part = null
 		qdel(O)
 	for(var/area/A in world)
-		if (!(A.z in config.station_levels)) continue
+		if(!(A.z in config.station_levels)) continue
 		A.gravitychange(0,A)
 	shake_everyone()
 	return ..()
@@ -300,7 +300,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
 			investigate_log("was brought online and is now producing gravity for this level.", "gravity")
 			message_admins("The gravity generator was brought online. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
 			for(var/area/A in world)
-				if (!(A.z in config.station_levels)) continue
+				if(!(A.z in config.station_levels)) continue
 				A.gravitychange(1,A)
 	else
 		if(gravity_in_level() == 1)
@@ -308,7 +308,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
 			investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
 			message_admins("The gravity generator was brought offline with no backup generator. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
 			for(var/area/A in world)
-				if (!(A.z in config.station_levels)) continue
+				if(!(A.z in config.station_levels)) continue
 				A.gravitychange(0,A)
 
 	update_icon()
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 78ac0d7093a..a96a4851c81 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -23,7 +23,7 @@
 
 /obj/machinery/light_construct/New()
 	..()
-	if (fixture_type == "bulb")
+	if(fixture_type == "bulb")
 		icon_state = "bulb-construct-stage1"
 
 /obj/machinery/light_construct/examine(mob/user)
@@ -38,30 +38,30 @@
 
 /obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
 	src.add_fingerprint(user)
-	if (istype(W, /obj/item/weapon/wrench))
-		if (src.stage == 1)
+	if(istype(W, /obj/item/weapon/wrench))
+		if(src.stage == 1)
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 			to_chat(usr, "You begin deconstructing [src].")
-			if (!do_after(usr, 30, target = src))
+			if(!do_after(usr, 30, target = src))
 				return
 			new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
 			user.visible_message("[user.name] deconstructs [src].", \
 				"You deconstruct [src].", "You hear a noise.")
 			playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1)
 			qdel(src)
-		if (src.stage == 2)
+		if(src.stage == 2)
 			to_chat(usr, "You have to remove the wires first.")
 			return
 
-		if (src.stage == 3)
+		if(src.stage == 3)
 			to_chat(usr, "You have to unscrew the case first.")
 			return
 
 	if(istype(W, /obj/item/weapon/wirecutters))
-		if (src.stage != 2) return
+		if(src.stage != 2) return
 		src.stage = 1
 		switch(fixture_type)
-			if ("tube")
+			if("tube")
 				src.icon_state = "tube-construct-stage1"
 			if("bulb")
 				src.icon_state = "bulb-construct-stage1"
@@ -72,11 +72,11 @@
 		return
 
 	if(istype(W, /obj/item/stack/cable_coil))
-		if (src.stage != 1) return
+		if(src.stage != 1) return
 		var/obj/item/stack/cable_coil/coil = W
 		coil.use(1)
 		switch(fixture_type)
-			if ("tube")
+			if("tube")
 				src.icon_state = "tube-construct-stage2"
 			if("bulb")
 				src.icon_state = "bulb-construct-stage2"
@@ -86,9 +86,9 @@
 		return
 
 	if(istype(W, /obj/item/weapon/screwdriver))
-		if (src.stage == 2)
+		if(src.stage == 2)
 			switch(fixture_type)
-				if ("tube")
+				if("tube")
 					src.icon_state = "tube-empty"
 				if("bulb")
 					src.icon_state = "bulb-empty"
@@ -101,7 +101,7 @@
 
 				if("tube")
 					newlight = new /obj/machinery/light/built(src.loc)
-				if ("bulb")
+				if("bulb")
 					newlight = new /obj/machinery/light/small/built(src.loc)
 
 			newlight.dir = src.dir
@@ -337,7 +337,7 @@
 					continue
 				M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
 			if(on && (W.flags & CONDUCT))
-				if (prob(12))
+				if(prob(12))
 					electrocute_mob(user, get_area(src), src, 0.3)
 			broken()
 
@@ -373,7 +373,7 @@
 			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 			s.set_up(3, 1, src)
 			s.start()
-			if (prob(75))
+			if(prob(75))
 				electrocute_mob(user, get_area(src), src, rand(0.7,1.0))
 
 
@@ -407,7 +407,7 @@
 	if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
 		to_chat(user, "\green That object is useless to you.")
 		return
-	else if (status == LIGHT_OK||status == LIGHT_BURNED)
+	else if(status == LIGHT_OK||status == LIGHT_BURNED)
 		user.do_attack_animation(src)
 		visible_message("<span class='danger'>[user.name] smashed the light!</span>", "You hear a tinkle of breaking glass")
 		broken()
@@ -418,7 +418,7 @@
 	if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
 		to_chat(M, "\red That object is useless to you.")
 		return
-	else if (status == LIGHT_OK||status == LIGHT_BURNED)
+	else if(status == LIGHT_OK||status == LIGHT_BURNED)
 		M.do_attack_animation(src)
 		visible_message("<span class='danger'>[M.name] smashed the light!</span>", "You hear a tinkle of breaking glass")
 		broken()
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index bc1599674a2..fdb9fe34ae1 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -179,7 +179,7 @@
 
 	//HasFuel() should guarantee us that there is enough fuel left, so no need to check that
 	//the only thing we need to worry about is if we are going to rollover to the next sheet
-	if (needed_sheets > sheet_left)
+	if(needed_sheets > sheet_left)
 		sheets--
 		sheet_left = (1 + sheet_left) - needed_sheets
 	else
@@ -197,7 +197,7 @@
 		cooling in order to get more power out.
 	*/
 	var/datum/gas_mixture/environment = loc.return_air()
-	if (environment)
+	if(environment)
 		var/ratio = min(environment.return_pressure()/ONE_ATMOSPHERE, 1)
 		var/ambient = environment.temperature - T20C
 		lower_limit += ambient*ratio
@@ -207,9 +207,9 @@
 
 	//calculate the temperature increase
 	var/bias = 0
-	if (temperature < lower_limit)
+	if(temperature < lower_limit)
 		bias = min(round((average - temperature)/TEMPERATURE_DIVISOR, 1), TEMPERATURE_CHANGE_MAX)
-	else if (temperature > upper_limit)
+	else if(temperature > upper_limit)
 		bias = max(round((temperature - average)/TEMPERATURE_DIVISOR, 1), -TEMPERATURE_CHANGE_MAX)
 
 	//limit temperature increase so that it cannot raise temperature above upper_limit,
@@ -218,20 +218,20 @@
 	var/dec_limit = min(temperature - lower_limit, 0)
 	temperature += between(dec_limit, rand(-7 + bias, 7 + bias), inc_limit)
 
-	if (temperature > max_temperature)
+	if(temperature > max_temperature)
 		overheat()
-	else if (overheating > 0)
+	else if(overheating > 0)
 		overheating--
 
 /obj/machinery/power/port_gen/pacman/handleInactive()
 	var/cooling_temperature = 20
 	var/datum/gas_mixture/environment = loc.return_air()
-	if (environment)
+	if(environment)
 		var/ratio = min(environment.return_pressure()/ONE_ATMOSPHERE, 1)
 		var/ambient = environment.temperature - T20C
 		cooling_temperature += ambient*ratio
 
-	if (temperature > cooling_temperature)
+	if(temperature > cooling_temperature)
 		var/temp_loss = (temperature - cooling_temperature)/TEMPERATURE_DIVISOR
 		temp_loss = between(2, round(temp_loss, 1), TEMPERATURE_CHANGE_MAX)
 		temperature = max(temperature - temp_loss, cooling_temperature)
@@ -242,7 +242,7 @@
 
 /obj/machinery/power/port_gen/pacman/proc/overheat()
 	overheating++
-	if (overheating > 60)
+	if(overheating > 60)
 		explode()
 
 /obj/machinery/power/port_gen/pacman/explode()
@@ -251,7 +251,7 @@
 	//1 mol = 10 u? I dunno. 1 mol of carbon is definitely bigger than a pill
 	/*var/plasma = (sheets+sheet_left)*20
 	var/datum/gas_mixture/environment = loc.return_air()
-	if (environment)
+	if(environment)
 		environment.adjust_gas("plasma", plasma/10, temperature + T0C)*/
 
 	sheets = 0
@@ -259,10 +259,10 @@
 	..()
 
 /obj/machinery/power/port_gen/pacman/emag_act(var/remaining_charges, var/mob/user)
-	if (active && prob(25))
+	if(active && prob(25))
 		explode() //if they're foolish enough to emag while it's running
 
-	if (!emagged)
+	if(!emagged)
 		emagged = 1
 		return 1
 
@@ -306,7 +306,7 @@
 
 /obj/machinery/power/port_gen/pacman/attack_hand(mob/user as mob)
 	..()
-	if (!anchored)
+	if(!anchored)
 		return
 	ui_interact(user)
 
@@ -343,7 +343,7 @@
 	data["fuel_type"] = sheet_name
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "pacman.tmpl", src.name, 500, 560)
 		ui.set_initial_data(data)
 		ui.open()
@@ -360,17 +360,17 @@
 				active = 1
 				icon_state = "portgen1"
 		if(href_list["action"] == "disable")
-			if (active)
+			if(active)
 				active = 0
 				icon_state = "portgen0"
 		if(href_list["action"] == "eject")
 			if(!active)
 				DropFuel()
 		if(href_list["action"] == "lower_power")
-			if (power_output > 1)
+			if(power_output > 1)
 				power_output--
-		if (href_list["action"] == "higher_power")
-			if (power_output < max_power_output || (emagged && power_output < round(max_power_output*2.5)))
+		if(href_list["action"] == "higher_power")
+			if(power_output < max_power_output || (emagged && power_output < round(max_power_output*2.5)))
 				power_output++
 
 	nanomanager.update_uis(src)
@@ -397,15 +397,15 @@
 
 /obj/machinery/power/port_gen/pacman/super/UseFuel()
 	//produces a tiny amount of radiation when in use
-	if (prob(2*power_output))
-		for (var/mob/living/L in range(src, 5))
+	if(prob(2*power_output))
+		for(var/mob/living/L in range(src, 5))
 			L.apply_effect(1, IRRADIATE) //should amount to ~5 rads per minute at max safe power
 	..()
 
 /obj/machinery/power/port_gen/pacman/super/explode()
 	//a nice burst of radiation
 	var/rads = 50 + (sheets + sheet_left)*1.5
-	for (var/mob/living/L in range(src, 10))
+	for(var/mob/living/L in range(src, 10))
 		//should really fall with the square of the distance, but that makes the rads value drop too fast
 		//I dunno, maybe physics works different when you live in 2D -- SM radiation also works like this, apparently
 		L.apply_effect(max(20, round(rads/get_dist(L,src))), IRRADIATE)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 7aa54d3429b..bab046450a3 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -204,7 +204,7 @@
 	var/Zdir
 	if(d==11)
 		Zdir = 11
-	else if (d==12)
+	else if(d==12)
 		Zdir = 12
 	else
 		Zdir = 999
@@ -342,23 +342,23 @@
 	else if(istype(power_source,/obj/machinery/power/apc))
 		var/obj/machinery/power/apc/apc = power_source
 		cell = apc.cell
-		if (apc.terminal)
+		if(apc.terminal)
 			PN = apc.terminal.powernet
-	else if (!power_source)
+	else if(!power_source)
 		return 0
 	else
 		log_admin("ERROR: /proc/electrocute_mob([M], [power_source], [source]): wrong power_source")
 		return 0
-	if (!cell && !PN)
+	if(!cell && !PN)
 		return 0
 	var/PN_damage = 0
 	var/cell_damage = 0
-	if (PN)
+	if(PN)
 		PN_damage = PN.get_electrocute_damage()
-	if (cell)
+	if(cell)
 		cell_damage = cell.get_electrocute_damage()
 	var/shock_damage = 0
-	if (PN_damage>=cell_damage)
+	if(PN_damage>=cell_damage)
 		power_source = PN
 		shock_damage = PN_damage
 	else
@@ -367,11 +367,11 @@
 	var/drained_hp = M.electrocute_act(shock_damage, source, siemens_coeff) //zzzzzzap!
 	var/drained_energy = drained_hp*20
 
-	if (source_area)
+	if(source_area)
 		source_area.use_power(drained_energy/CELLRATE)
-	else if (istype(power_source,/datum/powernet))
+	else if(istype(power_source,/datum/powernet))
 		var/drained_power = drained_energy/CELLRATE //convert from "joules" to "watts"
 		drained_power = PN.draw_power(drained_power)
-	else if (istype(power_source, /obj/item/weapon/stock_parts/cell))
+	else if(istype(power_source, /obj/item/weapon/stock_parts/cell))
 		cell.use(drained_energy)
 	return drained_energy
diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm
index d40281eae65..416de55f6c3 100644
--- a/code/modules/power/powernet.dm
+++ b/code/modules/power/powernet.dm
@@ -108,7 +108,7 @@
 		//very simple load balancing. If there was a net excess this tick then it must have been that some APCs used less than perapc, since perapc*numapc = avail
 		//Therefore we can raise the amount of power rationed out to APCs on the assumption that those APCs that used less than perapc will continue to do so.
 		//If that assumption fails, then some APCs will miss out on power next tick, however it will be rebalanced for the tick after.
-		if (netexcess >= 0)
+		if(netexcess >= 0)
 			perapc_excess += min(netexcess/numapc, (avail - perapc) - perapc_excess)
 		else
 			perapc_excess = 0
@@ -129,19 +129,19 @@
 
 /datum/powernet/proc/get_electrocute_damage()
 	switch(avail)
-		if (5000000 to INFINITY)
+		if(5000000 to INFINITY)
 			return min(rand(200,300),rand(200,300))
-		if (4000000 to 5000000)
+		if(4000000 to 5000000)
 			return min(rand(80,180),rand(80,180))
-		if (1000000 to 4000000)
+		if(1000000 to 4000000)
 			return min(rand(50,160),rand(50,160))
-		if (200000 to 1000000)
+		if(200000 to 1000000)
 			return min(rand(25,80),rand(25,80))
-		if (100000 to 200000)//Ave powernet
+		if(100000 to 200000)//Ave powernet
 			return min(rand(20,60),rand(20,60))
-		if (50000 to 100000)
+		if(50000 to 100000)
 			return min(rand(15,40),rand(15,40))
-		if (1000 to 50000)
+		if(1000 to 50000)
 			return min(rand(10,20),rand(10,20))
 		else
 			return 0
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index dd15f904614..5ec69cf0233 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -84,7 +84,7 @@ var/global/list/rad_collectors = list()
 		else
 			disconnect_from_network()
 	else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if (src.allowed(user))
+		if(src.allowed(user))
 			if(active)
 				src.locked = !src.locked
 				to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
@@ -109,7 +109,7 @@ var/global/list/rad_collectors = list()
 /obj/machinery/power/rad_collector/proc/eject()
 	locked = 0
 	var/obj/item/weapon/tank/plasma/Z = src.P
-	if (!Z)
+	if(!Z)
 		return
 	Z.loc = get_turf(src)
 	Z.layer = initial(Z.layer)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 06ba1a093f8..89119df21a8 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -64,7 +64,7 @@
 	set category = "Object"
 	set src in oview(1)
 
-	if (src.anchored || usr:stat)
+	if(src.anchored || usr:stat)
 		to_chat(usr, "It is fastened to the floor!")
 		return 0
 	src.dir = turn(src.dir, 90)
@@ -117,7 +117,7 @@
 	return ..()
 
 /obj/machinery/power/emitter/update_icon()
-	if (active && powernet && avail(active_power_usage))
+	if(active && powernet && avail(active_power_usage))
 		icon_state = "emitter_+a"
 	else
 		icon_state = "emitter"
@@ -253,12 +253,12 @@
 			if(0)
 				to_chat(user, "\red The [src.name] needs to be wrenched to the floor.")
 			if(1)
-				if (WT.remove_fuel(0,user))
+				if(WT.remove_fuel(0,user))
 					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 					user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
 						"You start to weld the [src] to the floor.", \
 						"You hear welding")
-					if (do_after(user,20, target = src))
+					if(do_after(user,20, target = src))
 						if(!src || !WT.isOn()) return
 						state = 2
 						to_chat(user, "You weld the [src] to the floor.")
@@ -266,12 +266,12 @@
 				else
 					to_chat(user, "\red You need more welding fuel to complete this task.")
 			if(2)
-				if (WT.remove_fuel(0,user))
+				if(WT.remove_fuel(0,user))
 					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 					user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
 						"You start to cut the [src] free from the floor.", \
 						"You hear welding")
-					if (do_after(user,20, target = src))
+					if(do_after(user,20, target = src))
 						if(!src || !WT.isOn()) return
 						state = 1
 						to_chat(user, "You cut the [src] free from the floor.")
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 5bf41aac044..ed4d7bbc537 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -125,24 +125,24 @@ field_generator power level display
 				to_chat(user, "<span class='warning'>The [src.name] needs to be wrenched to the floor!</span>")
 				return
 			if(1)
-				if (WT.remove_fuel(0,user))
+				if(WT.remove_fuel(0,user))
 					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 					user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
 						"<span class='notice'>You start to weld \the [src] to the floor...</span>", \
 						"<span class='italics'>You hear welding.</span>")
-					if (do_after(user,20, target = src))
+					if(do_after(user,20, target = src))
 						if(!src || !WT.isOn()) return
 						state = 2
 						to_chat(user, "<span class='notice'>You weld the field generator to the floor.</span>")
 				else
 					return
 			if(2)
-				if (WT.remove_fuel(0,user))
+				if(WT.remove_fuel(0,user))
 					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 					user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
 						"<span class='notice'>You start to cut \the [src] free from the floor...</span>", \
 						"<span class='italics'>You hear welding.</span>")
-					if (do_after(user,20, target = src))
+					if(do_after(user,20, target = src))
 						if(!src || !WT.isOn()) return
 						state = 1
 						to_chat(user, "<span class='notice'>You cut \the [src] free from the floor.</span>")
@@ -179,7 +179,7 @@ field_generator power level display
 	active = 0
 	spawn(1)
 		src.cleanup()
-		while (warming_up>0 && !active)
+		while(warming_up>0 && !active)
 			sleep(50)
 			warming_up--
 			update_icon()
@@ -187,7 +187,7 @@ field_generator power level display
 /obj/machinery/field/generator/proc/turn_on()
 	active = 1
 	spawn(1)
-		while (warming_up<3 && active)
+		while(warming_up<3 && active)
 			sleep(50)
 			warming_up++
 			update_icon()
@@ -204,8 +204,8 @@ field_generator power level display
 		src.power = field_generator_max_power
 
 	var/power_draw = 2
-	for (var/obj/machinery/field/containment/F in fields)
-		if (isnull(F))
+	for(var/obj/machinery/field/containment/F in fields)
+		if(isnull(F))
 			continue
 		power_draw++
 	if(draw_power(round(power_draw/2,1)))
@@ -303,7 +303,7 @@ field_generator power level display
 				CF.Crossed(L)
 	var/listcheck = 0
 	for(var/obj/machinery/field/generator/FG in connected_gens)
-		if (isnull(FG))
+		if(isnull(FG))
 			continue
 		if(FG == G)
 			listcheck = 1
@@ -312,7 +312,7 @@ field_generator power level display
 		connected_gens.Add(G)
 	listcheck = 0
 	for(var/obj/machinery/field/generator/FG2 in G.connected_gens)
-		if (isnull(FG2))
+		if(isnull(FG2))
 			continue
 		if(FG2 == src)
 			listcheck = 1
@@ -323,13 +323,13 @@ field_generator power level display
 
 /obj/machinery/field/generator/proc/cleanup()
 	clean_up = 1
-	for (var/obj/machinery/field/containment/F in fields)
-		if (isnull(F))
+	for(var/obj/machinery/field/containment/F in fields)
+		if(isnull(F))
 			continue
 		qdel(F)
 	fields = list()
 	for(var/obj/machinery/field/generator/FG in connected_gens)
-		if (isnull(FG))
+		if(isnull(FG))
 			continue
 		FG.connected_gens.Remove(src)
 		if(!FG.clean_up)//Makes the other gens clean up as well
diff --git a/code/modules/power/singularity/investigate.dm b/code/modules/power/singularity/investigate.dm
index bd82ff47c5c..6e22b1ad118 100644
--- a/code/modules/power/singularity/investigate.dm
+++ b/code/modules/power/singularity/investigate.dm
@@ -1,4 +1,4 @@
 /area/engine/engineering/power_alert(var/alarming)
-	if (alarming)
+	if(alarming)
 		investigate_log("has a power alarm!","singulo")
 	..()
\ No newline at end of file
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 5f858d92448..2232e322dbd 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -35,7 +35,7 @@
 
 
 /obj/effect/accelerated_particle/Bump(atom/A)
-	if (A)
+	if(A)
 		if(ismob(A))
 			toxmob(A)
 		if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/singularity/)))
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index cff8c2ee9fa..051440525f3 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -95,7 +95,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	if (src.anchored)
+	if(src.anchored)
 		to_chat(usr, "It is fastened to the floor!")
 		return 0
 	src.dir = turn(src.dir, 270)
@@ -108,7 +108,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	if (src.anchored)
+	if(src.anchored)
 		to_chat(usr, "It is fastened to the floor!")
 		return 0
 	src.dir = turn(src.dir, 90)
@@ -149,11 +149,11 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				qdel(src)
 				return
 		else
@@ -288,7 +288,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	if (src.anchored)
+	if(src.anchored)
 		to_chat(usr, "It is fastened to the floor!")
 		return 0
 	src.dir = turn(src.dir, 270)
@@ -301,7 +301,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	if (src.anchored)
+	if(src.anchored)
 		to_chat(usr, "It is fastened to the floor!")
 		return 0
 	src.dir = turn(src.dir, 90)
@@ -323,11 +323,11 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(25))
+			if(prob(25))
 				qdel(src)
 				return
 		else
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 8101269762e..a06290e84c5 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -221,7 +221,7 @@
 /obj/machinery/particle_accelerator/control_box/proc/toggle_power()
 	src.active = !src.active
 	investigate_log("turned [active?"<font color='red'>ON</font>":"<font color='green'>OFF</font>"] by [usr ? usr.key : "outside forces"]","singulo")
-	if (active)
+	if(active)
 		msg_admin_attack("PA Control Computer turned ON by [key_name(usr, usr.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
 		log_game("PA Control Computer turned ON by [usr.ckey]([usr]) in ([x],[y],[z])")
 		use_log += text("\[[time_stamp()]\] <font color='red'>[usr.name] ([usr.ckey]) has turned on the PA Control Computer.</font>")
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 56da613f48b..ce0d22c4165 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -370,7 +370,7 @@
 	var/toxrange = 10
 	var/radiation = 15
 	var/radiationmin = 3
-	if (energy>200)
+	if(energy>200)
 		radiation += round((energy-150)/10,1)
 		radiationmin = round((radiation/5),1)
 	for(var/mob/living/M in view(toxrange, src.loc))
@@ -392,7 +392,7 @@
 			continue
 
 		if(M.stat == CONSCIOUS)
-			if (istype(M,/mob/living/carbon/human))
+			if(istype(M,/mob/living/carbon/human))
 				var/mob/living/carbon/human/H = M
 				if(istype(H.glasses, /obj/item/clothing/glasses/meson))
 					var/obj/item/clothing/glasses/meson/MS = H.glasses
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index d55394f83bd..66e2e5d68b4 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -105,7 +105,7 @@
 
 	if(inputting == 2)
 		overlays += image('icons/obj/power.dmi', "smes-oc2")
-	else if (inputting == 1)
+	else if(inputting == 1)
 		overlays += image('icons/obj/power.dmi', "smes-oc1")
 	else
 		if(input_attempt)
@@ -158,7 +158,7 @@
 			return
 
 		var/turf/T = get_turf(user)
-		if (T.intact) //is the floor plating removed ?
+		if(T.intact) //is the floor plating removed ?
 			to_chat(user, "<span class='alert'>You must first remove the floor plating!</span>")
 			return
 
@@ -175,7 +175,7 @@
 	//disassembling the terminal
 	if(istype(I, /obj/item/weapon/wirecutters) && terminal && panel_open)
 		var/turf/T = get_turf(terminal)
-		if (T.intact) //is the floor plating removed ?
+		if(T.intact) //is the floor plating removed ?
 			to_chat(user, "<span class='alert'>You must first expose the power terminal!</span>")
 			return
 
@@ -183,7 +183,7 @@
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 
 		if(do_after(user, 50, target = src))
-			if (prob(50) && electrocute_mob(usr, terminal.powernet, terminal)) //animate the electrocution if uncautious and unlucky
+			if(prob(50) && electrocute_mob(usr, terminal.powernet, terminal)) //animate the electrocution if uncautious and unlucky
 				var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 				s.set_up(5, 1, src)
 				s.start()
@@ -241,9 +241,9 @@
 		var/actual_load = draw_power(target_load)						// add the load to the terminal side network
 		charge += actual_load * SMESRATE								// increase the charge
 
-		if (actual_load >= target_load) // Did we charge at full rate?
+		if(actual_load >= target_load) // Did we charge at full rate?
 			inputting = 2
-		else if (actual_load) // If not, did we charge at least partially?
+		else if(actual_load) // If not, did we charge at least partially?
 			inputting = 1
 		else // Or not at all?
 			inputting = 0
@@ -301,22 +301,22 @@
 
 //Will return 1 on failure
 /obj/machinery/power/smes/proc/make_terminal(const/mob/user)
-	if (user.loc == loc)
+	if(user.loc == loc)
 		to_chat(user, "<span class='warning'>You must not be on the same tile as the [src].</span>")
 		return 1
 
 	//Direction the terminal will face to
 	var/tempDir = get_dir(user, src)
 	switch(tempDir)
-		if (NORTHEAST, SOUTHEAST)
+		if(NORTHEAST, SOUTHEAST)
 			tempDir = EAST
-		if (NORTHWEST, SOUTHWEST)
+		if(NORTHWEST, SOUTHWEST)
 			tempDir = WEST
 	var/turf/tempLoc = get_step(src, reverse_direction(tempDir))
-	if (istype(tempLoc, /turf/space))
+	if(istype(tempLoc, /turf/space))
 		to_chat(user, "<span class='warning'>You can't build a terminal on space.</span>")
 		return 1
-	else if (istype(tempLoc))
+	else if(istype(tempLoc))
 		if(tempLoc.intact)
 			to_chat(user, "<span class='warning'>You must remove the floor plating first.</span>")
 			return 1
@@ -324,7 +324,7 @@
 	if(do_after(user, 50, target = src))
 		var/turf/T = get_turf(user)
 		var/obj/structure/cable/N = T.get_cable_node() //get the connecting node cable, if there's one
-		if (prob(50) && electrocute_mob(user, N, N)) //animate the electrocution if uncautious and unlucky
+		if(prob(50) && electrocute_mob(user, N, N)) //animate the electrocution if uncautious and unlucky
 			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 			s.set_up(5, 1, src)
 			s.start()
@@ -385,7 +385,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "smes.tmpl", "SMES Power Storage Unit", 540, 380)
@@ -475,7 +475,7 @@
 	output_level = rand(0, output_level_max)
 	input_level = rand(0, input_level_max)
 	charge -= 1e6/severity
-	if (charge < 0)
+	if(charge < 0)
 		charge = 0
 	update_icon()
 	..()
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index c8f5fc312e8..a6a54c75feb 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -69,7 +69,7 @@
 			user.visible_message("[user] takes the glass off the solar panel.", "<span class='notice'>You take the glass off the solar panel.</span>")
 			qdel(src)
 		return
-	else if (W)
+	else if(W)
 		src.add_fingerprint(user)
 		src.health -= W.force
 		src.healthcheck()
@@ -83,7 +83,7 @@
 
 
 /obj/machinery/power/solar/proc/healthcheck()
-	if (src.health <= 0)
+	if(src.health <= 0)
 		if(!(stat & BROKEN))
 			broken()
 		else
@@ -404,7 +404,7 @@
 	data["connected_tracker"] = (connected_tracker ? 1 : 0)
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "solar_control.tmpl", name, 490, 420)
 		ui.set_initial_data(data)
 		ui.open()
@@ -414,12 +414,12 @@
 	if(istype(I, /obj/item/weapon/screwdriver))
 		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20, target = src))
-			if (src.stat & BROKEN)
+			if(src.stat & BROKEN)
 				to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
 				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 				new /obj/item/weapon/shard( src.loc )
 				var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A )
-				for (var/obj/C in src)
+				for(var/obj/C in src)
 					C.loc = src.loc
 				A.circuit = M
 				A.state = 3
@@ -430,7 +430,7 @@
 				to_chat(user, "<span class='notice'>You disconnect the monitor.</span>")
 				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 				var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A )
-				for (var/obj/C in src)
+				for(var/obj/C in src)
 					C.loc = src.loc
 				A.circuit = M
 				A.state = 4
@@ -479,7 +479,7 @@
 			if(connected_tracker)
 				connected_tracker.set_angle(sun.angle)
 				set_panels(cdir)
-		else if (track == 1) //begin manual tracking
+		else if(track == 1) //begin manual tracking
 			src.targetdir = src.cdir
 			if(src.trackrate) nexttime = world.time + 36000/abs(trackrate)
 			set_panels(targetdir)
@@ -525,7 +525,7 @@
 					broken()
 
 /obj/machinery/power/solar_control/blob_act()
-	if (prob(75))
+	if(prob(75))
 		broken()
 		src.density = 0
 
diff --git a/code/modules/power/supermatter/sm_crystals.dm b/code/modules/power/supermatter/sm_crystals.dm
index 910f724d079..cb9448a2b2e 100644
--- a/code/modules/power/supermatter/sm_crystals.dm
+++ b/code/modules/power/supermatter/sm_crystals.dm
@@ -159,11 +159,11 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				qdel(src)
 				return
 		else
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 5bb36c06187..0f6d41fc145 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -278,7 +278,7 @@
 		data["detonating"] = 0
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "supermatter_crystal.tmpl", "Supermatter Crystal", 500, 300)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 6c4d1c3d6d0..af3d37e4481 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -62,7 +62,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
 
 		pixel_x = -32
 		pixel_y = -32
-		for (var/ball in orbiting_balls)
+		for(var/ball in orbiting_balls)
 			tesla_zap(ball, rand(1, Clamp(orbiting_balls.len, 3, 7)), TESLA_MINI_POWER)
 	else
 		energy = 0 // ensure we dont have miniballs of miniballs
@@ -94,7 +94,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
 
 		playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 30)
 		spawn(100)
-			if (!loc)
+			if(!loc)
 				return
 			var/obj/singularity/energy_ball/EB = new(loc)
 
@@ -123,14 +123,14 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
 	dust_mobs(A)
 
 /obj/singularity/energy_ball/orbit(obj/singularity/energy_ball/target)
-	if (istype(target))
+	if(istype(target))
 		target.orbiting_balls += src
 
 	. = ..()
 
-	if (istype(target))
+	if(istype(target))
 		target.orbiting_balls -= src
-	if (!loc)
+	if(!loc)
 		qdel(src)
 
 /obj/singularity/energy_ball/proc/dust_mobs(atom/A)
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 190c971f7cf..63653eab9d1 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -81,4 +81,4 @@
 	name = "tracker electronics"
 	icon = 'icons/obj/doors/door_assembly.dmi'
 	icon_state = "door_electronics"
-	w_class = 2.0
+	w_class = 2
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 7df58795f43..8f1685803f1 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -293,7 +293,7 @@
 
 /obj/machinery/power/turbine/interact(mob/user)
 
-	if ( !Adjacent(user)  || (stat & (NOPOWER|BROKEN)) && (!istype(user, /mob/living/silicon)) )
+	if( !Adjacent(user)  || (stat & (NOPOWER|BROKEN)) && (!istype(user, /mob/living/silicon)) )
 		user.unset_machine(src)
 		user << browse(null, "window=turbine")
 		return
diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
index 78286e416f4..a392105513a 100644
--- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
+++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
@@ -35,7 +35,7 @@
 
 /datum/mapGeneratorModule/border/proc/is_border(var/turf/T)
 	for(var/direction in list(SOUTH,EAST,WEST,NORTH))
-		if (get_step(T,direction) in mother.map)
+		if(get_step(T,direction) in mother.map)
 			continue
 		return 1
 	return 0
\ No newline at end of file
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 26dce25ead2..b5a990dec69 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -32,7 +32,7 @@
 	desc = "[initial(desc)][BB ? "" : " This one is spent"]"
 
 /obj/item/ammo_casing/proc/newshot(params) //For energy weapons, shotgun shells and wands (!).
-	if (!BB)
+	if(!BB)
 		BB = new projectile_type(src, params)
 	return
 
@@ -42,14 +42,14 @@
 		if(isturf(loc))
 			var/boolets = 0
 			for(var/obj/item/ammo_casing/bullet in loc)
-				if (box.stored_ammo.len >= box.max_ammo)
+				if(box.stored_ammo.len >= box.max_ammo)
 					break
-				if (bullet.BB)
-					if (box.give_round(bullet, 0))
+				if(bullet.BB)
+					if(box.give_round(bullet, 0))
 						boolets++
 				else
 					continue
-			if (boolets > 0)
+			if(boolets > 0)
 				box.update_icon()
 				to_chat(user, "<span class='notice'>You collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s.</span>")
 			else
@@ -109,12 +109,12 @@
 	return ..()
 
 /obj/item/ammo_box/proc/get_round(keep = 0)
-	if (!stored_ammo.len)
+	if(!stored_ammo.len)
 		return null
 	else
 		var/b = stored_ammo[stored_ammo.len]
 		stored_ammo -= b
-		if (keep)
+		if(keep)
 			stored_ammo.Insert(1,b)
 		return b
 
@@ -123,7 +123,7 @@
 	if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type))
 		return 0
 
-	if (stored_ammo.len < max_ammo)
+	if(stored_ammo.len < max_ammo)
 		stored_ammo += R
 		R.loc = src
 		return 1
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index a5af74e4d6c..4107de926bc 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -269,7 +269,7 @@
 	desc = "A caseless bullet casing."
 
 /obj/item/ammo_casing/caseless/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, distro, quiet)
-	if (..())
+	if(..())
 		loc = null
 		return 1
 	else
@@ -298,7 +298,7 @@
 
 /obj/item/ammo_casing/caseless/foam_dart/update_icon()
 	..()
-	if (modified)
+	if(modified)
 		icon_state = "foamdart_empty"
 		desc = "Its nerf or nothing! ... Although, this one doesn't look too safe."
 		if(BB)
@@ -312,11 +312,11 @@
 /obj/item/ammo_casing/caseless/foam_dart/attackby(obj/item/A, mob/user, params)
 	..()
 	var/obj/item/projectile/bullet/reusable/foam_dart/FD = BB
-	if (istype(A, /obj/item/weapon/screwdriver) && !modified)
+	if(istype(A, /obj/item/weapon/screwdriver) && !modified)
 		modified = 1
 		FD.damage_type = BRUTE
 		update_icon()
-	else if ((istype(A, /obj/item/weapon/pen)) && modified && !FD.pen)
+	else if((istype(A, /obj/item/weapon/pen)) && modified && !FD.pen)
 		if(!user.unEquip(A))
 			return
 		A.loc = FD
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index c77dcc07595..526876ca519 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -83,7 +83,7 @@
 	multiload = 0
 
 /obj/item/ammo_box/magazine/internal/shot/ammo_count(countempties = 1)
-	if (!countempties)
+	if(!countempties)
 		var/boolets = 0
 		for(var/obj/item/ammo_casing/bullet in stored_ammo)
 			if(bullet.BB)
@@ -180,6 +180,10 @@
 	max_ammo = 8
 	multiple_sprites = 2
 
+/obj/item/ammo_box/magazine/m10mm/empty		//for maint drops
+	desc = "A gun magazine. Seems to be broken and can only hold one bullet. Pretty useless."
+	max_ammo = 1
+
 /obj/item/ammo_box/magazine/m45
 	name = "handgun magazine (.45)"
 	icon_state = "45-8"
diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
index 2a75004f223..773ed4cff72 100644
--- a/code/modules/projectiles/firing.dm
+++ b/code/modules/projectiles/firing.dm
@@ -1,6 +1,6 @@
 /obj/item/ammo_casing/proc/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, distro, quiet, zone_override = "", spread)
 	distro += variance
-	for (var/i = max(1, pellets), i > 0, i--)
+	for(var/i = max(1, pellets), i > 0, i--)
 		var/targloc = get_turf(target)
 		ready_proj(target, user, quiet, zone_override)
 		if(distro) //We have to spread a pixel-precision bullet. throw_proj was called before so angles should exist by now...
@@ -21,11 +21,11 @@
 	return 1
 
 /obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
-	if (!BB)
+	if(!BB)
 		return
 	BB.original = target
 	BB.firer = user
-	if (zone_override)
+	if(zone_override)
 		BB.def_zone = zone_override
 	else
 		BB.def_zone = user.zone_sel.selecting
@@ -37,7 +37,7 @@
 
 /obj/item/ammo_casing/proc/throw_proj(atom/target, turf/targloc, mob/living/user, params, spread)
 	var/turf/curloc = get_turf(user)
-	if (!istype(targloc) || !istype(curloc) || !BB)
+	if(!istype(targloc) || !istype(curloc) || !BB)
 		return 0
 	BB.ammo_casing = src
 	if(targloc == curloc)
diff --git a/code/modules/projectiles/guns/dartgun.dm b/code/modules/projectiles/guns/dartgun.dm
index 2e55b19b4a9..ba01fde783c 100644
--- a/code/modules/projectiles/guns/dartgun.dm
+++ b/code/modules/projectiles/guns/dartgun.dm
@@ -121,7 +121,7 @@
 		src.update_icon()
 
 /obj/item/weapon/gun/dartgun/proc/get_mixed_syringe()
-	if (!cartridge)
+	if(!cartridge)
 		return 0
 	if(!cartridge.darts)
 		return 0
@@ -136,7 +136,7 @@
 	return dart
 
 /obj/item/weapon/gun/dartgun/proc/fire_dart(atom/target, mob/user)
-	if (locate (/obj/structure/table, src.loc))
+	if(locate (/obj/structure/table, src.loc))
 		return
 	else
 		var/turf/trg = get_turf(target)
@@ -172,7 +172,7 @@
 						for(var/datum/reagent/A in D.reagents.reagent_list)
 							R += A.id + " ("
 							R += num2text(A.volume) + "),"
-					if (istype(M, /mob))
+					if(istype(M, /mob))
 						M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])"
 						user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])"
 						if(M.ckey)
@@ -199,7 +199,7 @@
 
 			sleep(1)
 
-		if (D) spawn(10) qdel(D)
+		if(D) spawn(10) qdel(D)
 
 		return
 
@@ -212,14 +212,14 @@
 	user.set_machine(src)
 	var/dat = "<b>[src] mixing control:</b><br><br>"
 
-	if (beakers.len)
+	if(beakers.len)
 		var/i = 1
 		for(var/obj/item/weapon/reagent_containers/glass/beaker/B in beakers)
 			dat += "Beaker [i] contains: "
 			if(B.reagents && B.reagents.reagent_list.len)
 				for(var/datum/reagent/R in B.reagents.reagent_list)
 					dat += "<br>    [R.volume] units of [R.name], "
-				if (check_beaker_mixing(B))
+				if(check_beaker_mixing(B))
 					dat += text("<A href='?src=\ref[src];stop_mix=[i]'><font color='green'>Mixing</font></A> ")
 				else
 					dat += text("<A href='?src=\ref[src];mix=[i]'><font color='red'>Not mixing</font></A> ")
@@ -257,11 +257,11 @@
 				if(M == beakers[index])
 					mixing -= M
 					break
-	else if (href_list["mix"])
+	else if(href_list["mix"])
 		var/index = text2num(href_list["mix"])
 		if(index <= beakers.len)
 			mixing += beakers[index]
-	else if (href_list["eject"])
+	else if(href_list["eject"])
 		var/index = text2num(href_list["eject"])
 		if(index <= beakers.len)
 			if(beakers[index])
@@ -270,7 +270,7 @@
 				mixing -= B
 				beakers -= B
 				B.forceMove(get_turf(src))
-	else if (href_list["eject_cart"])
+	else if(href_list["eject_cart"])
 		remove_cartridge()
 	src.updateUsrDialog()
 	return
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 76e86d74699..ca6bfd495a6 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -31,7 +31,7 @@
 		power_supply = new(src)
 	power_supply.give(power_supply.maxcharge)
 	var/obj/item/ammo_casing/energy/shot
-	for (var/i = 1, i <= ammo_type.len, i++)
+	for(var/i = 1, i <= ammo_type.len, i++)
 		var/shottype = ammo_type[i]
 		shot = new shottype(src)
 		ammo_type[i] = shot
@@ -81,7 +81,7 @@
 	return power_supply.charge >= shot.e_cost
 
 /obj/item/weapon/gun/energy/newshot(params)
-	if (!ammo_type || !power_supply)
+	if(!ammo_type || !power_supply)
 		return
 	var/obj/item/ammo_casing/energy/shot = ammo_type[select]
 	if(power_supply.charge >= shot.e_cost) //if there's enough power in the power_supply cell...
@@ -98,12 +98,12 @@
 
 /obj/item/weapon/gun/energy/proc/select_fire(mob/living/user)
 	select++
-	if (select > ammo_type.len)
+	if(select > ammo_type.len)
 		select = 1
 	var/obj/item/ammo_casing/energy/shot = ammo_type[select]
 	fire_sound = shot.fire_sound
 	fire_delay = shot.delay
-	if (shot.select_name)
+	if(shot.select_name)
 		to_chat(user, "<span class='notice'>[src] is now set to [shot.select_name].</span>")
 	update_icon()
 	return
@@ -116,7 +116,7 @@
 	var/itemState = null
 	if(!initial(item_state))
 		itemState = icon_state
-	if (modifystate)
+	if(modifystate)
 		overlays += "[icon_state]_[shot.select_name]"
 		iconState += "_[shot.select_name]"
 		if(itemState)
@@ -142,7 +142,7 @@
 	toggle_gunlight()
 
 /obj/item/weapon/gun/energy/suicide_act(mob/user)
-	if (can_shoot())
+	if(can_shoot())
 		user.visible_message("<span class='suicide'>[user] is putting the barrel of the [name] in \his mouth.  It looks like \he's trying to commit suicide.</span>")
 		sleep(25)
 		if(user.l_hand == src || user.r_hand == src)
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 74e0b3af14e..33b0d83eee1 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -5,7 +5,7 @@
 	item_state = null	//so the human update icon uses the icon_state instead.
 	fire_sound = 'sound/weapons/IonRifle.ogg'
 	origin_tech = "combat=2;magnets=4"
-	w_class = 5.0
+	w_class = 5
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
 	ammo_type = list(/obj/item/ammo_casing/energy/ion)
@@ -443,7 +443,7 @@
 		desc = "A gun that changes the body temperature of its targets. Its temperature cap has been hacked."
 
 /obj/item/weapon/gun/energy/temperature/Topic(href, href_list)
-	if (..())
+	if(..())
 		return
 	usr.set_machine(src)
 	add_fingerprint(usr)
@@ -454,7 +454,7 @@
 			target_temperature = min((500 + 500*emagged), target_temperature+amount)
 		else
 			target_temperature = max(0, target_temperature+amount)
-	if (istype(loc, /mob))
+	if(istype(loc, /mob))
 		attack_self(loc)
 	add_fingerprint(usr)
 	return
@@ -491,9 +491,9 @@
 			temperature = target_temperature
 		update_icon()
 
-		if (istype(loc, /mob/living/carbon))
+		if(istype(loc, /mob/living/carbon))
 			var /mob/living/carbon/M = loc
-			if (src == M.machine)
+			if(src == M.machine)
 				update_dat()
 				M << browse("<TITLE>Temperature Gun Configuration</TITLE><HR>[dat]", "window=tempgun;size=510x102")
 	return
@@ -552,7 +552,7 @@
 	update_charge()
 
 /obj/item/weapon/gun/energy/temperature/proc/update_user()
-	if (istype(loc,/mob/living/carbon))
+	if(istype(loc,/mob/living/carbon))
 		var/mob/living/carbon/M = loc
 		M.update_inv_back()
 		M.update_inv_l_hand()
diff --git a/code/modules/projectiles/guns/energy/telegun.dm b/code/modules/projectiles/guns/energy/telegun.dm
index e8a882d7c80..a52a40c7ef2 100644
--- a/code/modules/projectiles/guns/energy/telegun.dm
+++ b/code/modules/projectiles/guns/energy/telegun.dm
@@ -21,7 +21,7 @@
 
 	for(var/obj/item/device/radio/beacon/R in beacons)
 		var/turf/T = get_turf(R)
-		if (!T)
+		if(!T)
 			continue
 		if((T.z in config.admin_levels) || T.z > 7)
 			continue
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 0c7f54bb21a..860d52d2550 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -37,7 +37,7 @@
 	return charges
 
 /obj/item/weapon/gun/magic/newshot(params)
-	if (charges && chambered)
+	if(charges && chambered)
 		chambered.newshot(params)
 	return
 
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 03519770eee..961a7b91e05 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -136,7 +136,7 @@
 	return boolets
 
 /obj/item/weapon/gun/projectile/suicide_act(mob/user)
-	if (chambered && chambered.BB && !chambered.BB.nodamage)
+	if(chambered && chambered.BB && !chambered.BB.nodamage)
 		user.visible_message("<span class='suicide'>[user] is putting the barrel of the [name] in \his mouth.  It looks like \he's trying to commit suicide.</span>")
 		sleep(25)
 		if(user.l_hand == src || user.r_hand == src)
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 7544ecc7b50..757315019ab 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -1,5 +1,5 @@
 /obj/item/weapon/gun/projectile/automatic
-	w_class = 3.0
+	w_class = 3
 	var/alarmed = 0
 	var/select = 1
 	can_suppress = 1
@@ -44,7 +44,7 @@
 /obj/item/weapon/gun/projectile/automatic/ui_action_click()
 	burst_select()
 
-/obj/item/weapon/gun/projectile/automatic/verb/burst_select()
+/obj/item/weapon/gun/projectile/automatic/proc/burst_select()
 	var/mob/living/carbon/human/user = usr
 	select = !select
 	if(!select)
@@ -220,7 +220,7 @@
 	desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
 	icon_state = "bulldog"
 	item_state = "bulldog"
-	w_class = 3.0
+	w_class = 3
 	origin_tech = "combat=5;materials=4;syndicate=6"
 	mag_type = /obj/item/ammo_box/magazine/m12g
 	fire_sound = 'sound/weapons/Gunshot4.ogg'
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 635ab22cc8c..61032f819fd 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -6,7 +6,7 @@
 	name = "grenade launcher"
 	icon_state = "dshotgun-sawn"
 	item_state = "gun"
-	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher
+	mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
 	fire_sound = 'sound/weapons/grenadelaunch.ogg'
 	w_class = 3
 
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index b2c0aa823be..661a14a44b4 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -26,6 +26,12 @@
 	mag_type = /obj/item/ammo_box/magazine/m45
 	can_suppress = 0
 
+/obj/item/weapon/gun/projectile/automatic/pistol/empty	//empty stetchshit for maint spawns
+
+/obj/item/weapon/gun/projectile/automatic/pistol/empty/New()
+	magazine = new /obj/item/ammo_box/magazine/m10mm/empty(src)
+	..()
+
 /obj/item/weapon/gun/projectile/automatic/pistol/deagle
 	name = "desert eagle"
 	desc = "A robust .50 AE handgun."
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index e6868110d0f..45849f584ef 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -41,7 +41,7 @@
 /obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user)
 	var/num_unloaded = 0
 	chambered = null
-	while (get_ammo() > 0)
+	while(get_ammo() > 0)
 		var/obj/item/ammo_casing/CB
 		CB = magazine.get_round(0)
 		if(CB)
@@ -49,7 +49,7 @@
 			CB.SpinAnimation(10, 1)
 			CB.update_icon()
 			num_unloaded++
-	if (num_unloaded)
+	if(num_unloaded)
 		to_chat(user, "<span class='notice'>You unload [num_unloaded] shell\s from [src].</span>")
 	else
 		to_chat(user, "<span class='warning'>[src] is empty!</span>")
@@ -68,6 +68,7 @@
 		var/obj/item/ammo_box/magazine/internal/cylinder/C = magazine
 		C.spin()
 		chamber_round(0)
+		playsound(loc, 'sound/weapons/revolver_spin.ogg', 50, 1)
 		usr.visible_message("[usr] spins [src]'s chamber.", "<span class='notice'>You spin [src]'s chamber.</span>")
 	else
 		verbs -= /obj/item/weapon/gun/projectile/revolver/verb/spin
@@ -77,9 +78,9 @@
 
 /obj/item/weapon/gun/projectile/revolver/get_ammo(countchambered = 0, countempties = 1)
 	var/boolets = 0 //mature var names for mature people
-	if (chambered && countchambered)
+	if(chambered && countchambered)
 		boolets++
-	if (magazine)
+	if(magazine)
 		boolets += magazine.ammo_count(countempties)
 	return boolets
 
@@ -207,14 +208,14 @@
 		Spin()
 	else
 		var/num_unloaded = 0
-		while (get_ammo() > 0)
+		while(get_ammo() > 0)
 			var/obj/item/ammo_casing/CB
 			CB = magazine.get_round()
 			chambered = null
 			CB.loc = get_turf(loc)
 			CB.update_icon()
 			num_unloaded++
-		if (num_unloaded)
+		if(num_unloaded)
 			to_chat(user, "<span class='notice'>You unload [num_unloaded] shell\s from [src].</span>")
 		else
 			to_chat(user, "<span class='notice'>[src] is empty.</span>")
@@ -306,14 +307,14 @@
 
 /obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user)
 	var/num_unloaded = 0
-	while (get_ammo() > 0)
+	while(get_ammo() > 0)
 		var/obj/item/ammo_casing/CB
 		CB = magazine.get_round(0)
 		chambered = null
 		CB.loc = get_turf(loc)
 		CB.update_icon()
 		num_unloaded++
-	if (num_unloaded)
+	if(num_unloaded)
 		to_chat(user, "<span class = 'notice'>You break open \the [src] and unload [num_unloaded] shell\s.</span>")
 	else
 		to_chat(user, "<span class='notice'>[src] is empty.</span>")
@@ -354,7 +355,7 @@
 
 /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/update_icon()
 	..()
-	if (slung && (slot_flags & SLOT_BELT) )
+	if(slung && (slot_flags & SLOT_BELT) )
 		slung = 0
 		icon_state = "ishotgun-sawn"
 
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index ddec7543009..35cde243c20 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -3,7 +3,7 @@
 	desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath."
 	icon_state = "shotgun"
 	item_state = "shotgun"
-	w_class = 4.0
+	w_class = 4
 	force = 10
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
@@ -64,7 +64,7 @@
 
 /obj/item/weapon/gun/projectile/shotgun/examine(mob/user)
 	..()
-	if (chambered)
+	if(chambered)
 		to_chat(user, "A [chambered.BB ? "live" : "spent"] one is in the chamber.")
 
 /obj/item/weapon/gun/projectile/shotgun/isHandgun() //You cannot, in fact, holster a shotgun.
@@ -189,7 +189,7 @@
 
 /obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/New()
 	..()
-	if (!alternate_magazine)
+	if(!alternate_magazine)
 		alternate_magazine = new mag_type(src)
 
 /obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/attack_self(mob/living/user)
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 59bd7fb649b..1d9949173ad 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -1,4 +1,4 @@
-/obj/item/weapon/gun/projectile/sniper_rifle
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle
 	name = "sniper rifle"
 	desc = "the kind of gun that will leave you crying for mummy before you even realise your leg's missing"
 	icon_state = "sniper"
@@ -7,6 +7,7 @@
 	weapon_weight = WEAPON_MEDIUM
 	mag_type = /obj/item/ammo_box/magazine/sniper_rounds
 	fire_delay = 40
+	burst_size = 1
 	origin_tech = "combat=8"
 	can_unsuppress = 1
 	can_suppress = 1
@@ -14,14 +15,15 @@
 	zoomable = TRUE
 	zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
 	slot_flags = SLOT_BACK
+	action_button_name = null
 
-/obj/item/weapon/gun/projectile/sniper_rifle/update_icon()
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle/update_icon()
 	if(magazine)
 		icon_state = "sniper-mag"
 	else
 		icon_state = "sniper"
 
-/obj/item/weapon/gun/projectile/sniper_rifle/syndicate
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle/syndicate
 	name = "syndicate sniper rifle"
 	desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face"
 	origin_tech = "combat=8;syndicate=4"
diff --git a/code/modules/projectiles/guns/rocket.dm b/code/modules/projectiles/guns/rocket.dm
index 72ab89bf40e..345d183318f 100644
--- a/code/modules/projectiles/guns/rocket.dm
+++ b/code/modules/projectiles/guns/rocket.dm
@@ -4,7 +4,7 @@
 	desc = "Say hello to my little friend"
 	icon_state = "rocket"
 	item_state = "rocket"
-	w_class = 4.0
+	w_class = 4
 	throw_speed = 2
 	throw_range = 10
 	force = 5.0
diff --git a/code/modules/projectiles/guns/throw/crossbow.dm b/code/modules/projectiles/guns/throw/crossbow.dm
index 55e76bec6b7..11d39bf2a38 100644
--- a/code/modules/projectiles/guns/throw/crossbow.dm
+++ b/code/modules/projectiles/guns/throw/crossbow.dm
@@ -153,7 +153,7 @@
 	icon_state = "bolt"
 	item_state = "bolt"
 	throwforce = 20
-	w_class = 3.0
+	w_class = 3
 	sharp = 1
 	edge = 0
 
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index d91fd3898f7..838f1acd90c 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -94,7 +94,7 @@
 	var/atom/T = target.loc
 	if(isturf(target) && target.density)
 		CreateDoor(target)
-	else if (isturf(T) && T.density)
+	else if(isturf(T) && T.density)
 		CreateDoor(T)
 	else if(istype(target, /obj/machinery/door))
 		OpenDoor(target)
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 53527ef326e..6fc934cd87e 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -140,7 +140,7 @@
 			if(prob(15))
 				M.apply_effect((rand(30,80)),IRRADIATE)
 				M.Weaken(5)
-				for (var/mob/V in viewers(src))
+				for(var/mob/V in viewers(src))
 					V.show_message("<span class='warning'>[M] writhes in pain as \his vacuoles boil.</span>", 3, "<span class='warning'>You hear the crunching of leaves.</span>", 2)
 			if(prob(35))
 				if(prob(80))
@@ -172,7 +172,7 @@
 		var/mob/living/carbon/human/H = M
 		if((H.species.flags & IS_PLANT) && (M.nutrition < 500))
 			M.nutrition += 30
-	else if (istype(target, /mob/living/carbon/))
+	else if(istype(target, /mob/living/carbon/))
 		M.show_message("<span class='notice'>The radiation beam dissipates harmlessly through your body.</span>")
 	else
 		return 1
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 2db8c339935..88a7e1518a2 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -92,17 +92,17 @@ var/const/INGEST = 2
 	return the_id
 
 /datum/reagents/proc/trans_to(var/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred.
-	if (!target)
+	if(!target)
 		return
 	if(src.total_volume <= 0)
 		return
 	var/datum/reagents/R
 	if(istype(target, /obj))
 		var/obj/O = target
-		if (!O.reagents )
+		if(!O.reagents )
 			return
 		R = O.reagents
-	else if (istype(target, /mob/living))
+	else if(istype(target, /mob/living))
 		var/mob/living/M = target
 		if(!M.reagents)
 			return
@@ -115,10 +115,10 @@ var/const/INGEST = 2
 	amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
 	var/part = amount / src.total_volume
 	var/trans_data = null
-	for (var/datum/reagent/current_reagent in src.reagent_list)
-		if (!current_reagent)
+	for(var/datum/reagent/current_reagent in src.reagent_list)
+		if(!current_reagent)
 			continue
-		if (current_reagent.id == "blood" && ishuman(target))
+		if(current_reagent.id == "blood" && ishuman(target))
 			var/mob/living/carbon/human/H = target
 			H.inject_blood(my_atom, amount)
 			continue
@@ -144,7 +144,7 @@ var/const/INGEST = 2
 	amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
 	var/part = amount / src.total_volume
 	var/trans_data = null
-	for (var/datum/reagent/current_reagent in src.reagent_list)
+	for(var/datum/reagent/current_reagent in src.reagent_list)
 		var/current_reagent_transfer = current_reagent.volume * part
 		if(preserve_data)
 			trans_data = copy_data(current_reagent)
@@ -157,9 +157,9 @@ var/const/INGEST = 2
 	return amount
 
 /datum/reagents/proc/trans_id_to(var/obj/target, var/reagent, var/amount=1, var/preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N
-	if (!target)
+	if(!target)
 		return
-	if (!target.reagents || src.total_volume<=0 || !src.get_reagent_amount(reagent))
+	if(!target.reagents || src.total_volume<=0 || !src.get_reagent_amount(reagent))
 		return
 
 	var/datum/reagents/R = target.reagents
@@ -167,7 +167,7 @@ var/const/INGEST = 2
 		amount = src.get_reagent_amount(reagent)
 	amount = min(amount, R.maximum_volume-R.total_volume)
 	var/trans_data = null
-	for (var/datum/reagent/current_reagent in src.reagent_list)
+	for(var/datum/reagent/current_reagent in src.reagent_list)
 		if(current_reagent.id == reagent)
 			if(preserve_data)
 				trans_data = copy_data(current_reagent)
@@ -182,7 +182,7 @@ var/const/INGEST = 2
 	return amount
 
 /*
-	if (!target) return
+	if(!target) return
 	var/total_transfered = 0
 	var/current_list_element = 1
 	var/datum/reagents/R = target.reagents
@@ -326,14 +326,14 @@ var/const/INGEST = 2
 /datum/reagents/proc/isolate_reagent(var/reagent)
 	for(var/A in reagent_list)
 		var/datum/reagent/R = A
-		if (R.id != reagent)
+		if(R.id != reagent)
 			del_reagent(R.id)
 			update_total()
 
 /datum/reagents/proc/del_reagent(var/reagent)
 	for(var/A in reagent_list)
 		var/datum/reagent/R = A
-		if (R.id == reagent)
+		if(R.id == reagent)
 			if(istype(my_atom, /mob/living))
 				var/mob/living/M = my_atom
 				R.reagent_deleted(M)
@@ -446,7 +446,7 @@ var/const/INGEST = 2
 	for(var/A in reagent_list)
 
 		var/datum/reagent/R = A
-		if (R.id == reagent)
+		if(R.id == reagent)
 			R.volume += amount
 			update_total()
 			my_atom.on_reagent_change()
@@ -482,7 +482,7 @@ var/const/INGEST = 2
 
 	for(var/A in reagent_list)
 		var/datum/reagent/R = A
-		if (R.id == reagent)
+		if(R.id == reagent)
 			R.volume -= amount
 			update_total()
 			if(!safety)//So it does not handle reactions when it need not to
@@ -496,7 +496,7 @@ var/const/INGEST = 2
 
 	for(var/A in reagent_list)
 		var/datum/reagent/R = A
-		if (R.id == reagent)
+		if(R.id == reagent)
 			if(!amount) return R
 			else
 				if(R.volume >= amount) return R
@@ -507,7 +507,7 @@ var/const/INGEST = 2
 /datum/reagents/proc/get_reagent_amount(var/reagent)
 	for(var/A in reagent_list)
 		var/datum/reagent/R = A
-		if (R.id == reagent)
+		if(R.id == reagent)
 			return R.volume
 
 	return 0
@@ -515,7 +515,7 @@ var/const/INGEST = 2
 /datum/reagents/proc/get_reagents()
 	var/res = ""
 	for(var/datum/reagent/A in reagent_list)
-		if (res != "") res += ","
+		if(res != "") res += ","
 		res += A.name
 
 	return res
@@ -565,8 +565,8 @@ var/const/INGEST = 2
 			D.data = new_data
 
 /datum/reagents/proc/copy_data(var/datum/reagent/current_reagent)
-	if (!current_reagent || !current_reagent.data) return null
-	if (!istype(current_reagent.data, /list)) return current_reagent.data
+	if(!current_reagent || !current_reagent.data) return null
+	if(!istype(current_reagent.data, /list)) return current_reagent.data
 
 	var/list/trans_data = current_reagent.data.Copy()
 
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 68bcd9306d3..39734fb20c6 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -89,12 +89,12 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 
 /obj/machinery/chem_dispenser/blob_act()
-	if (prob(50))
+	if(prob(50))
 		qdel(src)
 
  /**
@@ -129,7 +129,7 @@
 			beakerCurrentVolume += R.volume
 	data["beakerContents"] = beakerContents
 
-	if (beaker)
+	if(beaker)
 		data["beakerCurrentVolume"] = beakerCurrentVolume
 		data["beakerMaxVolume"] = beaker.volume
 	else
@@ -137,7 +137,7 @@
 		data["beakerMaxVolume"] = null
 
 	var chemicals[0]
-	for (var/re in dispensable_reagents)
+	for(var/re in dispensable_reagents)
 		var/datum/reagent/temp = chemical_reagents_list[re]
 		if(temp)
 			chemicals.Add(list(list("title" = temp.name, "id" = temp.id, "commands" = list("dispense" = temp.id)))) // list in a list because Byond merges the first list...
@@ -145,7 +145,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "chem_dispenser.tmpl", ui_title, 390, 655)
@@ -160,13 +160,13 @@
 
 	if(href_list["amount"])
 		amount = round(text2num(href_list["amount"]), 5) // round to nearest 5
-		if (amount < 0) // Since the user can actually type the commands himself, some sanity checking
+		if(amount < 0) // Since the user can actually type the commands himself, some sanity checking
 			amount = 0
-		if (amount > 100)
+		if(amount > 100)
 			amount = 100
 
 	if(href_list["dispense"])
-		if (dispensable_reagents.Find(href_list["dispense"]) && beaker != null)
+		if(dispensable_reagents.Find(href_list["dispense"]) && beaker != null)
 			var/obj/item/weapon/reagent_containers/glass/B = src.beaker
 			var/datum/reagents/R = B.reagents
 			var/space = R.maximum_volume - R.total_volume
@@ -411,12 +411,12 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 				return
 
 /obj/machinery/chem_master/blob_act()
-	if (prob(50))
+	if(prob(50))
 		qdel(src)
 
 /obj/machinery/chem_master/power_change()
@@ -465,7 +465,7 @@
 	usr.set_machine(src)
 
 
-	if (href_list["ejectp"])
+	if(href_list["ejectp"])
 		if(loaded_pill_bottle)
 			loaded_pill_bottle.forceMove(src.loc)
 			loaded_pill_bottle = null
@@ -475,8 +475,8 @@
 		usr.unset_machine()
 		return
 
-	if (href_list["print_p"])
-		if (!(src.printing))
+	if(href_list["print_p"])
+		if(!(src.printing))
 			src.printing = 1
 			for(var/mob/O in viewers(usr))
 				O.show_message("\blue \the [src] rattles and prints out a sheet of paper.", 1)
@@ -503,7 +503,7 @@
 
 	if(beaker)
 		var/datum/reagents/R = beaker.reagents
-		if (href_list["analyze"])
+		if(href_list["analyze"])
 			var/dat = ""
 			if(!condi)
 				if(href_list["name"] == "Blood")
@@ -525,21 +525,21 @@
 			usr << browse(dat, "window=chem_master;size=575x400")
 			return
 
-		else if (href_list["add"])
+		else if(href_list["add"])
 
 			if(href_list["amount"])
 				var/id = href_list["add"]
 				var/amount = text2num(href_list["amount"])
 				R.trans_id_to(src, id, amount)
 
-		else if (href_list["addcustom"])
+		else if(href_list["addcustom"])
 
 			var/id = href_list["addcustom"]
 			useramount = input("Select the amount to transfer.", 30, useramount) as num
 			useramount = isgoodnumber(useramount)
 			src.Topic(null, list("amount" = "[useramount]", "add" = "[id]"))
 
-		else if (href_list["remove"])
+		else if(href_list["remove"])
 
 			if(href_list["amount"])
 				var/id = href_list["remove"]
@@ -550,42 +550,42 @@
 					reagents.remove_reagent(id, amount)
 
 
-		else if (href_list["removecustom"])
+		else if(href_list["removecustom"])
 
 			var/id = href_list["removecustom"]
 			useramount = input("Select the amount to transfer.", 30, useramount) as num
 			useramount = isgoodnumber(useramount)
 			src.Topic(null, list("amount" = "[useramount]", "remove" = "[id]"))
 
-		else if (href_list["toggle"])
+		else if(href_list["toggle"])
 			mode = !mode
 
-		else if (href_list["main"])
+		else if(href_list["main"])
 			attack_hand(usr)
 			return
-		else if (href_list["eject"])
+		else if(href_list["eject"])
 			if(beaker)
 				beaker.forceMove(get_turf(src))
 				beaker = null
 				reagents.clear_reagents()
 				icon_state = "mixer0"
-		else if (href_list["createpill"] || href_list["createpill_multiple"])
+		else if(href_list["createpill"] || href_list["createpill_multiple"])
 			if(!condi)
 				var/count = 1
-				if (href_list["createpill_multiple"])
+				if(href_list["createpill_multiple"])
 					count = input("Select the number of pills to make.", 10, pillamount) as num|null
 					if(count == null)
 						return
 					count = isgoodnumber(count)
-				if (count > 20) count = 20	//Pevent people from creating huge stacks of pills easily. Maybe move the number to defines?
-				if (count <= 0) return
+				if(count > 20) count = 20	//Pevent people from creating huge stacks of pills easily. Maybe move the number to defines?
+				if(count <= 0) return
 				var/amount_per_pill = reagents.total_volume/count
-				if (amount_per_pill > 50) amount_per_pill = 50
+				if(amount_per_pill > 50) amount_per_pill = 50
 				var/name = input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill]u)") as text|null
 				if(!name)
 					return
 				name = reject_bad_text(name)
-				while (count--)
+				while(count--)
 					var/obj/item/weapon/reagent_containers/food/pill/P = new/obj/item/weapon/reagent_containers/food/pill(src.loc)
 					if(!name) name = reagents.get_master_reagent_name()
 					P.name = "[name] pill"
@@ -608,31 +608,35 @@
 				P.name = "[name] pack"
 				P.desc = "A small condiment pack. The label says it contains [name]."
 				reagents.trans_to(P,10)
-		else if (href_list["createpatch"] || href_list["createpatch_multiple"])
+		else if(href_list["createpatch"] || href_list["createpatch_multiple"])
 			if(!condi)
 				var/count = 1
-				if (href_list["createpatch_multiple"])
+				if(href_list["createpatch_multiple"])
 					count = input("Select the number of patches to make.", 10, patchamount) as num|null
 					if(count == null)
 						return
 					count = isgoodnumber(count)
 				if(!count || count <= 0)
 					return
-				if (count > 20) count = 20	//Pevent people from creating huge stacks of patches easily. Maybe move the number to defines?
+				if(count > 20) count = 20	//Pevent people from creating huge stacks of patches easily. Maybe move the number to defines?
 				var/amount_per_patch = reagents.total_volume/count
-				if (amount_per_patch > 40) amount_per_patch = 40
+				if(amount_per_patch > 40) amount_per_patch = 40
 				var/name = input(usr,"Name:","Name your patch!","[reagents.get_master_reagent_name()] ([amount_per_patch]u)") as text|null
 				if(!name)
 					return
 				name = reject_bad_text(name)
-				while (count--)
+				var/is_medical_patch = chemical_safety_check(reagents)
+				while(count--)
 					var/obj/item/weapon/reagent_containers/food/pill/patch/P = new/obj/item/weapon/reagent_containers/food/pill/patch(src.loc)
 					if(!name) name = reagents.get_master_reagent_name()
 					P.name = "[name] patch"
 					P.pixel_x = rand(-7, 7) //random position
 					P.pixel_y = rand(-7, 7)
 					reagents.trans_to(P,amount_per_patch)
-		else if (href_list["createbottle"])
+					if(is_medical_patch)
+						P.instant_application = 1
+						P.icon_state = "bandaid_med"
+		else if(href_list["createbottle"])
 			if(!condi)
 				var/name = input(usr,"Name:","Name your bottle!",reagents.get_master_reagent_name()) as text|null
 				if(!name)
@@ -757,6 +761,12 @@
 	else
 		return 0
 
+/obj/machinery/chem_master/proc/chemical_safety_check(datum/reagents/R)
+	var/all_safe = 1
+	for(var/datum/reagent/A in R.reagent_list)
+		if(!safe_chem_list.Find(A.id))
+			all_safe = 0
+	return all_safe
 
 /obj/machinery/chem_master/condimaster
 	name = "\improper CondiMaster 3000"
@@ -878,11 +888,11 @@
 
 /obj/machinery/reagentgrinder/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
 
-	if (istype(O,/obj/item/weapon/reagent_containers/glass) || \
+	if(istype(O,/obj/item/weapon/reagent_containers/glass) || \
 		istype(O,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass) || \
 		istype(O,/obj/item/weapon/reagent_containers/food/drinks/shaker))
 
-		if (beaker)
+		if(beaker)
 			return 1
 		else
 			if(!user.drop_item())
@@ -901,7 +911,7 @@
 	//Fill machine with the plantbag!
 	if(istype(O, /obj/item/weapon/storage/bag/plants))
 
-		for (var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents)
+		for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents)
 			O.contents -= G
 			G.forceMove(src)
 			holdingitems += G
@@ -916,7 +926,7 @@
 		return 0
 
 
-	if (!is_type_in_list(O, blend_items) && !is_type_in_list(O, juice_items))
+	if(!is_type_in_list(O, blend_items) && !is_type_in_list(O, juice_items))
 		to_chat(user, "<span class='warning'>Cannot refine into a reagent.</span>")
 		return 1
 
@@ -941,13 +951,13 @@
 	var/dat = ""
 
 	if(!inuse)
-		for (var/obj/item/O in holdingitems)
+		for(var/obj/item/O in holdingitems)
 			processing_chamber += "\A [O.name]<BR>"
 
-		if (!processing_chamber)
+		if(!processing_chamber)
 			is_chamber_empty = 1
 			processing_chamber = "Nothing."
-		if (!beaker)
+		if(!beaker)
 			beaker_contents = "<B>No beaker attached.</B><br>"
 		else
 			is_beaker_ready = 1
@@ -965,12 +975,12 @@
 	[processing_chamber]<br>
 	[beaker_contents]<hr>
 	"}
-		if (is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
+		if(is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
 			dat += "<A href='?src=\ref[src];action=grind'>Grind the reagents</a><BR>"
 			dat += "<A href='?src=\ref[src];action=juice'>Juice the reagents</a><BR><BR>"
 		if(holdingitems && holdingitems.len > 0)
 			dat += "<A href='?src=\ref[src];action=eject'>Eject the reagents</a><BR>"
-		if (beaker)
+		if(beaker)
 			dat += "<A href='?src=\ref[src];action=detach'>Detach the beaker</a><BR>"
 	else
 		dat += "Please wait..."
@@ -983,22 +993,22 @@
 		return
 	usr.set_machine(src)
 	switch(href_list["action"])
-		if ("grind")
+		if("grind")
 			grind()
 		if("juice")
 			juice()
 		if("eject")
 			eject()
-		if ("detach")
+		if("detach")
 			detach()
 	src.updateUsrDialog()
 	return
 
 /obj/machinery/reagentgrinder/proc/detach()
 
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
-	if (!beaker)
+	if(!beaker)
 		return
 	beaker.forceMove(src.loc)
 	beaker = null
@@ -1006,9 +1016,9 @@
 
 /obj/machinery/reagentgrinder/proc/eject()
 
-	if (usr.stat != 0)
+	if(usr.stat != 0)
 		return
-	if (holdingitems && holdingitems.len == 0)
+	if(holdingitems && holdingitems.len == 0)
 		return
 
 	for(var/obj/item/O in holdingitems)
@@ -1017,14 +1027,14 @@
 	holdingitems = list()
 
 /obj/machinery/reagentgrinder/proc/is_allowed(var/obj/item/weapon/reagent_containers/O)
-	for (var/i in blend_items)
+	for(var/i in blend_items)
 		if(istype(O, i))
 			return 1
 	return 0
 
 /obj/machinery/reagentgrinder/proc/get_allowed_by_id(var/obj/item/weapon/grown/O)
-	for (var/i in blend_items)
-		if (istype(O, i))
+	for(var/i in blend_items)
+		if(istype(O, i))
 			return blend_items[i]
 
 /obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(var/obj/item/weapon/reagent_containers/food/snacks/O)
@@ -1048,17 +1058,17 @@
 			return juice_tags[i]
 
 /obj/machinery/reagentgrinder/proc/get_grownweapon_amount(var/obj/item/weapon/grown/O)
-	if (!istype(O))
+	if(!istype(O))
 		return 5
-	else if (O.potency == -1)
+	else if(O.potency == -1)
 		return 5
 	else
 		return round(O.potency)
 
 /obj/machinery/reagentgrinder/proc/get_juice_amount(var/obj/item/weapon/reagent_containers/food/snacks/grown/O)
-	if (!istype(O))
+	if(!istype(O))
 		return 5
-	else if (O.potency == -1)
+	else if(O.potency == -1)
 		return 5
 	else
 		return round(5*sqrt(O.potency))
@@ -1071,7 +1081,7 @@
 	power_change()
 	if(stat & (NOPOWER|BROKEN))
 		return
-	if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
+	if(!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
 		return
 	playsound(src.loc, 'sound/machines/juicer.ogg', 20, 1)
 	var/offset = prob(50) ? -2 : 2
@@ -1082,8 +1092,8 @@
 		inuse = 0
 		interact(usr)
 	//Snacks
-	for (var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+	for(var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems)
+		if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break
 
 		var/allowed = null
@@ -1094,14 +1104,14 @@
 		if(isnull(allowed))
 			break
 
-		for (var/r_id in allowed)
+		for(var/r_id in allowed)
 
 			var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
 			var/amount = get_juice_amount(O)
 
 			beaker.reagents.add_reagent(r_id, min(amount, space))
 
-			if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+			if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 				break
 
 		remove_object(O)
@@ -1111,7 +1121,7 @@
 	power_change()
 	if(stat & (NOPOWER|BROKEN))
 		return
-	if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
+	if(!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
 		return
 	playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
 	var/offset = prob(50) ? -2 : 2
@@ -1122,8 +1132,8 @@
 		inuse = 0
 		interact(usr)
 	//Snacks and Plants
-	for (var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+	for(var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems)
+		if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break
 
 		var/allowed = null
@@ -1134,85 +1144,85 @@
 		if(isnull(allowed))
 			break
 
-		for (var/r_id in allowed)
+		for(var/r_id in allowed)
 
 			var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
 			var/amount = allowed[r_id]
 			if(amount <= 0)				//Negative amounts are multipliers for the reagent amount (Example: "amount = -5" means "reagent_amount * 5")
 				if(amount == 0)
-					if (O.reagents != null && O.reagents.has_reagent("nutriment"))
+					if(O.reagents != null && O.reagents.has_reagent("nutriment"))
 						beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("nutriment"), space))
 						O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
-					if (O.reagents != null && O.reagents.has_reagent("plantmatter"))
+					if(O.reagents != null && O.reagents.has_reagent("plantmatter"))
 						beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("plantmatter"), space))
 						O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space))
 				else
-					if (O.reagents != null && O.reagents.has_reagent("nutriment"))
+					if(O.reagents != null && O.reagents.has_reagent("nutriment"))
 						beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("nutriment")*abs(amount)), space))
 						O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
-					if (O.reagents != null && O.reagents.has_reagent("plantmatter"))
+					if(O.reagents != null && O.reagents.has_reagent("plantmatter"))
 						beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("plantmatter")*abs(amount)), space))
 						O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space))
 
 			else
 				O.reagents.trans_id_to(beaker, r_id, min(amount, space))
 
-			if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+			if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 				break
 
 		if(O.reagents.reagent_list.len == 0)
 			remove_object(O)
 
 	//Sheets
-	for (var/obj/item/stack/sheet/O in holdingitems)
+	for(var/obj/item/stack/sheet/O in holdingitems)
 		var/allowed = get_allowed_by_id(O)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+		if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break
 		for(var/i = 1; i <= round(O.amount, 1); i++)
-			for (var/r_id in allowed)
+			for(var/r_id in allowed)
 				var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
 				var/amount = allowed[r_id]
 				beaker.reagents.add_reagent(r_id,min(amount, space))
-				if (space < amount)
+				if(space < amount)
 					break
-			if (i == round(O.amount, 1))
+			if(i == round(O.amount, 1))
 				remove_object(O)
 				break
 	//Plants
-	for (var/obj/item/weapon/grown/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+	for(var/obj/item/weapon/grown/O in holdingitems)
+		if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break
 		var/allowed = get_allowed_by_id(O)
-		for (var/r_id in allowed)
+		for(var/r_id in allowed)
 			var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
 			var/amount = allowed[r_id]
-			if (amount == 0)
-				if (O.reagents != null && O.reagents.has_reagent(r_id))
+			if(amount == 0)
+				if(O.reagents != null && O.reagents.has_reagent(r_id))
 					beaker.reagents.add_reagent(r_id,min(O.reagents.get_reagent_amount(r_id), space))
 			else
 				beaker.reagents.add_reagent(r_id,min(amount, space))
 
-			if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+			if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 				break
 		remove_object(O)
 
 	//xenoarch
 	/*for(var/obj/item/weapon/rocksliver/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+		if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break
 		var/allowed = get_allowed_by_id(O)
-		for (var/r_id in allowed)
+		for(var/r_id in allowed)
 			var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
 			var/amount = allowed[r_id]
 			beaker.reagents.add_reagent(r_id,min(amount, space), O.geological_data)
 
-			if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+			if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 				break
 		remove_object(O)*/
 
 	//Everything else - Transfers reagents from it into beaker
-	for (var/obj/item/weapon/reagent_containers/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+	for(var/obj/item/weapon/reagent_containers/O in holdingitems)
+		if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break
 		var/amount = O.reagents.total_volume
 		O.reagents.trans_to(beaker, amount)
diff --git a/code/modules/reagents/newchem/chem_heater.dm b/code/modules/reagents/newchem/chem_heater.dm
index b3c6c6a5e8c..66d1217931d 100644
--- a/code/modules/reagents/newchem/chem_heater.dm
+++ b/code/modules/reagents/newchem/chem_heater.dm
@@ -147,7 +147,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "chem_heater.tmpl", "ChemHeater", 350, 270)
 		ui.set_initial_data(data)
 		ui.open()
\ No newline at end of file
diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm
index 20607ac87a4..937ebff0397 100644
--- a/code/modules/reagents/newchem/drugs.dm
+++ b/code/modules/reagents/newchem/drugs.dm
@@ -587,7 +587,7 @@
 			M.visible_message("<span class='warning'>[M]'s hands flip out and flail everywhere!</span>")
 			M.drop_l_hand()
 			M.drop_r_hand()
-		else if (effect <= 4)
+		else if(effect <= 4)
 			M.visible_message("<span class='warning'>[M] falls to the floor and flails uncontrollably!</span>")
 			M.Jitter(5)
 			M.Weaken(5)
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index 66a4ef9c7ed..3094f590d3f 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -609,7 +609,7 @@ datum/reagent/epinephrine/on_mob_life(var/mob/living/M as mob)
 
 /datum/reagent/epinephrine/overdose_process(var/mob/living/M as mob, severity)
 	var/effect = ..()
-	if (severity == 1)
+	if(severity == 1)
 		if(effect <= 1)
 			M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
 			M.fakevomit(no_text = 1)
@@ -998,7 +998,7 @@ datum/reagent/haloperidol/on_mob_life(var/mob/living/M as mob)
 	result_amount = 2
 
 /datum/reagent/degreaser/reaction_turf(var/turf/simulated/T, var/volume)
-	if (!istype(T)) return
+	if(!istype(T)) return
 	src = null
 	if(volume >= 1)
 		if(istype(T) && T.wet)
diff --git a/code/modules/reagents/newchem/newchem_procs.dm b/code/modules/reagents/newchem/newchem_procs.dm
index 8f3fa6204d2..7ec43e6a028 100644
--- a/code/modules/reagents/newchem/newchem_procs.dm
+++ b/code/modules/reagents/newchem/newchem_procs.dm
@@ -120,7 +120,7 @@
 // Called if the reagent has passed the overdose threshold and is set to be triggering overdose effects
 /datum/reagent/proc/overdose_process(var/mob/living/M as mob, severity)
 	var/effect = rand(1, 100) - severity
-	if (effect <= 8)
+	if(effect <= 8)
 		M.adjustToxLoss(severity)
 	return effect
 
diff --git a/code/modules/reagents/newchem/patch.dm b/code/modules/reagents/newchem/patch.dm
index 793b6f8ae6f..f686d293c24 100644
--- a/code/modules/reagents/newchem/patch.dm
+++ b/code/modules/reagents/newchem/patch.dm
@@ -36,6 +36,7 @@
 /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh
 	name = "syntheflesh patch"
 	desc = "Helps with burn injuries."
+	icon_state = "bandaid_med"
 	instant_application = 1
 
 /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh/New()
diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm
index 655b8e996eb..bd7f488c449 100644
--- a/code/modules/reagents/newchem/pyro.dm
+++ b/code/modules/reagents/newchem/pyro.dm
@@ -368,13 +368,13 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
 			M.Weaken(max(10/distance, 3))
 			M.ear_damage += rand(0, 5)
 			M.ear_deaf = max(M.ear_deaf,15)
-			if (M.ear_damage >= 15)
+			if(M.ear_damage >= 15)
 				to_chat(M, "<span class='warning'>Your ears start to ring badly!</span>")
 				if(prob(M.ear_damage - 10 + 5))
 					to_chat(M, "<span class='warning'>You can't hear anything!</span>")
 					M.disabilities |= DEAF
 			else
-				if (M.ear_damage >= 5)
+				if(M.ear_damage >= 5)
 					to_chat(M, "<span class='warning'>Your ears start to ring!</span>")
 
 /datum/chemical_reaction/sonic_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -397,13 +397,13 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
 			M.Weaken(max(10/distance, 3))
 			M.ear_damage += rand(0, 5)
 			M.ear_deaf = max(M.ear_deaf,15)
-			if (M.ear_damage >= 15)
+			if(M.ear_damage >= 15)
 				to_chat(M, "<span class='warning'>Your ears start to ring badly!</span>")
 				if(prob(M.ear_damage - 10 + 5))
 					to_chat(M, "<span class='warning'>You can't hear anything!</span>")
 					M.disabilities |= DEAF
 			else
-				if (M.ear_damage >= 5)
+				if(M.ear_damage >= 5)
 					to_chat(M, "<span class='warning'>Your ears start to ring!</span>")
 	holder.remove_reagent("sonic_powder", created_volume)
 
@@ -535,6 +535,7 @@ datum/reagent/pyrosium/on_tick()
 	required_reagents = list("chlorine" = 1, "oxygen" = 1, "nitrogen" = 1, "ammonia" = 1, "sodium" = 1, "silver" = 1)
 	result_amount = 1
 	mix_message = "The substance violently detonates!"
+	mix_sound = 'sound/effects/bang.ogg'
 
 /datum/chemical_reaction/azide/on_reaction(var/datum/reagents/holder, var/created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -570,7 +571,7 @@ datum/reagent/firefighting_foam/reaction_mob(var/mob/living/M, var/method=TOUCH,
 		return
 
 datum/reagent/firefighting_foam/reaction_turf(var/turf/simulated/T, var/volume)
-	if (!istype(T)) return
+	if(!istype(T)) return
 	var/CT = cooling_temperature
 	src = null
 	if(!istype(T, /turf/space))
@@ -603,6 +604,7 @@ datum/reagent/firefighting_foam/reaction_obj(var/obj/O, var/volume)
 	required_reagents = list("firefighting_foam" = 1, "clf3" = 1)
 	result_amount = 1
 	mix_message = "The substance violently detonates!"
+	mix_sound = 'sound/effects/bang.ogg'
 
 /datum/chemical_reaction/clf3_firefighting/on_reaction(var/datum/reagents/holder, var/created_volume)
 	var/location = get_turf(holder.my_atom)
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
index a40345ffaac..aa90da49005 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
@@ -198,7 +198,7 @@
 	M:drowsyness = max(0,M:drowsyness-7)
 	//if(!M:sleeping_willingly)
 	//	M:sleeping = max(0,M.sleeping-2)
-	if (M.bodytemperature > 310)
+	if(M.bodytemperature > 310)
 		M.bodytemperature = max(310, M.bodytemperature-5)
 	M.Jitter(1)
 	return
@@ -528,7 +528,7 @@
 
 /datum/reagent/ethanol/sbiten/on_mob_life(var/mob/living/M as mob)
 	..()
-	if (M.bodytemperature < 360)
+	if(M.bodytemperature < 360)
 		M.bodytemperature = min(360, M.bodytemperature+50) //310 is the normal bodytemp. 310.055
 	return
 
@@ -566,7 +566,7 @@
 
 /datum/reagent/ethanol/iced_beer/on_mob_life(var/mob/living/M as mob)
 	..()
-	if (M.bodytemperature < 270)
+	if(M.bodytemperature < 270)
 		M.bodytemperature = min(270, M.bodytemperature-40) //310 is the normal bodytemp. 310.055
 	return
 
@@ -689,7 +689,7 @@
 /datum/reagent/ethanol/driestmartini/on_mob_life(var/mob/living/M as mob)
 	M.dizziness +=10
 	if(current_cycle >= 55 && current_cycle <115)
-		if (!M.stuttering) M.stuttering = 1
+		if(!M.stuttering) M.stuttering = 1
 		M.stuttering += 10
 	..()
 
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
index d52743c6ae6..cc4daaa7bc5 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
@@ -47,7 +47,7 @@
 		if(1 to 20)
 			//nothing
 		if(21 to INFINITY)
-			if (prob(data-10))
+			if(prob(data-10))
 				M.disabilities &= ~NEARSIGHTED
 	data++
 	return
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink_base.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink_base.dm
index 848b20ccb41..7195dad5df5 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink_base.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink_base.dm
@@ -13,11 +13,11 @@
 /datum/reagent/drink/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom
 	M.nutrition += nutriment_factor
-	if (adj_dizzy) M.dizziness = max(0,M.dizziness + adj_dizzy)
-	if (adj_drowsy)	M.drowsyness = max(0,M.drowsyness + adj_drowsy)
-	if (adj_sleepy) M.sleeping = max(0,M.sleeping + adj_sleepy)
-	if (adj_temp)
-		if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
+	if(adj_dizzy) M.dizziness = max(0,M.dizziness + adj_dizzy)
+	if(adj_drowsy)	M.drowsyness = max(0,M.drowsyness + adj_drowsy)
+	if(adj_sleepy) M.sleeping = max(0,M.sleeping + adj_sleepy)
+	if(adj_temp)
+		if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
 			M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT))
 	..()
 	return
diff --git a/code/modules/reagents/oldchem/reagents/reagents_admin.dm b/code/modules/reagents/oldchem/reagents/reagents_admin.dm
index 92cfbfd4c36..4b0588c625b 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_admin.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_admin.dm
@@ -59,7 +59,7 @@
 	for(var/tocheck in incoming)
 		if(ispath(tocheck))
 			var/check = new tocheck
-			if (istype(check, /atom))
+			if(istype(check, /atom))
 				var/atom/reagentCheck = check
 				var/datum/reagents/reagents = reagentCheck.reagents
 				var/admin = 0
diff --git a/code/modules/reagents/oldchem/reagents/reagents_drugs.dm b/code/modules/reagents/oldchem/reagents/reagents_drugs.dm
index 0529a1ed4b0..87e51bf89ef 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_drugs.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_drugs.dm
@@ -45,17 +45,17 @@
 	if(!data) data = 1
 	switch(data)
 		if(1 to 5)
-			if (!M.stuttering) M.stuttering = 1
+			if(!M.stuttering) M.stuttering = 1
 			M.Dizzy(10)
 			if(prob(10)) M.emote(pick("twitch","giggle"))
 		if(5 to 10)
-			if (!M.stuttering) M.stuttering = 1
+			if(!M.stuttering) M.stuttering = 1
 			M.Jitter(20)
 			M.Dizzy(20)
 			M.druggy = max(M.druggy, 45)
 			if(prob(20)) M.emote(pick("twitch","giggle"))
-		if (10 to INFINITY)
-			if (!M.stuttering) M.stuttering = 1
+		if(10 to INFINITY)
+			if(!M.stuttering) M.stuttering = 1
 			M.Jitter(40)
 			M.Dizzy(40)
 			M.druggy = max(M.druggy, 60)
diff --git a/code/modules/reagents/oldchem/reagents/reagents_food.dm b/code/modules/reagents/oldchem/reagents/reagents_food.dm
index 4c284d7d7cc..c2711aac2f4 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_food.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_food.dm
@@ -205,7 +205,7 @@
 	color = "#403010" // rgb: 64, 48, 16
 
 /datum/reagent/hot_coco/on_mob_life(var/mob/living/M as mob)
-	if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
+	if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
 		M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
 	M.nutrition += nutriment_factor
 	..()
@@ -224,17 +224,17 @@
 	if(!data) data = 1
 	switch(data)
 		if(1 to 5)
-			if (!M.stuttering) M.stuttering = 1
+			if(!M.stuttering) M.stuttering = 1
 			M.Dizzy(5)
 			if(prob(10)) M.emote(pick("twitch","giggle"))
 		if(5 to 10)
-			if (!M.stuttering) M.stuttering = 1
+			if(!M.stuttering) M.stuttering = 1
 			M.Jitter(10)
 			M.Dizzy(10)
 			M.druggy = max(M.druggy, 35)
 			if(prob(20)) M.emote(pick("twitch","giggle"))
-		if (10 to INFINITY)
-			if (!M.stuttering) M.stuttering = 1
+		if(10 to INFINITY)
+			if(!M.stuttering) M.stuttering = 1
 			M.Jitter(20)
 			M.Dizzy(20)
 			M.druggy = max(M.druggy, 40)
@@ -277,7 +277,7 @@
 	return
 
 /datum/reagent/cornoil/reaction_turf(var/turf/simulated/T, var/volume)
-	if (!istype(T)) return
+	if(!istype(T)) return
 	src = null
 	if(volume >= 3)
 		T.MakeSlippery()
@@ -322,7 +322,7 @@
 
 /datum/reagent/hot_ramen/on_mob_life(var/mob/living/M as mob)
 	M.nutrition += nutriment_factor
-	if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
+	if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
 		M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT))
 	..()
 	return
diff --git a/code/modules/reagents/oldchem/reagents/reagents_med.dm b/code/modules/reagents/oldchem/reagents/reagents_med.dm
index 0a2fa0396bf..ebf04593fcb 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_med.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_med.dm
@@ -25,7 +25,7 @@
 
 	//makes you squeaky clean
 /datum/reagent/sterilizine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
-	if (method == TOUCH)
+	if(method == TOUCH)
 		M.germ_level -= min(volume*20, M.germ_level)
 
 /datum/reagent/sterilizine/reaction_obj(var/obj/O, var/volume)
diff --git a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm
index 8dcb1a77d6e..f9f3c75726b 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm
@@ -49,7 +49,7 @@
 
 /datum/reagent/minttoxin/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom
-	if (FAT in M.mutations)
+	if(FAT in M.mutations)
 		M.gib()
 	..()
 	return
@@ -412,27 +412,27 @@
 			var/eyes_covered = 0
 			var/obj/item/safe_thing = null
 			if( victim.wear_mask )
-				if ( victim.wear_mask.flags & MASKCOVERSEYES )
+				if( victim.wear_mask.flags & MASKCOVERSEYES )
 					eyes_covered = 1
 					safe_thing = victim.wear_mask
-				if ( victim.wear_mask.flags & MASKCOVERSMOUTH )
+				if( victim.wear_mask.flags & MASKCOVERSMOUTH )
 					mouth_covered = 1
 					safe_thing = victim.wear_mask
 			if( victim.head )
-				if ( victim.head.flags & MASKCOVERSEYES )
+				if( victim.head.flags & MASKCOVERSEYES )
 					eyes_covered = 1
 					safe_thing = victim.head
-				if ( victim.head.flags & MASKCOVERSMOUTH )
+				if( victim.head.flags & MASKCOVERSMOUTH )
 					mouth_covered = 1
 					safe_thing = victim.head
 			if(victim.glasses)
 				eyes_covered = 1
-				if ( !safe_thing )
+				if( !safe_thing )
 					safe_thing = victim.glasses
-			if ( eyes_covered && mouth_covered )
+			if( eyes_covered && mouth_covered )
 				to_chat(victim, "\red Your [safe_thing] protects you from the pepperspray!")
 				return
-			else if ( mouth_covered )	// Reduced effects if partially protected
+			else if( mouth_covered )	// Reduced effects if partially protected
 				to_chat(victim, "\red Your [safe_thing] protect you from most of the pepperspray!")
 				if(prob(5))
 					victim.emote("scream")
@@ -443,7 +443,7 @@
 				victim.Weaken(3)
 				victim.drop_item()
 				return
-			else if ( eyes_covered ) // Eye cover is better than mouth cover
+			else if( eyes_covered ) // Eye cover is better than mouth cover
 				to_chat(victim, "\red Your [safe_thing] protects your eyes from the pepperspray!")
 				victim.eye_blurry = max(M.eye_blurry, 3)
 				victim.damageoverlaytemp = 30
diff --git a/code/modules/reagents/oldchem/reagents/reagents_water.dm b/code/modules/reagents/oldchem/reagents/reagents_water.dm
index 11a5759fa5b..beb0892067a 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_water.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_water.dm
@@ -28,7 +28,7 @@
 		return
 
 /datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume)
-	if (!istype(T)) return
+	if(!istype(T)) return
 	src = null
 	if(volume >= 3)
 		T.MakeSlippery()
@@ -74,7 +74,7 @@
 	color = "#1BB1AB"
 
 /datum/reagent/lube/reaction_turf(var/turf/simulated/T, var/volume)
-	if (!istype(T)) return
+	if(!istype(T)) return
 	src = null
 	if(volume >= 1)
 		T.MakeSlippery(TURF_WET_LUBE)
@@ -289,13 +289,13 @@
 	data++
 	M.jitteriness = max(M.jitteriness-5,0)
 	if(data >= 30)		// 12 units, 60 seconds @ metabolism 0.4 units & tick rate 2.0 sec
-		if (!M.stuttering) M.stuttering = 1
+		if(!M.stuttering) M.stuttering = 1
 		M.stuttering += 4
 		M.Dizzy(5)
 		if(iscultist(M) && prob(5))
 			M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu"))
 	if(data >= 75 && prob(33))	// 30 units, 150 seconds
-		if (!M.confused) M.confused = 1
+		if(!M.confused) M.confused = 1
 		M.confused += 3
 		if(isvampirethrall(M))
 			ticker.mode.remove_vampire_mind(M.mind)
diff --git a/code/modules/reagents/pandemic.dm b/code/modules/reagents/pandemic.dm
index bec2b92f049..7ab532ed8e2 100644
--- a/code/modules/reagents/pandemic.dm
+++ b/code/modules/reagents/pandemic.dm
@@ -74,7 +74,7 @@
 	usr.set_machine(src)
 	if(!beaker) return
 
-	if (href_list["create_vaccine"])
+	if(href_list["create_vaccine"])
 		if(!src.wait)
 			var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
 			if(B)
@@ -104,7 +104,7 @@
 			src.temp_html = "The replicator is not ready yet."
 		src.updateUsrDialog()
 		return
-	else if (href_list["create_virus_culture"])
+	else if(href_list["create_virus_culture"])
 		if(!wait)
 			var/type = GetVirusTypeByIndex(text2num(href_list["create_virus_culture"]))//the path is received as string - converting
 			var/datum/disease/D = null
@@ -135,11 +135,11 @@
 			src.temp_html = "The replicator is not ready yet."
 		src.updateUsrDialog()
 		return
-	else if (href_list["empty_beaker"])
+	else if(href_list["empty_beaker"])
 		beaker.reagents.clear_reagents()
 		src.updateUsrDialog()
 		return
-	else if (href_list["eject"])
+	else if(href_list["eject"])
 		beaker:loc = src.loc
 		beaker = null
 		icon_state = "mixer0"
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 237dd9ac46b..7a3ec304296 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -22,12 +22,12 @@
 	if(amount_per_transfer_from_this in possible_transfer_amounts)
 		default = amount_per_transfer_from_this
 	var/N = input("Amount per transfer from this:", "[src]", default) as null|anything in possible_transfer_amounts
-	if (N)
+	if(N)
 		amount_per_transfer_from_this = N
 
 /obj/item/weapon/reagent_containers/New()
 	..()
-	if (!possible_transfer_amounts)
+	if(!possible_transfer_amounts)
 		src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT
 	var/datum/reagents/R = new/datum/reagents(volume)
 	reagents = R
@@ -72,7 +72,7 @@
 /obj/item/weapon/reagent_containers/proc/reagentlist(var/obj/item/weapon/reagent_containers/snack) //Attack logs for regents in pills
 	var/data
 	if(snack && snack.reagents && snack.reagents.reagent_list && snack.reagents.reagent_list.len) //find a reagent list if there is and check if it has entries
-		for (var/datum/reagent/R in snack.reagents.reagent_list) //no reagents will be left behind
+		for(var/datum/reagent/R in snack.reagents.reagent_list) //no reagents will be left behind
 			data += "[R.id]([R.volume] units); " //Using IDs because SOME chemicals(I'm looking at you, chlorhydrate-beer) have the same names as other chemicals.
 		return data
 	else return "No reagents"
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 9d67bb22881..0d97be00a17 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -74,9 +74,9 @@
 	if(!R.total_volume)
 		to_chat(user, "<span class='warning'>The injector is empty.</span>")
 		return
-	if (!istype(M))
+	if(!istype(M))
 		return
-	if (R.total_volume && M.can_inject(user, 1, penetrate_thick = bypass_protection))
+	if(R.total_volume && M.can_inject(user, 1, penetrate_thick = bypass_protection))
 		to_chat(user, "<span class='notice'>You inject [M] with the injector.</span>")
 		to_chat(M, "<span class='notice'>You feel a tiny prick!</span>")
 
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index f75959544ef..d37f607608b 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -32,13 +32,13 @@
 
 					var/obj/item/safe_thing = null
 					if( victim.wear_mask )
-						if ( victim.wear_mask.flags & MASKCOVERSEYES )
+						if( victim.wear_mask.flags & MASKCOVERSEYES )
 							safe_thing = victim.wear_mask
 					if( victim.head )
-						if ( victim.head.flags & MASKCOVERSEYES )
+						if( victim.head.flags & MASKCOVERSEYES )
 							safe_thing = victim.head
 					if(victim.glasses)
-						if ( !safe_thing )
+						if( !safe_thing )
 							safe_thing = victim.glasses
 
 					if(safe_thing)
@@ -54,7 +54,7 @@
 
 
 						to_chat(user, "\blue You transfer [trans] units of the solution.")
-						if (src.reagents.total_volume<=0)
+						if(src.reagents.total_volume<=0)
 							filled = 0
 							icon_state = "[initial(icon_state)]"
 						return
@@ -93,7 +93,7 @@
 
 			trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
 			to_chat(user, "\blue You transfer [trans] units of the solution.")
-			if (src.reagents.total_volume<=0)
+			if(src.reagents.total_volume<=0)
 				filled = 0
 				icon_state = "[initial(icon_state)]"
 
diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index f037fe6612a..611649dcf80 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -7,7 +7,7 @@
 	flags &= ~OPENCONTAINER
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/attack_self(mob/user as mob)
-	if (canopened == 0)
+	if(canopened == 0)
 		playsound(src.loc,'sound/effects/canopen.ogg', rand(10,50), 1)
 		to_chat(user, "<span class='notice'>You open the drink with an audible pop!</span>")
 		canopened = 1
@@ -59,11 +59,11 @@
 			return
 		if(!reagents || reagents.total_volume==0)
 			to_chat(user, "\blue \The [src] is empty!")
-		else if (reagents.total_volume<=src.volume/4)
+		else if(reagents.total_volume<=src.volume/4)
 			to_chat(user, "\blue \The [src] is almost empty!")
-		else if (reagents.total_volume<=src.volume*0.66)
+		else if(reagents.total_volume<=src.volume*0.66)
 			to_chat(user, "\blue \The [src] is half full!")
-		else if (reagents.total_volume<=src.volume*0.90)
+		else if(reagents.total_volume<=src.volume*0.90)
 			to_chat(user, "\blue \The [src] is almost full!")
 		else
 			to_chat(user, "\blue \The [src] is full!")*/
diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm
index 2b53bfb2e6d..29bd6e7dc53 100644
--- a/code/modules/reagents/reagent_containers/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/food/condiment.dm
@@ -120,7 +120,7 @@
 		else
 			name = "condiment bottle"
 			main_reagent = reagents.get_master_reagent_name()
-			if (reagents.reagent_list.len==1)
+			if(reagents.reagent_list.len==1)
 				desc = "Looks like it is [lowertext(main_reagent)], but you are not sure."
 			else
 				desc = "A mixture of various condiments. [lowertext(main_reagent)] is one of them."
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index d6a5d37012a..8766e784dd7 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -42,7 +42,7 @@
 	if(!proximity) return
 
 	// Moved from the can code; not necessary since closed cans aren't open containers now, but, eh.
-	if (istype(target, /obj/item/weapon/reagent_containers/food/drinks/cans))
+	if(istype(target, /obj/item/weapon/reagent_containers/food/drinks/cans))
 		var/obj/item/weapon/reagent_containers/food/drinks/cans/cantarget = target
 		if(cantarget.canopened == 0)
 			to_chat(user, "<span class='notice'>You need to open the drink you want to pour into!</span>")
@@ -109,12 +109,12 @@
 		return
 	if(!reagents || reagents.total_volume==0)
 		to_chat(user, "<span class='notice'> \The [src] is empty!</span>")
-	else if (reagents.total_volume<=src.volume/4)
+	else if(reagents.total_volume<=src.volume/4)
 		to_chat(user, "<span class='notice'> \The [src] is almost empty!</span>")
-	else if (reagents.total_volume<=src.volume*0.66)
+	else if(reagents.total_volume<=src.volume*0.66)
 		to_chat(user, "<span class='notice'> \The [src] is half full!</span>")// We're all optimistic, right?!
 
-	else if (reagents.total_volume<=src.volume*0.90)
+	else if(reagents.total_volume<=src.volume*0.90)
 		to_chat(user, "<span class='notice'> \The [src] is almost full!</span>")
 	else
 		to_chat(user, "<span class='notice'> \The [src] is full!</span>")
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index 981bb7148a2..b2ba9cf7a36 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -92,7 +92,7 @@
 		/*else if(reagents.reagent_list.len == 1)
 			for(var/datum/reagent/R in reagents.reagent_list)
 				switch(R.id)*/
-		if (reagents.reagent_list.len > 0)
+		if(reagents.reagent_list.len > 0)
 			//mrid = R.get_master_reagent_id()
 			switch(reagents.get_master_reagent_id())
 				if("beer")
@@ -183,7 +183,7 @@
 					icon_state = "cognacglass"
 					name = "Glass of cognac"
 					desc = "Damn, you feel like some kind of French aristocrat just by holding this."
-				if ("kahlua")
+				if("kahlua")
 					icon_state = "kahluaglass"
 					name = "Glass of RR coffee Liquor"
 					desc = "DAMN, THIS THING LOOKS ROBUST"
diff --git a/code/modules/reagents/reagent_containers/food/drinks/jar.dm b/code/modules/reagents/reagent_containers/food/drinks/jar.dm
index c28aee6b6cc..1ddd831ea90 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/jar.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/jar.dm
@@ -12,7 +12,7 @@
 		reagents.add_reagent("slimejelly", 50)
 
 	on_reagent_change()
-		if (reagents.reagent_list.len > 0)
+		if(reagents.reagent_list.len > 0)
 			switch(reagents.get_master_reagent_id())
 				if("slimejelly")
 					icon_state = "jar_slime"
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 8538db0b13d..92f43cd38b3 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -61,11 +61,11 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/examine(mob/user)
 	if(..(user, 0))
-		if (bitecount==0)
+		if(bitecount==0)
 			return
-		else if (bitecount==1)
+		else if(bitecount==1)
 			to_chat(user, "\blue \The [src] was bitten by someone!")
-		else if (bitecount<=3)
+		else if(bitecount<=3)
 			to_chat(user, "\blue \The [src] was bitten [bitecount] times!")
 		else
 			to_chat(user, "\blue \The [src] was bitten multiple times!")
@@ -138,7 +138,7 @@
 			return 1
 		to_chat(user, "\red You slip [W] inside [src].")
 		user.unEquip(W)
-		if ((user.client && user.s_active != src))
+		if((user.client && user.s_active != src))
 			user.client.screen -= W
 		W.dropped(user)
 		add_fingerprint(user)
@@ -155,7 +155,7 @@
 		to_chat(user, "\red You cannot slice [src] here! You need a table or at least a tray to do it.")
 		return 1
 	var/slices_lost = 0
-	if (!inaccurate)
+	if(!inaccurate)
 		user.visible_message( \
 			"\blue [user] slices \the [src]!", \
 			"\blue You slice \the [src]!" \
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index ca4b15fc211..ce0d298839e 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -51,7 +51,7 @@
 			filling.icon += mix_color_from_reagents(reagents.reagent_list)
 			overlays += filling
 
-		if (!is_open_container())
+		if(!is_open_container())
 			var/image/lid = image(icon, src, "lid_bottle")
 			overlays += lid
 
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index 31b1b2030e5..3e23348881f 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -48,12 +48,12 @@
 /obj/item/weapon/reagent_containers/glass/examine(mob/user)
 	if(!..(user, 2))
 		return
-	if (!is_open_container())
+	if(!is_open_container())
 		to_chat(user, "<span class='notice'>Airtight lid seals it completely.</span>")
 
 /obj/item/weapon/reagent_containers/glass/attack_self()
 	..()
-	if (is_open_container())
+	if(is_open_container())
 		to_chat(usr, "<span class='notice'>You put the lid on \the [src].</span>")
 		flags ^= OPENCONTAINER
 	else
@@ -63,7 +63,7 @@
 
 /obj/item/weapon/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
 	if(!proximity) return
-	if (!is_open_container())
+	if(!is_open_container())
 		return
 
 	for(var/type in can_be_placed_into)
@@ -216,7 +216,7 @@
 		filling.icon += mix_color_from_reagents(reagents.reagent_list)
 		overlays += filling
 
-	if (!is_open_container())
+	if(!is_open_container())
 		var/image/lid = image(icon, src, "lid_[initial(icon_state)]")
 		overlays += lid
 	if(assembly)
@@ -228,7 +228,7 @@
 	set src in usr
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	if (assembly)
+	if(assembly)
 		to_chat(usr, "<span class='notice'>You detach [assembly] from \the [src]</span>")
 		usr.put_in_hands(assembly)
 		assembly = null
@@ -242,8 +242,8 @@
 		reagents.handle_reactions()
 
 /obj/item/weapon/reagent_containers/glass/beaker/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W,/obj/item/device/assembly_holder))
-		if (assembly)
+	if(istype(W,/obj/item/device/assembly_holder))
+		if(assembly)
 			to_chat(usr, "<span class='warning'>The [src] already has an assembly.</span>")
 			return ..()
 		assembly = W
@@ -334,7 +334,7 @@
 	icon_state = "bucket"
 	item_state = "bucket"
 	materials = list(MAT_METAL=200)
-	w_class = 3.0
+	w_class = 3
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = list(5,10,15,20,25,30,50,80,100,120)
 	volume = 120
@@ -384,7 +384,7 @@
 	icon_state = "canister"
 	item_state = "canister"
 	materials = list(MAT_METAL=300)
-	w_class = 4.0
+	w_class = 4
 
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = list(10,20,30,60)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index efc6a48b1f9..a55a3c6319c 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -7,7 +7,7 @@
 	flags = OPENCONTAINER | NOBLUDGEON
 	slot_flags = SLOT_BELT
 	throwforce = 0
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 7
 	var/spray_maxrange = 3 //what the sprayer will set spray_currentrange to in the attack_self.
@@ -92,7 +92,7 @@
 	set src in usr
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
-	if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
+	if(alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
 		return
 	if(isturf(usr.loc) && src.loc == usr)
 		to_chat(usr, "<span class='notice'>You empty \the [src] onto the floor.</span>")
@@ -159,7 +159,7 @@
 	icon_state = "chemsprayer"
 	item_state = "chemsprayer"
 	throwforce = 0
-	w_class = 3.0
+	w_class = 3
 	spray_maxrange = 7
 	spray_currentrange = 7
 	amount_per_transfer_from_this = 10
@@ -228,10 +228,10 @@
 /obj/item/weapon/reagent_containers/spray/plantbgone/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
 	if(!proximity) return
 
-	if (istype(A, /obj/machinery/portable_atmospherics/hydroponics)) // We are targeting hydrotray
+	if(istype(A, /obj/machinery/portable_atmospherics/hydroponics)) // We are targeting hydrotray
 		return
 
-	if (istype(A, /obj/effect/blob)) // blob damage in blob code
+	if(istype(A, /obj/effect/blob)) // blob damage in blob code
 		return
 
 	..()
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 91f12f8c00e..81dd637a855 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -66,7 +66,7 @@
 		to_chat(user, "\red This syringe is broken!")
 		return
 
-/*	if (user.a_intent == I_HARM && ismob(target))
+/*	if(user.a_intent == I_HARM && ismob(target))
 		if((CLUMSY in user.mutations) && prob(50))
 			target = user
 		syringestab(target, user)
@@ -126,7 +126,7 @@
 					else
 						B = T.take_blood(src,amount)
 
-					if (B)
+					if(B)
 						src.reagents.reagent_list |= B
 						src.reagents.update_total()
 						src.on_reagent_change()
@@ -150,7 +150,7 @@
 				var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares?
 
 				to_chat(user, "\blue You fill the syringe with [trans] units of the solution.")
-			if (reagents.total_volume >= reagents.maximum_volume)
+			if(reagents.total_volume >= reagents.maximum_volume)
 				mode=!mode
 				update_icon()
 
@@ -254,7 +254,7 @@
 							to_chat(user, "<span class=warning>You break the medical seal on the [P]!</span>")
 							P.instant_application = 0
 
-				if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT)
+				if(reagents.total_volume <= 0 && mode==SYRINGE_INJECT)
 					mode = SYRINGE_DRAW
 					update_icon()
 
@@ -270,9 +270,9 @@
 	if(ismob(loc))
 		var/injoverlay
 		switch(mode)
-			if (SYRINGE_DRAW)
+			if(SYRINGE_DRAW)
 				injoverlay = "draw"
-			if (SYRINGE_INJECT)
+			if(SYRINGE_INJECT)
 				injoverlay = "inject"
 		overlays += injoverlay
 	icon_state = "[rounded_vol]"
@@ -303,7 +303,7 @@
 		var/target_zone = ran_zone(check_zone(user.zone_sel.selecting, target))
 		var/obj/item/organ/external/affecting = target:get_organ(target_zone)
 
-		if (!affecting || (affecting.status & ORGAN_DESTROYED) || affecting.is_stump())
+		if(!affecting || (affecting.status & ORGAN_DESTROYED) || affecting.is_stump())
 			to_chat(user, "<span class='danger'>They are missing that limb!</span>")
 			return
 		var/hit_area = affecting.name
@@ -312,7 +312,7 @@
 		if((user != target) && H.check_shields(7, "the [src.name]"))
 			return
 
-		if (target != user && target.getarmor(target_zone, "melee") > 5 && prob(50))
+		if(target != user && target.getarmor(target_zone, "melee") > 5 && prob(50))
 			for(var/mob/O in viewers(world.view, user))
 				O.show_message(text("\red <B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B>"), 1)
 			user.unEquip(src)
@@ -401,7 +401,7 @@
 					var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares?
 
 					to_chat(user, "\blue You fill the syringe with [trans] units of the solution.")
-				if (reagents.total_volume >= reagents.maximum_volume)
+				if(reagents.total_volume >= reagents.maximum_volume)
 					mode=!mode
 					update_icon()
 
@@ -430,7 +430,7 @@
 				spawn(5)
 					var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
 					to_chat(user, "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.")
-					if (reagents.total_volume >= reagents.maximum_volume && mode==SYRINGE_INJECT)
+					if(reagents.total_volume >= reagents.maximum_volume && mode==SYRINGE_INJECT)
 						mode = SYRINGE_DRAW
 						update_icon()
 		return
@@ -441,9 +441,9 @@
 		if(ismob(loc))
 			var/mode_t
 			switch(mode)
-				if (SYRINGE_DRAW)
+				if(SYRINGE_DRAW)
 					mode_t = "d"
-				if (SYRINGE_INJECT)
+				if(SYRINGE_INJECT)
 					mode_t = "i"
 			icon_state = "[mode_t][rounded_vol]"
 		else
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 70f8060a670..3d8cc4af060 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -19,7 +19,7 @@
 	var/datum/reagents/R = new/datum/reagents(1000)
 	reagents = R
 	R.my_atom = src
-	if (!possible_transfer_amounts)
+	if(!possible_transfer_amounts)
 		src.verbs -= /obj/structure/reagent_dispensers/verb/set_APTFT
 	..()
 
@@ -40,7 +40,7 @@
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return
 	var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
-	if (N)
+	if(N)
 		amount_per_transfer_from_this = N
 
 /obj/structure/reagent_dispensers/ex_act(severity)
@@ -49,12 +49,12 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				new /obj/effect/effect/water(src.loc)
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(5))
+			if(prob(5))
 				new /obj/effect/effect/water(src.loc)
 				qdel(src)
 				return
@@ -131,7 +131,7 @@
 		to_chat(usr, "<span class='notice'>There is some kind of device rigged to the tank.")
 
 /obj/structure/reagent_dispensers/fueltank/attack_hand()
-	if (rig)
+	if(rig)
 		usr.visible_message("[usr] begins to detach [rig] from \the [src].", "You begin to detach [rig] from \the [src]")
 		if(do_after(usr, 20, target = src))
 			usr.visible_message("\blue [usr] detaches [rig] from \the [src].", "\blue  You detach [rig] from \the [src]")
@@ -140,8 +140,8 @@
 			overlays = new/list()
 
 /obj/structure/reagent_dispensers/fueltank/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W,/obj/item/device/assembly_holder) && accepts_rig)
-		if (rig)
+	if(istype(W,/obj/item/device/assembly_holder) && accepts_rig)
+		if(rig)
 			to_chat(user, "\red There is another device in the way.")
 			return ..()
 		user.visible_message("[user] begins rigging [W] to \the [src].", "You begin rigging [W] to \the [src]")
@@ -149,7 +149,7 @@
 			user.visible_message("\blue [user] rigs [W] to \the [src].", "\blue  You rig [W] to \the [src]")
 
 			var/obj/item/device/assembly_holder/H = W
-			if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter))
+			if(istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter))
 				msg_admin_attack("[key_name_admin(user)] rigged a fueltank for explosion (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
 				log_game("[key_name(user)] rigged fueltank a fueltank for explosion at [loc.x], [loc.y], [loc.z]")
 
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index cb3737824e0..cf1181a0653 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -125,14 +125,14 @@
 	if(istype(G))	// handle grabbed mob
 		if(ismob(G.affecting))
 			var/mob/GM = G.affecting
-			for (var/mob/V in viewers(usr))
+			for(var/mob/V in viewers(usr))
 				V.show_message("[usr] starts putting [GM.name] into the disposal.", 3)
 			if(do_after(usr, 20, target = GM))
-				if (GM.client)
+				if(GM.client)
 					GM.client.perspective = EYE_PERSPECTIVE
 					GM.client.eye = src
 				GM.loc = src
-				for (var/mob/C in viewers(src))
+				for(var/mob/C in viewers(src))
 					C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
 				qdel(G)
 				usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Has placed [key_name(GM)] in disposals.</font>")
@@ -158,13 +158,13 @@
 // mouse drop another mob or self
 //
 /obj/machinery/disposal/MouseDrop_T(mob/target, mob/user)
-	if (!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai))
+	if(!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai))
 		return
 	if(isanimal(user) && target != user) return //animals cannot put mobs other than themselves into disposal
 	src.add_fingerprint(user)
 	var/target_loc = target.loc
 	var/msg
-	for (var/mob/V in viewers(usr))
+	for(var/mob/V in viewers(usr))
 		if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
 			V.show_message("[usr] starts climbing into the disposal.", 3)
 		if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
@@ -188,12 +188,12 @@
 			msg_admin_attack("[key_name_admin(user)] placed [key_name_admin(target)] in a disposals unit")
 	else
 		return
-	if (target.client)
+	if(target.client)
 		target.client.perspective = EYE_PERSPECTIVE
 		target.client.eye = src
 	target.loc = src
 
-	for (var/mob/C in viewers(src))
+	for(var/mob/C in viewers(src))
 		if(C == user)
 			continue
 		C.show_message(msg, 3)
@@ -215,7 +215,7 @@
 // leave the disposal
 /obj/machinery/disposal/proc/go_out(mob/user)
 
-	if (user.client)
+	if(user.client)
 		user.client.eye = user.client.mob
 		user.client.perspective = MOB_PERSPECTIVE
 	user.loc = src.loc
@@ -272,7 +272,7 @@
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "disposal_bin.tmpl", "Waste Disposal Unit", 395, 250)
 		ui.set_initial_data(data)
 		ui.open()
@@ -298,7 +298,7 @@
 	if(usr.stat || usr.restrained() || src.flushing)
 		return
 
-	if (istype(src.loc, /turf))
+	if(istype(src.loc, /turf))
 		if(href_list["pump"])
 			if(text2num(href_list["pump"]))
 				mode = 1
@@ -467,7 +467,7 @@
 		qdel(H)
 
 /obj/machinery/disposal/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-	if (istype(mover,/obj/item) && mover.throwing)
+	if(istype(mover,/obj/item) && mover.throwing)
 		var/obj/item/I = mover
 		if(istype(I, /obj/item/projectile))
 			return
@@ -630,13 +630,13 @@
 
 		var/mob/living/U = user
 
-		if (U.stat || U.last_special <= world.time)
+		if(U.stat || U.last_special <= world.time)
 			return
 
 		U.last_special = world.time+100
 
-		if (src.loc)
-			for (var/mob/M in hearers(src.loc.loc))
+		if(src.loc)
+			for(var/mob/M in hearers(src.loc.loc))
 				to_chat(M, "<FONT size=[max(0, 5 - get_dist(src, M))]>CLONG, clong!</FONT>")
 
 		playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0)
@@ -1159,7 +1159,7 @@
 	var/obj/machinery/disposal/D = locate() in src.loc
 	if(D)
 		linked = D
-		if (!D.trunk)
+		if(!D.trunk)
 			D.trunk = src
 
 	var/obj/structure/disposaloutlet/O = locate() in src.loc
@@ -1354,7 +1354,7 @@
 
 // check if mob has client, if so restore client view on eject
 /mob/pipe_eject(var/direction)
-	if (src.client)
+	if(src.client)
 		src.client.perspective = MOB_PERSPECTIVE
 		src.client.eye = src
 
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index f10a50be115..02b13b903f2 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -204,10 +204,10 @@
 		var/dat = "<tt><center><h1><b>TagMaster 2.2</b></h1></center>"
 
 		dat += "<table style='width:100%; padding:4px;'><tr>"
-		for (var/i = 1, i <= TAGGERLOCATIONS.len, i++)
+		for(var/i = 1, i <= TAGGERLOCATIONS.len, i++)
 			dat += "<td><a href='?src=\ref[src];nextTag=[i]'>[TAGGERLOCATIONS[i]]</a></td>"
 
-			if (i%4==0)
+			if(i%4==0)
 				dat += "</tr><tr>"
 
 		dat += "</tr></table><br>Current Selection: [currTag ? TAGGERLOCATIONS[currTag] : "None"]</tt>"
@@ -279,7 +279,7 @@
 				O.sortTag = 1
 		for(var/obj/item/smallDelivery/O in src)
 			deliveryCheck = 1
-			if (O.sortTag == 0)
+			if(O.sortTag == 0)
 				O.sortTag = 1
 		if(deliveryCheck == 0)
 			H.destinationTag = 1
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index 146f803edfb..82bf6b43989 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -66,7 +66,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	efficiency_coeff = 2 ** (T - 1) //Only 1 manipulator here, you're making runtimes Razharas
 
 /obj/machinery/r_n_d/circuit_imprinter/blob_act()
-	if (prob(50))
+	if(prob(50))
 		qdel(src)
 
 
@@ -86,9 +86,9 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	return g_amount + gold_amount + diamond_amount
 
 /obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
-	if (default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter", O))
+	if(default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter", O))
 		if(linked_console)
 			linked_console.linked_imprinter = null
 			linked_console = null
@@ -97,7 +97,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	if(exchange_parts(user, O))
 		return
 
-	if (panel_open)
+	if(panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
 			for(var/obj/I in component_parts)
 				if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
@@ -121,23 +121,23 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 		else
 			to_chat(user, "<span class='warning'>You can't load the [src.name] while it's opened.</span>")
 			return
-	if (disabled)
+	if(disabled)
 		return
-	if (!linked_console)
+	if(!linked_console)
 		to_chat(user, "<span class='warning'>The [name] must be linked to an R&D console first!</span>")
 		return 1
-	if (O.is_open_container())
+	if(O.is_open_container())
 		return
-	if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond))
+	if(!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond))
 		to_chat(user, "<span class='warning'>You cannot insert this item into the [name]!</span>")
 		return
-	if (stat)
+	if(stat)
 		return
-	if (busy)
+	if(busy)
 		to_chat(user, "<span class='warning'>The [name] is busy. Please wait for completion of previous operation.</span>")
 		return
 	var/obj/item/stack/sheet/stack = O
-	if ((TotalMaterials() + stack.perunit) > max_material_amount)
+	if((TotalMaterials() + stack.perunit) > max_material_amount)
 		to_chat(user, "<span class='warning'>The [name] is full. Please remove glass from the protolathe in order to insert more.</span>")
 		return
 
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 385969c3f3f..1938b08dc20 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -432,6 +432,16 @@
 	build_path = /obj/item/weapon/circuitboard/candy_maker
 	category = list("Misc. Machinery")
 
+/datum/design/deepfryer
+	name = "Machine Board (Deep Fryer)"
+	desc = "The circuit board for a Deep Fryer."
+	id = "deepfryer"
+	req_tech = list("programming" = 2)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000, "sacid" = 20)
+	build_path = /obj/item/weapon/circuitboard/deepfryer
+	category = list("Misc. Machinery")
+
 /datum/design/orion_trail
 	name = "Machine Board (Orion Trail Arcade Machine)"
 	desc = "Allows for the construction of circuit boards used to build a new Orion Trail machine."
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index 5a3bba6ae86..e8bbbd62db7 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -47,9 +47,9 @@ Note: Must be placed within 3 tiles of the R&D Console
 
 
 /obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
-	if (default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O))
+	if(default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O))
 		if(linked_console)
 			linked_console.linked_destroy = null
 			linked_console = null
@@ -60,20 +60,20 @@ Note: Must be placed within 3 tiles of the R&D Console
 
 	default_deconstruction_crowbar(O)
 
-	if (disabled)
+	if(disabled)
 		return
-	if (!linked_console)
+	if(!linked_console)
 		to_chat(user, "<span class='warning'>The [src.name] must be linked to an R&D console first!</span>")
 		return
-	if (busy)
+	if(busy)
 		to_chat(user, "<span class='warning'>The [src.name] is busy right now.</span>")
 		return
-	if (istype(O, /obj/item) && !loaded_item)
+	if(istype(O, /obj/item) && !loaded_item)
 		if(!O.origin_tech)
 			to_chat(user, "<span class='warning'>This doesn't seem to have a tech origin!</span>")
 			return
 		var/list/temp_tech = ConvertReqString2List(O.origin_tech)
-		if (temp_tech.len == 0)
+		if(temp_tech.len == 0)
 			to_chat(user, "<span class='warning'>You cannot deconstruct this item!</span>")
 			return
 		if(!user.drop_item())
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index c9ed686645a..30c58cce776 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -113,10 +113,10 @@
 	return TRUE
 
 /obj/machinery/r_n_d/experimentor/attackby(obj/item/O, mob/user, params)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
 
-	if (default_deconstruction_screwdriver(user, "h_lathe_maint", "h_lathe", O))
+	if(default_deconstruction_screwdriver(user, "h_lathe_maint", "h_lathe", O))
 		if(linked_console)
 			linked_console.linked_destroy = null
 			linked_console = null
@@ -133,20 +133,20 @@
 		to_chat(user, "<span class='warning'>The [O] is not yet valid for the [src] and must be completed!</span>")
 		return
 
-	if (disabled)
+	if(disabled)
 		return
-	if (!linked_console)
+	if(!linked_console)
 		to_chat(user, "<span class='warning'>The [src] must be linked to an R&D console first!</span>")
 		return
-	if (loaded_item)
+	if(loaded_item)
 		to_chat(user, "<span class='warning'>The [src] is already loaded.</span>")
 		return
-	if (istype(O, /obj/item))
+	if(istype(O, /obj/item))
 		if(!O.origin_tech)
 			to_chat(user, "<span class='warning'>This doesn't seem to have a tech origin!</span>")
 			return
 		var/list/temp_tech = ConvertReqString2List(O.origin_tech)
-		if (temp_tech.len == 0)
+		if(temp_tech.len == 0)
 			to_chat(user, "<span class='warning'>You cannot experiment on this item!</span>")
 			return
 		if(O.reliability < 90 && O.crit_fail == 0)
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 555fa7b22c1..651f278cdd8 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -87,12 +87,12 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 /obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
 	rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
 	var/authmsg = "[message]<br>"
-	if (id_auth)
+	if(id_auth)
 		authmsg += "[id_auth]<br>"
-	if (stamp)
+	if(stamp)
 		authmsg += "[stamp]<br>"
-	for (var/obj/machinery/requests_console/Console in allConsoles)
-		if (ckey(Console.department) == ckey(recipient))
+	for(var/obj/machinery/requests_console/Console in allConsoles)
+		if(ckey(Console.department) == ckey(recipient))
 			if(Console.inoperable())
 				Console.message_log += "<B>Message lost due to console failure.</B><BR>Please contact [station_name()] system adminsitrator or AI for technical assistance.<BR>"
 				continue
@@ -123,7 +123,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 /obj/machinery/message_server/update_icon()
 	if((stat & (BROKEN|NOPOWER)))
 		icon_state = "server-nopower"
-	else if (!active)
+	else if(!active)
 		icon_state = "server-off"
 	else
 		icon_state = "server-on"
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index cff54b3bd32..81392aa99e5 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -87,9 +87,9 @@ Note: Must be placed west/left of and R&D console to function.
 	return A
 
 /obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
-	if (default_deconstruction_screwdriver(user, "protolathe_t", "protolathe", O))
+	if(default_deconstruction_screwdriver(user, "protolathe_t", "protolathe", O))
 		if(linked_console)
 			linked_console.linked_lathe = null
 			linked_console = null
@@ -98,7 +98,7 @@ Note: Must be placed west/left of and R&D console to function.
 	if(exchange_parts(user, O))
 		return
 
-	if (panel_open)
+	if(panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
 			for(var/obj/I in component_parts)
 				if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
@@ -114,17 +114,17 @@ Note: Must be placed west/left of and R&D console to function.
 		else
 			to_chat(user, "<span class='warning'>You can't load the [src.name] while it's opened.</span>")
 			return 1
-	if (disabled)
+	if(disabled)
 		return
-	if (!linked_console)
+	if(!linked_console)
 		to_chat(user, "<span class='warning'> The [src.name] must be linked to an R&D console first!</span>")
 		return 1
-	if (busy)
+	if(busy)
 		to_chat(user, "<span class='warning'>The [src.name] is busy. Please wait for completion of previous operation.</span>")
 		return 1
-	if (O.is_open_container())
+	if(O.is_open_container())
 		return
-	if (stat)
+	if(stat)
 		return 1
 	if(!istype(O,/obj/item/stack/sheet))
 		return 1
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 2fdb61a706f..7debbe2bd3d 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -46,11 +46,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	var/obj/machinery/r_n_d/circuit_imprinter/linked_imprinter = null	//Linked Circuit Imprinter
 
 	var/screen = 1.0	//Which screen is currently showing.
-	
+
 	var/menu = 0 // Current menu.
 	var/submenu = 0
 	var/wait_message = 0
-	
+
 	var/id = 0			//ID of the computer (for server restrictions).
 	var/sync = 1		//If sync = 0, it doesn't show up on Server Control Console
 
@@ -76,7 +76,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 proc/CallMaterialName(ID)
 	var/datum/reagent/temp_reagent
 	var/return_name = null
-	if (copytext(ID, 1, 2) == "$")
+	if(copytext(ID, 1, 2) == "$")
 		return_name = copytext(ID, 2)
 		switch(return_name)
 			if("metal")
@@ -168,7 +168,7 @@ proc/CallMaterialName(ID)
 			return
 
 		if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D
-		else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D
+		else if(istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D
 		else
 			to_chat(user, "<span class='danger'>Machine cannot accept disks in that format.</span>")
 			return
@@ -221,7 +221,7 @@ proc/CallMaterialName(ID)
 			if(href_list["category"] in D.category)
 				matching_designs.Add(D)
 		submenu = 1
-		
+
 		selected_category = "Viewing Category [href_list["category"]]"
 
 	else if(href_list["updt_tech"]) //Update the research holder with information from the technology disk.
@@ -432,13 +432,13 @@ proc/CallMaterialName(ID)
 				if(linked_lathe.busy)
 					g2g = 0
 				var/key = usr.key	//so we don't lose the info during the spawn delay
-				if (!(being_built.build_type & PROTOLATHE))
+				if(!(being_built.build_type & PROTOLATHE))
 					g2g = 0
 					message_admins("Protolathe exploit attempted by [key_name(usr, usr.client)]!")
 
 
 
-				if (g2g) //If input is incorrect, nothing happens
+				if(g2g) //If input is incorrect, nothing happens
 					var/enough_materials = 1
 					linked_lathe.busy = 1
 					flick("protolathe_n",linked_lathe)
@@ -466,9 +466,9 @@ proc/CallMaterialName(ID)
 
 					var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes.
 					var/O = being_built.locked
-					
+
 					coeff *= being_built.lathe_time_factor
-					
+
 					spawn(32*amount/coeff)
 						if(g2g) //And if we only fail the material requirements, we still spend time and power
 							for(var/i = 0, i<amount, i++)
@@ -509,13 +509,13 @@ proc/CallMaterialName(ID)
 					power += round(being_built.materials[M] / 5)
 				power = max(2000, power)
 				wait_message = "Imprinting Circuit. Please Wait..."
-				if (linked_imprinter.busy)
+				if(linked_imprinter.busy)
 					g2g = 0
-				if (!(being_built.build_type & IMPRINTER))
+				if(!(being_built.build_type & IMPRINTER))
 					g2g = 0
 					message_admins("Circuit imprinter exploit attempted by [key_name(usr, usr.client)]!")
 
-				if (g2g) //Again, if input is wrong, do nothing
+				if(g2g) //Again, if input is wrong, do nothing
 					linked_imprinter.busy = 1
 					flick("circuit_imprinter_ani",linked_imprinter)
 					use_power(power)
@@ -559,10 +559,10 @@ proc/CallMaterialName(ID)
 
 	else if(href_list["lathe_ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material
 		var/desired_num_sheets
-		if (href_list["lathe_ejectsheet_amt"] == "custom")
+		if(href_list["lathe_ejectsheet_amt"] == "custom")
 			desired_num_sheets = input("How many sheets would you like to eject from the machine?", "How much?", 1) as null|num
 			desired_num_sheets = max(0,desired_num_sheets) // If you input too high of a number, the mineral datum will take care of it either way
-			if (!desired_num_sheets)
+			if(!desired_num_sheets)
 				return
 			desired_num_sheets = round(desired_num_sheets) // No partial-sheet goofery
 		else
@@ -571,10 +571,10 @@ proc/CallMaterialName(ID)
 
 	else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the protolathe to eject a sheet of material
 		var/desired_num_sheets = text2num(href_list["imprinter_ejectsheet_amt"])
-		if (href_list["imprinter_ejectsheet_amt"] == "custom")
+		if(href_list["imprinter_ejectsheet_amt"] == "custom")
 			desired_num_sheets = input("How many sheets would you like to eject from the machine?", "How much?", 1) as null|num
 			desired_num_sheets = max(0,desired_num_sheets) // for the imprinter they have something hacky, that still will guard against shenanigans. eh
-			if (!desired_num_sheets)
+			if(!desired_num_sheets)
 				return
 			desired_num_sheets = round(desired_num_sheets) // No partial-sheet goofery
 		else
@@ -645,7 +645,7 @@ proc/CallMaterialName(ID)
 			if(findtext(D.name,href_list["to_search"]))
 				matching_designs.Add(D)
 		submenu = 1
-		
+
 		selected_category = "Search Results for '[href_list["to_search"]]'"
 
 	nanomanager.update_uis(src)
@@ -663,14 +663,14 @@ proc/CallMaterialName(ID)
 /obj/machinery/computer/rdconsole/ui_interact(mob/user, ui_key="main", var/datum/nanoui/ui = null, var/force_open = 1)
 	user.set_machine(src)
 	var/data = list()
-	
+
 	files.RefreshResearch()
-	
+
 	data["menu"] = menu
 	data["submenu"] = submenu
 	data["wait_message"] = wait_message
 	data["src_ref"] = "\ref[src]"
-	
+
 	data["linked_destroy"] = linked_destroy ? 1 : 0
 	data["linked_lathe"] = linked_lathe ? 1 : 0
 	data["linked_imprinter"] = linked_imprinter ? 1 : 0
@@ -678,8 +678,8 @@ proc/CallMaterialName(ID)
 	data["admin"] = check_rights(R_ADMIN,0)
 	data["disk_type"] = d_disk ? 2 : (t_disk ? 1 : 0)
 	data["category"] = selected_category
-	
-	if(menu == 1)
+
+	if(menu == 0 || menu == 1)
 		var/list/tech_levels = list()
 		data["tech_levels"] = tech_levels
 		for(var/datum/tech/T in files.known_tech)
@@ -690,16 +690,16 @@ proc/CallMaterialName(ID)
 			this_tech_list["level"] = T.level
 			this_tech_list["desc"] = T.desc
 			tech_levels[++tech_levels.len] = this_tech_list
-	
+
 	if(menu == 2)
-		
+
 		if(t_disk != null && t_disk.stored != null && submenu == 0) //Technology Disk Menu
 			var/list/disk_data = list()
 			data["disk_data"] = disk_data
 			disk_data["name"] = t_disk.stored.name
 			disk_data["level"] = t_disk.stored.level
 			disk_data["desc"] = t_disk.stored.desc
-	
+
 		if(t_disk != null && submenu == 1)
 			var/list/to_copy = list()
 			data["to_copy"] = to_copy
@@ -710,7 +710,7 @@ proc/CallMaterialName(ID)
 					continue
 				item["name"] = T.name
 				item["id"] = T.id
-	
+
 		if(d_disk != null && d_disk.blueprint != null && submenu == 0)
 			var/list/disk_data = list()
 			data["disk_data"] = disk_data
@@ -732,7 +732,7 @@ proc/CallMaterialName(ID)
 				materials[++materials.len] = material
 				material["name"] = CallMaterialName(M)
 				material["amount"] = d_disk.blueprint.materials[M]
-	
+
 		if(d_disk != null && submenu == 1)
 			var/list/to_copy = list()
 			data["to_copy"] = to_copy
@@ -759,7 +759,7 @@ proc/CallMaterialName(ID)
 				if(F.name == CallTechName(T))
 					tech_item["current_level"] = F.level
 					break
-	
+
 	if(menu == 4 && linked_lathe)
 		data["total_materials"] = linked_lathe.materials.total_amount
 		data["max_materials"] = linked_lathe.materials.max_amount
@@ -783,7 +783,7 @@ proc/CallMaterialName(ID)
 					material_list["name"] = CallMaterialName(M)
 					material_list["amount"] = D.materials[M]
 					var/t = linked_lathe.check_mat(D, M)
-					
+
 					if(t < 1)
 						material_list["is_red"] = 1
 					else
@@ -796,7 +796,7 @@ proc/CallMaterialName(ID)
 					material_list["name"] = CallMaterialName(R)
 					material_list["amount"] = D.reagents[R]
 					var/t = linked_lathe.check_mat(D, R)
-					
+
 					if(t < 1)
 						material_list["is_red"] = 1
 					else
@@ -824,7 +824,7 @@ proc/CallMaterialName(ID)
 				loaded_chemical["name"] = R.name
 				loaded_chemical["volume"] = R.volume
 				loaded_chemical["id"] = R.id
-	
+
 	if(menu == 5 && linked_imprinter)
 		data["total_materials"] = linked_imprinter.TotalMaterials()
 		data["total_chemicals"] = linked_imprinter.reagents.total_volume
@@ -846,7 +846,7 @@ proc/CallMaterialName(ID)
 					materials_list[++materials_list.len] = material_list
 					material_list["name"] = CallMaterialName(M)
 					material_list["amount"] = D.materials[M] / coeff
-					if (!linked_imprinter.check_mat(D, M))
+					if(!linked_imprinter.check_mat(D, M))
 						check_materials = 0
 						material_list["is_red"] = 1
 					else
@@ -867,9 +867,9 @@ proc/CallMaterialName(ID)
 				loaded_chemical["name"] = R.name
 				loaded_chemical["volume"] = R.volume
 				loaded_chemical["id"] = R.id
-	
+
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "r_n_d.tmpl", src.name, 800, 550)
 		ui.set_initial_data(data)
 		ui.open()
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 79eca347423..319af3350f4 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -36,7 +36,7 @@
 	w -= src.disable_wire
 
 /obj/machinery/r_n_d/attack_hand(mob/user as mob)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
 	if(panel_open)
 		var/dat as text
@@ -58,7 +58,7 @@
 	src.add_fingerprint(usr)
 	if(href_list["pulse"])
 		var/temp_wire = href_list["wire"]
-		if (!istype(usr.get_active_hand(), /obj/item/device/multitool))
+		if(!istype(usr.get_active_hand(), /obj/item/device/multitool))
 			to_chat(usr, "You need a multitool!")
 		else
 			if(src.wires[temp_wire])
@@ -76,7 +76,7 @@
 					src.shock(usr,50)
 					spawn(100) src.shocked = !src.shocked
 	if(href_list["cut"])
-		if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters))
+		if(!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters))
 			to_chat(usr, "You need wirecutters!")
 		else
 			var/temp_wire = href_list["wire"]
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index e4b91505669..927dbaa936b 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -298,7 +298,7 @@ datum/tech/robotics
 	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk2"
 	item_state = "card-id"
-	w_class = 1.0
+	w_class = 1
 	materials = list(MAT_METAL=30, MAT_GLASS=10)
 	var/datum/tech/stored
 
@@ -312,7 +312,7 @@ datum/tech/robotics
 	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk2"
 	item_state = "card-id"
-	w_class = 1.0
+	w_class = 1
 	materials = list(MAT_METAL=30, MAT_GLASS=10)
 	var/datum/design/blueprint
 
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index fe135490e3d..79536efbe60 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -132,10 +132,10 @@
 				air_update_turf()
 
 /obj/machinery/r_n_d/server/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (disabled)
+	if(disabled)
 		return
 
-	if (shocked)
+	if(shocked)
 		shock(user,50)
 
 	if(istype(O, /obj/item/weapon/screwdriver))
@@ -145,17 +145,17 @@
 	if(exchange_parts(user, O))
 		return 1
 
-	if (panel_open)
+	if(panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
 			griefProtection()
 			default_deconstruction_crowbar(O)
 			return 1
 
 /obj/machinery/r_n_d/server/attack_hand(mob/user as mob)
-	if (disabled)
+	if(disabled)
 		return
 
-	if (shocked)
+	if(shocked)
 		shock(user,50)
 	return
 
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm
index a29f8ce293a..82caa2b9be5 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm
@@ -63,7 +63,7 @@
 			M.selected.action(src)
 
 /obj/structure/boulder/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/device/core_sampler))
+	if(istype(W, /obj/item/device/core_sampler))
 		if(geological_data)
 			src.geological_data.artifact_distance = rand(-100,100) / 100
 			src.geological_data.artifact_id = artifact_find.artifact_id
@@ -72,19 +72,19 @@
 		C.sample_item(src, user)
 		return
 
-	if (istype(W, /obj/item/device/depth_scanner))
+	if(istype(W, /obj/item/device/depth_scanner))
 		var/obj/item/device/depth_scanner/C = W
 		C.scan_atom(user, src)
 		return
 
-	if (istype(W, /obj/item/device/measuring_tape))
+	if(istype(W, /obj/item/device/measuring_tape))
 		var/obj/item/device/measuring_tape/P = W
 		user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].")
 		if(do_after(user,40, target = src))
 			to_chat(user, "\blue [bicon(P)] [src] has been excavated to a depth of [2*src.excavation_level]cm.")
 		return
 
-	if (istype(W, /obj/item/weapon/pickaxe))
+	if(istype(W, /obj/item/weapon/pickaxe))
 		var/obj/item/weapon/pickaxe/P = W
 
 		to_chat(user, "\red You start [P.drill_verb] [src].")
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
index d9041733d57..7a4b36707f9 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
@@ -220,7 +220,7 @@ var/list/valid_secondary_effect_types = list(\
 			secondary_effect.ToggleActivate(0)
 
 /obj/machinery/artifact/attack_hand(var/mob/user as mob)
-	if (get_dist(user, src) > 1)
+	if(get_dist(user, src) > 1)
 		to_chat(user, "\red You can't reach [src] from here.")
 		return
 	if(ishuman(user) && user:gloves)
@@ -238,7 +238,7 @@ var/list/valid_secondary_effect_types = list(\
 	if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH)
 		secondary_effect.ToggleActivate(0)
 
-	if (my_effect.effect == EFFECT_TOUCH)
+	if(my_effect.effect == EFFECT_TOUCH)
 		my_effect.DoEffectTouch(user)
 
 	if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated)
@@ -246,7 +246,7 @@ var/list/valid_secondary_effect_types = list(\
 
 /obj/machinery/artifact/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
 
-	if (istype(W, /obj/item/weapon/reagent_containers/))
+	if(istype(W, /obj/item/weapon/reagent_containers/))
 		if(W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1))
 			if(my_effect.trigger == TRIGGER_WATER)
 				my_effect.ToggleActivate()
@@ -272,12 +272,12 @@ var/list/valid_secondary_effect_types = list(\
 			istype(W,/obj/item/weapon/melee/cultblade) ||\
 			istype(W,/obj/item/weapon/card/emag) ||\
 			istype(W,/obj/item/device/multitool))
-		if (my_effect.trigger == TRIGGER_ENERGY)
+		if(my_effect.trigger == TRIGGER_ENERGY)
 			my_effect.ToggleActivate()
 		if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25))
 			secondary_effect.ToggleActivate(0)
 
-	else if (istype(W,/obj/item/weapon/match) && W:lit ||\
+	else if(istype(W,/obj/item/weapon/match) && W:lit ||\
 			istype(W,/obj/item/weapon/weldingtool) && W:welding ||\
 			istype(W,/obj/item/weapon/lighter) && W:lit)
 		if(my_effect.trigger == TRIGGER_HEAT)
@@ -286,7 +286,7 @@ var/list/valid_secondary_effect_types = list(\
 			secondary_effect.ToggleActivate(0)
 	else
 		..()
-		if (my_effect.trigger == TRIGGER_FORCE && W.force >= 10)
+		if(my_effect.trigger == TRIGGER_FORCE && W.force >= 10)
 			my_effect.ToggleActivate()
 		if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
 			secondary_effect.ToggleActivate(0)
@@ -302,14 +302,14 @@ var/list/valid_secondary_effect_types = list(\
 	else if(ishuman(M) && !istype(M:gloves,/obj/item/clothing/gloves))
 		var/warn = 0
 
-		if (my_effect.trigger == TRIGGER_TOUCH && prob(50))
+		if(my_effect.trigger == TRIGGER_TOUCH && prob(50))
 			my_effect.ToggleActivate()
 			warn = 1
 		if(secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH && prob(25))
 			secondary_effect.ToggleActivate(0)
 			warn = 1
 
-		if (my_effect.effect == EFFECT_TOUCH && prob(50))
+		if(my_effect.effect == EFFECT_TOUCH && prob(50))
 			my_effect.DoEffectTouch(M)
 			warn = 1
 		if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated && prob(50))
@@ -340,7 +340,7 @@ var/list/valid_secondary_effect_types = list(\
 	switch(severity)
 		if(1.0) qdel(src)
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 			else
 				if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
@@ -348,7 +348,7 @@ var/list/valid_secondary_effect_types = list(\
 				if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
 					secondary_effect.ToggleActivate(0)
 		if(3.0)
-			if (my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
+			if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
 				my_effect.ToggleActivate()
 			if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
 				secondary_effect.ToggleActivate(0)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
index 93a025336a0..373b5d9454f 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
@@ -28,7 +28,7 @@
 
 /datum/artifact_effect/badfeeling/DoEffectTouch(var/mob/user)
 	if(user)
-		if (istype(user, /mob/living/carbon/human))
+		if(istype(user, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = user
 			if(prob(50))
 				if(prob(75))
@@ -42,7 +42,7 @@
 /datum/artifact_effect/badfeeling/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			if(prob(5))
 				if(prob(75))
 					to_chat(H, "<font color='red'>[pick(messages)]</font>")
@@ -56,7 +56,7 @@
 /datum/artifact_effect/badfeeling/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			if(prob(50))
 				if(prob(95))
 					to_chat(H, "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
index ab66d1d0c6c..d67c33d1e4e 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
@@ -8,7 +8,7 @@
 	if(user)
 		if(istype(user, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/R = user
-			for (var/obj/item/weapon/stock_parts/cell/D in R.contents)
+			for(var/obj/item/weapon/stock_parts/cell/D in R.contents)
 				D.charge += rand() * 100 + 50
 				to_chat(R, "\blue SYSTEM ALERT: Large energy boost detected!")
 			return 1
@@ -16,13 +16,13 @@
 /datum/artifact_effect/cellcharge/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/obj/machinery/power/apc/C in range(200, T))
-			for (var/obj/item/weapon/stock_parts/cell/B in C.contents)
+		for(var/obj/machinery/power/apc/C in range(200, T))
+			for(var/obj/item/weapon/stock_parts/cell/B in C.contents)
 				B.charge += 25
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for(var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge += 25
-		for (var/mob/living/silicon/robot/M in mob_list)
-			for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
+		for(var/mob/living/silicon/robot/M in mob_list)
+			for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
 				D.charge += 25
 				to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
 		return 1
@@ -30,13 +30,13 @@
 /datum/artifact_effect/cellcharge/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/obj/machinery/power/apc/C in range(200, T))
-			for (var/obj/item/weapon/stock_parts/cell/B in C.contents)
+		for(var/obj/machinery/power/apc/C in range(200, T))
+			for(var/obj/item/weapon/stock_parts/cell/B in C.contents)
 				B.charge += rand() * 100
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for(var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge += 250
-		for (var/mob/living/silicon/robot/M in mob_list)
-			for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
+		for(var/mob/living/silicon/robot/M in mob_list)
+			for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
 				D.charge += rand() * 100
 				to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
 		return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
index 97c113b2fef..fcba3be4dec 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
@@ -8,7 +8,7 @@
 	if(user)
 		if(istype(user, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/R = user
-			for (var/obj/item/weapon/stock_parts/cell/D in R.contents)
+			for(var/obj/item/weapon/stock_parts/cell/D in R.contents)
 				D.charge = max(D.charge - rand() * 100, 0)
 				to_chat(R, "\blue SYSTEM ALERT: Energy drain detected!")
 			return 1
@@ -18,13 +18,13 @@
 /datum/artifact_effect/celldrain/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/obj/machinery/power/apc/C in range(200, T))
-			for (var/obj/item/weapon/stock_parts/cell/B in C.contents)
+		for(var/obj/machinery/power/apc/C in range(200, T))
+			for(var/obj/item/weapon/stock_parts/cell/B in C.contents)
 				B.charge = max(B.charge - 50,0)
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for(var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge = max(S.charge - 100,0)
-		for (var/mob/living/silicon/robot/M in mob_list)
-			for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
+		for(var/mob/living/silicon/robot/M in mob_list)
+			for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
 				D.charge = max(D.charge - 50,0)
 				to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
 	return 1
@@ -32,13 +32,13 @@
 /datum/artifact_effect/celldrain/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/obj/machinery/power/apc/C in range(200, T))
-			for (var/obj/item/weapon/stock_parts/cell/B in C.contents)
+		for(var/obj/machinery/power/apc/C in range(200, T))
+			for(var/obj/item/weapon/stock_parts/cell/B in C.contents)
 				B.charge = max(B.charge - rand() * 150,0)
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for(var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge = max(S.charge - 250,0)
-		for (var/mob/living/silicon/robot/M in mob_list)
-			for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
+		for(var/mob/living/silicon/robot/M in mob_list)
+			for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
 				D.charge = max(D.charge - rand() * 150,0)
 				to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
 	return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
index f52e8125e3f..08639dec98f 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
@@ -26,7 +26,7 @@
 
 /datum/artifact_effect/goodfeeling/DoEffectTouch(var/mob/user)
 	if(user)
-		if (istype(user, /mob/living/carbon/human))
+		if(istype(user, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = user
 			if(prob(50))
 				if(prob(75))
@@ -40,7 +40,7 @@
 /datum/artifact_effect/goodfeeling/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			if(prob(5))
 				if(prob(75))
 					to_chat(H, "<font color='blue'>[pick(messages)]</font>")
@@ -54,7 +54,7 @@
 /datum/artifact_effect/goodfeeling/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			if(prob(50))
 				if(prob(95))
 					to_chat(H, "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
index c46549d0d50..cde5632eaa5 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
@@ -38,7 +38,7 @@
 	//todo: check over this properly
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
 				if(prob(10))
@@ -54,7 +54,7 @@
 	//todo: check over this properly
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
 				to_chat(C, "\blue A wave of energy invigorates you.")
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
index fd221b470fb..399b7252d20 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
@@ -22,7 +22,7 @@
 /datum/artifact_effect/hurt/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
 				if(prob(10))
@@ -37,7 +37,7 @@
 /datum/artifact_effect/hurt/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(effectrange, T))
+		for(var/mob/living/carbon/C in range(effectrange, T))
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
 				to_chat(C, "\red A wave of painful energy strikes you!")
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_radiate.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_radiate.dm
index 4310ffb2e71..f27a4f4219b 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_radiate.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_radiate.dm
@@ -17,7 +17,7 @@
 /datum/artifact_effect/radiate/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/M in range(src.effectrange,T))
+		for(var/mob/living/M in range(src.effectrange,T))
 			M.apply_effect(radiation_amount,IRRADIATE,0)
 			M.updatehealth()
 		return 1
@@ -25,7 +25,7 @@
 /datum/artifact_effect/radiate/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/M in range(src.effectrange,T))
+		for(var/mob/living/M in range(src.effectrange,T))
 			M.apply_effect(radiation_amount * 25,IRRADIATE,0)
 			M.updatehealth()
 		return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
index 6f698bb8ee3..30316fc3342 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
@@ -8,7 +8,7 @@
 
 /datum/artifact_effect/roboheal/DoEffectTouch(var/mob/user)
 	if(user)
-		if (istype(user, /mob/living/silicon/robot))
+		if(istype(user, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/R = user
 			to_chat(R, "\blue Your systems report damaged components mending by themselves!")
 			R.adjustBruteLoss(rand(-10,-30))
@@ -18,7 +18,7 @@
 /datum/artifact_effect/roboheal/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
+		for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
 			if(prob(10))
 				to_chat(M, "\blue SYSTEM ALERT: Beneficial energy field detected!")
 			M.adjustBruteLoss(-1)
@@ -29,7 +29,7 @@
 /datum/artifact_effect/roboheal/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
+		for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
 			to_chat(M, "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!")
 			M.adjustBruteLoss(-10)
 			M.adjustFireLoss(-10)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
index c7f4d7f9775..da22a45b32b 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
@@ -8,7 +8,7 @@
 
 /datum/artifact_effect/robohurt/DoEffectTouch(var/mob/user)
 	if(user)
-		if (istype(user, /mob/living/silicon/robot))
+		if(istype(user, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/R = user
 			to_chat(R, "\red Your systems report severe damage has been inflicted!")
 			R.adjustBruteLoss(rand(10,50))
@@ -18,7 +18,7 @@
 /datum/artifact_effect/robohurt/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
+		for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
 			if(prob(10))
 				to_chat(M, "\red SYSTEM ALERT: Harmful energy field detected!")
 			M.adjustBruteLoss(1)
@@ -29,7 +29,7 @@
 /datum/artifact_effect/robohurt/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
+		for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
 			to_chat(M, "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!")
 			M.adjustBruteLoss(10)
 			M.adjustFireLoss(10)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
index 7ff0af5bab1..bbb16d76a3d 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
@@ -23,14 +23,14 @@
 /datum/artifact_effect/sleepy/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			var/weakness = GetAnomalySusceptibility(H)
 			if(prob(weakness * 100))
 				if(prob(10))
 					to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
 				H.drowsyness = min(H.drowsyness + 1 * weakness, 25 * weakness)
 				H.eye_blurry = min(H.eye_blurry + 1 * weakness, 25 * weakness)
-		for (var/mob/living/silicon/robot/R in range(src.effectrange,holder))
+		for(var/mob/living/silicon/robot/R in range(src.effectrange,holder))
 			to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
 		return 1
 
@@ -43,6 +43,6 @@
 				to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
 				H.drowsyness = min(H.drowsyness + rand(5,15) * weakness, 50 * weakness)
 				H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness)
-		for (var/mob/living/silicon/robot/R in range(src.effectrange,holder))
+		for(var/mob/living/silicon/robot/R in range(src.effectrange,holder))
 			to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
 		return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
index 5c924d2bb6e..327e732fa12 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
@@ -19,7 +19,7 @@
 /datum/artifact_effect/stun/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/susceptibility = GetAnomalySusceptibility(C)
 			if(prob(10 * susceptibility))
 				to_chat(C, "\red Your body goes numb for a moment.")
@@ -33,7 +33,7 @@
 /datum/artifact_effect/stun/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/susceptibility = GetAnomalySusceptibility(C)
 			if(prob(100 * susceptibility))
 				to_chat(C, "\red A wave of energy overwhelms your senses!")
diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm
index f417fc49792..984ad2a0690 100644
--- a/code/modules/research/xenoarchaeology/chemistry.dm
+++ b/code/modules/research/xenoarchaeology/chemistry.dm
@@ -82,7 +82,7 @@ datum
 	icon = 'icons/obj/device.dmi'
 	icon_state = "solution_tray"
 	materials = list(MAT_GLASS=5)
-	w_class = 1.0
+	w_class = 1
 	amount_per_transfer_from_this = 1
 	possible_transfer_amounts = list(1, 2)
 	volume = 2
diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm
index e94049a74f1..0c4f8e8369d 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm
@@ -25,11 +25,11 @@
 	return
 
 /obj/item/weapon/shard/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if ( istype(W, /obj/item/weapon/weldingtool))
+	if( istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.remove_fuel(0, user))
 			var/obj/item/stack/sheet/plasmaglass/NG = new (user.loc)
-			for (var/obj/item/stack/sheet/plasmaglass/G in user.loc)
+			for(var/obj/item/stack/sheet/plasmaglass/G in user.loc)
 				if(G==NG)
 					continue
 				if(G.amount>=G.max_amount)
diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
index 637b1596294..69b9d449f2c 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
@@ -113,9 +113,9 @@
 
 	var/list/listening = viewers(holder_atom)
 	for(var/mob/M in mob_list)
-		if (!M.client)
+		if(!M.client)
 			continue //skip monkeys and leavers
-		if (istype(M, /mob/new_player))
+		if(istype(M, /mob/new_player))
 			continue
 		if(M.stat == 2 &&  M.client.prefs.toggles & CHAT_GHOSTEARS)
 			listening|=M
diff --git a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
index cb2130c76fc..d43d7996e1a 100644
--- a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
+++ b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
@@ -61,7 +61,7 @@ datum/genesequence
 				src.visible_message("\blue [bicon(src)] [user] inserts [W] into [src], the fossil is consumed as [src] extracts genetic data from it.")
 				qdel(W)
 				updateDialog()
-	else if (istype(W, /obj/item/weapon/storage))
+	else if(istype(W, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
 		S.hide_from(usr)
 		var/numaccepted = 0
diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
index 017dcb7157d..9819275c0d1 100644
--- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
+++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
@@ -116,7 +116,7 @@
 
 /obj/machinery/artifact_harvester/Topic(href, href_list)
 
-	if (href_list["harvest"])
+	if(href_list["harvest"])
 		if(!inserted_battery)
 			src.visible_message("<b>[src]</b> states, \"Cannot harvest. No battery inserted.\"")
 
@@ -213,7 +213,7 @@
 								inserted_battery.battery_effect = E
 								inserted_battery.stored_charge = 0
 
-	if (href_list["stopharvest"])
+	if(href_list["stopharvest"])
 		if(harvesting)
 			if(harvesting < 0 && inserted_battery.battery_effect && inserted_battery.battery_effect.activated)
 				inserted_battery.battery_effect.ToggleActivate()
@@ -224,11 +224,11 @@
 			src.visible_message("<b>[name]</b> states, \"Energy harvesting interrupted.\"")
 			icon_state = "incubator"
 
-	if (href_list["ejectbattery"])
+	if(href_list["ejectbattery"])
 		src.inserted_battery.loc = src.loc
 		src.inserted_battery = null
 
-	if (href_list["drainbattery"])
+	if(href_list["drainbattery"])
 		if(inserted_battery)
 			if(inserted_battery.battery_effect && inserted_battery.stored_charge > 0)
 				if(alert("This action will dump all charge, safety gear is recommended before proceeding","Warning","Continue","Cancel"))
diff --git a/code/modules/research/xenoarchaeology/machinery/coolant.dm b/code/modules/research/xenoarchaeology/machinery/coolant.dm
index b2dd9ce2a9e..5b7800ad36f 100644
--- a/code/modules/research/xenoarchaeology/machinery/coolant.dm
+++ b/code/modules/research/xenoarchaeology/machinery/coolant.dm
@@ -47,9 +47,9 @@ datum/chemical_reaction/coolant
 
 	var/datum/gas_mixture/env = src.loc.return_air()
 	if(env)
-		if (reagents.total_volume > 750)
+		if(reagents.total_volume > 750)
 			env.temperature = 0
-		else if (reagents.total_volume > 500)
+		else if(reagents.total_volume > 500)
 			env.temperature -= 100
 		else
 			env.temperature -= 50
diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
index 75cc24e362a..8bb917d3df4 100644
--- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
+++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
@@ -97,8 +97,8 @@
 	fresh_coolant = 0
 	coolant_purity = 0
 	var/num_reagent_types = 0
-	for (var/datum/reagent/current_reagent in src.reagents.reagent_list)
-		if (!current_reagent)
+	for(var/datum/reagent/current_reagent in src.reagents.reagent_list)
+		if(!current_reagent)
 			continue
 		var/cur_purity = coolant_reagents_purity[current_reagent.id]
 		if(!cur_purity)
@@ -144,7 +144,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "geoscanner.tmpl", "High Res Radiocarbon Spectrometer", 900, 825)
diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
index a330e79c8bd..11999b51d92 100644
--- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
@@ -195,7 +195,7 @@
 	return ..()
 
 /obj/item/weapon/anodevice/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
-	if (!istype(M))
+	if(!istype(M))
 		return
 
 	if(activated && inserted_battery.battery_effect.effect == EFFECT_TOUCH && !isnull(inserted_battery))
diff --git a/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm b/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm
index 0d4e64d67ee..9e9de74e73e 100644
--- a/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm
+++ b/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm
@@ -5,21 +5,23 @@
 	desc = "A sealed bio suit capable of insulating against exotic alien energies"
 	icon_state = "engspace_suit"
 	item_state = "engspace_suit"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
+	species_fit = null
+	sprite_sheets = null
 
 /obj/item/clothing/head/bio_hood/anomaly
 	name = "Anomaly hood"
 	desc = "A sealed bio hood capable of insulating against exotic alien energies."
 	icon_state = "engspace_helmet"
 	item_state = "engspace_helmet"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
 
 /obj/item/clothing/suit/space/eva/anomaly
 	name = "Excavation suit"
 	desc = "A pressure resistant excavation suit partially capable of insulating against exotic alien energies."
 	icon_state = "cespace_suit"
 	item_state = "cespace_suit"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank)
 
 /obj/item/clothing/head/helmet/space/eva/anomaly
@@ -27,4 +29,4 @@
 	desc = "A pressure resistant excavation hood partially capable of insulating against exotic alien energies."
 	icon_state = "cespace_helmet"
 	item_state = "cespace_helmet"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
index ec0a7462963..127502b85c2 100644
--- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
@@ -22,7 +22,7 @@
 /obj/machinery/suspension_gen/process()
 	//set background = 1
 
-	if (suspension_field)
+	if(suspension_field)
 		cell.charge -= power_use
 
 		var/turf/T = get_turf(suspension_field)
@@ -126,11 +126,11 @@
 	if(href_list["select_field"])
 		field_type = href_list["select_field"]
 	else if(href_list["insertcard"])
-		if (istype(usr, /mob/living/silicon))
+		if(istype(usr, /mob/living/silicon))
 			locked = 0
 		else
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/weapon/card))
+			if(istype(I, /obj/item/weapon/card))
 				usr.drop_item()
 				I.loc = src
 				auth_card = I
@@ -169,14 +169,14 @@
 		to_chat(user, "<span class='info'>You remove the power cell</span>")
 
 /obj/machinery/suspension_gen/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/screwdriver))
+	if(istype(W, /obj/item/weapon/screwdriver))
 		if(!open)
 			if(screwed)
 				screwed = 0
 			else
 				screwed = 1
 			to_chat(user, "<span class='info'>You [screwed ? "screw" : "unscrew"] the battery panel.</span>")
-	else if (istype(W, /obj/item/weapon/crowbar))
+	else if(istype(W, /obj/item/weapon/crowbar))
 		if(!locked)
 			if(!screwed)
 				if(!suspension_field)
@@ -192,7 +192,7 @@
 				to_chat(user, "<span class='warning'>Unscrew [src]'s battery panel first.</span>")
 		else
 			to_chat(user, "<span class='warning'>[src]'s security locks are engaged.</span>")
-	else if (istype(W, /obj/item/weapon/wrench))
+	else if(istype(W, /obj/item/weapon/wrench))
 		if(!suspension_field)
 			if(anchored)
 				anchored = 0
@@ -205,7 +205,7 @@
 				desc = "It has stubby legs bolted up against it's body for stabilising."
 		else
 			to_chat(user, "<span class='warning'>You are unable to secure [src] while it is active!</span>")
-	else if (istype(W, /obj/item/weapon/stock_parts/cell))
+	else if(istype(W, /obj/item/weapon/stock_parts/cell))
 		if(open)
 			if(cell)
 				to_chat(user, "<span class='warning'>There is a power cell already installed.</span>")
diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
index 3ae1c15f660..d020845784c 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "flashgun"
 	item_state = "lampgreen"
-	w_class = 1.0
+	w_class = 1
 	slot_flags = SLOT_BELT
 	var/nearest_artifact_id = "unknown"
 	var/nearest_artifact_distance = -1
diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
index c1d8bda97ee..e8daea89b74 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
@@ -19,7 +19,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "sampler0"
 	item_state = "screwdriver_brown"
-	w_class = 1.0
+	w_class = 1
 	//slot_flags = SLOT_BELT
 	var/sampled_turf = ""
 	var/num_stored_bags = 10
diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
index 03165b75655..69812bdaa3f 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
@@ -9,7 +9,7 @@
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "crap"
 	item_state = "analyzer"
-	w_class = 1.0
+	w_class = 1
 	slot_flags = SLOT_BELT
 	var/list/positive_locations = list()
 	var/datum/depth_scan/current
diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm
index a4435dded28..1ceb45d00e6 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm
@@ -86,7 +86,7 @@
 		target_radio = null
 	else if(href_list["freq"])
 		var/new_frequency = (frequency + text2num(href_list["freq"]))
-		if (frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
+		if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
 			new_frequency = sanitize_frequency(new_frequency, 1499)
 		frequency = new_frequency
 
diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
index 48a5e0514d4..1dd6b769390 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
@@ -111,7 +111,7 @@
 	attack_self(var/mob/user as mob)
 		var/N = input("Excavation amount (in centimeters):", "[src]") as null|anything in possible_excavation_amounts
 
-		if (N)
+		if(N)
 			excavation_amount = N / 2
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index de551e94b75..e3a59183abf 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -125,7 +125,7 @@
 	origin_tech = "biotech=4"
 
 /obj/item/slimepotion/afterattack(obj/item/weapon/reagent_containers/target, mob/user , proximity)
-	if (istype(target))
+	if(istype(target))
 		to_chat(user, "<span class='notice'>You cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb.</span>") // le fluff faec
 		return
 
@@ -154,7 +154,7 @@
 		qdel(M)
 		var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
 
-		if (!newname)
+		if(!newname)
 			newname = "pet slime"
 		pet.name = newname
 		pet.real_name = newname
@@ -168,7 +168,7 @@
 		qdel(M)
 		var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
 
-		if (!newname)
+		if(!newname)
 			newname = "pet slime"
 		pet.name = newname
 		pet.real_name = newname
diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm
index d27820ac033..188bf7597c2 100644
--- a/code/modules/security_levels/keycard authentication.dm	
+++ b/code/modules/security_levels/keycard authentication.dm	
@@ -73,7 +73,7 @@
 	data["ertreason"] = ert_reason
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "keycard_auth.tmpl", "Keycard Authentication Device UI", 520, 320)
 		ui.set_initial_data(data)
 		ui.open()
@@ -155,12 +155,21 @@
 			if(is_ert_blocked())
 				to_chat(usr, "\red All Emergency Response Teams are dispatched and can not be called at this time.")
 				return
-
 			to_chat(usr, "<span class = 'notice'>ERT request transmitted.</span>")
-			if(admins.len)
-				ERT_Announce(ert_reason , event_triggered_by)
+
+
+			var/fullmin_count = 0
+			for(var/client/C in admins)
+				if(check_rights(R_EVENT, 0, C.mob))
+					fullmin_count++
+			if(fullmin_count)
+				ert_request_answered = 0
+				ERT_Announce(ert_reason , event_triggered_by, 0)
 				ert_reason = "Reason for ERT"
 				feedback_inc("alert_keycard_auth_ert",1)
+				spawn(3000)
+					if(!ert_request_answered)
+						ERT_Announce(ert_reason , event_triggered_by, 1)
 			else
 				trigger_armed_response_team(new /datum/response_team/amber) // No admins? No problem. Automatically send a code amber ERT.
 
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 7b42bc2f217..8516d3e1dec 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -17,11 +17,11 @@
 		return
 	if(shuttle_master.emergency.timeLeft() < 11)
 		return
-	if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if (istype(W, /obj/item/device/pda))
+	if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
+		if(istype(W, /obj/item/device/pda))
 			var/obj/item/device/pda/pda = W
 			W = pda.id
-		if (!W:access) //no access
+		if(!W:access) //no access
 			to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
 			return
 
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index db38c6be68b..1adebd04d58 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -307,10 +307,10 @@
 	dir = angle2dir(rotation+dir2angle(dir))
 
 	//rotate the pixel offsets too.
-	if (pixel_x || pixel_y)
-		if (rotation < 0)
+	if(pixel_x || pixel_y)
+		if(rotation < 0)
 			rotation += 360
-		for (var/turntimes=rotation/90;turntimes>0;turntimes--)
+		for(var/turntimes=rotation/90;turntimes>0;turntimes--)
 			var/oldPX = pixel_x
 			var/oldPY = pixel_y
 			pixel_x = oldPY
@@ -352,7 +352,7 @@
 	var/list/L1 = return_ordered_turfs(S1.x, S1.y, S1.z, S1.dir)
 
 	var/rotation = dir2angle(S1.dir)-dir2angle(dir)
-	if ((rotation % 90) != 0)
+	if((rotation % 90) != 0)
 		rotation += (rotation % 90) //diagonal rotations not allowed, round up
 	rotation = SimplifyDegrees(rotation)
 
@@ -392,10 +392,10 @@
 
 
 		for(var/atom/movable/AM in T0)
-			if (rotation)
+			if(rotation)
 				AM.shuttleRotate(rotation)
 
-			if (istype(AM,/obj))
+			if(istype(AM,/obj))
 				var/obj/O = AM
 				if(istype(O, /obj/docking_port/stationary))
 					continue
@@ -414,7 +414,7 @@
 									door_unlock_list += A
 							else
 								Door.close()
-			else if (istype(AM,/mob))
+			else if(istype(AM,/mob))
 				var/mob/M = AM
 				if(!M.move_on_shuttle)
 					continue
@@ -432,7 +432,7 @@
 						M.Weaken(3)
 
 
-		if (rotation)
+		if(rotation)
 			T1.shuttleRotate(rotation)
 
 		//lighting stuff
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 3245f6872dc..663f2677725 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -484,7 +484,7 @@
 	if(..())
 		return 1
 
-	if (href_list["doorder"])
+	if(href_list["doorder"])
 		if(world.time < reqtime)
 			visible_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
 			nanomanager.update_uis(src)
@@ -528,7 +528,7 @@
 			if(i == 1)
 				O.generateRequisition(loc)
 
-	else if (href_list["rreq"])
+	else if(href_list["rreq"])
 		var/ordernum = text2num(href_list["rreq"])
 		var/obj/item/weapon/card/id/I = usr.get_id_card()
 		for(var/i=1, i<=shuttle_master.requestlist.len, i++)
@@ -537,11 +537,11 @@
 				shuttle_master.requestlist.Cut(i,i+1)
 				break
 
-	else if (href_list["last_viewed_group"])
+	else if(href_list["last_viewed_group"])
 		content_pack = null
 		last_viewed_group = text2num(href_list["last_viewed_group"])
 
-	else if (href_list["contents"])
+	else if(href_list["contents"])
 		var/topic = href_list["contents"]
 		if(topic == 1)
 			content_pack = null
@@ -658,7 +658,7 @@
 		else if(!shuttle_master.supply.request(shuttle_master.getDock("supply_home")))
 			post_signal("supply")
 
-	else if (href_list["doorder"])
+	else if(href_list["doorder"])
 		if(world.time < reqtime)
 			visible_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
 			nanomanager.update_uis(src)
@@ -721,7 +721,7 @@
 					to_chat(usr, "<span class='warning'>There are insufficient supply points for this request.</span>")
 				break
 
-	else if (href_list["rreq"])
+	else if(href_list["rreq"])
 		var/ordernum = text2num(href_list["rreq"])
 		for(var/i=1, i<=shuttle_master.requestlist.len, i++)
 			var/datum/supply_order/SO = shuttle_master.requestlist[i]
@@ -729,11 +729,11 @@
 				shuttle_master.requestlist.Cut(i,i+1)
 				break
 
-	else if (href_list["last_viewed_group"])
+	else if(href_list["last_viewed_group"])
 		content_pack = null
 		last_viewed_group = text2num(href_list["last_viewed_group"])
 
-	else if (href_list["contents"])
+	else if(href_list["contents"])
 		var/topic = href_list["contents"]
 		if(topic == 1)
 			content_pack = null
@@ -790,10 +790,10 @@
 		return prob(60)
 
 	var/obj/structure/stool/bed/B = A
-	if (istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
+	if(istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
 		return 0
 
-	if (istype(A, /obj/structure/closet/cardboard))
+	if(istype(A, /obj/structure/closet/cardboard))
 		var/obj/structure/closet/cardboard/C = A
 		if(C.move_delay)
 			return 0
@@ -830,13 +830,13 @@
 
 /obj/structure/plasticflaps/ex_act(severity)
 	switch(severity)
-		if (1)
+		if(1)
 			qdel(src)
-		if (2)
-			if (prob(50))
+		if(2)
+			if(prob(50))
 				qdel(src)
-		if (3)
-			if (prob(5))
+		if(3)
+			if(prob(5))
 				qdel(src)
 
 /obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates
diff --git a/code/modules/spacepods/equipment.dm b/code/modules/spacepods/equipment.dm
index 07c49752d15..55342fad0e6 100644
--- a/code/modules/spacepods/equipment.dm
+++ b/code/modules/spacepods/equipment.dm
@@ -268,7 +268,7 @@
 	desc = "A key for a spacepod lock."
 	icon = 'icons/vehicles/spacepod.dmi'
 	icon_state = "podkey"
-	w_class = 1.0
+	w_class = 1
 	var/id = 0
 
 // Key - Lock Interactions
diff --git a/code/modules/spacepods/pod_fabricator.dm b/code/modules/spacepods/pod_fabricator.dm
index 666a793c496..6059292ba97 100644
--- a/code/modules/spacepods/pod_fabricator.dm
+++ b/code/modules/spacepods/pod_fabricator.dm
@@ -297,7 +297,7 @@
 
 /obj/machinery/spod_part_fabricator/interact(mob/user as mob)
 	var/dat, left_part
-	if (..())
+	if(..())
 		return
 	user.set_machine(src)
 	if(exit.density)
@@ -430,7 +430,7 @@
 		if(href_list["custom_eject"])
 			amount = input("How many sheets would you like to eject from the machine?", "How much?", 1) as null|num
 			amount = max(0,min(round(resources[material]/MINERAL_MATERIAL_AMOUNT),amount)) // Rounding errors aren't scary, as the mineral eject proc is smart
-			if (!amount)
+			if(!amount)
 				return
 			amount = round(amount)
 		if(amount < 0 || amount > resources[material]) //href protection
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 9adcac071b7..a7cd09b63ac 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -82,7 +82,7 @@
 	cargo_hold.max_combined_w_class = 0 //you can optimize your stash with larger items
 
 /obj/spacepod/Destroy()
-	if (equipment_system.cargo_system)
+	if(equipment_system.cargo_system)
 		equipment_system.cargo_system.removed(null)
 	qdel(equipment_system)
 	equipment_system = null
@@ -294,7 +294,7 @@
 
 	if(istype(W, /obj/item/device/spacepod_key) && istype(equipment_system.lock_system, /obj/item/device/spacepod_equipment/lock/keyed))
 		var/obj/item/device/spacepod_key/key = W
-		if (key.id == equipment_system.lock_system.id)
+		if(key.id == equipment_system.lock_system.id)
 			lock_pod()
 			return
 		else
@@ -309,7 +309,7 @@
 		if(!WT.isOn())
 			to_chat(user, "\red The welder must be on for this task.")
 			return
-		if (health < initial(health))
+		if(health < initial(health))
 			to_chat(user, "\blue You start welding the spacepod...")
 			playsound(loc, 'sound/items/Welder.ogg', 50, 1)
 			if(do_after(user, 20, target = src))
@@ -322,7 +322,7 @@
 
 	if(istype(W, /obj/item/device/lock_buster))
 		var/obj/item/device/lock_buster/L = W
-		if(L.on & equipment_system.lock_system)
+		if(L.on && equipment_system.lock_system)
 			user.visible_message(user, "<span class='warning'>[user] is drilling through the [src]'s lock!</span>",
 				"<span class='notice'>You start drilling through the [src]'s lock!</span>")
 			if(do_after(user, 100, target = src))
@@ -467,7 +467,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 		L += S.return_inv()
 	for(var/obj/item/weapon/gift/G in src)
 		L += G.gift
-		if (istype(G.gift, /obj/item/weapon/storage))
+		if(istype(G.gift, /obj/item/weapon/storage))
 			var/obj/item/weapon/storage/inv = G.gift
 			L += inv.return_inv()
 	return L
@@ -645,7 +645,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 		to_chat(user, "<span class='warning'>\The [src] already has \an [C.storage]</span>")
 
 /obj/spacepod/proc/enter_pod(mob/user)
-	if (usr.stat != CONSCIOUS)
+	if(usr.stat != CONSCIOUS)
 		return 0
 
 	if(equipment_system.lock_system && !unlocked)
@@ -732,7 +732,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 	if(!istype(user))
 		return
 
-	if (user.stat != CONSCIOUS || user.incapacitated()) // unconscious and restrained people can't let themselves out
+	if(user.stat != CONSCIOUS || user.incapacitated()) // unconscious and restrained people can't let themselves out
 		return
 
 	occupant_sanity_check()
@@ -939,8 +939,8 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 		if(moveship)
 			Move(get_step(src, direction), direction)
 			if(equipment_system.cargo_system)
-				for (var/turf/T in locs)
-					for (var/obj/item/I in T.contents)
+				for(var/turf/T in locs)
+					for(var/obj/item/I in T.contents)
 						equipment_system.cargo_system.passover(I)
 
 	else
diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm
index 66ce40bf4cf..a32186f2827 100644
--- a/code/modules/surgery/bones.dm
+++ b/code/modules/surgery/bones.dm
@@ -47,7 +47,7 @@
 
 /datum/surgery_step/glue_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
-	if (affected.stage == 0)
+	if(affected.stage == 0)
 		user.visible_message("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." , \
 		"You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].")
 	target.custom_pain("Something in your [affected.name] is causing you a lot of pain!",1)
@@ -90,7 +90,7 @@
 
 /datum/surgery_step/set_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
-	if (affected.status & ORGAN_BROKEN)
+	if(affected.status & ORGAN_BROKEN)
 		user.visible_message("<span class='notice'> [user] sets the bone in [target]'s [affected.name] in place with \the [tool].</span>", \
 			"<span class='notice'> You set the bone in [target]'s [affected.name] in place with \the [tool].</span>")
 		affected.stage = 2
diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm
index 4c4a328bc0a..90460f34c21 100644
--- a/code/modules/surgery/encased.dm
+++ b/code/modules/surgery/encased.dm
@@ -9,7 +9,7 @@
 
 /datum/surgery_step/open_encased/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return 0
 
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
@@ -27,14 +27,14 @@
 	time = 54
 
 /datum/surgery_step/open_encased/saw/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	return ..() && affected && affected.open == 2
 
 /datum/surgery_step/open_encased/saw/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -45,7 +45,7 @@
 
 /datum/surgery_step/open_encased/saw/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -56,7 +56,7 @@
 
 /datum/surgery_step/open_encased/saw/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -80,14 +80,14 @@
 	time = 24
 
 /datum/surgery_step/open_encased/retract/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	return ..() && affected && affected.open == 2.5
 
 /datum/surgery_step/open_encased/retract/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -99,7 +99,7 @@
 
 /datum/surgery_step/open_encased/retract/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -113,7 +113,7 @@
 
 /datum/surgery_step/open_encased/retract/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -138,14 +138,14 @@
 
 /datum/surgery_step/open_encased/close/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	return ..() && affected && affected.open == 3
 
 /datum/surgery_step/open_encased/close/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -157,7 +157,7 @@
 
 /datum/surgery_step/open_encased/close/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -171,7 +171,7 @@
 
 /datum/surgery_step/open_encased/close/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -195,14 +195,14 @@
 
 /datum/surgery_step/open_encased/mend/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	return ..() && affected && affected.open == 2.5
 
 /datum/surgery_step/open_encased/mend/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -214,7 +214,7 @@
 
 /datum/surgery_step/open_encased/mend/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm
index aac39bacf8c..1c1ad5dfa1d 100644
--- a/code/modules/surgery/face.dm
+++ b/code/modules/surgery/face.dm
@@ -24,10 +24,10 @@
 	can_infect = 0
 
 /datum/surgery_step/face/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return 0
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
-	if (!affected || (affected.status & ORGAN_ROBOT))
+	if(!affected || (affected.status & ORGAN_ROBOT))
 		return 0
 	return target_zone == "mouth"
 
@@ -159,7 +159,7 @@
 		"<span class='notice'> You cauterize the incision on [target]'s face and neck with \the [tool].</span>")
 		affected.open = 0
 		affected.status &= ~ORGAN_BLEEDING
-		//if (target.op_stage.face == 3)//I NEED TO REPLACE THE OPSTAGE SHIT!
+		//if(target.op_stage.face == 3)//I NEED TO REPLACE THE OPSTAGE SHIT!
 		var/obj/item/organ/external/head/h = affected
 		h.disfigured = 0
 		h.update_icon()
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index 842eaf84af5..d02787eb3b5 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -7,16 +7,16 @@
 	can_infect = 1
 
 /datum/surgery_step/generic/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (target_zone == "eyes")	//there are specific steps for eye surgery
+	if(target_zone == "eyes")	//there are specific steps for eye surgery
 		return 0
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return 0
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
-	if (affected == null)
+	if(affected == null)
 		return 0
-	if (affected.status & ORGAN_DESTROYED)
+	if(affected.status & ORGAN_DESTROYED)
 		return 0
-	if (affected.status & ORGAN_ROBOT)
+	if(affected.status & ORGAN_ROBOT)
 		return 0
 	return 1
 
@@ -130,10 +130,10 @@
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	var/msg = "[user] starts to pry open the incision on [target]'s [affected.name] with \the [tool]."
 	var/self_msg = "You start to pry open the incision on [target]'s [affected.name] with \the [tool]."
-	if (target_zone == "chest")
+	if(target_zone == "chest")
 		msg = "[user] starts to separate the ribcage and rearrange the organs in [target]'s torso with \the [tool]."
 		self_msg = "You start to separate the ribcage and rearrange the organs in [target]'s torso with \the [tool]."
-	if (target_zone == "groin")
+	if(target_zone == "groin")
 		msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
 		self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
 	user.visible_message(msg, self_msg)
@@ -144,10 +144,10 @@
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	var/msg = "<span class='notice'> [user] keeps the incision open on [target]'s [affected.name] with \the [tool].</span>"
 	var/self_msg = "<span class='notice'> You keep the incision open on [target]'s [affected.name] with \the [tool].</span>"
-	if (target_zone == "chest")
+	if(target_zone == "chest")
 		msg = "<span class='notice'> [user] keeps the ribcage open on [target]'s torso with \the [tool].</span>"
 		self_msg = "<span class='notice'> You keep the ribcage open on [target]'s torso with \the [tool]."
-	if (target_zone == "groin")
+	if(target_zone == "groin")
 		msg = "<span class='notice'> [user] keeps the incision open on [target]'s lower abdomen with \the [tool].</span>"
 		self_msg = "<span class='notice'> You keep the incision open on [target]'s lower abdomen with \the [tool].</span>"
 	user.visible_message(msg, self_msg)
@@ -158,10 +158,10 @@
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	var/msg = "<span class='warning'> [user]'s hand slips, tearing the edges of incision on [target]'s [affected.name] with \the [tool]!</span>"
 	var/self_msg = "<span class='warning'> Your hand slips, tearing the edges of incision on [target]'s [affected.name] with \the [tool]!</span>"
-	if (target_zone == "chest")
+	if(target_zone == "chest")
 		msg = "<span class='warning'> [user]'s hand slips, damaging several organs [target]'s torso with \the [tool]!</span>"
 		self_msg = "<span class='warning'> Your hand slips, damaging several organs [target]'s torso with \the [tool]!</span>"
-	if (target_zone == "groin")
+	if(target_zone == "groin")
 		msg = "<span class='warning'> [user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]</span>"
 		self_msg = "<span class='warning'> Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!</span>"
 	user.visible_message(msg, self_msg)
@@ -239,14 +239,14 @@
 	time = 100
 
 /datum/surgery_step/generic/amputate/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (target_zone == "eyes")	//there are specific steps for eye surgery
+	if(target_zone == "eyes")	//there are specific steps for eye surgery
 		return 0
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return 0
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
-	if (affected == null)
+	if(affected == null)
 		return 0
-	if (affected.status & ORGAN_DESTROYED)
+	if(affected.status & ORGAN_DESTROYED)
 		return 0
 	return !affected.cannot_amputate
 
diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm
index 88b2f42416c..1aec72f1d63 100644
--- a/code/modules/surgery/implant.dm
+++ b/code/modules/surgery/implant.dm
@@ -42,22 +42,22 @@
 	return affected && affected.open == (affected.encased ? 3 : 2) && !(affected.status & ORGAN_BLEEDING)
 
 /datum/surgery_step/cavity/proc/get_max_wclass(obj/item/organ/external/affected)
-	switch (affected.limb_name)
-		if ("head")
+	switch(affected.limb_name)
+		if("head")
 			return 1
-		if ("chest")
+		if("chest")
 			return 3
-		if ("groin")
+		if("groin")
 			return 2
 	return 0
 
 /datum/surgery_step/cavity/proc/get_cavity(obj/item/organ/external/affected)
-	switch (affected.limb_name)
-		if ("head")
+	switch(affected.limb_name)
+		if("head")
 			return "cranial"
-		if ("chest")
+		if("chest")
 			return "thoracic"
-		if ("groin")
+		if("groin")
 			return "abdominal"
 	return ""
 
@@ -142,7 +142,7 @@
 
 
 /datum/surgery_step/cavity/place_item/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (!ishuman(target))
+	if(!ishuman(target))
 		return 0
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	var/can_fit = affected && !affected.hidden && affected.cavity && tool.w_class <= get_max_wclass(affected)
@@ -292,10 +292,10 @@
 /datum/surgery_step/cavity/implant_removal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	..()
 	var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
-	if (affected.implants.len)
+	if(affected.implants.len)
 		var/fail_prob = 10
 		fail_prob += 100 - tool_quality(tool)
-		if (prob(fail_prob))
+		if(prob(fail_prob))
 			var/obj/item/weapon/implant/imp = affected.implants[1]
 			user.visible_message("<span class='warning'> Something beeps inside [target]'s [affected.name]!</span>")
 			playsound(imp.loc, 'sound/items/countdown.ogg', 75, 1, -3)
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index fced24c49ca..ad0a1973b8f 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -68,10 +68,10 @@
 /datum/surgery_step/limb/
 	can_infect = 0
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		if (!hasorgans(target))
+		if(!hasorgans(target))
 			return 0
 		var/obj/item/organ/external/affected = target.get_organ(target_zone)
-		if (affected)
+		if(affected)
 			return 0
 		var/list/organ_data = target.species.has_limbs["[target_zone]"]
 		return !isnull(organ_data)
@@ -175,8 +175,8 @@
 /datum/surgery_step/limb/mechanize/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 	if(..())
 		var/obj/item/robot_parts/p = tool
-		if (p.part)
-			if (!(target_zone in p.part))
+		if(p.part)
+			if(!(target_zone in p.part))
 				return 0
 		return isnull(target.get_organ(target_zone))
 
diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm
index c1a1c7562a9..77c12cd78a8 100644
--- a/code/modules/surgery/organs/blood.dm
+++ b/code/modules/surgery/organs/blood.dm
@@ -60,10 +60,10 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 			blood_volume = round(vessel.get_reagent_amount(blood_reagent))
 			if(blood_volume < max_blood && blood_volume)
 				vessel.add_reagent(blood_reagent, 0.1) // regenerate blood VERY slowly
-				if (reagents.has_reagent("nutriment"))	//Getting food speeds it up
+				if(reagents.has_reagent("nutriment"))	//Getting food speeds it up
 					vessel.add_reagent(blood_reagent, 0.4)
 					reagents.remove_reagent("nutriment", 0.1)
-				else if (reagents.has_reagent(blood_reagent))
+				else if(reagents.has_reagent(blood_reagent))
 					vessel.add_reagent(blood_reagent, 0.4)
 					reagents.remove_reagent(blood_reagent, 0.4)
 
@@ -93,13 +93,13 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 								break
 
 					vessel.add_reagent("blood", 0.1) // regenerate blood VERY slowly
-					if (reagents.has_reagent("nutriment"))	//Getting food speeds it up
+					if(reagents.has_reagent("nutriment"))	//Getting food speeds it up
 						vessel.add_reagent("blood", 0.4)
 						reagents.remove_reagent("nutriment", 0.1)
-					if (reagents.has_reagent("iron"))	//Hematogen candy anyone?
+					if(reagents.has_reagent("iron"))	//Hematogen candy anyone?
 						vessel.add_reagent("blood", 0.8)
 						reagents.remove_reagent("iron", 0.1)
-					if (reagents.has_reagent("salglu_solution"))	//saline is good for blood regeneration
+					if(reagents.has_reagent("salglu_solution"))	//saline is good for blood regeneration
 						if(prob(33))
 							vessel.add_reagent("blood", 1.0)
 
@@ -172,7 +172,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 				continue
 			for(var/datum/wound/W in temp.wounds) if(W.bleeding())
 				blood_max += W.damage / 4
-			if (temp.open)
+			if(temp.open)
 				blood_max += 2  //Yer stomach is cut open
 		drip(blood_max)
 
@@ -263,7 +263,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 /mob/living/carbon/proc/inject_blood(obj/item/weapon/reagent_containers/container, var/amount)
 	var/datum/reagent/blood/injected = get_blood(container.reagents)
 
-	if (!istype(injected))
+	if(!istype(injected))
 		return
 
 	var/list/chems = list()
@@ -286,7 +286,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 
 	var/datum/reagent/blood/our = get_blood(vessel)
 
-	if (!istype(injected) || !istype(our))
+	if(!istype(injected) || !istype(our))
 		return
 	if(blood_incompatible(injected.data["blood_type"],our.data["blood_type"]) )
 		reagents.add_reagent("toxin",amount * 0.5)
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index 329da35ef2f..5e49a97fc59 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -87,7 +87,7 @@ var/list/organ_cache = list()
 		return
 
 	//Process infections
-	if ((status & ORGAN_ROBOT) || sterile ||(owner && owner.species && (owner.species.flags & IS_PLANT)))
+	if((status & ORGAN_ROBOT) || sterile ||(owner && owner.species && (owner.species.flags & IS_PLANT)))
 		germ_level = 0
 		return
 
@@ -152,10 +152,10 @@ var/list/organ_cache = list()
 	//** Handle the effects of infections
 	var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
 
-	if (germ_level > 0 && germ_level < INFECTION_LEVEL_ONE/2 && prob(30))
+	if(germ_level > 0 && germ_level < INFECTION_LEVEL_ONE/2 && prob(30))
 		germ_level--
 
-	if (germ_level >= INFECTION_LEVEL_ONE/2)
+	if(germ_level >= INFECTION_LEVEL_ONE/2)
 		//aiming for germ level to go from ambient to INFECTION_LEVEL_TWO in an average of 15 minutes
 		if(antibiotics < 5 && prob(round(germ_level/6)))
 			germ_level++
@@ -164,13 +164,13 @@ var/list/organ_cache = list()
 		var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 5)* min(germ_level/INFECTION_LEVEL_TWO, 1) + owner.species.body_temperature
 		owner.bodytemperature += between(0, (fever_temperature - T20C)/BODYTEMP_COLD_DIVISOR + 1, fever_temperature - owner.bodytemperature)
 
-	if (germ_level >= INFECTION_LEVEL_TWO)
+	if(germ_level >= INFECTION_LEVEL_TWO)
 		var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
 		//spread germs
-		if (antibiotics < 5 && parent.germ_level < germ_level && ( parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30) ))
+		if(antibiotics < 5 && parent.germ_level < germ_level && ( parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30) ))
 			parent.germ_level++
 
-		if (prob(3))	//about once every 30 seconds
+		if(prob(3))	//about once every 30 seconds
 			take_damage(1,silent=prob(30))
 
 /obj/item/organ/proc/receive_chem(chemical as obj)
@@ -181,7 +181,7 @@ var/list/organ_cache = list()
 	germ_level = 0
 	if(status & ORGAN_ROBOT)	//Robotic organs stay robotic.
 		status = ORGAN_ROBOT
-	else if (status & ORGAN_ASSISTED) //Assisted organs stay assisted.
+	else if(status & ORGAN_ASSISTED) //Assisted organs stay assisted.
 		status = ORGAN_ASSISTED
 	else
 		status = 0
@@ -201,12 +201,12 @@ var/list/organ_cache = list()
 /obj/item/organ/proc/handle_antibiotics()
 	var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
 
-	if (!germ_level || antibiotics <= 0.4)
+	if(!germ_level || antibiotics <= 0.4)
 		return
 
-	if (germ_level < INFECTION_LEVEL_ONE)
+	if(germ_level < INFECTION_LEVEL_ONE)
 		germ_level = 0	//cure instantly
-	else if (germ_level < INFECTION_LEVEL_TWO)
+	else if(germ_level < INFECTION_LEVEL_TWO)
 		germ_level -= 24	//at germ_level == 500, this should cure the infection in 15 seconds
 	else
 		germ_level -= 8	// at germ_level == 1000, this will cure the infection in 1 minute, 15 seconds
@@ -260,11 +260,11 @@ var/list/organ_cache = list()
 /obj/item/organ/emp_act(severity)
 	if(!(status & ORGAN_ROBOT))
 		return
-	switch (severity)
-		if (1.0)
+	switch(severity)
+		if(1.0)
 			take_damage(0,20)
 			return
-		if (2.0)
+		if(2.0)
 			take_damage(0,7)
 			return
 		if(3.0)
@@ -274,10 +274,10 @@ var/list/organ_cache = list()
 	if(!robotic)
 		return
 	if(robotic == 2)
-		switch (severity)
-			if (1.0)
+		switch(severity)
+			if(1.0)
 				take_damage(20,1)
-			if (2.0)
+			if(2.0)
 				take_damage(7,1)
 			if(3.0)
 				take_damage(3,1)
@@ -322,7 +322,7 @@ var/list/organ_cache = list()
 	owner = target
 	processing_objects -= src
 	affected.internal_organs |= src
-	if (!target.get_int_organ(src))
+	if(!target.get_int_organ(src))
 		target.internal_organs += src
 	src.loc = target
 	if(robotic)
@@ -338,8 +338,8 @@ Returns 0 if it isn't
 I use this so that this can be made better once the organ overhaul rolls out -- Crazylemon
 */
 /obj/item/organ/proc/is_primary_organ(var/mob/living/carbon/human/O = null)
-	if (isnull(O))
+	if(isnull(O))
 		O = owner
-	if (!istype(owner)) // You're not the primary organ of ANYTHING, bucko
+	if(!istype(owner)) // You're not the primary organ of ANYTHING, bucko
 		return 0
 	return src == O.get_int_organ(organ_tag)
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index c5d19ac2509..10d7fe724ea 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -210,7 +210,7 @@
 		//How much damage can we actually cause?
 		var/can_inflict = max_damage * config.organ_health_multiplier - (brute_dam + burn_dam)
 		if(can_inflict)
-			if (brute > 0)
+			if(brute > 0)
 				//Inflict all burte damage we can
 				if(can_cut)
 					createwound( CUT, min(brute,can_inflict) )
@@ -222,14 +222,14 @@
 				//How much brute damage is left to inflict
 				brute = max(0, brute - temp)
 
-			if (burn > 0 && can_inflict)
+			if(burn > 0 && can_inflict)
 				//Inflict all burn damage we can
 				createwound(BURN, min(burn,can_inflict))
 				//How much burn damage is left to inflict
 				burn = max(0, burn - can_inflict)
 		//If there are still hurties to dispense
-		if (burn || brute)
-			if (fail_at_full_damage == 1 && body_part != UPPER_TORSO && body_part != LOWER_TORSO)
+		if(burn || brute)
+			if(fail_at_full_damage == 1 && body_part != UPPER_TORSO && body_part != LOWER_TORSO)
 				droplimb(1) //Clean loss, just drop the limb and be done
 			else
 				//List organs we can pass it to
@@ -310,7 +310,7 @@ This function completely restores a damaged organ to perfect condition.
 	damage_state = "00"
 	if(status & ORGAN_ROBOT)	//Robotic organs stay robotic.
 		status = ORGAN_ROBOT
-	else if (status & ORGAN_ASSISTED) //Assisted organs stay assisted.
+	else if(status & ORGAN_ASSISTED) //Assisted organs stay assisted.
 		status = ORGAN_ASSISTED
 	else
 		status = 0
@@ -358,8 +358,8 @@ This function completely restores a damaged organ to perfect condition.
 		if((type == CUT || type == BRUISE) && damage >= 5)
 			//we need to make sure that the wound we are going to worsen is compatible with the type of damage...
 			var/list/compatible_wounds = list()
-			for (var/datum/wound/W in wounds)
-				if (W.can_worsen(type, damage))
+			for(var/datum/wound/W in wounds)
+				if(W.can_worsen(type, damage))
 					compatible_wounds += W
 
 			if(compatible_wounds.len)
@@ -412,7 +412,7 @@ This function completely restores a damaged organ to perfect condition.
 	if(!wound_cleanup_timer)
 		wound_cleanup_timer = addtimer(src, "cleanup_wounds", SecondsToTicks(600), 1, wounds)
 
-	if (update_icon())
+	if(update_icon())
 		owner.UpdateDamageIcon(1)
 	return 0
 
@@ -482,13 +482,13 @@ Note that amputating the affected organ does in fact remove the infection from t
 	var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
 	for(var/datum/wound/W in wounds)
 		//Open wounds can become infected
-		if (owner.germ_level > W.germ_level && W.infection_check())
+		if(owner.germ_level > W.germ_level && W.infection_check())
 			W.germ_level++
 
-	if (antibiotics < 5)
+	if(antibiotics < 5)
 		for(var/datum/wound/W in wounds)
 			//Infected wounds raise the organ's germ level
-			if (W.germ_level > germ_level)
+			if(W.germ_level > germ_level)
 				germ_level++
 				break	//limit increase to a maximum of one per second
 
@@ -502,37 +502,37 @@ Note that amputating the affected organ does in fact remove the infection from t
 	if(germ_level >= INFECTION_LEVEL_TWO)
 		//spread the infection to internal organs
 		var/obj/item/organ/internal/target_organ = null	//make internal organs become infected one at a time instead of all at once
-		for (var/obj/item/organ/internal/I in internal_organs)
-			if (I.germ_level > 0 && I.germ_level < min(germ_level, INFECTION_LEVEL_TWO))	//once the organ reaches whatever we can give it, or level two, switch to a different one
-				if (!target_organ || I.germ_level > target_organ.germ_level)	//choose the organ with the highest germ_level
+		for(var/obj/item/organ/internal/I in internal_organs)
+			if(I.germ_level > 0 && I.germ_level < min(germ_level, INFECTION_LEVEL_TWO))	//once the organ reaches whatever we can give it, or level two, switch to a different one
+				if(!target_organ || I.germ_level > target_organ.germ_level)	//choose the organ with the highest germ_level
 					target_organ = I
 
-		if (!target_organ)
+		if(!target_organ)
 			//figure out which organs we can spread germs to and pick one at random
 			var/list/candidate_organs = list()
-			for (var/obj/item/organ/internal/I in internal_organs)
-				if (I.germ_level < germ_level)
+			for(var/obj/item/organ/internal/I in internal_organs)
+				if(I.germ_level < germ_level)
 					candidate_organs |= I
-			if (candidate_organs.len)
+			if(candidate_organs.len)
 				target_organ = pick(candidate_organs)
 
-		if (target_organ)
+		if(target_organ)
 			target_organ.germ_level++
 
 		//spread the infection to child and parent organs
-		if (children)
-			for (var/obj/item/organ/external/child in children)
-				if (child.germ_level < germ_level && !(child.status & ORGAN_ROBOT))
-					if (child.germ_level < INFECTION_LEVEL_ONE*2 || prob(30))
+		if(children)
+			for(var/obj/item/organ/external/child in children)
+				if(child.germ_level < germ_level && !(child.status & ORGAN_ROBOT))
+					if(child.germ_level < INFECTION_LEVEL_ONE*2 || prob(30))
 						child.germ_level++
 
-		if (parent)
-			if (parent.germ_level < germ_level && !(parent.status & ORGAN_ROBOT))
-				if (parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30))
+		if(parent)
+			if(parent.germ_level < germ_level && !(parent.status & ORGAN_ROBOT))
+				if(parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30))
 					parent.germ_level++
 
 	if(germ_level >= INFECTION_LEVEL_THREE && antibiotics < 30)	//overdosing is necessary to stop severe infections
-		if (!(status & ORGAN_DEAD))
+		if(!(status & ORGAN_DEAD))
 			status |= ORGAN_DEAD
 			to_chat(owner, "<span class='notice'>You can't feel your [name] anymore...</span>")
 			owner.update_body(1)
@@ -567,7 +567,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 		var/heal_amt = 0
 
 		// if damage >= 50 AFTER treatment then it's probably too severe to heal within the timeframe of a round.
-		if (W.can_autoheal() && W.wound_damage() < 50)
+		if(W.can_autoheal() && W.wound_damage() < 50)
 			heal_amt += 0.5
 
 		//we only update wounds once in [wound_update_accuracy] ticks so have to emulate realtime
@@ -587,7 +587,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 
 	// sync the organ's damage with its wounds
 	src.update_damages()
-	if (update_icon())
+	if(update_icon())
 		owner.UpdateDamageIcon(1)
 
 //Updates brute_damn and burn_damn from wound damages. Updates BLEEDING status.
@@ -620,7 +620,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 
 		number_wounds += W.amount
 
-	if (open && !clamped && (H && !(H.species.flags & NO_BLOOD)))
+	if(open && !clamped && (H && !(H.species.flags & NO_BLOOD)))
 		status |= ORGAN_BLEEDING
 
 	//Bone fractures
@@ -638,18 +638,18 @@ Note that amputating the affected organ does in fact remove the infection from t
 
 	if(burn_dam ==0)
 		tburn =0
-	else if (burn_dam < (max_damage * 0.25 / 2))
+	else if(burn_dam < (max_damage * 0.25 / 2))
 		tburn = 1
-	else if (burn_dam < (max_damage * 0.75 / 2))
+	else if(burn_dam < (max_damage * 0.75 / 2))
 		tburn = 2
 	else
 		tburn = 3
 
-	if (brute_dam == 0)
+	if(brute_dam == 0)
 		tbrute = 0
-	else if (brute_dam < (max_damage * 0.25 / 2))
+	else if(brute_dam < (max_damage * 0.25 / 2))
 		tbrute = 1
-	else if (brute_dam < (max_damage * 0.75 / 2))
+	else if(brute_dam < (max_damage * 0.75 / 2))
 		tbrute = 2
 	else
 		tbrute = 3
@@ -744,12 +744,12 @@ Note that amputating the affected organ does in fact remove the infection from t
 		holder = owner
 	if(!holder)
 		return
-	if (holder.handcuffed && body_part in list(ARM_LEFT, ARM_RIGHT, HAND_LEFT, HAND_RIGHT))
+	if(holder.handcuffed && body_part in list(ARM_LEFT, ARM_RIGHT, HAND_LEFT, HAND_RIGHT))
 		holder.visible_message(\
 			"\The [holder.handcuffed.name] falls off of [holder.name].",\
 			"\The [holder.handcuffed.name] falls off you.")
 		holder.unEquip(holder.handcuffed)
-	if (holder.legcuffed && body_part in list(FOOT_LEFT, FOOT_RIGHT, LEG_LEFT, LEG_RIGHT))
+	if(holder.legcuffed && body_part in list(FOOT_LEFT, FOOT_RIGHT, LEG_LEFT, LEG_RIGHT))
 		holder.visible_message(\
 			"\The [holder.legcuffed.name] falls off of [holder.name].",\
 			"\The [holder.legcuffed.name] falls off you.")
@@ -809,7 +809,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 	perma_injury = brute_dam
 
 	// Fractures have a chance of getting you out of restraints
-	if (prob(25))
+	if(prob(25))
 		release_restraints()
 
 /obj/item/organ/external/proc/mend_fracture()
@@ -845,7 +845,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 
 	cannot_break = 1
 	get_icon()
-	for (var/obj/item/organ/external/T in children)
+	for(var/obj/item/organ/external/T in children)
 		if(T)
 			T.robotize()
 
@@ -939,7 +939,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 		qdel(src)
 
 /obj/item/organ/external/proc/disfigure(var/type = "brute")
-	if (disfigured)
+	if(disfigured)
 		return
 	if(owner)
 		if(type == "brute")
@@ -953,9 +953,9 @@ Note that amputating the affected organ does in fact remove the infection from t
 	disfigured = 1
 
 /obj/item/organ/external/is_primary_organ(var/mob/living/carbon/human/O = null)
-	if (isnull(O))
+	if(isnull(O))
 		O = owner
-	if (!istype(O)) // You're not the primary organ of ANYTHING, bucko
+	if(!istype(O)) // You're not the primary organ of ANYTHING, bucko
 		return 0
 	return src == O.organs_by_name[limb_name]
 
diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm
index 9fb13fe8692..49777aa4a5c 100644
--- a/code/modules/surgery/organs/organ_icon.dm
+++ b/code/modules/surgery/organs/organ_icon.dm
@@ -135,7 +135,7 @@ var/global/list/limb_icon_cache = list()
 			else if(status & ORGAN_ROBOT)
 				mob_icon = new /icon('icons/mob/human_races/robotic.dmi', "[icon_name][gender ? "_[gender]" : ""]")
 			else
-				if (status & ORGAN_MUTATED)
+				if(status & ORGAN_MUTATED)
 					mob_icon = new /icon(species.deform, "[icon_name][gender ? "_[gender]" : ""]")
 				else
 					mob_icon = new /icon(species.icobase, "[icon_name][gender ? "_[gender]" : ""]")
@@ -161,7 +161,7 @@ var/global/list/limb_icon_cache = list()
 // adjusted to set damage_state to brute/burn code only (without r_name0 as before)
 /obj/item/organ/external/update_icon()
 	var/n_is = damage_state_text()
-	if (n_is != damage_state)
+	if(n_is != damage_state)
 		damage_state = n_is
 		return 1
 	return 0
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index f4a47c595cb..27ab9ea3b99 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -191,6 +191,70 @@
 	S.icon_state = "heart-off"
 	return S
 
+/obj/item/organ/internal/heart/cursed
+	name = "cursed heart"
+	desc = "it needs to be pumped..."
+	icon_state = "cursedheart-off"
+	icon_base = "cursedheart"
+	origin_tech = "biotech=5"
+	organ_action_name = "pump your blood"
+	var/last_pump = 0
+	var/pump_delay = 30 //you can pump 1 second early, for lag, but no more (otherwise you could spam heal)
+	var/blood_loss = 100 //600 blood is human default, so 5 failures (below 122 blood is where humans die because reasons?)
+
+	//How much to heal per pump, negative numbers would HURT the player
+	var/heal_brute = 0
+	var/heal_burn = 0
+	var/heal_oxy = 0
+
+
+/obj/item/organ/internal/heart/cursed/attack(mob/living/carbon/human/H, mob/living/carbon/human/user, obj/target)
+	if(H == user && istype(H))
+		if(H.species.flags & NO_BLOOD || H.species.exotic_blood)
+			to_chat(H, "<span class = 'userdanger'>\The [src] is not compatible with your form!</span>")
+			return
+		playsound(user,'sound/effects/singlebeat.ogg', 40, 1)
+		user.drop_item()
+		insert(user)
+	else
+		return ..()
+
+/obj/item/organ/internal/heart/cursed/on_life()
+	if(world.time > (last_pump + pump_delay))
+		if(ishuman(owner) && owner.client) //While this entire item exists to make people suffer, they can't control disconnects.
+			var/mob/living/carbon/human/H = owner
+			H.vessel.remove_reagent("blood", blood_loss)
+			to_chat(H, "<span class='userdanger'>You have to keep pumping your blood!</span>")
+			if(H.client)
+				H.client.color = "red" //bloody screen so real
+		else
+			last_pump = world.time //lets be extra fair *sigh*
+
+/obj/item/organ/internal/heart/cursed/insert(mob/living/carbon/M, special = 0)
+	..()
+	if(owner)
+		to_chat(owner, "<span class='userdanger'>Your heart has been replaced with a cursed one, you have to pump this one manually otherwise you'll die!</span>")
+
+//You are now brea- pumping blood manually
+/obj/item/organ/internal/heart/cursed/ui_action_click()
+	if(world.time < (last_pump + (pump_delay-10))) //no spam
+		to_chat(owner, "<span class='userdanger'>Too soon!</span>")
+		return
+
+	last_pump = world.time
+	playsound(owner, 'sound/effects/singlebeat.ogg', 40, 1)
+	to_chat(owner, "<span class='notice'>Your heart beats.</span>")
+
+	var/mob/living/carbon/human/H = owner
+	if(istype(H))
+		H.vessel.add_reagent("blood", (blood_loss*0.5))//gain half the blood back from a failure
+		if(owner.client)
+			owner.client.color = ""
+
+		H.adjustBruteLoss(-heal_brute)
+		H.adjustFireLoss(-heal_burn)
+		H.adjustOxyLoss(-heal_oxy)
+
 /obj/item/organ/internal/lungs
 	name = "lungs"
 	icon_state = "lungs"
@@ -212,7 +276,7 @@
 
 	if(!owner)
 		return
-	if (germ_level > INFECTION_LEVEL_ONE)
+	if(germ_level > INFECTION_LEVEL_ONE)
 		if(prob(5))
 			owner.emote("cough")		//respitory tract infection
 
@@ -302,10 +366,10 @@
 	if(!owner)
 		return
 
-	if (germ_level > INFECTION_LEVEL_ONE)
+	if(germ_level > INFECTION_LEVEL_ONE)
 		if(prob(1))
 			to_chat(owner, "<span class='warning'> Your skin itches.</span>")
-	if (germ_level > INFECTION_LEVEL_TWO)
+	if(germ_level > INFECTION_LEVEL_TWO)
 		if(prob(1))
 			spawn owner.vomit()
 
@@ -314,7 +378,7 @@
 		//High toxins levels are dangerous
 		if(owner.getToxLoss() >= 60 && !owner.reagents.has_reagent("charcoal"))
 			//Healthy liver suffers on its own
-			if (src.damage < min_broken_damage)
+			if(src.damage < min_broken_damage)
 				src.damage += 0.2 * PROCESS_ACCURACY
 			//Damaged one shares the fun
 			else
@@ -323,7 +387,7 @@
 					O.damage += 0.2  * PROCESS_ACCURACY
 
 		//Detox can heal small amounts of damage
-		if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("charcoal"))
+		if(src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("charcoal"))
 			src.damage -= 0.2 * PROCESS_ACCURACY
 
 		if(src.damage < 0)
@@ -476,13 +540,22 @@
 			var/mob/living/carbon/human/H = owner
 			if(isobj(H.shoes))
 				var/thingy = H.shoes
-				H.unEquip(H.shoes)
-				walk_away(thingy,H,15,2)
-				spawn(20)
-					if(thingy)
-						walk(thingy,0)
+				if(H.unEquip(H.shoes))
+					walk_away(thingy,H,15,2)
+					spawn(20)
+						if(thingy)
+							walk(thingy,0)
 	..()
 
+/obj/item/organ/internal/honktumor/cursed
+
+/obj/item/organ/internal/honktumor/cursed/remove(mob/living/carbon/M, special = 0, clean_remove = 0)
+	..()
+	if(!clean_remove)
+		visible_message("<span class='warning'>[src] vanishes into dust, and a [M] emits a loud honk!</span>", "<span class='notice'>You hear a loud honk.</span>")
+		insert(M) //You're not getting away that easily!
+	else
+		qdel(src)
 
 /obj/item/organ/internal/beard
 	name = "beard organ"
@@ -493,7 +566,6 @@
 	parent_organ = "head"
 	slot = "hair_organ"
 
-
 /obj/item/organ/internal/beard/on_life()
 
 	if(!owner)
@@ -516,4 +588,4 @@
 			head_organ.r_facial = 216
 			head_organ.g_facial = 192
 			head_organ.b_facial = 120
-			H.update_fhair()
\ No newline at end of file
+			H.update_fhair()
diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm
index d481ba1b7ae..1c6240318fe 100644
--- a/code/modules/surgery/organs/subtypes/standard.dm
+++ b/code/modules/surgery/organs/subtypes/standard.dm
@@ -187,9 +187,9 @@
 
 /obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())
 	..(brute, burn, sharp, edge, used_weapon, forbidden_limbs)
-	if (!disfigured)
-		if (brute_dam > 40)
-			if (prob(50))
+	if(!disfigured)
+		if(brute_dam > 40)
+			if(prob(50))
 				disfigure("brute")
-		if (burn_dam > 40)
+		if(burn_dam > 40)
 			disfigure("burn")
diff --git a/code/modules/surgery/organs/wound.dm b/code/modules/surgery/organs/wound.dm
index 55a2f3f5cee..ca5b25dee12 100644
--- a/code/modules/surgery/organs/wound.dm
+++ b/code/modules/surgery/organs/wound.dm
@@ -97,15 +97,15 @@
 
 	// Checks whether other other can be merged into src.
 	proc/can_merge(var/datum/wound/other)
-		if (other.type != src.type) return 0
-		if (other.current_stage != src.current_stage) return 0
-		if (other.damage_type != src.damage_type) return 0
-		if (!(other.can_autoheal()) != !(src.can_autoheal())) return 0
-		if (!(other.bandaged) != !(src.bandaged)) return 0
-		if (!(other.clamped) != !(src.clamped)) return 0
-		if (!(other.salved) != !(src.salved)) return 0
-		if (!(other.disinfected) != !(src.disinfected)) return 0
-		//if (other.germ_level != src.germ_level) return 0
+		if(other.type != src.type) return 0
+		if(other.current_stage != src.current_stage) return 0
+		if(other.damage_type != src.damage_type) return 0
+		if(!(other.can_autoheal()) != !(src.can_autoheal())) return 0
+		if(!(other.bandaged) != !(src.bandaged)) return 0
+		if(!(other.clamped) != !(src.clamped)) return 0
+		if(!(other.salved) != !(src.salved)) return 0
+		if(!(other.disinfected) != !(src.disinfected)) return 0
+		//if(other.germ_level != src.germ_level) return 0
 		return 1
 
 	proc/merge_wound(var/datum/wound/other)
@@ -118,24 +118,24 @@
 	// checks if wound is considered open for external infections
 	// untreated cuts (and bleeding bruises) and burns are possibly infectable, chance higher if wound is bigger
 	proc/infection_check()
-		if (damage < 10)	//small cuts, tiny bruises, and moderate burns shouldn't be infectable.
+		if(damage < 10)	//small cuts, tiny bruises, and moderate burns shouldn't be infectable.
 			return 0
-		if (is_treated() && damage < 25)	//anything less than a flesh wound (or equivalent) isn't infectable if treated properly
+		if(is_treated() && damage < 25)	//anything less than a flesh wound (or equivalent) isn't infectable if treated properly
 			return 0
-		if (disinfected)
+		if(disinfected)
 			germ_level = 0	//reset this, just in case
 			return 0
 
-		if (damage_type == BRUISE && !bleeding()) //bruises only infectable if bleeding
+		if(damage_type == BRUISE && !bleeding()) //bruises only infectable if bleeding
 			return 0
 
 		var/dam_coef = round(damage/10)
-		switch (damage_type)
-			if (BRUISE)
+		switch(damage_type)
+			if(BRUISE)
 				return prob(dam_coef*5)
-			if (BURN)
+			if(BURN)
 				return prob(dam_coef*10)
-			if (CUT)
+			if(CUT)
 				return prob(dam_coef*20)
 
 		return 0
@@ -174,32 +174,32 @@
 	// returns whether this wound can absorb the given amount of damage.
 	// this will prevent large amounts of damage being trapped in less severe wound types
 	proc/can_worsen(damage_type, damage)
-		if (src.damage_type != damage_type)
+		if(src.damage_type != damage_type)
 			return 0	//incompatible damage types
 
-		if (src.amount > 1)
+		if(src.amount > 1)
 			return 0
 
 		//with 1.5*, a shallow cut will be able to carry at most 30 damage,
 		//37.5 for a deep cut
 		//52.5 for a flesh wound, etc.
 		var/max_wound_damage = 1.5*src.damage_list[1]
-		if (src.damage + damage > max_wound_damage)
+		if(src.damage + damage > max_wound_damage)
 			return 0
 
 		return 1
 
 	proc/bleeding()
-		if (src.internal)
+		if(src.internal)
 			return 0	// internal wounds don't bleed in the sense of this function
 
-		if (current_stage > max_bleeding_stage)
+		if(current_stage > max_bleeding_stage)
 			return 0
 
-		if (bandaged||clamped)
+		if(bandaged||clamped)
 			return 0
 
-		if (wound_damage() <= 30 && bleed_timer <= 0)
+		if(wound_damage() <= 30 && bleed_timer <= 0)
 			return 0	//Bleed timer has run out. Wounds with more than 30 damage don't stop bleeding on their own.
 
 		return (damage_type == BRUISE && wound_damage() >= 20 || damage_type == CUT && wound_damage() >= 5)
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 8f7ed0e6d67..e16a07c454c 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -60,7 +60,7 @@
 
 /datum/surgery_step/internal/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return 0
 
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
@@ -156,11 +156,11 @@
 	else if(implement_type in implements_mend)
 		current_type = "mend"
 		var/tool_name = "\the [tool]"
-		if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
+		if(istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
 			tool_name = "regenerative membrane"
-		else if (istype(tool, /obj/item/stack/medical/bruise_pack))
+		else if(istype(tool, /obj/item/stack/medical/bruise_pack))
 			tool_name = "the bandaid"
-		else if (istype(tool, /obj/item/stack/nanopaste))
+		else if(istype(tool, /obj/item/stack/nanopaste))
 			tool_name = "\the [tool]" //what else do you call nanopaste medically?
 
 		if(!hasorgans(target))
@@ -188,14 +188,14 @@
 /datum/surgery_step/internal/manipulate_organs/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	if(current_type == "mend")
 		var/tool_name = "\the [tool]"
-		if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
+		if(istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
 			tool_name = "regenerative membrane"
-		if (istype(tool, /obj/item/stack/medical/bruise_pack))
+		if(istype(tool, /obj/item/stack/medical/bruise_pack))
 			tool_name = "the bandaid"
-		if (istype(tool, /obj/item/stack/nanopaste))
+		if(istype(tool, /obj/item/stack/nanopaste))
 			tool_name = "\the [tool]" //what else do you call nanopaste medically?
 
-		if (!hasorgans(target))
+		if(!hasorgans(target))
 			return
 		for(var/obj/item/organ/internal/I in affected.internal_organs)
 			if(I)
@@ -259,17 +259,17 @@
 
 /datum/surgery_step/internal/manipulate_organs/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	if(current_type == "mend")
-		if (!hasorgans(target))
+		if(!hasorgans(target))
 			return
 
 		user.visible_message("<span class='warning'> [user]'s hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!</span>", \
 		"<span class='warning'> Your hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!</span>")
 		var/dam_amt = 2
 
-		if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
+		if(istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
 			target.adjustToxLoss(5)
 
-		else if (istype(tool, /obj/item/stack/medical/bruise_pack) || istype(tool, /obj/item/stack/nanopaste))
+		else if(istype(tool, /obj/item/stack/medical/bruise_pack) || istype(tool, /obj/item/stack/nanopaste))
 			dam_amt = 5
 			target.adjustToxLoss(10)
 			affected.createwound(CUT, 5)
@@ -400,10 +400,10 @@
 /datum/surgery_step/retract_carapace/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	var/msg = "[user] starts to pry open the incision on [target]'s [target_zone] with \the [tool]."
 	var/self_msg = "You start to pry open the incision on [target]'s [target_zone] with \the [tool]."
-	if (target_zone == "chest")
+	if(target_zone == "chest")
 		msg = "[user] starts to separate the ribcage and rearrange the organs in [target]'s torso with \the [tool]."
 		self_msg = "You start to separate the ribcage and rearrange the organs in [target]'s torso with \the [tool]."
-	if (target_zone == "groin")
+	if(target_zone == "groin")
 		msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
 		self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
 	user.visible_message(msg, self_msg)
@@ -412,10 +412,10 @@
 /datum/surgery_step/retract_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	var/msg = "<span class='notice'> [user] keeps the incision open on [target]'s [target_zone] with \the [tool]</span>."
 	var/self_msg = "<span class='notice'> You keep the incision open on [target]'s [target_zone] with \the [tool].</span>"
-	if (target_zone == "chest")
+	if(target_zone == "chest")
 		msg = "<span class='notice'> [user] keeps the ribcage open on [target]'s torso with \the [tool].</span>"
 		self_msg = "<span class='notice'> You keep the ribcage open on [target]'s torso with \the [tool].</span>"
-	if (target_zone == "groin")
+	if(target_zone == "groin")
 		msg = "<span class='notice'> [user] keeps the incision open on [target]'s lower abdomen with \the [tool].</span>"
 		self_msg = "<span class='notice'> You keep the incision open on [target]'s lower abdomen with \the [tool].</span>"
 	user.visible_message(msg, self_msg)
@@ -424,10 +424,10 @@
 /datum/surgery_step/generic/retract_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	var/msg = "<span class='warning'> [user]'s hand slips, tearing the edges of incision on [target]'s [target_zone] with \the [tool]!</span>"
 	var/self_msg = "<span class='warning'> Your hand slips, tearing the edges of incision on [target]'s [target_zone] with \the [tool]!</span>"
-	if (target_zone == "chest")
+	if(target_zone == "chest")
 		msg = "<span class='warning'> [user]'s hand slips, damaging several organs [target]'s torso with \the [tool]!</span>"
 		self_msg = "<span class='warning'> Your hand slips, damaging several organs [target]'s torso with \the [tool]!</span>"
-	if (target_zone == "groin")
+	if(target_zone == "groin")
 		msg = "<span class='warning'> [user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]</span>"
 		self_msg = "<span class='warning'> Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!</span>"
 	user.visible_message(msg, self_msg)
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 8e3ff02b091..44c0e30d9f2 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -66,7 +66,7 @@
 	for(var/datum/wound/W in affected.wounds) if(W.internal)
 		affected.wounds -= W
 		affected.update_damages()
-	if (ishuman(user) && prob(40))
+	if(ishuman(user) && prob(40))
 		var/mob/living/carbon/human/U = user
 		U.bloody_hands(target, 0)
 
@@ -97,7 +97,7 @@
 	if(!hasorgans(target))
 		return 0
 
-	if (target_zone == "mouth" || target_zone == "eyes")
+	if(target_zone == "mouth" || target_zone == "eyes")
 		return 0
 
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
@@ -143,7 +143,7 @@
 	time = 24
 
 /datum/surgery_step/fix_dead_tissue/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (!istype(tool, /obj/item/weapon/reagent_containers))
+	if(!istype(tool, /obj/item/weapon/reagent_containers))
 		return 0
 
 	var/obj/item/weapon/reagent_containers/container = tool
@@ -153,7 +153,7 @@
 	if(!hasorgans(target))
 		return 0
 
-	if (target_zone == "mouth" || target_zone == "eyes")
+	if(target_zone == "mouth" || target_zone == "eyes")
 		return 0
 
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
@@ -169,13 +169,13 @@
 /datum/surgery_step/fix_dead_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
-	if (!istype(tool, /obj/item/weapon/reagent_containers))
+	if(!istype(tool, /obj/item/weapon/reagent_containers))
 		return
 
 	var/obj/item/weapon/reagent_containers/container = tool
 
 	var/trans = container.reagents.trans_to(target, container.amount_per_transfer_from_this)
-	if (trans > 0)
+	if(trans > 0)
 		container.reagents.reaction(target, INGEST)	//technically it's contact, but the reagents are being applied to internal tissue
 
 		if(container.reagents.has_reagent("mitocholide"))
@@ -189,7 +189,7 @@
 /datum/surgery_step/fix_dead_tissue/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
-	if (!istype(tool, /obj/item/weapon/reagent_containers))
+	if(!istype(tool, /obj/item/weapon/reagent_containers))
 		return
 
 	var/obj/item/weapon/reagent_containers/container = tool
@@ -232,7 +232,7 @@
 	time = 30
 
 /datum/surgery_step/internal/dethrall/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	return ..() && affected && is_thrall(target) && affected.open_enough_for_surgery() && target_zone == target.named_organ_parent("brain")
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index fee1d87323a..4567c465678 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -48,26 +48,26 @@
 	can_infect = 0
 
 /datum/surgery_step/robotics/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (isslime(target))
+	if(isslime(target))
 		return 0
-	if (target_zone == "eyes")	//there are specific steps for eye surgery
+	if(target_zone == "eyes")	//there are specific steps for eye surgery
 		return 0
-	if (!hasorgans(target))
+	if(!hasorgans(target))
 		return 0
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
-	if (affected == null)
+	if(affected == null)
 		return 0
-	if (affected.status & ORGAN_DESTROYED)
+	if(affected.status & ORGAN_DESTROYED)
 		return 0
 	return 1
 
 /datum/surgery_step/robotics/external
 
 /datum/surgery_step/robotics/external/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if (!..())
+	if(!..())
 		return 0
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
-	if (!(affected.status & ORGAN_ROBOT))
+	if(!(affected.status & ORGAN_ROBOT))
 		return 0
 	return 1
 
@@ -373,7 +373,7 @@
 
 	else if(implement_type in implements_mend)
 		current_type = "mend"
-		if (!hasorgans(target))
+		if(!hasorgans(target))
 			return
 		var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -396,7 +396,7 @@
 /datum/surgery_step/robotics/manipulate_robotic_organs/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	if(current_type == "mend")
 
-		if (!hasorgans(target))
+		if(!hasorgans(target))
 			return
 		for(var/obj/item/organ/internal/I in affected.internal_organs)
 			if(I && I.damage > 0)
@@ -418,13 +418,13 @@
 
 		if(I && istype(I))
 			I.status &= ~ORGAN_CUT_AWAY
-	else if (current_type == "install")
+	else if(current_type == "install")
 		user.visible_message("<span class='notice'> [user] has installed \the [tool] into [target]'s [affected.name].</span>", \
 		"<span class='notice'> You have installed \the [tool] into [target]'s [affected.name].</span>")
 
 		var/obj/item/device/mmi/M = tool
 		var/obj/item/organ/internal/brain/mmi_holder/holder = new()
-		if (istype(M, /obj/item/device/mmi/posibrain))
+		if(istype(M, /obj/item/device/mmi/posibrain))
 			holder.robotize()
 
 		holder.insert(target)
@@ -461,7 +461,7 @@
 /datum/surgery_step/robotics/manipulate_robotic_organs/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 
 	if(current_type == "mend")
-		if (!hasorgans(target))
+		if(!hasorgans(target))
 			return
 		var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
@@ -483,7 +483,7 @@
 		user.visible_message("<span class='warning'> [user]'s hand slips, disconnecting \the [tool].</span>", \
 		"<span class='warning'> Your hand slips, disconnecting \the [tool].</span>")
 
-	else if (current_type == "install")
+	else if(current_type == "install")
 		user.visible_message("<span class='warning'> [user]'s hand slips!</span>.", \
 		"<span class='warning'> Your hand slips!</span>")
 	else if(current_type == "finish")
@@ -549,7 +549,7 @@
 
 		var/obj/item/device/mmi/M = tool
 		var/obj/item/organ/internal/brain/mmi_holder/holder = new()
-		if (istype(M, /obj/item/device/mmi/posibrain))
+		if(istype(M, /obj/item/device/mmi/posibrain))
 			holder.robotize()
 
 		holder.insert(target)
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 672ae3ac804..8a60718ccbf 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -130,8 +130,8 @@
 
 //returns how well tool is suited for this step
 /datum/surgery_step/proc/tool_quality(obj/item/tool)
-	for (var/T in allowed_tools)
-		if (istype(tool,T))
+	for(var/T in allowed_tools)
+		if(istype(tool,T))
 			return allowed_tools[T]
 	return 0
 
@@ -160,13 +160,13 @@
 /datum/surgery_step/proc/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 	if(ishuman(target))
 		var/obj/item/organ/external/affected = target.get_organ(target_zone)
-		if (can_infect && affected)
+		if(can_infect && affected)
 			spread_germs_to_organ(affected, user)
-	if (ishuman(user) && !(istype(target,/mob/living/carbon/alien)) && prob(60))
+	if(ishuman(user) && !(istype(target,/mob/living/carbon/alien)) && prob(60))
 		var/mob/living/carbon/human/H = user
-		if (blood_level)
+		if(blood_level)
 			H.bloody_hands(target,0)
-		if (blood_level > 1)
+		if(blood_level > 1)
 			H.bloody_body(target,0)
 	return
 
@@ -192,7 +192,7 @@
 /proc/sort_surgeries()
 	var/gap = surgery_steps.len
 	var/swapped = 1
-	while (gap > 1 || swapped)
+	while(gap > 1 || swapped)
 		swapped = 0
 		if(gap > 1)
 			gap = round(gap / 1.247330950103979)
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index b878034ff4a..2e47438eb44 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -5,7 +5,7 @@
 	icon_state = "retractor"
 	materials = list(MAT_METAL=6000, MAT_GLASS=3000)
 	flags = CONDUCT
-	w_class = 2.0
+	w_class = 2
 	origin_tech = "materials=1;biotech=1"
 
 
@@ -16,7 +16,7 @@
 	icon_state = "hemostat"
 	materials = list(MAT_METAL=5000, MAT_GLASS=2500)
 	flags = CONDUCT
-	w_class = 1.0
+	w_class = 1
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "pinched")
 
@@ -28,7 +28,7 @@
 	icon_state = "cautery"
 	materials = list(MAT_METAL=2500, MAT_GLASS=750)
 	flags = CONDUCT
-	w_class = 1.0
+	w_class = 1
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("burnt")
 
@@ -44,7 +44,7 @@
 	force = 15.0
 	sharp = 1
 	edge = 1
-	w_class = 3.0
+	w_class = 3
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("drilled")
 
@@ -63,7 +63,7 @@
 	force = 10.0
 	sharp = 1
 	edge = 1
-	w_class = 1.0
+	w_class = 1
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
@@ -124,7 +124,7 @@
 	force = 15.0
 	sharp = 1
 	edge = 1
-	w_class = 3.0
+	w_class = 3
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
@@ -138,7 +138,7 @@
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "bone-gel"
 	force = 0
-	w_class = 2.0
+	w_class = 2
 	throwforce = 1.0
 	origin_tech = "materials=1;biotech=1"
 
@@ -149,7 +149,7 @@
 	force = 0
 	throwforce = 1.0
 	origin_tech = "materials=1;biotech=1"
-	w_class = 2.0
+	w_class = 2
 
 /obj/item/weapon/bonesetter
 	name = "bone setter"
@@ -159,7 +159,7 @@
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
-	w_class = 2.0
+	w_class = 2
 	attack_verb = list("attacked", "hit", "bludgeoned")
 	origin_tech = "materials=1;biotech=1"
 
@@ -168,6 +168,6 @@
 	desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "surgical_drapes"
-	w_class = 1.0
+	w_class = 1
 	origin_tech = "biotech=1"
 	attack_verb = list("slapped")
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index 97962435e7d..ee698cec30f 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -4,7 +4,7 @@ var/list/GPS_list = list()
 	desc = "Helping lost spacemen find their way through the planets since 2016."
 	icon = 'icons/obj/telescience.dmi'
 	icon_state = "gps-c"
-	w_class = 2.0
+	w_class = 2
 	slot_flags = SLOT_BELT
 	origin_tech = "programming=2;engineering=2"
 	var/gpstag = "COM0"
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index b542f968516..a9585abfb80 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -79,7 +79,7 @@
 		..()
 
 /obj/machinery/computer/telescience/emag_act(user as mob)
-	if (!emagged)
+	if(!emagged)
 		to_chat(user, "\blue You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!")
 		emagged = 1
 	else
@@ -252,7 +252,7 @@
 					log_msg += "[key_name(T)], "
 				else
 					log_msg += "[ROI.name]"
-					if (istype(ROI, /obj/structure/closet))
+					if(istype(ROI, /obj/structure/closet))
 						var/obj/structure/closet/C = ROI
 						log_msg += " ("
 						for(var/atom/movable/Q as mob|obj in C)
@@ -260,7 +260,7 @@
 								log_msg += "[key_name(Q)], "
 							else
 								log_msg += "[Q.name], "
-						if (dd_hassuffix(log_msg, "("))
+						if(dd_hassuffix(log_msg, "("))
 							log_msg += "empty)"
 						else
 							log_msg = dd_limittext(log_msg, length(log_msg) - 2)
@@ -268,7 +268,7 @@
 					log_msg += ", "
 				do_teleport(ROI, dest)
 
-			if (dd_hassuffix(log_msg, ", "))
+			if(dd_hassuffix(log_msg, ", "))
 				log_msg = dd_limittext(log_msg, length(log_msg) - 2)
 			else
 				log_msg += "nothing"
@@ -289,7 +289,7 @@
 		temp_msg = "ERROR!<BR>Elevation is less than 1 or greater than 90."
 		return
 	if(z_co == 2 || z_co < 1 || z_co > 6)
-		if (z_co == 7 & emagged == 1)
+		if(z_co == 7 & emagged == 1)
 		// This should be empty, allows for it to continue if the z-level is 7 and the machine is emagged.
 		else
 			telefail()
diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm
index cbe016c5bad..8aebf1a2f1f 100644
--- a/code/modules/tooltip/tooltip.dm
+++ b/code/modules/tooltip/tooltip.dm
@@ -41,7 +41,7 @@ Notes:
 
 
 /datum/tooltip/New(client/C)
-	if (C)
+	if(C)
 		owner = C
 		owner << browse(file2text(file), "window=[control]")
 
@@ -49,21 +49,21 @@ Notes:
 
 
 /datum/tooltip/proc/show(atom/movable/thing, params = null, title = null, content = null, theme = "default", special = "none")
-	if (!thing || !params || (!title && !content) || !owner || !isnum(world.icon_size))
+	if(!thing || !params || (!title && !content) || !owner || !isnum(world.icon_size))
 		return 0
-	if (!init)
+	if(!init)
 		//Initialize some vars
 		init = 1
 		owner << output(list2params(list(world.icon_size, control)), "[control]:tooltip.init")
 
 	showing = 1
 
-	if (title && content)
+	if(title && content)
 		title = "<h1>[title]</h1>"
 		content = "<p>[content]</p>"
-	else if (title && !content)
+	else if(title && !content)
 		title = "<p>[title]</p>"
-	else if (!title && content)
+	else if(!title && content)
 		content = "<p>[content]</p>"
 
 	//Make our dumb param object
@@ -74,7 +74,7 @@ Notes:
 
 	//If a hide() was hit while we were showing, run hide() again to avoid stuck tooltips
 	showing = 0
-	if (queueHide)
+	if(queueHide)
 		hide()
 
 	return 1
diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html
index 9fa0702a2b3..0be70b4229d 100644
--- a/code/modules/tooltip/tooltip.html
+++ b/code/modules/tooltip/tooltip.html
@@ -102,7 +102,7 @@
 				window.location = 'byond://winset?id='+tooltip.control+';is-visible=false';
 			},
 			updateCallback: function(map) {
-				if (typeof map === 'undefined' || !map) {return false;}
+				if(typeof map === 'undefined' || !map) {return false;}
 
 				//alert(tooltip.params+' | '+tooltip.clientView+' | '+tooltip.text+' | '+tooltip.theme); //DEBUG
 
@@ -123,7 +123,7 @@
 
 				//Parse out the tile and cursor locations from params (e.g. "icon-x=32;icon-y=29;screen-loc=3:10,15:29")
 				var paramsA = tooltip.params.cursor.split(';');
-				if (paramsA.length < 3) {return false;} //Sometimes screen-loc is never sent ahaha fuck you byond
+				if(paramsA.length < 3) {return false;} //Sometimes screen-loc is never sent ahaha fuck you byond
 				//icon-x
 				var iconX = paramsA[0];
 				iconX = iconX.split('=');
@@ -136,10 +136,10 @@
 				var screenLoc = paramsA[2];
 				screenLoc = screenLoc.split('=');
 				screenLoc = screenLoc[1].split(',');
-				if (screenLoc.length < 2) {return false;}
+				if(screenLoc.length < 2) {return false;}
 				var left = screenLoc[0];
 				var top = screenLoc[1];
-				if (!left || !top) {return false;}
+				if(!left || !top) {return false;}
 				screenLoc = left.split(':');
 				left = parseInt(screenLoc[0]);
 				var enteredX = parseInt(screenLoc[1]);
@@ -152,26 +152,26 @@
 				var oScreenLoc = tooltip.params.screenLoc.split(','); //o for original ok
 
 				var west = oScreenLoc[0].split(':');
-				if (west.length > 1) { //Only if west has a pixel offset
+				if(west.length > 1) { //Only if west has a pixel offset
 					var westOffset = parseInt(west[1]);
-					if (westOffset !== 0) {
-						if ((iconX + westOffset) !== enteredX) { //Cursor entered on the offset tile
+					if(westOffset !== 0) {
+						if((iconX + westOffset) !== enteredX) { //Cursor entered on the offset tile
 							left = left + (westOffset < 0 ? 1 : -1);
 						}
 						leftOffset = leftOffset + (westOffset * resizeRatio);
 					}
 				}
 
-				if (oScreenLoc.length > 1) { //If north is given
+				if(oScreenLoc.length > 1) { //If north is given
 					var north = oScreenLoc[1].split(':');
-					if (north.length > 1) { //Only if north has a pixel offset
+					if(north.length > 1) { //Only if north has a pixel offset
 						var northOffset = parseInt(north[1]);
-						if (northOffset !== 0) {
-							if ((iconY + northOffset) === enteredY) { //Cursor entered on the original tile
+						if(northOffset !== 0) {
+							if((iconY + northOffset) === enteredY) { //Cursor entered on the original tile
 								top--;
 								topOffset = topOffset - ((tooltip.tileSize + northOffset) * resizeRatio);
 							} else { //Cursor entered on the offset tile
-								if (northOffset < 0) { //Offset southwards
+								if(northOffset < 0) { //Offset southwards
 									topOffset = topOffset - ((tooltip.tileSize + northOffset) * resizeRatio);
 								} else { //Offset northwards
 									top--;
@@ -183,7 +183,7 @@
 				}
 
 				//Handle special cases (for fuck sake)
-				if (tooltip.special !== 'none') {
+				if(tooltip.special !== 'none') {
 					//Put yo special cases here
 				}
 
@@ -210,7 +210,7 @@
 				var docWidth	= $wrap.outerWidth(),
 					docHeight	= $wrap.outerHeight();
 
-				if (posY + docHeight > map.size.y) { //Is the bottom edge below the window? Snap it up if so
+				if(posY + docHeight > map.size.y) { //Is the bottom edge below the window? Snap it up if so
 					posY = (posY - docHeight) - realIconSize - tooltip.padding;
 				}
 
diff --git a/code/world.dm b/code/world.dm
index ac46204cca5..3aa661aeb05 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -100,9 +100,9 @@ var/world_topic_spam_protect_time = world.timeofday
 	var/list/input = params2list(T)
 	var/key_valid = (config.comms_password && input["key"] == config.comms_password) //no password means no comms, not any password
 
-	if ("ping" in input)
+	if("ping" in input)
 		var/x = 1
-		for (var/client/C)
+		for(var/client/C)
 			x++
 		return x
 
@@ -113,7 +113,7 @@ var/world_topic_spam_protect_time = world.timeofday
 				n++
 		return n
 
-	else if ("status" in input)
+	else if("status" in input)
 		var/list/s = list()
 		var/list/admins = list()
 		s["version"] = game_version
@@ -226,7 +226,7 @@ var/world_topic_spam_protect_time = world.timeofday
 	return "Bad Key"
 
 /world/Reboot(var/reason, var/feedback_c, var/feedback_r, var/time)
-	if (reason == 1) //special reboot, do none of the normal stuff
+	if(reason == 1) //special reboot, do none of the normal stuff
 		if(usr)
 			message_admins("[key_name_admin(usr)] has requested an immediate world restart via client side debugging tools")
 			log_admin("[key_name(usr)] has requested an immediate world restart via client side debugging tools")
@@ -282,7 +282,7 @@ var/world_topic_spam_protect_time = world.timeofday
 					log_access("AFK: [key_name(C)]")
 					to_chat(C, "\red You have been inactive for more than 10 minutes and have been disconnected.")
 					del(C)
-		if ( ((world.timeofday - sleep_check) > work_length) || ((world.timeofday - sleep_check) < 0) )
+		if( ((world.timeofday - sleep_check) > work_length) || ((world.timeofday - sleep_check) < 0) )
 			sleep(sleep_length)
 			sleep_check = world.timeofday
 		waiting++
@@ -295,7 +295,7 @@ var/world_topic_spam_protect_time = world.timeofday
 		while(1)
 			sleep(DISCONNECTED_DELETE)
 			for(var/mob/living/carbon/human/C in living_mob_list)
-				if (dd_hasprefix(C.key,@)) return
+				if(dd_hasprefix(C.key,@)) return
 				if(!C.client && C.brain_op_stage!=4.0 && C.lastKnownIP)
 					sleep(600)
 					if(!C.client && C.stat != DEAD && C.brain_op_stage!=4.0)
@@ -353,7 +353,7 @@ var/world_topic_spam_protect_time = world.timeofday
 /world/proc/update_status()
 	var/s = ""
 
-	if (config && config.server_name)
+	if(config && config.server_name)
 		s += "<b>[config.server_name]</b> &#8212; "
 
 	s += "<b>[station_name()]</b>";
@@ -375,41 +375,41 @@ var/world_topic_spam_protect_time = world.timeofday
 	else
 		features += "<b>STARTING</b>"
 
-	if (!enter_allowed)
+	if(!enter_allowed)
 		features += "closed"
 
 	features += abandon_allowed ? "respawn" : "no respawn"
 
-	if (config && config.allow_vote_mode)
+	if(config && config.allow_vote_mode)
 		features += "vote"
 
-	if (config && config.allow_ai)
+	if(config && config.allow_ai)
 		features += "AI allowed"
 
 	var/n = 0
-	for (var/mob/M in player_list)
-		if (M.client)
+	for(var/mob/M in player_list)
+		if(M.client)
 			n++
 
-	if (n > 1)
+	if(n > 1)
 		features += "~[n] players"
-	else if (n > 0)
+	else if(n > 0)
 		features += "~[n] player"
 
 	/*
 	is there a reason for this? the byond site shows 'hosted by X' when there is a proper host already.
-	if (host)
+	if(host)
 		features += "hosted by <b>[host]</b>"
 	*/
 
-//	if (!host && config && config.hostedby)
+//	if(!host && config && config.hostedby)
 //		features += "hosted by <b>[config.hostedby]</b>"
 
-	if (features)
+	if(features)
 		s += ": [jointext(features, ", ")]"
 
 	/* does this help? I do not know */
-	if (src.status != s)
+	if(src.status != s)
 		src.status = s
 
 #define FAILED_DB_CONNECTION_CUTOFF 5
@@ -439,7 +439,7 @@ proc/setup_database_connection()
 
 	dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
 	. = dbcon.IsConnected()
-	if ( . )
+	if( . )
 		failed_db_connections = 0	//If this connection succeeded, reset the failed connections counter.
 	else
 		failed_db_connections++		//If it failed, increase the failed connections counter.
diff --git a/config/example/config.txt b/config/example/config.txt
index 1ed02a543d1..ca829933479 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -317,4 +317,7 @@ PLAYER_REROUTE_CAP 0
 #DISABLE_LOBBY_MUSIC
 
 ## Uncomment this if you want to disable the popup alert for people on the same CID
-#DISABLE_CID_WARN_POPUP
\ No newline at end of file
+#DISABLE_CID_WARN_POPUP
+
+## How many loadout points players may spend in character setup
+#MAX_LOADOUT_POINTS 5
\ No newline at end of file
diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm
index 39fd96a722e..b0aad73286d 100644
--- a/goon/code/datums/browserOutput.dm
+++ b/goon/code/datums/browserOutput.dm
@@ -31,7 +31,8 @@ var/list/chatResources = list(
 		return 0
 
 	if(!winexists(owner, "browseroutput"))
-		alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.")
+		spawn()
+			alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.")
 		broken = TRUE
 		return 0
 
diff --git a/html/browser/delay_interactivity.js b/html/browser/delay_interactivity.js
new file mode 100644
index 00000000000..f621906337b
--- /dev/null
+++ b/html/browser/delay_interactivity.js
@@ -0,0 +1,26 @@
+// Disables all links for one second after the browser window opens.
+
+(function(){
+  // If there's already an onload, let's not clobber it
+  var oldonload = window.onload;
+  window.onload = function(){
+    if(typeof oldonload == 'function'){
+      oldonload();
+    }
+    var onclicks = Array();
+    var links = document.getElementsByTagName("a");
+    var returnfalse = function(){return false;};
+    for(var i = 0; i < links.length; i++){
+      onclicks.push(links[i].onclick);
+      links[i].onclick = returnfalse;
+    }
+    setTimeout(function(){
+      for(var i = 0; i < links.length; i++){
+        // Reset onclick, but only if something else hasn't already changed it
+        if(links[i].onclick == returnfalse){
+          links[i].onclick = onclicks[i];
+        }
+      }
+    }, 1000);
+  };
+})();
diff --git a/html/changelog.html b/html/changelog.html
index 78b8faec193..bc903312b77 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,207 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">09 July 2016</h2>
+			<h3 class="author">Chakirski updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds disabled_component() to cyborgs.</li>
+				<li class="bugfix">EMPs now disable binary communication for as long as the stun time.</li>
+				<li class="tweak">Syndicate thermal imaging glasses (mesons) can now be prescription upgraded like normal mesons.</li>
+				<li class="tweak">Green glasses from the AutoDrobe can now be prescription upgraded.</li>
+			</ul>
+			<h3 class="author">FalseIncarnate updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Deepfryers are no longer arcane mysteries, and can be (de)constructed and upgraded.</li>
+			</ul>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Grenade have a chance to explode when the person holding them is shot</li>
+				<li class="rscadd">Flamethrowers can release their tank's contents if the person holding them is shot</li>
+				<li class="tweak">Can no longer self-trigger blocked shield events (ie: no self-harm to trigger a reactive teleport armor)</li>
+				<li class="tweak">Hugging someone/shaking them up bypasses shield checks (oh no, hugs of death)</li>
+				<li class="tweak">Riot shields have a +30% chance to block thrown projectiles</li>
+				<li class="tweak">Hunter pounces are now a thrown attack as far as shield go, and yes, can be blocked by riot shields now</li>
+				<li class="tweak">Energy shields no longer block anything other than beam and energy projectiles</li>
+				<li class="tweak">Being able to be pushed is based on the block chance of the item you're holding instead of it just being based on riot shields</li>
+				<li class="rscadd">Adds in cursed wizard heart, purchase it from the wizard's spell book for 1 point, but be wary of not keeping the heart beating...</li>
+			</ul>
+			<h3 class="author">FreeStylaLT updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a bunch of new items to maint, some rare uplink gear included. (see PR for full list)</li>
+				<li class="tweak">made gas masks, nothing and extinguishers less common in maint</li>
+			</ul>
+			<h3 class="author">Krausus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Players probably won't get stuck as plants forever anymore. Probably.</li>
+				<li class="tweak">Refactored job ban checking, which should massively reduce round start-up time.</li>
+				<li class="bugfix">Job bans/unbans will now take effect instantly, rather than at the next server restart.</li>
+			</ul>
+			<h3 class="author">TheDZD updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">DNA injectors no longer always activate powers that are supposed to have a chance to activate.</li>
+				<li class="tweak">Dionae can no longer activate the radiation disability, nor the run superpower except via adminbus.</li>
+				<li class="rscadd">Adds genetic instability, which causes a variety of negative effects, including toxin damage, burn damage, cloneloss, and even gibbing. Effects get worse as stability gets lower, burn damage starts below 85 stability, tox and clone below 70, and gibbing once you're below 40.</li>
+				<li class="rscadd">Adds Curse of the Cluwne touch attack spell, which wizards can pick, heavily based off of the same spell from Goonstation. Said spell adds an unremovable honk tumor to the target, gives them NODROP neon green clown gear, makes them stutter, makes them almost eternally fat, confuses them, makes them clumsy and speak in Comic Sans, and severely brain damages them. Use it on a cluwne however...</li>
+				<li class="bugfix">Fixes a bug where honk tumors would cause NODROP items to still be moved, despite being unable to be unequipped.</li>
+			</ul>
+			<h3 class="author">TullyBurnalot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Botanist access to the morgue revoked</li>
+				<li class="tweak">Added custom messages for evil faxes</li>
+				<li class="tweak">Added unique text body for each non-evil fax template</li>
+				<li class="rscadd">Added a "Keep up the good work" fax template</li>
+				<li class="rscadd">Added a "ERT Instructions" fax template</li>
+				<li class="rscadd">Photocopiers can be emagged</li>
+				<li class="rscadd">Emagged photocopiers deal 30 burn damage to all mobs copying their butts</li>
+				<li class="tweak">Deconstructing Comfy Chairs yields 2 metal sheets</li>
+				<li class="tweak">Boxes no longer allowed inside evidence bags to prevent them going into themselves</li>
+				<li class="tweak">Monocles are now prescription upgradable</li>
+				<li class="rscadd">Monocles added to Loadout selection</li>
+				<li class="tweak">Spinning a revolver's chamber makes a noise again</li>
+				<li class="tweak">Revenants can actually be killed now.</li>
+				<li class="tweak">AntagHUD activation disqualifies player from rebooted drones</li>
+				<li class="tweak">Sergeant Ian hat now visible</li>
+			</ul>
+			<h3 class="author">Twinmold updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes the inconsistency of getting 2 metal rods when you wirecutter a destroyed grille down to 1.</li>
+			</ul>
+
+			<h2 class="date">07 July 2016</h2>
+			<h3 class="author">Ar3nn updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Adds tech levels to RnD console main menu</li>
+			</ul>
+			<h3 class="author">FalseIncarnate updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Chicks no longer lose their souls (literally) when becoming adults.</li>
+				<li class="bugfix">Intercoms, fire alarms, and air alarms no longer contain internal portals to a realm of infinite cables and circuit boards.</li>
+			</ul>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Space lube damage removed and duration reduced from 7 to 5</li>
+				<li class="tweak">Azide and CLF3+Firefighting foam now play a bang sound when mixed</li>
+				<li class="rscadd">Can now pet pAI's with help intent</li>
+				<li class="bugfix">Fixes sechuds and nightvision sechuds having flash protection</li>
+			</ul>
+			<h3 class="author">FreeStylaLT updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added windows and a missing firelock to Genetics/Cloning</li>
+				<li class="tweak">Tweaked layout of Genetics slightly</li>
+				<li class="rscadd">Added photocopier to R&D.</li>
+				<li class="tweak">Tweaked RD's office layout slightly</li>
+				<li class="tweak">Changed access on Tcomms' external airlocks' buttons to be same as general Tcomms access</li>
+				<li class="bugfix">fixed the airless tiles in Assembly Line's windows</li>
+			</ul>
+			<h3 class="author">KasparoVy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Adds improved Vox mask/goggle sprites.</li>
+				<li class="imageadd">Adds Vox-compatible versions of most suits.</li>
+				<li class="rscadd">Adds species-fitting and icon override handling to clothing accessories and suit collars.</li>
+				<li class="rscadd">You can now open/close Clown Officer and Soldier coats.</li>
+				<li class="rscadd">Adds by-species tail hiding.</li>
+				<li class="tweak">Tidies up and refactors the way the Captain's space helmet shows Vox hair but hides every other species'.</li>
+				<li class="bugfix">Reactive armour's sprite will now update as soon as you turn it on/off or EMP it.</li>
+			</ul>
+			<h3 class="author">Krausus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed borers dying in hosts who happened to be somewhere cold, such as space. Even if their host was in a space suit.</li>
+				<li class="bugfix">Fixed borers forgetting to detach from a host when it died.</li>
+				<li class="bugfix">Fixed borers being able to assume control of a dead host.</li>
+				<li class="bugfix">Fixed dead borers in a host being able to speak with the host and ghosts.</li>
+				<li class="bugfix">Fixed employees starting every shift at least 3 minutes late. You aren't getting paid to stand around, people!</li>
+				<li class="bugfix">Fixed animal beatdowns being twice as noisy as they should be.</li>
+				<li class="bugfix">Pod lock busters should now properly bust pod locks.</li>
+				<li class="bugfix">The late-stage effects of the "sensory destruction" disease symptom should now properly destroy your senses.</li>
+				<li class="bugfix">Autotraitor should now continue picking new in-game traitors, instead of picking one and dying.</li>
+				<li class="bugfix">Lacking a head no longer makes you immune to becoming a husk or skeleton.</li>
+				<li class="bugfix">Security and medical records should probably stop crashing people.</li>
+				<li class="bugfix">Altering details on an Agent ID Card will now actually update what's seen when examining the card.</li>
+			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Fixes NT Special Ops Officer's headset so he can correctly hear, and talk on, the Special Ops (deathsquad) channel.</li>
+				<li class="bugfix">Fixed oversight in keycard authentication devices that incorrectly treated trialmins like fullmins, resulting in situations where calling an ERT became impossible.</li>
+				<li class="tweak">If an ERT request gets no answer for 5 minutes, admins now get a one time reminder that it was sent.</li>
+			</ul>
+			<h3 class="author">TheDZD updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Burst fire selection is now a proc, as it was meant to be, rather than a verb.</li>
+			</ul>
+			<h3 class="author">TullyBurnalot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">AI can no longer interact with IV Drips</li>
+				<li class="tweak">Robots can no longer remove beakers/blood bags from IV Drips</li>
+				<li class="bugfix">Fixed clown door deconstruction</li>
+				<li class="bugfix">Fixed mime door deconstruction</li>
+			</ul>
+
+			<h2 class="date">02 July 2016</h2>
+			<h3 class="author">Fethas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">adds comfirmation dialogs to transforms from player panel</li>
+			</ul>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds in laughter demons</li>
+				<li class="rscadd">Can summon laughter demons as a wizard</li>
+				<li class="rscadd">Chem master can produce instantaneous medical patches if all chems are safe</li>
+				<li class="rscadd">Can now purchase sniper rifle and associated ammo on uplink during nuke ops</li>
+				<li class="tweak">Most melee and laser armor values halved or reduced; some bullet armor reduced slightly</li>
+				<li class="tweak">Slowdown on most armor and spacesuits reduced by 1 (chaplain armor is still slow though)</li>
+				<li class="tweak">Mining armor caps out at 60 melee resist as opposed to 80</li>
+				<li class="tweak">Ling melee armor reduced; bullet and laser values buffed a bit and slowdown removed</li>
+				<li class="tweak">Chameleon jumpsuit has a little bit of armor</li>
+				<li class="tweak">Detective's forensic jacket now has identical armor to the native detective jacket</li>
+				<li class="tweak">Armor penetration added to energy swords, chainsaws, scythes, and spears</li>
+				<li class="bugfix">Fixes stun batons, telebatons, and abductor batons piercing/bypassing shields</li>
+			</ul>
+			<h3 class="author">FreeStylaLT updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds appropriate battle yells to sleeping carp</li>
+			</ul>
+			<h3 class="author">KasparoVy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Engineer boots that've had their toes cut open now have a sprite.</li>
+				<li class="imageadd">Vox now have engineer workboot sprites.</li>
+				<li class="imagedel">Removes unused SWAT boot sprites that were really just copypasted jackboot sprites.</li>
+			</ul>
+			<h3 class="author">Krausus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The late-join job listing is now big enough to show all the jobs at once, and organizes them into labeled categories.</li>
+				<li class="bugfix">Fixed Hotkey Help and hotkey mode toggle messages not appearing.</li>
+				<li class="tweak">The late-join job listing will now ignore (mis)clicks for the first second after popping up.</li>
+			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">"Loyalty" implants are now known as "Mindshield" implants</li>
+				<li class="tweak">Admins playing CC jobs can no longer get antag status from autotraitor.</li>
+			</ul>
+			<h3 class="author">Tastyfish updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">There's essentially a completely new space hotel map! Explorers rejoice!</li>
+			</ul>
+			<h3 class="author">TheDZD updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Chance for vampires to burn in the chapel has been greatly reduced (from a 35% chance down to 8% per tick).</li>
+				<li class="tweak">Vampires do not scream from chapel/space burning until they actually start catching fire.</li>
+				<li class="tweak">Threshold for vampires to catch fire from space/chapel burning changed from 60 health to 50 health.</li>
+				<li class="tweak">Fire stacks from vampire burning no longer apply twice 35% of the time while below the health threshold.</li>
+			</ul>
+			<h3 class="author">VampyrBytes updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">No more *me emoting from your corpse!</li>
+			</ul>
+			<h3 class="author">monster860 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes ghosts having a generic icon when darkness is toggled off</li>
+			</ul>
+			<h3 class="author">tigercat2000 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">There's a new tab in the character setup screen, "loadouts". This allows you to spawn with a limited number of preset items.</li>
+				<li class="tweak">Character setup now uses #defines for the different tabs.</li>
+			</ul>
+
 			<h2 class="date">28 June 2016</h2>
 			<h3 class="author">CrAzYPiLoT updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 29c68feb153..0479451006d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1941,3 +1941,198 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: All uses of \icon have been replaced with bicon()
   tkdrg:
   - rscadd: Admins now have a verb to wipe all scripts from telecomms.
+2016-07-02:
+  Fethas:
+  - bugfix: adds comfirmation dialogs to transforms from player panel
+  Fox McCloud:
+  - rscadd: Adds in laughter demons
+  - rscadd: Can summon laughter demons as a wizard
+  - rscadd: Chem master can produce instantaneous medical patches if all chems are
+      safe
+  - rscadd: Can now purchase sniper rifle and associated ammo on uplink during nuke
+      ops
+  - tweak: Most melee and laser armor values halved or reduced; some bullet armor
+      reduced slightly
+  - tweak: Slowdown on most armor and spacesuits reduced by 1 (chaplain armor is still
+      slow though)
+  - tweak: Mining armor caps out at 60 melee resist as opposed to 80
+  - tweak: Ling melee armor reduced; bullet and laser values buffed a bit and slowdown
+      removed
+  - tweak: Chameleon jumpsuit has a little bit of armor
+  - tweak: Detective's forensic jacket now has identical armor to the native detective
+      jacket
+  - tweak: Armor penetration added to energy swords, chainsaws, scythes, and spears
+  - bugfix: Fixes stun batons, telebatons, and abductor batons piercing/bypassing
+      shields
+  FreeStylaLT:
+  - rscadd: Adds appropriate battle yells to sleeping carp
+  KasparoVy:
+  - imageadd: Engineer boots that've had their toes cut open now have a sprite.
+  - imageadd: Vox now have engineer workboot sprites.
+  - imagedel: Removes unused SWAT boot sprites that were really just copypasted jackboot
+      sprites.
+  Krausus:
+  - tweak: The late-join job listing is now big enough to show all the jobs at once,
+      and organizes them into labeled categories.
+  - bugfix: Fixed Hotkey Help and hotkey mode toggle messages not appearing.
+  - tweak: The late-join job listing will now ignore (mis)clicks for the first second
+      after popping up.
+  Kyep:
+  - tweak: '"Loyalty" implants are now known as "Mindshield" implants'
+  - tweak: Admins playing CC jobs can no longer get antag status from autotraitor.
+  Tastyfish:
+  - rscadd: There's essentially a completely new space hotel map! Explorers rejoice!
+  TheDZD:
+  - tweak: Chance for vampires to burn in the chapel has been greatly reduced (from
+      a 35% chance down to 8% per tick).
+  - tweak: Vampires do not scream from chapel/space burning until they actually start
+      catching fire.
+  - tweak: Threshold for vampires to catch fire from space/chapel burning changed
+      from 60 health to 50 health.
+  - tweak: Fire stacks from vampire burning no longer apply twice 35% of the time
+      while below the health threshold.
+  VampyrBytes:
+  - bugfix: No more *me emoting from your corpse!
+  monster860:
+  - bugfix: Fixes ghosts having a generic icon when darkness is toggled off
+  tigercat2000:
+  - rscadd: There's a new tab in the character setup screen, "loadouts". This allows
+      you to spawn with a limited number of preset items.
+  - tweak: 'Character setup now uses #defines for the different tabs.'
+2016-07-07:
+  Ar3nn:
+  - tweak: Adds tech levels to RnD console main menu
+  FalseIncarnate:
+  - bugfix: Chicks no longer lose their souls (literally) when becoming adults.
+  - bugfix: Intercoms, fire alarms, and air alarms no longer contain internal portals
+      to a realm of infinite cables and circuit boards.
+  Fox McCloud:
+  - tweak: Space lube damage removed and duration reduced from 7 to 5
+  - tweak: Azide and CLF3+Firefighting foam now play a bang sound when mixed
+  - rscadd: Can now pet pAI's with help intent
+  - bugfix: Fixes sechuds and nightvision sechuds having flash protection
+  FreeStylaLT:
+  - rscadd: Added windows and a missing firelock to Genetics/Cloning
+  - tweak: Tweaked layout of Genetics slightly
+  - rscadd: Added photocopier to R&D.
+  - tweak: Tweaked RD's office layout slightly
+  - tweak: Changed access on Tcomms' external airlocks' buttons to be same as general
+      Tcomms access
+  - bugfix: fixed the airless tiles in Assembly Line's windows
+  KasparoVy:
+  - imageadd: Adds improved Vox mask/goggle sprites.
+  - imageadd: Adds Vox-compatible versions of most suits.
+  - rscadd: Adds species-fitting and icon override handling to clothing accessories
+      and suit collars.
+  - rscadd: You can now open/close Clown Officer and Soldier coats.
+  - rscadd: Adds by-species tail hiding.
+  - tweak: Tidies up and refactors the way the Captain's space helmet shows Vox hair
+      but hides every other species'.
+  - bugfix: Reactive armour's sprite will now update as soon as you turn it on/off
+      or EMP it.
+  Krausus:
+  - bugfix: Fixed borers dying in hosts who happened to be somewhere cold, such as
+      space. Even if their host was in a space suit.
+  - bugfix: Fixed borers forgetting to detach from a host when it died.
+  - bugfix: Fixed borers being able to assume control of a dead host.
+  - bugfix: Fixed dead borers in a host being able to speak with the host and ghosts.
+  - bugfix: Fixed employees starting every shift at least 3 minutes late. You aren't
+      getting paid to stand around, people!
+  - bugfix: Fixed animal beatdowns being twice as noisy as they should be.
+  - bugfix: Pod lock busters should now properly bust pod locks.
+  - bugfix: The late-stage effects of the "sensory destruction" disease symptom should
+      now properly destroy your senses.
+  - bugfix: Autotraitor should now continue picking new in-game traitors, instead
+      of picking one and dying.
+  - bugfix: Lacking a head no longer makes you immune to becoming a husk or skeleton.
+  - bugfix: Security and medical records should probably stop crashing people.
+  - bugfix: Altering details on an Agent ID Card will now actually update what's seen
+      when examining the card.
+  Kyep:
+  - tweak: Fixes NT Special Ops Officer's headset so he can correctly hear, and talk
+      on, the Special Ops (deathsquad) channel.
+  - bugfix: Fixed oversight in keycard authentication devices that incorrectly treated
+      trialmins like fullmins, resulting in situations where calling an ERT became
+      impossible.
+  - tweak: If an ERT request gets no answer for 5 minutes, admins now get a one time
+      reminder that it was sent.
+  TheDZD:
+  - bugfix: Burst fire selection is now a proc, as it was meant to be, rather than
+      a verb.
+  TullyBurnalot:
+  - tweak: AI can no longer interact with IV Drips
+  - tweak: Robots can no longer remove beakers/blood bags from IV Drips
+  - bugfix: Fixed clown door deconstruction
+  - bugfix: Fixed mime door deconstruction
+2016-07-09:
+  Chakirski:
+  - rscadd: Adds disabled_component() to cyborgs.
+  - bugfix: EMPs now disable binary communication for as long as the stun time.
+  - tweak: Syndicate thermal imaging glasses (mesons) can now be prescription upgraded
+      like normal mesons.
+  - tweak: Green glasses from the AutoDrobe can now be prescription upgraded.
+  FalseIncarnate:
+  - rscadd: Deepfryers are no longer arcane mysteries, and can be (de)constructed
+      and upgraded.
+  Fox McCloud:
+  - rscadd: Grenade have a chance to explode when the person holding them is shot
+  - rscadd: Flamethrowers can release their tank's contents if the person holding
+      them is shot
+  - tweak: 'Can no longer self-trigger blocked shield events (ie: no self-harm to
+      trigger a reactive teleport armor)'
+  - tweak: Hugging someone/shaking them up bypasses shield checks (oh no, hugs of
+      death)
+  - tweak: Riot shields have a +30% chance to block thrown projectiles
+  - tweak: Hunter pounces are now a thrown attack as far as shield go, and yes, can
+      be blocked by riot shields now
+  - tweak: Energy shields no longer block anything other than beam and energy projectiles
+  - tweak: Being able to be pushed is based on the block chance of the item you're
+      holding instead of it just being based on riot shields
+  - rscadd: Adds in cursed wizard heart, purchase it from the wizard's spell book
+      for 1 point, but be wary of not keeping the heart beating...
+  FreeStylaLT:
+  - rscadd: Added a bunch of new items to maint, some rare uplink gear included. (see
+      PR for full list)
+  - tweak: made gas masks, nothing and extinguishers less common in maint
+  Krausus:
+  - bugfix: Players probably won't get stuck as plants forever anymore. Probably.
+  - tweak: Refactored job ban checking, which should massively reduce round start-up
+      time.
+  - bugfix: Job bans/unbans will now take effect instantly, rather than at the next
+      server restart.
+  TheDZD:
+  - bugfix: DNA injectors no longer always activate powers that are supposed to have
+      a chance to activate.
+  - tweak: Dionae can no longer activate the radiation disability, nor the run superpower
+      except via adminbus.
+  - rscadd: Adds genetic instability, which causes a variety of negative effects,
+      including toxin damage, burn damage, cloneloss, and even gibbing. Effects get
+      worse as stability gets lower, burn damage starts below 85 stability, tox and
+      clone below 70, and gibbing once you're below 40.
+  - rscadd: Adds Curse of the Cluwne touch attack spell, which wizards can pick, heavily
+      based off of the same spell from Goonstation. Said spell adds an unremovable
+      honk tumor to the target, gives them NODROP neon green clown gear, makes them
+      stutter, makes them almost eternally fat, confuses them, makes them clumsy and
+      speak in Comic Sans, and severely brain damages them. Use it on a cluwne however...
+  - bugfix: Fixes a bug where honk tumors would cause NODROP items to still be moved,
+      despite being unable to be unequipped.
+  TullyBurnalot:
+  - rscdel: Botanist access to the morgue revoked
+  - tweak: Added custom messages for evil faxes
+  - tweak: Added unique text body for each non-evil fax template
+  - rscadd: Added a "Keep up the good work" fax template
+  - rscadd: Added a "ERT Instructions" fax template
+  - rscadd: Photocopiers can be emagged
+  - rscadd: Emagged photocopiers deal 30 burn damage to all mobs copying their butts
+  - tweak: Deconstructing Comfy Chairs yields 2 metal sheets
+  - tweak: Boxes no longer allowed inside evidence bags to prevent them going into
+      themselves
+  - tweak: Monocles are now prescription upgradable
+  - rscadd: Monocles added to Loadout selection
+  - tweak: Spinning a revolver's chamber makes a noise again
+  - tweak: Revenants can actually be killed now.
+  - tweak: AntagHUD activation disqualifies player from rebooted drones
+  - tweak: Sergeant Ian hat now visible
+  Twinmold:
+  - bugfix: Fixes the inconsistency of getting 2 metal rods when you wirecutter a
+      destroyed grille down to 1.
diff --git a/html/changelogs/AutoChangeLog-pr-4700.yml b/html/changelogs/AutoChangeLog-pr-4700.yml
deleted file mode 100644
index 4b9428a7ba4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4700.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Tastyfish
-delete-after: True
-changes: 
-  - rscadd: "There's essentially a completely new space hotel map! Explorers rejoice!"
diff --git a/html/changelogs/AutoChangeLog-pr-4777.yml b/html/changelogs/AutoChangeLog-pr-4777.yml
deleted file mode 100644
index a139206bd29..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4777.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Kyep
-delete-after: True
-changes: 
-  - tweak: "\"Loyalty\" implants are now known as \"Mindshield\" implants"
diff --git a/html/changelogs/AutoChangeLog-pr-4794.yml b/html/changelogs/AutoChangeLog-pr-4794.yml
deleted file mode 100644
index a3f98159cde..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4794.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: monster860
-delete-after: True
-changes: 
-  - bugfix: "Fixes ghosts having a generic icon when darkness is toggled off"
diff --git a/html/changelogs/AutoChangeLog-pr-4798.yml b/html/changelogs/AutoChangeLog-pr-4798.yml
deleted file mode 100644
index 1205c1a2848..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4798.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: FreeStylaLT
-delete-after: True
-changes: 
-  - rscadd: "Adds appropriate battle yells to sleeping carp"
diff --git a/html/changelogs/AutoChangeLog-pr-4799.yml b/html/changelogs/AutoChangeLog-pr-4799.yml
deleted file mode 100644
index 2cb3b97b96c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4799.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fethas
-delete-after: True
-changes: 
-  - bugfix: "adds comfirmation dialogs to transforms from player panel"
diff --git a/html/changelogs/AutoChangeLog-pr-4812.yml b/html/changelogs/AutoChangeLog-pr-4812.yml
deleted file mode 100644
index 2277d38eb9f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4812.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: KasparoVy
-delete-after: True
-changes: 
-  - imageadd: "Engineer boots that've had their toes cut open now have a sprite."
-  - imageadd: "Vox now have engineer workboot sprites."
-  - imagedel: "Removes unused SWAT boot sprites that were really just copypasted jackboot sprites."
diff --git a/html/changelogs/AutoChangeLog-pr-4815.yml b/html/changelogs/AutoChangeLog-pr-4815.yml
deleted file mode 100644
index 462b92c49ed..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4815.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Kyep
-delete-after: True
-changes: 
-  - tweak: "Admins playing CC jobs can no longer get antag status from autotraitor."
diff --git a/html/changelogs/AutoChangeLog-pr-4822.yml b/html/changelogs/AutoChangeLog-pr-4822.yml
deleted file mode 100644
index c4ff22970af..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4822.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes: 
-  - rscadd: "Adds in laughter demons"
-  - rscadd: "Can summon laughter demons as a wizard"
diff --git a/html/changelogs/AutoChangeLog-pr-4823.yml b/html/changelogs/AutoChangeLog-pr-4823.yml
deleted file mode 100644
index 16bbcd105af..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4823.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: VampyrBytes
-delete-after: True
-changes: 
-  - bugfix: "No more *me emoting from your corpse!"
diff --git a/html/changelogs/AutoChangeLog-pr-4826.yml b/html/changelogs/AutoChangeLog-pr-4826.yml
deleted file mode 100644
index 3998629cb9d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4826.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Krausus
-delete-after: True
-changes: 
-  - tweak: "The late-join job listing is now big enough to show all the jobs at once, and organizes them into labeled categories."
diff --git a/html/changelogs/AutoChangeLog-pr-4832.yml b/html/changelogs/AutoChangeLog-pr-4832.yml
deleted file mode 100644
index 66243f0b8e9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4832.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: TheDZD
-delete-after: True
-changes: 
-  - tweak: "Chance for vampires to burn in the chapel has been greatly reduced (from a 35% chance down to 8% per tick)."
-  - tweak: "Vampires do not scream from chapel/space burning until they actually start catching fire."
-  - tweak: "Threshold for vampires to catch fire from space/chapel burning changed from 60 health to 50 health."
-  - tweak: "Fire stacks from vampire burning no longer apply twice 35% of the time while below the health threshold."
diff --git a/html/changelogs/AutoChangeLog-pr-4837.yml b/html/changelogs/AutoChangeLog-pr-4837.yml
deleted file mode 100644
index e9a6bb62c25..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4837.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Krausus
-delete-after: True
-changes: 
-  - bugfix: "Fixed Hotkey Help and hotkey mode toggle messages not appearing."
diff --git a/html/changelogs/AutoChangeLog-pr-4916.yml b/html/changelogs/AutoChangeLog-pr-4916.yml
new file mode 100644
index 00000000000..8df9fa04b87
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4916.yml
@@ -0,0 +1,4 @@
+author: Ar3nn
+delete-after: True
+changes: 
+  - rscadd: "Adds a silence button to newscasters, which will silence the regular update sounds"
diff --git a/html/changelogs/AutoChangeLog-pr-4952.yml b/html/changelogs/AutoChangeLog-pr-4952.yml
new file mode 100644
index 00000000000..eaf232c228a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4952.yml
@@ -0,0 +1,5 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - tweak: "Overall borg power useage has been lowered"
+  - tweak: "Borgs who have completely run out of power can now still move around/see/talk, but they will be unable to interact with machinery/doors around them; they can still bump open doors, however. Borgs with no cell are still completely paralyzed and can't do anything."
diff --git a/html/changelogs/AutoChangeLog-pr-4959.yml b/html/changelogs/AutoChangeLog-pr-4959.yml
new file mode 100644
index 00000000000..1d9e2845aa9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4959.yml
@@ -0,0 +1,4 @@
+author: TheDZD
+delete-after: True
+changes: 
+  - rscadd: "Adds \"salts\" as a say verb for deadchat ghosts."
diff --git a/html/changelogs/AutoChangeLog-pr-4976.yml b/html/changelogs/AutoChangeLog-pr-4976.yml
new file mode 100644
index 00000000000..ae783b1d4a4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4976.yml
@@ -0,0 +1,4 @@
+author: monster860
+delete-after: True
+changes: 
+  - bugfix: "Alerts are no broken ghostly outlines"
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 695d701dba3..725d97ce21b 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/goonstation/mob/clothing/feet.dmi b/icons/goonstation/mob/clothing/feet.dmi
new file mode 100644
index 00000000000..73549581095
Binary files /dev/null and b/icons/goonstation/mob/clothing/feet.dmi differ
diff --git a/icons/goonstation/mob/clothing/mask.dmi b/icons/goonstation/mob/clothing/mask.dmi
new file mode 100644
index 00000000000..c4392fb8de7
Binary files /dev/null and b/icons/goonstation/mob/clothing/mask.dmi differ
diff --git a/icons/goonstation/mob/clothing/uniform.dmi b/icons/goonstation/mob/clothing/uniform.dmi
new file mode 100644
index 00000000000..522e83854ec
Binary files /dev/null and b/icons/goonstation/mob/clothing/uniform.dmi differ
diff --git a/icons/goonstation/mob/inhands/clothing_lefthand.dmi b/icons/goonstation/mob/inhands/clothing_lefthand.dmi
new file mode 100644
index 00000000000..363c616d3f8
Binary files /dev/null and b/icons/goonstation/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/goonstation/mob/inhands/clothing_righthand.dmi b/icons/goonstation/mob/inhands/clothing_righthand.dmi
new file mode 100644
index 00000000000..0903e0d2055
Binary files /dev/null and b/icons/goonstation/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/goonstation/objects/clothing/feet.dmi b/icons/goonstation/objects/clothing/feet.dmi
new file mode 100644
index 00000000000..e6d37e10132
Binary files /dev/null and b/icons/goonstation/objects/clothing/feet.dmi differ
diff --git a/icons/goonstation/objects/clothing/mask.dmi b/icons/goonstation/objects/clothing/mask.dmi
new file mode 100644
index 00000000000..f5c4f97c255
Binary files /dev/null and b/icons/goonstation/objects/clothing/mask.dmi differ
diff --git a/icons/goonstation/objects/clothing/uniform.dmi b/icons/goonstation/objects/clothing/uniform.dmi
new file mode 100644
index 00000000000..a602f0cdce5
Binary files /dev/null and b/icons/goonstation/objects/clothing/uniform.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 5adc3ed1509..127b63a154a 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi
index 8c48077682e..a92b79d564e 100644
Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 6703c61b1b7..89719ebca26 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 61c176bd08a..27168c30865 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 652996f8d8c..2f7154777fd 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/species/vox/collar.dmi b/icons/mob/species/vox/collar.dmi
new file mode 100644
index 00000000000..c0b8c6ba936
Binary files /dev/null and b/icons/mob/species/vox/collar.dmi differ
diff --git a/icons/mob/species/vox/eyes.dmi b/icons/mob/species/vox/eyes.dmi
index f761fb361a7..d2ca8399639 100644
Binary files a/icons/mob/species/vox/eyes.dmi and b/icons/mob/species/vox/eyes.dmi differ
diff --git a/icons/mob/species/vox/mask.dmi b/icons/mob/species/vox/mask.dmi
index cd9c224051b..dcf01b87eb5 100644
Binary files a/icons/mob/species/vox/mask.dmi and b/icons/mob/species/vox/mask.dmi differ
diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi
index 895de207c1e..b8340ac1c9c 100644
Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index e162c42a531..ea31b07c4cb 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 6fed8c42c66..28096d4e1a4 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index ccf3bad52b5..40f5b5ddc17 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 3c2ea5a0990..195d6137fca 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 7893396874b..9d6207aa2c3 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 05ccd754f9d..8aacc4a4178 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/cooking_machines.dmi b/icons/obj/cooking_machines.dmi
index 10fee80e60d..9b3031ed5f8 100644
Binary files a/icons/obj/cooking_machines.dmi and b/icons/obj/cooking_machines.dmi differ
diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi
index db174eb329f..2c927cb8047 100644
Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 424cf671e88..88161a20b5c 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 01609b50824..7867fac04b4 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/nano/templates/r_n_d.tmpl b/nano/templates/r_n_d.tmpl
index 5d29c399550..cabd0c46992 100644
--- a/nano/templates/r_n_d.tmpl
+++ b/nano/templates/r_n_d.tmpl
@@ -22,12 +22,17 @@
 		{{:data.wait_message}}
 	{{else data.menu == 0}}
 		<h3>Main Menu:</h3>
-		<div class='line'>{{:helper.link('Current Research Levels', 'folder-open', {'menu': 1, 'submenu': 0})}}</div>
 		<div class='line'>{{:helper.link('Disk Operations', 'save', {'menu': 2, 'submenu': 0}, data.disk_type ? null : 'disabled')}}</div>
 		<div class='line'>{{:helper.link('Destructive Analyzer Menu', 'chain-broken', {'menu': 3, 'submenu': 0}, data.linked_destroy ? null : 'disabled')}}</div>
 		<div class='line'>{{:helper.link('Protolathe Menu', 'print', {'menu': 4, 'submenu': 0}, data.linked_lathe ? null : 'disabled')}}</div>
 		<div class='line'>{{:helper.link('Circuit Imprinter Menu', 'print', {'menu': 5, 'submenu': 0}, data.linked_imprinter ? null : 'disabled')}}</div>
 		<div class='line'>{{:helper.link('Settings', 'gear', {'menu': 6, 'submenu': 0})}}</div>
+		<br>
+		<br>
+		Current Research Levels:
+		{{for data.tech_levels}}
+		<div class='line'><div class='itemLabel'>{{:value.name}}:</div>{{:value.level}}</div>
+		{{/for}}
 	{{else data.menu == 1}}
 		<h3>Current Research Levels:</h3>
 		{{for data.tech_levels}}
diff --git a/paradise.dme b/paradise.dme
index aa90ab44d78..9342fc2b09f 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -264,9 +264,6 @@
 #include "code\datums\diseases\advance\symptoms\weakness.dm"
 #include "code\datums\diseases\advance\symptoms\weight.dm"
 #include "code\datums\diseases\advance\symptoms\youth.dm"
-#include "code\datums\Emote_system\emote.dm"
-#include "code\datums\Emote_system\emote_handler.dm"
-#include "code\datums\Emote_system\emotes.dm"
 #include "code\datums\helper_datums\construction_datum.dm"
 #include "code\datums\helper_datums\events.dm"
 #include "code\datums\helper_datums\global_iterator.dm"
@@ -277,6 +274,7 @@
 #include "code\datums\spells\area_teleport.dm"
 #include "code\datums\spells\bloodcrawl.dm"
 #include "code\datums\spells\charge.dm"
+#include "code\datums\spells\cluwne.dm"
 #include "code\datums\spells\conjure.dm"
 #include "code\datums\spells\construct_spells.dm"
 #include "code\datums\spells\dumbfire.dm"
@@ -1010,7 +1008,6 @@
 #include "code\modules\admin\IsBanned.dm"
 #include "code\modules\admin\machine_upgrade.dm"
 #include "code\modules\admin\NewBan.dm"
-#include "code\modules\admin\newbanjob.dm"
 #include "code\modules\admin\player_panel.dm"
 #include "code\modules\admin\secrets.dm"
 #include "code\modules\admin\sql_notes.dm"
@@ -1120,10 +1117,15 @@
 #include "code\modules\client\client defines.dm"
 #include "code\modules\client\client procs.dm"
 #include "code\modules\client\message.dm"
-#include "code\modules\client\preferences.dm"
-#include "code\modules\client\preferences_mysql.dm"
-#include "code\modules\client\preferences_spawnpoints.dm"
-#include "code\modules\client\preferences_toggles.dm"
+#include "code\modules\client\preference\preferences.dm"
+#include "code\modules\client\preference\preferences_mysql.dm"
+#include "code\modules\client\preference\preferences_spawnpoints.dm"
+#include "code\modules\client\preference\preferences_toggles.dm"
+#include "code\modules\client\preference\loadout\gear_tweaks.dm"
+#include "code\modules\client\preference\loadout\loadout.dm"
+#include "code\modules\client\preference\loadout\loadout_accessories.dm"
+#include "code\modules\client\preference\loadout\loadout_general.dm"
+#include "code\modules\client\preference\loadout\loadout_uniform.dm"
 #include "code\modules\clothing\clothing.dm"
 #include "code\modules\clothing\glasses\glasses.dm"
 #include "code\modules\clothing\glasses\hud.dm"
@@ -1404,6 +1406,7 @@
 #include "code\modules\mining\laborcamp\laborstacker.dm"
 #include "code\modules\mob\abilities.dm"
 #include "code\modules\mob\death.dm"
+#include "code\modules\mob\emote.dm"
 #include "code\modules\mob\hear_say.dm"
 #include "code\modules\mob\holder.dm"
 #include "code\modules\mob\inventory.dm"
@@ -1455,6 +1458,7 @@
 #include "code\modules\mob\living\carbon\alien\login.dm"
 #include "code\modules\mob\living\carbon\alien\logout.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\emote.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\empress.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\inventory.dm"
@@ -1466,6 +1470,7 @@
 #include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm"
 #include "code\modules\mob\living\carbon\alien\larva\death.dm"
+#include "code\modules\mob\living\carbon\alien\larva\emote.dm"
 #include "code\modules\mob\living\carbon\alien\larva\inventory.dm"
 #include "code\modules\mob\living\carbon\alien\larva\larva.dm"
 #include "code\modules\mob\living\carbon\alien\larva\life.dm"
@@ -1476,6 +1481,7 @@
 #include "code\modules\mob\living\carbon\brain\brain.dm"
 #include "code\modules\mob\living\carbon\brain\brain_item.dm"
 #include "code\modules\mob\living\carbon\brain\death.dm"
+#include "code\modules\mob\living\carbon\brain\emote.dm"
 #include "code\modules\mob\living\carbon\brain\life.dm"
 #include "code\modules\mob\living\carbon\brain\login.dm"
 #include "code\modules\mob\living\carbon\brain\MMI.dm"
@@ -1484,6 +1490,7 @@
 #include "code\modules\mob\living\carbon\human\appearance.dm"
 #include "code\modules\mob\living\carbon\human\body_accessories.dm"
 #include "code\modules\mob\living\carbon\human\death.dm"
+#include "code\modules\mob\living\carbon\human\emote.dm"
 #include "code\modules\mob\living\carbon\human\examine.dm"
 #include "code\modules\mob\living\carbon\human\human.dm"
 #include "code\modules\mob\living\carbon\human\human_attackalien.dm"
@@ -1514,6 +1521,7 @@
 #include "code\modules\mob\living\carbon\human\species\species.dm"
 #include "code\modules\mob\living\carbon\human\species\station.dm"
 #include "code\modules\mob\living\carbon\slime\death.dm"
+#include "code\modules\mob\living\carbon\slime\emote.dm"
 #include "code\modules\mob\living\carbon\slime\examine.dm"
 #include "code\modules\mob\living\carbon\slime\life.dm"
 #include "code\modules\mob\living\carbon\slime\powers.dm"
@@ -1522,6 +1530,7 @@
 #include "code\modules\mob\living\carbon\slime\subtypes.dm"
 #include "code\modules\mob\living\carbon\slime\update_icons.dm"
 #include "code\modules\mob\living\silicon\death.dm"
+#include "code\modules\mob\living\silicon\emote.dm"
 #include "code\modules\mob\living\silicon\laws.dm"
 #include "code\modules\mob\living\silicon\login.dm"
 #include "code\modules\mob\living\silicon\say.dm"
@@ -1544,7 +1553,7 @@
 #include "code\modules\mob\living\silicon\decoy\decoy.dm"
 #include "code\modules\mob\living\silicon\decoy\life.dm"
 #include "code\modules\mob\living\silicon\pai\death.dm"
-#include "code\modules\mob\living\silicon\pai\examine.dm"
+#include "code\modules\mob\living\silicon\pai\emote.dm"
 #include "code\modules\mob\living\silicon\pai\life.dm"
 #include "code\modules\mob\living\silicon\pai\pai.dm"
 #include "code\modules\mob\living\silicon\pai\personality.dm"
@@ -1554,6 +1563,7 @@
 #include "code\modules\mob\living\silicon\pai\software_modules.dm"
 #include "code\modules\mob\living\silicon\robot\component.dm"
 #include "code\modules\mob\living\silicon\robot\death.dm"
+#include "code\modules\mob\living\silicon\robot\emote.dm"
 #include "code\modules\mob\living\silicon\robot\examine.dm"
 #include "code\modules\mob\living\silicon\robot\inventory.dm"
 #include "code\modules\mob\living\silicon\robot\laws.dm"
@@ -1586,6 +1596,7 @@
 #include "code\modules\mob\living\simple_animal\bot\cleanbot.dm"
 #include "code\modules\mob\living\simple_animal\bot\construction.dm"
 #include "code\modules\mob\living\simple_animal\bot\ed209bot.dm"
+#include "code\modules\mob\living\simple_animal\bot\emote.dm"
 #include "code\modules\mob\living\simple_animal\bot\floorbot.dm"
 #include "code\modules\mob\living\simple_animal\bot\medbot.dm"
 #include "code\modules\mob\living\simple_animal\bot\mulebot.dm"
@@ -1617,6 +1628,7 @@
 #include "code\modules\mob\living\simple_animal\hostile\headcrab.dm"
 #include "code\modules\mob\living\simple_animal\hostile\hivebot.dm"
 #include "code\modules\mob\living\simple_animal\hostile\hostile.dm"
+#include "code\modules\mob\living\simple_animal\hostile\illusion.dm"
 #include "code\modules\mob\living\simple_animal\hostile\jungle_animals.dm"
 #include "code\modules\mob\living\simple_animal\hostile\killertomato.dm"
 #include "code\modules\mob\living\simple_animal\hostile\mimic.dm"
diff --git a/sound/magic/Charge.ogg b/sound/magic/Charge.ogg
new file mode 100644
index 00000000000..bf27fb9ae99
Binary files /dev/null and b/sound/magic/Charge.ogg differ