diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
index b50efa38848..bb50f35b41d 100644
--- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
@@ -455,7 +455,7 @@
 "aiM" = (/obj/effect/spawner/window/reinforced{useFull = 1; tag = "fullReinWin"},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/security/prison)
 "aiN" = (/obj/machinery/flasher/portable,/obj/machinery/flasher/portable,/obj/structure/reagent_dispensers/peppertank{pixel_x = 0; pixel_y = 29},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/warden)
 "aiO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden)
-"aiP" = (/obj/structure/rack,/obj/item/weapon/gun/energy/advtaser{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/energy/advtaser,/obj/item/weapon/gun/energy/advtaser{pixel_x = 3; pixel_y = -3},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/warden)
+"aiP" = (/obj/structure/rack,/obj/item/weapon/gun/energy/gun/advtaser{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/energy/gun/advtaser,/obj/item/weapon/gun/energy/gun/advtaser{pixel_x = 3; pixel_y = -3},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/warden)
 "aiQ" = (/obj/machinery/syndicatebomb/training,/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/warden)
 "aiR" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plasteel{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/warden)
 "aiS" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden)
@@ -583,7 +583,7 @@
 "alk" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"})
 "all" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_l"; icon_state = "propulsion_l"},/turf/space,/area/shuttle/vox)
 "alm" = (/obj/structure/rack,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/suit/space/vox/pressure,/obj/item/clothing/head/helmet/space/vox/pressure,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox)
-"aln" = (/obj/structure/rack,/obj/item/weapon/gun/launcher/spikethrower,/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox)
+"aln" = (/obj/structure/rack,/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox)
 "alo" = (/obj/machinery/door/poddoor{id_tag = "trash"; name = "disposal bay door"},/turf/simulated/floor/plating,/area/maintenance/disposal)
 "alp" = (/obj/machinery/mass_driver{dir = 8; id_tag = "trash"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/disposal)
 "alq" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id = "garbage"; name = "disposal coveyor"},/turf/simulated/floor/plating,/area/maintenance/disposal)
@@ -1679,7 +1679,7 @@
 "aGo" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 6},/area/security/nuke_storage)
 "aGp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "vault"},/area/security/nuke_storage)
 "aGq" = (/obj/machinery/camera/motion{c_tag = "Vault"; dir = 1; network = list("MiniSat")},/obj/machinery/light,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 10},/area/security/nuke_storage)
-"aGr" = (/obj/structure/safe,/obj/item/weapon/storage/secure/briefcase{contents = newlist(/obj/item/clothing/suit/armor/vest,/obj/item/weapon/gun/projectile/automatic/pistol,/obj/item/weapon/suppressor,/obj/item/clothing/mask/balaclava,/obj/item/bodybag,/obj/item/weapon/soap/nanotrasen)},/obj/item/weapon/storage/backpack/duffel{contents = newlist(/obj/item/clothing/under/lawyer,/obj/item/clothing/accessory/waistcoat,/obj/item/clothing/shoes/laceup,/obj/item/clothing/gloves/color/black,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/fedora); desc = "A large dufflebag for holding extra things. There is a NanoTrasen logo on the back."; icon_state = "duffle-syndieammo"; item_state = "duffle-syndieammo"},/obj/item/weapon/card/id/silver{access = list(12); assignment = "Reaper"; name = "Thirteen's ID Card (Reaper)"; registered_name = "Thirteen"},/obj/item/weapon/lazarus_injector,/obj/item/weapon/gun/energy/advtaser,/obj/item/weapon/gun/projectile/revolver/russian,/obj/item/ammo_box/a357,/obj/item/clothing/accessory/stethoscope,/obj/item/weapon/book{desc = "An undeniably handy book."; icon_state = "bookknock"; name = "A Simpleton's Guide to Safe-cracking with Stethoscopes"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/security/nuke_storage)
+"aGr" = (/obj/structure/safe,/obj/item/weapon/storage/secure/briefcase{contents = newlist(/obj/item/clothing/suit/armor/vest,/obj/item/weapon/gun/projectile/automatic/pistol,/obj/item/weapon/suppressor,/obj/item/clothing/mask/balaclava,/obj/item/bodybag,/obj/item/weapon/soap/nanotrasen)},/obj/item/weapon/storage/backpack/duffel{contents = newlist(/obj/item/clothing/under/lawyer,/obj/item/clothing/accessory/waistcoat,/obj/item/clothing/shoes/laceup,/obj/item/clothing/gloves/color/black,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/fedora); desc = "A large dufflebag for holding extra things. There is a NanoTrasen logo on the back."; icon_state = "duffle-syndieammo"; item_state = "duffle-syndieammo"},/obj/item/weapon/card/id/silver{access = list(12); assignment = "Reaper"; name = "Thirteen's ID Card (Reaper)"; registered_name = "Thirteen"},/obj/item/weapon/lazarus_injector,/obj/item/weapon/gun/energy/gun/advtaser,/obj/item/weapon/gun/projectile/revolver/russian,/obj/item/ammo_box/a357,/obj/item/clothing/accessory/stethoscope,/obj/item/weapon/book{desc = "An undeniably handy book."; icon_state = "bookknock"; name = "A Simpleton's Guide to Safe-cracking with Stethoscopes"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/security/nuke_storage)
 "aGs" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/simulated/shuttle/plating,/area/shuttle/siberia)
 "aGt" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Labor Camp Shuttle Airlock"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore)
 "aGu" = (/obj/effect/spawner/window/reinforced{useFull = 1; tag = "fullReinWin"},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/door/poddoor/preopen{id_tag = "Secure Gate"; name = "brig shutters"},/turf/simulated/floor/plating,/area/security/brig)
diff --git a/_maps/map_files/RandomZLevels/beach.dmm b/_maps/map_files/RandomZLevels/beach.dmm
index 0a5cd703fc0..04512b660bf 100644
--- a/_maps/map_files/RandomZLevels/beach.dmm
+++ b/_maps/map_files/RandomZLevels/beach.dmm
@@ -19,7 +19,7 @@
 "as" = (/obj/structure/boulder,/turf/unsimulated/beach/water/deep/sand_floor,/area/awaymission/undersea)
 "at" = (/obj/item/flag/cult,/turf/unsimulated/beach/water/deep/wood_floor,/area/awaymission/undersea)
 "au" = (/obj/structure/mineral_door/sandstone,/obj/structure/barricade/wooden,/turf/unsimulated/beach/water/deep/wood_floor,/area/awaymission/undersea)
-"av" = (/obj/item/weapon/crossbowframe,/turf/unsimulated/beach/water/deep/sand_floor,/area/awaymission/undersea)
+"av" = (/turf/unsimulated/beach/water/deep/sand_floor,/area/awaymission/undersea)
 "aw" = (/obj/item/toy/eight_ball/conch,/turf/unsimulated/beach/water/deep/wood_floor,/area/awaymission/undersea)
 "ax" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/beach/water/deep/wood_floor,/area/awaymission/undersea)
 "ay" = (/obj/structure/closet/cabinet,/turf/unsimulated/beach/water/deep/wood_floor,/area/awaymission/undersea)
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 6eef766fd9b..75270cc75f6 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -225,7 +225,7 @@
 "aeq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall/r_wall,/area/security/interrogationobs)
 "aer" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/camera{c_tag = "Brig Prison Hallway"; dir = 4; network = list("Prison","SS13")},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/permabrig)
 "aes" = (/obj/structure/lattice,/obj/machinery/camera{c_tag = "Brig Secure Armory Exterior South"; dir = 8; network = list("SS13")},/turf/space,/area/security/permabrig)
-"aet" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/gun/energy/advtaser{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/energy/advtaser{pixel_x = 0; pixel_y = 0},/obj/item/weapon/gun/energy/advtaser{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plasteel{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury)
+"aet" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/gun/energy/gun/advtaser{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/energy/gun/advtaser{pixel_x = 0; pixel_y = 0},/obj/item/weapon/gun/energy/gun/advtaser{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plasteel{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury)
 "aeu" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/warning_stripes/southeast,/obj/vehicle/secway,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/securearmoury)
 "aev" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/shield/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/shield/riot,/turf/simulated/floor/plasteel{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury)
 "aew" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/carpet,/area/security/hos)
@@ -2104,9 +2104,9 @@
 "aOx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/fsmaint2)
 "aOy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/fsmaint2)
 "aOz" = (/obj/machinery/mass_driver{dir = 4; id_tag = "chapelgun"},/obj/machinery/door/window{dir = 8; name = "Mass Driver"; req_access_txt = "22"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fsmaint2)
-"aOA" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/maintenance/fsmaint2)
+"aOA" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_pump,/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/maintenance/fsmaint2)
 "aOB" = (/obj/machinery/door/poddoor{id_tag = "chapelgun"; name = "Chapel Launcher Door"; protected = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
-"aOC" = (/turf/space,/area/chapel/main)
+"aOC" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main)
 "aOD" = (/turf/simulated/shuttle/wall{icon_state = "swall11"; dir = 2},/area/shuttle/arrival/station)
 "aOE" = (/obj/effect/landmark{name = "HONKsquad"},/obj/structure/closet/walllocker/emerglocker/north,/turf/simulated/shuttle/floor,/area/shuttle/arrival/station)
 "aOF" = (/turf/simulated/shuttle/floor,/area/shuttle/arrival/station)
@@ -2181,7 +2181,7 @@
 "aPW" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/chapel/office)
 "aPX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{level = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/chapel/office)
 "aPY" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1; initialize_directions = 11; level = 1},/turf/simulated/wall,/area/chapel/office)
-"aPZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/driver_button{id_tag = "chapelgun"; name = "Chapel Mass Driver"; pixel_x = 25},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main)
+"aPZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/driver_button{id_tag = "chapelgun"; name = "Chapel Mass Driver"; pixel_x = 25},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main)
 "aQa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/wall,/area/maintenance/fsmaint2)
 "aQb" = (/turf/simulated/wall,/area/chapel/main)
 "aQc" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/chapel/main)
@@ -2366,7 +2366,7 @@
 "aTz" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/library)
 "aTA" = (/obj/structure/crematorium,/obj/effect/landmark{name = "revenantspawn"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office)
 "aTB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office)
-"aTC" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office)
+"aTC" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main)
 "aTD" = (/obj/effect/landmark/start{name = "Chaplain"},/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office)
 "aTE" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/storage/fancy/crayons,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office)
 "aTF" = (/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office)
@@ -2801,7 +2801,7 @@
 "bbS" = (/obj/structure/bookcase{name = "Forbidden Knowledge"},/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/library)
 "bbT" = (/obj/structure/table/woodentable,/obj/item/device/taperecorder{pixel_y = 0},/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "Camera"; pictures_left = 30; pixel_x = 0; pixel_y = 0},/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/library)
 "bbU" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen/invisible,/obj/machinery/camera{c_tag = "Library Study"; dir = 8; network = list("SS13")},/obj/item/stack/tape_roll,/obj/item/weapon/pen/multi,/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/library)
-"bbV" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main)
+"bbV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main)
 "bbW" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/chapel/main)
 "bbX" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/chapel/main)
 "bbY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/chapel/main)
@@ -3007,7 +3007,7 @@
 "bfQ" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellowcorner"},/area/bridge)
 "bfR" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plasteel,/area/bridge)
 "bfS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/bridge)
-"bfT" = (/obj/structure/table/reinforced,/obj/item/device/aicard,/obj/item/device/multitool,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/bridge)
+"bfT" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/bookcase,/obj/item/weapon/book/manual/sop_engineering,/obj/item/weapon/book/manual/sop_medical,/obj/item/weapon/book/manual/sop_science,/obj/item/weapon/book/manual/sop_security,/obj/item/weapon/book/manual/sop_service,/obj/item/weapon/book/manual/sop_supply,/obj/item/weapon/book/manual/sop_general,/obj/item/weapon/book/manual/sop_legal,/obj/item/weapon/book/manual/sop_command,/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/lawoffice)
 "bfU" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/door_control{id = "bridge blast"; name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = -2; req_access_txt = "19"},/obj/machinery/keycard_auth{pixel_x = 29; pixel_y = 8},/turf/simulated/floor/plasteel,/area/bridge)
 "bfV" = (/obj/structure/table/reinforced,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 4},/area/bridge)
 "bfW" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "greencorner"},/area/bridge)
@@ -3656,7 +3656,7 @@
 "bsp" = (/obj/machinery/camera{c_tag = "Cargo Delivery Office"; dir = 4; network = list("SS13")},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/telepad_cargo,/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/office)
 "bsq" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 4},/area/quartermaster/office)
 "bsr" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/hallway/primary/central/west)
-"bss" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/bookcase,/obj/item/weapon/book/manual/sop_engineering,/obj/item/weapon/book/manual/sop_medical,/obj/item/weapon/book/manual/sop_science,/obj/item/weapon/book/manual/sop_security,/obj/item/weapon/book/manual/sop_service,/obj/item/weapon/book/manual/sop_supply,/obj/item/weapon/book/manual/sop_general,/obj/item/weapon/book/manual/sop_legal,/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/lawoffice)
+"bss" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/sop_command,/obj/item/device/aicard,/obj/item/device/multitool,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/bridge)
 "bst" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/bridge/meeting_room)
 "bsu" = (/obj/item/weapon/folder/blue,/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/bridge/meeting_room)
 "bsv" = (/obj/machinery/vending/coffee,/turf/simulated/floor/wood,/area/bridge/meeting_room)
@@ -5227,7 +5227,7 @@
 "bWA" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/wood,/area/blueshield)
 "bWB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/wood,/area/blueshield)
 "bWC" = (/obj/machinery/light{dir = 1},/obj/machinery/power/apc{dir = 4; name = "Blueshield Office APC"; pixel_x = 24; pixel_y = -3},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/blueshield)
-"bWD" = (/obj/structure/table,/obj/item/weapon/folder/blue,/obj/item/weapon/stamp/hop,/obj/item/device/eftpos,/obj/item/weapon/book/manual/sop_service,/obj/item/weapon/book/manual/sop_supply,/turf/simulated/floor/plasteel,/area/crew_quarters/heads)
+"bWD" = (/obj/structure/table,/obj/item/weapon/book/manual/sop_general,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor/wood,/area/bridge/meeting_room)
 "bWE" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/ntrep)
 "bWF" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/wood,/area/ntrep)
 "bWG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/wood,/area/ntrep)
@@ -5544,7 +5544,7 @@
 "ccF" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "ccG" = (/obj/machinery/keycard_auth{pixel_x = -24; pixel_y = 0},/obj/machinery/door/window{dir = 1; name = "Desk Door"; req_access_txt = "67"},/turf/simulated/floor/wood,/area/blueshield)
 "ccH" = (/obj/structure/table/woodentable,/obj/item/ashtray/glass{pixel_x = -4; pixel_y = -4},/obj/item/weapon/lighter/zippo/blue{pixel_x = 7; pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "bcarpet05"},/area/blueshield)
-"ccI" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue,/obj/item/weapon/folder/blue{pixel_x = 4; pixel_y = 6},/obj/item/weapon/paper/blueshield,/turf/simulated/floor/plasteel{icon_state = "bcarpet05"},/area/blueshield)
+"ccI" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/coin/plasma,/obj/item/weapon/book/manual/sop_general,/obj/item/weapon/book/manual/sop_command,/obj/item/device/megaphone,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "ccJ" = (/obj/structure/sign/poster/legit{pixel_x = 32},/obj/machinery/photocopier,/turf/simulated/floor/wood,/area/blueshield)
 "ccK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/wall,/area/ntrep)
 "ccL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/photocopier,/turf/simulated/floor/wood,/area/ntrep)
@@ -7337,6 +7337,7 @@
 "cLe" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "cLf" = (/obj/structure/closet/crate,/obj/item/clothing/under/color/lightpurple,/obj/item/weapon/spacecash/c200,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "cLg" = (/obj/effect/spawner/window,/turf/simulated/floor/plating,/area/maintenance/asmaint)
+"cLh" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office)
 "cLi" = (/obj/effect/spawner/window/reinforced,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/disposalpipe/segment,/obj/structure/cable,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "xenobio4"; name = "Containment Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/toxins/xenobiology)
 "cLj" = (/obj/machinery/door/window/southright{name = "Containment Pen"; req_access_txt = "55"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "xenobio4"; name = "Containment Blast Doors"; opacity = 0},/turf/simulated/floor/engine,/area/toxins/xenobiology)
 "cLk" = (/obj/effect/spawner/window/reinforced,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "xenobio4"; name = "Containment Blast Doors"; opacity = 0},/obj/structure/cable,/turf/simulated/floor/plating,/area/toxins/xenobiology)
@@ -8497,7 +8498,7 @@
 "dhv" = (/obj/structure/rack,/obj/item/weapon/pneumatic_cannon,/obj/item/weapon/harpoon,/obj/item/weapon/harpoon,/obj/item/weapon/harpoon,/obj/item/weapon/harpoon,/obj/item/weapon/tank/nitrogen,/obj/machinery/light/spot{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox)
 "dhw" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_l"; icon_state = "propulsion_l"},/turf/space,/area/shuttle/vox)
 "dhx" = (/obj/structure/rack,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/suit/space/vox/pressure,/obj/item/clothing/head/helmet/space/vox/pressure,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox)
-"dhy" = (/obj/structure/rack,/obj/item/weapon/gun/launcher/spikethrower,/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox)
+"dhy" = (/obj/structure/rack,/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox)
 "dhz" = (/obj/structure/rack,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/suit/space/vox/stealth,/obj/item/clothing/head/helmet/space/vox/stealth,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox)
 "dhA" = (/obj/structure/grille,/obj/structure/shuttle/window{tag = "icon-window5_end (NORTH)"; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; dir = 1},/turf/simulated/shuttle/plating/vox,/area/shuttle/vox)
 "dhB" = (/obj/structure/grille,/obj/structure/shuttle/window{tag = "icon-window5_end"; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; dir = 2},/turf/simulated/shuttle/plating/vox,/area/shuttle/vox)
@@ -8536,6 +8537,7 @@
 "dii" = (/obj/docking_port/stationary{dir = 2; dwidth = 2; height = 18; id = "skipjack_nw"; name = "northwest of SS13"; width = 19},/turf/space,/area/space)
 "dij" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Equipment Room"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
 "dik" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1331; id_tag = "synd_pump"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
+"dil" = (/obj/machinery/hologram/holopad,/obj/machinery/light_switch{pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main)
 "dim" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate/black/red,/obj/item/clothing/head/helmet/space/syndicate/black/red,/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1331; id_tag = "synd_pump"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
 "din" = (/obj/item/device/radio/intercom/syndicate{pixel_x = -28},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
 "dio" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_ne"; name = "northeast of station"; width = 18},/turf/space,/area/space)
@@ -8563,6 +8565,7 @@
 "diK" = (/obj/structure/table,/obj/item/weapon/gun/syringe,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
 "diL" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
 "diM" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
+"diN" = (/obj/structure/table,/obj/item/weapon/folder/blue,/obj/item/weapon/stamp/hop,/obj/item/device/eftpos,/obj/item/weapon/book/manual/sop_service,/obj/item/weapon/book/manual/sop_supply,/obj/item/weapon/book/manual/sop_command,/turf/simulated/floor/plasteel,/area/crew_quarters/heads)
 "diO" = (/obj/structure/table,/obj/item/weapon/grenade/syndieminibomb{pixel_x = 4; pixel_y = 2; pixel_z = 0},/obj/item/weapon/grenade/syndieminibomb{pixel_x = -1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
 "diP" = (/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
 "diQ" = (/obj/machinery/telecomms/allinone{intercept = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
@@ -8732,9 +8735,8 @@
 "dlY" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/book/manual/sop_engineering,/turf/simulated/floor/plasteel,/area/engine/break_room)
 "dlZ" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/book/manual/sop_science,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology)
 "dma" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/folder/yellow,/obj/item/weapon/stamp/ce,/obj/item/weapon/book/manual/sop_engineering,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office)
-"dmb" = (/obj/item/weapon/storage/fancy/donut_box,/obj/structure/table,/obj/item/weapon/book/manual/sop_general,/turf/simulated/floor/wood,/area/bridge/meeting_room)
-"dmc" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/coin/plasma,/obj/item/device/megaphone,/obj/item/weapon/book/manual/sop_general,/turf/simulated/floor/wood,/area/crew_quarters/captain)
-"dmd" = (/obj/machinery/light{dir = 1},/obj/structure/bookcase,/obj/item/weapon/book/manual/sop_engineering,/obj/item/weapon/book/manual/sop_medical,/obj/item/weapon/book/manual/sop_science,/obj/item/weapon/book/manual/sop_security,/obj/item/weapon/book/manual/sop_service,/obj/item/weapon/book/manual/sop_supply,/obj/item/weapon/book/manual/sop_general,/obj/item/weapon/book/manual/sop_legal,/turf/simulated/floor/wood,/area/ntrep)
+"dmb" = (/obj/machinery/light{dir = 1},/obj/structure/bookcase,/obj/item/weapon/book/manual/sop_engineering,/obj/item/weapon/book/manual/sop_medical,/obj/item/weapon/book/manual/sop_science,/obj/item/weapon/book/manual/sop_security,/obj/item/weapon/book/manual/sop_service,/obj/item/weapon/book/manual/sop_supply,/obj/item/weapon/book/manual/sop_general,/obj/item/weapon/book/manual/sop_legal,/obj/item/weapon/book/manual/sop_command,/turf/simulated/floor/wood,/area/ntrep)
+"dmc" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue,/obj/item/weapon/folder/blue{pixel_x = 4; pixel_y = 6},/obj/item/weapon/paper/blueshield,/obj/item/weapon/book/manual/sop_command,/turf/simulated/floor/plasteel{icon_state = "bcarpet05"},/area/blueshield)
 "dme" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/mechanic_workshop)
 "dmf" = (/obj/machinery/door/firedoor{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/glass_engineering{name = "Mechanic Workshop"; req_access_txt = "70"; req_one_access_txt = "0"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/mechanic_workshop)
 "dmg" = (/obj/item/device/radio/intercom{pixel_y = -30},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/light/small,/obj/structure/stool/bed/chair/wood/wings{tag = "icon-wooden_chair_wings (WEST)"; icon_state = "wooden_chair_wings"; dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/bar)
@@ -8836,7 +8838,7 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikapsapsapsbikbikbikbikbikbikaabaabbikaabbikbikaabaxRaxSaxTaxUaxRaxVaxVbikbikaabbikbikbikbikbikbikbikbikbikbikawmaxWaxXaxYaxZayaaybaycaydayeayfaxqaxqaygaxqaxqaxqaxqaxqayhaxqaxqaxqaxqaxqaxqayiaxqaxqaxqaxqaSWaxqaykaxqaylaxqaymaynapWayoaypayqayraysaytaxEayuavUayvaywayxayyayzayAayBawMavWbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikbikaabayCayDayEayFayCaabbikaabbikbikaabbikbikaabaabbikbikayGasMavlasMavlayHayIayHayJayHayHayHayKayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikaxVaxVaxVaxVaxVaabaabaxRayLayMayNaxRayOaxVbikbikaabbikbikbikbikbikbikbikbikbikbikawmayPayQayRaySayTawmayUayVayWayXayYayZazaazbazcayXayXayXazdayXayXayXayXayXayXazeazfazgazgazgazhaziazjaziazkazlazmaznapWazoazoazoazoazoazoaxEaxFavUazpaxHazqavVcscazraxJcvYavWbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikbikbikaabayCazsaztazuayCaabbikaabbikbikaabbikbikayGazvayGazvayGayKayHayHayHayHayHayHayHayHayHazwazxayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikazyazzazybikbikbikaxVaxVaxVaxVazAazBazCaxVbikbikaxRazDazEazFazGazHaxVbikbikaabbikbikbikbikbikbikbikbikbikbikawmawmawmawmawmawmawmazIazIazJazKazKazLazMazNazOazPazPazOazQazOazRazRazRazRazRazRazSazRazRazTazUazVazWazIazXazIazYazIazIaqVazZaovaovaovaovaAaaxFavUaAbaxHaAcavVaAdayAayBawMavWbikbikbikbikbikbikbikbikaabaabbikbikbikbikazyaAeazybikaabayCaAfaAgaAhayCaAiaAiaAiaAiaAiazvazvazvayGaAjayHazwazxayJayHayJayJayJayGaAkayGayGayGayGayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikaAlaAmaAlbikbikaabaxVaAnaAoaApazHaAqazHaxVaAlaAlaxRaxRaAraAsazGazHaxVaxVaAlaAlaAlaxVaxVbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikazJaAtaAuaAvazMaAwazOaAxaAyaAzaAAaABaACaADbssaAFaAGaAHaAIaAJaAKaALaxqaxraAMaANaAOaAPaAQaAPaAPaAPaARaAPaAPaAPaAPaASaATaAUaAVaAWaAXaAYcNsaBaaUadcuavWaabaBbaBcaBcaBcaBcaBcaBdaabaabbikbikbikbikazvaBeazvbikaAiayCayCaBfaBgayCaBhayHayHayHayJaBiayHaBjayGayHayHayHaBkayJayHayGaBlaBmayGayHaBnayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikaAlaAmaAlbikbikaabaxVaAnaAoaApazHaAqazHaxVaAlaAlaxRaxRaAraAsazGazHaxVaxVaAlaAlaAlaxVaxVbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikazJaAtaAuaAvazMaAwazOaAxaAyaAzaAAaABaACaADbfTaAFaAGaAHaAIaAJaAKaALaxqaxraAMaANaAOaAPaAQaAPaAPaAPaARaAPaAPaAPaAPaASaATaAUaAVaAWaAXaAYcNsaBaaUadcuavWaabaBbaBcaBcaBcaBcaBcaBdaabaabbikbikbikbikazvaBeazvbikaAiayCayCaBfaBgayCaBhayHayHayHayJaBiayHaBjayGayHayHayHaBkayJayHayGaBlaBmayGayHaBnayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikappaBpaBobikaBqaBsaBraabaabaAlazHaAlbikbikaabaxVaBuaBvaBwaBxaByaBzaxVaBAazHaBBaBCaBDaBEaBEaBEaBEaBEaBEaBEaBEaBFaxVbikaBGbikbikbikbikbikbikbikbikbikbikbikbikbikbikaBHaBIaBJaBKazMaAwazOaBLafvaBNaAAaABaBOaBPaBPaBPaBPaBPaAIbjlaAKaxlaxqaxrazIaBQaBRaBSaBTaBSaBSaBUaBVaBWaBWaBWaBWaBWaBWaBXaBYaBZaCaaCbaCcaCdaCeavWavWaCfaCgaChaChaChaChaChaCgaCfaabbikbikbikbikazvaCiaCjbikaAiaCkaClaCmaCnayHayHayHayJayHayJaCoayHayHayGayHaCpaCqaCoaAkayHayGaCraCsayGayHaCtayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaCuaBtaCvaBtaCuaCwaCxaCwaCuaabaAlaCzaCAbikbikaxVaxVaxVaxVaxVaCBaCCaCDaCEaCFaCGaCGaCHaCIaCIaCJaCKaxVazHaxVaxVaxVaCLaxVbikaabbikbikbikbikbikbikaabaabaabaabaabaabaabaabaCMaCNaCOaBKazMaAwazOaCPaCQaCRaAAaCSaCTaBPaCUaBPaCVaCVaAIaBPaAKaxlaxqaCWazIaCXaBRaCYaCZaDaaDbaDcaDdaDeaDfaDgaDhaDiaDjaDkaDlaDmaDnaDoaDpaDqaDraDsaDtaCfaCgaChaChaChaChaChaCgaCfaabaabaabaabazvazvaDuaDvazvaAiaDwayHaDxayHayKayHayGayGaDyayGayGaDzayJayJaCoaDAaDBayHayGayHaDCaDCaDCaDCaDCaDCaDCaDCaDCaDDaDDaDDaDDaacaDDaDDaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaDEaBtaCyaBtaDEaCwaDFaCwaDEaxVaAlaDHaDIaAlaAlaxVazHazHazHazHazHazHazHaCBaCLaxVaxVaxVaxVaxVaDJaxVaxVazHaDKaxVaDLaCLaxVaxVaxVbikbikbikbikbikaDMaDMaDMaDMaDMaDMaDMaDMaabaCMaDNaDOaDPaDQaDRaDSaDTaDUaDVaDWaABaDXaBPaDYaDZaEaaEbaEcaEdaAKaxlaxqaxrazIatsaEeaEfaCZaDaaDbaEgaEhaEhaEhaEhaEhaEhaEhaEhaEhaEhaEiaEjaEkaElaEmaEnaEoaEpaCgaChaChaChaChaChaCgaCfaCfaCfbikbikazvayHaEqaEraBhaEsaDAaCoaDxayHaEtayIaEuaAkayHayHayHayHaEvayHayHaDAaEwayHaDzayHaDCaExaEyaEzaDCaEAaEBaECaDCaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
@@ -8848,18 +8850,18 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabaDEaKzaKAaKzaKBaJraJraKCaKzaKAaKzaKDaKEaKFaKGaxVazHaGpaGpaxVaxVaxVaKHaKHaKHazNaKHaKHaKHaKHaKHaGvaDMaDMaDMaDMaDMaDMaDMaJFaKIaJGbikaabbikaabbikaabbikaabbikaJGaJLaJMaKJaKKaKLaKMaKNaJMaGvaIKaKOaKOaKPaKQaKRaKSaKTaKSaKUaKVaKWaKOaKOaIKaJZaxqaKXazIaKbaGKaGLaCZaDaaDbaEgaKYaKZaLaaLbaLcaLcaLdaLeaLcaLeaLfaLgaLhaLiaLjaLkaLlaCfaKraChaChaChaChaChaKrayGaCtayHaLmaLnayJayGayJaCtayHayGaCtaDxayGaLoayHayGaLpayHayJaLqaLrayGaLsayHayJaAkaAkaDxaAkaLtaDCaLuaIhaLvaLwaLvaIhaLxaDCaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaLyaCuaLzaGdaKzaLAaLBaLCaLDaKzaGdaLEaInaCuaLFaLGaxVazHazHazHazHazHazHaKHaLHaLIaLJaLKaLLaLMaLHaKHaLNaLOaIDaIDaIDaIDaIDaIDaLPaLQaJGaabaLRaLRaLRaLRaLRaLRaLRaabaJGaJLaJMaLSaLTaLUaLVaLSaJMaGvaIKaIKaIKaIKaLWaLXaJOaLYaJOaLXaLZaIKaIKaIKaIKaJZaxqaMaazIaKbaGKaFAaCZaDaaDbaFBaMbaMcaMcaMcaMcaMcaMcaMcaMdaMcaMeaMeaMeaMeaMeaMfayGaCfaKraChaChaChaChaChaKrayGayGayHaMgaLnayJaMhayGayHayHayGayHaDxayJayHayHayGayHayHayJaDxayIayGayHayHayJaMiayHaDxayHaMjaMkaMkaDCaDCaDCaDCaDCaDCaDCaDDaDDaDDaDDaDDaabbikbikbikbikbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaInaKAaKzaKzaKzaKzaKzaKzaKAaInaMlaCuaMmaMnaMoaMoaMoaMoaMoaMoaMpaKHaLHaMqaLJaMraMqaMqaLHaKHaMsaMtaMuaMuaMuaMuaMuaMuaMuaMuaMvbikaLRaMwaMxaMyaMzaMAaLRbikaJGaJLaJMaMBaMCaMDaMEaLSaJMaGvaIKaMFaMFaKPaMGaMHaKSaKTaKSaMHaMIaMJaKOaKOaIKaJZaxqaKaazIaMKaBRaMLaCZaDaaDbaEgaMbaMcaMMaMNaMOaMOaMcaMPaMQaMRaMeaMSaMTaMUaMeaMVayGbikaMWaMXaMXaMXaMXaMXaMYbikayGayHaMZaNaayJayJayGayGayJayJaNbaNcayJayGazxayGayGayJayJaNdaNeayGayGayGaHYaMiayHaDxayHaMjazwayKaFSayGaNfaNgaNfayGayGayGaabaabaabaabaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaNhaNiaNjaNiaNiaNkaNlaNiaNiaNjaNmaNnaCuaKBaNoaMoaNpaNqaNraNsaNtaNuaKHaLHaMqaLJaNvaMqaMqaLHaKHaNwaNxaNyaNzaNAaNBaNCaNDaNEaNFaMvaabaLRaNGaNHaNIaNJaNKaLRaabaJGaJLaJMaNLaNMaNNaNOaNPaJMaGvaIKaJNaJOaNQaNRaLXaJOaNSaJOaLXaNTaNUaJOaJYaIKaJZaxqaNVazIaKbaEeaEfaCZaDaaDbaNWaNXaMcaNYaMQaMQaMQaNZaOaaObaOcaMeaOdaOeaOfaOgaOhazxbikbikbikbikbikbikbikbikbikayGaOiaOjaOkaOlaOmayGaEtayHaHVaDxayHayGbikayGayHayHayHayHaDxaOnaOoaOpaOpaOpaOpaOqaOraOsaOtaOuaOvaOuaOwaOxaOxaOyaOzaOAaOBaOCaOCbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaNhaNmaNiaODaOEaOFaOGaOHaOIaOJaOKaOLaOMaONaOOaKzaKBaOPaMoaOQaORaOSaOTaOSaOUaKHaOVaMqaOWaOXaOYaOXaOZaPaaPbaPcaPdaPdaPdaPdaPdaPdaPeaPfaMvbikaLRaPgaNHaPhaNJaPiaLRbikaJGaJLaJMaPjaPkaPlaPmaPnaJMaGvaIKaPoaPoaKPaPpaMHaKSaPqaKSaMHaPraKWaPsaPsaIKaPtazUaPuazIaKbaEeaPvaPvaPvaPvaPwaPxaPyaPzaPAaPBaPBaPBaPCaPBaPDaPEaPFaPGaPHaPEaPIaPJazxayGayGayGayGayGayGayGayGayGayGayGayGaBMayGayGayGayGayHaDxaOiazvaabazvayHaPLaPMaPNaPOaPPaPQaPRaPRaPRaPRaPSaPTaPUaPVaPWaPXaPWaPYaPWaPWaPZaQaaQbaQbaQcaQdaQeaQeaQeaQeaQeaQeaQeaQeaQeabLadbbikbikbikbikbikbikbikaaabdBaQfbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaONaQgaQhaQiaOMaQjaOFaQjaOFaQjaOFaQjaOMaQkaQlaKzaKBaQmaMoaQnaQoaQpaQqaQraQsaKHaQtaMqaQuaQvaQwaQxaQyaKHaQzaPdaPdaPdaPdaPdaPdaPdaPeaQAaMvaabaLRaQBaQCaQDaQEaQFaLRaabaJGaJLaJMaQGaQHaQIaQJaQKaJMaGvaIKaIKaIKaIKaQLaLXaJOaLYaJOaLXaQMaIKaIKaIKaIKaQNaQOaQPazIaMKaQQaQRaQRaQRaQSaQTaQUaQVaQWaQXaQVaQYaQZaRaaQVaRbaRcaRdaReaRfaMeaRgaRhaRiaRjaRjaRhaRkaRlaRlaRlaRlaRlaRmaRnaRlaRoaRpaRqaRraRsaRvaRuaTkaRwaRxaRwaRyaRzayHayGaRAaRBaRCaRDaREaRFaRGaRHaRIaRJaRIaRKaRLaRMaRNaROaRPaRQaRRaRSaRTaRUaQdaRVaRWaRXaRYaRZaSaaSbaScaSdaprbikbikbikbikbikbikbikaaabfmbifbieaQfbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaSfaOFaOFaNjaOMaQjaOFaQjaSgaQjaOFaQjaOMaQkaQlaKzaKBaShaMoaMoaSiaSjaSkaSjaMoaKHaKHaKHaKHaSlaSmaSnaSoaKHaSpaSqaSraPdaPdaSsaPdaStaSuaSvaMvbikaLRaLRaSwaSxaSwaLRaLRbikaJGaJLaJMaSyaSzaSAaQJaSBaJMaGvaIKaJNaJOaSCaNRaLXaJOaLYaJOaLXaNTaSDaIKaIKaIKaSEaSFaSGaSHaSIaSJamKamKaSKaSLaSMaSNaMcaSOaMQaMcaSPaMcaSQaMcaSRaSSaSTaSUaSVaTeaSXaSYaSZaTaaTbaTcaTdaTbaTbaUjaTbaSYaTfaSYaOvaTgaSYaThaTiaTjaTmaTlaToaTnaTqaTpaWIaTraOuaTsaTtaTuaTvaTwaTxaTyaTzaRHaTAaTBaRIaTCaTDaTEaTFaROaTGaRQaRRaRSaTHaTIaQdaTJaTKaTKaTLaScaScaScaScaSdaprbikbikbikbikbikbikaaabfmbigbijbihbieaQfbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaNhaNiaNjaNiaNiaNkaNlaNiaNiaNjaNmaNnaCuaKBaNoaMoaNpaNqaNraNsaNtaNuaKHaLHaMqaLJaNvaMqaMqaLHaKHaNwaNxaNyaNzaNAaNBaNCaNDaNEaNFaMvaabaLRaNGaNHaNIaNJaNKaLRaabaJGaJLaJMaNLaNMaNNaNOaNPaJMaGvaIKaJNaJOaNQaNRaLXaJOaNSaJOaLXaNTaNUaJOaJYaIKaJZaxqaNVazIaKbaEeaEfaCZaDaaDbaNWaNXaMcaNYaMQaMQaMQaNZaOaaObaOcaMeaOdaOeaOfaOgaOhazxbikbikbikbikbikbikbikbikbikayGaOiaOjaOkaOlaOmayGaEtayHaHVaDxayHayGbikayGayHayHayHayHaDxaOnaOoaOpaOpaOpaOpaOqaOraOsaOtaOuaOvaOuaOwaOxaOxaOyaOzaOAaOBbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaNhaNmaNiaODaOEaOFaOGaOHaOIaOJaOKaOLaOMaONaOOaKzaKBaOPaMoaOQaORaOSaOTaOSaOUaKHaOVaMqaOWaOXaOYaOXaOZaPaaPbaPcaPdaPdaPdaPdaPdaPdaPeaPfaMvbikaLRaPgaNHaPhaNJaPiaLRbikaJGaJLaJMaPjaPkaPlaPmaPnaJMaGvaIKaPoaPoaKPaPpaMHaKSaPqaKSaMHaPraKWaPsaPsaIKaPtazUaPuazIaKbaEeaPvaPvaPvaPvaPwaPxaPyaPzaPAaPBaPBaPBaPCaPBaPDaPEaPFaPGaPHaPEaPIaPJazxayGayGayGayGayGayGayGayGayGayGayGayGaBMayGayGayGayGayHaDxaOiazvaabazvayHaPLaPMaPNaPOaPPaPQaPRaPRaPRaPRaPSaPTaPUaPVaPWaPXaPWaPYaPWaPWaPZaQabpqaQbaQcaQdaQeaQeaQeaQeaQeaQeaQeaQeaQeabLadbbikbikbikbikbikbikbikaaabdBaQfbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaONaQgaQhaQiaOMaQjaOFaQjaOFaQjaOFaQjaOMaQkaQlaKzaKBaQmaMoaQnaQoaQpaQqaQraQsaKHaQtaMqaQuaQvaQwaQxaQyaKHaQzaPdaPdaPdaPdaPdaPdaPdaPeaQAaMvaabaLRaQBaQCaQDaQEaQFaLRaabaJGaJLaJMaQGaQHaQIaQJaQKaJMaGvaIKaIKaIKaIKaQLaLXaJOaLYaJOaLXaQMaIKaIKaIKaIKaQNaQOaQPazIaMKaQQaQRaQRaQRaQSaQTaQUaQVaQWaQXaQVaQYaQZaRaaQVaRbaRcaRdaReaRfaMeaRgaRhaRiaRjaRjaRhaRkaRlaRlaRlaRlaRlaRmaRnaRlaRoaRpaRqaRraRsaRvaRuaTkaRwaRxaRwaRyaRzayHayGaRAaRBaRCaRDaREaRFaRGaRHaRIaRJaRIaRKaRLaRMaRNaROaRPaOCbbVaTCaRTaRUaQdaRVaRWaRXaRYaRZaSaaSbaScaSdaprbikbikbikbikbikbikbikaaabfmbifbieaQfbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaSfaOFaOFaNjaOMaQjaOFaQjaSgaQjaOFaQjaOMaQkaQlaKzaKBaShaMoaMoaSiaSjaSkaSjaMoaKHaKHaKHaKHaSlaSmaSnaSoaKHaSpaSqaSraPdaPdaSsaPdaStaSuaSvaMvbikaLRaLRaSwaSxaSwaLRaLRbikaJGaJLaJMaSyaSzaSAaQJaSBaJMaGvaIKaJNaJOaSCaNRaLXaJOaLYaJOaLXaNTaSDaIKaIKaIKaSEaSFaSGaSHaSIaSJamKamKaSKaSLaSMaSNaMcaSOaMQaMcaSPaMcaSQaMcaSRaSSaSTaSUaSVaTeaSXaSYaSZaTaaTbaTcaTdaTbaTbaUjaTbaSYaTfaSYaOvaTgaSYaThaTiaTjaTmaTlaToaTnaTqaTpaWIaTraOuaTsaTtaTuaTvaTwaTxaTyaTzaRHaTAaTBaRIcLhaTDaTEaTFaROaTGaRQaRRaRSaTHaTIaQdaTJaTKaTKaTLaScaScaScaScaSdaprbikbikbikbikbikbikaaabfmbigbijbihbieaQfbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaONaTMaTNaQiaOMaQjaOFaQjaOFaQjaOFaQjaOMaQkaQlaKzaKBaTOaTPaTQaTRaTSaTSaJraTTaTUaTVaTWaTXaTYaTZaMqcoCaKHaUbaUcaUdaUeaUfaUgaUhaUiaUZaUkaMvbikaabbikaUlaUmaUlbikaabbikaJGaJLaJMaUnaUoaUpaUqaUraJMaGvaIKaUsaUtaKPaUuaUvaKSaUwaKSaUxaUyaUzaIKaUAaUBaUCaUDaUEaUFaUGaUHbikbikaSKaUIaUJaUKaMcaULaUMaMQaMQaUNaMQaMQaMQaUOaMeaUPaMeaUQaURaMeaUSaMeaUTaUUaUVaUWaUXaUYaUTbwNaVaaVbaVcaVbaVbaVbaVbaVdaWLaVbaVeaVfaWFaWBaVbaVhayHaRDaViaTvaVjaVkaVlaVmaVnaVoaVpaVqaRIaVraVsaVtaVuaVvaTGaRQaRRaRSaRTaVwaQdaVxaTKaTKaTLaScaScaScaScaSdaprbikbikbikbikbikbikbdBblqbjMbmKbjMbqQbdBbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaVyaVzaNiaODaOMaOFaVAaVBaOFaOFaVCaVAaOMaONaVDaKzaKBaVEaVFaVGaVHaVGaVGaVGaVGaVGaVIaJraKHaVJaVKaVJaKHaKHaVLaVMaVLaMuaMuaMuaMuaVLaVNaVOaMvaVPaVQaVQaVRaVSaVRaVQaVQaVTaJGaVVaJMaVWaJMaVXaVYaVZaJMaWaaIKaIKaIKaIKaWbaWcaWdaWeaWdaWcaWbaIKaIKaWfaUDaUDaUDaUDaWgaWhaWiaWjaWkaSKbKgaUJaWmaMcaMcaMcaMcaMcaMcaMcaMeaMeaUOaWnaWoaWpaWqaWraWsaWuaWtaUTaWvaWwaWxaWyaWzaUTaWAaWGaWCaWDaWCaWEaWHaYDaWNaYFaWJaWKaYGaWMaYEaVbaWOaRtaWPaWQaWRaVjbtTcvIaVmaWTaRIaWUaWVaWWaWXaWYaTFaTFaRIaRIaRQaRRaRSaTHaWZaQdaXaaXbaXcaXdaXeaXfaScaScaXgaprbikbikbikbikbikaaabfmbqRbmKbmKbmKbqSbieaQfbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaVyaNiaNjaNiaNiaNkaNlaNiaNiaNjaVzaXhaCuaXiaVEaInaXjaXjaXkaXjaXlaDEaXmaXnaJraXoaXpaXqaXqaXraXsaXqaXtaXqaXqaXqaXuaXqaXqaXvaXwaXxaXyaXzaXAaXyaXBaXyaXyaXyaXyaXCaXDaXEaXqaXqaXFaXGaXHaXIaXJaXKaXLaXMaXRaXPaXPaXPaXPaXPaXPaXPaXQaXWaXXaXSaXTaXUaXVaXYaZHaXZaUDaUDaYaaYbaYcaYbaYcaYdaYeaYfaYgaYhaYiaMeaYkbBvaYmaYlaYnaYnaYoaYpaYqaYraUTaYsaYtaYuaYuaYvaUTaYwaYxaYyaYzaYAaYAaYBaYCaYHbbFbalbbHbbGbbJaVgaVbaVhaKsaRDaYIaYJaYJaYKaYLaYJaYMaRIaYNaYOaRIaYPaYQaTFaYRaRIaYSaYTaYUaRSaQbaQbaQdaYVaQeaYWaYXaQeaQeaQeaQeaQeabLadbbikbikbikbikbqUbqTbqVbmKbmKbrUbthbmKbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaInaYYaKzaKzaKzaKzaKzaKzaYYaInaMlaCuaYZaZaaInaZbaZcaZdaZdaZeaDEaZfaXnaZgaZhaXpaZiaZjaZkaZlaZlaZmaZnaZnaZnaZoaZpaZpaZqaZraZsaZlaZlaZtaZpaZvaZwaZxaZxaZyaZzaZAaZuaZuaZuaZBaXGaXHaXIaXJaXJaXJaXJaZCaXJaXJaXJaXJaXJaXJaZDaZEaZNaZFaZGaZJaZIaZLaZKaZMaZNaZNaZNaZOaZPaZPaZPaZQaYiaYiaYiaZRaZSaYiaMebbsaZUaYnaYnaZVaYnaZWaZXaYqaZYaUTaZZbaababbacbadaUTbaebafbagbahbaibajaVbaVbbbKbbLaVbaVbbakbbMbakaVbaVhayHaRDbamaTvaTvaTvbanaTvbaoaRIaRIaRIaRIaRIaRIaRIbapaRIaRSaRSaRRaRSbaqbaraQbbasbatbaubavbawbaxbaybazbaAbikbikbikbikaaabtibtjbtibtibtibtkbtibtlbtibtjbtiaQfbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabaLyaCuaInaGdaKzbaBbaCbaDbaEaKzaGdaInaInaCubaFaVEaInbaGbaHaZdaZdaZeaDEbaIaXnaJraZhaXpaXqbaJbaKbaLbaLbaMbaNbaObaLbaPbaLbaQbaLbaRbaSbaLbaLbaWbaLbaLbaUbaVbaLbaWbaXbaYbaZaXqaXqbbabbbbbcbbdbbebbfbbebbgbbhbbgbbgbbgbbgbbgbbgbbibbjbbkbbkbbkbbkbblbbkbbmbbnbbkbbkbbobbpbbqbbqbbqbbqbbqbbqbbqbbraYiaYiaMebcTbbtbbubbvbbvbbwbbxaZXaYqbbyaUTaUTaUTaUTaUTbbzaUTbbAbbBbbCbbDaWCbbEaVbbdfbdcbdgbbIbkZbjrcSNcIgaVbaVhaHYaRDbbNbbOaTvbbPbbQaTvbbRbbRaRDbbSbbTbbUaQbbbVbbWbbXaRSaRSbbYbbZaQbbcaaQbbcbbatbccbcdbcebatbatbcfbaAbikbikbikbikbqUbtmbwlbutbwmbtmbmKbutbwmbtmbwlbutbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabaLyaCuaInaGdaKzbaBbaCbaDbaEaKzaGdaInaInaCubaFaVEaInbaGbaHaZdaZdaZeaDEbaIaXnaJraZhaXpaXqbaJbaKbaLbaLbaMbaNbaObaLbaPbaLbaQbaLbaRbaSbaLbaLbaWbaLbaLbaUbaVbaLbaWbaXbaYbaZaXqaXqbbabbbbbcbbdbbebbfbbebbgbbhbbgbbgbbgbbgbbgbbgbbibbjbbkbbkbbkbbkbblbbkbbmbbnbbkbbkbbobbpbbqbbqbbqbbqbbqbbqbbqbbraYiaYiaMebcTbbtbbubbvbbvbbwbbxaZXaYqbbyaUTaUTaUTaUTaUTbbzaUTbbAbbBbbCbbDaWCbbEaVbbdfbdcbdgbbIbkZbjrcSNcIgaVbaVhaHYaRDbbNbbOaTvbbPbbQaTvbbRbbRaRDbbSbbTbbUaQbdilbbWbbXaRSaRSbbYbbZaQbbcaaQbbcbbatbccbcdbcebatbatbcfbaAbikbikbikbikbqUbtmbwlbutbwmbtmbmKbutbwmbtmbwlbutbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabaDEaInaYYaKzaKBaJraJraKCaKzaYYaKzbcgbchbcibcjaInbckbckaXkbckaXlaDEbclaXnaJraDEbcmbcmbcnbcobcobcobcobcobcobcpbcqbcobcobcobcobcobcobcrbcsbctbctbcubctbcvbcwbcxbcvbcvbcybczbcAbcmbcBbcBbcCbcCbcCbcDbcDbcDbcDbcDbcDbcDbcDbcEbcFbcFbcGbcFbcHbcHbcHbcHbcIbcJbcHbcEbcKbcKbcKbcKbcKbcKbcKbcKbcLbcLbcLaMebcMbcNbcObcObcObcObcPbcQbcRbmwbcUaZTbcVbcWbcXbcYaUTaUTbcZbdabdbbdabdaaVbcYtbdddcnbdebdebdecZrcZqaVbbdhbdiaRDbdjaTvbbPbbPbbQbbPaTvbdkaRDbdlbdmbdnaQbaRSbdobdpbdqbdqbdrbdsbdtbdubdvbdwbdxbdybdzbavbatbatbdAbaAbikbikbikbikbqUbwnbmKbutbBQbtmbmKbutbBQbtmbmKbFmbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbdCbdDaJrbdEbdFbdGbdHbdIbdJbdHbdKbdLbdHbdHbdMbdNbdObdPbdQbdQbdQbdRbdQbdSbdTaDEbdUbdVbdWbcobdXbdYbdZbeabebbecbedbeebefbegbehbeibcobejbekbctbelbembenbcvbeobepbeqbcvberbesbetberberberbeuaXJaXObcDbikbikbikbikbikbikbikbcEbevbewbexbeybezbeAbeBbeCbeDbeEbeFbcEbikbikbikbikbikbikbikbcKbeGaYibeHaMebeIbcNbmwbmwbmwbmwbmwbeJbeKbmwbmwbmwbnMbeMbeMbeNbeObePbeQbeRbeSbeTbeUaVbbeVbeWdlHbeYbeYbeXbeZbfaaVbaVhayHaRDbfbbfcaTvbbPbbQaTvbfdbfdaRDaRDbfeaRDaQbbffbbWbbZbfgbfgbfhbbZaQbaQbaQbbfibatbfjbfjbfkbfjbatbflbaAaabbikbikaabbdBbtmbmKbutbBQbtmbmKbutbBQbtmbmKbutbdBbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbdCbfnbfobfnbfnbfnbfnbfnbfnbfobfnbfnbfpaJrbfqbfrbfsaJrbftaJrbfubfvbfwbfxbfyaDEbdVbdVbfzbcobfAbecbecbecbecbecbedbfBbecbecbecbfCbcobejbfDbctbfEbfFbfGbcvbfHbfIbfJbcvbfKbfLbfMbfNbfObesbeuaXJaXObcDbikbikbikbikbcEbcEbcEbcEbfPbfQbfRbfSbfTbfUbfVbfWbfXbfYbfZbcEbcEbcEbcEbikbikbikbikbcKbeGaYibgabgbbgcbgdbgebgfbgcbggbghbgibgjbgkbglbmwbeLbgmbeMbgnbgobeMbgpbgqbgrbgsbeMbgtbgubgvdlHbeYbeYbeXbgwbgxaVbaVhaKsaRDbdjaTvbbPbbPbbQbbPaTvaTvbgybgzaTvbgAaQbbgBbgCbgDbfgbfgbgEbgDbgFaQbbgGbgHbatbgIbgIbgJbgIbatbdAbaAbgKbaAbaAbaAbqUbtmbmKbutbGVbtmbmKbutbGVbtmbmKbutbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbdCbfnbfobfnbfnbfnbfnbfnbfnbfobfnbfnbfpaJrbfqbfrbfsaJrbftaJrbfubfvbfwbfxbfyaDEbdVbdVbfzbcobfAbecbecbecbecbecbedbfBbecbecbecbfCbcobejbfDbctbfEbfFbfGbcvbfHbfIbfJbcvbfKbfLbfMbfNbfObesbeuaXJaXObcDbikbikbikbikbcEbcEbcEbcEbfPbfQbfRbfSbssbfUbfVbfWbfXbfYbfZbcEbcEbcEbcEbikbikbikbikbcKbeGaYibgabgbbgcbgdbgebgfbgcbggbghbgibgjbgkbglbmwbeLbgmbeMbgnbgobeMbgpbgqbgrbgsbeMbgtbgubgvdlHbeYbeYbeXbgwbgxaVbaVhaKsaRDbdjaTvbbPbbPbbQbbPaTvaTvbgybgzaTvbgAaQbbgBbgCbgDbfgbfgbgEbgDbgFaQbbgGbgHbatbgIbgIbgJbgIbatbdAbaAbgKbaAbaAbaAbqUbtmbmKbutbGVbtmbmKbutbGVbtmbmKbutbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaCuaCuaInaInaInaInaInaInaInaInaInaCuaDEbgLbgMbgNbgNbgNbgNbgNbgNbgObgNbgNbgNaDEbdVbejbgPbcobgQbecbecbgRbgSbgTbgUbgRbecbecbecbgVbcobejbekbctbgWbgXbgYbcvbgZbhabhbbcvbhcbhdbhebhfbhgbesbhhbhiaXObcDbcDbhjbcEbcEbcEbhkbhlbhmbhnbhobhobhpbhqbhobhrbhobhsbhtbhubhvbhwbhxbcEbcEbcEbhjbcKbcKbeGaYiaYiaMebhybhzbgkbhAbmwbhBbhCbmwbhDbhEbglbmwbnMbeMbeMbhFbcSbhHbhIbhJbhKbhLbeMbhMbgubhNdlHbeYbeYbhObhPbhQaVbaVhayHaRDbhRbhSbhTbbPbbQbhUaTvaTvbhVaTvbhWbhXaQbbhYbhZbiabfgbfgbibbiabicaQbbidbgHbatbatbatbavbatbatbKnbIzbPfbNjbiibPfddJbmKbmKbmKbmKbmKbmKbmKbmKbmKbmKbutbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikblsbltbltblubltbltbltblvbltbltbmPaabaInaLAaJtbilbgNbimbinbiobipbiqbirbisbitbgNbiubivbiwbixbcobiybecbecbgRbgTbizbiAbgRbecbecbiBbiCbcobejbekbctbctbiDbctbcvbiEbiFbiGbcvbiHbhfbiIbhfbiJbesbeubiKaXOaXPaXPbiLbiMbiNbcEbiObfRbiPbhobhobiQbiRbiSakybiSbiUbiVbiWbiXbiYbiZbjabcEbjbbiMbjcbjdbjebeGaYiaYibjfbmwbjgbmwbmwbmwbjhbjibmwbhDbjjbglbmwbeLbeMbeMbjkbBDbjmbjnbjobjpbhLbjqaVbdlJdlIdlKbeYbeYbeXbhPbjsaVbbjtbjuaRDbjvaRDaRDbjwbbQbjxbjyaTvbjzbjAaWSbjBbdvbjCbjDbjEbjFbjFbjGbjHbjIbdvbjJbjKbatbjLbatbavbatbatddAbaAbaAbaAbaAbgKbqUddBbmKbutbwmbtmbmKbutbwmbtmbmKddCbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikblsbohbptbojbpwbpwbqWbpwbpwbpwbqWblubjNaInaKzaKBbfqbgNbimbjObjPbimbjQbjRbjSbjTbgNbjUaFmbjWbcsbcobjXbjYbjZbkabkbbkcbkdbkebkebkebkfbkgbcobejbivbkhbkibkjbkkbcvbcvbcvbcvbcvbklbkmbknbkobkpbesbeubiKaXJaXJaXJbkqbkrbksbktbkubkvbhobkwbkxbkybkzbkAbkBbkCbkDbkEbkFbkGbkubkHbkIbkJbkKbkMbkLbkObkObkPaYibkQaMebmwbkRbkSbglbmwbkTbkUbmwbkVbkWbglbmwbnMbeMbeMbeMbeNbeMbkXbeMbjpbhLbkYaVbdlObhNbeXbeYbeYbeXbhPblaaVbblbblcbldbleblfblgblhblibljbljbljbljbljbljblkbllblmbfgbfgbfgbfgbfgbfgblnbloblpbgHbatbatbatbavbatbatddDbgKblrblrblrbaAbwmbtmbmKbutbBQbtmbmKbutbBQbtmbmKbutbwmbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
@@ -8868,9 +8870,9 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbrcbltbltblubltbltbltblvbltbltbtnaabaInboibdFbokbgNbjObjObjObimbolbombonboobgNbopboqbjWblCborblCbosbotblCboubovbowbcobnbbncbndbiCbcobejbnfbngboxboybozboAboBbngboCboDboEboFbnmbnmbnmbnmboGboHboIbnqboJboKboLboMboNboOboPboQbmgboRbnvboSboTboUboTboSbnvboVbmgboWboXboYboZbpabpbbpcbpdbnAbpebpfbpfbpgaMeaMeaMeaMebphbjfbphbpiaMeaURaMeaMeaUTaUTaUTaUTbplbpkbpkbpkbpkbpmbpJaVbbakbpnbakbpobpobakbpnbakaVbbnSbmFbmFbppbnTaRDaRDaRDaRDaRDbjvaRDaRDaRDaRDaQbbpqaQcaQcaQcaQcaQcaQcaQbaQbbprbpsbatbatbatbavbatbatddAbaAbaAbaAbaAbgKbqUddFbmKbmKbmKbmKbmKbmKbmKbmKbmKddGbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaLyaCuaKzaKzaKzaDEaDEaDEaDEaDEaDEbtobpubgNbgNbgNbgNbgNbgNbpvbgNbgNbgNbejbejbpxblCbpybpzbosbpAblCdlEbpCbpBbcobnbbncbndbecbcobejbnfbngbpDbpEbpFboAbpFbngboCbpGbpHbpIbmubpKbpLbnmbpMbpNboIbpObpPbpQbpRbpSbpSbpRbpTbpUbmgbpVbnvbnvbpWbpXboTboSbnvbpYbmkbpZbqabqbbqcbqdbqebqbbqfbnAbqgbqhbqibqjbqkbqlbqmbqnbqnbqnbqnbqnbqnbqobqpbqqbqnbqnbqsbqnbqnbqnbqnbqnbqnbqnbqndcZbqubqvbqvbqvbqvbqvbqvbqwbqlbqxbqybqyaHkbqAbqBbqAbqCbqAbqDbqEbqFbqAbqGbqHbqIbqJbqKbqKbqKbqKbqKbqKbqKbqLbqMbqNbqNbqNbqNbqObqNbqPbKnddHbPfddIbiibPfdlbbmKbmKbmKbmKddKbmKddKbmKbmKbmKddGbdBbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbtpbtqbtqbtqbtqbwpbwpbtqbtqbxZbikaabaInaLAaJtbzPbzObzRbzQbzQbzQbzQbzSbzUbzTbcsbdVbBFbrhblCblCblCbribotblCbcobcobcobcobnbbrjbrkbrlbcobrmbrnbngbrobrpboAbpFbrqbngboCbrrbpHbpIbpIbrsbrtbnmbrubpNboIbpObrvbrwbrxbrybrzbrAbpTbrBbmgbrCbpWbnvbrDbrEbrDbnvbpWbrFbnzbrGbqbbqbbqcbrHbqebqbbrIbnAbrJbqibqibqjbqkbqlbqnbqnbqnbqnbqnbqnbqnbrKbqnbqnbqnbqnbqnbqnbrLbrMbrMbrMbrMbrMbrMbrMbrMbrMbrMbrMbrMbrMbrMbrNbrObrPbqKbqKbrQbmFbmFbmFbmFbmFbmGbmFbmFbmFbmFbmFbmFbmFbmFbmFbmFbmFbmFbrRbmFbrSbrTbatbatbatbatbatbatbatddLbaAbgKbaAbaAbaAbqUddMddOddNbdBddPbdBddPbdBddQddMddObqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbBGbDCbBHdjhbDDdjidjidjkdjjbtqbxZbjNaInaInaKBbrWbrXbrYbrXbrXbrXbrXbrZbsabsbbcsbcsbscbsdblCbmUbsebsfbpAblCbsgbshbsgbcobcobcobcobsibcobsjbskbngbslbsmbpFbsnbsobngboCbnmbspbpIbpIbpIbsqbnmbsrbpNboIbpOdmbbrwbrxbstbsubrAbpTbsvbmgbswbsxbnvbsybszbsAboSbsBbsCbsDbsEbsFbsGbsHbsIbsJbqbbsKbnAbsLbsMbqibqjbqkbqlbqnbsNbqnbqnbqnbqnbsObsPbsPbsPbsPbsQbqnbqnbqnbqnbsRbqnbsNbsSbqnbsTbsUbsVbqnbsWbsXbsXbsYbsZbtabtbbmFbmFbmFbmFbmFbmFbmFbtcbtdbmFbmFbmFbmFbmFbmFbmFbmFbmFbmFbmFbtebtfbtfbtgddSddRddUddTddTddTddTddVddWbaAaabbikbikaabbqUddXddZddYdeabqUbikbqUdecdebdecdecbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbBGbDCbBHdjhbDDdjidjidjkdjjbtqbxZbjNaInaInaKBbrWbrXbrYbrXbrXbrXbrXbrZbsabsbbcsbcsbscbsdblCbmUbsebsfbpAblCbsgbshbsgbcobcobcobcobsibcobsjbskbngbslbsmbpFbsnbsobngboCbnmbspbpIbpIbpIbsqbnmbsrbpNboIbpObWDbrwbrxbstbsubrAbpTbsvbmgbswbsxbnvbsybszbsAboSbsBbsCbsDbsEbsFbsGbsHbsIbsJbqbbsKbnAbsLbsMbqibqjbqkbqlbqnbsNbqnbqnbqnbqnbsObsPbsPbsPbsPbsQbqnbqnbqnbqnbsRbqnbsNbsSbqnbsTbsUbsVbqnbsWbsXbsXbsYbsZbtabtbbmFbmFbmFbmFbmFbmFbmFbtcbtdbmFbmFbmFbmFbmFbmFbmFbmFbmFbmFbmFbtebtfbtfbtgddSddRddUddTddTddTddTddVddWbaAaabbikbikaabbqUddXddZddYdeabqUbikbqUdecdebdecdecbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbBGbDCdjldjidjidjidjidjidjidjideHdjnaGddjnaJrbtrbrXbtsbttbtubtvbtwbrZbtxbtybtzbtzbtAbtBblCblCblCbosbtCborbcsbcsbcsbcsbtDbejbejbskbejbsjbskbngbtEbtFbtGbtHboAbngbtIbnmbtJbpIbpIbpIbtKbtLbtMbpNbtNbnqbtObtPbpRbpRbpRbpRbpTbtQbmgbtRbtSbmgbmgbmgbmgbmgbmgbmgbnzbnAbqrbtUbtVbtWbtXbtYbtZbnAbvubuabuabucbucbucbucbucbucbucbudbudbuebufbugbugbufbuebudbudbuhbuhbuhbuhbuhbuhbuibuibujbuibuibuibuibuibukafkbumbunbmFbmFbuobuobupbupbupbupbupbuqbtfbtfbtebtfbmFbtfbtfbtfbtfburbusbusbusbusdedbuubuubuubuubuubuubuubuubuubikbikbikbikbdBddYddYddYdeebqUbikbqUdefdebdebdegbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbBGbDCdjodjpdjpdjidjpdjpdjpbtqdjqaInaInaInaKBbuvbrXbuwbuxbuxbuxbuybrZbejbuzbuAbuBbuCbuDblCbmUbuEbosbuFborbuGbuHbuIbuJbuKbuLbuLbuMbuLbuNbuObngbuPbuQbuRbuSbuTbuUbuVbnmbuWbpIbpIbuXbuYbuZbtMbpNbvabnqbvbbvcbvdbvebvfbvgbvhbnqbnqbvibvjbvkbvlbvmbvlbvnbvjbikbvobnAbvpbvqbvrdmcbtXbqbbvtbnAbxebvwbxfbucbzcbvybvzbvAbvBbvCbvDbvEbvFbvGbvHbvHbvGbvIbvJbvKbuhbvLbvMbvNbvObuhbvPbvQbvRbvSbvTbvUbvUbvVbukafNbvXbvYbvZbvYbwabwabupbwbbwcbwdbupbwebwfbwebupbwgbtfburbusbwhbwibwhbusbwjbwkbusdeicngbxXbwobikbikbikbikbikbikbikbikbikbikbqUddXddZddYdejbqUbikbqUdekdekdekdekbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbBGbDCdjodjpdjpdjidjpdjpdjpbtqdjqaInaInaInaKBbuvbrXbuwbuxbuxbuxbuybrZbejbuzbuAbuBbuCbuDblCbmUbuEbosbuFborbuGbuHbuIbuJbuKbuLbuLbuMbuLbuNbuObngbuPbuQbuRbuSbuTbuUbuVbnmbuWbpIbpIbuXbuYbuZbtMbpNbvabnqbvbbvcbvdbvebvfbvgbvhbnqbnqbvibvjbvkbvlbvmbvlbvnbvjbikbvobnAbvpbvqbvrccIbtXbqbbvtbnAbxebvwbxfbucbzcbvybvzbvAbvBbvCbvDbvEbvFbvGbvHbvHbvGbvIbvJbvKbuhbvLbvMbvNbvObuhbvPbvQbvRbvSbvTbvUbvUbvVbukafNbvXbvYbvZbvYbwabwabupbwbbwcbwdbupbwebwfbwebupbwgbtfburbusbwhbwibwhbusbwjbwkbusdeicngbxXbwobikbikbikbikbikbikbikbikbikbikbqUddXddZddYdejbqUbikbqUdekdekdekdekbqUbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjrbtqbtqbtqbtqbtqbtqbtqbtqdjqbikbikaInbwqbdFbwrbrXbwsbrXbwtbuxbwubwvbrZbwwbwxbwybwzbuDblCblCblCblCblCblCbwAbwBbwCbwDbwEbngbngbngbngbngbngbngbwFbngbngbngbwGbngbwHbwIbwJbpIbpIbpIbwKbtLbwLbpNbwMbnqbIDbvcbnrbnrbnrbnqbwObnqbwPbwQbwRbwSbwTbwUbwVbwWbwXbwYbwZbnAbxabqbbxbbxcbtXbxdbqbbnAbzbbxgbANbucbxhbxibxjbxkbxlbxmbxnbvHbvHbvHbvHbvHbvHbvHbvHbxobxpbxqbxrbxsbxtbuhbxubxvbxwbxxbxybxzbxvbxAbukbDdbvXbxCbxDbxEbxFbxFbxGbxHbxIbxJbxKbxLbxMbxNbupbxObxPbxQbusbxRbxSbxTbLSbxUbxVbusbxWbxXbxYbwobikbikbikbikbikbikbikbikbikbikbDybtldemdemdemdenbikdeodepdepdepbtlbDzbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaLyaCuaKzaKzaInaInaInaInaInaInaInaKBaJrbyabrXbybbycbydbyebyebyfbygbyhbyibyibyjbykbtzbtzbtzbtzbtzbtzbylbymbymbynbyobngbypbyqbyrbysbytbyubyvbywbngbyxbyybyzbuVbtLbwJbpIbpIbyAbnmbnmbyBbyCbyDbyEbyFbyGbyHbyIbyJbyKbyLbyMbyNbyObwXbyPbyQbyPbyQbyRbwXbwYbySbyTbyUbyVbyWbyXbyYbyZbzabyTbAObvwbvwbucbzebzdcSCbzfbzgbucbxnbvHbvHbvHbvHbvHbvHbvHbzhbzibzjbzkbzlbxqbzmbuhbznbzobzpbxxbxAbxzbzqbzrbukbIbbztbzubzvbzvbzwbzxbzybzzbzAbzAbzAbzBbzAbzCbzDbzEbzFbzGbzHbzIbzJbzKbzKbzKbzLbusbzMbxXbzNbwobikbikbikbikbikbikbikbikbikbikbikbDyderderderbDzbikbDyderderderbDzbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaIndjtdjsdjuaIoaIoaIobdFaJraJrbrXbzVbrXbzWbzXbzYbzZbrXbcsbAabAabAbbAcbAbbAbbAbbAcbAbbcsbcsbngbngbngbAdbngbAebAebAebAebAebAebyvbAfbAgbAhbAibAjbAkbAlbAmbAnbAobApbAqbArbAsbAtbAubAvbAwbAwbAxbAybAzbAAbABbACbADbAEbvjbAFbwVbAGbwTbAHbvjbikbAIbAJbAKbALbAJbAJbAJbAJbAMbnAbCBbvwbCCbAPbAQbARbASbATbAUbucbAVbAWbAXbAYbAZbBabBbbBcbvHbBdbuhbBebzlbBfbBgbuhbBhbBibxwbxxbxAbxzbxvbxAbukbDdbvXbBjbBkbBlbBmbBnbBobBpbBqbBrbBsbBtbBubKpbupbBwbBxbBybusbBzbBAbBBbxUbBCbKwbusbzMbxXbBEbwobikbikbikbikaabaabaabaabaabaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
@@ -8880,18 +8882,18 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjxdjCdjEdjDdjGdjFdjIdjHdjFdjJdjLdjKdjydjydjBbikbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevbGWbmrbNkbmrbGXbGYbGZbGYbGYbGYbGYbHabyvbAfbHbbngbngbHcbpIbAibFvbHdbtLbHebHfbHfbHgbHhbHibHjbHkbHlbHmbHnbHobHpbHqbHrbHsbCpbCqbAEbvjbEibHubHvbHwbHxbvjbikbEkbHybHzbHybHybHybHybHybHAbHybKPbvwbKObucbHCbHDbHDbHEbHFbEybHGbHHbHIbHJbHKbHLbHMbHIbHNbHObHPbHQbHRbHSbHTbHTbHUbHVbHWbHXbHYbLibLCbLBbNdbNcbNebIfbIfbIgbIhbIibxGbIjbxJbxJbIkbIlbEUbImbInbIobIpbIqbIrbIsbItbIubIvbIubusbusbIwbEXbGxbLDbLDbLDbLDbLDbGxbFhbFkbFibFkbFkbGTbFhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjxdjydjHdjHdjHdjMdjFdjNdjNdjFdjOdjHdjHdjQdjPdjydjBbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevbLFbKmbIAbKmbIBbAebFqbFrbFrbFrbAebAebyvbAfbICbKobngbIEbpIbAibFvbIFbtLbIGbpIbrsbpIbIHbDXbvvbIIbHlbHmbIJbIKbILbIMbINbIObIPbIQbIRbISbISbITbIUbIVbvjbvjbikbEkbHybIWbIXbIYbIZbJabJbbJcbJdbMhbvwbKObCHbJfbJgbJhbJibJjbEybJkbJlbJmbJnbJobJpbJqbJrbJsbJtbJubJvbJwbJxbJybJzbJAbJBbJCbJDbJEbGwchEbIecnfcjubvYbJIbJJbJKbJLbJLbxGbJMbJNbJObxGbJPbEUbJQbxGbJRbJSbJTbJUbJVbJWbJXbJYbJZbKabKbbKcbKdbKebKfbKfbIxbJFbJHbGzbKlbFfbDBbNhbDBbFfbLEaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjxdjydjSdjRdjUdjTdjVdjFdjWdjHdjXdjHdjHdjHdjHdjHdjMdjFbikbikbikbikbikbikbikbikbikbikdewdeCdevdevdevcOfdewbFnbBRbBRdezbAebFqbAebAebAebAebAebyvbAfbICbLwbngbLQbpIbKqbKrbpIbKsbpHbpIbpIbKtbtLbDXbvvbIIbHlbHmbCpbKubKvbqzbKxbKybKzbKAbKBbKCbKDbwXbKEbKFbwXbwYbwYbKGbHybKHbKIbKJbKKbKLbKLbKMbKNbMibvwbMjbucbEybKQbEubKRbKSbEybJkbKTbKUbKVbKWbKXbKYbKUbJkbKZbLabLbcchbLbbLcbLbbLdbLdbLebLfbLgbLhbLhcpLbLgbLgbLhbLhbLjbLkbLjbLjbxGbxGbxGbxGbxGbLlbLmbBobxGbLnbLobLpbLqbLqbLrbLsbLtbLubLvbLIbLxbLybLzbLAbLAbEObGAbHZbGxbGzbGzbGzbIabGxbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjZdjYdjHdjHdkadkadkadjFdjHdjHdjFdkbdkddkcdkfdkedkgdjFbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevbWobKmbIAbKmbFobLGbLHbAebAebAebLGbAebyvbAfbICbNrbngbLJbpIbAibFvbpIbnmbLKbpIbpIbLLbtLbDXbvvbLMbHlbLNbCpbLObLPbWDbLRcobbKzbLTbLUbLVbLWbLXbLYbLZbMabikbikbikbHybMbbMcbMdbMdbMebMfbMgbHybNSbNRbKObNTbMkbMlbMmbMnbMobMpbMqbJlbMrbMsbMtbMubMvbMrbJkbKZbMwbMxbMybMzbMAbMBbLdbMCbMDbMEbLgbMFbMGbMHbMIbMJbMKbMLbKabMMbLqbLqbMNbMObLqbMPbMQbMRbMSbMTbLqbMUbiTbMWbMXbMYbMZbNabNbbNabNabNabIwbEXbGxbLDbLDbGxcnccndcnebOQbOSbUHbYdbGzbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjZdjYdjHdjHdkadkadkadjFdjHdjHdjFdkbdkddkcdkfdkedkgdjFbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevbWobKmbIAbKmbFobLGbLHbAebAebAebLGbAebyvbAfbICbNrbngbLJbpIbAibFvbpIbnmbLKbpIbpIbLLbtLbDXbvvbLMbHlbLNbCpbLObLPdiNbLRcobbKzbLTbLUbLVbLWbLXbLYbLZbMabikbikbikbHybMbbMcbMdbMdbMebMfbMgbHybNSbNRbKObNTbMkbMlbMmbMnbMobMpbMqbJlbMrbMsbMtbMubMvbMrbJkbKZbMwbMxbMybMzbMAbMBbLdbMCbMDbMEbLgbMFbMGbMHbMIbMJbMKbMLbKabMMbLqbLqbMNbMObLqbMPbMQbMRbMSbMTbLqbMUbiTbMWbMXbMYbMZbNabNbbNabNabNabIwbEXbGxbLDbLDbGxcnccndcnebOQbOSbUHbYdbGzbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkhdjYdjHdjHdjHdjHdjHdkidjHdjHdjFdjydjydjydjydjydjydkjbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevdeEdeDdeGdeDbNlbNmbNnbNnbNnbNnbNnbNobNpbNqbICbWSbngbNsbNtbNubNvbNwbNxbNybNybNybNzbNzbNAbvvbNBbNCbHmbCpbNDbNEbNFbKvbNGbKzbNHbNIbNJbNKbNLbFNbNMbMabikbikbikbHybNNbNObNPbNQbMebMfbMgbHybPibNUbQObPjbNVbNWbNXbNYbNZbOabObbOcbKUbKUbOdbOebKUbKUbJkbKZbOfbOgbOhbOibOjbOkbLdbOlbOmbOnbOobOpbOqbOrbOrbOsbOtbOubOvbOwbJVbJVbOxbJVbOybJVbOzbJVbOAbOBbOBbOCbODbOEbOFbOGbOHcsjbOJbOKbOLbNabOMcxHbikbikbikbGxbORbJFbOPbOQbGzbOObNibGxbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkmdkldkodkndjHdjFdjHdjHdjFdjHdkqdkpdkrbikbikbikbikbikbikbikbikbikbikbikbikbikdewdevdevdevdevdevdewbFnbBRbBRbngbngbBRbBRbBRbBRbBRbngbngbBRbBRbBRbngbOVbOVbOVbOWbOVbNzbOXbOYbOZbPabNzbDXbvvbPbbPcbPcbCpbCpbCpbCpbCpbPdbKzbISbIRbPebNKbPgbPhbMabMabvjbvjbvjbHybHzbHybHybHybHybHybHybHybQPbvwbQQbPkbPlbPmbPnbPlbPlbPobPpbPqbPrbPsbPtbPubPvbPwbMqbPxbPybPzbPAbPBbPCbPDbPEbPFbPGbPHbPIbPJbPKbPLbMHbPMbLhbLhbPNbPObPNbPPbPQbPPbPPbPPbPRbPSbPTbPTbPUbPVbPWbPXbOFbPYbPZbQabQbbQcbQdbNabOMcxHbikbikbikbGxbNfbNgbGxbGzbGxbGxbGzbGxbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjydjydjydjydjydjydjFdjOdjHdksdjHdkudktdkvbikbikbikbikbikbikbikbikbikbikbikbikbikdeJdeIdevdeKdevdeLdeMbikbikbikbikbikbikbikbikbikbikbQgaabbikbikbikbikbOVbQhbQibQjbQkbNzbQlbQmbQnbQobNzbDXbvvbQpbQqbQrbQsbQtbQubQvbQwbQxbQybQzbQAbQBbQCbQDbQEbQFbQGbQHbQIbQJbQKbQLbQMbQRbuabQSbvwbShbSgbSibvwbSjbPlbQTbQUbQVbQWbQXbJkbQYbQZbRabRbbRcbRdbRebRfbRgbRhbRibLbbRjbOibRkbRlbRmbRnbRobRpbLgbRqbMHbMHbMHbRrbLhbPNbRsbRtbRubRvbRwbRxbRybPPbRzbRAbRBbPTbPTbRCbPWbRDbREbWHbRGbRHbRIbRJbRKbNabRLbwobikbikbikbGxbGxbGxbGxbikbikaabbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjxdjydkxdkwdkydkxdkzdjFdjHdjHdjFdjHdkBdkAdkCbikbikbikbikbikbikbikbikbikbikbikbikbikdeOdeNdePdePdePdeNdeQbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbOVbRMbRNbRObRPbNybRQbRRbRSbRTbNzbDXbRUbRVbvvbvvbFXbRWbubbQNbQMbRXbRYbRXbRZbSabSabSbbScbSdbSabSabSebSabSfbSabQMbQRbuabSlbSkbTJbTIbTLbTKbvwbPlbSmbQUbSnbSobSpbJkbSqbSrbSsbStbSubSvbSwbSxbJkbSybSzbLbbSAbSBbSBbSCbSDbSEbSFbSGbLgbSHbSIbMHbSJbSKbLhbPNbSLbSMbSNbSObSPbSQbSRbPPbSSbRAbSTbSTbPTbSUbSVbSWbSXbSYbSZbTabTbbTcbTdbNabOMbwobTebikbikbikbikbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjZdjYdkDdkDdkDdkDdkDdkEdjHdjHdjFdjydjydjydjydjydjydjBbikbikbikbikbikbikbikbikbikbikbikdeRdeSdeSdeSdeTbikbikbikbikbikbikbikbikbOUbOTbQebOTbQfbikbikbikbOVbOVbTjbTkbRObTlbNybTmbQnbTnbTobNzbDXbTpbTqbTrbTsbTtbTubTvbTwbTxbTybTzbTAbTBbTCbTCbTDbTEbTEbTEbTEbTEbTEbTFbTGbTHbTNbTMbTPbTOdlidjmdlkdljdllbPlbTQbQUbQVbTRbSpbJkbSqbSrbTSbTTbTUbTVbTWbTXbJsbTYbTZbLbbLbbUabUabLbbSDbLdbUbbUcbLgbUdbUebUfbUgbUhbLhbPNbUibUjbUkbUlbUmbUnbUobPPbUpbRAbSTbSTbPTbUqbUrbUsbUtbUubUvbUwbUxbUybUzbNabOMbUAbUBbUAbUCbUDbUCbUCbUCbikbikbikbikaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikaabaabaabaabaabbikbikbikbikaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkhdjYdkDdkDdkDdkFdkGdjFdjHdjHdjFdjHdjHdjHdkHdjHdkIdjFbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbTgbTfbTibThbTgbUIbUIbUIbOVbUJbUKbULbUMbUNbUObUPbUQbUQbURbNzbUSbUTbUUbUVbUVbUWbUXbUYbUVbUZbUZbVabVbbONbUZbUZbVdbQMbQMbVebVfbVfbVfbVgbVhbVfbVfbVibVjbVkbVkbVlbVkbVmbVnbVkbVobVpbVqbPlbVrbVsbSqbVtbVubVvbVwbVxbVybVubJkbSybVzbVAbVBbVCbVDbVEbVFbVGbVHbVIbVJbVKbVLbVMbVNbVObLhbPNbPNbVPbVQbVRbVSbVRbVTbPPbVUbVVbVWbVWbPTbVXbVYbVZbNabNabNabNabNabNabNabNabOMbUAbWabWbbWcbWdbWdbWebUCbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikaabbWfbWfbWfbWfbWgbWgbWhbWhbWhbWhbWiaabaabbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkKdkJdkDdkLdkMdjFdjHdjHdkNdjHdjHdjHdkOdjHdkPdjFbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbQebUEbUFbUEbQebUIbWmbWlbOVbWnbWpbWqbWrbWsbNzbWtbWubWvbWwbNzbUTbUTbWxbUVbWybWzbWAbWBbWCbUZdmdbWEbWFbWGcAzbUZbWIbWJbWKbVfbWLbWMbWObWNbWPbWQbWRceLbWTbWUbWVbWWbWXbWYbWZbXabXbbXcbXdbXebXfbXgbXhbSrbXibXjbXkbXlbXmbXnbJsbXobXpbXqbXrbVDbXsbXsbXtbXubLgbXvbXwbXxbXybXzbXAbXBbLhbXCbXDbXEbXFbXEbXEbXGbXHbXIbXJbXKbXLbXMbPTbXNbXObPXbEXbxXbXPbXQbXRbXRbXQbXRbXSbUAbXTbXUbWcbWdbXWbXVbUCbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWfbXXbXYbXXbWgbWhbWhbXZbYabXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkKdkJdkDdkLdkMdjFdjHdjHdkNdjHdjHdjHdkOdjHdkPdjFbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbQebUEbUFbUEbQebUIbWmbWlbOVbWnbWpbWqbWrbWsbNzbWtbWubWvbWwbNzbUTbUTbWxbUVbWybWzbWAbWBbWCbUZdmbbWEbWFbWGcAzbUZbWIbWJbWKbVfbWLbWMbWObWNbWPbWQbWRceLbWTbWUbWVbWWbWXbWYbWZbXabXbbXcbXdbXebXfbXgbXhbSrbXibXjbXkbXlbXmbXnbJsbXobXpbXqbXrbVDbXsbXsbXtbXubLgbXvbXwbXxbXybXzbXAbXBbLhbXCbXDbXEbXFbXEbXEbXGbXHbXIbXJbXKbXLbXMbPTbXNbXObPXbEXbxXbXPbXQbXRbXRbXQbXRbXSbUAbXTbXUbWcbWdbXWbXVbUCbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWfbXXbXYbXXbWgbWhbWhbXZbYabXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkQdkDdkDdkRdjFdjHdjHdjFdkSdjHdjHdkUdkTdjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbTgbUGbUEbUEdeycOWbTkbTkdeAbZAbTkbWqbYhbYibNzbNzbNzbNzbNzbNzbYjbUTbYkbYlbYmbYnbYnbYnbYobUZbYpbYqbYqbYqbYrbYsbYtbYubYvbYwbYxbYybYzbYAbYBbYCbVfbVibYDbVkbYEbYFbYGbYHbYIbVkbSmbQVbSnbSobYJbYKbYLbYMbYNbYObYPbYQbYRbVubYSbYTbYUbYVbYWbYXbYYbYZbZabZbbLgbLgbLgbLgbLgbZcbZdbZebLhbZfbXEbXEbZgbZhbXEbZibZjbZkbZlbRAbZmbZmbPTbPVbZnbPXbEXbUAbZobUAbUAbUAbUAbUAbUAbUAbZpbZqbUCbZrbZtbZsbUCaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacbZubXXbXXbZvbWhbWhbXZbXZbZwbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkWdkVdkXdjFdjHdkYdjFdkZdladjHdjydjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbQebUFbUFbUFbQebUIbYfbYebZzbZAbTkbZBbZCbZDbZEbZFbZFbZFbZGbUTbUTbUTbWxbUVbZHbYnbZIbYnbZJbUZbYpbYqbZKbYqbZLbUZbZMbZNbZObVfbZPbZQbZRbZSbZTbZUbZVbZWbZXbZYbZZcaacabcaccadbVkbTQbQVbQVcaebYJbYKcafcagcahbXjcaicajcElcalcamcancaocapcaqcarcIfcasbXscatbVAcaucavcawcaxcaycazcaAbZjbZfcaBbXEbXEbXEcaCcaDbZjbZkcaEbRAbZmbZmbPTcaFcaGbPXbEXcaHcaIcaJbUAcaKcaLcaMcaNcaOcaPcaQbUCcaRcaScaTbUCbUAbUAbUAbUAbUAbUAbUAbUAbikbikbikbikbikaabbikbikbikbikbikbikbikcaUbWhbZubWhbWhbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydjydjydjydjydjydjydjydjydjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaahbikbikbikbikbikbikbTgbWjbYbbWkbTgbUIbUIbUIbOVcaYcaZcaZcaZbOVbOVbUTcbacbacbbcbcbUTcbdcbebUVbZHbYnbYnbYncbfbUZbYpbYqbYqcbgcbhcbicbjcbkcblbVfbVfbVfbVfbVfcbmbVfbVfcbncbobVkbVkcbpbVkbVnbVkbVkbPlcbqcbqbPlccicbrcbscbtcbucbvcbwcbxcbycbzcbAcbBcaocapcbCcbDcbEcbFcbGcbHbVAcbIcbJcbKcbLcbMcbNcbOcbPcbQcbPcbRcbRcbRcbPcbScbPcbPcbTcbUbZmbZmbPTcbVbZnbPXcbWcbXcbYcbZccaccbccccccccdcceccfccgcckccjcdqcclcfeccmccnccoccpccqccrccscctaabaabaabaabaabaabaabaabbikbikbikbikbikbWgbWhccuccvccvbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbYcbOTbYgbOTbZxbikaabbikbOVbOVbUIbUIbUIbOVbikbUTccAccBccCccDbZFccEccFbUVccGccHccIbYnccJccKccLccMccNccOccPbUZccQccRccSccTccUccUccUccUccVccWccXccYccYccZccZcdacdbcdcbVibPlcddcdecdfcdgcdhbYKcdicbtcdjcdkcdlcdmbSwcdncdocdpcffcdrcdrcdscdrcdrcdrcdtbVAcducdvcdwcdxcdycdzcdAcbPcdBcdCcdDcdEcdFcdCcdGcdHcdCcdIcdJbRBbPTbPTcdKcdLcdMcdNcdOcdPcdQcdRcdScdTcdUcdVcdWcdXcdYcdZceacebceaceccebcebcebcedceecefcegcehaabbikbikbikbikaabbikbikbikbikbikbikbikbWhbWhceibXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbYcbOTbYgbOTbZxbikaabbikbOVbOVbUIbUIbUIbOVbikbUTccAccBccCccDbZFccEccFbUVccGccHdmcbYnccJccKccLccMccNccOccPbUZccQccRccSccTccUccUccUccUccVccWccXccYccYccZccZcdacdbcdcbVibPlcddcdecdfcdgcdhbYKcdicbtcdjcdkcdlcdmbSwcdncdocdpcffcdrcdrcdscdrcdrcdrcdtbVAcducdvcdwcdxcdycdzcdAcbPcdBcdCcdDcdEcdFcdCcdGcdHcdCcdIcdJbRBbPTbPTcdKcdLcdMcdNcdOcdPcdQcdRcdScdTcdUcdVcdWcdXcdYcdZceacebceaceccebcebcebcedceecefcegcehaabbikbikbikbikaabbikbikbikbikbikbikbikbWhbWhceibXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabcejbUTbUTbUTcekbUTbUTcelbUVcemcenceocepceqcercescetceucevcewccKcexceycezceAceBceBceBceBceCceDceEceFceGceFceHceIceJceKchvceMceNceOcePceQceRceSceTceUceVceWceXceYceZcfacfbcfccfgbMmbMmcfichOcgHceYchVcfjcfjcfkcfjcflcfmcfncfocbPcfpcfqcfrcfscfrcftcfucfvcdCbPTcfwbPTbPTcfxcfybZnbBxbEXbUAcfzbUAbUAcfAcfBcfCcfDcfEcebcfFcfGcfHcdUcfHcdUcfIcdUcdUbUAcfJcfKcfLcfMaabaabaabaabaabaabaabaabbikbikbikbikbikbWhbXZbXZbXZbXZbXZbXZcfNbXZcfObXZbXZbXZbXZbXZbWhbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcejcfPbVccqsbUTcfSbUVcfTcfUcfVbZHcfWcfXcfYbYpcfZcgacgbcfXcgccgdcgecgfcgfcggcghcgicgjcgkcglcgmbGycgnbVicgobGybGycgpcgqcgrcgscgtceQcgucgvcgwcgxcgycgzbMVcgBcgCcgzcgzcgDcgEcgEcgEcgEcgEcgGcgFciOcgJcgJcgKcgLcgMcgNcgOcgPcbPcgQcgRcgScgTcgScgUcgVcfrcgWcgXcgYbBxcgZbBxcfybZnbBxbEXchachbchcbUAbUAbUAbUAbUAchdcdUchechfcfIcdUchgcdUbZpcdUchhbUAchichjchkbUAaabbikbikbikbikaabbikbikbikbikbikbikbikbWhchlchlchlchlchlchlchmbXZchnchlcfObXZbXZbXZbXZbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcejchocfQchpbUTcfSchrchrchrchrchrchrbUZbUZbUZbUZbUZbUZbUZchschtchucWpchwchxchychychzchAcglbGybGychBchCchDbGybGybGycqOchFchGceOchHchIchJcgEchKchLchMbSqchLchNcfdcfdcfdcjncjlcjlcjlcjlckacgIbSqclPchPchQchRchSchTchUclQcbPchWchXcfrchYcfrchZciacibciccidciecifbBxcigcfybZncihbEXbFeciicijcikbwobxXbxXbUAcilcimcinciocipciqcirciscitciucivbUAciwciycixcizbikbikbikbikaahbikbikbikbikbikbikbikbikciAbXXbXXbXXbXXbXXbXXbXXciBciCbXZbXZbXZbXZciDbYabWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm
index 46b1662d8d6..403e17cdb0b 100644
--- a/_maps/map_files/cyberiad/z2.dmm
+++ b/_maps/map_files/cyberiad/z2.dmm
@@ -907,7 +907,7 @@
 "wc" = (/turf/unsimulated/floor{tag = "icon-warning (NORTHWEST)"; icon_state = "warning"; dir = 9},/area/centcom/specops)
 "wd" = (/turf/unsimulated/floor{dir = 5; icon_state = "warning"},/area/centcom/specops)
 "we" = (/turf/space,/area/centcom/specops)
-"wf" = (/obj/item/weapon/gun/projectile/automatic/pistol/m2411,/obj/item/ammo_box/magazine/m45,/obj/item/ammo_box/magazine/m45,/obj/item/ammo_box/magazine/m45,/obj/structure/closet{icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; icon_state = "cabinet_closed"},/obj/item/clothing/head/helmet/space/deathsquad/beret,/obj/item/clothing/shoes/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/gloves/combat,/obj/item/clothing/suit/space/deathsquad/officer,/obj/item/clothing/under/rank/centcom/captain,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/flashbangs,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/emergency_oxygen/double,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/specops)
+"wf" = (/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/obj/item/ammo_box/magazine/m45,/obj/item/ammo_box/magazine/m45,/obj/item/ammo_box/magazine/m45,/obj/structure/closet{icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; icon_state = "cabinet_closed"},/obj/item/clothing/head/helmet/space/deathsquad/beret,/obj/item/clothing/shoes/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/gloves/combat,/obj/item/clothing/suit/space/deathsquad/officer,/obj/item/clothing/under/rank/centcom/captain,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/flashbangs,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/emergency_oxygen/double,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/specops)
 "wg" = (/obj/machinery/telecomms/relay/preset/centcom,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/specops)
 "wh" = (/obj/machinery/recharge_station/upgraded,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/specops)
 "wi" = (/turf/unsimulated/wall{icon = 'icons/obj/library.dmi'; icon_state = "book-5"; name = "bookcase (Tactics)"},/area/centcom/specops)
@@ -1136,12 +1136,12 @@
 "EY" = (/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/turf/unsimulated/wall{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5"; name = "window"; opacity = 0; tag = "icon-window5 (EAST)"},/area/admin)
 "EZ" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/turf/unsimulated/wall{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5"; name = "window"; opacity = 0; tag = "icon-window5"},/area/admin)
 "Fa" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "ADMINCHEMLOCKDOWN"; name = "Security Doors"; opacity = 0},/obj/machinery/door/airlock/hatch{name = "Chem Lab"; req_access_txt = "0"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/admin)
-"Fb" = (/obj/structure/rack,/obj/item/ammo_box/magazine/m762,/obj/item/ammo_box/magazine/m762,/obj/item/ammo_box/magazine/m762,/obj/item/ammo_box/magazine/m762,/obj/item/weapon/gun/projectile/automatic/l6_saw,/obj/item/weapon/gun/projectile/automatic/l6_saw{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
+"Fb" = (/obj/structure/rack,/obj/item/ammo_box/magazine/mm556x45,/obj/item/ammo_box/magazine/mm556x45,/obj/item/ammo_box/magazine/mm556x45,/obj/item/ammo_box/magazine/mm556x45,/obj/item/weapon/gun/projectile/automatic/l6_saw,/obj/item/weapon/gun/projectile/automatic/l6_saw{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Fc" = (/obj/structure/rack,/obj/item/weapon/gun/projectile/automatic/proto,/obj/item/weapon/gun/projectile/automatic/proto{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Fd" = (/obj/structure/rack,/obj/item/ammo_box/magazine/m556,/obj/item/ammo_box/magazine/m556,/obj/item/ammo_box/magazine/m556,/obj/item/ammo_box/magazine/m556,/obj/item/ammo_box/magazine/m556,/obj/item/ammo_box/magazine/m556,/obj/item/ammo_box/a40mm,/obj/item/ammo_box/a40mm,/obj/item/ammo_box/a40mm,/obj/item/ammo_box/a40mm,/obj/item/weapon/gun/projectile/automatic/m90,/obj/item/weapon/gun/projectile/automatic/m90{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Fe" = (/obj/structure/mirror{dir = 4; pixel_x = 0; pixel_y = -32},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Ff" = (/obj/machinery/optable,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/admin)
-"Fh" = (/obj/structure/table,/obj/item/weapon/gun/energy/pulse_rifle/pistol,/obj/machinery/door_control{desc = "A remote control switch to lock down the admin lab."; icon_state = "doorctrl0"; id = "ADMINCHEMLOCKDOWN"; name = "Lockdown"; pixel_y = 24; req_access_txt = "0"},/turf/unsimulated/floor{dir = 9; icon_state = "carpetside"},/area/admin)
+"Fh" = (/obj/structure/table,/obj/item/weapon/gun/energy/pulse/pistol,/obj/machinery/door_control{desc = "A remote control switch to lock down the admin lab."; icon_state = "doorctrl0"; id = "ADMINCHEMLOCKDOWN"; name = "Lockdown"; pixel_y = 24; req_access_txt = "0"},/turf/unsimulated/floor{dir = 9; icon_state = "carpetside"},/area/admin)
 "Fi" = (/turf/unsimulated/floor{dir = 1; icon_state = "carpetside"},/area/admin)
 "Fj" = (/obj/machinery/computer/secure_data,/obj/item/weapon/paper/sop,/turf/unsimulated/floor{dir = 5; icon_state = "carpetside"},/area/admin)
 "Fk" = (/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/turf/unsimulated/wall{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "diagonalWall3"},/area/admin)
@@ -1163,7 +1163,7 @@
 "FA" = (/obj/structure/table,/obj/structure/window/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/unsimulated/floor{dir = 10; icon_state = "carpetside"},/area/admin)
 "FB" = (/obj/structure/table,/obj/machinery/door/window/southleft{name = "security checkpoint"; req_access_txt = "0"},/turf/unsimulated/floor{dir = 2; icon_state = "carpetside"},/area/admin)
 "FC" = (/obj/structure/table,/obj/structure/window/reinforced,/obj/machinery/recharger,/turf/unsimulated/floor{dir = 6; icon_state = "carpetside"},/area/admin)
-"FD" = (/obj/machinery/recharger/wallcharger{pixel_x = 30},/obj/structure/rack,/obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911,/obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
+"FD" = (/obj/machinery/recharger/wallcharger{pixel_x = 30},/obj/structure/rack,/obj/item/weapon/gun/energy/pulse/pistol/m1911,/obj/item/weapon/gun/energy/pulse/pistol/m1911{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "FE" = (/obj/structure/table,/obj/item/weapon/tank/oxygen/yellow,/obj/random/bomb_supply,/obj/item/clothing/under/rebeloutfit,/obj/item/clothing/suit/poncho/ponchoshame,/obj/item/clothing/head/sombrero/shamebrero,/turf/unsimulated/floor{tag = "icon-dark"; icon_state = "dark"},/area/admin)
 "FF" = (/obj/machinery/door/airlock/hatch{name = "Tool Storage"; req_access_txt = "0"},/turf/unsimulated/floor{tag = "icon-dark"; icon_state = "dark"},/area/admin)
 "FG" = (/obj/structure/table,/obj/item/weapon/FixOVein,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/admin)
@@ -1174,8 +1174,8 @@
 "FL" = (/turf/simulated/wall/r_wall,/area/adminconstruction)
 "FM" = (/obj/structure/rack,/obj/item/weapon/gun/energy/meteorgun,/obj/item/weapon/gun/energy/meteorgun{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "FN" = (/obj/structure/rack,/obj/item/weapon/twohanded/knighthammer{pixel_x = -3; pixel_y = 3},/obj/item/weapon/twohanded/mjollnir,/obj/item/weapon/twohanded/singularityhammer{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
-"FO" = (/obj/structure/rack,/obj/item/weapon/gun/energy/crossbow,/obj/item/weapon/gun/energy/crossbow{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
-"FP" = (/obj/machinery/recharger/wallcharger{pixel_x = 30},/obj/structure/rack,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
+"FO" = (/obj/structure/rack,/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow,/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
+"FP" = (/obj/machinery/recharger/wallcharger{pixel_x = 30},/obj/structure/rack,/obj/item/weapon/gun/energy/pulse,/obj/item/weapon/gun/energy/pulse{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "FQ" = (/obj/structure/table,/obj/random/tool,/obj/item/clothing/gloves/color/yellow,/obj/item/weapon/pinpointer/advpinpointer,/turf/unsimulated/floor{tag = "icon-dark"; icon_state = "dark"},/area/admin)
 "FR" = (/obj/structure/table,/obj/item/weapon/grenade/syndieminibomb{pixel_x = 4; pixel_y = 2; pixel_z = 0},/obj/item/weapon/grenade/syndieminibomb{pixel_x = -1},/turf/unsimulated/floor{tag = "icon-dark"; icon_state = "dark"},/area/admin)
 "FS" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 0},/obj/item/toy/cards/deck/syndicate/black,/turf/unsimulated/floor{tag = "icon-dark"; icon_state = "dark"},/area/admin)
@@ -1593,4 +1593,3 @@ aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN
 aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN
 aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN
 "}
-
diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm
index 104c590cccc..da5594a4405 100644
--- a/_maps/map_files/cyberiad/z6.dmm
+++ b/_maps/map_files/cyberiad/z6.dmm
@@ -648,7 +648,7 @@
 "mx" = (/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
 "my" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/engine,/area/syndicate_depot)
 "mz" = (/turf/simulated/floor/engine,/area/syndicate_depot)
-"mA" = (/obj/structure/closet/crate{name = "munitions crate"},/obj/item/weapon/storage/box/donkpockets,/obj/item/ammo_box/magazine/m762,/obj/item/weapon/gun/projectile/automatic/m90,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
+"mA" = (/obj/structure/closet/crate{name = "munitions crate"},/obj/item/weapon/storage/box/donkpockets,/obj/item/ammo_box/magazine/mm556x45,/obj/item/weapon/gun/projectile/automatic/m90,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
 "mB" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon_state = "right"; name = "Telepad"; req_access_txt = "0"},/turf/simulated/floor/engine,/area/syndicate_depot)
 "mC" = (/obj/machinery/telepad,/turf/simulated/floor/engine,/area/syndicate_depot)
 "mD" = (/obj/structure/closet/crate{name = "munitions crate"},/obj/item/ammo_box/magazine/m12g/dragon,/obj/item/ammo_box/magazine/m12g/dragon,/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate,/obj/item/weapon/storage/firstaid/tactical,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index bf620aad6e3..ca293307099 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -53,3 +53,11 @@
 #define AI_ON		1
 #define AI_IDLE		2
 #define AI_OFF		3
+
+//Gun Stuff
+ #define SAWN_INTACT  0
+ #define SAWN_OFF     1
+
+ #define WEAPON_LIGHT 0
+ #define WEAPON_MEDIUM 1
+ #define WEAPON_HEAVY 2
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index d375f63dd39..d36405db5d1 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -251,3 +251,7 @@
                               0.3, 0.3, 0.3, 0,\
                               0.3, 0.3, 0.3, 0,\
                               0,   0,   0,   1)
+//Gun trigger guards
+#define TRIGGER_GUARD_ALLOW_ALL -1
+#define TRIGGER_GUARD_NONE 0
+#define TRIGGER_GUARD_NORMAL 1
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index b44ba964628..db5a0bbcd0f 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -45,7 +45,7 @@
 	if(modifiers["middle"])
 		MiddleClickOn(A)
 		if(controlled_mech) //Are we piloting a mech? Placed here so the modifiers are not overridden.
-			controlled_mech.click_action(A, src) //Override AI normal click behavior.
+			controlled_mech.click_action(A, src, params) //Override AI normal click behavior.
 		return
 	if(modifiers["shift"])
 		ShiftClickOn(A)
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index d135e62ae69..fa1d696a067 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -74,7 +74,7 @@
 		if(!locate(/turf) in list(A,A.loc)) // Prevents inventory from being drilled
 			return
 		var/obj/mecha/M = loc
-		return M.click_action(A,src)
+		return M.click_action(A, src, params)
 
 	if(restrained())
 		changeNext_move(CLICK_CD_HANDCUFFED) //Doing shit in cuffs shall be vey slow
@@ -167,9 +167,8 @@
 	animals lunging, etc.
 */
 /mob/proc/RangedAttack(var/atom/A, var/params)
-	if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/color/yellow/power)) && a_intent == I_HARM)
-		PowerGlove(A)
-	if(!mutations.len) return
+	if(!mutations.len)
+		return
 	if((LASER in mutations) && a_intent == I_HARM)
 		LaserEyes(A) // moved into a proc below
 		return
@@ -319,61 +318,8 @@
 	LE.current = T
 	LE.yo = U.y - T.y
 	LE.xo = U.x - T.x
-	spawn(1)
-		LE.process()
+	LE.fire()
 
-/mob/proc/PowerGlove(atom/A)
-	return
-
-/mob/living/carbon/human/PowerGlove(atom/A)
-	var/obj/item/clothing/gloves/color/yellow/power/G = src:gloves
-	var/time = 100
-	var/turf/T = get_turf(src)
-	var/turf/U = get_turf(A)
-	var/obj/structure/cable/cable = locate() in T
-	if(!cable || !istype(cable))
-		to_chat(src, "<span class='warning'>There is no cable here to power the gloves.</span>")
-		return
-	if(world.time < G.next_shock)
-		to_chat(src, "<span class='warning'>[G] aren't ready to shock again!</span>")
-		return
-	src.visible_message("<span class='warning'>[name] fires an arc of electricity!</span>", \
-	"<span class='warning'>You fire an arc of electricity!</span>", \
-	"You hear the loud crackle of electricity!")
-	var/datum/powernet/PN = cable.get_powernet()
-	var/available = 0
-	var/obj/item/projectile/beam/lightning/L = new /obj/item/projectile/beam/lightning/(get_turf(src))
-	if(PN)
-		available = PN.avail
-		L.damage = PN.get_electrocute_damage()
-		if(available >= 5000000)
-			L.damage = 205
-		if(L.damage >= 200)
-			time = 200
-		else if(L.damage >= 100)
-			time = 150
-		var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
-		s.set_up(5, 1, src)
-		s.start()
-	if(L.damage <= 0)
-		qdel(L)
-	if(L)
-		playsound(get_turf(src), 'sound/effects/eleczap.ogg', 75, 1)
-		L.tang = L.adjustAngle(get_angle(U,T))
-		L.icon = midicon
-		L.icon_state = "[L.tang]"
-		L.firer = usr
-		L.def_zone = get_organ_target()
-		L.original = src
-		L.current = U
-		L.starting = U
-		L.yo = U.y - T.y
-		L.xo = U.x - T.x
-		spawn( 1 )
-			L.process()
-
-	next_move = world.time + 12
-	G.next_shock = world.time + time
 // Simple helper to face what you clicked on, in case it should be needed in more than one place
 /mob/proc/face_atom(var/atom/A)
 
@@ -419,4 +365,4 @@
 	else
 		var/turf/T = screen_loc2turf(modifiers["screen-loc"], get_turf(usr))
 		T.Click(location, control, params)
-	return 1
\ No newline at end of file
+	return 1
diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
index 092398ee174..d37b7368b8f 100644
--- a/code/_onclick/click_override.dm
+++ b/code/_onclick/click_override.dm
@@ -40,4 +40,29 @@
 	newObject.loc = get_turf(A)
 	to_chat(user, "<span class='notice'>You release the power you had stored up, summoning \a [newObject.name]! </span>")
 	usr.loc.visible_message("<span class='notice'>[user] waves \his hand and summons \a [newObject.name]</span>")
-	..()
\ No newline at end of file
+	..()
+
+/datum/middleClickOverride/power_gloves
+	var/last_shocked = 0
+	var/shock_delay = 120
+
+/datum/middleClickOverride/power_gloves/onClick(var/atom/A, var/mob/living/user)
+	if(user.incapacitated())
+		return
+	if(world.time < last_shocked + shock_delay)
+		to_chat(user, "<span class='warning'>The gloves are still recharging.</span>")
+		return
+	if(!isliving(A))
+		to_chat(user, "<span class='warning'>Shocking an inanimate object would be pointless.</span>")
+		return
+	var/mob/living/L = A
+	var/turf/T = get_turf(user)
+	var/obj/structure/cable/C = locate() in T
+	if(!C || !istype(C))
+		to_chat(user, "<span class='warning'>There is no cable here to power the gloves.</span>")
+		return
+	user.visible_message("<span class='warning'>[user.name] fires an arc of electricity at [L]!</span>", "<span class='warning'>You fire an arc of electricity at [L]!</span>", "You hear the loud crackle of electricity!")
+	var/datum/powernet/PN = C.get_powernet()
+	user.Beam(L,icon_state="lightning[rand(1,12)]",icon='icons/effects/effects.dmi',time=5)
+	electrocute_mob(L, PN, user)
+	last_shocked = world.time
diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm
index 233add211f6..4744b789712 100644
--- a/code/_onclick/hud/action.dm
+++ b/code/_onclick/hud/action.dm
@@ -217,11 +217,25 @@
 	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_ALIVE|AB_CHECK_INSIDE
 
 /datum/action/item_action/CheckRemoval(mob/living/user)
-	return !(target in user)
+	return get(target, /mob/living) != user
 
 /datum/action/item_action/hands_free
 	check_flags = AB_CHECK_ALIVE|AB_CHECK_INSIDE
 
+// for clothing accessories like holsters
+/datum/action/item_action/accessory
+	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_ALIVE
+
+/datum/action/item_action/accessory/Checks()
+	. = ..()
+	if(!.)
+		return 0
+	if(target.loc == owner)
+		return 1
+	if(istype(target.loc, /obj/item/clothing/under) && target.loc.loc == owner)
+		return 1
+	return 0
+
 ///prset for organ actions
 /datum/action/item_action/organ_action
 	check_flags = AB_CHECK_ALIVE
diff --git a/code/_onclick/oldcode.dm b/code/_onclick/oldcode.dm
index b3f2c1dde05..89b1131a6f0 100644
--- a/code/_onclick/oldcode.dm
+++ b/code/_onclick/oldcode.dm
@@ -369,8 +369,7 @@
 				A.current = T
 				A.yo = U.y - T.y
 				A.xo = U.x - T.x
-				spawn( 1 )
-					A.process()
+				A.fire()
 
 				usr.next_move = world.time + 6
 	return
diff --git a/code/datums/spells/dumbfire.dm b/code/datums/spells/dumbfire.dm
index c1eb4889a93..7b5c77b7d21 100644
--- a/code/datums/spells/dumbfire.dm
+++ b/code/datums/spells/dumbfire.dm
@@ -79,8 +79,11 @@
 								qdel(trail)
 
 				current_loc = projectile.loc
+				var/matrix/M = new
+				M.Turn(dir2angle(projectile.dir))
+				projectile.transform = M
 
 				sleep(proj_step_delay)
 
 			if(projectile)
-				qdel(projectile)
\ No newline at end of file
+				qdel(projectile)
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 247d481f1be..be25ea14f1f 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -234,9 +234,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 
 /datum/supply_packs/security/taser
 	name = "Stun Guns Crate"
-	contains = list(/obj/item/weapon/gun/energy/advtaser,
-					/obj/item/weapon/gun/energy/advtaser,
-					/obj/item/weapon/gun/energy/advtaser)
+	contains = list(/obj/item/weapon/gun/energy/gun/advtaser,
+					/obj/item/weapon/gun/energy/gun/advtaser,
+					/obj/item/weapon/gun/energy/gun/advtaser)
 	cost = 15
 	containername = "stun gun crate"
 
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 08c418778a3..d9daba46e40 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -605,10 +605,10 @@ var/list/uplink_items = list()
 	gamemodes = list(/datum/game_mode/nuclear)
 
 /datum/uplink_item/ammo/machinegun
-	name = "Box Magazine - 7.62x51mm"
-	desc = "A 50-round magazine of 7.62x51mm ammunition for use in the L6 SAW machine gun. By the time you need to use this, you'll already be on a pile of corpses."
+	name = "Box Magazine - 5.56x45mm"
+	desc = "A 50-round magazine of 5.56x45mm ammunition for use in the L6 SAW machine gun. By the time you need to use this, you'll already be on a pile of corpses."
 	reference = "762"
-	item = /obj/item/ammo_box/magazine/m762
+	item = /obj/item/ammo_box/magazine/mm556x45
 	cost = 12
 	gamemodes = list(/datum/game_mode/nuclear)
 	surplus = 0
diff --git a/code/defines/vox_sounds.dm b/code/defines/vox_sounds.dm
index 6f9bcf122fd..98442569e5b 100644
--- a/code/defines/vox_sounds.dm
+++ b/code/defines/vox_sounds.dm
@@ -16,6 +16,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "across" = 'sound/vox_fem/across.ogg',
 "activate" = 'sound/vox_fem/activate.ogg',
 "activated" = 'sound/vox_fem/activated.ogg',
+"active" = 'sound/vox_fem/active.ogg',
 "activity" = 'sound/vox_fem/activity.ogg',
 "adios" = 'sound/vox_fem/adios.ogg',
 "administration" = 'sound/vox_fem/administration.ogg',
@@ -24,7 +25,9 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "after" = 'sound/vox_fem/after.ogg',
 "agent" = 'sound/vox_fem/agent.ogg',
 "ai" = 'sound/vox_fem/ai.ogg',
+"airlock" = 'sound/vox_fem/airlock.ogg',
 "alarm" = 'sound/vox_fem/alarm.ogg',
+"alcohol" = 'sound/vox_fem/alcohol.ogg',
 "alert" = 'sound/vox_fem/alert.ogg',
 "alien" = 'sound/vox_fem/alien.ogg',
 "aligned" = 'sound/vox_fem/aligned.ogg',
@@ -51,6 +54,8 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "armory" = 'sound/vox_fem/armory.ogg',
 "array" = 'sound/vox_fem/array.ogg',
 "arrest" = 'sound/vox_fem/arrest.ogg',
+"arrival" = 'sound/vox_fem/arrival.ogg',
+"arrivals" = 'sound/vox_fem/arrivals.ogg',
 "asimov" = 'sound/vox_fem/asimov.ogg',
 "ass" = 'sound/vox_fem/ass.ogg',
 "asshole" = 'sound/vox_fem/asshole.ogg',
@@ -74,8 +79,10 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "base" = 'sound/vox_fem/base.ogg',
 "bay" = 'sound/vox_fem/bay.ogg',
 "be" = 'sound/vox_fem/be.ogg',
+"becoming" = 'sound/vox_fem/becoming.ogg',
 "been" = 'sound/vox_fem/been.ogg',
 "before" = 'sound/vox_fem/before.ogg',
+"between" = 'sound/vox_fem/between.ogg',
 "beyond" = 'sound/vox_fem/beyond.ogg',
 "biohazard" = 'sound/vox_fem/biohazard.ogg',
 "biological" = 'sound/vox_fem/biological.ogg',
@@ -86,6 +93,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "bizwarn" = 'sound/vox_fem/bizwarn.ogg',
 "black" = 'sound/vox_fem/black.ogg',
 "blast" = 'sound/vox_fem/blast.ogg',
+"blob" = 'sound/vox_fem/blob.ogg',
 "blocked" = 'sound/vox_fem/blocked.ogg',
 "bloop" = 'sound/vox_fem/bloop.ogg',
 "blue" = 'sound/vox_fem/blue.ogg',
@@ -104,6 +112,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "breached" = 'sound/vox_fem/breached.ogg',
 "break" = 'sound/vox_fem/break.ogg',
 "bridge" = 'sound/vox_fem/bridge.ogg',
+"briefing" = 'sound/vox_fem/briefing.ogg',
 "brig" = 'sound/vox_fem/brig.ogg',
 "bust" = 'sound/vox_fem/bust.ogg',
 "but" = 'sound/vox_fem/but.ogg',
@@ -115,6 +124,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "cage" = 'sound/vox_fem/cage.ogg',
 "call" = 'sound/vox_fem/call.ogg',
 "called" = 'sound/vox_fem/called.ogg',
+"camp" = 'sound/vox_fem/camp.ogg',
 "can" = 'sound/vox_fem/can.ogg',
 "canal" = 'sound/vox_fem/canal.ogg',
 "cancer" = 'sound/vox_fem/cancer.ogg',
@@ -130,11 +140,13 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "center" = 'sound/vox_fem/center.ogg',
 "centi" = 'sound/vox_fem/centi.ogg',
 "central" = 'sound/vox_fem/central.ogg',
+"chair" = 'sound/vox_fem/chair.ogg',
 "chamber" = 'sound/vox_fem/chamber.ogg',
 "changed" = 'sound/vox_fem/changed.ogg',
 "changeling" = 'sound/vox_fem/changeling.ogg',
 "changelings" = 'sound/vox_fem/changelings.ogg',
 "changer" = 'sound/vox_fem/changer.ogg',
+"chapel" = 'sound/vox_fem/chapel.ogg',
 "charlie" = 'sound/vox_fem/charlie.ogg',
 "check" = 'sound/vox_fem/check.ogg',
 "checkpoint" = 'sound/vox_fem/checkpoint.ogg',
@@ -147,6 +159,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "clear" = 'sound/vox_fem/clear.ogg',
 "clearance" = 'sound/vox_fem/clearance.ogg',
 "close" = 'sound/vox_fem/close.ogg',
+"closet" = 'sound/vox_fem/closet.ogg',
 "clown" = 'sound/vox_fem/clown.ogg',
 "clowns" = 'sound/vox_fem/clowns.ogg',
 "cmo" = 'sound/vox_fem/cmo.ogg',
@@ -179,6 +192,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "cryogenic" = 'sound/vox_fem/cryogenic.ogg',
 "cunt" = 'sound/vox_fem/cunt.ogg',
 "cunts" = 'sound/vox_fem/cunts.ogg',
+"cyberiad" = 'sound/vox_fem/cyberiad.ogg',
 "cyborg" = 'sound/vox_fem/cyborg.ogg',
 "cyborgs" = 'sound/vox_fem/cyborgs.ogg',
 "d" = 'sound/vox_fem/d.ogg',
@@ -190,6 +204,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "deactivated" = 'sound/vox_fem/deactivated.ogg',
 "dead" = 'sound/vox_fem/dead.ogg',
 "death" = 'sound/vox_fem/death.ogg',
+"declared" = 'sound/vox_fem/declared.ogg',
 "decompression" = 'sound/vox_fem/decompression.ogg',
 "decontamination" = 'sound/vox_fem/decontamination.ogg',
 "deeoo" = 'sound/vox_fem/deeoo.ogg',
@@ -206,11 +221,13 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "destroyed" = 'sound/vox_fem/destroyed.ogg',
 "detain" = 'sound/vox_fem/detain.ogg',
 "detected" = 'sound/vox_fem/detected.ogg',
+"detective" = 'sound/vox_fem/detective.ogg',
 "detonation" = 'sound/vox_fem/detonation.ogg',
 "device" = 'sound/vox_fem/device.ogg',
 "did" = 'sound/vox_fem/did.ogg',
 "die" = 'sound/vox_fem/die.ogg',
 "dimensional" = 'sound/vox_fem/dimensional.ogg',
+"diona" = 'sound/vox_fem/diona.ogg',
 "dirt" = 'sound/vox_fem/dirt.ogg',
 "disengaged" = 'sound/vox_fem/disengaged.ogg',
 "dish" = 'sound/vox_fem/dish.ogg',
@@ -218,12 +235,18 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "distance" = 'sound/vox_fem/distance.ogg',
 "distortion" = 'sound/vox_fem/distortion.ogg',
 "do" = 'sound/vox_fem/do.ogg',
+"dock" = 'sound/vox_fem/dock.ogg',
+"docked" = 'sound/vox_fem/docked.ogg',
+"docking" = 'sound/vox_fem/docking.ogg',
+"docks" = 'sound/vox_fem/docks.ogg',
 "doctor" = 'sound/vox_fem/doctor.ogg',
 "doctors" = 'sound/vox_fem/doctors.ogg',
 "doop" = 'sound/vox_fem/doop.ogg',
 "door" = 'sound/vox_fem/door.ogg',
 "dorms" = 'sound/vox_fem/dorms.ogg',
 "down" = 'sound/vox_fem/down.ogg',
+"drask" = 'sound/vox_fem/drask.ogg',
+"drunk" = 'sound/vox_fem/drunk.ogg',
 "dual" = 'sound/vox_fem/dual.ogg',
 "duct" = 'sound/vox_fem/duct.ogg',
 "e" = 'sound/vox_fem/e.ogg',
@@ -240,6 +263,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "elevator" = 'sound/vox_fem/elevator.ogg',
 "eleven" = 'sound/vox_fem/eleven.ogg',
 "eliminate" = 'sound/vox_fem/eliminate.ogg',
+"emag" = 'sound/vox_fem/emag.ogg',
 "emergency" = 'sound/vox_fem/emergency.ogg',
 "energy" = 'sound/vox_fem/energy.ogg',
 "engage" = 'sound/vox_fem/engage.ogg',
@@ -251,9 +275,11 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "enter" = 'sound/vox_fem/enter.ogg',
 "entry" = 'sound/vox_fem/entry.ogg',
 "environment" = 'sound/vox_fem/environment.ogg',
+"equipment" = 'sound/vox_fem/equipment.ogg',
 "error" = 'sound/vox_fem/error.ogg',
 "escape" = 'sound/vox_fem/escape.ogg',
 "evacuate" = 'sound/vox_fem/evacuate.ogg',
+"evacuation" = 'sound/vox_fem/evacuation.ogg',
 "every" = 'sound/vox_fem/every.ogg',
 "everywhere" = 'sound/vox_fem/everywhere.ogg',
 "exchange" = 'sound/vox_fem/exchange.ogg',
@@ -262,6 +288,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "expect" = 'sound/vox_fem/expect.ogg',
 "experiment" = 'sound/vox_fem/experiment.ogg',
 "experimental" = 'sound/vox_fem/experimental.ogg',
+"experimentor" = 'sound/vox_fem/experimentor.ogg',
 "explode" = 'sound/vox_fem/explode.ogg',
 "explosion" = 'sound/vox_fem/explosion.ogg',
 "exposure" = 'sound/vox_fem/exposure.ogg',
@@ -310,6 +337,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "fuel" = 'sound/vox_fem/fuel.ogg',
 "g" = 'sound/vox_fem/g.ogg',
 "gas" = 'sound/vox_fem/gas.ogg',
+"gateway" = 'sound/vox_fem/gateway.ogg',
 "get" = 'sound/vox_fem/get.ogg',
 "glory" = 'sound/vox_fem/glory.ogg',
 "go" = 'sound/vox_fem/go.ogg',
@@ -332,6 +360,8 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "hacker" = 'sound/vox_fem/hacker.ogg',
 "hackers" = 'sound/vox_fem/hackers.ogg',
 "hacking" = 'sound/vox_fem/hacking.ogg',
+"hail" = 'sound/vox_fem/hail.ogg',
+"hallway" = 'sound/vox_fem/hallway.ogg',
 "handling" = 'sound/vox_fem/handling.ogg',
 "hangar" = 'sound/vox_fem/hangar.ogg',
 "happening" = 'sound/vox_fem/happening.ogg',
@@ -352,6 +382,8 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "highest" = 'sound/vox_fem/highest.ogg',
 "hit" = 'sound/vox_fem/hit.ogg',
 "hole" = 'sound/vox_fem/hole.ogg',
+"holoparasite" = 'sound/vox_fem/holoparasite.ogg',
+"honk" = 'sound/vox_fem/honk.ogg',
 "hop" = 'sound/vox_fem/hop.ogg',
 "hos" = 'sound/vox_fem/hos.ogg',
 "hostile" = 'sound/vox_fem/hostile.ogg',
@@ -359,6 +391,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "hotel" = 'sound/vox_fem/hotel.ogg',
 "hour" = 'sound/vox_fem/hour.ogg',
 "hours" = 'sound/vox_fem/hours.ogg',
+"hull" = 'sound/vox_fem/hull.ogg',
 "human" = 'sound/vox_fem/human.ogg',
 "humans" = 'sound/vox_fem/humans.ogg',
 "hundred" = 'sound/vox_fem/hundred.ogg',
@@ -367,10 +400,12 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "hydroponics" = 'sound/vox_fem/hydroponics.ogg',
 "i" = 'sound/vox_fem/i.ogg',
 "iaa" = 'sound/vox_fem/iaa.ogg',
+"ian" = 'sound/vox_fem/ian.ogg',
 "idiot" = 'sound/vox_fem/idiot.ogg',
 "illegal" = 'sound/vox_fem/illegal.ogg',
 "immediate" = 'sound/vox_fem/immediate.ogg',
 "immediately" = 'sound/vox_fem/immediately.ogg',
+"imminent" = 'sound/vox_fem/imminent.ogg',
 "in" = 'sound/vox_fem/in.ogg',
 "inches" = 'sound/vox_fem/inches.ogg',
 "india" = 'sound/vox_fem/india.ogg',
@@ -380,7 +415,9 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "inspection" = 'sound/vox_fem/inspection.ogg',
 "inspector" = 'sound/vox_fem/inspector.ogg',
 "interchange" = 'sound/vox_fem/interchange.ogg',
+"interested" = 'sound/vox_fem/interested.ogg',
 "intruder" = 'sound/vox_fem/intruder.ogg',
+"intruders" = 'sound/vox_fem/intruders.ogg',
 "invalid" = 'sound/vox_fem/invalid.ogg',
 "invasion" = 'sound/vox_fem/invasion.ogg',
 "is" = 'sound/vox_fem/is.ogg',
@@ -390,6 +427,8 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "juliet" = 'sound/vox_fem/juliet.ogg',
 "k" = 'sound/vox_fem/k.ogg',
 "key" = 'sound/vox_fem/key.ogg',
+"kida" = 'sound/vox_fem/kida.ogg',
+"kidan" = 'sound/vox_fem/kidan.ogg',
 "kill" = 'sound/vox_fem/kill.ogg',
 "killed" = 'sound/vox_fem/killed.ogg',
 "killing" = 'sound/vox_fem/killing.ogg',
@@ -398,6 +437,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "kitchen" = 'sound/vox_fem/kitchen.ogg',
 "l" = 'sound/vox_fem/l.ogg',
 "lab" = 'sound/vox_fem/lab.ogg',
+"labor" = 'sound/vox_fem/labor.ogg',
 "lambda" = 'sound/vox_fem/lambda.ogg',
 "laser" = 'sound/vox_fem/laser.ogg',
 "last" = 'sound/vox_fem/last.ogg',
@@ -411,6 +451,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "legal" = 'sound/vox_fem/legal.ogg',
 "level" = 'sound/vox_fem/level.ogg',
 "lever" = 'sound/vox_fem/lever.ogg',
+"library" = 'sound/vox_fem/library.ogg',
 "lie" = 'sound/vox_fem/lie.ogg',
 "lieutenant" = 'sound/vox_fem/lieutenant.ogg',
 "life" = 'sound/vox_fem/life.ogg',
@@ -457,8 +498,13 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "military" = 'sound/vox_fem/military.ogg',
 "milli" = 'sound/vox_fem/milli.ogg',
 "million" = 'sound/vox_fem/million.ogg',
+"mime" = 'sound/vox_fem/mime.ogg',
+"mimes" = 'sound/vox_fem/mimes.ogg',
 "minefield" = 'sound/vox_fem/minefield.ogg',
+"miner" = 'sound/vox_fem/miner.ogg',
+"miners" = 'sound/vox_fem/miners.ogg',
 "minimum" = 'sound/vox_fem/minimum.ogg',
+"mining" = 'sound/vox_fem/mining.ogg',
 "minus" = 'sound/vox_fem/minus.ogg',
 "minutes" = 'sound/vox_fem/minutes.ogg',
 "mister" = 'sound/vox_fem/mister.ogg',
@@ -473,6 +519,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "must" = 'sound/vox_fem/must.ogg',
 "my" = 'sound/vox_fem/my.ogg',
 "n" = 'sound/vox_fem/n.ogg',
+"n2o" = 'sound/vox_fem/n2o.ogg',
 "nanotrasen" = 'sound/vox_fem/nanotrasen.ogg',
 "nearest" = 'sound/vox_fem/nearest.ogg',
 "negative" = 'sound/vox_fem/negative.ogg',
@@ -488,20 +535,25 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "not" = 'sound/vox_fem/not.ogg',
 "november" = 'sound/vox_fem/november.ogg',
 "now" = 'sound/vox_fem/now.ogg',
+"nuke" = 'sound/vox_fem/nuke.ogg',
 "number" = 'sound/vox_fem/number.ogg',
 "o" = 'sound/vox_fem/o.ogg',
 "objective" = 'sound/vox_fem/objective.ogg',
 "observation" = 'sound/vox_fem/observation.ogg',
 "obtain" = 'sound/vox_fem/obtain.ogg',
 "of" = 'sound/vox_fem/of.ogg',
+"office" = 'sound/vox_fem/office.ogg',
 "officer" = 'sound/vox_fem/officer.ogg',
 "ok" = 'sound/vox_fem/ok.ogg',
 "on" = 'sound/vox_fem/on.ogg',
 "one" = 'sound/vox_fem/one.ogg',
+"op" = 'sound/vox_fem/op.ogg',
 "open" = 'sound/vox_fem/open.ogg',
 "operating" = 'sound/vox_fem/operating.ogg',
+"operational" = 'sound/vox_fem/operational.ogg',
 "operations" = 'sound/vox_fem/operations.ogg',
 "operative" = 'sound/vox_fem/operative.ogg',
+"ops" = 'sound/vox_fem/ops.ogg',
 "option" = 'sound/vox_fem/option.ogg',
 "or" = 'sound/vox_fem/or.ogg',
 "order" = 'sound/vox_fem/order.ogg',
@@ -526,7 +578,10 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "plasma" = 'sound/vox_fem/plasma.ogg',
 "platform" = 'sound/vox_fem/platform.ogg',
 "please" = 'sound/vox_fem/please.ogg',
+"pod" = 'sound/vox_fem/pod.ogg',
+"pods" = 'sound/vox_fem/pods.ogg',
 "point" = 'sound/vox_fem/point.ogg',
+"poly" = 'sound/vox_fem/poly.ogg',
 "port" = 'sound/vox_fem/port.ogg',
 "portal" = 'sound/vox_fem/portal.ogg',
 "power" = 'sound/vox_fem/power.ogg',
@@ -540,6 +595,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "propulsion" = 'sound/vox_fem/propulsion.ogg',
 "prosecute" = 'sound/vox_fem/prosecute.ogg',
 "protective" = 'sound/vox_fem/protective.ogg',
+"pun" = 'sound/vox_fem/pun.ogg',
 "push" = 'sound/vox_fem/push.ogg',
 "q" = 'sound/vox_fem/q.ogg',
 "qm" = 'sound/vox_fem/qm.ogg',
@@ -569,10 +625,12 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "released" = 'sound/vox_fem/released.ogg',
 "remaining" = 'sound/vox_fem/remaining.ogg',
 "removal" = 'sound/vox_fem/removal.ogg',
+"renault" = 'sound/vox_fem/renault.ogg',
 "renegade" = 'sound/vox_fem/renegade.ogg',
 "repair" = 'sound/vox_fem/repair.ogg',
 "report" = 'sound/vox_fem/report.ogg',
 "reports" = 'sound/vox_fem/reports.ogg',
+"representative" = 'sound/vox_fem/representative.ogg',
 "request" = 'sound/vox_fem/request.ogg',
 "requested" = 'sound/vox_fem/requested.ogg',
 "required" = 'sound/vox_fem/required.ogg',
@@ -591,6 +649,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "room" = 'sound/vox_fem/room.ogg',
 "round" = 'sound/vox_fem/round.ogg',
 "run" = 'sound/vox_fem/run.ogg',
+"runtime" = 'sound/vox_fem/runtime.ogg',
 "s" = 'sound/vox_fem/s.ogg',
 "safe" = 'sound/vox_fem/safe.ogg',
 "safety" = 'sound/vox_fem/safety.ogg',
@@ -601,6 +660,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "science" = 'sound/vox_fem/science.ogg',
 "scream" = 'sound/vox_fem/scream.ogg',
 "screen" = 'sound/vox_fem/screen.ogg',
+"scrubbers" = 'sound/vox_fem/scrubbers.ogg',
 "search" = 'sound/vox_fem/search.ogg',
 "second" = 'sound/vox_fem/second.ogg',
 "secondary" = 'sound/vox_fem/secondary.ogg',
@@ -612,6 +672,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "select" = 'sound/vox_fem/select.ogg',
 "selected" = 'sound/vox_fem/selected.ogg',
 "sensors" = 'sound/vox_fem/sensors.ogg',
+"sequencer" = 'sound/vox_fem/sequencer.ogg',
 "service" = 'sound/vox_fem/service.ogg',
 "seven" = 'sound/vox_fem/seven.ogg',
 "seventeen" = 'sound/vox_fem/seventeen.ogg',
@@ -642,6 +703,9 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "sixteen" = 'sound/vox_fem/sixteen.ogg',
 "sixty" = 'sound/vox_fem/sixty.ogg',
 "skipjack" = 'sound/vox_fem/skipjack.ogg',
+"skree" = 'sound/vox_fem/skree.ogg',
+"skrek" = 'sound/vox_fem/skrek.ogg',
+"skrell" = 'sound/vox_fem/skrell.ogg',
 "slime" = 'sound/vox_fem/slime.ogg',
 "slow" = 'sound/vox_fem/slow.ogg',
 "smoke" = 'sound/vox_fem/smoke.ogg',
@@ -654,6 +718,9 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "son" = 'sound/vox_fem/son.ogg',
 "sorry" = 'sound/vox_fem/sorry.ogg',
 "south" = 'sound/vox_fem/south.ogg',
+"space" = 'sound/vox_fem/space.ogg',
+"spider" = 'sound/vox_fem/spider.ogg',
+"spiders" = 'sound/vox_fem/spiders.ogg',
 "squad" = 'sound/vox_fem/squad.ogg',
 "square" = 'sound/vox_fem/square.ogg',
 "ss13" = 'sound/vox_fem/ss13.ogg',
@@ -664,8 +731,10 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "status" = 'sound/vox_fem/status.ogg',
 "sterile" = 'sound/vox_fem/sterile.ogg',
 "sterilization" = 'sound/vox_fem/sterilization.ogg',
+"still" = 'sound/vox_fem/still.ogg',
 "storage" = 'sound/vox_fem/storage.ogg',
 "stuck" = 'sound/vox_fem/stuck.ogg',
+"stupid" = 'sound/vox_fem/stupid.ogg',
 "sub" = 'sound/vox_fem/sub.ogg',
 "subsurface" = 'sound/vox_fem/subsurface.ogg',
 "sudden" = 'sound/vox_fem/sudden.ogg',
@@ -679,7 +748,10 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "surrender" = 'sound/vox_fem/surrender.ogg',
 "surround" = 'sound/vox_fem/surround.ogg',
 "surrounded" = 'sound/vox_fem/surrounded.ogg',
+"swarmer" = 'sound/vox_fem/swarmer.ogg',
+"swarmers" = 'sound/vox_fem/swarmers.ogg',
 "switch" = 'sound/vox_fem/switch.ogg',
+"sword" = 'sound/vox_fem/sword.ogg',
 "syndicate" = 'sound/vox_fem/syndicate.ogg',
 "system" = 'sound/vox_fem/system.ogg',
 "systems" = 'sound/vox_fem/systems.ogg',
@@ -692,13 +764,19 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "tank" = 'sound/vox_fem/tank.ogg',
 "target" = 'sound/vox_fem/target.ogg',
 "team" = 'sound/vox_fem/team.ogg',
+"technology" = 'sound/vox_fem/technology.ogg',
 "telecomms" = 'sound/vox_fem/telecomms.ogg',
+"teleport" = 'sound/vox_fem/teleport.ogg',
+"teleported" = 'sound/vox_fem/teleported.ogg',
+"teleporter" = 'sound/vox_fem/teleporter.ogg',
+"teleporting" = 'sound/vox_fem/teleporting.ogg',
 "temperature" = 'sound/vox_fem/temperature.ogg',
 "temporal" = 'sound/vox_fem/temporal.ogg',
 "ten" = 'sound/vox_fem/ten.ogg',
 "terminal" = 'sound/vox_fem/terminal.ogg',
 "terminated" = 'sound/vox_fem/terminated.ogg',
 "termination" = 'sound/vox_fem/termination.ogg',
+"tesla" = 'sound/vox_fem/tesla.ogg',
 "test" = 'sound/vox_fem/test.ogg',
 "that" = 'sound/vox_fem/that.ogg',
 "the" = 'sound/vox_fem/the.ogg',
@@ -716,6 +794,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "tide" = 'sound/vox_fem/tide.ogg',
 "time" = 'sound/vox_fem/time.ogg',
 "to" = 'sound/vox_fem/to.ogg',
+"tool" = 'sound/vox_fem/tool.ogg',
 "top" = 'sound/vox_fem/top.ogg',
 "topside" = 'sound/vox_fem/topside.ogg',
 "touch" = 'sound/vox_fem/touch.ogg',
@@ -735,6 +814,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "twenty" = 'sound/vox_fem/twenty.ogg',
 "two" = 'sound/vox_fem/two.ogg',
 "u" = 'sound/vox_fem/u.ogg',
+"unathi" = 'sound/vox_fem/unathi.ogg',
 "unauthorized" = 'sound/vox_fem/unauthorized.ogg',
 "under" = 'sound/vox_fem/under.ogg',
 "uniform" = 'sound/vox_fem/uniform.ogg',
@@ -753,13 +833,16 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "used" = 'sound/vox_fem/used.ogg',
 "user" = 'sound/vox_fem/user.ogg',
 "v" = 'sound/vox_fem/v.ogg',
+"vacant" = 'sound/vox_fem/vacant.ogg',
 "vacate" = 'sound/vox_fem/vacate.ogg',
 "valid" = 'sound/vox_fem/valid.ogg',
 "vampire" = 'sound/vox_fem/vampire.ogg',
 "vampires" = 'sound/vox_fem/vampires.ogg',
 "vapor" = 'sound/vox_fem/vapor.ogg',
+"vault" = 'sound/vox_fem/vault.ogg',
 "vent" = 'sound/vox_fem/vent.ogg',
 "ventilation" = 'sound/vox_fem/ventilation.ogg',
+"vents" = 'sound/vox_fem/vents.ogg',
 "victor" = 'sound/vox_fem/victor.ogg',
 "violated" = 'sound/vox_fem/violated.ogg',
 "violation" = 'sound/vox_fem/violation.ogg',
@@ -767,6 +850,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "voltage" = 'sound/vox_fem/voltage.ogg',
 "vox" = 'sound/vox_fem/vox.ogg',
 "vox_login" = 'sound/vox_fem/vox_login.ogg',
+"vulpkanin" = 'sound/vox_fem/vulpkanin.ogg',
 "w" = 'sound/vox_fem/w.ogg',
 "walk" = 'sound/vox_fem/walk.ogg',
 "wall" = 'sound/vox_fem/wall.ogg',
@@ -783,12 +867,15 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "weapon" = 'sound/vox_fem/weapon.ogg',
 "weed" = 'sound/vox_fem/weed.ogg',
 "welcome" = 'sound/vox_fem/welcome.ogg',
+"weld" = 'sound/vox_fem/weld.ogg',
 "west" = 'sound/vox_fem/west.ogg',
 "whiskey" = 'sound/vox_fem/whiskey.ogg',
 "white" = 'sound/vox_fem/white.ogg',
 "wiggle" = 'sound/vox_fem/wiggle.ogg',
 "wilco" = 'sound/vox_fem/wilco.ogg',
 "will" = 'sound/vox_fem/will.ogg',
+"window" = 'sound/vox_fem/window.ogg',
+"windows" = 'sound/vox_fem/windows.ogg',
 "with" = 'sound/vox_fem/with.ogg',
 "without" = 'sound/vox_fem/without.ogg',
 "wizard" = 'sound/vox_fem/wizard.ogg',
@@ -807,6 +894,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "year" = 'sound/vox_fem/year.ogg',
 "yellow" = 'sound/vox_fem/yellow.ogg',
 "yes" = 'sound/vox_fem/yes.ogg',
+"yet" = 'sound/vox_fem/yet.ogg',
 "you" = 'sound/vox_fem/you.ogg',
 "your" = 'sound/vox_fem/your.ogg',
 "yourself" = 'sound/vox_fem/yourself.ogg',
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 92c894cba10..b169deeee10 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -331,4 +331,4 @@
 /atom/movable/CanPass(atom/movable/mover, turf/target, height=1.5)
 	if(buckled_mob == mover)
 		return 1
-	return ..()
\ No newline at end of file
+	return ..()
diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm
index 229b35660a3..d60748f8dae 100644
--- a/code/game/gamemodes/blob/blobs/blob_mobs.dm
+++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm
@@ -91,6 +91,8 @@
 	loc.visible_message("<span class='warning'>The corpse of [H.name] suddenly rises!</span>")
 
 /mob/living/simple_animal/hostile/blob/blobspore/death()
+	..()
+
 	// On death, create a small smoke of harmful gas (s-Acid)
 	var/datum/effect/system/chem_smoke_spread/S = new
 	var/turf/location = get_turf(src)
@@ -108,7 +110,6 @@
 	S.set_up(reagents, 1, 1, location, 15, 1) // only 1-2 smoke cloud
 	S.start()
 
-	ghostize()
 	qdel(src)
 
 /mob/living/simple_animal/hostile/blob/blobspore/Destroy()
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 803a7ba0d80..3c8b96935ec 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -72,7 +72,7 @@ rcd light flash thingy on matter drain
 		if(T.z in config.station_levels)
 			// Increase health by 37.5% of original max, decrease delays between shots to 66%
 			turret.health += initial(turret.health) * 3 / 8
-			turret.eprojectile = /obj/item/projectile/beam/heavylaser //Once you see it, you will know what it means to FEAR.
+			turret.eprojectile = /obj/item/projectile/beam/laser/heavylaser //Once you see it, you will know what it means to FEAR.
 			turret.eshot_sound = 'sound/weapons/lasercannonfire.ogg'
 	to_chat(src, "<span class='notice'>Turrets upgraded.</span>")
 /datum/AI_Module/large/destroy_rcd
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index 5107ff7cab4..930ec3df35d 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -14,7 +14,7 @@
 	origin_tech = "materials=5;biotech=4;powerstorage=5;abductor=3"
 	armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15)
 	action_button_name = "Activate"
-	action_button_is_hands_free = 1
+	action_button_custom_type = /datum/action/item_action/hands_free
 	var/mode = VEST_STEALTH
 	var/stealth_active = 0
 	var/combat_cooldown = 10
@@ -308,14 +308,7 @@
 	icon_state = "alienpistol"
 	item_state = "alienpistol"
 	origin_tech = "combat=5;materials=4;powerstorage=3;abductor=3"
-
-/obj/item/weapon/gun/energy/decloner/alien/special_check(user)
-	if(istype(user, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = user
-		if(H.get_species() != "Abductor")
-			to_chat(user, "<span class='userdanger'>UNAUTHORIZED -- UNAUTHORIZED</span>")
-			return 0
-	return 1
+	restricted_species = list("Abductor")
 
 /obj/item/weapon/paper/abductor
 	name = "Dissection Guide"
@@ -631,4 +624,4 @@ Congratulations! You are now trained for xenobiology research!"}
 	icon_state = "abductor"
 	icon_closed = "abductor"
 	icon_opened = "abductoropen"
-	material_drop = /obj/item/stack/sheet/mineral/abductor
\ No newline at end of file
+	material_drop = /obj/item/stack/sheet/mineral/abductor
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index fd648b05c7d..25d2807432e 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -35,7 +35,7 @@
 
 /datum/theft_objective/hoslaser
 	name = "the head of security's recreated antique laser gun"
-	typepath = /obj/item/weapon/gun/energy/hos
+	typepath = /obj/item/weapon/gun/energy/gun/hos
 	protected_jobs = list("Head Of Security")
 
 /datum/theft_objective/hand_tele
@@ -244,4 +244,4 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C)
 	typepath = /obj/item/stack/sheet/mineral/uranium
 	min=10
 	max=30
-	step=5
\ No newline at end of file
+	step=5
diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm
index eb1e8bce930..f2c10d7fc10 100644
--- a/code/game/gamemodes/wizard/rightandwrong.dm
+++ b/code/game/gamemodes/wizard/rightandwrong.dm
@@ -20,7 +20,7 @@
 		if(!summon_type)
 			switch (randomizeguns)
 				if("taser")
-					new /obj/item/weapon/gun/energy/advtaser(get_turf(H))
+					new /obj/item/weapon/gun/energy/gun/advtaser(get_turf(H))
 				if("egun")
 					new /obj/item/weapon/gun/energy/gun(get_turf(H))
 				if("laser")
@@ -34,7 +34,7 @@
 				if("gyrojet")
 					new /obj/item/weapon/gun/projectile/automatic/gyropistol(get_turf(H))
 				if("pulse")
-					new /obj/item/weapon/gun/energy/pulse_rifle(get_turf(H))
+					new /obj/item/weapon/gun/energy/pulse(get_turf(H))
 				if("suppressed")
 					new /obj/item/weapon/gun/projectile/automatic/pistol(get_turf(H))
 					new /obj/item/weapon/suppressor(get_turf(H))
@@ -71,7 +71,7 @@
 				if("turret")
 					new /obj/item/weapon/gun/energy/gun/turret(get_turf(H))
 				if("pulsecarbine")
-					new /obj/item/weapon/gun/energy/pulse_rifle/carbine(get_turf(H))
+					new /obj/item/weapon/gun/energy/pulse/carbine(get_turf(H))
 				if("decloner")
 					new /obj/item/weapon/gun/energy/decloner(get_turf(H))
 				if("mindflayer")
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 3b13ceb6b64..31c82b2a203 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -77,7 +77,7 @@
 		H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses)
 //		H.equip_or_collect(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
 		H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store)
-		H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store)
+		H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store)
 		if(H.backbag == 1)
 			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
 			H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand)
@@ -175,7 +175,7 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head)
 		H.equip_or_collect(new /obj/item/device/pda/security(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves)
-		H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store)
+		H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store)
 		H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store)
 		if(H.backbag == 1)
 			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
@@ -249,7 +249,7 @@
 		H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
 		H.equip_or_collect(new /obj/item/device/pda/security(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves)
-		H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store)
+		H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store)
 		H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store)
 		if(H.backbag == 1)
 			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 2475df770b3..d0281c4b7c1 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -174,10 +174,10 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 
 		if(H.backbag == 1)
 			H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H), slot_r_hand)
-			H.equip_or_collect(new /obj/item/weapon/gun/energy/blueshield(H), slot_l_hand)
+			H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H), slot_l_hand)
 		else
 			H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H.back), slot_in_backpack)
-			H.equip_or_collect(new /obj/item/weapon/gun/energy/blueshield(H.back), slot_in_backpack)
+			H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H.back), slot_in_backpack)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 		L.imp_in = H
 		L.implanted = 1
@@ -263,4 +263,4 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 		L.imp_in = H
 		L.implanted = 1
 		H.sec_hud_set_implants()
-		return 1
\ No newline at end of file
+		return 1
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 210edd98c98..12f01822cde 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -244,6 +244,10 @@
 		H.equip_or_collect(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack)
 		H.equip_or_collect(new /obj/item/weapon/storage/fancy/crayons(H), slot_in_backpack)
 		H.equip_or_collect(new /obj/item/weapon/reagent_containers/spray/waterflower(H), slot_in_backpack)
+		if(H.get_species() == "Machine")
+			var/obj/item/organ/internal/cyberimp/brain/clown_voice/implant
+			implant = new
+			implant.insert(H)
 		H.mutations.Add(CLUMSY)
 		H.dna.SetSEState(COMICBLOCK,1,1)
 		genemutcheck(H,COMICBLOCK,null,MUTCHK_FORCED)
diff --git a/code/game/machinery/gameboard.dm b/code/game/machinery/gameboard.dm
index 5657d62f65f..a19f34af99b 100644
--- a/code/game/machinery/gameboard.dm
+++ b/code/game/machinery/gameboard.dm
@@ -2,11 +2,12 @@
 	name = "Virtual Gameboard"
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "gboard_on"
-	desc = "A holographic table allowing the crew to have fun™ on boring shifts! One player per board."
+	desc = "A holographic table allowing the crew to have fun(TM) on boring shifts! One player per board."
 	density = 1
 	anchored = 1
 	use_power = 1
 	var/cooling_down = 0
+	light_color = LIGHT_COLOR_LIGHTBLUE
 
 /obj/machinery/gameboard/New()
 	..()
@@ -20,6 +21,10 @@
 /obj/machinery/gameboard/power_change()
 	. = ..()
 	update_icon()
+	if(stat & NOPOWER)
+		set_light(0)
+	else
+		set_light(3, 3)
 
 /obj/machinery/gameboard/update_icon()
 	if(stat & NOPOWER)
@@ -34,6 +39,9 @@
 	if(src.in_use)
 		to_chat(user, "This gameboard is already in use!")
 		return
+	if(!anchored)
+		to_chat(user, "The gameboard is not secured!")
+		return
 	interact(user)
 
 /obj/machinery/gameboard/interact(mob/user)
@@ -68,10 +76,10 @@
 /obj/machinery/gameboard/Topic(var/href, var/list/href_list)
 	. = ..()
 	var/prize = /obj/item/stack/tickets
-	if (.)
+	if(.)
 		return
 
-	if (href_list["checkmate"])
+	if(href_list["checkmate"])
 		if(cooling_down)
 			message_admins("Too many checkmates on chessboard, possible HREF exploits: [key_name_admin(usr)] on [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
 			return
@@ -82,5 +90,11 @@
 		spawn(600)
 			cooling_down = 0
 
-	if (href_list["close"])
+	if(href_list["close"])
 		close_game()
+
+/obj/machinery/gameboard/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
+	if(istype(G, /obj/item/weapon/wrench))
+		default_unfasten_wrench(user, G)
+	else if(istype(G, /obj/item/weapon/crowbar))
+		default_deconstruction_crowbar(G, ignore_panel = 1)
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index eab12bb22d5..fb1ef8c8740 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -99,13 +99,12 @@
 	one_access = 0
 
 /obj/machinery/porta_turret/proc/setup()
-	var/obj/item/weapon/gun/energy/E = installation	//All energy-based weapons are applicable
-	if(istext(installation)) E = text2path(installation)
-	//var/obj/item/ammo_casing/shottype = E.projectile_type
+	var/obj/item/weapon/gun/energy/E= new installation	//All energy-based weapons are applicable
+	var/obj/item/ammo_casing/shottype = E.ammo_type[1]
 
-	projectile = initial(E.projectile_type)
+	projectile = shottype.projectile_type
 	eprojectile = projectile
-	shot_sound = initial(E.fire_sound)
+	shot_sound = shottype.fire_sound
 	eshot_sound = shot_sound
 
 	weapon_setup(installation)
@@ -561,9 +560,6 @@ var/list/turret_icons
 	if(get_dist(src, L) > 7)	//if it's too far away, why bother?
 		return TURRET_NOT_TARGET
 
-	if(!check_trajectory(L, src))	//check if we have true line of sight
-		return TURRET_NOT_TARGET
-
 	if(emagged)		// If emagged not even the dead get a rest
 		return L.stat ? TURRET_SECONDARY_TARGET : TURRET_PRIORITY_TARGET
 
@@ -670,6 +666,8 @@ var/list/turret_icons
 	return
 
 /obj/machinery/porta_turret/proc/shootAt(var/mob/living/target)
+	if(!raised) //the turret has to be raised in order to fire - makes sense, right?
+		return
 	//any emagged turrets will shoot extremely fast! This not only is deadly, but drains a lot power!
 	if(!emagged)	//if it hasn't been emagged, it has to obey a cooldown rate
 		if(last_fired || !raised)	//prevents rapid-fire shooting, unless it's been emagged
@@ -684,10 +682,6 @@ var/list/turret_icons
 	if(!istype(T) || !istype(U))
 		return
 
-	if(!raised) //the turret has to be raised in order to fire - makes sense, right?
-		return
-
-
 	update_icon()
 	var/obj/item/projectile/A
 	if(emagged || lethal)
@@ -698,18 +692,17 @@ var/list/turret_icons
 		if(projectile)
 			A = new projectile(loc)
 			playsound(loc, shot_sound, 75, 1)
-	A.original = target
 
 	// Lethal/emagged turrets use twice the power due to higher energy beams
 	// Emagged turrets again use twice as much power due to higher firing rates
 	use_power(reqpower * (2 * (emagged || lethal)) * (2 * emagged))
 
-		//Shooting Code:
+	A.original = target
 	A.current = T
 	A.yo = U.y - T.y
 	A.xo = U.x - T.x
-	spawn(1)
-		A.process()
+	A.fire()
+	return A
 
 /datum/turret_checks
 	var/enabled
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 92bca16c5b7..a1559c4fb3a 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -203,7 +203,8 @@
 					if(istype(O,/obj/item/weapon/gun/energy/disabler/cyborg))
 						var/obj/item/weapon/gun/energy/disabler/cyborg/D = O
 						if(D.power_supply.charge < D.power_supply.maxcharge)
-							D.power_supply.give(D.charge_cost)
+							var/obj/item/ammo_casing/energy/E = D.ammo_type[D.select]
+							D.power_supply.give(E.e_cost)
 							D.update_icon()
 						else
 							D.charge_tick = 0
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index 9d9481aba04..290e3352ea8 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -387,7 +387,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 			src.receive_information(signal, src)
 
 		// Try sending it!
-		var/list/try_send = list("/obj/machinery/telecomms/server", "/obj/machinery/telecomms/hub", "/obj/machinery/telecomms/broadcaster", "/obj/machinery/telecomms/bus")
+		var/list/try_send = list("/obj/machinery/telecomms/server", "/obj/machinery/telecomms/hub", "/obj/machinery/telecomms/broadcaster")
 		var/i = 0
 		for(var/send in try_send)
 			if(i)
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index 82060d47bc2..f0b6ce34ef7 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -227,15 +227,15 @@
 			if(1)
 				A = new /obj/item/projectile/beam(loc)
 			if(2)
-				A = new /obj/item/projectile/beam/heavylaser(loc)
+				A = new /obj/item/projectile/beam/laser/heavylaser(loc)
 			if(3)
 				A = new /obj/item/projectile/beam/pulse(loc)
 			if(4)
 				A = new /obj/item/projectile/magic/change(loc)
 			if(5)
-				A = new /obj/item/projectile/lasertag/blue(loc)
+				A = new /obj/item/projectile/beam/lasertag/bluetag(loc)
 			if(6)
-				A = new /obj/item/projectile/lasertag/red(loc)
+				A = new /obj/item/projectile/beam/lasertag/redtag(loc)
 		A.original = target
 		use_power(500)
 	else
@@ -248,8 +248,7 @@
 	A.current = T
 	A.yo = U.y - T.y
 	A.xo = U.x - T.x
-	spawn( 0 )
-		A.process()
+	A.fire()
 	return
 
 
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 29880e519ec..e022e0c6a4b 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -849,7 +849,7 @@
 	product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?"
 	vend_reply = "Remember the name: Liberation Station!"
 	products = list(/obj/item/weapon/gun/projectile/automatic/pistol/deagle/gold = 2,/obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo = 2,
-					/obj/item/weapon/gun/projectile/automatic/pistol/m2411 = 2,/obj/item/weapon/gun/projectile/automatic/proto = 2,
+					/obj/item/weapon/gun/projectile/automatic/pistol/m1911 = 2,/obj/item/weapon/gun/projectile/automatic/proto = 2,
 					/obj/item/weapon/gun/projectile/shotgun/automatic/combat = 2,/obj/item/weapon/gun/projectile/automatic/gyropistol = 1,
 					/obj/item/weapon/gun/projectile/shotgun = 2,/obj/item/weapon/gun/projectile/automatic/ar = 2)
 	premium = list(/obj/item/ammo_box/magazine/smgm9mm = 2,/obj/item/ammo_box/magazine/m50 = 4,/obj/item/ammo_box/magazine/m45 = 2,/obj/item/ammo_box/magazine/m75 = 2)
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index f79c43068ee..05b3dac0e63 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -384,7 +384,7 @@
 /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun
 	name = "Syringe Gun"
 	desc = "Exosuit-mounted chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur. (Can be attached to: Medical Exosuits)"
-	icon = 'icons/obj/gun.dmi'
+	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "syringegun"
 	item_state = "syringegun"
 	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
@@ -666,4 +666,4 @@
 		for(var/reagent in S.processed_reagents)
 			S.reagents.add_reagent(reagent,amount)
 			S.chassis.use_power(energy_drain)
-		return 1
\ No newline at end of file
+		return 1
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index d95cbaff799..ae5595d69e5 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -5,6 +5,10 @@
 	var/projectile
 	var/fire_sound
 	var/size=0
+	var/projectiles_per_shot = 1
+	var/variance = 0
+	var/randomspread = 0 //use random spread for machineguns, instead of shotgun scatter
+	var/projectile_delay = 0
 
 /obj/item/mecha_parts/mecha_equipment/weapon/can_attach(var/obj/mecha/combat/M as obj)
 	if(..())
@@ -16,32 +20,51 @@
 			return 1
 	return 0
 
+/obj/item/mecha_parts/mecha_equipment/weapon/proc/get_shot_amount()
+	return projectiles_per_shot
 
-/obj/item/mecha_parts/mecha_equipment/weapon/energy
-	name = "General Energy Weapon"
-	size = 2
-	action(target)
-		if(!action_checks(target)) return
-		var/turf/curloc = chassis.loc
-		var/atom/targloc = get_turf(target)
-		if (!targloc || !istype(targloc, /turf) || !curloc)
-			return
-		if (targloc == curloc)
-			return
-		set_ready_state(0)
-		playsound(chassis, fire_sound, 50, 1)
+/obj/item/mecha_parts/mecha_equipment/weapon/action(target, params)
+	if(!action_checks(target))
+		return 0
+
+	var/turf/curloc = get_turf(chassis)
+	var/turf/targloc = get_turf(target)
+	if (!targloc || !istype(targloc) || !curloc)
+		return 0
+	if (targloc == curloc)
+		return 0
+
+	set_ready_state(0)
+	for(var/i=1 to get_shot_amount())
 		var/obj/item/projectile/A = new projectile(curloc)
 		A.firer = chassis.occupant
 		A.original = target
 		A.current = curloc
-		A.yo = targloc.y - curloc.y
-		A.xo = targloc.x - curloc.x
-		chassis.use_power(energy_drain)
-		A.process()
-		chassis.log_message("Fired from [src.name], targeting [target].")
-		do_after_cooldown()
-		return
 
+		var/spread = 0
+		if(variance)
+			if(randomspread)
+				spread = round((rand() - 0.5) * variance)
+			else
+				spread = round((i / projectiles_per_shot - 0.5) * variance)
+		A.preparePixelProjectile(target, targloc, chassis.occupant, params, spread)
+
+		chassis.use_power(energy_drain)
+		A.fire()
+		playsound(chassis, fire_sound, 50, 1)
+
+		sleep(max(0, projectile_delay))
+	set_ready_state(0)
+	log_message("Fired from [name], targeting [target].")
+	var/turf/T = get_turf(src)
+	msg_admin_attack("[key_name_admin(chassis.occupant)] fired a [src] in ([T.x], [T.y], [T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)")
+	log_game("[key_name(chassis.occupant)] fired a [src] in [T.x], [T.y], [T.z]")
+	do_after_cooldown()
+	return
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy
+	name = "General Energy Weapon"
+	size = 2
 
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
 	equip_cooldown = 8
@@ -56,7 +79,7 @@
 	name = "CH-LC \"Solaris\" Laser Cannon"
 	icon_state = "mecha_laser"
 	energy_drain = 40
-	projectile = /obj/item/projectile/beam/heavylaser
+	projectile = /obj/item/projectile/beam/laser/heavylaser
 	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
@@ -82,25 +105,25 @@
 	icon_state = "pulse1_bl"
 	var/life = 20
 
-	Bump(atom/A)
-		A.bullet_act(src, def_zone)
-		src.life -= 10
-		if(ismob(A))
-			var/mob/M = A
-			if(istype(firer, /mob))
-				M.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-				firer.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-				log_attack("<font color='red'>[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]</font>")
-				if(!iscarbon(firer))
-					M.LAssailant = null
-				else
-					M.LAssailant = firer
+/obj/item/projectile/beam/pulse/heavy/Bump(atom/A)
+	A.bullet_act(src, def_zone)
+	life -= 10
+	if(ismob(A))
+		var/mob/M = A
+		if(istype(firer, /mob))
+			M.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
+			firer.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
+			log_attack("<font color='red'>[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]</font>")
+			if(!iscarbon(firer))
+				M.LAssailant = null
 			else
-				M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-				log_attack("<font color='red'>UNKNOWN shot [M] ([M.ckey]) with a [src]</font>")
-		if(life <= 0)
-			qdel(src)
-		return
+				M.LAssailant = firer
+		else
+			M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
+			log_attack("<font color='red'>UNKNOWN shot [M] ([M.ckey]) with a [src]</font>")
+	if(life <= 0)
+		qdel(src)
+	return
 
 
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
@@ -119,89 +142,89 @@
 	equip_cooldown = 150
 	range = MELEE|RANGED
 
-	can_attach(obj/mecha/combat/honker/M as obj)
-		if(..())
-			if(istype(M))
-				return 1
+/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M as obj)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/weapon/honker/action(target, params)
+	if(!chassis)
+		return 0
+	if(energy_drain && chassis.get_charge() < energy_drain)
+		return 0
+	if(!equip_ready)
 		return 0
 
-	action(target)
-		if(!chassis)
-			return 0
-		if(energy_drain && chassis.get_charge() < energy_drain)
-			return 0
-		if(!equip_ready)
-			return 0
+	playsound(chassis, 'sound/items/AirHorn.ogg', 100, 1)
+	chassis.occupant_message("<font color='red' size='5'>HONK</font>")
+	for(var/mob/living/carbon/M in ohearers(6, chassis))
+		if(istype(M, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = M
+			if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs))
+				continue
+		to_chat(M, "<font color='red' size='7'>HONK</font>")
+		M.sleeping = 0
+		M.stuttering = 20
+		M.ear_deaf = 30
+		M.Weaken(3)
+		if(prob(30))
+			M.Stun(10)
+			M.Paralyse(4)
+		else
+			M.Jitter(500)
+		///else the mousetraps are useless
+		if(istype(M, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = M
+			if(isobj(H.shoes))
+				var/thingy = H.shoes
+				H.unEquip(H.shoes)
+				walk_away(thingy,chassis,15,2)
+				spawn(20)
+					if(thingy)
+						walk(thingy,0)
+	for(var/obj/mecha/combat/recitence/R in oview(6, chassis))
+		R.occupant_message("\The [R] has protected you from [chassis]'s HONK at the cost of some power.")
+		R.use_power(R.get_charge() / 4)
 
-		playsound(chassis, 'sound/items/AirHorn.ogg', 100, 1)
-		chassis.occupant_message("<font color='red' size='5'>HONK</font>")
-		for(var/mob/living/carbon/M in ohearers(6, chassis))
-			if(istype(M, /mob/living/carbon/human))
-				var/mob/living/carbon/human/H = M
-				if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs))
-					continue
-			to_chat(M, "<font color='red' size='7'>HONK</font>")
-			M.sleeping = 0
-			M.stuttering = 20
-			M.ear_deaf = 30
-			M.Weaken(3)
-			if(prob(30))
-				M.Stun(10)
-				M.Paralyse(4)
-			else
-				M.Jitter(500)
-			///else the mousetraps are useless
-			if(istype(M, /mob/living/carbon/human))
-				var/mob/living/carbon/human/H = M
-				if(isobj(H.shoes))
-					var/thingy = H.shoes
-					H.unEquip(H.shoes)
-					walk_away(thingy,chassis,15,2)
-					spawn(20)
-						if(thingy)
-							walk(thingy,0)
-		for(var/obj/mecha/combat/recitence/R in oview(6, chassis))
-			R.occupant_message("\The [R] has protected you from [chassis]'s HONK at the cost of some power.")
-			R.use_power(R.get_charge() / 4)
-
-		chassis.use_power(energy_drain)
-		log_message("Honked from [src.name]. HONK!")
-		var/turf/T = get_turf(src)
-		msg_admin_attack("[key_name_admin(chassis.occupant)] used a Mecha Honker in ([T.x], [T.y], [T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)")
-		log_game("[key_name(chassis.occupant)] used a Mecha Honker in [T.x], [T.y], [T.z]")
-		do_after_cooldown()
-		return
+	chassis.use_power(energy_drain)
+	log_message("Honked from [name]. HONK!")
+	var/turf/T = get_turf(src)
+	msg_admin_attack("[key_name_admin(chassis.occupant)] used a Mecha Honker in ([T.x], [T.y], [T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)")
+	log_game("[key_name(chassis.occupant)] used a Mecha Honker in [T.x], [T.y], [T.z]")
+	do_after_cooldown()
+	return
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic
 	name = "General Ballisic Weapon"
 	var/projectiles
 	var/projectile_energy_cost
 	size = 2
-	action_checks(atom/target)
-		if(..())
-			if(projectiles > 0)
-				return 1
-		return 0
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/action_checks(atom/target)
+	if(..())
+		if(projectiles > 0)
+			return 1
+	return 0
 
-	get_equip_info()
-		return "[..()]\[[src.projectiles]\][(src.projectiles < initial(src.projectiles))?" - <a href='?src=\ref[src];rearm=1'>Rearm</a>":null]"
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/get_equip_info()
+	return "[..()]\[[projectiles]\][(projectiles < initial(projectiles))?" - <a href='?src=\ref[src];rearm=1'>Rearm</a>":null]"
 
-	proc/rearm()
-		if(projectiles < initial(projectiles))
-			var/projectiles_to_add = initial(projectiles) - projectiles
-			while(chassis.get_charge() >= projectile_energy_cost && projectiles_to_add)
-				projectiles++
-				projectiles_to_add--
-				chassis.use_power(projectile_energy_cost)
-		send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
-		log_message("Rearmed [src.name].")
-		return
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/proc/rearm()
+	if(projectiles < initial(projectiles))
+		var/projectiles_to_add = initial(projectiles) - projectiles
+		while(chassis.get_charge() >= projectile_energy_cost && projectiles_to_add)
+			projectiles++
+			projectiles_to_add--
+			chassis.use_power(projectile_energy_cost)
+	send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info())
+	log_message("Rearmed [name].")
+	return
 
-	Topic(href, href_list)
-		..()
-		if (href_list["rearm"])
-			src.rearm()
-		return
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/Topic(href, href_list)
+	..()
+	if (href_list["rearm"])
+		rearm()
+	return
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
 	name = "FNX-66 Carbine"
@@ -211,41 +234,6 @@
 	fire_sound = 'sound/weapons/Gunshot.ogg'
 	projectiles = 24
 	projectile_energy_cost = 15
-	var/projectiles_per_shot = 1
-	var/deviation = 0.0
-
-	action(atom/target)
-		if(!action_checks(target)) return
-		var/turf/targloc = get_turf(target)
-		var/target_x = targloc.x
-		var/target_y = targloc.y
-		var/target_z = targloc.z
-		targloc = null
-		spawn	for(var/i=1 to min(projectiles, projectiles_per_shot))
-			if(!chassis) break
-			var/turf/curloc = get_turf(chassis)
-			targloc = locate(target_x+GaussRandRound(deviation,1),target_y+GaussRandRound(deviation,1),target_z)
-			if (!targloc || !curloc)
-				continue
-			if (targloc == curloc)
-				continue
-
-			playsound(chassis, fire_sound, 50, 1)
-			var/obj/item/projectile/A = new projectile(curloc)
-			src.projectiles--
-			A.original = target
-			A.current = curloc
-			A.yo = targloc.y - curloc.y
-			A.xo = targloc.x - curloc.x
-			A.process()
-			sleep(2)
-		set_ready_state(0)
-		log_message("Fired from [src.name], targeting [target].")
-		var/turf/T = get_turf(src)
-		msg_admin_attack("[key_name_admin(chassis.occupant)] fired a [src] in ([T.x], [T.y], [T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)")
-		log_game("[key_name(chassis.occupant)] fired a [src] in [T.x], [T.y], [T.z]")
-		do_after_cooldown()
-		return
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced
 	name = "\improper S.H.H. \"Quietus\" Carbine"
@@ -270,36 +258,8 @@
 	fire_sound = 'sound/weapons/Gunshot.ogg'
 	projectiles = 40
 	projectile_energy_cost = 25
-	var/projectiles_per_shot = 4
-	var/deviation = 0.7
-
-	action(atom/target)
-		if(!action_checks(target)) return
-		var/turf/curloc = get_turf(chassis)
-		var/turf/targloc = get_turf(target)
-		if(!curloc || !targloc) return
-		var/target_x = targloc.x
-		var/target_y = targloc.y
-		var/target_z = targloc.z
-		targloc = null
-		for(var/i=1 to min(projectiles, projectiles_per_shot))
-			targloc = locate(target_x+GaussRandRound(deviation,1),target_y+GaussRandRound(deviation,1),target_z)
-			if(!targloc || targloc == curloc)
-				break
-			playsound(chassis, fire_sound, 80, 1)
-			var/obj/item/projectile/A = new projectile(curloc)
-			src.projectiles--
-			A.original = target
-			A.current = curloc
-			A.yo = targloc.y - curloc.y
-			A.xo = targloc.x - curloc.x
-			set_ready_state(0)
-			A.process()
-		log_message("Fired from [src.name], targeting [target].")
-		do_after_cooldown()
-		return
-
-
+	projectiles_per_shot = 4
+	variance = 25
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
 	name = "Ultra AC 2"
@@ -309,38 +269,9 @@
 	fire_sound = 'sound/weapons/Gunshot.ogg'
 	projectiles = 300
 	projectile_energy_cost = 20
-	var/projectiles_per_shot = 3
-	var/deviation = 0.3
-
-	action(atom/target)
-		if(!action_checks(target)) return
-		var/turf/targloc = get_turf(target)
-		var/target_x = targloc.x
-		var/target_y = targloc.y
-		var/target_z = targloc.z
-		targloc = null
-		spawn	for(var/i=1 to min(projectiles, projectiles_per_shot))
-			if(!chassis) break
-			var/turf/curloc = get_turf(chassis)
-			targloc = locate(target_x+GaussRandRound(deviation,1),target_y+GaussRandRound(deviation,1),target_z)
-			if (!targloc || !curloc)
-				continue
-			if (targloc == curloc)
-				continue
-
-			playsound(chassis, fire_sound, 50, 1)
-			var/obj/item/projectile/A = new projectile(curloc)
-			src.projectiles--
-			A.original = target
-			A.current = curloc
-			A.yo = targloc.y - curloc.y
-			A.xo = targloc.x - curloc.x
-			A.process()
-			sleep(2)
-		set_ready_state(0)
-		log_message("Fired from [src.name], targeting [target].")
-		do_after_cooldown()
-		return
+	projectiles_per_shot = 3
+	variance = 6
+	projectile_delay = 2
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
 	name = "SRM-8 Missile Rack"
@@ -353,20 +284,21 @@
 	var/missile_speed = 2
 	var/missile_range = 30
 
-	action(target)
-		if(!action_checks(target)) return
-		set_ready_state(0)
-		var/obj/item/missile/M = new projectile(chassis.loc)
-		M.primed = 1
-		playsound(chassis, fire_sound, 50, 1)
-		M.throw_at(target, missile_range, missile_speed, chassis)
-		projectiles--
-		log_message("Fired from [src.name], targeting [target].")
-		var/turf/T = get_turf(src)
-		msg_admin_attack("[key_name_admin(chassis.occupant)] fired a [src] in ([T.x], [T.y], [T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)")
-		log_game("[key_name(chassis.occupant)] fired a [src] in [T.x], [T.y], [T.z]")
-		do_after_cooldown()
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/action(target, params)
+	if(!action_checks(target))
 		return
+	set_ready_state(0)
+	var/obj/item/missile/M = new projectile(chassis.loc)
+	M.primed = 1
+	playsound(chassis, fire_sound, 50, 1)
+	M.throw_at(target, missile_range, missile_speed, chassis)
+	projectiles--
+	log_message("Fired from [name], targeting [target].")
+	var/turf/T = get_turf(src)
+	msg_admin_attack("[key_name_admin(chassis.occupant)] fired a [src] in ([T.x], [T.y], [T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)")
+	log_game("[key_name(chassis.occupant)] fired a [src] in [T.x], [T.y], [T.z]")
+	do_after_cooldown()
+	return
 
 
 /obj/item/missile
@@ -375,13 +307,13 @@
 	var/primed = null
 	throwforce = 15
 
-	throw_impact(atom/hit_atom)
-		if(primed)
-			explosion(hit_atom, 0, 0, 2, 4, 0)
-			qdel(src)
-		else
-			..()
-		return
+/obj/item/missile/throw_impact(atom/hit_atom)
+	if(primed)
+		explosion(hit_atom, 0, 0, 2, 4, 0)
+		qdel(src)
+	else
+		..()
+	return
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang
 	name = "SGL-6 Grenade Launcher"
@@ -394,18 +326,19 @@
 	equip_cooldown = 60
 	var/det_time = 20
 	size=1
-	action(target)
-		if(!action_checks(target)) return
-		set_ready_state(0)
-		var/obj/item/weapon/grenade/flashbang/F = new projectile(chassis.loc)
-		playsound(chassis, fire_sound, 50, 1)
-		F.throw_at(target, missile_range, missile_speed, chassis)
-		projectiles--
-		log_message("Fired from [src.name], targeting [target].")
-		spawn(det_time)
-			F.prime()
-		do_after_cooldown()
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/action(target, params)
+	if(!action_checks(target))
 		return
+	set_ready_state(0)
+	var/obj/item/weapon/grenade/flashbang/F = new projectile(chassis.loc)
+	playsound(chassis, fire_sound, 50, 1)
+	F.throw_at(target, missile_range, missile_speed, chassis)
+	projectiles--
+	log_message("Fired from [name], targeting [target].")
+	spawn(det_time)
+		F.prime()
+	do_after_cooldown()
+	return
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang//Because I am a heartless bastard -Sieve
 	name = "SOB-3 Grenade Launcher"
@@ -417,7 +350,7 @@
 	size=1
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited/get_equip_info()//Limited version of the clusterbang launcher that can't reload
-	return "<span style=\"color:[equip_ready?"#0f0":"#f00"];\">*</span>&nbsp;[chassis.selected==src?"<b>":"<a href='?src=\ref[chassis];select_equip=\ref[src]'>"][src.name][chassis.selected==src?"</b>":"</a>"]\[[src.projectiles]\]"
+	return "<span style=\"color:[equip_ready?"#0f0":"#f00"];\">*</span>&nbsp;[chassis.selected==src?"<b>":"<a href='?src=\ref[chassis];select_equip=\ref[src]'>"][name][chassis.selected==src?"</b>":"</a>"]\[[projectiles]\]"
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited/rearm()
 	return//Extra bit of security
@@ -432,22 +365,23 @@
 	projectile_energy_cost = 100
 	equip_cooldown = 20
 
-	can_attach(obj/mecha/combat/honker/M as obj)
-		if(..())
-			if(istype(M))
-				return 1
-		return 0
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/can_attach(obj/mecha/combat/honker/M as obj)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
 
-	action(target)
-		if(!action_checks(target)) return
-		set_ready_state(0)
-		var/obj/item/weapon/bananapeel/B = new projectile(chassis.loc)
-		playsound(chassis, fire_sound, 60, 1)
-		B.throw_at(target, missile_range, missile_speed, chassis)
-		projectiles--
-		log_message("Bananed from [src.name], targeting [target]. HONK!")
-		do_after_cooldown()
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/action(target, params)
+	if(!action_checks(target))
 		return
+	set_ready_state(0)
+	var/obj/item/weapon/bananapeel/B = new projectile(chassis.loc)
+	playsound(chassis, fire_sound, 60, 1)
+	B.throw_at(target, missile_range, missile_speed, chassis)
+	projectiles--
+	log_message("Bananed from [name], targeting [target]. HONK!")
+	do_after_cooldown()
+	return
 
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar
@@ -460,23 +394,24 @@
 	projectile_energy_cost = 100
 	equip_cooldown = 10
 
-	can_attach(obj/mecha/combat/honker/M as obj)
-		if(..())
-			if(istype(M))
-				return 1
-		return 0
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar/can_attach(obj/mecha/combat/honker/M as obj)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
 
-	action(target)
-		if(!action_checks(target)) return
-		set_ready_state(0)
-		var/obj/item/device/assembly/mousetrap/M = new projectile(chassis.loc)
-		M.secured = 1
-		playsound(chassis, fire_sound, 60, 1)
-		M.throw_at(target, missile_range, missile_speed, chassis)
-		projectiles--
-		log_message("Launched a mouse-trap from [src.name], targeting [target]. HONK!")
-		do_after_cooldown()
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar/action(target, params)
+	if(!action_checks(target))
 		return
+	set_ready_state(0)
+	var/obj/item/device/assembly/mousetrap/M = new projectile(chassis.loc)
+	M.secured = 1
+	playsound(chassis, fire_sound, 60, 1)
+	M.throw_at(target, missile_range, missile_speed, chassis)
+	projectiles--
+	log_message("Launched a mouse-trap from [name], targeting [target]. HONK!")
+	do_after_cooldown()
+	return
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas
 	name = "PCMK-6 Bolas Launcher"
@@ -489,23 +424,24 @@
 	projectile_energy_cost = 50
 	equip_cooldown = 10
 
-	can_attach(obj/mecha/combat/gygax/M as obj)
-		if(..())
-			if(istype(M))
-				return 1
-		return 0
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas/can_attach(obj/mecha/combat/gygax/M as obj)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
 
-	action(target)
-		if(!action_checks(target)) return
-		set_ready_state(0)
-		var/obj/item/weapon/legcuffs/bolas/M = new projectile(chassis.loc)
-		playsound(chassis, fire_sound, 50, 1)
-		M.thrown_from = src
-		M.throw_at(target, missile_range, missile_speed)
-		projectiles--
-		log_message("Fired from [src.name], targeting [target].")
-		do_after_cooldown()
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas/action(target, params)
+	if(!action_checks(target))
 		return
+	set_ready_state(0)
+	var/obj/item/weapon/legcuffs/bolas/M = new projectile(chassis.loc)
+	playsound(chassis, fire_sound, 50, 1)
+	M.thrown_from = src
+	M.throw_at(target, missile_range, missile_speed)
+	projectiles--
+	log_message("Fired from [name], targeting [target].")
+	do_after_cooldown()
+	return
 
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
 	equip_cooldown = 20
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index ceeca47f72e..fcfccd1f9b6 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -219,7 +219,7 @@
 //		return ..()
 */
 
-/obj/mecha/proc/click_action(atom/target,mob/user)
+/obj/mecha/proc/click_action(atom/target, mob/user, params)
 	if(!src.occupant || src.occupant != user ) return
 	if(user.stat || !user.canmove)
 		return
@@ -239,9 +239,9 @@
 			return
 	if(!target.Adjacent(src))
 		if(selected && selected.is_ranged())
-			selected.action(target)
+			selected.action(target, params)
 	else if(selected && selected.is_melee())
-		selected.action(target)
+		selected.action(target, params)
 	else
 		if(internal_damage&MECHA_INT_CONTROL_LOST)
 			target = safepick(oview(1,src))
@@ -1991,4 +1991,4 @@
 
 
 /obj/mecha/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list())
-	flick_overlay(image('icons/mob/talk.dmi', bubble_loc, bubble_state,MOB_LAYER+1), bubble_recipients, 30)
\ No newline at end of file
+	flick_overlay(image('icons/mob/talk.dmi', bubble_loc, bubble_state,MOB_LAYER+1), bubble_recipients, 30)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 417ad82d46b..2a3fe4a2a03 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -31,7 +31,7 @@
 
 	//If this is set, The item will make an action button on the player's HUD when picked up.
 	var/action_button_name //It is also the text which gets displayed on the action button. If not set it defaults to 'Use [name]'. If it's not set, there'll be no button.
-	var/action_button_is_hands_free = 0 //If 1, bypass the restrained, lying, and stunned checks action buttons normally test for
+	var/action_button_custom_type = null
 	var/datum/action/item_action/action = null
 
 	var/list/materials = list()
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 9e4d83592b0..5b4afe8095c 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -9,6 +9,7 @@
 	var/mob/attacher = null
 	var/valve_open = 0
 	var/toggle = 1
+	origin_tech = "materials=1;engineering=1"
 
 /obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
 
@@ -187,7 +188,7 @@
 			attacher_name = "[key_name_admin(attacher)]"
 
 		var/mob/mob = get_mob_by_key(src.fingerprintslast)
-		
+
 		bombers += "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)]"
 		message_admins("Bomb valve opened at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a> with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name_admin(mob)]")
 		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)]")
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index bfb90de8cac..512baa30703 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -125,13 +125,13 @@
 		to_chat(usr, "This robot has had its disabler removed!")
 		return 0
 
-	if(T.recharge_time <= 2)
+	if(T.charge_delay <= 2)
 		to_chat(R, "Maximum cooling achieved for this hardpoint!")
 		to_chat(usr, "There's no room for another cooling unit!")
 		return 0
 
 	else
-		T.recharge_time = max(2 , T.recharge_time - 4)
+		T.charge_delay = max(2 , T.charge_delay - 4)
 
 	return 1
 
@@ -214,4 +214,4 @@
 		return 0
 
 	R.emagged = 1
-	return 1
\ No newline at end of file
+	return 1
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index c71f2e14182..fd3f5505f4f 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -114,7 +114,7 @@
 			bmark.pixel_x--
 			bmark.pixel_y--
 
-			if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/practice))
+			if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/beam/practice))
 				bmark.icon_state = "scorch"
 				bmark.dir = pick(NORTH,SOUTH,EAST,WEST) // random scorch design
 
@@ -178,4 +178,4 @@
 		b2y1 = pixel_y + pick(1,1,1,1,2,2,3,3,4)
 		b2y2 = pixel_y - pick(1,1,1,1,2,2,3,3,4)
 
-		Target.bulletholes.Add(src)
\ No newline at end of file
+		Target.bulletholes.Add(src)
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index e41457f0c38..efba4f62a77 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -80,7 +80,7 @@
 			return
 		to_chat(usr, "\blue Assembling grille...")
 
-		if (!do_after(usr, 10, target = src))
+		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/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 3fe6dc7102f..50dc5c3b467 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -140,7 +140,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
-	new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0), \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1), \
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 41c2946a0c1..bd799640122 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -130,7 +130,7 @@
 			return
 		if (R.time)
 			to_chat(usr, "\blue Building [R.title] ...")
-			if (!do_after(usr, R.time, target = src))
+			if (!do_after(usr, R.time, target = usr))
 				return
 		if (src.amount < R.req_amount*multiplier)
 			return
@@ -194,20 +194,24 @@
 /obj/item/stack/proc/get_max_amount()
 	return max_amount
 
+/obj/item/stack/proc/split(mob/user, amt)
+	var/obj/item/stack/F = new type(user, amt)
+	F.copy_evidences(src)
+	if(isliving(user))
+		add_fingerprint(user)
+		F.add_fingerprint(user)
+	use(amt)
+	return F
+
 /obj/item/stack/attack_hand(mob/user as mob)
 	if (user.get_inactive_hand() == src)
-		var/obj/item/stack/F = new src.type( user, 1)
-		F.copy_evidences(src)
+		var/obj/item/stack/F = split(user, 1)
 		user.put_in_hands(F)
-		src.add_fingerprint(user)
-		F.add_fingerprint(user)
-		use(1)
-		if (src && usr.machine==src)
-			spawn(0) src.interact(usr)
+		if(src && usr.machine == src)
+			spawn(0)
+				interact(usr)
 	else
 		..()
-	update_icon()
-	return
 
 /obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 25ade73eb38..f2f07174ec5 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1318,7 +1318,7 @@ obj/item/toy/cards/deck/syndicate/black
 /obj/item/toy/russian_revolver
 	name = "russian revolver"
 	desc = "for fun and games!"
-	icon = 'icons/obj/gun.dmi'
+	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "detective_gold"
 	item_state = "gun"
 	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index e0ac96c4feb..b0a1c45622d 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -41,12 +41,11 @@
 	icon = 'icons/obj/chronos.dmi'
 	icon_state = "chronogun"
 	item_state = "chronogun"
-	w_class = 3.0
-	projectile_type = "/obj/item/projectile/energy/chrono_beam"
-	fire_sound = 'sound/weapons/Laser.ogg'
-	charge_cost = 0
-	fire_delay = 50
+	w_class = 3
 	flags = NODROP
+	ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
+	can_charge = 0
+	fire_delay = 50
 	var/obj/item/weapon/chrono_eraser/TED = null
 	var/obj/effect/chrono_field/field = null
 	var/turf/startpos = null
@@ -60,12 +59,13 @@
 		qdel(src)
 
 /obj/item/weapon/gun/energy/chrono_gun/dropped()
+	..()
 	qdel(src)
 
 /obj/item/weapon/gun/energy/chrono_gun/update_icon()
 	return
 
-/obj/item/weapon/gun/energy/chrono_gun/Fire()
+/obj/item/weapon/gun/energy/chrono_gun/process_fire()
 	if(field)
 		field_disconnect(field)
 	..()
@@ -125,18 +125,23 @@
 	nodamage = 1
 	var/obj/item/weapon/gun/energy/chrono_gun/gun = null
 
-/obj/item/projectile/energy/chrono_beam/process()
+/obj/item/projectile/energy/chrono_beam/fire()
 	gun = firer.get_active_hand()
 	if(istype(gun))
 		return ..()
 	else
 		return 0
 
-/obj/item/projectile/energy/chrono_beam/on_hit(var/atom/target)
+/obj/item/projectile/energy/chrono_beam/on_hit(atom/target)
 	if(target && gun && isliving(target))
 		var/obj/effect/chrono_field/F = new(target.loc, target, gun)
 		gun.field_connect(F)
 
+/obj/item/ammo_casing/energy/chrono_beam
+	name = "eradication beam"
+	projectile_type = /obj/item/projectile/energy/chrono_beam
+	icon_state = "chronobolt"
+	e_cost = 0
 
 /obj/effect/chrono_field
 	name = "eradication field"
@@ -256,4 +261,4 @@
 
 
 #undef CHRONO_BEAM_RANGE
-#undef CHRONO_FRAME_COUNT
\ No newline at end of file
+#undef CHRONO_FRAME_COUNT
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index f501ef8e002..705c126915b 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -382,3 +382,75 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharp = 1
 	edge = 1
+
+/obj/item/weapon/nullrod/rosary
+	icon_state = "rosary"
+	item_state = null
+	name = "prayer beads"
+	desc = "A set of prayer beads used by many of the more traditional religions in space.<br>Vampires and other unholy abominations have learned to fear these."
+	force = 0
+	throwforce = 0
+	var/praying = 0
+
+/obj/item/weapon/nullrod/rosary/New()
+	..()
+	processing_objects.Add(src)
+
+
+/obj/item/weapon/nullrod/rosary/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M))
+		return ..()
+
+	if(!user.mind || user.mind.assigned_role != "Chaplain")
+		to_chat(user, "<span class='notice'>You are not close enough with [ticker.Bible_deity_name] to use [src].</span>")
+		return
+
+	if(in_use)
+		to_chat(user, "<span class='notice'>You are already using [src].</span>")
+
+	user.visible_message("<span class='info'>[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name].</span>", \
+		"<span class='info'>You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name].</span>")
+
+	in_use = 1
+	if(do_after(user, 150, target = M))
+		if(istype(M, /mob/living/carbon/human)) // This probably should not work on vulps. They're unholy abominations.
+			var/mob/living/carbon/human/target = M
+
+			if(target.mind)
+				if(iscultist(target))
+					ticker.mode.remove_cultist(target.mind) // This proc will handle message generation.
+					praying = 0
+					return
+
+				if(target.mind.vampire && !target.mind.vampire.get_ability(/datum/vampire_passive/full)) // Getting a full prayer off on a vampire will interrupt their powers for a large duration.
+					target.mind.vampire.nullified = max(120, target.mind.vampire.nullified + 120)
+					to_chat(target, "<span class='userdanger'>[user]'s prayer to [ticker.Bible_deity_name] has interfered with your power!</span>")
+					praying = 0
+					return
+
+			if(prob(25))
+				to_chat(target, "<span class='notice'>[user]'s prayer to [ticker.Bible_deity_name] has eased your pain!</span>")
+				target.adjustToxLoss(-5)
+				target.adjustOxyLoss(-5)
+				target.adjustBruteLoss(-5)
+				target.adjustFireLoss(-5)
+
+			praying = 0
+
+	else
+		to_chat(user, "<span class='notice'>Your prayer to [ticker.Bible_deity_name] was interrupted.</span>")
+		praying = 0
+
+/obj/item/weapon/nullrod/rosary/process()
+	if(istype(loc, /mob/living/carbon/human))
+		var/mob/living/carbon/human/holder = loc
+
+		if(src == holder.l_hand || src == holder.r_hand) // Holding this in your hand will
+			for(var/mob/living/carbon/human/M in range(5))
+				if(M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full))
+					M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+					if(prob(10))
+						to_chat(M, "<span class='userdanger'>Being in the presence of [holder]'s [src] is interfering with your powers!</span>")
+
+
+
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index c466c5ba811..67b52da31ec 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -2,7 +2,7 @@
 	name = "implant"
 	icon = 'icons/obj/implants.dmi'
 	icon_state = "generic" //Shows up as the action button icon
-	action_button_is_hands_free = 1
+	action_button_custom_type = /datum/action/item_action/hands_free
 	origin_tech = "materials=2;biotech=3;programming=2"
 
 	var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like loyalty implants
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 3a371b8191e..b580a024b91 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -1815,18 +1815,6 @@
 				</ol>
                 <br><br>
 
-                <h1><a name="atmos"><B>Atmospherics Technician</B></a></h1><BR>
-				<ol>
-					<li>Atmospheric Technicians are permitted to completely repipe the Atmospherics Piping Setup, provided they do not pump harmful gases into anywhere except the Turbine;</li>
-                    <li>Atmospheric Technicians are not permitted to create volatile mixes using Plasma and Oxygen, nor are they permitted to create any potentially harmful mixes with Carbon Dioxide and/or Nitrous Oxide. An exception is made when working with the Turbine;</li>
-                    <li>Atmospheric Technicians are permitted to cool Plasma and store it for later use in Radiation Collectors. Likewise, they are permitted to cool Nitrogen or Carbon Dioxide and store it for use as coolant for the Supermatter Engine;</li>
-                    <li>Atmospheric Technicians are not permitted to take the axe out of its case unless there is an immediate and urgent threat to their life or urgent access to crisis locations is necessary. The axe must be returned to the case afterwards, and the case locked;</li>
-                    <li>Atmospheric Technicians are not permitted to tamper with the default values on Air Alarms. They are, however, permitted to create small, acclimatized rooms for species that require special atmospheric conditions (such as Plasmamen and Vox), provided they receive express permission from the Chief Engineer;</li>
-                    <li>Atmospheric Technicians must periodically check on the Central Alarms Computer, in periods of, at most, thirty (30) minutes;</li>
-                    <li>Atmospheric Technicians must respond promptly to piping and station breaches. Failure to report within fifteen (15) minutes will be considered a breach of Standard Operating Procedure, unless there are no spare Atmospheric Technicians to report, or an Engineer has arrived on scene first. All Hazard Zones must be cordoned off with Engineering Tape, for the sake of everyone else</li>
-				</ol>
-                <br><br>
-
                 <h1><a name="sf"><B>Shaft Miner</B></a></h1><BR>
 				<ol>
 					<li>Shaft Miners are not permitted to bring Gibtonite aboard the station;</li>
@@ -2412,7 +2400,104 @@
                     <li>Demotion of Chief Engineer and reparation of Engine if no threat manifests.</li>
                 </ul>
                 <br><br>
-				
+
+				</body>
+				</html>
+
+		"}
+
+/obj/item/weapon/book/manual/sop_command
+	name = "Command Standard Operating Procedures"
+	desc = "A set of guidelines aiming at the safe conduct of all Command activities."
+	icon_state = "book4"
+	author = "Nanotrasen"
+	title = "Command Standard Operating Procedures"
+	dat = {"
+
+		<html>
+				<head>
+				<style>
+				h1 {font-size: 15px; margin: 15px 0px 5px;}
+				li {margin: 2px 0px 2px 15px;}
+				ul {list-style: none; margin: 5px; padding: 0px;}
+				ol {margin: 5px; padding: 0px 15px;}
+				</style>
+				</head>
+				<body>
+				<font face="Verdana" color=black>
+
+				<h1><a name="Contents">Contents</a></h1>
+				<ol>
+					<li><a href="#foreword">Foreword</a></li>
+					<li><a href="#cap">Captain</a></li>
+					<li><a href="#hop">Head of Personnel</a></li>
+					<li><a href="#ntrep">NanoTrasen Representative</a></li>
+					<li><a href="#bs">Blueshield Officer</a></li>
+                    <li><a href="#ai">AI</a></li>
+				</ol>
+				<br><BR>
+
+				<h1><a name="foreword"><U><B>FOREWORD</B></U></a></h1><BR>
+				Job SOP should not be a considered a checklist of conditions to fire someone over, and should not be rigidly followed to the letter in detriment of circumstances and context.
+				As always, SOP can be malleable if the situation so requires, and the decision to punish a crewmember for breaching it ultimately falls onto the relevant Head of Staff,
+				for Department Members, or Captain, for the Head of Staff.<BR><BR>
+
+				<h1><a name="cap"><B>Captain</B></a></h1><BR>
+				<ol>
+					<li>The Captain is not permitted to perform regular Security Duty. However, they may still assist Security if they are understaffed, or if they see a crime being committed. However, the Captain is not permitted to take items from the Armory under normal circumstances, unless authorized by the Head of Security. In addition, the Captain may not requisition weaponry for themselves from Cargo and/or Science, unless there's an immediate threat to station and/or crew;</li>
+					<li>If a Department lacks a Head of Staff, the Captain should make reasonable efforts to appoint an Acting Head of Staff, if there are available personnel to fill the position;</li>
+					<li>The Captain is to ensure that Space Law is being correctly applied. This should be done in cooperation with the Head of Security;</li>
+					<li>The Captain is not to leave the NSS Cyberiad unless given specific permission by Central Command, or it happens to be the end of the shift. This includes via space or via the Gateway. To do so is to be considered abandoning their posts and is grounds for termination;</li>
+					<li>The Captain must keep the Nuclear Authentication Disk on their person at all times or, failing that, in the possession of the Head of Security or Blueshield;</li>
+					<li>The Captain is to attempt to resolve every issue that arises in Command locally before contacting Central Command;</li>
+					<li>The Captain is not permitted to carry their Antique Laser Gun or Space Armor unless there's an immediate emergency that requires attending to;</li>
+					<li>The Captain, despite being in charge of the Cyberiad, is not independent from NanoTrasen. Any attempts to disregard general company policy are to be considered an instant condition for contract termination;</li>
+					<li>The Captain may only promote personnel to a Acting Head of Staff position if there is no assigned Head of Staff associated with the Department. Said Acting Head of Staff must be a member of the Department they are to lead. See below for more information on Chain of Command;</li>
+                    <li>The Captain may not fire any Head of Staff without reasonable justification (ie, incompetency, criminal activity, or otherwise any action that endangers/compromises the station and/or crew). The Captain may not fire any Central Command VIPs (ie, Blueshield, Magistrate, NanoTrasen Representative) without permission from Central Command, unless they are blatantly acting against the well-being and safety of the crew and station.</li>
+				</ol><BR>
+
+                <h1><a name="hop"><B>Head of Personnel</B></a></h1><BR>
+				<ol>
+					<li>The Head of Personnel may not transfer any personnel to another Department without authorization from the relevant Head of Staff. If no Head of Staff is available, the Head of Personnel may make a judgement call. This does not apply to Security, which always requires authorization from the Head of Security, or Genetics, which requires both Chief Medical Officer and Research Director approval. If there is no Head of Security active, no transfers are allowed to Security without authorization from the Captain;</li>
+					<li>The Head of Personnel may not give any personnel increased access without authorization from the relevant Head of Staff. This includes the Head of Personnel. In addition, the Head of Personnel may only give Captain-Level access to someone if they are the Acting Captain. This access is to be removed when a proper Captain arrives on the station;</li>
+					<li>The Head of Personnel may not increase any Job Openings unless the relevant Head of Staff approves;</li>
+					<li>The Head of Personnel may not fire any personnel without authorization from the relevant Head of Staff, unless other conditions apply (see Space Law and General Standard Operating Procedure);</li>
+					<li>The Head of Personnel may not promote any personnel to the following Jobs without authorization from Central Command: Barber, Brig Physician, NanoTrasen Representative, Blueshield, Security Pod Pilot, Mechanic and Magistrate; (This is due to them being karma locked. Do not promote people to these positions without approval from the Administrators);</li>
+					<li>The Head of Personnel is free to utilize paperwork at their discretion. However, during major station emergencies, expediency should take precedence over bureaucracy;</li>
+					<li>The Head of Personnel may not leave their office unmanned if there are personnel waiting in line. Failure to respond to personnel with a legitimate request within ten (10) minutes, either via radio or in person, is to be considered a breach of Standard Operating Procedure;</li>
+					<li>Despite nominally being in charge of Supply, the Head of Personnel should allow the Quartermaster to run the Department, unless they prove themselves to be incompetent/dangerous;</li>
+                    <li>The Head of Personnel is bound to the same rules regarding ordering Cargo Crates as the Quartermaster and Cargo Technicians. In addition, the Head of Personnel may not order unneeded, non-essential items against the wishes of Cargo;</li>
+                    <li>The Head of Personnel is not permitted to perform Security duty. The Head of Personnel is permitted to carry an Energy Gun, for self-defence only.</li>
+				</ol><BR>
+
+				<h1><a name="ntrep"><B>NanoTrasen Representative</B></a></h1><BR>
+				<ol>
+					<li>The NanoTrasen Representative is to ensure that every Department is following Standard Operating Procedure, up to and including the respective Head of Staff. If a Head of Staff is not available for a Department, the NanoTrasen Representative must ensure that the Captain appoints an Acting Head of Staff for said Department;</li>
+					<li>The NanoTrasen Representative must attempt to resolve any breach of Standard Operating Procedure locally before contacting Central Command. This is an imperative: Standard Operating Procedure should always be followed unless there is a very good reason not to;</li>
+					<li>The NanoTrasen Representative must, together with the Magistrate and Head of Security, ensure that Space Law is being followed and correctly applied;</li>
+					<li>The NanoTrasen Representative may not threaten the use of a fax in order to gain leverage over any personnel, up to and including Command. In addition they may not threaten to fire, or have Central Command, fire anyone, unless they actually possess a demotion note;</li>
+					<li>The NanoTrasen Representative is permitted to carry their Stun-Cane, or a Telescopic Baton if the Stun-Cane is lost.</li>
+				</ol><BR>
+
+                <h1><a name="bs"><B>Blueshield Officer</B></a></h1><BR>
+				<ol>
+					<li>The Blueshield may not conduct arrests under the same conditions as Security. However, they may apprehend any personnel that trespass on a Head of Staff Office or Command Area, any personnel that steal from those locations, or any personnel that steal from and/or injure any Head of Staff or Central Command VIP. However, all apprehended personnel are to be processed by Security personnel;</li>
+					<li>The Blueshield is to put the lives of Command over those of any other personnel, the Blueshield included. Their continued well-being is the Blueshield's top priority. This includes applying basic first aid and making sure they are revived if killed;</li>
+					<li>The Blueshield is to protect the lives of Command personnel, not follow their orders to a fault. The Blueshield is not to interfere with legal demotions or arrests. To do so is to place themselves under the Special Modifier Aiding and Abetting;</li>
+					<li>The Blueshield is not to apply Lethal Force unless there is a clear and present danger to their life, or to the life of a member of Command, and the assailant cannot be non-lethally detained.</li>
+				</ol><BR>
+
+	            <h1><a name="ai"><B>AI</B></a></h1><BR>
+				<b><i>The following are procedures for AI Maintenance:</i></b><br>
+				<ol>
+					<li>Only the Captain or Research Director may enter the AI Upload to perform Law Changes (see below), and only the Captain, Research Director or Chief Engineer may enter the AI Core to perform a Carding (see below);</li>
+					<li> No Law Changes are to be performed without approval from the Captain and Research Director. The only Lawsets to be used are those provided by NanoTrasen. Failure to legally perform a Law Change is to be considered Sabotage. Command must be informed prior to the Law Change, and all objections must be taken into consideration. If the number of Command personnel opposing the Law Change is greater than the number of Command personnel in favour, the Law Change is not to be done. If the Law Change is performed, the crew is to be immediately informed of the new Law(s);</li>
+                    <li>The AI may not be Carded unless it it clearly malfunctioning or subverted. However, any member of Command may card it if the AI agrees to it, either at the end of the shift, or due to external circumstances (such as massive damage to the AI Satellite);</li>
+                    <li>The AI Upload and Minisat Antechamber Turrets are to be kept on Non-Lethal in Code Green and Code Blue. The AI Core Turrets are to be kept on Lethal at all times. If a legal Law Change or Carding is occurring, the Turrets are to be disabled;</li>
+                    <li>If the AI Unit is not malfunctioning or subverted, any attempt at performing an illegal Carding or Law Change is to be responded to with non-lethal force. If the illegal attempts persist, and the perpetrator is demonstrably hostile, lethal force from Command/Security is permitted;</li>
+                    <li>Freeform Laws are only to be added if absolutely necessary due to external circumstances (such as major station emergencies). Adding unnecessary Freeform Laws is not permitted. Exception is made if the AI Unit and majority of Command agree to the Freeform Law that is proposed;</li>
+                    <li>Any use of the "Purge" Module is to be followed by the upload of a NanoTrasen-approved Lawset immediately. AI Units must be bound to a Lawset at all times.</li>
+				</ol><BR>
 				</body>
 				</html>
 
diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm
index 62f60a91bc4..a34a8328457 100644
--- a/code/game/objects/items/weapons/power_cells.dm
+++ b/code/game/objects/items/weapons/power_cells.dm
@@ -128,7 +128,6 @@
 	materials = list()
 	minor_fault = 1
 
-
 /obj/item/weapon/stock_parts/cell/high/slime
 	name = "charged slime core"
 	desc = "A yellow slime core infused with plasma, it crackles with power."
@@ -138,6 +137,12 @@
 	materials = list()
 	self_recharge = 1 // Infused slime cores self-recharge, over time
 
+/obj/item/weapon/stock_parts/cell/pulse //200 pulse shots
+	name = "pulse rifle power cell"
+	maxcharge = 40000
+	rating = 3
+	chargerate = 1500
+
 /obj/item/weapon/stock_parts/cell/pulse/carbine
 	name = "pulse carbine power cell"
 	maxcharge = 4000
@@ -168,9 +173,3 @@
 
 /obj/item/weapon/stock_parts/cell/emproof/corrupt()
 	return
-
-/obj/item/weapon/stock_parts/cell/temperaturegun
-	name = "temperature gun cell"
-	desc = "A specially designed power cell for heating and cooling projectiles"
-	icon_state = "icell"
-	maxcharge = 900
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm
index f7edba7e1c4..6e0500ffd38 100644
--- a/code/game/objects/items/weapons/stock_parts.dm
+++ b/code/game/objects/items/weapons/stock_parts.dm
@@ -131,7 +131,7 @@
 	name = "nano-manipulator"
 	desc = "A tiny little manipulator used in the construction of certain devices."
 	icon_state = "nano_mani"
-	origin_tech = "materials=3,programming=2"
+	origin_tech = "materials=3;programming=2"
 	rating = 2
 	materials = list(MAT_METAL=30)
 
@@ -173,7 +173,7 @@
 	name = "pico-manipulator"
 	desc = "A tiny little manipulator used in the construction of certain devices."
 	icon_state = "pico_mani"
-	origin_tech = "materials=5,programming=2"
+	origin_tech = "materials=5;programming=2"
 	rating = 3
 	materials = list(MAT_METAL=30)
 
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index daefa0db457..d14fc5958f0 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -6,8 +6,17 @@
 	item_state = "utility"
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
+	var/use_item_overlays = 0 // Do we have overlays for items held inside the belt?
 
 
+/obj/item/weapon/storage/belt/update_icon()
+	if(use_item_overlays)
+		overlays.Cut()
+		for(var/obj/item/I in contents)
+			overlays += "[I.name]"
+
+	..()
+
 /obj/item/weapon/storage/belt/proc/can_use()
 	return is_equipped()
 
@@ -148,6 +157,7 @@
 	item_state = "security"//Could likely use a better one.
 	storage_slots = 5
 	max_w_class = 3
+	use_item_overlays = 1
 	can_hold = list(
 		"/obj/item/weapon/grenade/flashbang",
 		"/obj/item/weapon/grenade/chem_grenade/teargas",
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 4a2ced79339..1a24f932091 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -115,7 +115,7 @@
 		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/weapon/storage/belt/security/sec(src)
 		new /obj/item/taperoll/police(src)
-		new /obj/item/weapon/gun/energy/hos(src)
+		new /obj/item/weapon/gun/energy/gun/hos(src)
 		new /obj/item/weapon/door_remote/head_of_security(src)
 
 
@@ -152,7 +152,7 @@
 		new /obj/item/weapon/storage/box/flashbangs(src)
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
 		new /obj/item/weapon/melee/baton/loaded(src)
-		new /obj/item/weapon/gun/energy/advtaser(src)
+		new /obj/item/weapon/gun/energy/gun/advtaser(src)
 		new /obj/item/weapon/storage/belt/security/sec(src)
 		new /obj/item/weapon/storage/box/holobadge(src)
 
diff --git a/code/game/response_team.dm b/code/game/response_team.dm
index 241e317c24b..d9b8cfcc375 100644
--- a/code/game/response_team.dm
+++ b/code/game/response_team.dm
@@ -382,7 +382,7 @@ var/send_emergency_team
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ert/security(M), slot_wear_suit)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/advtaser(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun/advtaser(M), slot_s_store)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(M), slot_glasses)
 
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ert/security(M), slot_in_backpack)
@@ -459,7 +459,7 @@ var/send_emergency_team
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/security(M), slot_wear_suit)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/advtaser(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun/advtaser(M), slot_s_store)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(M), slot_glasses)
 
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/security(M), slot_in_backpack)
@@ -532,7 +532,7 @@ var/send_emergency_team
 			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse/pistol(M), slot_in_backpack)
 
 			M.equip_to_slot_or_del(new /obj/item/device/t_scanner/extended_range(M), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
@@ -553,7 +553,7 @@ var/send_emergency_team
 				M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/ionrifle/carbine(M), slot_in_backpack)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/carbine(M), slot_r_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse/carbine(M), slot_r_hand)
 
 		if("Medic")
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)
@@ -566,7 +566,7 @@ var/send_emergency_team
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/medical(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/surgery(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse/pistol(M), slot_in_backpack)
 
 			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
@@ -585,7 +585,7 @@ var/send_emergency_team
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/lockbox/loyalty(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse/pistol(M), slot_in_backpack)
 
 			M.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(M), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
@@ -610,4 +610,4 @@ var/send_emergency_team
 	new /obj/item/device/radio/centcom( src )
 	new /obj/item/weapon/reagent_containers/food/pill/salicylic( src )
 	new /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh( src )
-	return
\ No newline at end of file
+	return
diff --git a/code/game/sound.dm b/code/game/sound.dm
index cecf12c657d..1890a0966e7 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -9,8 +9,9 @@ var/list/jackboot_sound = list('sound/effects/jackboot1.ogg','sound/effects/jack
 var/list/swing_hit_sound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
 var/list/hiss_sound = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
 var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg')
-//var/list/gun_sound = list('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
+var/list/gun_sound = list('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
 var/list/computer_ambience = list('sound/goonstation/machines/ambicomp1.ogg', 'sound/goonstation/machines/ambicomp2.ogg', 'sound/goonstation/machines/ambicomp3.ogg')
+var/list/ricochet = list('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg','sound/weapons/effects/ric3.ogg','sound/weapons/effects/ric4.ogg','sound/weapons/effects/ric5.ogg')
 
 /proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, var/is_global, var/pitch)
 
@@ -107,17 +108,32 @@ var/const/FALLOFF_SOUNDS = 0.5
 /proc/get_sfx(soundin)
 	if(istext(soundin))
 		switch(soundin)
-			if ("shatter") soundin = pick(shatter_sound)
-			if ("explosion") soundin = pick(explosion_sound)
-			if ("sparks") soundin = pick(spark_sound)
-			if ("rustle") soundin = pick(rustle_sound)
-			if ("bodyfall") soundin = pick(bodyfall_sound)
-			if ("punch") soundin = pick(punch_sound)
-			if ("clownstep") soundin = pick(clown_sound)
-			if ("jackboot") soundin = pick(jackboot_sound)
-			if ("swing_hit") soundin = pick(swing_hit_sound)
-			if ("hiss") soundin = pick(hiss_sound)
-			if ("pageturn") soundin = pick(page_sound)
-			//if ("gunshot") soundin = pick(gun_sound)
-			if("computer_ambience") soundin = pick(computer_ambience)
+			if ("shatter")
+				soundin = pick(shatter_sound)
+			if ("explosion")
+				soundin = pick(explosion_sound)
+			if ("sparks")
+				soundin = pick(spark_sound)
+			if ("rustle")
+				soundin = pick(rustle_sound)
+			if ("bodyfall")
+				soundin = pick(bodyfall_sound)
+			if ("punch")
+				soundin = pick(punch_sound)
+			if ("clownstep")
+				soundin = pick(clown_sound)
+			if ("jackboot")
+				soundin = pick(jackboot_sound)
+			if ("swing_hit")
+				soundin = pick(swing_hit_sound)
+			if ("hiss")
+				soundin = pick(hiss_sound)
+			if ("pageturn")
+				soundin = pick(page_sound)
+			if ("gunshot")
+				soundin = pick(gun_sound)
+			if("computer_ambience")
+				soundin = pick(computer_ambience)
+			if("ricochet")
+				soundin = pick(ricochet)
 	return soundin
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 090955de57a..dc7cc24d6b7 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2483,7 +2483,7 @@
 				for(var/obj/item/W in world)
 					if(istype(W, /obj/item/clothing) || istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/weapon/disk) || istype(W, /obj/item/weapon/tank))
 						continue
-					W.icon = 'icons/obj/gun.dmi'
+					W.icon = 'icons/obj/guns/projectile.dmi'
 					W.icon_state = "revolver"
 					W.item_state = "gun"
 				message_admins("[key_name_admin(usr)] made every item look like a gun")
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 6b3c78cf954..e02ac49b821 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -690,7 +690,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/clothing/suit/armor/vest(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/thunderdome(M), slot_head)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(M), slot_r_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse/destroyer(M), slot_r_hand)
 			M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/knife(M), slot_l_hand)
 			M.equip_to_slot_or_del(new /obj/item/weapon/grenade/smokebomb(M), slot_r_store)
 
@@ -881,7 +881,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 			M.equip_or_collect(pda, slot_r_store)
 			M.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(M), slot_l_store)
-			M.equip_or_collect(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_belt)
+			M.equip_or_collect(new /obj/item/weapon/gun/energy/pulse/pistol(M), slot_belt)
 
 			var/obj/item/weapon/card/id/centcom/W = new(M)
 			W.name = "[M.real_name]'s ID Card (Nanotrasen Navy Officer)"
@@ -904,7 +904,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 			M.equip_or_collect(pda, slot_r_store)
 			M.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(M), slot_l_store)
-			M.equip_or_collect(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_belt)
+			M.equip_or_collect(new /obj/item/weapon/gun/energy/pulse/pistol(M), slot_belt)
 
 			var/obj/item/weapon/card/id/centcom/W = new(M)
 			W.name = "[M.real_name]'s ID Card (Nanotrasen Navy Captain)"
@@ -967,7 +967,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/clothing/glasses/thermal/cyber(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse/pistol/m1911(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/twohanded/dualsaber/red(M), slot_l_store)
 
@@ -996,7 +996,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/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/cyber(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse/pistol/m1911(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_r_store)
 			M.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_l_store)
@@ -1233,4 +1233,4 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	assets.register()
 
 	// Clear the user's cache so they get resent.
-	usr.client.cache = list()
\ No newline at end of file
+	usr.client.cache = list()
diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm
index 75fc6af84d9..dd37a828302 100644
--- a/code/modules/admin/verbs/honksquad.dm
+++ b/code/modules/admin/verbs/honksquad.dm
@@ -121,7 +121,7 @@ var/global/sent_honksquad = 0
 	if(prob(50))
 		equip_to_slot_or_del(new /obj/item/weapon/gun/energy/clown(src), slot_in_backpack)
 	else
-		equip_to_slot_or_del(new /obj/item/weapon/gun/grenadelauncher/piecannon(src), slot_in_backpack)
+		equip_to_slot_or_del(new /obj/item/weapon/gun/throw/piecannon(src), slot_in_backpack)
 	src.mutations.Add(CLUMSY)
 
 
@@ -134,4 +134,4 @@ var/global/sent_honksquad = 0
 	W.registered_name = real_name
 	equip_to_slot_or_del(W, slot_wear_id)
 
-	return 1
\ No newline at end of file
+	return 1
diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm
index a5b98bc888c..142bb8203cd 100644
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -154,7 +154,7 @@ var/global/sent_strike_team = 0
 	equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(src), slot_s_store)
 	equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(src), slot_belt)
 
-	equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(src), slot_r_hand)
+	equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse(src), slot_r_hand)
 
 
 	var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(src)//Here you go Deuryn
@@ -170,4 +170,4 @@ var/global/sent_strike_team = 0
 	W.registered_name = real_name
 	equip_to_slot_or_del(W, slot_wear_id)
 
-	return 1
\ No newline at end of file
+	return 1
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm
index 6131962b881..054b5469d9b 100644
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -144,7 +144,7 @@ var/global/sent_syndicate_strike_team = 0
 	equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
 
 	equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(src), slot_back)
-	equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m762, slot_in_backpack)
+	equip_to_slot_or_del(new /obj/item/ammo_box/magazine/mm556x45)
 
 	equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m45(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack)
@@ -160,7 +160,7 @@ var/global/sent_syndicate_strike_team = 0
 	equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/saber(src), slot_l_store)
 	equip_to_slot_or_del(new /obj/item/weapon/grenade/empgrenade(src), slot_r_store)
 	equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(src), slot_s_store)
-	equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol/m2411(src), slot_belt)
+	equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol/m1911(src), slot_belt)
 
 	equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/l6_saw(src), slot_r_hand)
 
@@ -173,4 +173,4 @@ var/global/sent_syndicate_strike_team = 0
 	W.registered_name = real_name
 	equip_to_slot_or_del(W, slot_wear_id)
 
-	return 1
\ No newline at end of file
+	return 1
diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm
index c5e370f06f7..b2cc9336bf5 100644
--- a/code/modules/admin/verbs/vox_raiders.dm
+++ b/code/modules/admin/verbs/vox_raiders.dm
@@ -18,7 +18,7 @@ var/global/vox_tick = 1
 			equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE.
 			equip_to_slot_or_del(new /obj/item/device/chameleon(src), slot_l_store)
 
-			var/obj/item/weapon/gun/launcher/spikethrower/W = new(src)
+			var/obj/item/weapon/gun/projectile/automatic/spikethrower/W = new(src)
 			equip_to_slot_or_del(W, slot_r_hand)
 
 
@@ -77,4 +77,4 @@ var/global/vox_tick = 1
 	vox_tick++
 	if (vox_tick > 4) vox_tick = 1
 
-	return 1
\ No newline at end of file
+	return 1
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 3bf0775473c..3171755b34c 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -10,6 +10,7 @@
 	var/status = 0   //0 - not readied //1 - bomb finished with welder
 	var/obj/item/device/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
 	var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank
+	origin_tech = "materials=1;engineering=1"
 
 /obj/item/device/onetankbomb/examine(mob/user)
 	..(user)
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index 0adf55229e0..682e2137d2a 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -61,10 +61,8 @@
  */
 //Captain's retro laser - Fires practice laser shots instead.
 obj/item/weapon/gun/energy/laser/retro/sc_retro
-	name ="retro laser"
-	icon_state = "retro"
 	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces."
-//	projectile_type = "/obj/item/projectile/practice"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
 	clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face
 
 //Syndicate sub-machine guns.
@@ -196,4 +194,4 @@ var/sc_safecode5 = "[rand(0,9)]"
 	return
 
 /obj/singularity/narsie/sc_Narsie/ex_act()
-	return
\ No newline at end of file
+	return
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 768de2a270b..292120b65c5 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -316,8 +316,9 @@
 	send_resources()
 
 	if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates. -CP
+		if(!establish_db_connection())
+			return // if we have db problems, don't show anything
 		winset(src, "rpane.changelog", "background-color=#f4aa94;font-style=bold")
-		prefs.SetChangelog(src,changelog_hash)
 		to_chat(src, "<span class='info'>Changelog has changed since your last visit.</span>")
 
 	if(!void)
diff --git a/code/modules/client/preferences_mysql.dm b/code/modules/client/preferences_mysql.dm
index 07db4bf7128..15abdab0360 100644
--- a/code/modules/client/preferences_mysql.dm
+++ b/code/modules/client/preferences_mysql.dm
@@ -456,10 +456,12 @@
 
 /datum/preferences/proc/SetChangelog(client/C,hash)
 	lastchangelog=hash
+	winset(C, "rpane.changelog", "background-color=none;font-style=")
 	var/DBQuery/query = dbcon.NewQuery("UPDATE [format_table_name("player")] SET lastchangelog='[lastchangelog]' WHERE ckey='[C.ckey]'")
 	if(!query.Execute())
 		var/err = query.ErrorMsg()
 		log_game("SQL ERROR during lastchangelog updating. Error : \[[err]\]\n")
 		message_admins("SQL ERROR during lastchangelog updating. Error : \[[err]\]\n")
+		to_chat(C, "Couldn't update your last seen changelog, please try again later.")
 		return
 	return 1
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index db163ad3e59..a50e56382a1 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -6,8 +6,32 @@
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	item_color="yellow"
-	power
-		var/next_shock = 0
+
+/obj/item/clothing/gloves/color/yellow/power
+	description_antag = "These are a pair of power gloves, and can be used to fire bolts of electricity while standing over powered power cables."
+	var/old_mclick_override
+	var/datum/middleClickOverride/power_gloves/mclick_override = new /datum/middleClickOverride/power_gloves
+
+/obj/item/clothing/gloves/color/yellow/power/equipped(mob/user, slot)
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/H = user
+	if(slot == slot_gloves)
+		if(H.middleClickOverride)
+			old_mclick_override = H.middleClickOverride
+		H.middleClickOverride = mclick_override
+		to_chat(H, "<span class='notice'>You feel electricity begin to build up in [src].</span>")
+
+/obj/item/clothing/gloves/color/yellow/power/dropped(mob/user, slot)
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/H = user
+	if(H.get_item_by_slot(slot_gloves) == src && H.middleClickOverride == mclick_override)
+		if(old_mclick_override)
+			H.middleClickOverride = old_mclick_override
+			old_mclick_override = null
+		else
+			H.middleClickOverride = null
 
 /obj/item/clothing/gloves/color/yellow/fake
 	desc = "These gloves will protect the wearer from electric shock. They don't feel like rubber..."
@@ -167,4 +191,4 @@
 	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
-	strip_delay = 60
\ No newline at end of file
+	strip_delay = 60
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 4015f107e51..91824a9856e 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -34,8 +34,8 @@
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60)
 	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_rifle, \
-	/obj/item/weapon/gun/energy/advtaser, /obj/item/weapon/melee/baton, /obj/item/weapon/gun/energy/gun)
+	/obj/item/device/radio, /obj/item/device/analyzer, /obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse, \
+	/obj/item/weapon/gun/energy/gun/advtaser, /obj/item/weapon/melee/baton, /obj/item/weapon/gun/energy/gun)
 	strip_delay = 130
 
 //Commander
@@ -121,4 +121,4 @@
 
 /obj/item/clothing/suit/space/rig/ert/paranormal/New()
 	..()
-	new /obj/item/weapon/nullrod(src)
\ No newline at end of file
+	new /obj/item/weapon/nullrod(src)
diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm
index 2473fd24eb8..16ddf2bdd69 100644
--- a/code/modules/clothing/spacesuits/rig/modules/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm
@@ -119,7 +119,7 @@
 		gun.attack_self(holder.wearer)
 		return 1
 
-	gun.Fire(target,holder.wearer)
+	gun.process_fire(target,holder.wearer)
 	return 1
 
 /obj/item/rig_module/mounted/egun
@@ -168,7 +168,7 @@
 	active_power_cost = 10
 	passive_power_cost = 0
 
-	gun_type = /obj/item/weapon/gun/energy/crossbow/ninja
+	gun_type = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/ninja
 
 /obj/item/rig_module/mounted/energy_blade/process()
 
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 7934d49a620..abdfaf7648e 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -135,13 +135,13 @@
 	icon_state = "armor_reflec"
 	item_state = "armor_reflec"
 	blood_overlay_type = "armor"
-	var/hit_reflect_chance = 40
 	armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)
+	var/hit_reflect_chance = 40
 
 /obj/item/clothing/suit/armor/laserproof/IsReflect(var/def_zone)
 	if(!(def_zone in list("chest", "groin"))) //If not shot where ablative is covering you, you don't get the reflection bonus!
-		hit_reflect_chance = 0
-	if (prob(hit_reflect_chance))
+		return 0
+	if(prob(hit_reflect_chance))
 		return 1
 
 /obj/item/clothing/suit/armor/vest/det_suit
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 5dc5cf02699..8b1d33d6ddb 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -10,6 +10,7 @@
 	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.
+	action_button_custom_type = /datum/action/item_action/accessory
 
 /obj/item/clothing/accessory/New()
 	..()
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index c578c452bbc..bbdb526c70a 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -44,7 +44,7 @@
 				/obj/item/robot_parts/r_leg = 1,
 				/obj/item/stack/sheet/metal = 5,
 				/obj/item/stack/cable_coil = 5,
-				/obj/item/weapon/gun/energy/advtaser = 1,
+				/obj/item/weapon/gun/energy/gun/advtaser = 1,
 				/obj/item/weapon/stock_parts/cell = 1,
 				/obj/item/device/assembly/prox_sensor = 1,
 				/obj/item/robot_parts/r_arm = 1)
@@ -200,4 +200,22 @@
 	time = 15
 	reqs = list(/obj/item/stack/sheet/wood = 1,
 				/obj/item/stack/cable_coil = 5)
-	tools = list(/obj/item/weapon/kitchen/knife) // Gotta carve the wood into handles
\ No newline at end of file
+	tools = list(/obj/item/weapon/kitchen/knife) // Gotta carve the wood into handles
+
+/datum/table_recipe/makeshift_bolt
+	name = "Makeshift Bolt"
+	result = /obj/item/weapon/arrow/rod
+	time = 15
+	reqs = list(/obj/item/stack/rods = 1)
+	tools = list(/obj/item/weapon/weldingtool)
+
+/datum/table_recipe/crossbow
+	name = "Powered Crossbow"
+	result = /obj/item/weapon/gun/throw/crossbow
+	time = 300
+	reqs = list(/obj/item/stack/rods = 3,
+				/obj/item/stack/cable_coil = 10,
+				/obj/item/stack/sheet/mineral/plastic = 3,
+				/obj/item/stack/sheet/wood = 5)
+	tools = list(/obj/item/weapon/weldingtool,
+				/obj/item/weapon/screwdriver)
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 3cd6566e731..3371eeade23 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -293,6 +293,16 @@
 	src.item_state = "[item_color]"
 	usr.update_inv_w_uniform()
 
+/obj/item/clothing/under/fluff/honourable // MrBarrelrolll: Maximus Greenwood
+	name = "Viridi Protegat"
+	desc = "A set of chainmail adorned with a hide mantle. \"Greenwood\" is engraved into the right breast."
+	icon = 'icons/obj/clothing/uniforms.dmi'
+	icon_state = "roman"
+	item_state = "maximus_armor"
+	item_color = "maximus_armor"
+	displays_id = 0
+	strip_delay = 100
+
 //////////// Masks ////////////
 
 //////////// Shoes ////////////
diff --git a/code/modules/examine/descriptions/weapons.dm b/code/modules/examine/descriptions/weapons.dm
index 90929d31e08..264e0e99dfe 100644
--- a/code/modules/examine/descriptions/weapons.dm
+++ b/code/modules/examine/descriptions/weapons.dm
@@ -26,7 +26,7 @@
 	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To switch between stun and lethal, click the weapon \
 	in your hand.  To recharge this weapon, use a weapon recharger."
 
-/obj/item/weapon/gun/energy/advtaser
+/obj/item/weapon/gun/energy/gun/advtaser
 	description_info = "This is an energy weapon.  To fire the weapon, have your gun mode set to 'fire', \
 	then click where you want to fire. To recharge this weapon, use a weapon recharger. \
 	To switch between insta-stun and disabler beams, click the weapon in your hand. This weapon can only fire through glass if it is set to disabler beams."
@@ -55,11 +55,6 @@
 	then click where you want to fire.  After firing, you will need to pump the gun, by clicking on the gun in your hand.  To reload, load more shotgun \
 	shells into the gun."
 
-/obj/item/weapon/gun/projectile/heavysniper
-	description_info = "This is a ballistic weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire.  The gun's chamber can be opened or closed by using it in your hand.  To reload, open the chamber, add a new bullet \
-	then close it.  To use the scope, use the appropriate verb in the object tab."
-
 //*******
 //*Melee*
 //*******
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index c4088d9a53f..45ef929967a 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -695,7 +695,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
 					halitem.layer = 50
 					switch(rand(1,6))
 						if(1) //revolver
-							halitem.icon = 'icons/obj/gun.dmi'
+							halitem.icon = 'icons/obj/guns/projectile.dmi'
 							halitem.icon_state = "revolver"
 							halitem.name = "Revolver"
 						if(2) //c4
@@ -780,4 +780,4 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
 					if(client) client.images += halbody
 					spawn(rand(50,80)) //Only seen for a brief moment.
 						if(client) client.images -= halbody
-						halbody = null
\ No newline at end of file
+						halbody = null
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index 9102af9e0ab..3e9580ef14b 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -179,6 +179,7 @@
 	if(locked)
 		if(istype(W, /obj/item/weapon/card/emag))
 			boom(user)
+			return 1
 		if(istype(W, /obj/item/device/multitool))
 			to_chat(user, "<span class='notice'>DECA-CODE LOCK REPORT:</span>")
 			if(attempts == 1)
@@ -186,30 +187,24 @@
 			else
 				to_chat(user, "<span class='notice'>* Anti-Tamper Bomb will activate after [src.attempts] failed access attempts.</span>")
 			if(lastattempt != null)
-				var/guess = lastattempt
 				var/bulls = 0
 				var/cows = 0
 				var/list/banned = list()
-				for(var/i; i <= length(lastattempt); i++)
-					var/list/a = strip_first(guess)
-					if(a[1] in banned)
+				for(var/i in 1 to codelen)
+					var/list/a = copytext(lastattempt, i, i + 1)
+					if(a in banned)
 						continue
-					if(findtext(a[2], a[1]))
-						if(findtext(code, a[1], i, i+1))
+					var/g = findtext(code, a)
+					if(g)
+						banned += a
+						if(g == i)
 							++bulls
-							banned += a[1]
-					else
-						var/g = findtext(code, a[1])
-						if(g)
-							if(g == i)
-								++bulls
-							else
-								++cows
-					guess = a[2]
+						else
+							++cows
 
 				to_chat(user, "<span class='notice'>Last code attempt had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.</span>")
-		else ..()
-	else ..()
+			return 1
+	return ..()
 
 /obj/structure/closet/crate/secure/loot/togglelock(mob/user)
 	if(locked)
diff --git a/code/modules/mining/security_recipes.dm b/code/modules/mining/security_recipes.dm
index f08addbf4a0..9cbdeadc154 100644
--- a/code/modules/mining/security_recipes.dm
+++ b/code/modules/mining/security_recipes.dm
@@ -99,7 +99,7 @@
 
 /datum/manufacture/taser
 	name = "Advanced Taser"
-	item = /obj/item/weapon/gun/energy/advtaser
+	item = /obj/item/weapon/gun/energy/gun/advtaser
 	cost1 = /obj/item/weapon/ore/iron
 	cname1 = "Iron"
 	amount1 = 15
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 afae056b99f..9311ab0592f 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -123,8 +123,8 @@ Doesn't work on other aliens/AI.*/
 		A.firer = src
 		A.yo = U.y - T.y
 		A.xo = U.x - T.x
-		spawn(1)
-			A.process()
+		A.fire()
+		A.newtonian_move(get_dir(U, T))
 	return
 
 /mob/living/carbon/alien/humanoid/proc/resin() // -- TLE
@@ -185,4 +185,4 @@ Doesn't work on other aliens/AI.*/
 		adjustPlasma(-amount)
 		return 1
 
- 	return 0
\ No newline at end of file
+ 	return 0
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index 857546732d7..63eb38e607f 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -32,22 +32,6 @@
 				adjustToxLoss(3)
 				updatehealth()
 
-/mob/living/carbon/brain/handle_environment(datum/gas_mixture/environment)
-	if(!environment)
-		return
-	var/environment_heat_capacity = environment.heat_capacity()
-	if(istype(get_turf(src), /turf/space))
-		var/turf/heat_turf = get_turf(src)
-		environment_heat_capacity = heat_turf.heat_capacity
-
-	if((environment.temperature > (T0C + 50)) || (environment.temperature < (T0C + 10)))
-		var/transfer_coefficient = 1
-
-		handle_temperature_damage(HEAD, environment.temperature, environment_heat_capacity*transfer_coefficient)
-
-	if(stat == DEAD)
-		bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000)
-
 /mob/living/carbon/brain/proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
 	if(status_flags & GODMODE)
 		return
@@ -94,3 +78,6 @@
 		see_in_dark = 2
 		see_invisible = SEE_INVISIBLE_LIVING
 	handle_hud_icons_health()
+
+/mob/living/carbon/brain/breathe()
+	return
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 7775830b4a0..cb067591904 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1982,4 +1982,21 @@
 				. |= A.GetAccess()
 
 /mob/living/carbon/human/is_mechanical()
-	return ..() || (species.flags & ALL_RPARTS) != 0
\ No newline at end of file
+	return ..() || (species.flags & ALL_RPARTS) != 0
+
+/mob/living/carbon/human/can_use_guns(var/obj/item/weapon/gun/G)
+	. = ..()
+
+	if(G.trigger_guard == TRIGGER_GUARD_NORMAL)
+		if(HULK in mutations)
+			to_chat(src, "<span class='warning'>Your meaty finger is much too large for the trigger guard!</span>")
+			return 0
+		if(species.flags & NOGUNS)
+			to_chat(src, "<span class='warning'>Your fingers don't fit in the trigger guard!</span>")
+			return 0
+
+	if(martial_art && martial_art.name == "The Sleeping Carp") //great dishonor to famiry
+		to_chat(src, "<span class='warning'>Use of ranged weaponry would bring dishonor to the clan.</span>")
+		return 0
+
+	return .
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 835f741be3d..3a935e5e449 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -27,7 +27,7 @@ emp_act
 				P.current = curloc
 				P.yo = new_y - curloc.y
 				P.xo = new_x - curloc.x
-				P.Angle = ""//round(Get_Angle(P,P.original))
+				P.Angle = null
 
 			return -1 // complete projectile permutation
 
@@ -46,7 +46,10 @@ emp_act
 		if((P.embed && prob(20 + max(P.damage - armor, -10))))
 			var/obj/item/weapon/shard/shrapnel/SP = new()
 			(SP.name) = "[P.name] shrapnel"
-			(SP.desc) = "[SP.desc] It looks like it was fired from [P.shot_from]."
+			if(P.ammo_casing && P.ammo_casing.caliber)
+				(SP.desc) = "[SP.desc] It looks like it is a [P.ammo_casing.caliber] caliber round."
+			else
+				(SP.desc) = "[SP.desc] The round's caliber is unidentifiable."
 			(SP.loc) = organ
 			organ.embed(SP)
 
diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm
index 0a220accc98..b0806e66241 100644
--- a/code/modules/mob/living/carbon/human/interactive/functions.dm
+++ b/code/modules/mob/living/carbon/human/interactive/functions.dm
@@ -693,7 +693,7 @@
 							best = R
 					if(istype(R, /obj/item/weapon/gun))
 						var/obj/item/weapon/gun/G = R
-						if(G.can_fire())
+						if(G.can_shoot())
 							best = R
 							break // gun with ammo? screw the rest
 	if(best && best != main_hand)
@@ -727,22 +727,23 @@
 					if(main_hand.force != 0)
 						if(istype(main_hand,/obj/item/weapon/gun))
 							var/obj/item/weapon/gun/G = main_hand
-							if(G.special_check(src))
+							if(G.can_trigger_gun(src))
 								var/shouldFire = 1
 								if(istype(main_hand, /obj/item/weapon/gun/energy))
 									var/obj/item/weapon/gun/energy/P = main_hand
 									var/stunning = 0
-									if(ispath(text2path(P.projectile_type), /obj/item/projectile/energy/electrode))
-										stunning = 1
+									for(var/A in P.ammo_type)
+										if(ispath(A,/obj/item/ammo_casing/energy/electrode))
+											stunning = 1
 									var/mob/stunCheck = TARGET
 									if(stunning && stunCheck.stunned)
 										shouldFire = 0
 								if(shouldFire)
-									if(!G.process_chambered())
-										G.click_empty(src)
+									if(!G.can_shoot())
+										G.shoot_with_empty_chamber(src)
 										npcDrop(G, 1)
 									else
-										G.Fire(TARGET, src)
+										G.process_fire(TARGET, src)
 								else
 									if(get_dist(src,TARGET) > 6)
 										if(!walk2derpless(TARGET))
@@ -871,4 +872,4 @@
 			else
 				A.stamp(S)
 				custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")] as they stamp \the [A] with \a [S]!")
-			return
\ No newline at end of file
+			return
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 7162933349d..840b500de01 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -148,6 +148,9 @@
 			if(prob(braindam))
 				message = uppertext(message)
 				verb = "yells loudly"
+	
+	if(locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in internal_organs)
+		message = "<span class='sans'>[message]</span>"
 
 	returns[1] = message
 	returns[2] = verb
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 26ee19b0788..003e1969d33 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -66,7 +66,7 @@
 		if("Warden","Security Officer","Security Pod Pilot")
 			suit=/obj/item/clothing/suit/space/eva/plasmaman/security/
 			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/
-			H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_in_backpack)
+			H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_in_backpack)
 		if("Magistrate")
 			suit=/obj/item/clothing/suit/space/eva/plasmaman/magistrate
 			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/magistrate
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 7b3f74ef65f..c26508b1374 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -465,4 +465,4 @@
 				else
 					healths.icon_state = "health6"
 		else
-			healths.icon_state = "health7"
\ No newline at end of file
+			healths.icon_state = "health7"
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index c3c64c1c696..85526945b54 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -59,6 +59,8 @@
 	if(get_nations_mode())
 		process_nations()
 
+	..()
+
 /mob/living/proc/handle_breathing()
 	return
 
@@ -251,19 +253,17 @@
 /mob/living/proc/give_action_button(var/obj/item/I, recursive = 0)
 	if(I.action_button_name)
 		if(!I.action)
-			if(istype(I, /obj/item/organ/internal))
-				I.action = new/datum/action/item_action/organ_action
-			else if(I.action_button_is_hands_free)
-				I.action = new/datum/action/item_action/hands_free
+			if(I.action_button_custom_type)
+				I.action = new I.action_button_custom_type
 			else
-				I.action = new/datum/action/item_action
+				I.action = new /datum/action/item_action
 			I.action.name = I.action_button_name
 			I.action.target = I
 		I.action.Grant(src)
 
 	if(recursive)
 		for(var/obj/item/T in I)
-			give_action_button(I, recursive - 1)
+			give_action_button(T, recursive - 1)
 
 /mob/living/update_action_buttons()
 	if(!hud_used) return
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index f28e884f92f..f3c48bce39a 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -855,3 +855,9 @@
 		tally += 10
 
 	return tally
+
+/mob/living/proc/can_use_guns(var/obj/item/weapon/gun/G)
+	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 4d994436489..cc50408148e 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -47,10 +47,6 @@
 		proj_sharp = 0
 		proj_edge = 0
 
-	if(istype(P, /obj/item/projectile/beam/lightning)) //Stupid snowflake lightning gun.
-		if(P.damage >= 200)
-			src.dust()
-
 	if(!P.nodamage)
 		apply_damage(P.damage, P.damage_type, def_zone, armor)
 	return P.on_hit(src, armor, def_zone)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 3346882a488..812d2e8df58 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -814,7 +814,8 @@ var/list/ai_verbs_default = list(
 		var/icon_list[] = list(
 		"default",
 		"floating face",
-		"xeno queen"
+		"xeno queen",
+		"eldritch"
 		)
 		input = input("Please select a hologram:") as null|anything in icon_list
 		if(input)
@@ -826,6 +827,8 @@ var/list/ai_verbs_default = list(
 					holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo2"))
 				if("xeno queen")
 					holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo3"))
+				if("eldritch")
+					holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo4"))
 	return
 
 /mob/living/silicon/ai/proc/corereturn()
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 12030e52773..7fb1ba0a8aa 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -337,7 +337,7 @@
 	src.modules += new /obj/item/device/flash/cyborg(src)
 	src.modules += new /obj/item/borg/sight/thermal(src)
 	src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src)
-	src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/cyborg(src)
+	src.modules += new /obj/item/weapon/gun/energy/pulse/cyborg(src)
 	src.modules += new /obj/item/weapon/tank/jetpack/carbondioxide(src)
 	src.modules += new /obj/item/weapon/crowbar(src)
 	src.emag = null
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 2c2ca652d10..27bfe821502 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -158,7 +158,7 @@
 						return
 					newname = "redtag ED-209 assembly"
 				if("")
-					if(!istype(W, /obj/item/weapon/gun/energy/advtaser))
+					if(!istype(W, /obj/item/weapon/gun/energy/gun/advtaser))
 						return
 					newname = "taser ED-209 assembly"
 				else
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 12dd032ba49..34888dd3488 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -365,7 +365,7 @@ Auto Patrol[]"},
 	new /obj/item/device/assembly/prox_sensor(Tsec)
 
 	if(!lasercolor)
-		var/obj/item/weapon/gun/energy/advtaser/G = new /obj/item/weapon/gun/energy/advtaser(Tsec)
+		var/obj/item/weapon/gun/energy/gun/advtaser/G = new /obj/item/weapon/gun/energy/gun/advtaser(Tsec)
 		G.power_supply.charge = 0
 		G.update_icon()
 	else if(lasercolor == "b")
@@ -403,7 +403,7 @@ Auto Patrol[]"},
 	shoot_sound = 'sound/weapons/laser.ogg'
 	if(emagged == 2)
 		if(lasercolor)
-			projectile = /obj/item/projectile/lasertag
+			projectile = /obj/item/projectile/beam/lasertag
 		else
 			projectile = /obj/item/projectile/beam
 	else
@@ -411,9 +411,9 @@ Auto Patrol[]"},
 			shoot_sound = 'sound/weapons/Taser.ogg'
 			projectile = /obj/item/projectile/energy/electrode
 		else if(lasercolor == "b")
-			projectile = /obj/item/projectile/lasertag/blue
+			projectile = /obj/item/projectile/beam/lasertag/bluetag
 		else if(lasercolor == "r")
-			projectile = /obj/item/projectile/lasertag/red
+			projectile = /obj/item/projectile/beam/lasertag/redtag
 
 /mob/living/simple_animal/bot/ed209/proc/shootAt(mob/target)
 	if(lastfired && world.time - lastfired < shot_delay)
@@ -438,8 +438,7 @@ Auto Patrol[]"},
 	A.current = U
 	A.yo = U.y - T.y
 	A.xo = U.x - T.x
-	spawn(0)
-		A.process()
+	A.fire()
 
 /mob/living/simple_animal/bot/ed209/attack_alien(mob/living/carbon/alien/user)
 	..()
@@ -491,10 +490,10 @@ Auto Patrol[]"},
 	if(!disabled)
 		var/lasertag_check = 0
 		if((lasercolor == "b"))
-			if(istype(Proj, /obj/item/projectile/lasertag/red))
+			if(istype(Proj, /obj/item/projectile/beam/lasertag/redtag))
 				lasertag_check++
 		else if((lasercolor == "r"))
-			if(istype(Proj, /obj/item/projectile/lasertag/blue))
+			if(istype(Proj, /obj/item/projectile/beam/lasertag/bluetag))
 				lasertag_check++
 		if(lasertag_check)
 			icon_state = "[lasercolor]ed2090"
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 4f8b7753caf..e8ba27fa07d 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -632,8 +632,7 @@
 	A.current = T
 	A.yo = U.y - T.y
 	A.xo = U.x - T.x
-	spawn( 0 )
-		A.process()
+	A.fire()
 	return
 
 /mob/living/simple_animal/pet/corgi/Ian/borgi/Life()
@@ -657,4 +656,4 @@
 	s.start()
 	respawnable_list += src
 	qdel(src)
-	return
\ No newline at end of file
+	return
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 418c30199d0..ef048b351fd 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -262,7 +262,8 @@
 
 	var/obj/item/projectile/A = new projectiletype(src.loc)
 	playsound(user, projectilesound, 100, 1)
-	if(!A)	return
+	if(!A)
+		return
 
 	A.current = target
 	A.firer = src
@@ -272,7 +273,7 @@
 		newtonian_move(get_dir(target, user))
 	A.original = target
 	spawn( 0 )
-		A.process()
+		A.fire()
 	return
 
 /mob/living/simple_animal/hostile/proc/DestroySurroundings()
diff --git a/code/modules/mob/living/simple_animal/vox.dm b/code/modules/mob/living/simple_animal/vox.dm
index 3b34ddaf143..1a46e46e4e4 100644
--- a/code/modules/mob/living/simple_animal/vox.dm
+++ b/code/modules/mob/living/simple_animal/vox.dm
@@ -65,15 +65,26 @@
 		if ((O.client && !( O.blinded )))
 			to_chat(O, "\red [src] launches a razor-sharp quill at [target]!")
 
-	var/obj/item/weapon/arrow/quill/Q = new(loc)
+	var/obj/item/weapon/quill/Q = new(loc)
 	Q.fingerprintslast = src.ckey
 	Q.throw_at(target,10,30)
+
 	quills--
 
 	spawn(100)
 		to_chat(src, "\red You feel a fresh quill slide into place.")
 		quills++
 
+/obj/item/weapon/quill
+	name = "vox quill"
+	desc = "A wickedly barbed quill from some bizarre animal."
+	icon_state = "quill"
+	item_state = "quill"
+	throwforce = 5
+	w_class = 3.0
+	sharp = 1
+	edge = 0
+
 /mob/living/simple_animal/vox/armalis/verb/message_mob()
 	set category = "Alien"
 	set name = "Commune with creature"
@@ -155,4 +166,4 @@
 	desc = "A series of metallic lenses and chains."
 	icon = 'icons/obj/clothing/hats.dmi'
 	icon_state = "amp"
-	item_state = "amp"
\ No newline at end of file
+	item_state = "amp"
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index bbb0211ce67..f7cff248519 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -34,10 +34,6 @@
 		verbs += /client/proc/readmin
 	spawn(40)
 		if(client)
-			if(client.prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates. -CP
-				winset(client, "rpane.changelog", "background-color=#f4aa94;font-style=bold")
-				client.prefs.SetChangelog(client,changelog_hash)
-				to_chat(src, "<span class='info'>Changelog has changed since your last visit.</span>")
 			client.playtitlemusic()
 
 	if(config.player_overflow_cap && config.overflow_server_url) //Overflow rerouting, if set, forces players to be moved to a different server once a player cap is reached. Less rough than a pure kick.
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 60285b092fc..f961055ca56 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -452,7 +452,7 @@
 	var/datum/language/chosen_language
 	if(client.prefs.language)
 		chosen_language = all_languages[client.prefs.language]
-	if((chosen_language == null && chosen_language != "None") || (chosen_language && chosen_language.flags & RESTRICTED))
+	if((chosen_language == null && client.prefs.language != "None") || (chosen_language && chosen_language.flags & RESTRICTED))
 		log_debug("[src] had language [client.prefs.language], though they weren't supposed to. Setting to None.")
 		client.prefs.language = "None"
 
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 8208635f577..863b231f25a 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -520,6 +520,11 @@ obj/structure/cable/proc/cableColor(var/colorC)
 	else
 		return ..()
 
+/obj/item/stack/cable_coil/split()
+	var/obj/item/stack/cable_coil/C = ..()
+	C.color = color
+	return C
+
 /obj/item/stack/cable_coil/update_icon()
 	if (!color)
 		color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
@@ -600,27 +605,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
 			src.use(amt)
 			return
 
-//remove cables from the stack
-/* This is probably reduntant
-/obj/item/stack/cable_coil/use(var/used)
-	if(src.amount < used)
-		return 0
-	else if (src.amount == used)
-		if(ismob(loc)) //handle mob icon update
-			var/mob/M = loc
-			M.unEquip(src)
-		qdel(src)
-		return 1
-	else
-		amount -= used
-		update_icon()
-		return 1
-*/
-/obj/item/stack/cable_coil/use(var/used)
-	. = ..()
-	update_icon()
-	return
-
 //add cables to the stack
 /obj/item/stack/cable_coil/proc/give(var/extra)
 	if(amount + extra > MAXCOIL)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 4f0d72e1511..06ba1a093f8 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -213,7 +213,7 @@
 			else // Any other
 				A.yo = -20
 				A.xo = 0
-		A.process()	//TODO: Carn: check this out
+		A.fire()	//TODO: Carn: check this out
 
 
 /obj/machinery/power/emitter/attackby(obj/item/W, mob/user, params)
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 45670ec70b0..f47a4db719b 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -6,14 +6,16 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 1
-	w_class = 1.0
-	var/caliber = ""							//Which kind of guns it can be loaded into
-	var/projectile_type = ""//The bullet type to create when New() is called
+	w_class = 1
+	var/fire_sound = null						//What sound should play when this ammo is fired
+	var/caliber = null							//Which kind of guns it can be loaded into
+	var/projectile_type = null					//The bullet type to create when New() is called
 	var/obj/item/projectile/BB = null 			//The loaded bullet
-	var/pellets = 1
-	var/deviation = 0
-	var/spread = 0
-
+	var/pellets = 1								//Pellets for spreadshot
+	var/variance = 0							//Variance for inaccuracy fundamental to the casing
+	var/delay = 0								//Delay for energy weapons
+	var/randomspread = 0						//Randomspread for automatics
+	var/click_cooldown_override = 0				//Override this to make your gun have a faster fire rate, in tenths of a second. 4 is the default gun cooldown.
 
 /obj/item/ammo_casing/New()
 	..()
@@ -29,54 +31,50 @@
 	icon_state = "[initial(icon_state)][BB ? "-live" : ""]"
 	desc = "[initial(desc)][BB ? "" : " This one is spent"]"
 
-
-
-/obj/item/ammo_casing/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/screwdriver))
-		if(BB)
-			if(initial(BB.name) == "bullet")
-				var/tmp_label = ""
-				var/label_text = sanitize(input(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label))
-				if(length(label_text) > 20)
-					to_chat(user, "<span class='warning''>The inscription can be at most 20 characters long.</span>")
-				else
-					if(label_text == "")
-						to_chat(user, "<span class='notice'>You scratch the inscription off of [initial(BB)].</span>")
-						BB.name = initial(BB.name)
-					else
-						to_chat(user, "<span class='notice'>You inscribe \"[label_text]\" into \the [initial(BB.name)].</span>")
-						BB.name = "[initial(BB.name)] \"[label_text]\""
-			else
-				to_chat(user, "<span class='notice'>You can only inscribe a metal bullet.</span>")//because inscribing beanbags is silly
-
-		else
-			to_chat(user, "<span class='notice'>There is no bullet in the casing to inscribe anything into.</span>")
-
-/obj/item/ammo_casing/attackby(obj/item/ammo_box/box as obj, mob/user as mob, params)
-	if(!istype(box, /obj/item/ammo_box))
-		return
-	if(isturf(loc))
-		var/boolets = 0
-		for(var/obj/item/ammo_casing/pew in loc)
-			if(box.stored_ammo.len >= box.max_ammo)
-				break
-			if(pew.BB)
-				if(box.give_round(pew))
-					boolets++
-			else
-				continue
-		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
-			to_chat(user, "<span class='notice'>You fail to collect anything.</span>")
-
 /obj/item/ammo_casing/proc/newshot() //For energy weapons, shotgun shells and wands (!).
-	if(!BB)
+	if (!BB)
 		BB = new projectile_type(src)
 	return
 
+/obj/item/ammo_casing/attackby(obj/item/I as obj, mob/user as mob, params)
+	if(istype(I, /obj/item/ammo_box))
+		var/obj/item/ammo_box/box = I
+		if(isturf(loc))
+			var/boolets = 0
+			for(var/obj/item/ammo_casing/bullet in loc)
+				if (box.stored_ammo.len >= box.max_ammo)
+					break
+				if (bullet.BB)
+					if (box.give_round(bullet, 0))
+						boolets++
+				else
+					continue
+			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
+				to_chat(user, "<span class='warning'>You fail to collect anything!</span>")
+	else
+		if(istype(I, /obj/item/weapon/screwdriver))
+			if(BB)
+				if(initial(BB.name) == "bullet")
+					var/tmp_label = ""
+					var/label_text = sanitize(input(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label))
+					if(length(label_text) > 20)
+						to_chat(user, "<span class='warning''>The inscription can be at most 20 characters long.</span>")
+					else
+						if(label_text == "")
+							to_chat(user, "<span class='notice'>You scratch the inscription off of [initial(BB)].</span>")
+							BB.name = initial(BB.name)
+						else
+							to_chat(user, "<span class='notice'>You inscribe \"[label_text]\" into \the [initial(BB.name)].</span>")
+							BB.name = "[initial(BB.name)] \"[label_text]\""
+				else
+					to_chat(user, "<span class='notice'>You can only inscribe a metal bullet.</span>")//because inscribing beanbags is silly
 
+			else
+				to_chat(user, "<span class='notice'>There is no bullet in the casing to inscribe anything into.</span>")
+		..()
 
 //Boxes of ammo
 /obj/item/ammo_box
@@ -89,53 +87,78 @@
 	item_state = "syringe_kit"
 	materials = list(MAT_METAL=30000)
 	throwforce = 2
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 4
 	throw_range = 10
 	var/list/stored_ammo = list()
-	var/obj/item/ammo_casing/ammo_type
+	var/ammo_type = /obj/item/ammo_casing
 	var/max_ammo = 7
 	var/multiple_sprites = 0
-	var/caliber = ""
+	var/caliber
 	var/multiload = 1
+
 /obj/item/ammo_box/New()
-	for(var/i = 1, i <= max_ammo, i++)
+	for(var/i in 1 to max_ammo)
 		stored_ammo += new ammo_type(src)
 	update_icon()
 
-/obj/item/ammo_box/proc/get_round(var/keep = 0)
-	if(!stored_ammo.len)
+/obj/item/ammo_box/Destroy()
+	for(var/atom/A in stored_ammo)
+		qdel(A)
+	stored_ammo = null
+	return ..()
+
+/obj/item/ammo_box/proc/get_round(keep = 0)
+	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
 
-/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/r)
-	var/obj/item/ammo_casing/rb = r
-	if(rb)
-		if(stored_ammo.len < max_ammo && rb.caliber == caliber)
-			stored_ammo += rb
-			rb.loc = src
-			return 1
+/obj/item/ammo_box/proc/give_round(obj/item/ammo_casing/R, replace_spent = 0)
+	// Boxes don't have a caliber type, magazines do. Not sure if it's intended or not, but if we fail to find a caliber, then we fall back to ammo_type.
+	if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type))
+		return 0
+
+	if (stored_ammo.len < max_ammo)
+		stored_ammo += R
+		R.loc = src
+		return 1
+	//for accessibles magazines (e.g internal ones) when full, start replacing spent ammo
+	else if(replace_spent)
+		for(var/obj/item/ammo_casing/AC in stored_ammo)
+			if(!AC.BB)//found a spent ammo
+				stored_ammo -= AC
+				AC.loc = get_turf(loc)
+
+				stored_ammo += R
+				R.loc = src
+				return 1
+
 	return 0
 
-/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, var/silent = 0, params)
+/obj/item/ammo_box/proc/can_load(mob/user)
+	return 1
+
+/obj/item/ammo_box/attackby(obj/item/A, mob/user, params, silent = 0, replace_spent = 0)
 	var/num_loaded = 0
+	if(!can_load(user))
+		return
 	if(istype(A, /obj/item/ammo_box))
 		var/obj/item/ammo_box/AM = A
 		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
-			var/didload = give_round(AC)
-			if(didload)
+			var/did_load = give_round(AC, replace_spent)
+			if(did_load)
 				AM.stored_ammo -= AC
 				num_loaded++
-			if(!multiload || !didload)
+			if(!multiload || !did_load)
 				break
 	if(istype(A, /obj/item/ammo_casing))
 		var/obj/item/ammo_casing/AC = A
-		if(give_round(AC))
+		if(give_round(AC, replace_spent))
 			user.drop_item()
 			AC.loc = src
 			num_loaded++
@@ -145,6 +168,8 @@
 		A.update_icon()
 		update_icon()
 
+	return num_loaded
+
 /obj/item/ammo_box/attack_self(mob/user as mob)
 	var/obj/item/ammo_casing/A = get_round()
 	if(A)
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index 44189411515..a5af74e4d6c 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -1,128 +1,146 @@
 /obj/item/ammo_casing/a357
 	desc = "A .357 bullet casing."
 	caliber = "357"
-	projectile_type = "/obj/item/projectile/bullet"
+	projectile_type = /obj/item/projectile/bullet
+
+/obj/item/ammo_casing/a762
+	desc = "A 7.62mm bullet casing."
+	icon_state = "762-casing"
+	caliber = "a762"
+	projectile_type = /obj/item/projectile/bullet
+
+/obj/item/ammo_casing/a762/enchanted
+	projectile_type = /obj/item/projectile/bullet/weakbullet3
 
 /obj/item/ammo_casing/a50
 	desc = "A .50AE bullet casing."
 	caliber = ".50"
-	projectile_type = "/obj/item/projectile/bullet"
+	projectile_type = /obj/item/projectile/bullet
 
 /obj/item/ammo_casing/c38
 	desc = "A .38 bullet casing."
 	caliber = "38"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet2/rubber"
-
-/obj/item/ammo_casing/cap
-	desc = "A cap for children toys."
-	caliber = "caps"
-	projectile_type = "/obj/item/projectile/bullet/cap"
-
+	projectile_type = /obj/item/projectile/bullet/weakbullet2/rubber
 
 /obj/item/ammo_casing/c10mm
 	desc = "A 10mm bullet casing."
 	caliber = "10mm"
-	projectile_type = "/obj/item/projectile/bullet/midbullet3"
-
+	projectile_type = /obj/item/projectile/bullet/midbullet3
 
 /obj/item/ammo_casing/c9mm
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet3"
+	projectile_type = /obj/item/projectile/bullet/weakbullet3
 
 /obj/item/ammo_casing/c9mmap
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
-	projectile_type = "/obj/item/projectile/bullet/armourpiercing"
+	projectile_type = /obj/item/projectile/bullet/armourpiercing
 
 /obj/item/ammo_casing/c9mmtox
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
-	projectile_type = "/obj/item/projectile/bullet/toxinbullet"
+	projectile_type = /obj/item/projectile/bullet/toxinbullet
 
 /obj/item/ammo_casing/c9mminc
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
-	projectile_type = "/obj/item/projectile/bullet/incendiary/firebullet"
+	projectile_type = /obj/item/projectile/bullet/incendiary/firebullet
 
 /obj/item/ammo_casing/c46x30mm
 	desc = "A 4.6x30mm bullet casing."
 	caliber = "4.6x30mm"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet3"
+	projectile_type = /obj/item/projectile/bullet/weakbullet3
 
 /obj/item/ammo_casing/c46x30mmap
 	desc = "A 4.6x30mm bullet casing."
 	caliber = "4.6x30mm"
-	projectile_type = "/obj/item/projectile/bullet/armourpiercing"
+	projectile_type = /obj/item/projectile/bullet/armourpiercing
 
 /obj/item/ammo_casing/c46x30mmtox
 	desc = "A 4.6x30mm bullet casing."
 	caliber = "4.6x30mm"
-	projectile_type = "/obj/item/projectile/bullet/toxinbullet"
+	projectile_type = /obj/item/projectile/bullet/toxinbullet
 
 /obj/item/ammo_casing/c46x30mminc
 	desc = "A 4.6x30mm bullet casing."
 	caliber = "4.6x30mm"
-	projectile_type = "/obj/item/projectile/bullet/incendiary/firebullet"
+	projectile_type = /obj/item/projectile/bullet/incendiary/firebullet
 
 /obj/item/ammo_casing/c45
 	desc = "A .45 bullet casing."
 	caliber = ".45"
-	projectile_type = "/obj/item/projectile/bullet/midbullet"
+	projectile_type = /obj/item/projectile/bullet/midbullet
 
+/obj/item/ammo_casing/c45nostamina
+	desc = "A .45 bullet casing."
+	caliber = ".45"
+	projectile_type = /obj/item/projectile/bullet/midbullet3
+
+/obj/item/ammo_casing/n762
+	desc = "A 7.62x38mmR bullet casing."
+	caliber = "n762"
+	projectile_type = /obj/item/projectile/bullet
+
+/obj/item/ammo_casing/caseless/magspear
+	name = "magnetic spear"
+	desc = "A reusable spear that is typically loaded into kinetic spearguns."
+	projectile_type = /obj/item/projectile/bullet/reusable/magspear
+	caliber = "speargun"
+	icon_state = "magspear"
+	throwforce = 15 //still deadly when thrown
+	throw_speed = 3
 
 /obj/item/ammo_casing/shotgun
 	name = "shotgun slug"
 	desc = "A 12 gauge lead slug."
 	icon_state = "blshell"
 	caliber = "shotgun"
-	projectile_type = "/obj/item/projectile/bullet"
+	projectile_type = /obj/item/projectile/bullet
 	materials = list(MAT_METAL=4000)
 
-
 /obj/item/ammo_casing/shotgun/buckshot
 	name = "buckshot shell"
 	desc = "A 12 gauge buckshot shell."
 	icon_state = "gshell"
-	projectile_type = "/obj/item/projectile/bullet/pellet"
+	projectile_type = /obj/item/projectile/bullet/pellet
 	pellets = 6
-	deviation = 30
+	variance = 25
 
 /obj/item/ammo_casing/shotgun/rubbershot
 	name = "rubber shot"
 	desc = "A shotgun casing filled with densely-packed rubber balls, used to incapacitate crowds from a distance."
 	icon_state = "bshell"
-	projectile_type = "/obj/item/projectile/bullet/rpellet"
+	projectile_type = /obj/item/projectile/bullet/rpellet
 	pellets = 6
-	deviation = 30
+	variance = 25
 	materials = list(MAT_METAL=4000)
 
 /obj/item/ammo_casing/shotgun/beanbag
 	name = "beanbag slug"
 	desc = "A weak beanbag slug for riot control."
 	icon_state = "bshell"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet/rubber"
+	projectile_type = /obj/item/projectile/bullet/weakbullet/rubber
 	materials = list(MAT_METAL=250)
 
-
 /obj/item/ammo_casing/shotgun/improvised
 	name = "improvised shell"
 	desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
 	icon_state = "gshell"
-	projectile_type = "/obj/item/projectile/bullet/pellet/weak"
+	projectile_type = /obj/item/projectile/bullet/pellet/weak
 	materials = list(MAT_METAL=250)
 	pellets = 5
-	deviation = 30
+	variance = 25
 
 /obj/item/ammo_casing/shotgun/improvised/overload
 	name = "overloaded improvised shell"
 	desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \
 	propellant. It's like playing russian roulette, with a shotgun."
 	icon_state = "improvshell"
-	projectile_type = "/obj/item/projectile/bullet/pellet/random"
+	projectile_type = /obj/item/projectile/bullet/pellet/overload
 	materials = list(MAT_METAL=250)
 	pellets = 5
-	deviation = 30
+	variance = 40
 
 /obj/item/ammo_casing/shotgun/improvised/overload/New()
 	..()
@@ -132,15 +150,20 @@
 	name = "taser slug"
 	desc = "A stunning taser slug."
 	icon_state = "stunshell"
-	projectile_type = "/obj/item/projectile/bullet/stunshot"
+	projectile_type = /obj/item/projectile/bullet/stunshot
 	materials = list(MAT_METAL=250)
 
-
 /obj/item/ammo_casing/shotgun/meteorshot
 	name = "meteorshot shell"
 	desc = "A shotgun shell rigged with CMC technology, which launches a massive slug when fired."
 	icon_state = "mshell"
-	projectile_type = "/obj/item/projectile/bullet/meteorshot"
+	projectile_type = /obj/item/projectile/bullet/meteorshot
+
+/obj/item/ammo_casing/shotgun/breaching
+	name = "breaching shell"
+	desc = "An economic version of the meteorshot, utilizing similar technologies. Great for busting down doors."
+	icon_state = "mshell"
+	projectile_type = /obj/item/projectile/bullet/meteorshot/weak
 
 /obj/item/ammo_casing/shotgun/pulseslug
 	name = "pulse slug"
@@ -148,42 +171,42 @@
 	energy blast. While the heat and power drain limit it to one use, it can still allow an operator to engage targets that ballistic ammunition \
 	would have difficulty with."
 	icon_state = "pshell"
-	projectile_type = "/obj/item/projectile/beam/pulse/shot"
+	projectile_type = /obj/item/projectile/beam/pulse/shot
 
 /obj/item/ammo_casing/shotgun/incendiary
 	name = "incendiary slug"
 	desc = "An incendiary-coated shotgun slug."
 	icon_state = "ishell"
-	projectile_type = "/obj/item/projectile/bullet/incendiary/shell"
+	projectile_type = /obj/item/projectile/bullet/incendiary/shell
 
 /obj/item/ammo_casing/shotgun/frag12
 	name = "FRAG-12 slug"
 	desc = "A high explosive breaching round for a 12 gauge shotgun."
 	icon_state = "heshell"
-	projectile_type = "/obj/item/projectile/bullet/frag12"
+	projectile_type = /obj/item/projectile/bullet/frag12
 
 /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
 	name = "dragonsbreath shell"
 	desc = "A shotgun shell which fires a spread of incendiary pellets."
 	icon_state = "ishell2"
-	projectile_type = "/obj/item/projectile/bullet/incendiary/shell/dragonsbreath"
+	projectile_type = /obj/item/projectile/bullet/incendiary/shell/dragonsbreath
 	pellets = 4
-	deviation = 30
+	variance = 35
 
 /obj/item/ammo_casing/shotgun/ion
 	name = "ion shell"
 	desc = "An advanced shotgun shell which uses a subspace ansible crystal to produce an effect similar to a standard ion rifle. \
 	The unique properties of the crystal splot the pulse into a spread of individually weaker bolts."
 	icon_state = "ionshell"
-	projectile_type = "/obj/item/projectile/ion/weak"
+	projectile_type = /obj/item/projectile/ion/weak
 	pellets = 4
-	deviation = 30
+	variance = 35
 
 /obj/item/ammo_casing/shotgun/laserslug
 	name = "laser slug"
 	desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a laser weapon in a ballistic package."
 	icon_state = "lshell"
-	projectile_type = "/obj/item/projectile/beam"
+	projectile_type = /obj/item/projectile/beam
 
 /obj/item/ammo_casing/shotgun/techshell
 	name = "unloaded technological shell"
@@ -195,7 +218,7 @@
 	name = "shotgun dart"
 	desc = "A dart for use in shotguns. Can be injected with up to 30 units of any chemical."
 	icon_state = "cshell"
-	projectile_type = "/obj/item/projectile/bullet/dart"
+	projectile_type = /obj/item/projectile/bullet/dart
 
 /obj/item/ammo_casing/shotgun/dart/New()
 	..()
@@ -206,93 +229,116 @@
 /obj/item/ammo_casing/shotgun/dart/attackby()
 	return
 
+/obj/item/ammo_casing/shotgun/dart/bioterror
+	desc = "A shotgun dart filled with deadly toxins."
+
+/obj/item/ammo_casing/shotgun/dart/bioterror/New()
+	..()
+	reagents.add_reagent("neurotoxin", 6)
+	reagents.add_reagent("spores", 6)
+	reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT
+	reagents.add_reagent("coniine", 6)
+	reagents.add_reagent("sodium_thiopental", 6)
+
 /obj/item/ammo_casing/shotgun/tranquilizer
 	name = "tranquilizer darts"
 	desc = "A tranquilizer round used to subdue individuals utilizing stimulants."
 	icon_state = "cshell"
-	projectile_type = "/obj/item/projectile/bullet/dart/syringe/tranquilizer"
+	projectile_type = /obj/item/projectile/bullet/dart/syringe/tranquilizer
 	materials = list(MAT_METAL=250)
 
-/obj/item/ammo_casing/syringegun
-	name = "syringe gun spring"
-	desc = "A high-power spring that throws syringes."
-	projectile_type = null
+/obj/item/ammo_casing/a556
+	desc = "A 5.56mm bullet casing."
+	caliber = "a556"
+	projectile_type = /obj/item/projectile/bullet/heavybullet
 
 /obj/item/ammo_casing/shotgun/fakebeanbag
 	name = "beanbag shell"
 	desc = "A weak beanbag shell."
 	icon_state = "bshell"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet/booze"
-
-/obj/item/ammo_casing/a762
-	desc = "A 7.62mm bullet casing."
-	icon_state = "762-casing"
-	caliber = "a762"
-	projectile_type = "/obj/item/projectile/bullet"
-
-/obj/item/ammo_casing/a556
-	desc = "A 5.56mm bullet casing."
-	caliber = "a556"
-	projectile_type = "/obj/item/projectile/bullet/heavybullet"
+	projectile_type = /obj/item/projectile/bullet/weakbullet/booze
 
 /obj/item/ammo_casing/rocket
 	name = "rocket shell"
 	desc = "A high explosive designed to be fired from a launcher."
 	icon_state = "rocketshell"
-	projectile_type = "/obj/item/missile"
+	projectile_type = /obj/item/missile
 	caliber = "rocket"
 
 /obj/item/ammo_casing/caseless
 	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 (..())
+		loc = null
+		return 1
+	else
+		return 0
+
 /obj/item/ammo_casing/caseless/a75
 	desc = "A .75 bullet casing."
 	caliber = "75"
-	projectile_type = "/obj/item/projectile/bullet/gyro"
+	projectile_type = /obj/item/projectile/bullet/gyro
 
 /obj/item/ammo_casing/a40mm
 	name = "40mm HE shell"
 	desc = "A cased high explosive grenade that can only be activated once fired out of a grenade launcher."
 	caliber = "40mm"
 	icon_state = "40mmHE"
-	projectile_type = "/obj/item/projectile/bullet/a40mm"
+	projectile_type = /obj/item/projectile/bullet/a40mm
 
-//FOAM DARTS
 /obj/item/ammo_casing/caseless/foam_dart
 	name = "foam dart"
 	desc = "It's nerf or nothing! Ages 8 and up."
-	projectile_type = "/obj/item/projectile/bullet/reusable/foam_dart"
+	projectile_type = /obj/item/projectile/bullet/reusable/foam_dart
 	caliber = "foam_force"
-	icon = 'icons/obj/toyguns.dmi'
+	icon = 'icons/obj/guns/toy.dmi'
 	icon_state = "foamdart"
 	var/modified = 0
 
 /obj/item/ammo_casing/caseless/foam_dart/update_icon()
-	if(modified)
-		icon_state = "foamdart_empty"
-
-/obj/item/ammo_casing/caseless/foam_dart/attackby(var/obj/item/weapon/A as obj, mob/user as mob, params)
 	..()
-	if(istype(A, /obj/item/weapon/screwdriver) && !modified)
-		modified = 1
-		BB.damage_type = BRUTE
+	if (modified)
 		icon_state = "foamdart_empty"
-		desc = "It's nerf or nothing! ...Although, this one doesn't look too safe."
-		to_chat(user, "<span class='notice'>You pop the safety cap off of [src].</span>")
-	else if((istype(A, /obj/item/weapon/pen)) && modified && !BB.contents.len)
+		desc = "Its nerf or nothing! ... Although, this one doesn't look too safe."
+		if(BB)
+			BB.icon_state = "foamdart_empty"
+	else
+		icon_state = "foamdart"
+		desc = "Its nerf or nothing! Ages 8 and up."
+		if(BB)
+			BB.icon_state = "foamdart_empty"
+
+/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)
+		modified = 1
+		FD.damage_type = BRUTE
+		update_icon()
+	else if ((istype(A, /obj/item/weapon/pen)) && modified && !FD.pen)
 		if(!user.unEquip(A))
 			return
-		A.forceMove(BB)
-		BB.damage = 5
-		BB.nodamage = 0
+		A.loc = FD
+		FD.pen = A
+		FD.damage = 5
+		FD.nodamage = 0
 		to_chat(user, "<span class='notice'>You insert [A] into [src].</span>")
 	return
 
+/obj/item/ammo_casing/caseless/foam_dart/attack_self(mob/living/user)
+	var/obj/item/projectile/bullet/reusable/foam_dart/FD = BB
+	if(FD.pen)
+		FD.damage = initial(FD.damage)
+		FD.nodamage = initial(FD.nodamage)
+		user.put_in_hands(FD.pen)
+		to_chat(user, "<span class='notice'>You remove [FD.pen] from [src].</span>")
+		FD.pen = null
 
 /obj/item/ammo_casing/caseless/foam_dart/riot
 	name = "riot foam dart"
 	desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up."
-	projectile_type = "/obj/item/projectile/bullet/reusable/foam_dart/riot"
+	projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/riot
 	icon_state = "foamdart_riot"
 
 /obj/item/ammo_casing/shotgun/dart/assassination
@@ -301,3 +347,8 @@
 /obj/item/ammo_casing/shotgun/dart/assassination/New()
 	..()
 	reagents.add_reagent("neurotoxin", 6)
+
+/obj/item/ammo_casing/cap
+	desc = "A cap for children toys."
+	caliber = "caps"
+	projectile_type = /obj/item/projectile/bullet/cap
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index eb998823b6a..894b5ac25b1 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -1,5 +1,6 @@
 /obj/item/ammo_box/a357
 	name = "speed loader (.357)"
+	desc = "Designed to quickly reload revolvers."
 	icon_state = "357"
 	ammo_type = /obj/item/ammo_casing/a357
 	max_ammo = 7
@@ -7,18 +8,12 @@
 
 /obj/item/ammo_box/c38
 	name = "speed loader (.38)"
+	desc = "Designed to quickly reload revolvers."
 	icon_state = "38"
 	ammo_type = /obj/item/ammo_casing/c38
 	max_ammo = 6
 	multiple_sprites = 1
 
-/obj/item/ammo_box/caps
-	name = "speed loader (caps)"
-	icon_state = "357"
-	ammo_type = /obj/item/ammo_casing/cap
-	max_ammo = 7
-	multiple_sprites = 1
-
 /obj/item/ammo_box/c9mm
 	name = "ammo box (9mm)"
 	icon_state = "9mmbox"
@@ -55,6 +50,13 @@
 	max_ammo = 5
 	multiple_sprites = 1
 
+/obj/item/ammo_box/n762
+	name = "ammo box (7.62x38mmR)"
+	icon_state = "10mmbox"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/n762
+	max_ammo = 14
+
 /obj/item/ammo_box/shotgun
 	name = "Ammunition Box (slug)"
 	icon_state = "9mmbox"
@@ -91,7 +93,7 @@
 //FOAM DARTS
 /obj/item/ammo_box/foambox
 	name = "ammo box (Foam Darts)"
-	icon = 'icons/obj/toyguns.dmi'
+	icon = 'icons/obj/guns/toy.dmi'
 	icon_state = "foambox"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	max_ammo = 40
@@ -99,3 +101,10 @@
 /obj/item/ammo_box/foambox/riot
 	icon_state = "foambox_riot"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+
+/obj/item/ammo_box/caps
+	name = "speed loader (caps)"
+	icon_state = "357"
+	ammo_type = /obj/item/ammo_casing/cap
+	max_ammo = 7
+	multiple_sprites = 1
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
new file mode 100644
index 00000000000..d7f26ff3919
--- /dev/null
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -0,0 +1,231 @@
+/obj/item/ammo_casing/energy
+	name = "energy weapon lens"
+	desc = "The part of the gun that makes the laser go pew"
+	caliber = "energy"
+	projectile_type = /obj/item/projectile/energy
+	var/e_cost = 1000 //The amount of energy a cell needs to expend to create this shot.
+	var/select_name = "energy"
+	fire_sound = 'sound/weapons/Laser.ogg'
+
+/obj/item/ammo_casing/energy/laser
+	projectile_type = /obj/item/projectile/beam/laser
+	select_name = "kill"
+
+/obj/item/ammo_casing/energy/lasergun
+	projectile_type = /obj/item/projectile/beam/laser
+	e_cost = 830
+	select_name = "kill"
+
+/obj/item/ammo_casing/energy/laser/hos //allows balancing of HoS and blueshit guns seperately from other energy weapons
+
+/obj/item/ammo_casing/energy/laser/practice
+	projectile_type = /obj/item/projectile/beam/practice
+	select_name = "practice"
+
+/obj/item/ammo_casing/energy/laser/scatter
+	projectile_type = /obj/item/projectile/beam/scatter
+	pellets = 5
+	variance = 25
+	select_name = "scatter"
+
+/obj/item/ammo_casing/energy/laser/heavy
+	projectile_type = /obj/item/projectile/beam/laser/heavylaser
+	select_name = "anti-vehicle"
+	fire_sound = 'sound/weapons/lasercannonfire.ogg'
+
+/obj/item/ammo_casing/energy/laser/pulse
+	projectile_type = /obj/item/projectile/beam/pulse
+	e_cost = 200
+	select_name = "DESTROY"
+	fire_sound = 'sound/weapons/pulse.ogg'
+
+/obj/item/ammo_casing/energy/laser/scatter/pulse
+	projectile_type = /obj/item/projectile/beam/pulse
+	e_cost = 2000
+	select_name = "ANNIHILATE"
+	fire_sound = 'sound/weapons/pulse.ogg'
+
+/obj/item/ammo_casing/energy/laser/bluetag
+	projectile_type = /obj/item/projectile/beam/lasertag/bluetag
+	select_name = "bluetag"
+
+/obj/item/ammo_casing/energy/laser/redtag
+	projectile_type = /obj/item/projectile/beam/lasertag/redtag
+	select_name = "redtag"
+
+/obj/item/ammo_casing/energy/xray
+	projectile_type = /obj/item/projectile/beam/xray
+	e_cost = 500
+	fire_sound = 'sound/weapons/laser3.ogg'
+
+/obj/item/ammo_casing/energy/immolator
+	projectile_type = /obj/item/projectile/beam/immolator
+	fire_sound = 'sound/weapons/laser3.ogg'
+	e_cost = 1250
+
+/obj/item/ammo_casing/energy/electrode
+	projectile_type = /obj/item/projectile/energy/electrode
+	select_name = "stun"
+	fire_sound = 'sound/weapons/taser.ogg'
+	e_cost = 2000
+	delay = 15
+
+/obj/item/ammo_casing/energy/electrode/gun
+	fire_sound = 'sound/weapons/gunshot.ogg'
+	e_cost = 1000
+
+/obj/item/ammo_casing/energy/electrode/hos //allows balancing of HoS and blueshit guns seperately from other energy weapons
+
+/obj/item/ammo_casing/energy/ion
+	projectile_type = /obj/item/projectile/ion
+	select_name = "ion"
+	fire_sound = 'sound/weapons/IonRifle.ogg'
+
+/obj/item/ammo_casing/energy/declone
+	projectile_type = /obj/item/projectile/energy/declone
+	select_name = "declone"
+	fire_sound = 'sound/weapons/pulse3.ogg'
+
+/obj/item/ammo_casing/energy/mindflayer
+	projectile_type = /obj/item/projectile/beam/mindflayer
+	select_name = "MINDFUCK"
+	fire_sound = 'sound/weapons/Laser.ogg'
+
+/obj/item/ammo_casing/energy/flora
+	fire_sound = 'sound/effects/stealthoff.ogg'
+
+/obj/item/ammo_casing/energy/flora/yield
+	projectile_type = /obj/item/projectile/energy/florayield
+	select_name = "yield"
+
+/obj/item/ammo_casing/energy/flora/mut
+	projectile_type = /obj/item/projectile/energy/floramut
+	select_name = "mutation"
+
+/obj/item/ammo_casing/energy/temp
+	projectile_type = /obj/item/projectile/temp
+	var/temperature = 300
+	e_cost = 100
+	fire_sound = 'sound/weapons/pulse3.ogg'
+
+/obj/item/ammo_casing/energy/temp/newshot()
+	..()
+	var/obj/item/projectile/temp/T = BB
+	T.temperature = temperature
+
+/obj/item/ammo_casing/energy/meteor
+	projectile_type = /obj/item/projectile/meteor
+	select_name = "goddamn meteor"
+
+/obj/item/ammo_casing/energy/kinetic
+	projectile_type = /obj/item/projectile/kinetic
+	select_name = "kinetic"
+	e_cost = 5000
+	fire_sound = 'sound/weapons/Kenetic_accel.ogg' // fine spelling there chap
+
+/obj/item/ammo_casing/energy/kinetic/super
+	projectile_type = /obj/item/projectile/kinetic/super
+
+/obj/item/ammo_casing/energy/kinetic/hyper
+	projectile_type = /obj/item/projectile/kinetic/hyper
+
+/obj/item/ammo_casing/energy/disabler
+	projectile_type = /obj/item/projectile/beam/disabler
+	select_name  = "disable"
+	e_cost = 500
+	fire_sound = "sound/weapons/taser2.ogg"
+
+/obj/item/ammo_casing/energy/plasma
+	projectile_type = /obj/item/projectile/plasma
+	select_name = "plasma burst"
+	fire_sound = 'sound/weapons/plasma_cutter.ogg'
+	delay = 15
+	e_cost = 250
+
+/obj/item/ammo_casing/energy/plasma/adv
+	projectile_type = /obj/item/projectile/plasma/adv
+	delay = 10
+	e_cost = 100
+
+/obj/item/ammo_casing/energy/wormhole
+	projectile_type = /obj/item/projectile/beam/wormhole
+	e_cost = 0
+	fire_sound = "sound/weapons/pulse3.ogg"
+	var/obj/item/weapon/gun/energy/wormhole_projector/gun = null
+	select_name = "blue"
+
+/obj/item/ammo_casing/energy/wormhole/New(var/obj/item/weapon/gun/energy/wormhole_projector/wh)
+	gun = wh
+
+/obj/item/ammo_casing/energy/wormhole/orange
+	projectile_type = /obj/item/projectile/beam/wormhole/orange
+	select_name = "orange"
+
+/obj/item/ammo_casing/energy/bolt
+	projectile_type = /obj/item/projectile/energy/bolt
+	select_name = "bolt"
+	e_cost = 5000
+	fire_sound = 'sound/weapons/Genhit.ogg'
+
+/obj/item/ammo_casing/energy/bolt/large
+	projectile_type = /obj/item/projectile/energy/bolt/large
+	select_name = "heavy bolt"
+
+/obj/item/ammo_casing/energy/dart
+	projectile_type = /obj/item/projectile/energy/dart
+	fire_sound = 'sound/weapons/Genhit.ogg'
+	e_cost = 5000
+	select_name = "toxic dart"
+
+/obj/item/ammo_casing/energy/instakill
+	projectile_type = /obj/item/projectile/beam/instakill
+	e_cost = 0
+	select_name = "DESTROY"
+
+/obj/item/ammo_casing/energy/instakill/blue
+	projectile_type = /obj/item/projectile/beam/instakill/blue
+
+/obj/item/ammo_casing/energy/instakill/red
+	projectile_type = /obj/item/projectile/beam/instakill/red
+
+/obj/item/ammo_casing/energy/plasma
+	projectile_type = /obj/item/projectile/plasma
+	select_name = "plasma burst"
+	fire_sound = 'sound/weapons/pulse.ogg'
+
+/obj/item/ammo_casing/energy/plasma/adv
+	projectile_type = /obj/item/projectile/plasma/adv
+
+/obj/item/ammo_casing/energy/shock_revolver
+	fire_sound = 'sound/magic/lightningbolt.ogg'
+	e_cost = 2000
+	select_name = "lightning beam"
+	projectile_type = /obj/item/projectile/energy/shock_revolver
+
+/obj/item/ammo_casing/energy/toxplasma
+	projectile_type = /obj/item/projectile/energy/toxplasma
+	fire_sound = "sound/weapons/taser2.ogg"
+	select_name = "plasma dart"
+
+/obj/item/ammo_casing/energy/clown
+	projectile_type = /obj/item/projectile/clown
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	select_name = "clown"
+
+/obj/item/ammo_casing/energy/sniper
+	projectile_type = /obj/item/projectile/beam/sniper
+	fire_sound = 'sound/weapons/marauder.ogg'
+	delay = 50
+	select_name = "snipe"
+
+/obj/item/ammo_casing/energy/teleport
+	projectile_type = /obj/item/projectile/energy/teleport
+	fire_sound = 'sound/weapons/wave.ogg'
+	e_cost = 1250
+	select_name = "teleport beam"
+	var/teleport_target
+
+/obj/item/ammo_casing/energy/teleport/newshot()
+	..()
+	var/obj/item/projectile/energy/teleport/T = BB
+	T.teleport_target = teleport_target
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 32c3eeaa37c..c77dcc07595 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -1,113 +1,169 @@
 ////////////////INTERNAL MAGAZINES//////////////////////
+/obj/item/ammo_box/magazine/internal
+	desc = "Oh god, this shouldn't be here"
+
+//internals magazines are accessible, so replace spent ammo if full when trying to put a live one in
+/obj/item/ammo_box/magazine/internal/give_round(obj/item/ammo_casing/R)
+	return ..(R,1)
+
+// Revolver internal mags
 /obj/item/ammo_box/magazine/internal/cylinder
 	name = "revolver cylinder"
-	desc = "Oh god, this shouldn't be here"
-	ammo_type = "/obj/item/ammo_casing/a357"
+	ammo_type = /obj/item/ammo_casing/a357
 	caliber = "357"
 	max_ammo = 7
 
 
-/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(var/countempties = 1)
-	if (!countempties)
-		var/boolets = 0
-		for (var/i = 1, i <= stored_ammo.len, i++)
-			var/obj/item/ammo_casing/bullet = stored_ammo[i]
-			if (bullet.BB)
-				boolets++
-		return boolets
-	else
-		return stored_ammo.len
+/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = 1)
+	var/boolets = 0
+	for(var/obj/item/ammo_casing/bullet in stored_ammo)
+		if(bullet && (bullet.BB || countempties))
+			boolets++
+	return boolets
 
-/obj/item/ammo_box/magazine/internal/cylinder/rus357
-	name = "russian revolver cylinder"
-	desc = "Oh god, this shouldn't be here"
-	ammo_type = "/obj/item/ammo_casing/a357"
-	caliber = "357"
-	max_ammo = 6
-	multiload = 0
+/obj/item/ammo_box/magazine/internal/cylinder/get_round(keep = 0)
+	rotate()
 
-/obj/item/ammo_box/magazine/internal/cylinder/rus357/New()
-	stored_ammo += new ammo_type(src)
+	var/b = stored_ammo[1]
+	if(!keep)
+		stored_ammo[1] = null
+
+	return b
+
+/obj/item/ammo_box/magazine/internal/cylinder/proc/rotate()
+	var/b = stored_ammo[1]
+	stored_ammo.Cut(1,2)
+	stored_ammo.Insert(0, b)
+
+/obj/item/ammo_box/magazine/internal/cylinder/proc/spin()
+	for(var/i in 1 to rand(0, max_ammo*2))
+		rotate()
+
+/obj/item/ammo_box/magazine/internal/cylinder/give_round(obj/item/ammo_casing/R, replace_spent = 0)
+	if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type))
+		return 0
+
+	for(var/i in 1 to stored_ammo.len)
+		var/obj/item/ammo_casing/bullet = stored_ammo[i]
+		if(!bullet || !bullet.BB) // found a spent ammo
+			stored_ammo[i] = R
+			R.loc = src
+
+			if(bullet)
+				bullet.loc = get_turf(loc)
+			return 1
+
+	return 0
 
 /obj/item/ammo_box/magazine/internal/cylinder/rev38
-	name = "d-tiv revolver cylinder"
-	desc = "Oh god, this shouldn't be here"
-	ammo_type = "/obj/item/ammo_casing/c38"
+	name = "detective revolver cylinder"
+	ammo_type = /obj/item/ammo_casing/c38
 	caliber = "38"
 	max_ammo = 6
 
+/obj/item/ammo_box/magazine/internal/cylinder/rev762
+	name = "nagant revolver cylinder"
+	ammo_type = /obj/item/ammo_casing/n762
+	caliber = "n762"
+	max_ammo = 7
+
 /obj/item/ammo_box/magazine/internal/cylinder/cap
 	name = "cap gun revolver cylinder"
 	desc = "Oh god, this shouldn't be here"
-	ammo_type = "/obj/item/ammo_casing/cap"
+	ammo_type = /obj/item/ammo_casing/cap
 	caliber = "cap"
 	max_ammo = 7
 
+// Shotgun internal mags
 /obj/item/ammo_box/magazine/internal/shot
 	name = "shotgun internal magazine"
-	desc = "Oh god, this shouldn't be here"
-	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
+	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	caliber = "shotgun"
 	max_ammo = 4
 	multiload = 0
 
-/obj/item/ammo_box/magazine/internal/shotcom
+/obj/item/ammo_box/magazine/internal/shot/ammo_count(countempties = 1)
+	if (!countempties)
+		var/boolets = 0
+		for(var/obj/item/ammo_casing/bullet in stored_ammo)
+			if(bullet.BB)
+				boolets++
+		return boolets
+	else
+		return ..()
+
+/obj/item/ammo_box/magazine/internal/shot/tube
+	name = "dual feed shotgun internal tube"
+	ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+	max_ammo = 4
+
+/obj/item/ammo_box/magazine/internal/shot/lethal
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
+/obj/item/ammo_box/magazine/internal/shot/com
 	name = "combat shotgun internal magazine"
-	desc = "Oh god, this shouldn't be here"
-	ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
-	caliber = "shotgun"
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
 	max_ammo = 6
-	multiload = 0
 
-/obj/item/ammo_box/magazine/internal/cylinder/dualshot
+/obj/item/ammo_box/magazine/internal/shot/dual
 	name = "double-barrel shotgun internal magazine"
-	desc = "This doesn't even exist"
-	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
-	caliber = "shotgun"
 	max_ammo = 2
-	multiload = 0
 
-/obj/item/ammo_box/magazine/internal/cylinder/improvised
+/obj/item/ammo_box/magazine/internal/shot/improvised
 	name = "improvised shotgun internal magazine"
-	desc = "This doesn't even exist"
-	ammo_type = "/obj/item/ammo_casing/shotgun/improvised"
-	caliber = "shotgun"
+	ammo_type = /obj/item/ammo_casing/shotgun/improvised
 	max_ammo = 1
-	multiload = 0
 
-/obj/item/ammo_box/magazine/internal/shotriot
+/obj/item/ammo_box/magazine/internal/shot/riot
 	name = "riot shotgun internal magazine"
-	desc = "Oh god, this shouldn't be here"
-	ammo_type = "/obj/item/ammo_casing/shotgun/rubbershot"
-	caliber = "shotgun"
+	ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
 	max_ammo = 6
-	multiload = 0
 
-/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher
+/obj/item/ammo_box/magazine/internal/grenadelauncher
 	name = "grenade launcher internal magazine"
-	ammo_type = "/obj/item/ammo_casing/a40mm"
+	ammo_type = /obj/item/ammo_casing/a40mm
 	caliber = "40mm"
 	max_ammo = 1
 
 /obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi
-	ammo_type = "/obj/item/ammo_casing/a40mm"
+	ammo_type = /obj/item/ammo_casing/a40mm
 	max_ammo = 6
 
+/obj/item/ammo_box/magazine/internal/speargun
+	name = "speargun internal magazine"
+	ammo_type = /obj/item/ammo_casing/caseless/magspear
+	caliber = "speargun"
+	max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/rus357
+	name = "russian revolver cylinder"
+	ammo_type = /obj/item/ammo_casing/a357
+	caliber = "357"
+	max_ammo = 6
+	multiload = 0
+
+/obj/item/ammo_box/magazine/internal/rus357/New()
+	stored_ammo += new ammo_type(src)
+
 /obj/item/ammo_box/magazine/internal/boltaction
 	name = "bolt action rifle internal magazine"
 	desc = "Oh god, this shouldn't be here"
-	ammo_type = "/obj/item/ammo_casing/a762"
+	ammo_type = /obj/item/ammo_casing/a762
 	caliber = "a762"
 	max_ammo = 5
 	multiload = 1
 
+/obj/item/ammo_box/magazine/internal/boltaction/enchanted
+	max_ammo =1
+	ammo_type = /obj/item/ammo_casing/a762/enchanted
+
 /obj/item/ammo_box/magazine/internal/shot/toy
-	ammo_type = "/obj/item/ammo_casing/caseless/foam_dart"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	caliber = "foam_force"
 	max_ammo = 4
 
 /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
- 	max_ammo = 5
+	max_ammo = 5
 
 /obj/item/ammo_box/magazine/internal/shot/toy/tommygun
  	max_ammo = 10
@@ -116,17 +172,18 @@
 
 /obj/item/ammo_box/magazine/m10mm
 	name = "pistol magazine (10mm)"
+	desc = "A gun magazine."
 	icon_state = "9x19p"
 	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/c10mm"
+	ammo_type = /obj/item/ammo_casing/c10mm
 	caliber = "10mm"
 	max_ammo = 8
 	multiple_sprites = 2
 
 /obj/item/ammo_box/magazine/m45
 	name = "handgun magazine (.45)"
-	icon_state = "45"
-	ammo_type = "/obj/item/ammo_casing/c45"
+	icon_state = "45-8"
+	ammo_type = /obj/item/ammo_casing/c45
 	caliber = ".45"
 	max_ammo = 8
 
@@ -137,7 +194,7 @@
 /obj/item/ammo_box/magazine/wt550m9
 	name = "wt550 magazine (4.6x30mm)"
 	icon_state = "46x30mmt-20"
-	ammo_type = "/obj/item/ammo_casing/c46x30mm"
+	ammo_type = /obj/item/ammo_casing/c46x30mm
 	caliber = "4.6x30mm"
 	max_ammo = 20
 
@@ -147,20 +204,20 @@
 
 /obj/item/ammo_box/magazine/wt550m9/wtap
 	name = "wt550 magazine (Armour Piercing 4.6x30mm)"
-	ammo_type = "/obj/item/ammo_casing/c46x30mmap"
+	ammo_type = /obj/item/ammo_casing/c46x30mmap
 
 /obj/item/ammo_box/magazine/wt550m9/wttx
 	name = "wt550 magazine (Toxin Tipped 4.6x30mm)"
-	ammo_type = "/obj/item/ammo_casing/c46x30mmtox"
+	ammo_type = /obj/item/ammo_casing/c46x30mmtox
 
 /obj/item/ammo_box/magazine/wt550m9/wtic
 	name = "wt550 magazine (Incindiary 4.6x30mm)"
-	ammo_type = "/obj/item/ammo_casing/c46x30mminc"
+	ammo_type = /obj/item/ammo_casing/c46x30mminc
 
 /obj/item/ammo_box/magazine/uzim9mm
 	name = "uzi magazine (9mm)"
 	icon_state = "uzi9mm-32"
-	ammo_type = "/obj/item/ammo_casing/c9mm"
+	ammo_type = /obj/item/ammo_casing/c9mm
 	caliber = "9mm"
 	max_ammo = 32
 
@@ -171,35 +228,46 @@
 /obj/item/ammo_box/magazine/smgm9mm
 	name = "SMG magazine (9mm)"
 	icon_state = "smg9mm"
-	ammo_type = "/obj/item/ammo_casing/c9mm"
+	ammo_type = /obj/item/ammo_casing/c9mm
 	caliber = "9mm"
-	max_ammo = 30
+	max_ammo = 21
 	materials = list(MAT_METAL = 2000)
 
 /obj/item/ammo_box/magazine/smgm9mm/ap
 	name = "SMG magazine (Armour Piercing 9mm)"
-	ammo_type = "/obj/item/ammo_casing/c9mmap"
+	ammo_type = /obj/item/ammo_casing/c9mmap
 	materials = list(MAT_METAL = 3000)
 
 /obj/item/ammo_box/magazine/smgm9mm/toxin
 	name = "SMG magazine (Toxin Tipped 9mm)"
-	ammo_type = "/obj/item/ammo_casing/c9mmtox"
+	ammo_type = /obj/item/ammo_casing/c9mmtox
 	materials = list(MAT_METAL = 3000)
 
 /obj/item/ammo_box/magazine/smgm9mm/fire
 	name = "SMG Magazine (Incendiary 9mm)"
-	ammo_type = "/obj/item/ammo_casing/c9mminc"
+	ammo_type = /obj/item/ammo_casing/c9mminc
 	materials = list(MAT_METAL = 3000)
 
 /obj/item/ammo_box/magazine/smgm9mm/update_icon()
 	..()
 	icon_state = "[initial(icon_state)]-[round(ammo_count(),6)]"
 
+/obj/item/ammo_box/magazine/pistolm9mm
+	name = "pistol magazine (9mm)"
+	icon_state = "9x19p-8"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	caliber = "9mm"
+	max_ammo = 15
+
+/obj/item/ammo_box/magazine/pistolm9mm/update_icon()
+	..()
+	icon_state = "9x19p-[ammo_count() ? "8" : "0"]"
+
 /obj/item/ammo_box/magazine/smgm45
 	name = "SMG magazine (.45)"
 	icon_state = "c20r45"
 	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/c45"
+	ammo_type = /obj/item/ammo_casing/c45
 	caliber = ".45"
 	max_ammo = 20
 
@@ -210,7 +278,7 @@
 /obj/item/ammo_box/magazine/tommygunm45
 	name = "drum magazine (.45)"
 	icon_state = "drum45"
-	ammo_type = "/obj/item/ammo_casing/c45"
+	ammo_type = /obj/item/ammo_casing/c45
 	caliber = ".45"
 	max_ammo = 50
 
@@ -218,7 +286,7 @@
 	name = "handgun magazine (.50ae)"
 	icon_state = "50ae"
 	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/a50"
+	ammo_type = /obj/item/ammo_casing/a50
 	caliber = ".50"
 	max_ammo = 7
 	multiple_sprites = 1
@@ -226,7 +294,7 @@
 /obj/item/ammo_box/magazine/m75
 	name = "specialized magazine (.75)"
 	icon_state = "75"
-	ammo_type = "/obj/item/ammo_casing/caseless/a75"
+	ammo_type = /obj/item/ammo_casing/caseless/a75
 	caliber = "75"
 	multiple_sprites = 2
 	max_ammo = 8
@@ -235,50 +303,16 @@
 	name = "toploader magazine (5.56mm)"
 	icon_state = "5.56m"
 	origin_tech = "combat=5;syndicate=1"
-	ammo_type = "/obj/item/ammo_casing/a556"
+	ammo_type = /obj/item/ammo_casing/a556
 	caliber = "a556"
 	max_ammo = 30
 	multiple_sprites = 2
 
-/obj/item/ammo_box/magazine/m762
-	name = "box magazine (7.62mm)"
-	icon_state = "a762"
-	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/a762"
-	caliber = "a762"
-	max_ammo = 50
-
-/obj/item/ammo_box/magazine/m762/update_icon()
-	..()
-	icon_state = "[initial(icon_state)]-[round(ammo_count(),10)]"
-
-/obj/item/ammo_box/magazine/m762/buckshot
-	name = "box magazine (buckshot)"
-	icon_state = "b762"
-	caliber = "shotgun"
-	ammo_type ="/obj/item/ammo_casing/shotgun/buckshot"
-	max_ammo = 300 // Bluespace!
-
-/obj/item/ammo_box/magazine/m762/buckshot/update_icon()
-	..()
-	icon_state = "[initial(icon_state)]-[round(ammo_count(),60)]"
-
-/obj/item/ammo_box/magazine/m762/he // I am not a good person.
-	name = "box magazine (40mm high explosive)"
-	icon_state = "g762"
-	caliber = "40mm"
-	ammo_type ="/obj/item/ammo_casing/a40mm"
-	max_ammo = 25
-
-/obj/item/ammo_box/magazine/m762/he/update_icon()
-	..()
-	icon_state = "[initial(icon_state)]-[round(ammo_count(),5)]"
-
-
 /obj/item/ammo_box/magazine/m12g
 	name = "shotgun magazine (12g slugs)"
+	desc = "A drum magazine."
 	icon_state = "m12gb"
-	ammo_type = "/obj/item/ammo_casing/shotgun"
+	ammo_type = /obj/item/ammo_casing/shotgun
 	origin_tech = "combat=3;syndicate=1"
 	caliber = "shotgun"
 	max_ammo = 8
@@ -290,36 +324,45 @@
 /obj/item/ammo_box/magazine/m12g/buckshot
 	name = "shotgun magazine (12g buckshot slugs)"
 	icon_state = "m12gb"
-	ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
 
 /obj/item/ammo_box/magazine/m12g/stun
 	name = "shotgun magazine (12g taser slugs)"
 	icon_state = "m12gs"
-	ammo_type = "/obj/item/ammo_casing/shotgun/stunslug"
+	ammo_type = /obj/item/ammo_casing/shotgun/stunslug
 
 
 /obj/item/ammo_box/magazine/m12g/dragon
 	name = "shotgun magazine (12g dragon's breath)"
 	icon_state = "m12gf"
-	ammo_type = "/obj/item/ammo_casing/shotgun/incendiary/dragonsbreath"
+	ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
+
+/obj/item/ammo_box/magazine/m12g/bioterror
+	name = "shotgun magazine (12g bioterror)"
+	icon_state = "m12gt"
+	ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
+
+/obj/item/ammo_box/magazine/m12g/breach
+	name = "shotgun magazine (12g breacher slugs)"
+	icon_state = "m12gbc"
+	ammo_type = /obj/item/ammo_casing/shotgun/breaching
 
-//FOAM DARTS
 /obj/item/ammo_box/magazine/toy
 	name = "foam force META magazine"
-	ammo_type = "/obj/item/ammo_casing/caseless/foam_dart"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	caliber = "foam_force"
 
 /obj/item/ammo_box/magazine/toy/smg
 	name = "foam force SMG magazine"
 	icon_state = "smg9mm-30"
-	max_ammo = 30
+	max_ammo = 20
 
 /obj/item/ammo_box/magazine/toy/smg/update_icon()
 	..()
-	icon_state = "smg9mm-[round(ammo_count(),6)]"
+	icon_state = "smg9mm-[round(ammo_count(),5)]"
 
 /obj/item/ammo_box/magazine/toy/smg/riot
-	ammo_type = "/obj/item/ammo_casing/caseless/foam_dart/riot"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
 
 /obj/item/ammo_box/magazine/toy/pistol
 	name = "foam force pistol magazine"
@@ -328,11 +371,11 @@
 	multiple_sprites = 2
 
 /obj/item/ammo_box/magazine/toy/pistol/riot
-	ammo_type = "/obj/item/ammo_casing/caseless/foam_dart/riot"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
 
 /obj/item/ammo_box/magazine/toy/smgm45
 	name = "donksoft SMG magazine"
-	ammo_type = "/obj/item/ammo_casing/caseless/foam_dart/riot"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
 	max_ammo = 20
 
 /obj/item/ammo_box/magazine/toy/smgm45/update_icon()
@@ -341,7 +384,7 @@
 
 /obj/item/ammo_box/magazine/toy/m762
 	name = "donksoft box magazine"
-	ammo_type = "/obj/item/ammo_casing/caseless/foam_dart/riot"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
 	max_ammo = 50
 
 /obj/item/ammo_box/magazine/toy/m762/update_icon()
diff --git a/code/modules/projectiles/ammunition/special.dm b/code/modules/projectiles/ammunition/special.dm
new file mode 100644
index 00000000000..d17d65e9fc8
--- /dev/null
+++ b/code/modules/projectiles/ammunition/special.dm
@@ -0,0 +1,49 @@
+/obj/item/ammo_casing/magic
+	name = "magic casing"
+	desc = "I didn't even know magic needed ammo..."
+	projectile_type = /obj/item/projectile/magic
+
+/obj/item/ammo_casing/magic/change
+	projectile_type = /obj/item/projectile/magic/change
+
+/obj/item/ammo_casing/magic/animate
+	projectile_type = /obj/item/projectile/magic/animate
+
+/obj/item/ammo_casing/magic/heal
+	projectile_type = /obj/item/projectile/magic/resurrection
+
+/obj/item/ammo_casing/magic/death
+	projectile_type = /obj/item/projectile/magic/death
+
+/obj/item/ammo_casing/magic/teleport
+	projectile_type = /obj/item/projectile/magic/teleport
+
+/obj/item/ammo_casing/magic/door
+	projectile_type = /obj/item/projectile/magic/door
+
+/obj/item/ammo_casing/magic/fireball
+	projectile_type = /obj/item/projectile/magic/fireball
+
+/obj/item/ammo_casing/magic/chaos
+	projectile_type = /obj/item/projectile/magic
+
+/obj/item/ammo_casing/magic/chaos/newshot()
+	projectile_type = pick(typesof(/obj/item/projectile/magic))
+	..()
+
+/obj/item/ammo_casing/magic/honk
+	projectile_type = /obj/item/projectile/bullet/honker
+
+/obj/item/ammo_casing/forcebolt
+	projectile_type = /obj/item/projectile/forcebolt
+
+/obj/item/ammo_casing/syringegun
+	name = "syringe gun spring"
+	desc = "A high-power spring that throws syringes."
+	projectile_type = null
+
+/obj/item/ammo_casing/energy/c3dbullet
+	projectile_type = /obj/item/projectile/bullet/midbullet3
+	select_name = "spraydown"
+	fire_sound = 'sound/weapons/gunshot_smg.ogg'
+	e_cost = 200
diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
new file mode 100644
index 00000000000..2a75004f223
--- /dev/null
+++ b/code/modules/projectiles/firing.dm
@@ -0,0 +1,95 @@
+/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--)
+		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...
+			if(randomspread)
+				spread = round((rand() - 0.5) * distro)
+			else //Smart spread
+				spread = round((i / pellets - 0.5) * distro)
+		if(!throw_proj(target, targloc, user, params, spread))
+			return 0
+		if(i > 1)
+			newshot()
+	if(click_cooldown_override)
+		user.changeNext_move(click_cooldown_override)
+	else
+		user.changeNext_move(CLICK_CD_RANGE)
+	user.newtonian_move(get_dir(target, user))
+	update_icon()
+	return 1
+
+/obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
+	if (!BB)
+		return
+	BB.original = target
+	BB.firer = user
+	if (zone_override)
+		BB.def_zone = zone_override
+	else
+		BB.def_zone = user.zone_sel.selecting
+	BB.suppressed = quiet
+
+	if(reagents && BB.reagents)
+		reagents.trans_to(BB, reagents.total_volume) //For chemical darts/bullets
+		qdel(reagents)
+
+/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)
+		return 0
+	BB.ammo_casing = src
+	if(targloc == curloc)
+		if(target) //if the target is right on our location we go straight to bullet_act()
+			target.bullet_act(BB, BB.def_zone)
+		qdel(BB)
+		BB = null
+		return 1
+
+	BB.preparePixelProjectile(target, targloc, user, params, spread)
+	if(BB)
+		BB.fire()
+	BB = null
+	return 1
+
+/obj/item/ammo_casing/proc/spread(turf/target, turf/current, distro)
+	var/dx = abs(target.x - current.x)
+	var/dy = abs(target.y - current.y)
+	return locate(target.x + round(gaussian(0, distro) * (dy+2)/8, 1), target.y + round(gaussian(0, distro) * (dx+2)/8, 1), target.z)
+
+/obj/item/projectile/proc/preparePixelProjectile(atom/target, var/turf/targloc, mob/living/user, params, spread)
+	var/turf/curloc = get_turf(user)
+	loc = get_turf(user)
+	starting = get_turf(user)
+	current = curloc
+	yo = targloc.y - curloc.y
+	xo = targloc.x - curloc.x
+
+	if(params)
+		var/list/mouse_control = params2list(params)
+		if(mouse_control["icon-x"])
+			p_x = text2num(mouse_control["icon-x"])
+		if(mouse_control["icon-y"])
+			p_y = text2num(mouse_control["icon-y"])
+		if(mouse_control["screen-loc"])
+			//Split screen-loc up into X+Pixel_X and Y+Pixel_Y
+			var/list/screen_loc_params = splittext(mouse_control["screen-loc"], ",")
+
+			//Split X+Pixel_X up into list(X, Pixel_X)
+			var/list/screen_loc_X = splittext(screen_loc_params[1],":")
+
+			//Split Y+Pixel_Y up into list(Y, Pixel_Y)
+			var/list/screen_loc_Y = splittext(screen_loc_params[2],":")
+			var/x = text2num(screen_loc_X[1]) * world.icon_size + text2num(screen_loc_X[2]) - world.icon_size + (user.client ? user.client.pixel_x : 0)
+			var/y = text2num(screen_loc_Y[1]) * world.icon_size + text2num(screen_loc_Y[2]) - world.icon_size + (user.client ? user.client.pixel_y : 0)
+
+			//Calculate the "resolution" of screen based on client's view and world's icon size. This will work if the user can view more tiles than average.
+			var/screenview = (user.client.view * 2 + 1) * world.icon_size //Refer to http://www.byond.com/docs/ref/info.html#/client/var/view for mad maths
+
+			var/ox = round(screenview/2) //"origin" x
+			var/oy = round(screenview/2) //"origin" y
+			var/angle = Atan2(y - oy, x - ox)
+			Angle = angle
+	if(spread)
+		Angle += spread
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index cb4f21d2497..f86bfff5abb 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1,54 +1,59 @@
- #define SAWN_INTACT  0
- #define SAWN_OFF     1
- #define SAWN_SAWING -1
-
 /obj/item/weapon/gun
 	name = "gun"
-	desc = "Its a gun. It's pretty terrible, though."
-	icon = 'icons/obj/gun.dmi'
+	desc = "It's a gun. It's pretty terrible, though."
+	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "detective"
 	item_state = "gun"
-	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
 	flags =  CONDUCT
 	slot_flags = SLOT_BELT
 	materials = list(MAT_METAL=2000)
-	w_class = 3.0
+	w_class = 3
 	throwforce = 5
-	throw_speed = 4
+	throw_speed = 3
 	throw_range = 5
-	force = 5.0
+	force = 5
 	origin_tech = "combat=1"
 	needs_permit = 1
 	attack_verb = list("struck", "hit", "bashed")
 
-	var/fire_sound = 'sound/weapons/Gunshot.ogg'
-	var/obj/item/projectile/in_chamber = null
-	var/silenced = 0
-	var/ghettomodded = 0
-	var/recoil = 0
+	var/fire_sound = "gunshot"
+	var/fire_sound_text = "gunshot" //the fire sound that shows in chat messages: laser blast, gunshot, etc.
+	var/suppressed = 0					//whether or not a message is displayed when fired
 	var/can_suppress = 0
 	var/can_unsuppress = 1
+	var/recoil = 0						//boom boom shake the room
 	var/clumsy_check = 1
-	var/sawn_desc = null
+	var/obj/item/ammo_casing/chambered = null
+	var/trigger_guard = TRIGGER_GUARD_NORMAL	//trigger guard on the weapon, hulks can't fire them with their big meaty fingers
+	var/sawn_desc = null				//description change if weapon is sawn-off
 	var/sawn_state = SAWN_INTACT
-	var/obj/item/ammo_casing/chambered = null // The round (not bullet) that is in the chamber. THIS MISPLACED ITEM BROUGHT TO YOU BY HACKY BUCKSHOT.
-	var/tmp/list/mob/living/target //List of who yer targeting.
-	var/tmp/lock_time = -100
-	var/tmp/mouthshoot = 0 ///To stop people from suiciding twice... >.>
-	var/automatic = 0 //Used to determine if you can target multiple people.
-	var/tmp/mob/living/last_moved_mob //Used to fire faster at more than one person.
-	var/tmp/told_cant_shoot = 0 //So that it doesn't spam them with the fact they cannot hit them.
-	var/firerate = 1     // 0 for one bullet after tarrget moves and aim is lowered,
-						//1 for keep shooting until aim is lowered
-	var/fire_delay = 0
-	var/last_fired = 0
+	var/burst_size = 1					//how large a burst is
+	var/fire_delay = 0					//rate of fire for burst firing and semi auto
+	var/firing_burst = 0				//Prevent the weapon from firing again while already firing
+	var/semicd = 0						//cooldown handler
+	var/weapon_weight = WEAPON_LIGHT
+	var/list/restricted_species
+
+	var/spread = 0
+	var/randomspread = 1
+
+	var/unique_rename = 0 //allows renaming with a pen
+	var/unique_reskin = 0 //allows one-time reskinning
+	var/current_skin = null //the skin choice if we had a reskin
+	var/list/options = list()
+
+	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
+
 	var/obj/item/device/flashlight/F = null
 	var/can_flashlight = 0
-	var/heavy_weapon = 0
-	var/randomspread = 0
 
-	var/burst_size = 1
+	var/list/upgrades = list()
+
+	var/ammo_x_offset = 0 //used for positioning ammo count overlay on sprite
+	var/ammo_y_offset = 0
+	var/flight_x_offset = 0
+	var/flight_y_offset = 0
 
 	//Zooming
 	var/zoomable = FALSE //whether the gun generates a Zoom action on creation
@@ -56,312 +61,200 @@
 	var/zoom_amt = 3 //Distance in TURFs to move the user's screen forward (the "zoom" effect)
 	var/datum/action/toggle_scope_zoom/azoom
 
-	proc/ready_to_fire()
-		if(world.time >= last_fired + fire_delay)
-			last_fired = world.time
-			return 1
-		else
-			return 0
-
-	proc/process_chambered()
-		return 0
-
-
-	proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver.
-		if(!M.IsAdvancedToolUser())
-			return 0
-		return 1
-
-
-	proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
-		to_chat(user, "<span class='warning'>*click*</span>")
-		playsound(user, 'sound/weapons/emptyclick.ogg', 40, 1)
-		return
-
-	emp_act(severity)
-		for(var/obj/O in contents)
-			O.emp_act(severity)
-
-	proc/prepare_shot(var/obj/item/projectile/proj) //Transfer properties from the gun to the bullet
-		proj.shot_from = src
-		proj.silenced = silenced
-		return
-
 /obj/item/weapon/gun/New()
+	..()
+	if(F)
+		verbs += /obj/item/weapon/gun/proc/toggle_gunlight
 	build_zooming()
+
+/obj/item/weapon/gun/examine(mob/user)
 	..()
+	if(unique_reskin && !current_skin)
+		to_chat(user, "<span class='notice'>Alt-click it to reskin it.</span>")
+	if(unique_rename)
+		to_chat(user, "<span class='notice'>Use a pen on it to rename it.</span>")
 
-/obj/item/weapon/gun/pickup(mob/user)
+/obj/item/weapon/gun/proc/process_chamber()
+	return 0
 
-	if(azoom)
-		azoom.Grant(user)
-	..()
-
-/obj/item/weapon/gun/dropped(mob/user)
-
-	zoom(user,FALSE)
-	if(azoom)
-		azoom.Remove(user)
-	..()
-
-/obj/item/weapon/gun/afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)
-	if(flag)    return //we're placing gun on a table or in backpack
-	if(istype(target, /obj/machinery/recharger) && istype(src, /obj/item/weapon/gun/energy))    return//Shouldnt flag take care of this?
-	Fire(A,user,params) //Otherwise, fire normally.
-
-/obj/item/weapon/gun/proc/isHandgun()
+//check if there's enough ammo/energy/whatever to shoot one time
+//i.e if clicking would make it shoot
+/obj/item/weapon/gun/proc/can_shoot()
 	return 1
 
-/obj/item/weapon/gun/proc/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)//TODO: go over this
+/obj/item/weapon/gun/proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
+	to_chat(user, "<span class='danger'>*click*</span>")
+	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+
+/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
+	if(recoil)
+		shake_camera(user, recoil + 1, recoil)
+
+	if(suppressed)
+		playsound(user, fire_sound, 10, 1)
+	else
+		playsound(user, fire_sound, 50, 1)
+		if(!message)
+			return
+		if(pointblank)
+			user.visible_message("<span class='danger'>[user] fires [src] point blank at [pbtarget]!</span>", "<span class='danger'>You fire [src] point blank at [pbtarget]!</span>", "<span class='italics'>You hear \a [fire_sound_text]!</span>")
+		else
+			user.visible_message("<span class='danger'>[user] fires [src]!</span>", "<span class='danger'>You fire [src]!</span>", "You hear \a [fire_sound_text]!")
+
+	if(weapon_weight >= WEAPON_MEDIUM)
+		if(user.get_inactive_hand())
+			if(prob(15))
+				if(user.drop_item())
+					user.visible_message("<span class='danger'>[src] flies out of [user]'s hands!</span>", "<span class='userdanger'>[src] kicks out of your grip!</span>")
+
+/obj/item/weapon/gun/emp_act(severity)
+	for(var/obj/O in contents)
+		O.emp_act(severity)
+
+/obj/item/weapon/gun/afterattack(atom/target, mob/living/user, flag, params)
+	if(firing_burst)
+		return
+	if(flag) //It's adjacent, is the user, or is on the user's person
+		if(target in user.contents) //can't shoot stuff inside us.
+			return
+		if(!ismob(target) || user.a_intent == "harm") //melee attack
+			return
+		if(target == user && user.zone_sel.selecting != "mouth") //so we can't shoot ourselves (unless mouth selected)
+			return
+
+	if(istype(user))//Check if the user can use the gun, if the user isn't alive(turrets) assume it can.
+		var/mob/living/L = user
+		if(!can_trigger_gun(L))
+			return
+
+	if(!can_shoot()) //Just because you can pull the trigger doesn't mean it can't shoot.
+		shoot_with_empty_chamber(user)
+		return
+
+	if(flag)
+		if(user.zone_sel.selecting == "mouth")
+			handle_suicide(user, target, params)
+			return
+
+
 	//Exclude lasertag guns from the CLUMSY check.
 	if(clumsy_check)
-		if(istype(user, /mob/living))
-			var/mob/living/M = user
-			if ((CLUMSY in M.mutations) && prob(50))
-				to_chat(M, "<span class='danger'>[src] blows up in your face.</span>")
-				M.take_organ_damage(0,20)
-				M.drop_item()
-				qdel(src)
+		if(istype(user))
+			if (user.disabilities & CLUMSY && prob(40))
+				to_chat(user, "<span class='userdanger'>You shoot yourself in the foot with \the [src]!</span>")
+				var/shot_leg = pick("l_foot", "r_foot")
+				process_fire(user, user, 0, params, zone_override = shot_leg)
+				user.drop_item()
 				return
 
-	if (!user.IsAdvancedToolUser() || istype(user, /mob/living/simple_animal/diona))
-		to_chat(user, "<span class='danger'>You don't have the dexterity to do this!</span>")
+	if(weapon_weight == WEAPON_HEAVY && user.get_inactive_hand())
+		to_chat(user, "<span class='userdanger'>You need both hands free to fire \the [src]!</span>")
 		return
-	if(istype(user, /mob/living))
-		var/mob/living/M = user
-		if (HULK in M.mutations)
-			to_chat(M, "<span class='danger'>Your meaty finger is much too large for the trigger guard!</span>")
-			return
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(H.species.flags & NOGUNS)
-			to_chat(user, "<span class='warning'>Your fingers don't fit in the trigger guard!</span>")
-			return
-		if(H.martial_art && H.martial_art.name == "The Sleeping Carp") //great dishonor to famiry
-			to_chat(user, "<span class='danger'>Use of ranged weaponry would bring dishonor to the clan.</span>")
-			return
 
+	process_fire(target,user,1,params)
+
+/obj/item/weapon/gun/proc/can_trigger_gun(var/mob/living/user)
+	if(!user.can_use_guns(src))
+		return 0
+	if(restricted_species && restricted_species.len && !(user.get_species() in restricted_species))
+		to_chat(user, "<span class='danger'>[src] is incompatible with your biology!</span>")
+		return 0
+	return 1
+
+obj/item/weapon/gun/proc/newshot()
+	return
+
+/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
 	add_fingerprint(user)
 
-	if(!special_check(user))
+	if(semicd)
 		return
 
-	if (!ready_to_fire())
-		if (world.time % 3) //to prevent spam
-			to_chat(user, "<span class='warning'>[src] is not ready to fire again!")
-		return
-
-	if(heavy_weapon)
+	if(weapon_weight)
 		if(user.get_inactive_hand())
 			recoil = 4 //one-handed kick
 		else
 			recoil = initial(recoil)
 
-	if (istype(in_chamber, /obj/item/projectile/bullet/blank)) // A hacky way of making blank shotgun shells work again. Honk.
-		in_chamber.delete()
-		in_chamber = null
-		return
-
-	user.changeNext_move(CLICK_CD_RANGE)
-
-	var/spread = 0
-	var/turf/targloc = get_turf(target)
-	for(var/f = 1 to burst_size)
-		if(!process_chambered()) //CHECK
-			return click_empty(user)
-
-		if(chambered)
-			for (var/i = max(1, chambered.pellets), i > 0, i--) //Previous way of doing it fucked up math for spreading. This way, even the first projectile is part of the spread code.
-				if(i != max(1, chambered.pellets)) //Have we fired the initial chambered bullet yet?
-					in_chamber = new chambered.projectile_type()
-				ready_projectile(target, user)
-				prepare_shot(in_chamber)
-				if(chambered.deviation)
-					if(randomspread) //Random spread
-						spread = (rand() - 0.5) * chambered.deviation
-					else //Smart spread
-						spread = (i / chambered.pellets - 0.5) * chambered.deviation
-				if(!process_projectile(targloc, user, params, spread))
-					return 0
-		else
-			ready_projectile(target, user)
-			prepare_shot(in_chamber)
-			if(!process_projectile(targloc, user, params, spread))
-				return 0
-
-		if(recoil)
-			spawn()
-				shake_camera(user, recoil + 1, recoil)
-
-		if(silenced)
-			playsound(user, fire_sound, 10, 1)
-		else
-			playsound(user, fire_sound, 50, 1)
-			if(f == 1) // Only print this once
-				user.visible_message("<span class='warning'>[user] fires [src][reflex ? " by reflex":""]!</span>", \
-				"<span class='warning'>You fire [src][reflex ? "by reflex":""]!</span>", \
-				"You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!")
-
-		if(heavy_weapon)
-			if(user.get_inactive_hand())
-				if(prob(15))
-					user.visible_message("<span class='danger'>[src] flies out of [user]'s hands!</span>", "<span class='userdanger'>[src] kicks out of your grip!</span>")
-					user.drop_item()
+	if(burst_size > 1)
+		firing_burst = 1
+		for(var/i = 1 to burst_size)
+			if(!user)
+				break
+			if(!issilicon(user))
+				if( i>1 && !(src in get_both_hands(user))) //for burst firing
 					break
-
-		user.newtonian_move(get_dir(target, user))
+			if(chambered)
+				var/sprd = 0
+				if(randomspread)
+					sprd = round((rand() - 0.5) * spread)
+				else
+					sprd = round((i / burst_size - 0.5) * spread)
+				if(!chambered.fire(target, user, params, ,suppressed, zone_override, sprd))
+					shoot_with_empty_chamber(user)
+					break
+				else
+					if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
+						shoot_live_shot(user, 1, target, message)
+					else
+						shoot_live_shot(user, 0, target, message)
+			else
+				shoot_with_empty_chamber(user)
+				break
+			process_chamber()
+			update_icon()
+			sleep(fire_delay)
+		firing_burst = 0
+	else
+		if(chambered)
+			if(!chambered.fire(target, user, params, , suppressed, zone_override, spread))
+				shoot_with_empty_chamber(user)
+				return
+			else
+				if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
+					shoot_live_shot(user, 1, target, message)
+				else
+					shoot_live_shot(user, 0, target, message)
+		else
+			shoot_with_empty_chamber(user)
+			return
+		process_chamber()
 		update_icon()
+		semicd = 1
+		spawn(fire_delay)
+			semicd = 0
+
+	if(user)
 		if(user.hand)
 			user.update_inv_l_hand()
 		else
 			user.update_inv_r_hand()
-		sleep(fire_delay)
+	feedback_add_details("gun_fired","[type]")
 
-/obj/item/weapon/gun/proc/ready_projectile(atom/target as mob|obj|turf, mob/living/user)
-	in_chamber.firer = user
-	in_chamber.def_zone = user.zone_sel.selecting
-	in_chamber.original = target
-	return
-
-/obj/item/weapon/gun/proc/process_projectile(var/turf/targloc, mob/living/user as mob|obj, params, spread)
-	var/turf/curloc = user.loc
-	if (!istype(targloc) || !istype(curloc) || !in_chamber)
-		return 0
-	if(targloc == curloc)			//Fire the projectile
-		user.bullet_act(in_chamber)
-		del(in_chamber)
-		update_icon()
-		return 1
-
-	in_chamber.loc = get_turf(user)
-	in_chamber.starting = get_turf(user)
-	in_chamber.current = curloc
-	in_chamber.OnFired()
-	in_chamber.yo = targloc.y - curloc.y
-	in_chamber.xo = targloc.x - curloc.x
-	if(params)
-		var/list/mouse_control = params2list(params)
-		if(mouse_control["icon-x"])
-			in_chamber.p_x = text2num(mouse_control["icon-x"])
-		if(mouse_control["icon-y"])
-			in_chamber.p_y = text2num(mouse_control["icon-y"])
-		if(mouse_control["screen-loc"])
-			//Split screen-loc up into X+Pixel_X and Y+Pixel_Y
-			var/list/screen_loc_params = splittext(mouse_control["screen-loc"], ",")
-
-			//Split X+Pixel_X up into list(X, Pixel_X)
-			var/list/screen_loc_X = splittext(screen_loc_params[1],":")
-
-			//Split Y+Pixel_Y up into list(Y, Pixel_Y)
-			var/list/screen_loc_Y = splittext(screen_loc_params[2],":")
-
-			var/x = text2num(screen_loc_X[1]) * 32 + text2num(screen_loc_X[2]) - 32
-			var/y = text2num(screen_loc_Y[1]) * 32 + text2num(screen_loc_Y[2]) - 32
-			var/ox = round(480/2) //"origin" x - Basically center of the screen. This is a bad way of doing it because if you are able to view MORE than 17 tiles at a time your aim will get fucked.
-			var/oy = round(480/2) //"origin" y - Basically center of the screen.
-
-			var/angle = Atan2(y - oy, x - ox)
-
-			in_chamber.Angle = angle
-
-	if(istype(user, /mob/living/carbon)) //Increase spread based on shock
-		var/mob/living/carbon/mob = user
-		if(mob.shock_stage > 120)
-			spread += rand(-5,5)
-		else if(mob.shock_stage > 70)
-			spread += rand(-2,2)
-
-	if(spread)
-		in_chamber.Angle += spread
-	if(in_chamber)
-		in_chamber.process()
-	in_chamber = null
-	return 1
-
-/obj/item/weapon/gun/proc/can_fire()
-	return process_chambered()
-
-/obj/item/weapon/gun/proc/can_hit(var/mob/living/target as mob, var/mob/living/user as mob)
-	return in_chamber.check_fire(target,user)
-
-/obj/item/weapon/gun/proc/click_empty(mob/user = null)
-	if (user)
-		user.visible_message("*click click*", "\red <b>*click*</b>")
-		playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+/obj/item/weapon/gun/attack(mob/M as mob, mob/user)
+	if(user.a_intent == "harm") //Flogging
+		..()
 	else
-		src.visible_message("*click click*")
-		playsound(src.loc, 'sound/weapons/empty.ogg', 100, 1)
+		return
 
-/obj/item/weapon/gun/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
-	//Suicide handling.
-	if (M == user && user.zone_sel.selecting == "mouth" && !mouthshoot)
-		mouthshoot = 1
-		M.visible_message("<span class='warning'> [user] sticks their gun in their mouth, ready to pull the trigger...</span>")
-		if(!do_after(user, 40, target = M))
-			M.visible_message("<span class='warning'> [user] decided life was worth living</span>")
-			mouthshoot = 0
-			return
-		if (process_chambered())
-			user.visible_message("<span class='warning'>[user] pulls the trigger.</span>")
-			if(silenced)
-				playsound(user, fire_sound, 10, 1)
-			else
-				playsound(user, fire_sound, 50, 1)
-			if(istype(in_chamber, /obj/item/projectile/lasertag) || istype(in_chamber, /obj/item/projectile/bullet/reusable/foam_dart))
-				user.show_message("<span class='warning'>You feel rather silly, trying to commit suicide with a toy.</span>")
-				mouthshoot = 0
-				return
-			in_chamber.on_hit(M)
-			if (in_chamber.damage_type != STAMINA)
-				user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1)
-				user.death()
-			else
-				to_chat(user, "<span class='notice'>Ow...</span>")
-				user.apply_effect(110,STAMINA,0)
-			del(in_chamber)
-			mouthshoot = 0
-			return
-		else
-			click_empty(user)
-			mouthshoot = 0
-			return
-
-	if (src.process_chambered())
-		//Point blank shooting if on harm intent or target we were targeting.
-		if(user.a_intent == I_HARM)
-			user.visible_message("\red <b> \The [user] fires \the [src] point blank at [M]!</b>")
-			if(istype(in_chamber)) in_chamber.damage *= 1.3
-			Fire(M,user,0,0,1)
-			return
-		else if(target && M in target)
-			Fire(M,user,0,0,1) ///Otherwise, shoot!
-			return
-	else
-		return ..() //Pistolwhippin'
-
-
-/obj/item/weapon/gun/attackby(var/obj/item/A as obj, mob/user as mob, params)
-	if(istype(A, /obj/item/device/flashlight/seclite))
-		var/obj/item/device/flashlight/seclite/S = A
+/obj/item/weapon/gun/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/device/flashlight/seclite))
+		var/obj/item/device/flashlight/seclite/S = I
 		if(can_flashlight)
 			if(!F)
-				if(user.l_hand != src && user.r_hand != src)
-					to_chat(user, "<span class='notice'>You'll need [src] in your hands to do that.</span>")
+				if(!user.unEquip(I))
 					return
-				user.drop_item()
 				to_chat(user, "<span class='notice'>You click [S] into place on [src].</span>")
 				if(S.on)
 					set_light(0)
 				F = S
-				A.loc = src
+				I.loc = src
 				update_icon()
 				update_gunlight(user)
 				verbs += /obj/item/weapon/gun/proc/toggle_gunlight
-	if(istype(A, /obj/item/weapon/screwdriver))
-		if(F)
-			if(user.l_hand != src && user.r_hand != src)
-				to_chat(user, "<span class='notice'>You'll need [src] in your hands to do that.</span>")
-				return
+
+	if(istype(I, /obj/item/weapon/screwdriver))
+		if(F && can_flashlight)
 			for(var/obj/item/device/flashlight/seclite/S in src)
 				to_chat(user, "<span class='notice'>You unscrew the seclite from [src].</span>")
 				F = null
@@ -370,8 +263,11 @@
 				S.update_brightness(user)
 				update_icon()
 				verbs -= /obj/item/weapon/gun/proc/toggle_gunlight
+
+	if(unique_rename)
+		if(istype(I, /obj/item/weapon/pen))
+			rename_gun(user)
 	..()
-	return
 
 /obj/item/weapon/gun/proc/toggle_gunlight()
 	set name = "Toggle Gunlight"
@@ -383,15 +279,14 @@
 
 	var/mob/living/carbon/human/user = usr
 	if(!isturf(user.loc))
-		to_chat(user, "You cannot turn the light on while in this [user.loc].")
+		to_chat(user, "<span class='warning'>You cannot turn the light on while in this [user.loc]!</span>")
 	F.on = !F.on
 	to_chat(user, "<span class='notice'>You toggle the gunlight [F.on ? "on":"off"].</span>")
 
 	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
 	update_gunlight(user)
-	return
 
-/obj/item/weapon/gun/proc/update_gunlight(var/mob/user = null)
+/obj/item/weapon/gun/proc/update_gunlight(mob/user = null)
 	if(F)
 		if(F.on)
 			set_light(F.brightness_on)
@@ -400,7 +295,80 @@
 		update_icon()
 	else
 		set_light(0)
+
+/obj/item/weapon/gun/pickup(mob/user)
+	..()
+	if(azoom)
+		azoom.Grant(user)
+
+/obj/item/weapon/gun/dropped(mob/user)
+	..()
+	zoom(user,FALSE)
+	if(azoom)
+		azoom.Remove(user)
+
+/obj/item/weapon/gun/AltClick(mob/user)
+	..()
+	if(user.incapacitated())
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
+	if(unique_reskin && !current_skin && loc == user)
+		reskin_gun(user)
+
+/obj/item/weapon/gun/proc/reskin_gun(mob/M)
+	var/choice = input(M,"Warning, you can only reskin your weapon once!","Reskin Gun") in options
+
+	if(src && choice && !current_skin && !M.incapacitated() && in_range(M,src))
+		if(options[choice] == null)
+			return
+		current_skin = options[choice]
+		to_chat(M, "Your gun is now skinned as [choice]. Say hello to your new friend.")
+		update_icon()
+
+/obj/item/weapon/gun/proc/rename_gun(mob/M)
+	var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN)
+
+	if(src && input && !M.stat && in_range(M,src) && !M.restrained() && M.canmove)
+		name = input
+		to_chat(M, "You name the gun [input]. Say hello to your new friend.")
+		return
+
+/obj/item/weapon/gun/proc/handle_suicide(mob/living/carbon/human/user, mob/living/carbon/human/target, params)
+	if(!ishuman(user) || !ishuman(target))
+		return
+
+	if(semicd)
+		return
+
+	if(user == target)
+		target.visible_message("<span class='warning'>[user] sticks [src] in their mouth, ready to pull the trigger...</span>", \
+			"<span class='userdanger'>You stick [src] in your mouth, ready to pull the trigger...</span>")
+	else
+		target.visible_message("<span class='warning'>[user] points [src] at [target]'s head, ready to pull the trigger...</span>", \
+			"<span class='userdanger'>[user] points [src] at your head, ready to pull the trigger...</span>")
+
+	semicd = 1
+
+	if(!do_mob(user, target, 120) || user.zone_sel.selecting != "mouth")
+		if(user)
+			if(user == target)
+				user.visible_message("<span class='notice'>[user] decided life was worth living.</span>")
+			else if(target && target.Adjacent(user))
+				target.visible_message("<span class='notice'>[user] has decided to spare [target]'s life.</span>", "<span class='notice'>[user] has decided to spare your life!</span>")
+		semicd = 0
+		return
+
+	semicd = 0
+
+	target.visible_message("<span class='warning'>[user] pulls the trigger!</span>", "<span class='userdanger'>[user] pulls the trigger!</span>")
+
+	if(chambered && chambered.BB)
+		chambered.BB.damage *= 5
+
+	process_fire(target, user, 1, params)
+
+/obj/item/weapon/gun/proc/isHandgun()
+	return 1
 
 /////////////
 // ZOOMING //
@@ -424,8 +392,6 @@
 	gun.zoom(L, FALSE)
 	..()
 
-
-
 /obj/item/weapon/gun/proc/zoom(mob/living/user, forced_zoom)
 	if(!user || !user.client)
 		return
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index eeb775be84a..a6bc11ad83e 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/code/modules/projectiles/guns/alien.dm
@@ -1,108 +1,100 @@
-//Vox pinning weapon.
-/obj/item/weapon/gun/launcher/spikethrower
-
-	name = "Vox spike thrower"
+/obj/item/weapon/gun/projectile/automatic/spikethrower
+	name = "\improper Vox spike thrower"
 	desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
-
-	var/last_regen = 0
-	var/spike_gen_time = 100
-	var/max_spikes = 3
-	var/spikes = 3
-	release_force = 30
-	icon = 'icons/obj/gun.dmi'
-	icon_state = "spikethrower3"
+	icon_state = "spikethrower"
 	item_state = "spikethrower"
+	w_class = 2
 	fire_sound_text = "a strange noise"
-	fire_sound = 'sound/weapons/bladeslice.ogg'
+	mag_type = /obj/item/ammo_box/magazine/internal/spikethrower
+	burst_size = 2
+	fire_delay = 3
+	can_suppress = 0
+	var/charge_tick = 0
+	var/charge_delay = 15
+	restricted_species = list("Vox", "Vox Armalis")
 
-/obj/item/weapon/gun/launcher/spikethrower/New()
+/obj/item/weapon/gun/projectile/automatic/spikethrower/New()
 	..()
 	processing_objects.Add(src)
-	last_regen = world.time
 
-/obj/item/weapon/gun/launcher/spikethrower/Destroy()
+/obj/item/weapon/gun/projectile/automatic/spikethrower/Destroy()
 	processing_objects.Remove(src)
 	return ..()
 
-/obj/item/weapon/gun/launcher/spikethrower/process()
-
-	if(spikes < max_spikes && world.time > last_regen + spike_gen_time)
-		spikes++
-		last_regen = world.time
-		update_icon()
-
-/obj/item/weapon/gun/launcher/spikethrower/examine(mob/user)
-	..(user)
-	to_chat(user, "It has [spikes] [spikes == 1 ? "spike" : "spikes"] remaining.")
-
-/obj/item/weapon/gun/launcher/spikethrower/update_icon()
-	icon_state = "spikethrower[spikes]"
-
-/obj/item/weapon/gun/launcher/spikethrower/emp_act(severity)
+/obj/item/weapon/gun/projectile/automatic/spikethrower/update_icon()
 	return
 
-/obj/item/weapon/gun/launcher/spikethrower/special_check(user)
-	if(istype(user,/mob/living/carbon/human))
-		var/mob/living/carbon/human/H = user
-		if(H.species && H.species.name != "Vox" && H.species.name != "Vox Armalis")
-			to_chat(user, "\red \The [src] does not respond to you!")
-			return 0
+/obj/item/weapon/gun/projectile/automatic/spikethrower/process()
+	charge_tick++
+	if(charge_tick < charge_delay || !magazine)
+		return
+	charge_tick = 0
+	var/obj/item/ammo_casing/caseless/spike/S = new(get_turf(src))
+	magazine.give_round(S)
 	return 1
 
-/obj/item/weapon/gun/launcher/spikethrower/update_release_force()
+/obj/item/weapon/gun/projectile/automatic/spikethrower/attack_self()
 	return
 
-/obj/item/weapon/gun/launcher/spikethrower/chamber_round()
-	if(in_chamber) return 1
-	if(spikes < 1) return 0
+/obj/item/weapon/gun/projectile/automatic/spikethrower/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
 
-	spikes--
-	in_chamber = new /obj/item/weapon/spike(src)
-	return 1
+/obj/item/ammo_box/magazine/internal/spikethrower
+	name = "\improper Vox spikethrower internal magazine"
+	ammo_type = /obj/item/ammo_casing/caseless/spike
+	caliber = "spike"
+	max_ammo = 10
 
-/obj/item/weapon/gun/launcher/spikethrower/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
-	if(..()) update_icon()
+/obj/item/ammo_casing/caseless/spike
+	name = "alloy spike"
+	desc = "A broadhead spike made out of a weird silvery metal."
+	projectile_type = /obj/item/projectile/bullet/spike
+	sharp = 1
+	edge = 0
+	throwforce = 5
+	w_class = 3
+	caliber = "spike"
+	icon_state = "bolt"
+	fire_sound = 'sound/weapons/bladeslice.ogg'
+
+/obj/item/projectile/bullet/spike
+	name = "alloy spike"
+	desc = "It's about a foot of weird silvery metal with a wicked point."
+	damage = 25
+	stun = 1
+	armour_penetration = 30
+	icon_state = "magspear"
+
+/obj/item/projectile/bullet/spike/on_hit(atom/target, blocked = 0)
+	if((blocked != 100) && istype(target, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = target
+		H.drip(500)
+	..()
 
 //This gun only functions for armalis. The on-sprite is too huge to render properly on other sprites.
 /obj/item/weapon/gun/energy/noisecannon
-
 	name = "alien heavy cannon"
 	desc = "It's some kind of enormous alien weapon, as long as a man is tall."
-
-	icon = 'icons/obj/gun.dmi' //Actual on-sprite is handled by icon_override.
 	icon_state = "noisecannon"
 	item_state = "noisecannon"
 	recoil = 1
-
 	force = 10
-	projectile_type = "/obj/item/projectile/energy/sonic"
+	ammo_type = list(/obj/item/ammo_casing/energy/sonic)
 	cell_type = "/obj/item/weapon/stock_parts/cell/super"
-	fire_delay = 40
-	fire_sound = 'sound/effects/basscannon.ogg'
-
-	var/mode = 1
-
-/obj/item/weapon/gun/energy/noisecannon/attack_hand(mob/user as mob)
-	if(loc != user)
-		var/mob/living/carbon/human/H = user
-		if(istype(H))
-			if(H.species.name == "Vox Armalis")
-				..()
-				return
-		to_chat(user, "\red \The [src] is far too large for you to pick up.")
-		return
-
-/obj/item/weapon/gun/energy/noisecannon/process_chambered() //Does not have ammo.
-	in_chamber = new projectile_type(src)
-	return 1
+	restricted_species = list("Vox Armalis")
 
 /obj/item/weapon/gun/energy/noisecannon/update_icon()
 	return
 
+//Casing
+/obj/item/ammo_casing/energy/sonic
+	projectile_type = /obj/item/projectile/energy/sonic
+	fire_sound = 'sound/effects/basscannon.ogg'
+	delay = 40
+
 //Projectile.
 /obj/item/projectile/energy/sonic
 	name = "distortion"
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
 	icon_state = "particle"
 	damage = 60
 	damage_type = BRUTE
@@ -112,7 +104,3 @@
 	embed = 0
 	weaken = 5
 	stun = 5
-
-/obj/item/projectile/energy/sonic/proc/split()
-	//TODO: create two more projectiles to either side of this one, fire at targets to the side of target turf.
-	return
\ No newline at end of file
diff --git a/code/modules/reagents/dartgun.dm b/code/modules/projectiles/guns/dartgun.dm
similarity index 94%
rename from code/modules/reagents/dartgun.dm
rename to code/modules/projectiles/guns/dartgun.dm
index 4fb705dbcf9..2e55b19b4a9 100644
--- a/code/modules/reagents/dartgun.dm
+++ b/code/modules/projectiles/guns/dartgun.dm
@@ -33,9 +33,8 @@
 	var/list/starting_chems = null
 
 /obj/item/weapon/gun/dartgun/update_icon()
-
 	if(!cartridge)
-		icon_state = "dartgun-empty"
+		icon_state = "dartgun-e"
 		return 1
 
 	if(!cartridge.darts)
@@ -47,7 +46,6 @@
 	return 1
 
 /obj/item/weapon/gun/dartgun/New()
-
 	..()
 	if(starting_chems)
 		for(var/chem in starting_chems)
@@ -104,7 +102,7 @@
 		to_chat(user, "<span class='notice>You slot [B] into [src].</span>")
 		src.updateUsrDialog()
 
-/obj/item/weapon/gun/dartgun/can_fire()
+/obj/item/weapon/gun/dartgun/can_shoot()
 	if(!cartridge)
 		return 0
 	else
@@ -205,15 +203,12 @@
 
 		return
 
-/obj/item/weapon/gun/dartgun/afterattack(obj/target, mob/user , flag)
-	if(!isturf(target.loc) || target == user) return
+/obj/item/weapon/gun/dartgun/afterattack(atom/target, mob/living/user, flag, params)
+	if(!isturf(target.loc) || target == user)
+		return
 	..()
 
-/obj/item/weapon/gun/dartgun/can_hit(var/mob/living/target as mob, var/mob/living/user as mob)
-	return 1
-
 /obj/item/weapon/gun/dartgun/attack_self(mob/user)
-
 	user.set_machine(src)
 	var/dat = "<b>[src] mixing control:</b><br><br>"
 
@@ -280,9 +275,10 @@
 	src.updateUsrDialog()
 	return
 
-/obj/item/weapon/gun/dartgun/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
+/obj/item/weapon/gun/dartgun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
 	if(cartridge)
-		spawn(0) fire_dart(target,user)
+		spawn(0)
+			fire_dart(target,user)
 	else
 		to_chat(usr, "<span class='warning'>[src] is empty.</span>")
 
@@ -305,7 +301,7 @@
 	anchored = 1
 	density = 0
 
-	New()
-		var/datum/reagents/R = new/datum/reagents(15)
-		reagents = R
-		R.my_atom = src
\ No newline at end of file
+/obj/effect/syringe_gun_dummy/New()
+	var/datum/reagents/R = new/datum/reagents(15)
+	reagents = R
+	R.my_atom = src
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 8add6a5caf9..24a200915f0 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -2,25 +2,26 @@
 	icon_state = "energy"
 	name = "energy gun"
 	desc = "A basic energy-based gun."
-	fire_sound = 'sound/weapons/Taser.ogg'
+	icon = 'icons/obj/guns/energy.dmi'
+	fire_sound_text = "laser blast"
 
 	var/obj/item/weapon/stock_parts/cell/power_supply //What type of power cell this uses
-	var/charge_cost = 1000 //How much energy is needed to fire.
-	var/cell_type = "/obj/item/weapon/stock_parts/cell"
-	var/projectile_type = "/obj/item/projectile/beam"
-	var/modifystate
+	var/cell_type = /obj/item/weapon/stock_parts/cell
+	var/modifystate = 0
+	var/list/ammo_type = list(/obj/item/ammo_casing/energy)
+	var/select = 1 //The state of the select fire switch. Determines from the ammo_type list what kind of shot is fired next.
 	var/can_charge = 1
-
-	//self-recharging
-	var/self_recharge = 0	//if set, the weapon will recharge itself
+	var/charge_sections = 4
+	ammo_x_offset = 2
+	var/shaded_charge = 0 //if this gun uses a stateful charge bar for more detail
+	var/selfcharge = 0
 	var/use_external_power = 0 //if set, the weapon will look for an external power source to draw from, otherwise it recharges magically
-	var/recharge_time = 4
 	var/charge_tick = 0
+	var/charge_delay = 4
 
 /obj/item/weapon/gun/energy/emp_act(severity)
-	if(power_supply)
-		power_supply.use(round(power_supply.charge / severity))
-		update_icon()
+	power_supply.use(round(power_supply.charge / severity))
+	update_icon()
 
 /obj/item/weapon/gun/energy/New()
 	..()
@@ -29,39 +30,147 @@
 	else
 		power_supply = new(src)
 	power_supply.give(power_supply.maxcharge)
-	if(self_recharge)
+	var/obj/item/ammo_casing/energy/shot
+	for (var/i = 1, i <= ammo_type.len, i++)
+		var/shottype = ammo_type[i]
+		shot = new shottype(src)
+		ammo_type[i] = shot
+	shot = ammo_type[select]
+	fire_sound = shot.fire_sound
+	fire_delay = shot.delay
+	if(selfcharge)
 		processing_objects.Add(src)
 	update_icon()
 
 /obj/item/weapon/gun/energy/Destroy()
-	if(self_recharge)
+	if(selfcharge)
 		processing_objects.Remove(src)
 	return ..()
 
 /obj/item/weapon/gun/energy/process()
-	if(self_recharge) //Every [recharge_time] ticks, recharge a shot for the cyborg
+	if(selfcharge) //Every [recharge_time] ticks, recharge a shot for the cyborg
 		charge_tick++
-		if(charge_tick < recharge_time) return 0
+		if(charge_tick < charge_delay)
+			return
 		charge_tick = 0
-
-		if(!power_supply || power_supply.charge >= power_supply.maxcharge)
-			return 0 // check if we actually need to recharge
-
+		if(!power_supply)
+			return // check if we actually need to recharge
+		var/obj/item/ammo_casing/energy/E = ammo_type[select]
 		if(use_external_power)
 			var/obj/item/weapon/stock_parts/cell/external = get_external_power_supply()
-			if(!external || !external.use(charge_cost/10)) //Take power from the borg...
-				return 0								//Note, uses /10 because of shitty mods to the cell system
-
-		power_supply.give(charge_cost) //... to recharge the shot
+			if(!external || !external.use((E.e_cost)/10)) //Take power from the borg...
+				return								//Note, uses /10 because of shitty mods to the cell system
+		power_supply.give(1000) //... to recharge the shot
 		update_icon()
-	return 1
+
+/obj/item/weapon/gun/energy/attack_self(mob/living/user as mob)
+	if(ammo_type.len > 1)
+		select_fire(user)
+		update_icon()
+		if(istype(user,/mob/living/carbon/human)) //This has to be here or else if you toggle modes by clicking the gun in hand
+			var/mob/living/carbon/human/H = user //Otherwise the mob icon doesn't update, blame shitty human update_icons() code
+			H.update_inv_l_hand()
+			H.update_inv_r_hand()
+
+/obj/item/weapon/gun/energy/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
+	newshot() //prepare a new shot
+	..()
+
+/obj/item/weapon/gun/energy/can_shoot()
+	var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+	return power_supply.charge >= shot.e_cost
+
+/obj/item/weapon/gun/energy/newshot()
+	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...
+		chambered = shot //...prepare a new shot based on the current ammo type selected
+		chambered.newshot()
+	return
+
+/obj/item/weapon/gun/energy/process_chamber()
+	if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired...
+		var/obj/item/ammo_casing/energy/shot = chambered
+		power_supply.use(shot.e_cost)//... drain the power_supply cell
+	chambered = null //either way, released the prepared shot
+	return
+
+/obj/item/weapon/gun/energy/proc/select_fire(mob/living/user)
+	select++
+	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)
+		to_chat(user, "<span class='notice'>[src] is now set to [shot.select_name].</span>")
+	update_icon()
+	return
+
+/obj/item/weapon/gun/energy/update_icon()
+	overlays.Cut()
+	var/ratio = Ceiling((power_supply.charge / power_supply.maxcharge) * charge_sections)
+	var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+	var/iconState = "[icon_state]_charge"
+	var/itemState = null
+	if(!initial(item_state))
+		itemState = icon_state
+	if (modifystate)
+		overlays += "[icon_state]_[shot.select_name]"
+		iconState += "_[shot.select_name]"
+		if(itemState)
+			itemState += "[shot.select_name]"
+	if(power_supply.charge < shot.e_cost)
+		overlays += "[icon_state]_empty"
+	else
+		if(!shaded_charge)
+			for(var/i = ratio, i >= 1, i--)
+				overlays += image(icon = icon, icon_state = iconState, pixel_x = ammo_x_offset * (i -1))
+		else
+			overlays += image(icon = icon, icon_state = "[icon_state]_[modifystate ? "[shot.select_name]_" : ""]charge[ratio]")
+	if(F && can_flashlight)
+		var/iconF = "flight"
+		if(F.on)
+			iconF = "flight_on"
+		overlays += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
+	if(itemState)
+		itemState += "[ratio]"
+		item_state = itemState
+
+/obj/item/weapon/gun/energy/ui_action_click()
+	toggle_gunlight()
+
+/obj/item/weapon/gun/energy/suicide_act(mob/user)
+	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)
+			user.visible_message("<span class='suicide'>[user] melts \his face off with the [name]!</span>")
+			playsound(loc, fire_sound, 50, 1, -1)
+			var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+			power_supply.use(shot.e_cost)
+			update_icon()
+			return(FIRELOSS)
+		else
+			user.visible_message("<span class='suicide'>[user] panics and starts choking to death!</span>")
+			return(OXYLOSS)
+	else
+		user.visible_message("<span class='suicide'>[user] is pretending to blow \his brains out with the [name]! It looks like \he's trying to commit suicide!</b></span>")
+		playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
+		return (OXYLOSS)
+
+/obj/item/weapon/gun/energy/proc/robocharge()
+	if(isrobot(loc))
+		var/mob/living/silicon/robot/R = loc
+		if(R && R.cell)
+			var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot
+			if(R.cell.use(shot.e_cost/10)) 		//Take power from the borg... //Divided by 10 because cells and charge costs are fucked.
+				power_supply.give(shot.e_cost)	//... to recharge the shot
 
 /obj/item/weapon/gun/energy/proc/get_external_power_supply()
-	if(isrobot(src.loc))
-		var/mob/living/silicon/robot/R = src.loc
-		return R.cell
-	if(istype(src.loc, /obj/item/rig_module))
-		var/obj/item/rig_module/module = src.loc
+	if(istype(loc, /obj/item/rig_module))
+		var/obj/item/rig_module/module = loc
 		if(module.holder && module.holder.wearer)
 			var/mob/living/carbon/human/H = module.holder.wearer
 			if(istype(H) && H.back)
@@ -69,29 +178,3 @@
 				if(istype(suit))
 					return suit.cell
 	return null
-
-/obj/item/weapon/gun/energy/process_chambered()
-	if(in_chamber)	return 1
-	if(!power_supply)	return 0
-	if(!power_supply.use(charge_cost))	return 0
-	if(!projectile_type)	return 0
-	in_chamber = new projectile_type(src)
-	return 1
-
-/obj/item/weapon/gun/energy/update_icon()
-	if(cell_type)
-		var/ratio = power_supply.charge / power_supply.maxcharge
-		ratio = round(ratio, 0.25) * 100
-		if(modifystate)
-			icon_state = "[modifystate][ratio]"
-		else
-			icon_state = "[initial(icon_state)][ratio]"
-	else
-		icon_state = "energy0"
-	overlays.Cut()
-	if(F)
-		if(F.on)
-			overlays += "flight-on"
-		else
-			overlays += "flight"
-	return
diff --git a/code/modules/projectiles/guns/energy/advtaser.dm b/code/modules/projectiles/guns/energy/advtaser.dm
deleted file mode 100644
index 8601a388f15..00000000000
--- a/code/modules/projectiles/guns/energy/advtaser.dm
+++ /dev/null
@@ -1,40 +0,0 @@
-/obj/item/weapon/gun/energy/advtaser
-	name = "hybrid taser"
-	desc = "A hybrid taser designed to fire both short-range high-power electrodes and long-range disabler beams."
-	icon_state = "advtaser"
-	item_state = null	//so the human update icon uses the icon_state instead.
-	cell_type = "/obj/item/weapon/stock_parts/cell"
-	origin_tech = null
-	fire_sound = 'sound/weapons/Taser.ogg'
-	projectile_type = "/obj/item/projectile/energy/electrode"
-	charge_cost = 2000
-	modifystate = "advtaserstun"
-	can_flashlight = 1
-	fire_delay = 15
-
-	var/mode = 0 //0 = stun, 1 = disable
-
-
-	attack_self(mob/living/user as mob)
-		switch(mode)
-			if(0)
-				mode = 1
-				charge_cost = 500
-				fire_sound = 'sound/weapons/taser2.ogg'
-				to_chat(user, "\red [src.name] is now set to Disable.")
-				projectile_type = "/obj/item/projectile/beam/disabler"
-				modifystate = "advtaserdisable"
-				fire_delay = 0
-			if(1)
-				mode = 0
-				charge_cost = 2000
-				fire_sound = 'sound/weapons/Taser.ogg'
-				to_chat(user, "\red [src.name] is now set to stun.")
-				projectile_type = "/obj/item/projectile/energy/electrode"
-				modifystate = "advtaserstun"
-				fire_delay = 15
-		update_icon()
-		if(user.l_hand == src)
-			user.update_inv_l_hand()
-		else
-			user.update_inv_r_hand()
diff --git a/code/modules/projectiles/guns/energy/blueshield.dm b/code/modules/projectiles/guns/energy/blueshield.dm
deleted file mode 100644
index 914b92e19a6..00000000000
--- a/code/modules/projectiles/guns/energy/blueshield.dm
+++ /dev/null
@@ -1,37 +0,0 @@
-/obj/item/weapon/gun/energy/blueshield
-	name = "advanced stun revolver"
-	desc = "An advanced stun revolver with the capacity to shoot both electrodes and lasers."
-	icon_state = "bsgun_stun"
-	item_state = "gun"
-	modifystate = "bsgun_stun"
-	force = 7
-	fire_sound = 'sound/weapons/gunshot.ogg'
-	charge_cost = 2000
-	projectile_type = "/obj/item/projectile/energy/electrode"
-	fire_delay = 15
-	var/fire_mode = 0 // 0 for taser, 1 for lethals.
-
-/obj/item/weapon/gun/energy/blueshield/attack_self(mob/living/user as mob)
-	if(!fire_mode)
-		fire_mode = 1
-		charge_cost = 1000
-		fire_delay = 0
-
-		fire_sound = 'sound/weapons/Laser.ogg'
-		projectile_type = "/obj/item/projectile/beam"
-		modifystate = "bsgun_kill"
-
-		to_chat(user, "<span class = 'warning'>You adjust [src.name] to the kill setting.</span>")
-
-	else
-		fire_mode = 0
-		charge_cost = 2000
-		fire_delay = 15
-
-		projectile_type = "/obj/item/projectile/energy/electrode"
-		fire_sound = 'sound/weapons/gunshot.ogg'
-		modifystate = "bsgun_stun"
-
-		to_chat(user, "<span class = 'info'>You adjust [src.name] to the stun setting.</span>")
-
-	update_icon()
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/energy/hos.dm b/code/modules/projectiles/guns/energy/hos.dm
deleted file mode 100644
index 6bcb9992c4d..00000000000
--- a/code/modules/projectiles/guns/energy/hos.dm
+++ /dev/null
@@ -1,45 +0,0 @@
-/obj/item/weapon/gun/energy/hos
-	name = "head of security's energy gun"
-	desc = "This is a modern recreation of the captain's antique laser gun. This gun has several unique fire modes, but lacks the ability to recharge over time."
-	icon_state = "hoslaser"
-	item_state = null	//so the human update icon uses the icon_state instead.
-	force = 10
-	fire_sound = 'sound/weapons/Taser.ogg'
-	origin_tech = "combat=3;magnets=2"
-	charge_cost = 2000
-	modifystate = "hoslaserstun"
-	projectile_type = "/obj/item/projectile/energy/electrode"
-	fire_delay = 15
-	var/mode = 2
-
-	attack_self(mob/living/user as mob)
-		switch(mode)
-			if(2)
-				mode = 0
-				charge_cost = 1000
-				fire_sound = 'sound/weapons/Laser.ogg'
-				to_chat(user, "\red [src.name] is now set to kill.")
-				projectile_type = "/obj/item/projectile/beam"
-				modifystate = "hoslaserkill"
-				fire_delay = 0
-			if(0)
-				mode = 1
-				charge_cost = 500
-				fire_sound = 'sound/weapons/taser2.ogg'
-				to_chat(user, "\red [src.name] is now set to disable.")
-				projectile_type = "/obj/item/projectile/beam/disabler"
-				modifystate = "hoslaserdisable"
-				fire_delay = 0
-			if(1)
-				mode = 2
-				charge_cost = 2000
-				fire_sound = 'sound/weapons/taser.ogg'
-				to_chat(user, "\red [src.name] is now set to stun.")
-				projectile_type = "/obj/item/projectile/energy/electrode"
-				modifystate = "hoslaserstun"
-				fire_delay = 15
-		update_icon()
-		if(user.l_hand == src)
-			user.update_inv_l_hand()
-		else
-			user.update_inv_r_hand()
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 330d9136f17..40356f8a7d9 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -1,59 +1,65 @@
 /obj/item/weapon/gun/energy/laser
 	name = "laser gun"
-	desc = "a basic weapon designed kill with concentrated energy bolts"
+	desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
 	icon_state = "laser"
 	item_state = "laser"
-	fire_sound = 'sound/weapons/Laser.ogg'
-	charge_cost = 760
-	w_class = 3.0
+	w_class = 3
 	materials = list(MAT_METAL=2000)
 	origin_tech = "combat=3;magnets=2"
-	projectile_type = "/obj/item/projectile/beam"
+	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
+	ammo_x_offset = 1
+	shaded_charge = 1
 
 /obj/item/weapon/gun/energy/laser/practice
 	name = "practice laser gun"
 	desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
-	projectile_type = "/obj/item/projectile/practice"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
 	clumsy_check = 0
 	needs_permit = 0
 
-obj/item/weapon/gun/energy/laser/retro
+/obj/item/weapon/gun/energy/laser/retro
 	name ="retro laser gun"
 	icon_state = "retro"
-	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
-
+	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
+	ammo_x_offset = 3
 
 /obj/item/weapon/gun/energy/laser/captain
-	name = "captain's antique laser gun"
+	name = "antique laser gun"
 	icon_state = "caplaser"
 	item_state = "caplaser"
 	desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
 	force = 10
 	origin_tech = null
+	ammo_x_offset = 3
+	selfcharge = 1
 
-	self_recharge = 1
-
+/obj/item/weapon/gun/energy/laser/captain/scattershot
+	name = "scatter shot laser rifle"
+	icon_state = "lasercannon"
+	item_state = "laser"
+	desc = "An industrial-grade heavy-duty laser rifle with a modified laser lense to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theorically infinite use."
+	origin_tech = "combat=5;materials=4;powerstorage=4"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
+	shaded_charge = 0
 
 /obj/item/weapon/gun/energy/laser/cyborg
+	can_charge = 0
 	desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
+	origin_tech = null
 
-/obj/item/weapon/gun/energy/laser/cyborg/process()
-	return 1
-
-/obj/item/weapon/gun/energy/laser/cyborg/process_chambered()
-	if(in_chamber)
-		return 1
-	if(isrobot(src.loc))
-		var/mob/living/silicon/robot/R = src.loc
-		if(R && R.cell && R.cell.charge >= 83)
-			R.cell.use(83)
-			in_chamber = new/obj/item/projectile/beam(src)
-			return 1
-	return 0
+/obj/item/weapon/gun/energy/laser/cyborg/newshot()
+	..()
+	robocharge()
 
 /obj/item/weapon/gun/energy/laser/cyborg/emp_act()
 	return
 
+/obj/item/weapon/gun/energy/laser/scatter
+	name = "scatter laser gun"
+	desc = "A laser gun equipped with a refraction kit that spreads bolts."
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
+
+///Laser Cannon
 
 /obj/item/weapon/gun/energy/lasercannon
 	name = "accelerator laser cannon"
@@ -64,13 +70,18 @@ obj/item/weapon/gun/energy/laser/retro
 	force = 10
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
-	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 	origin_tech = "combat=4;materials=3;powerstorage=3"
-	projectile_type = "/obj/item/projectile/beam/laser/accelerator"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/accelerator)
+	ammo_x_offset = 3
 
 /obj/item/weapon/gun/energy/lasercannon/isHandgun()
 	return 0
 
+/obj/item/ammo_casing/energy/laser/accelerator
+	projectile_type = /obj/item/projectile/beam/laser/accelerator
+	select_name = "accelerator"
+	fire_sound = 'sound/weapons/lasercannonfire.ogg'
+
 /obj/item/projectile/beam/laser/accelerator
 	name = "accelerator laser"
 	icon_state = "heavylaser"
@@ -83,40 +94,34 @@ obj/item/weapon/gun/energy/laser/retro
 
 /obj/item/weapon/gun/energy/lasercannon/mounted
 	name = "mounted laser cannon"
-	self_recharge = 1
+	selfcharge = 1
 	use_external_power = 1
-	recharge_time = 10
+	charge_delay = 10
 
+/obj/item/weapon/gun/energy/lasercannon/cyborg
 
-/obj/item/weapon/gun/energy/lasercannon/cyborg/process_chambered()
-	if(in_chamber)
-		return 1
-	if(isrobot(src.loc))
-		var/mob/living/silicon/robot/R = src.loc
-		if(R && R.cell)
-			R.cell.use(250)
-			in_chamber = new/obj/item/projectile/beam(src)
-			return 1
-	return 0
+/obj/item/weapon/gun/energy/lasercannon/cyborg/newshot()
+	..()
+	robocharge()
+
+/obj/item/weapon/gun/energy/lasercannon/cyborg/emp_act()
+	return
 
 /obj/item/weapon/gun/energy/xray
 	name = "xray laser gun"
 	desc = "A high-power laser gun capable of expelling concentrated xray blasts."
 	icon_state = "xray"
-	fire_sound = 'sound/weapons/laser3.ogg'
 	origin_tech = "combat=5;materials=3;magnets=2;syndicate=2"
-	projectile_type = "/obj/item/projectile/beam/xray"
-	charge_cost = 500
+	ammo_type = list(/obj/item/ammo_casing/energy/xray)
 
 /obj/item/weapon/gun/energy/immolator
 	name = "Immolator laser gun"
 	desc = "A modified laser gun, shooting highly concetrated beams with higher intensity that ignites the target, for the cost of draining more power per shot"
 	icon_state = "immolator"
 	item_state = "laser"
-	fire_sound = 'sound/weapons/laser3.ogg'
-	projectile_type = "/obj/item/projectile/beam/immolator"
+	ammo_type = list(/obj/item/ammo_casing/energy/immolator)
 	origin_tech = "combat=4;materials=4;magnets=3;plasmatech=2"
-	charge_cost = 1250
+	shaded_charge = 1
 
 ////////Laser Tag////////////////////
 
@@ -124,34 +129,20 @@ obj/item/weapon/gun/energy/laser/retro
 	name = "laser tag gun"
 	icon_state = "bluetag"
 	desc = "Standard issue weapon of the Imperial Guard"
-	projectile_type = "/obj/item/projectile/lasertag/blue"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/bluetag)
 	origin_tech = "combat=1;magnets=2"
 	clumsy_check = 0
 	needs_permit = 0
-
-	self_recharge = 1
-
-/obj/item/weapon/gun/energy/laser/bluetag/special_check(var/mob/living/carbon/human/M)
-	if(ishuman(M))
-		if(istype(M.wear_suit, /obj/item/clothing/suit/bluetag))
-			return 1
-		to_chat(M, "\red You need to be wearing your laser tag vest!")
-	return 0
+	ammo_x_offset = 2
+	selfcharge = 1
 
 /obj/item/weapon/gun/energy/laser/redtag
 	name = "laser tag gun"
 	icon_state = "redtag"
 	desc = "Standard issue weapon of the Imperial Guard"
-	projectile_type = "/obj/item/projectile/lasertag/red"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/redtag)
 	origin_tech = "combat=1;magnets=2"
 	clumsy_check = 0
 	needs_permit = 0
-
-	self_recharge = 1
-
-/obj/item/weapon/gun/energy/laser/redtag/special_check(var/mob/living/carbon/human/M)
-	if(ishuman(M))
-		if(istype(M.wear_suit, /obj/item/clothing/suit/redtag))
-			return 1
-		to_chat(M, "\red You need to be wearing your laser tag vest!")
-	return 0
\ No newline at end of file
+	ammo_x_offset = 2
+	selfcharge = 1
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 5bc164c5d76..2ef193a6c37 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -1,192 +1,132 @@
 /obj/item/weapon/gun/energy/gun
 	name = "energy gun"
 	desc = "A basic energy-based gun with two settings: kill and disable."
-	icon_state = "energystun100"
+	icon_state = "energy"
 	item_state = null	//so the human update icon uses the icon_state instead.
-	fire_sound = 'sound/weapons/Taser2.ogg'
-	charge_cost = 500
-	projectile_type = "/obj/item/projectile/beam/disabler"
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
 	origin_tech = "combat=3;magnets=2"
-	modifystate = "energystun"
+	modifystate = 2
 	can_flashlight = 1
-
-	var/mode = 0 //0 = disable, 1 = kill
-
-
-	attack_self(mob/living/user as mob)
-		switch(mode)
-			if(0)
-				mode = 1
-				charge_cost = 1000
-				fire_sound = 'sound/weapons/Laser.ogg'
-				to_chat(user, "\red [src.name] is now set to kill.")
-				projectile_type = "/obj/item/projectile/beam"
-				modifystate = "energykill"
-			if(1)
-				mode = 0
-				charge_cost = 500
-				fire_sound = 'sound/weapons/Taser2.ogg'
-				to_chat(user, "\red [src.name] is now set to disable.")
-				projectile_type = "/obj/item/projectile/beam/disabler"
-				modifystate = "energystun"
-		update_icon()
-		if(user.l_hand == src)
-			user.update_inv_l_hand()
-		else
-			user.update_inv_r_hand()
+	ammo_x_offset = 3
+	flight_x_offset = 15
+	flight_y_offset = 10
 
 /obj/item/weapon/gun/energy/gun/cyborg
 	desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
 
-/obj/item/weapon/gun/energy/gun/cyborg/process()
-	return 1
-
-/obj/item/weapon/gun/energy/gun/cyborg/process_chambered()
-	if(in_chamber)
-		return 1
-	if(isrobot(src.loc))
-		var/mob/living/silicon/robot/R = src.loc
-		if(R && R.cell && R.cell.charge >= 83)
-			R.cell.use(83)
-			in_chamber = new projectile_type(src)
-			return 1
-	return 0
+/obj/item/weapon/gun/energy/gun/cyborg/newshot()
+	..()
+	robocharge()
 
+/obj/item/weapon/gun/energy/gun/cyborg/emp_act()
+	return
 
 /obj/item/weapon/gun/energy/gun/mounted
 	name = "mounted energy gun"
-	self_recharge = 1
+	selfcharge = 1
 	use_external_power = 1
 
-/obj/item/weapon/gun/energy/gun/nuclear
-	name = "Advanced Energy Gun"
-	desc = "An energy gun with an experimental miniaturized reactor."
-	icon_state = "nucgun"
-	origin_tech = "combat=3;materials=5;powerstorage=3"
-	var/lightfail = 0
-	can_flashlight = 0
-	can_charge = 0
+/obj/item/weapon/gun/energy/gun/mini
+	name = "miniature energy gun"
+	desc = "A small, pistol-sized energy gun with a built-in flashlight. It has two settings: stun and kill."
+	icon_state = "mini"
+	item_state = "gun"
+	w_class = 2
+	ammo_x_offset = 2
+	charge_sections = 3
+	can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
 
-	New()
-		..()
-		processing_objects.Add(src)
+/obj/item/weapon/gun/energy/gun/mini/New()
+	F = new /obj/item/device/flashlight/seclite(src)
+	..()
+	power_supply.maxcharge = 6000
+	power_supply.charge = 6000
 
+/obj/item/weapon/gun/energy/gun/mini/update_icon()
+	..()
+	if(F && F.on)
+		overlays += "mini-light"
 
-	Destroy()
-		processing_objects.Remove(src)
-		return ..()
-
-
-	process()
-		charge_tick++
-		if(charge_tick < 4) return 0
-		charge_tick = 0
-		if(!power_supply) return 0
-		if((power_supply.charge / power_supply.maxcharge) != 1)
-			if(!failcheck())	return 0
-			power_supply.give(1000)
-			update_icon()
-		return 1
-
-
-	proc
-		failcheck()
-			lightfail = 0
-			if (prob(src.reliability)) return 1 //No failure
-			if (prob(src.reliability))
-				for (var/mob/living/M in range(0,src)) //Only a minor failure, enjoy your radiation if you're in the same tile or carrying it
-					if (src in M.contents)
-						to_chat(M, "\red Your gun feels pleasantly warm for a moment.")
-					else
-						to_chat(M, "\red You feel a warm sensation.")
-					M.apply_effect(rand(3,120), IRRADIATE)
-				lightfail = 1
-			else
-				for (var/mob/living/M in range(rand(1,4),src)) //Big failure, TIME FOR RADIATION BITCHES
-					if (src in M.contents)
-						to_chat(M, "\red Your gun's reactor overloads!")
-					to_chat(M, "\red You feel a wave of heat wash over you.")
-					M.apply_effect(300, IRRADIATE)
-				crit_fail = 1 //break the gun so it stops recharging
-				processing_objects.Remove(src)
-				update_icon()
-			return 0
-
-
-		update_charge()
-			if (crit_fail)
-				overlays += "nucgun-whee"
-				return
-			var/ratio = power_supply.charge / power_supply.maxcharge
-			ratio = round(ratio, 0.25) * 100
-			overlays += "nucgun-[ratio]"
-
-
-		update_reactor()
-			if(crit_fail)
-				overlays += "nucgun-crit"
-				return
-			if(lightfail)
-				overlays += "nucgun-medium"
-			else if ((power_supply.charge/power_supply.maxcharge) <= 0.5)
-				overlays += "nucgun-light"
-			else
-				overlays += "nucgun-clean"
-
-
-		update_mode()
-			if (mode == 0)
-				overlays += "nucgun-stun"
-			else if (mode == 1)
-				overlays += "nucgun-kill"
-
-	emp_act(severity)
-		..()
-		reliability = max(reliability - round(15/severity), 0) //Do not allow it to go negative!
-
-
-	update_icon()
-		overlays.Cut()
-		update_charge()
-		update_reactor()
-		update_mode()
+/obj/item/weapon/gun/energy/gun/hos
+	name = "\improper X-01 MultiPhase Energy Gun"
+	desc = "This is a expensive, modern recreation of a antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
+	icon_state = "hoslaser"
+	force = 10
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
+	ammo_x_offset = 4
 
+/obj/item/weapon/gun/energy/gun/blueshield
+	name = "advanced stun revolver"
+	desc = "An advanced stun revolver with the capacity to shoot both electrodes and lasers."
+	icon_state = "bsgun"
+	force = 7
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos)
+	ammo_x_offset = 1
+	shaded_charge = 1
 
 /obj/item/weapon/gun/energy/gun/turret
 	name = "hybrid turret gun"
 	desc = "A heavy hybrid energy cannon with two settings: Stun and kill."
 	icon_state = "turretlaser"
+	item_state = "turretlaser"
 	slot_flags = null
 	w_class = 5
-	heavy_weapon = 1
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+	weapon_weight = WEAPON_MEDIUM
 	can_flashlight = 0
-	projectile_type = /obj/item/projectile/energy/electrode
-	charge_cost = 1000
-	fire_delay = 15
+	trigger_guard = TRIGGER_GUARD_NONE
+	ammo_x_offset = 2
 
-/obj/item/weapon/gun/energy/gun/turret/update_icon()
-	icon_state = initial(icon_state)
+/obj/item/weapon/gun/energy/gun/nuclear
+	name = "advanced energy gun"
+	desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
+	icon_state = "nucgun"
+	item_state = "nucgun"
+	origin_tech = "combat=3;materials=5;powerstorage=3"
+	var/fail_tick = 0
+	charge_delay = 5
+	can_charge = 0
+	ammo_x_offset = 1
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
+	selfcharge = 1
 
-/obj/item/weapon/gun/energy/gun/turret/attack_self(mob/living/user as mob)
-	switch(mode)
-		if(0)
-			mode = 1
-			charge_cost = 500
-			fire_sound = 'sound/weapons/Laser.ogg'
-			to_chat(user, "\red [src.name] is now set to kill.")
-			projectile_type = /obj/item/projectile/beam
-			modifystate = "energykill"
-			fire_delay = 0
-		if(1)
-			mode = 0
-			charge_cost = 1000
-			fire_sound = 'sound/weapons/Taser.ogg'
-			to_chat(user, "\red [src.name] is now set to stun.")
-			projectile_type = /obj/item/projectile/energy/electrode
-			modifystate = "energystun"
-			fire_delay = 15
+/obj/item/weapon/gun/energy/gun/nuclear/process()
+	if(fail_tick > 0)
+		fail_tick--
+	..()
+
+/obj/item/weapon/gun/energy/gun/nuclear/shoot_live_shot()
+	failcheck()
 	update_icon()
-	if(user.l_hand == src)
-		user.update_inv_l_hand()
+	..()
+
+/obj/item/weapon/gun/energy/gun/nuclear/proc/failcheck()
+	if(!prob(reliability) && istype(loc, /mob/living))
+		var/mob/living/M = loc
+		switch(fail_tick)
+			if(0 to 200)
+				fail_tick += (2*(100-reliability))
+				M.apply_effect(rand(3,120), IRRADIATE)
+				to_chat(M, "<span class='userdanger'>Your [name] feels warmer.</span>")
+			if(201 to INFINITY)
+				processing_objects.Remove(src)
+				M.apply_effect(300, IRRADIATE)
+				crit_fail = 1
+				to_chat(M, "<span class='userdanger'>Your [name]'s reactor overloads!</span>")
+
+/obj/item/weapon/gun/energy/gun/nuclear/emp_act(severity)
+	..()
+	reliability = max(reliability - round(15/severity), 0) //Do not allow it to go negative!
+
+/obj/item/weapon/gun/energy/gun/nuclear/update_icon()
+	..()
+	if(crit_fail)
+		overlays += "[icon_state]_fail_3"
 	else
-		user.update_inv_r_hand()
\ No newline at end of file
+		switch(fail_tick)
+			if(0)
+				overlays += "[icon_state]_fail_0"
+			if(1 to 150)
+				overlays += "[icon_state]_fail_1"
+			if(151 to INFINITY)
+				overlays += "[icon_state]_fail_2"
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index bc7704d709a..3ffa3b59bbb 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -1,66 +1,28 @@
-/obj/item/weapon/gun/energy/pulse_rifle
+/obj/item/weapon/gun/energy/pulse
 	name = "pulse rifle"
-	desc = "A heavy-duty, pulse-based energy weapon, preferred by front-line combat personnel."
+	desc = "A heavy-duty, multifaceted energy rifle with three modes. Preferred by front-line combat personnel."
 	icon_state = "pulse"
-	item_state = null	//so the human update icon uses the icon_state instead.
+	item_state = null
+	w_class = 4
 	force = 10
-	fire_sound = 'sound/weapons/pulse.ogg'
-	charge_cost = 200
-	projectile_type = "/obj/item/projectile/beam/pulse"
-	cell_type = "/obj/item/weapon/stock_parts/cell/super"
-	var/mode = 2
+	flags =  CONDUCT
 	slot_flags = SLOT_BACK
-	w_class = 4.0
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+	cell_type = "/obj/item/weapon/stock_parts/cell/pulse"
 
-	emp_act()
-		return
+/obj/item/weapon/gun/energy/pulse/emp_act(severity)
+	return
 
-	attack_self(mob/living/user as mob)
-		switch(mode)
-			if(2)
-				mode = 0
-				charge_cost = 50
-				fire_sound = 'sound/weapons/Taser.ogg'
-				to_chat(user, "\red [src.name] is now set to stun.")
-				projectile_type = "/obj/item/projectile/energy/electrode"
-			if(0)
-				mode = 1
-				charge_cost = 100
-				fire_sound = 'sound/weapons/Laser.ogg'
-				to_chat(user, "\red [src.name] is now set to kill.")
-				projectile_type = "/obj/item/projectile/beam"
-			if(1)
-				mode = 2
-				charge_cost = 200
-				fire_sound = 'sound/weapons/pulse.ogg'
-				to_chat(user, "\red [src.name] is now set to DESTROY.")
-				projectile_type = "/obj/item/projectile/beam/pulse"
-		return
-
-	isHandgun()
-		return 0
-
-/obj/item/weapon/gun/energy/pulse_rifle/cyborg/process_chambered()
-	if(in_chamber)
-		return 1
-	if(isrobot(src.loc))
-		var/mob/living/silicon/robot/R = src.loc
-		if(R && R.cell)
-			R.cell.use(charge_cost)
-			in_chamber = new projectile_type(src)
-			return 1
+/obj/item/weapon/gun/energy/pulse/isHandgun()
 	return 0
 
+/obj/item/weapon/gun/energy/pulse/cyborg
 
-/obj/item/weapon/gun/energy/pulse_rifle/destroyer
-	name = "pulse destroyer"
-	desc = "A heavy-duty, pulse-based energy weapon."
-	cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
+/obj/item/weapon/gun/energy/pulse/cyborg/newshot()
+	..()
+	robocharge()
 
-	attack_self(mob/living/user as mob)
-		to_chat(user, "\red [src.name] has three settings, and they are all DESTROY.")
-
-/obj/item/weapon/gun/energy/pulse_rifle/carbine
+/obj/item/weapon/gun/energy/pulse/carbine
 	name = "pulse carbine"
 	desc = "A compact variant of the pulse rifle with less firepower but easier storage."
 	w_class = 3
@@ -69,9 +31,10 @@
 	item_state = "pulse"
 	cell_type = "/obj/item/weapon/stock_parts/cell/pulse/carbine"
 	can_flashlight = 1
+	flight_x_offset = 18
+	flight_y_offset = 12
 
-
-/obj/item/weapon/gun/energy/pulse_rifle/pistol
+/obj/item/weapon/gun/energy/pulse/pistol
 	name = "pulse pistol"
 	desc = "A pulse rifle in an easily concealed handgun package with low capacity."
 	w_class = 2
@@ -79,15 +42,31 @@
 	icon_state = "pulse_pistol"
 	item_state = "gun"
 	cell_type = "/obj/item/weapon/stock_parts/cell/pulse/pistol"
+	can_charge = 0
 
-/obj/item/weapon/gun/energy/pulse_rifle/pistol/isHandgun()
+/obj/item/weapon/gun/energy/pulse/pistol/isHandgun()
 	return 1
 
-/obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911
+/obj/item/weapon/gun/energy/pulse/destroyer
+	name = "pulse destroyer"
+	desc = "A heavy-duty, pulse-based energy weapon."
+	cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse)
+
+/obj/item/weapon/gun/energy/pulse/destroyer/attack_self(mob/living/user)
+	to_chat(user, "<span class='danger'>[name] has three settings, and they are all DESTROY.</span>")
+
+/obj/item/weapon/gun/energy/pulse/destroyer/annihilator
+	name = "pulse ANNIHILATOR"
+	desc = "For when the situation calls for a little more than a pulse destroyer."
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter/pulse)
+
+/obj/item/weapon/gun/energy/pulse/pistol/m1911
 	name = "\improper M1911-P"
 	desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people."
-	icon_state = "m1911-p"
+	icon_state = "m1911"
 	item_state = "gun"
 	cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
-	isHandgun()
-		return 1
\ No newline at end of file
+
+/obj/item/weapon/gun/energy/pulse/pistol/m1911/isHandgun()
+	return 1
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index d6c0ad7beb3..49dbc2bf670 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -8,7 +8,10 @@
 	w_class = 5.0
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
-	projectile_type = "/obj/item/projectile/ion"
+	ammo_type = list(/obj/item/ammo_casing/energy/ion)
+	ammo_x_offset = 3
+	flight_x_offset = 17
+	flight_y_offset = 9
 
 /obj/item/weapon/gun/energy/ionrifle/emp_act(severity)
 	return
@@ -17,10 +20,12 @@
 	name = "ion carbine"
 	desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient."
 	icon_state = "ioncarbine"
-	item_state = "ioncarbine"
 	origin_tech = "combat=4;magnets=4;materials=4"
 	w_class = 3
 	slot_flags = SLOT_BELT
+	ammo_x_offset = 2
+	flight_x_offset = 18
+	flight_y_offset = 11
 
 /obj/item/weapon/gun/energy/decloner
 	name = "biological demolecularisor"
@@ -28,65 +33,38 @@
 	icon_state = "decloner"
 	fire_sound = 'sound/weapons/pulse3.ogg'
 	origin_tech = "combat=5;materials=4;powerstorage=3"
-	projectile_type = "/obj/item/projectile/energy/declone"
+	ammo_type = list(/obj/item/ammo_casing/energy/declone)
+	ammo_x_offset = 1
 
+/obj/item/weapon/gun/energy/decloner/update_icon()
+	..()
+	var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+	if(power_supply.charge > shot.e_cost)
+		overlays += "decloner_spin"
 
 /obj/item/weapon/gun/energy/floragun
 	name = "floral somatoray"
 	desc = "A tool that discharges controlled radiation which induces mutation in plant cells."
-	icon_state = "floramut100"
+	icon_state = "flora"
 	item_state = "gun"
 	fire_sound = 'sound/effects/stealthoff.ogg'
-	projectile_type = "/obj/item/projectile/energy/floramut"
+	ammo_type = list(/obj/item/ammo_casing/energy/flora/yield, /obj/item/ammo_casing/energy/flora/mut)
 	origin_tech = "materials=2;biotech=3;powerstorage=3"
-	modifystate = "floramut"
-	var/mode = 0 //0 = mutate, 1 = yield boost
-	needs_permit = 0
-
-	self_recharge = 1
-
-/obj/item/weapon/gun/energy/floragun/attack_self(mob/living/user as mob)
-	switch(mode)
-		if(0)
-			mode = 1
-			charge_cost = 1000
-			to_chat(user, "\red The [src.name] is now set to increase yield.")
-			projectile_type = "/obj/item/projectile/energy/florayield"
-			modifystate = "florayield"
-		if(1)
-			mode = 0
-			charge_cost = 1000
-			to_chat(user, "\red The [src.name] is now set to induce mutations.")
-			projectile_type = "/obj/item/projectile/energy/floramut"
-			modifystate = "floramut"
-	update_icon()
-	return
-
-
-/obj/item/weapon/gun/energy/floragun/afterattack(obj/target, mob/user, flag)
-
-	if(flag && istype(target,/obj/machinery/portable_atmospherics/hydroponics))
-		var/obj/machinery/portable_atmospherics/hydroponics/tray = target
-		if(process_chambered())
-			user.visible_message("\red <b> \The [user] fires \the [src] into \the [tray]!</b>")
-			Fire(target,user)
-		return
-
-	..()
+	modifystate = 1
+	ammo_x_offset = 1
+	selfcharge = 1
 
 /obj/item/weapon/gun/energy/meteorgun
 	name = "meteor gun"
 	desc = "For the love of god, make sure you're aiming this the right way!"
+	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "riotgun"
 	item_state = "c20r"
 	w_class = 4
-	projectile_type = "/obj/item/projectile/meteor"
+	ammo_type = list(/obj/item/ammo_casing/energy/meteor)
 	cell_type = "/obj/item/weapon/stock_parts/cell/potato"
 	clumsy_check = 0 //Admin spawn only, might as well let clowns use it.
-
-	self_recharge = 1
-	recharge_time = 5 //Time it takes for shots to recharge (in ticks)
-
+	selfcharge = 1
 
 /obj/item/weapon/gun/energy/meteorgun/pen
 	name = "meteor pen"
@@ -98,119 +76,116 @@
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	w_class = 1
 
-
 /obj/item/weapon/gun/energy/mindflayer
 	name = "\improper Mind Flayer"
 	desc = "A prototype weapon recovered from the ruins of Research-Station Epsilon."
 	icon_state = "xray"
-	projectile_type = "/obj/item/projectile/beam/mindflayer"
-	fire_sound = 'sound/weapons/Laser.ogg'
-
-obj/item/weapon/gun/energy/staff/focus
-	name = "mental focus"
-	desc = "An artefact that channels the will of the user into destructive bolts of force. If you aren't careful with it, you might poke someone's brain out."
-	icon = 'icons/obj/wizard.dmi'
-	icon_state = "focus"
-	item_state = "focus"
-	projectile_type = "/obj/item/projectile/forcebolt"
-	/*
-	attack_self(mob/living/user as mob)
-		if(projectile_type == "/obj/item/projectile/forcebolt")
-			charge_cost = 200
-			to_chat(user, "\red The [src.name] will now strike a small area.")
-			projectile_type = "/obj/item/projectile/forcebolt/strong"
-		else
-			charge_cost = 100
-			to_chat(user, "\red The [src.name] will now strike only a single person.")
-			projectile_type = "/obj/item/projectile/forcebolt"
-	*/
-
-/obj/item/weapon/gun/energy/clown
-	name = "HONK Rifle"
-	desc = "Clown Planet's finest."
-	icon_state = "energy"
-	projectile_type = "/obj/item/projectile/clown"
-	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
-	clumsy_check = 0
-
-
-
-/obj/item/weapon/gun/energy/toxgun
-	name = "plasma pistol"
-	desc = "A specialized firearm designed to fire lethal bolts of toxins."
-	icon_state = "toxgun"
-	fire_sound = 'sound/effects/stealthoff.ogg'
-	w_class = 3.0
-	origin_tech = "combat=4;plasmatech=3"
-	projectile_type = "/obj/item/projectile/energy/plasma"
-
-/obj/item/weapon/gun/energy/sniperrifle
-	name = "L.W.A.P. Sniper Rifle"
-	desc = "A rifle constructed of lightweight materials, fitted with a SMART aiming-system scope."
-	icon = 'icons/obj/gun.dmi'
-	icon_state = "esniper"
-	fire_sound = 'sound/weapons/marauder.ogg'
-	origin_tech = "combat=6;materials=5;powerstorage=4"
-	projectile_type = "/obj/item/projectile/beam/sniper"
-	slot_flags = SLOT_BACK
-	charge_cost = 2500
-	fire_delay = 50
-	w_class = 4.0
-	zoomable = TRUE
-	zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
-
+	item_state = null
+	ammo_type = list(/obj/item/ammo_casing/energy/mindflayer)
+	ammo_x_offset = 2
 
 /obj/item/weapon/gun/energy/kinetic_accelerator
 	name = "proto-kinetic accelerator"
 	desc = "According to Nanotrasen accounting, this is mining equipment. It's been modified for extreme power output to crush rocks, but often serves as a miner's first defense against hostile alien life; it's not very powerful unless used in a low pressure environment."
 	icon_state = "kineticgun"
 	item_state = "kineticgun"
-	projectile_type = "/obj/item/projectile/kinetic"
-	fire_sound = 'sound/weapons/Kenetic_accel.ogg'
-	charge_cost = 5000
-	cell_type = "/obj/item/weapon/stock_parts/cell/emproof"
-	needs_permit = 0 // Aparently these are safe to carry? I'm sure Golliaths would disagree.
-	fire_delay = 16 //Because guncode is bad and you can bug the reload for rapid fire otherwise.
-	var/recently_fired = 0
+	ammo_type = list(/obj/item/ammo_casing/energy/kinetic)
+	cell_type = /obj/item/weapon/stock_parts/cell/emproof
+	// Apparently these are safe to carry? I'm sure goliaths would disagree.
+	needs_permit = 0
+	var/overheat_time = 16
+	unique_rename = 1
+	weapon_weight = WEAPON_LIGHT
+	origin_tech = "combat=2;powerstorage=1"
+	var/holds_charge = FALSE
+	var/unique_frequency = FALSE // modified by KA modkits
+
+	var/overheat = FALSE
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/super
 	name = "super-kinetic accelerator"
 	desc = "An upgraded, superior version of the proto-kinetic accelerator."
 	icon_state = "kineticgun_u"
-	projectile_type = "/obj/item/projectile/kinetic/super"
-	fire_delay = 15
+	ammo_type = list(/obj/item/ammo_casing/energy/kinetic/super)
+	overheat_time = 15
 	origin_tech = "combat=3;powerstorage=2"
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/hyper
 	name = "hyper-kinetic accelerator"
 	desc = "An upgraded, even more superior version of the proto-kinetic accelerator."
 	icon_state = "kineticgun_h"
-	projectile_type = "/obj/item/projectile/kinetic/hyper"
-	fire_delay = 13
+	ammo_type = list(/obj/item/ammo_casing/energy/kinetic/hyper)
+	overheat_time = 14
 	origin_tech = "combat=4;powerstorage=3"
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg
-	flags = NODROP
+	holds_charge = TRUE
+	unique_frequency = TRUE
 
-/obj/item/weapon/gun/energy/kinetic_accelerator/Fire()
-	if(!recently_fired)
-		recently_fired = 1
-		spawn(fire_delay)
-			reload(usr)
-	..()
+/obj/item/weapon/gun/energy/kinetic_accelerator/New()
+	. = ..()
+	if(!holds_charge)
+		empty()
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/shoot_live_shot()
+	. = ..()
+	attempt_reload()
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/equipped(mob/user)
+	. = ..()
+	if(!can_shoot())
+		attempt_reload()
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/dropped()
+	. = ..()
+	if(!holds_charge)
+		// Put it on a delay because moving item from slot to hand
+		// calls dropped().
+		spawn(1)
+			if(!ismob(loc))
+				empty()
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty()
+	power_supply.use(5000)
+	update_icon()
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/proc/attempt_reload()
+	if(overheat)
+		return
+	overheat = TRUE
+
+	var/carried = 0
+	if(!unique_frequency)
+		for(var/obj/item/weapon/gun/energy/kinetic_accelerator/K in \
+			loc.GetAllContents())
+
+			carried++
+
+		carried = max(carried, 1)
+	else
+		carried = 1
+
+	spawn(overheat_time * carried)
+		reload()
+		overheat = FALSE
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity)
 	return
 
-/obj/item/weapon/gun/energy/kinetic_accelerator/proc/reload(mob/living/user)
+/obj/item/weapon/gun/energy/kinetic_accelerator/proc/reload()
 	power_supply.give(5000)
-	if(!silenced)
-		playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
-	else if(user)
-		to_chat(usr, "<span class='warning'>You silently charge [src].<span>")
-	recently_fired = 0
+	if(!suppressed)
+		playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
+	else
+		to_chat(loc, "<span class='warning'>[src] silently charges up.<span>")
 	update_icon()
 
+/obj/item/weapon/gun/energy/kinetic_accelerator/update_icon()
+	if(!can_shoot())
+		icon_state = "[initial(icon_state)]_empty"
+	else
+		icon_state = initial(icon_state)
+
 /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow
 	name = "mini energy crossbow"
 	desc = "A weapon favored by syndicate stealth specialists."
@@ -219,10 +194,17 @@ obj/item/weapon/gun/energy/staff/focus
 	w_class = 2
 	materials = list(MAT_METAL=2000)
 	origin_tech = "combat=2;magnets=2;syndicate=5"
-	silenced = 1
-	projectile_type = "/obj/item/projectile/energy/bolt"
-	fire_sound = 'sound/weapons/Genhit.ogg'
-	fire_delay = 20
+	suppressed = 1
+	ammo_type = list(/obj/item/ammo_casing/energy/bolt)
+	weapon_weight = WEAPON_LIGHT
+	unique_rename = 0
+	overheat_time = 20
+	holds_charge = TRUE
+	unique_frequency = TRUE
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/ninja
+	name = "energy dart thrower"
+	ammo_type = list(/obj/item/ammo_casing/energy/dart)
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large
 	name = "energy crossbow"
@@ -231,8 +213,8 @@ obj/item/weapon/gun/energy/staff/focus
 	w_class = 3
 	materials = list(MAT_METAL=4000)
 	origin_tech = "combat=2;magnets=2;syndicate=3" //can be further researched for more syndie tech
-	silenced = 0
-	projectile_type = "/obj/item/projectile/energy/bolt/large"
+	suppressed = 0
+	ammo_type = list(/obj/item/ammo_casing/energy/bolt/large)
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large/cyborg
 	desc = "One and done!"
@@ -240,27 +222,35 @@ obj/item/weapon/gun/energy/staff/focus
 	origin_tech = null
 	materials = list()
 
+/obj/item/weapon/gun/energy/kinetic_accelerator/suicide_act(mob/user)
+	if(!suppressed)
+		playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
+	user.visible_message("<span class='suicide'>[user] cocks the [name] and pretends to blow \his brains out! It looks like \he's trying to commit suicide!</b></span>")
+	shoot_live_shot()
+	return (OXYLOSS)
+
 /obj/item/weapon/gun/energy/plasmacutter
 	name = "plasma cutter"
 	desc = "A mining tool capable of expelling concentrated plasma bursts. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
 	icon_state = "plasmacutter"
 	item_state = "plasmacutter"
-	modifystate = "plasmacutter"
+	modifystate = -1
 	origin_tech = "combat=1;materials=3;magnets=2;plasmatech=2;engineering=1"
-	projectile_type = /obj/item/projectile/plasma
+	ammo_type = list(/obj/item/ammo_casing/energy/plasma)
 	fire_sound = 'sound/weapons/laser.ogg'
 	flags = CONDUCT | OPENCONTAINER
 	attack_verb = list("attacked", "slashed", "cut", "sliced")
-	charge_cost = 250
-	fire_delay = 15
+	force = 12
+	sharp = 1
+	edge = 1
 	can_charge = 0
 
 /obj/item/weapon/gun/energy/plasmacutter/examine(mob/user)
-	..(user)
+	..()
 	if(power_supply)
 		to_chat(user, "<span class='notice'>[src] is [round(power_supply.percent())]% charged.</span>")
 
-/obj/item/weapon/gun/energy/plasmacutter/attackby(var/obj/item/A, var/mob/user)
+/obj/item/weapon/gun/energy/plasmacutter/attackby(obj/item/A, mob/user)
 	if(istype(A, /obj/item/stack/sheet/mineral/plasma))
 		var/obj/item/stack/sheet/S = A
 		S.use(1)
@@ -273,92 +263,35 @@ obj/item/weapon/gun/energy/staff/focus
 	else
 		..()
 
+/obj/item/weapon/gun/energy/plasmacutter/update_icon()
+	return
+
 /obj/item/weapon/gun/energy/plasmacutter/adv
 	name = "advanced plasma cutter"
 	icon_state = "adv_plasmacutter"
 	modifystate = "adv_plasmacutter"
 	origin_tech = "combat=3;materials=4;magnets=3;plasmatech=3;engineering=2"
-	projectile_type = /obj/item/projectile/plasma/adv
-	fire_delay = 10
-	charge_cost = 100
-
-/obj/item/weapon/gun/energy/disabler
-	name = "disabler"
-	desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
-	icon_state = "disabler"
-	item_state = null
-	projectile_type = /obj/item/projectile/beam/disabler
-	fire_sound = 'sound/weapons/taser2.ogg'
-	cell_type = "/obj/item/weapon/stock_parts/cell"
-	charge_cost = 500
-
-/obj/item/weapon/gun/energy/disabler/cyborg
-	name = "cyborg disabler"
-	desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating."
-
-	self_recharge = 1
-	use_external_power = 1
-	recharge_time = 2.5
-
-
-/* 3d printer 'pseudo guns' for borgs */
-
-/obj/item/weapon/gun/energy/printer
-	name = "cyborg lmg"
-	desc = "A machinegun that fires 3d-printed flachettes slowly regenerated using a cyborg's internal power source."
-	icon_state = "l6closed0"
-	icon = 'icons/obj/gun.dmi'
-	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
-	cell_type = "/obj/item/weapon/stock_parts/cell/secborg"
-	projectile_type = "/obj/item/projectile/bullet/midbullet3"
-	charge_cost = 200 //Yeah, let's NOT give them a 300 round clip that recharges, 20 is more reasonable and will actually hurt the borg's battery for overuse.
-
-	self_recharge = 1
-	use_external_power = 1
-	recharge_time = 5
-
-/obj/item/weapon/gun/energy/printer/update_icon()
-	return
+	ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv)
+	force = 15
 
 /obj/item/weapon/gun/energy/wormhole_projector
 	name = "bluespace wormhole projector"
 	desc = "A projector that emits high density quantum-coupled bluespace beams."
-	projectile_type = "/obj/item/projectile/beam/wormhole"
-	charge_cost = 0
-	fire_sound = "sound/weapons/pulse3.ogg"
+	ammo_type = list(/obj/item/ammo_casing/energy/wormhole, /obj/item/ammo_casing/energy/wormhole/orange)
 	item_state = null
 	icon_state = "wormhole_projector100"
-	modifystate = "wormhole_projector"
 	var/obj/effect/portal/blue
 	var/obj/effect/portal/orange
 
-	var/mode = 0 //0 = blue 1 = orange
 
+/obj/item/weapon/gun/energy/wormhole_projector/update_icon()
+	icon_state = "[initial(icon_state)][select]"
+	item_state = icon_state
+	return
 
-/obj/item/weapon/gun/energy/wormhole_projector/attack_self(mob/living/user as mob)
-	switch_modes()
-
-/obj/item/weapon/gun/energy/wormhole_projector/proc/switch_modes(mob/living/user as mob)
-	switch(mode)
-		if(0)
-			mode = 1
-			to_chat(user, "<span class='warning'>[name] is now set to orange.</span>")
-			projectile_type = "/obj/item/projectile/beam/wormhole/orange"
-			modifystate = "wormhole_projector_orange"
-		if(1)
-			mode = 0
-			to_chat(user, "<span class='warning'>[name] is now set to blue.</span>")
-			projectile_type = "/obj/item/projectile/beam/wormhole"
-			modifystate = "wormhole_projector"
-	update_icon()
-	if(user.hand)
-		user.update_inv_l_hand()
-	else
-		user.update_inv_r_hand()
-
-/obj/item/weapon/gun/energy/wormhole_projector/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
+/obj/item/weapon/gun/energy/wormhole_projector/process_chamber()
 	..()
-	switch_modes(user)
+	select_fire()
 
 /obj/item/weapon/gun/energy/wormhole_projector/proc/portal_destroyed(obj/effect/portal/P)
 	if(P.icon_state == "portal")
@@ -373,7 +306,6 @@ obj/item/weapon/gun/energy/staff/focus
 /obj/item/weapon/gun/energy/wormhole_projector/proc/create_portal(obj/item/projectile/beam/wormhole/W)
 	var/obj/effect/portal/P = new /obj/effect/portal(get_turf(W), null, src)
 	P.precision = 0
-	P.failchance = 0
 	if(W.name == "bluespace beam")
 		qdel(blue)
 		blue = P
@@ -383,4 +315,260 @@ obj/item/weapon/gun/energy/staff/focus
 		orange = P
 	if(orange && blue)
 		blue.target = get_turf(orange)
-		orange.target = get_turf(blue)
\ No newline at end of file
+		orange.target = get_turf(blue)
+
+/* 3d printer 'pseudo guns' for borgs */
+
+/obj/item/weapon/gun/energy/printer
+	name = "cyborg lmg"
+	desc = "A machinegun that fires 3d-printed flachettes slowly regenerated using a cyborg's internal power source."
+	icon_state = "l6closed0"
+	icon = 'icons/obj/guns/projectile.dmi'
+	cell_type = "/obj/item/weapon/stock_parts/cell/secborg"
+	ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
+	can_charge = 0
+
+/obj/item/weapon/gun/energy/printer/update_icon()
+	return
+
+/obj/item/weapon/gun/energy/printer/emp_act()
+	return
+
+/obj/item/weapon/gun/energy/printer/newshot()
+	..()
+	robocharge()
+
+/obj/item/weapon/gun/energy/laser/instakill
+	name = "instakill rifle"
+	icon_state = "instagib"
+	item_state = "instagib"
+	desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit."
+	ammo_type = list(/obj/item/ammo_casing/energy/instakill)
+	force = 60
+	origin_tech = null
+
+/obj/item/weapon/gun/energy/laser/instakill/emp_act() //implying you could stop the instagib
+	return
+
+/obj/item/weapon/gun/energy/laser/instakill/red
+	desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a red design."
+	icon_state = "instagibred"
+	item_state = "instagibred"
+	ammo_type = list(/obj/item/ammo_casing/energy/instakill/red)
+
+/obj/item/weapon/gun/energy/laser/instakill/blue
+	desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a blue design."
+	icon_state = "instagibblue"
+	item_state = "instagibblue"
+	ammo_type = list(/obj/item/ammo_casing/energy/instakill/blue)
+
+/obj/item/weapon/gun/energy/clown
+	name = "HONK Rifle"
+	desc = "Clown Planet's finest."
+	icon_state = "disabler"
+	ammo_type = list(/obj/item/ammo_casing/energy/clown)
+	clumsy_check = 0
+
+/obj/item/weapon/gun/energy/toxgun
+	name = "plasma pistol"
+	desc = "A specialized firearm designed to fire lethal bolts of toxins."
+	icon_state = "toxgun"
+	fire_sound = 'sound/effects/stealthoff.ogg'
+	w_class = 3
+	origin_tech = "combat=4;plasmatech=3"
+	ammo_type = list(/obj/item/ammo_casing/energy/toxplasma)
+	shaded_charge = 1
+
+/obj/item/weapon/gun/energy/sniperrifle
+	name = "L.W.A.P. Sniper Rifle"
+	desc = "A rifle constructed of lightweight materials, fitted with a SMART aiming-system scope."
+	icon_state = "esniper"
+	origin_tech = "combat=6;materials=5;powerstorage=4"
+	ammo_type = list(/obj/item/ammo_casing/energy/sniper)
+	slot_flags = SLOT_BACK
+	w_class = 4
+	zoomable = TRUE
+	zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
+	shaded_charge = 1
+
+/obj/item/weapon/gun/energy/temperature
+	name = "temperature gun"
+	icon = 'icons/obj/guns/gun_temperature.dmi'
+	icon_state = "tempgun_4"
+	item_state = "tempgun_4"
+	slot_flags = SLOT_BACK
+	w_class = 4
+	fire_sound = 'sound/weapons/pulse3.ogg'
+	desc = "A gun that changes the body temperature of its targets."
+	var/temperature = 300
+	var/target_temperature = 300
+	var/e_cost = 1000
+	origin_tech = "combat=3;materials=4;powerstorage=3;magnets=2"
+
+	ammo_type = list(/obj/item/ammo_casing/energy/temp)
+	cell_type = "/obj/item/weapon/stock_parts/cell"
+
+	var/powercost = ""
+	var/powercostcolor = ""
+
+	var/emagged = 0			//ups the temperature cap from 500 to 1000, targets hit by beams over 500 Kelvin will burst into flames
+	var/dat = ""
+
+/obj/item/weapon/gun/energy/temperature/New()
+	..()
+	update_icon()
+	processing_objects.Add(src)
+
+
+/obj/item/weapon/gun/energy/temperature/Destroy()
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/item/weapon/gun/energy/temperature/newshot()
+	..()
+	var/obj/item/ammo_casing/energy/temp/T = chambered
+	if(T)
+		T.temperature = temperature
+		T.e_cost = e_cost
+
+/obj/item/weapon/gun/energy/temperature/attack_self(mob/living/user as mob)
+	user.set_machine(src)
+	update_dat()
+	user << browse("<TITLE>Temperature Gun Configuration</TITLE><HR>[dat]", "window=tempgun;size=510x120")
+	onclose(user, "tempgun")
+
+/obj/item/weapon/gun/energy/temperature/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/card/emag) && !emagged)
+		emagged = 1
+		to_chat(user, "<span class='caution'>You double the gun's temperature cap! Targets hit by searing beams will burst into flames!</span>")
+		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 (..())
+		return
+	usr.set_machine(src)
+	add_fingerprint(usr)
+
+	if(href_list["temp"])
+		var/amount = text2num(href_list["temp"])
+		if(amount > 0)
+			target_temperature = min((500 + 500*emagged), target_temperature+amount)
+		else
+			target_temperature = max(0, target_temperature+amount)
+	if (istype(loc, /mob))
+		attack_self(loc)
+	add_fingerprint(usr)
+	return
+
+/obj/item/weapon/gun/energy/temperature/process()
+	switch(temperature)
+		if(0 to 100)
+			e_cost = 3000
+			powercost = "High"
+		if(100 to 250)
+			e_cost = 2000
+			powercost = "Medium"
+		if(251 to 300)
+			e_cost = 1000
+			powercost = "Low"
+		if(301 to 400)
+			e_cost = 2000
+			powercost = "Medium"
+		if(401 to 1000)
+			e_cost = 3000
+			powercost = "High"
+	switch(powercost)
+		if("High")		powercostcolor = "orange"
+		if("Medium")	powercostcolor = "green"
+		else			powercostcolor = "blue"
+	if(target_temperature != temperature)
+		var/difference = abs(target_temperature - temperature)
+		if(difference >= (10 + 40*emagged)) //so emagged temp guns adjust their temperature much more quickly
+			if(target_temperature < temperature)
+				temperature -= (10 + 40*emagged)
+			else
+				temperature += (10 + 40*emagged)
+		else
+			temperature = target_temperature
+		update_icon()
+
+		if (istype(loc, /mob/living/carbon))
+			var /mob/living/carbon/M = loc
+			if (src == M.machine)
+				update_dat()
+				M << browse("<TITLE>Temperature Gun Configuration</TITLE><HR>[dat]", "window=tempgun;size=510x102")
+	return
+
+/obj/item/weapon/gun/energy/temperature/proc/update_dat()
+	dat = ""
+	dat += "Current output temperature: "
+	if(temperature > 500)
+		dat += "<FONT color=red><B>[temperature]</B> ([round(temperature-T0C)]&deg;C)</FONT>"
+		dat += "<FONT color=red><B> SEARING!</B></FONT>"
+	else if(temperature > (T0C + 50))
+		dat += "<FONT color=red><B>[temperature]</B> ([round(temperature-T0C)]&deg;C)</FONT>"
+	else if(temperature > (T0C - 50))
+		dat += "<FONT color=black><B>[temperature]</B> ([round(temperature-T0C)]&deg;C)</FONT>"
+	else
+		dat += "<FONT color=blue><B>[temperature]</B> ([round(temperature-T0C)]&deg;C)</FONT>"
+	dat += "<BR>"
+	dat += "Target output temperature: "	//might be string idiocy, but at least it's easy to read
+	dat += "<A href='?src=\ref[src];temp=-100'>-</A> "
+	dat += "<A href='?src=\ref[src];temp=-10'>-</A> "
+	dat += "<A href='?src=\ref[src];temp=-1'>-</A> "
+	dat += "[target_temperature] "
+	dat += "<A href='?src=\ref[src];temp=1'>+</A> "
+	dat += "<A href='?src=\ref[src];temp=10'>+</A> "
+	dat += "<A href='?src=\ref[src];temp=100'>+</A>"
+	dat += "<BR>"
+	dat += "Power cost: "
+	dat += "<FONT color=[powercostcolor]><B>[powercost]</B></FONT>"
+
+/obj/item/weapon/gun/energy/temperature/proc/update_temperature()
+	switch(temperature)
+		if(501 to INFINITY)
+			item_state = "tempgun_8"
+		if(400 to 500)
+			item_state = "tempgun_7"
+		if(360 to 400)
+			item_state = "tempgun_6"
+		if(335 to 360)
+			item_state = "tempgun_5"
+		if(295 to 335)
+			item_state = "tempgun_4"
+		if(260 to 295)
+			item_state = "tempgun_3"
+		if(200 to 260)
+			item_state = "tempgun_2"
+		if(120 to 260)
+			item_state = "tempgun_1"
+		if(-INFINITY to 120)
+			item_state = "tempgun_0"
+	icon_state = item_state
+
+/obj/item/weapon/gun/energy/temperature/update_icon()
+	overlays = 0
+	update_temperature()
+	update_user()
+	update_charge()
+
+/obj/item/weapon/gun/energy/temperature/proc/update_user()
+	if (istype(loc,/mob/living/carbon))
+		var/mob/living/carbon/M = loc
+		M.update_inv_back()
+		M.update_inv_l_hand()
+		M.update_inv_r_hand()
+
+/obj/item/weapon/gun/energy/temperature/proc/update_charge()
+	var/charge = power_supply.charge
+	switch(charge)
+		if(9000 to INFINITY)		overlays += "900"
+		if(8000 to 9000)			overlays += "800"
+		if(7000 to 8000)			overlays += "700"
+		if(6000 to 7000)			overlays += "600"
+		if(5000 to 6000)			overlays += "500"
+		if(4000 to 5000)			overlays += "400"
+		if(3000 to 4000)			overlays += "300"
+		if(2000 to 3000)			overlays += "200"
+		if(1000 to 2002)			overlays += "100"
+		if(-INFINITY to 1000)	overlays += "0"
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 37d22ba5ff7..6fdbe55c171 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -1,84 +1,67 @@
-
 /obj/item/weapon/gun/energy/taser
 	name = "taser gun"
 	desc = "A small, low capacity gun used for non-lethal takedowns."
 	icon_state = "taser"
 	item_state = null	//so the human update icon uses the icon_state instead.
-	fire_sound = 'sound/weapons/Taser.ogg'
-	projectile_type = "/obj/item/projectile/energy/electrode"
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode)
+	ammo_x_offset = 3
 	cell_type = "/obj/item/weapon/stock_parts/cell/crap"
-	fire_delay = 15
 
 /obj/item/weapon/gun/energy/taser/mounted
 	name = "mounted taser gun"
-	self_recharge = 1
+	selfcharge = 1
 	use_external_power = 1
 
 /obj/item/weapon/gun/energy/taser/cyborg
 	name = "taser gun"
 	desc = "A small, low capacity gun used for non-lethal takedowns."
 	icon_state = "taser"
-	fire_sound = 'sound/weapons/Taser.ogg'
-	projectile_type = "/obj/item/projectile/energy/electrode"
 	cell_type = "/obj/item/weapon/stock_parts/cell/secborg"
 
-	self_recharge = 1
-	recharge_time = 10 //Time it takes for shots to recharge (in ticks)
+/obj/item/weapon/gun/energy/disabler/cyborg/newshot()
+	..()
+	robocharge()
 
 /obj/item/weapon/gun/energy/shock_revolver
 	name = "tesla revolver"
 	desc = "A high-tech revolver that fires internal, reusable shock cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."
 	icon_state = "stunrevolver"
 	item_state = "gun"
-	fire_sound = 'sound/weapons/gunshot.ogg'
-	projectile_type = "/obj/item/projectile/energy/shock_revolver"
-	charge_cost = 2000
+	ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver)
 	can_flashlight = 0
+	shaded_charge = 1
 
-/obj/item/projectile/energy/shock_revolver
-	name = "shock bolt"
-	icon_state = "purple_laser"
-	var/chain
+/obj/item/weapon/gun/energy/gun/advtaser
+	name = "hybrid taser"
+	desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams."
+	icon_state = "advtaser"
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
+	origin_tech = null
+	ammo_x_offset = 2
 
-/obj/item/projectile/energy/shock_revolver/OnFired()
-	spawn(1)
-		chain = Beam(firer, icon_state="purple_lightning", icon = 'icons/effects/effects.dmi',time=1000, maxdistance = 30)
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg
+	name = "cyborg taser"
+	desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
+	can_flashlight = 0
+	can_charge = 0
 
-/obj/item/projectile/energy/shock_revolver/on_hit(atom/target)
-	. = ..()
-	if(isliving(target))
-		tesla_zap(src, 3, 10000)
-	qdel(chain)
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg/newshot()
+	..()
+	robocharge()
 
-/obj/item/weapon/gun/energy/crossbow
-	name = "mini energy-crossbow"
-	desc = "A weapon favored by many of the syndicates stealth specialists."
-	icon_state = "crossbow"
-	w_class = 2.0
-	item_state = "crossbow"
-	materials = list(MAT_METAL=2000)
-	origin_tech = "combat=2;magnets=2;syndicate=5"
-	silenced = 1
-	fire_sound = 'sound/weapons/Genhit.ogg'
-	projectile_type = "/obj/item/projectile/energy/bolt"
-	cell_type = "/obj/item/weapon/stock_parts/cell/crap"
-
-	self_recharge = 1
-
-/obj/item/weapon/gun/energy/crossbow/ninja
-	name = "energy dart thrower"
-	projectile_type = /obj/item/projectile/energy/dart
-
-/obj/item/weapon/gun/energy/crossbow/update_icon()
-	return
-/obj/item/weapon/gun/energy/crossbow/largecrossbow
-	name = "Energy Crossbow"
-	desc = "A weapon favored by syndicate carp hunters."
-	icon_state = "crossbowlarge"
-	silenced = 0
-	w_class = 3.0
-	force = 10
-	materials = list(MAT_METAL=4000)
-	projectile_type = "/obj/item/projectile/energy/bolt/large"
+/obj/item/weapon/gun/energy/disabler
+	name = "disabler"
+	desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
+	icon_state = "disabler"
+	item_state = null
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler)
+	ammo_x_offset = 3
 
+/obj/item/weapon/gun/energy/disabler/cyborg
+	name = "cyborg disabler"
+	desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating."
+	can_charge = 0
 
+/obj/item/weapon/gun/energy/disabler/cyborg/newshot()
+	..()
+	robocharge()
diff --git a/code/modules/projectiles/guns/energy/telegun.dm b/code/modules/projectiles/guns/energy/telegun.dm
index 3819401e031..23dd6455a3e 100644
--- a/code/modules/projectiles/guns/energy/telegun.dm
+++ b/code/modules/projectiles/guns/energy/telegun.dm
@@ -5,11 +5,10 @@
 	desc = "An extremely high-tech bluespace energy gun capable of teleporting targets to far off locations."
 	icon_state = "telegun"
 	item_state = "ionrifle"
-	fire_sound = 'sound/weapons/wave.ogg'
 	origin_tech = "combat=6;materials=7;powerstorage=5;bluespace=5;syndicate=4"
 	cell_type = "/obj/item/weapon/stock_parts/cell/crap"
-	projectile_type = "/obj/item/projectile/energy/teleport"
-	charge_cost = 1250
+	ammo_type = list(/obj/item/ammo_casing/energy/teleport)
+	shaded_charge = 1
 	var/teleport_target = null
 
 /obj/item/weapon/gun/energy/telegun/Destroy()
@@ -36,4 +35,9 @@
 		L[tmpname] = R
 
 	var/desc = input("Please select a location to lock in.", "Telegun Target Interface") in L
-	teleport_target = L[desc]
\ No newline at end of file
+	teleport_target = L[desc]
+
+/obj/item/weapon/gun/energy/telegun/newshot()
+	..()
+	var/obj/item/ammo_casing/energy/teleport/T = chambered
+	T.teleport_target = teleport_target
diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm
deleted file mode 100644
index 1e0eb5d08c2..00000000000
--- a/code/modules/projectiles/guns/energy/temperature.dm
+++ /dev/null
@@ -1,182 +0,0 @@
-/obj/item/weapon/gun/energy/temperature
-	name = "temperature gun"
-	icon = 'icons/obj/gun_temperature.dmi'
-	icon_state = "tempgun_4"
-	item_state = "tempgun_4"
-	slot_flags = SLOT_BACK
-	w_class = 4.0
-	fire_sound = 'sound/weapons/pulse3.ogg'
-	desc = "A gun that changes the body temperature of its targets."
-	var/temperature = 300
-	var/target_temperature = 300
-	charge_cost = 90
-	origin_tech = "combat=3;materials=4;powerstorage=3;magnets=2"
-
-	projectile_type = /obj/item/projectile/temp
-	cell_type = /obj/item/weapon/stock_parts/cell/temperaturegun
-
-	var/powercost = ""
-	var/powercostcolor = ""
-
-	var/emagged = 0			//ups the temperature cap from 500 to 1000, targets hit by beams over 500 Kelvin will burst into flames
-	var/dat = ""
-
-/obj/item/weapon/gun/energy/temperature/New()
-	..()
-	update_icon()
-	processing_objects.Add(src)
-
-
-/obj/item/weapon/gun/energy/temperature/Destroy()
-	processing_objects.Remove(src)
-	return ..()
-
-
-/obj/item/weapon/gun/energy/temperature/attack_self(mob/living/user as mob)
-	user.set_machine(src)
-	update_dat()
-
-	user << browse("<TITLE>Temperature Gun Configuration</TITLE><HR>[dat]", "window=tempgun;size=510x120")
-	onclose(user, "tempgun")
-
-/obj/item/weapon/gun/energy/temperature/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/card/emag) && !emagged)
-		emagged = 1
-		to_chat(user, "<span class='caution'>You double the gun's temperature cap! Targets hit by searing beams will burst into flames!</span>")
-		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 (..())
-		return
-	usr.set_machine(src)
-	add_fingerprint(usr)
-
-	if(href_list["temp"])
-		var/amount = text2num(href_list["temp"])
-		if(amount > 0)
-			target_temperature = min((500 + 500*emagged), target_temperature+amount)
-		else
-			target_temperature = max(0, target_temperature+amount)
-	if (istype(loc, /mob))
-		attack_self(loc)
-	add_fingerprint(usr)
-	return
-
-
-/obj/item/weapon/gun/energy/temperature/process()
-	switch(temperature)
-		if(0 to 100)
-			charge_cost = 300
-			powercost = "High"
-		if(100 to 250)
-			charge_cost = 180
-			powercost = "Medium"
-		if(251 to 300)
-			charge_cost = 90
-			powercost = "Low"
-		if(301 to 400)
-			charge_cost = 180
-			powercost = "Medium"
-		if(401 to 1000)
-			charge_cost = 300
-			powercost = "High"
-	switch(powercost)
-		if("High")		powercostcolor = "orange"
-		if("Medium")	powercostcolor = "green"
-		else			powercostcolor = "blue"
-	if(target_temperature != temperature)
-		var/difference = abs(target_temperature - temperature)
-		if(difference >= (10 + 40*emagged)) //so emagged temp guns adjust their temperature much more quickly
-			if(target_temperature < temperature)
-				temperature -= (10 + 40*emagged)
-			else
-				temperature += (10 + 40*emagged)
-		else
-			temperature = target_temperature
-		update_icon()
-
-		if (istype(loc, /mob/living/carbon))
-			var /mob/living/carbon/M = loc
-			if (src == M.machine)
-				update_dat()
-				M << browse("<TITLE>Temperature Gun Configuration</TITLE><HR>[dat]", "window=tempgun;size=510x102")
-
-
-	if(power_supply)
-		power_supply.give(50)
-		update_icon()
-	return
-
-/obj/item/weapon/gun/energy/temperature/proc/update_dat()
-	dat = ""
-	dat += "Current output temperature: "
-	if(temperature > 500)
-		dat += "<FONT color=red><B>[temperature]</B> ([round(temperature-T0C)]&deg;C)</FONT>"
-		dat += "<FONT color=red><B> SEARING!</B></FONT>"
-	else if(temperature > (T0C + 50))
-		dat += "<FONT color=red><B>[temperature]</B> ([round(temperature-T0C)]&deg;C)</FONT>"
-	else if(temperature > (T0C - 50))
-		dat += "<FONT color=black><B>[temperature]</B> ([round(temperature-T0C)]&deg;C)</FONT>"
-	else
-		dat += "<FONT color=blue><B>[temperature]</B> ([round(temperature-T0C)]&deg;C)</FONT>"
-	dat += "<BR>"
-	dat += "Target output temperature: "	//might be string idiocy, but at least it's easy to read
-	dat += "<A href='?src=\ref[src];temp=-100'>-</A> "
-	dat += "<A href='?src=\ref[src];temp=-10'>-</A> "
-	dat += "<A href='?src=\ref[src];temp=-1'>-</A> "
-	dat += "[target_temperature] "
-	dat += "<A href='?src=\ref[src];temp=1'>+</A> "
-	dat += "<A href='?src=\ref[src];temp=10'>+</A> "
-	dat += "<A href='?src=\ref[src];temp=100'>+</A>"
-	dat += "<BR>"
-	dat += "Power cost: "
-	dat += "<FONT color=[powercostcolor]><B>[powercost]</B></FONT>"
-
-/obj/item/weapon/gun/energy/temperature/proc/update_temperature()
-	switch(temperature)
-		if(501 to INFINITY)
-			item_state = "tempgun_8"
-		if(400 to 500)
-			item_state = "tempgun_7"
-		if(360 to 400)
-			item_state = "tempgun_6"
-		if(335 to 360)
-			item_state = "tempgun_5"
-		if(295 to 335)
-			item_state = "tempgun_4"
-		if(260 to 295)
-			item_state = "tempgun_3"
-		if(200 to 260)
-			item_state = "tempgun_2"
-		if(120 to 260)
-			item_state = "tempgun_1"
-		if(-INFINITY to 120)
-			item_state = "tempgun_0"
-	icon_state = item_state
-
-/obj/item/weapon/gun/energy/temperature/proc/update_charge()
-	var/charge = power_supply.charge
-	switch(charge)
-		if(900 to INFINITY)		overlays += "900"
-		if(800 to 900)			overlays += "800"
-		if(700 to 800)			overlays += "700"
-		if(600 to 700)			overlays += "600"
-		if(500 to 600)			overlays += "500"
-		if(400 to 500)			overlays += "400"
-		if(300 to 400)			overlays += "300"
-		if(200 to 300)			overlays += "200"
-		if(100 to 200)			overlays += "100"
-		if(-INFINITY to 100)	overlays += "0"
-
-/obj/item/weapon/gun/energy/temperature/proc/update_user()
-	if (istype(loc,/mob/living/carbon))
-		var/mob/living/carbon/M = loc
-		M.update_inv_back()
-		M.update_inv_l_hand()
-		M.update_inv_r_hand()
-
-/obj/item/weapon/gun/energy/temperature/update_icon()
-	overlays = 0
-	update_temperature()
-	update_user()
-	update_charge()
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm
new file mode 100644
index 00000000000..5abac9ebad9
--- /dev/null
+++ b/code/modules/projectiles/guns/grenade_launcher.dm
@@ -0,0 +1,54 @@
+/obj/item/weapon/gun/grenadelauncher
+	name = "grenade launcher"
+	desc = "a terrible, terrible thing. it's really awful!"
+	icon = 'icons/obj/guns/projectile.dmi'
+	icon_state = "riotgun"
+	item_state = "riotgun"
+	w_class = 4
+	throw_speed = 2
+	throw_range = 10
+	force = 5
+	var/list/grenades = new/list()
+	var/max_grenades = 3
+
+	materials = list(MAT_METAL=2000)
+
+/obj/item/weapon/gun/grenadelauncher/examine(mob/user)
+	if(..(user, 2))
+		to_chat(user, "<span class='notice'>[grenades.len] / [max_grenades] grenades.</span>")
+
+/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params)
+	if((istype(I, /obj/item/weapon/grenade)))
+		if(grenades.len < max_grenades)
+			if(!user.unEquip(I))
+				return
+			I.loc = src
+			grenades += I
+			to_chat(user, "<span class='notice'>You put the grenade in the [name].</span>")
+			to_chat(user, "<span class='notice'>[grenades.len] / [max_grenades] grenades.</span>")
+		else
+			to_chat(user, "<span class='warning'>The grenade launcher cannot hold more grenades.</span>")
+
+/obj/item/weapon/gun/grenadelauncher/afterattack(obj/target, mob/user , flag)
+	if(target == user)
+		return
+
+	if(grenades.len)
+		fire_grenade(target,user)
+	else
+		to_chat(user, "<span class='danger'>The grenade launcher is empty.</span>")
+
+/obj/item/weapon/gun/grenadelauncher/proc/fire_grenade(atom/target, mob/user)
+	user.visible_message("<span class='danger'>[user] fired a grenade!</span>", \
+						"<span class='danger'>You fire the grenade launcher!</span>")
+	var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta!
+	grenades -= F
+	F.loc = user.loc
+	F.throw_at(target, 30, 2, user)
+	message_admins("[key_name_admin(user)] fired a grenade ([F.name]) from a grenade launcher ([name]).")
+	log_game("[key_name(user)] fired a grenade ([F.name]) from a grenade launcher ([name]).")
+	F.active = 1
+	F.icon_state = initial(icon_state) + "_active"
+	playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+	spawn(15)
+		F.prime()
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 13f92bcef86..870ae85bc63 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -1,35 +1,29 @@
 /obj/item/weapon/gun/magic
 	name = "staff of nothing"
 	desc = "This staff is boring to watch because even though it came first you've seen everything it can do in other staves for years."
-	icon = 'icons/obj/gun.dmi'
+	icon = 'icons/obj/guns/magic.dmi'
 	icon_state = "staffofnothing"
 	item_state = "staff"
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	fire_sound = 'sound/weapons/emitter.ogg'
+	fire_sound_text = "energy blast"
 	flags =  CONDUCT
 	w_class = 5
-	var/projectile_type = /obj/item/projectile/magic
 	var/max_charges = 6
 	var/charges = 0
 	var/recharge_rate = 4
 	var/charge_tick = 0
 	var/can_charge = 1
+	var/ammo_type
 	var/no_den_usage
 	origin_tech = null
 	clumsy_check = 0
+	trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses magic instead
 
-/obj/item/weapon/gun/magic/emp_act(severity)
-	return
+	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
+	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 
-/obj/item/weapon/gun/magic/process_chambered()
-		if(in_chamber)	return 1
-		if(!charges)	return 0
-		if(!projectile_type)	return 0
-		in_chamber = new projectile_type(src)
-		return 1
-
-/obj/item/weapon/gun/magic/afterattack(atom/target as mob, mob/living/user as mob, flag)
+/obj/item/weapon/gun/magic/afterattack(atom/target, mob/living/user, flag)
+	newshot()
 	if(no_den_usage)
 		var/area/A = get_area(user)
 		if(istype(A, /area/wizard_station))
@@ -38,22 +32,38 @@
 		else
 			no_den_usage = 0
 	..()
-	if(charges && !in_chamber && !flag)	charges--
+
+/obj/item/weapon/gun/magic/can_shoot()
+	return charges
+
+/obj/item/weapon/gun/magic/newshot()
+	if (charges && chambered)
+		chambered.newshot()
+	return
+
+/obj/item/weapon/gun/magic/process_chamber()
+	if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired...
+		charges--//... drain a charge
+	return
 
 /obj/item/weapon/gun/magic/New()
 	..()
 	charges = max_charges
-	if(can_charge)	processing_objects.Add(src)
+	chambered = new ammo_type(src)
+	if(can_charge)
+		processing_objects.Add(src)
 
 
 /obj/item/weapon/gun/magic/Destroy()
-	if(can_charge)	processing_objects.Remove(src)
+	if(can_charge)
+		processing_objects.Remove(src)
 	return ..()
 
 
 /obj/item/weapon/gun/magic/process()
 	charge_tick++
-	if(charge_tick < recharge_rate || charges >= max_charges) return 0
+	if(charge_tick < recharge_rate || charges >= max_charges)
+		return 0
 	charge_tick = 0
 	charges++
 	return 1
@@ -63,4 +73,9 @@
 
 /obj/item/weapon/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj)
 	to_chat(user, "<span class='warning'>The [name] whizzles quietly.<span>")
-	return
\ No newline at end of file
+	return
+
+/obj/item/weapon/gun/magic/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is twisting the [name] above \his head, releasing a magical blast! It looks like \he's trying to commit suicide.</span>")
+	playsound(loc, fire_sound, 50, 1, -1)
+	return FIRELOSS
diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index 16fc552397d..85b483b8363 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -4,49 +4,61 @@ obj/item/weapon/gun/magic/staff/
 obj/item/weapon/gun/magic/staff/change
 	name = "staff of change"
 	desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
-	projectile_type = "/obj/item/projectile/magic/change"
+	ammo_type = /obj/item/ammo_casing/magic/change
 	icon_state = "staffofchange"
 	item_state = "staffofchange"
 
 obj/item/weapon/gun/magic/staff/animate
 	name = "staff of animation"
 	desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."
-	projectile_type = "/obj/item/projectile/magic/animate"
+	ammo_type = /obj/item/ammo_casing/magic/animate
 	icon_state = "staffofanimation"
 	item_state = "staffofanimation"
 
 obj/item/weapon/gun/magic/staff/healing
 	name = "staff of healing"
 	desc = "An artefact that spits bolts of restoring magic which can remove ailments of all kinds and even raise the dead."
-	projectile_type = "/obj/item/projectile/magic/resurrection"
+	ammo_type = /obj/item/ammo_casing/magic/heal
 	icon_state = "staffofhealing"
 	item_state = "staffofhealing"
 
+/obj/item/weapon/gun/magic/staff/healing/handle_suicide() //Stops people trying to commit suicide to heal themselves
+	return
+
 obj/item/weapon/gun/magic/staff/chaos
 	name = "staff of chaos"
 	desc = "An artefact that spits bolts of chaotic magic that can potentially do anything."
-	projectile_type = "/obj/item/projectile/magic"
+	ammo_type = /obj/item/ammo_casing/magic/chaos
 	icon_state = "staffofchaos"
 	item_state = "staffofchaos"
 	max_charges = 10
 	recharge_rate = 2
-
 	no_den_usage = 1
 
-/obj/item/weapon/gun/magic/staff/chaos/process_chambered() //Snowflake proc, because this uses projectile_type instead of ammo_casing for whatever reason.
-	projectile_type = pick(typesof(/obj/item/projectile/magic))
-	if(in_chamber)	return 1
-	if(!charges)	return 0
-	in_chamber = new projectile_type(src)
-	return 1
-
 obj/item/weapon/gun/magic/staff/door
 	name = "staff of door creation"
 	desc = "An artefact that spits bolts of transformative magic that can create doors in walls."
-	projectile_type = "/obj/item/projectile/magic/door"
+	ammo_type = /obj/item/ammo_casing/magic/door
 	icon_state = "staffofdoor"
 	item_state = "staffofdoor"
 	max_charges = 10
 	recharge_rate = 2
+	no_den_usage = 1
 
-	no_den_usage = 1
\ No newline at end of file
+/obj/item/weapon/gun/magic/staff/honk
+	name = "staff of the honkmother"
+	desc = "Honk"
+	fire_sound = "sound/items/airhorn.ogg"
+	ammo_type = /obj/item/ammo_casing/magic/honk
+	icon_state = "honker"
+	item_state = "honker"
+	max_charges = 4
+	recharge_rate = 8
+
+obj/item/weapon/gun/magic/staff/focus
+	name = "mental focus"
+	desc = "An artefact that channels the will of the user into destructive bolts of force. If you aren't careful with it, you might poke someone's brain out."
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "focus"
+	item_state = "focus"
+	ammo_type = list(/obj/item/ammo_casing/forcebolt)
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index 6be4e0936bf..abde404e87d 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -1,21 +1,13 @@
 /obj/item/weapon/gun/magic/wand/
 	name = "wand of nothing"
 	desc = "It's not just a stick, it's a MAGIC stick!"
-	projectile_type = "/obj/item/projectile/magic"
+	ammo_type = /obj/item/ammo_casing/magic
 	icon_state = "nothingwand"
 	item_state = "wand"
 	w_class = 2
 	can_charge = 0
 	max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
 	var/variable_charges = 1
-	var/drained = 0
-
-/obj/item/projectile/magic/fireball/Range()
-	var/mob/living/L = locate(/mob/living) in (range(src, 1) - firer)
-	if(L && L.stat != DEAD)
-		Bump(L) //Magic Bullet #teachthecontroversy
-		return
-	..()
 
 /obj/item/weapon/gun/magic/wand/New()
 	if(prob(75) && variable_charges) //25% chance of listed max charges, 50% chance of 1/2 max charges, 25% chance of 1/3 max charges
@@ -26,26 +18,21 @@
 	..()
 
 /obj/item/weapon/gun/magic/wand/examine(mob/user)
-	..(user)
+	..()
 	to_chat(user, "Has [charges] charge\s remaining.")
 
-/obj/item/weapon/gun/magic/wand/attack_self(mob/living/user as mob)
-	if(charges)
-		zap_self(user)
-	else
-		to_chat(user, "<span class='caution'>The [name] whizzles quietly.<span>")
-	..()
+/obj/item/weapon/gun/magic/wand/update_icon()
+	icon_state = "[initial(icon_state)][charges ? "" : "-drained"]"
 
-/obj/item/weapon/gun/magic/wand/attack(atom/target as mob, mob/living/user as mob)
+
+/obj/item/weapon/gun/magic/wand/attack(atom/target, mob/living/user)
 	if(target == user)
 		return
 	..()
 
-/obj/item/weapon/gun/magic/wand/afterattack(atom/target as mob, mob/living/user as mob)
-	if(!charges && !drained)
-		to_chat(user, "<span class='warning'>The [name] whizzles quietly.<span>")
-		icon_state = "[icon_state]-drained"
-		drained = 1
+/obj/item/weapon/gun/magic/wand/afterattack(atom/target, mob/living/user)
+	if(!charges)
+		shoot_with_empty_chamber(user)
 		return
 	if(target == user)
 		if(no_den_usage)
@@ -53,74 +40,83 @@
 			if(istype(A, /area/wizard_station))
 				to_chat(user, "<span class='warning'>You know better than to violate the security of The Den, best wait until you leave to use [src].<span>")
 				return
-		else
-			no_den_usage = 0
+			else
+				no_den_usage = 0
 		zap_self(user)
 	else
 		..()
+	update_icon()
 
-/obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user as mob)
-	user.visible_message("<span class='notice'>[user] zaps \himself with [src]!</span>")
+/obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user)
+	user.visible_message("<span class='danger'>[user] zaps \himself with [src].</span>")
+	playsound(user, fire_sound, 50, 1)
+	user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> zapped \himself with a <b>[src]</b>"
+
+/////////////////////////////////////
+//WAND OF DEATH
+/////////////////////////////////////
 
 /obj/item/weapon/gun/magic/wand/death
 	name = "wand of death"
 	desc = "This deadly wand overwhelms the victim's body with pure energy, slaying them without fail."
-	projectile_type = "/obj/item/projectile/magic/death"
+	ammo_type = /obj/item/ammo_casing/magic/death
 	icon_state = "deathwand"
 	max_charges = 3 //3, 2, 2, 1
 
-/obj/item/weapon/gun/magic/wand/death/zap_self(mob/living/user as mob)
-	if(alert(user, "You really want to zap yourself with the wand of death?",, "Yes", "No") == "Yes" && charges && user.get_active_hand() == src && isliving(user))
-		var/message ="<span class='warning'>You irradiate yourself with pure energy! "
-		message += pick("Do not pass go. Do not collect 200 zorkmids.</span>","You feel more confident in your spell casting skills.</span>","You Die...</span>","Do you want your possessions identified?</span>")
-		to_chat(user, message)
-		user.adjustOxyLoss(500)
-		charges--
-		..()
+/obj/item/weapon/gun/magic/wand/death/zap_self(mob/living/user)
+	var/message ="<span class='warning'>You irradiate yourself with pure energy! "
+	message += pick("Do not pass go. Do not collect 200 zorkmids.</span>","You feel more confident in your spell casting skills.</span>","You Die...</span>","Do you want your possessions identified?</span>")
+	to_chat(user, message)
+	user.adjustFireLoss(500)
+	charges--
+	..()
+
+/////////////////////////////////////
+//WAND OF HEALING
+/////////////////////////////////////
 
 /obj/item/weapon/gun/magic/wand/resurrection
 	name = "wand of resurrection"
 	desc = "This wand uses healing magics to heal and revive. They are rarely utilized within the Wizard Federation for some reason."
-	projectile_type = "/obj/item/projectile/magic/resurrection"
+	ammo_type = /obj/item/ammo_casing/magic/heal
 	icon_state = "revivewand"
 	max_charges = 3 //3, 2, 2, 1
 
-/obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user as mob)
-	user.setToxLoss(0)
-	user.setOxyLoss(0)
-	user.setCloneLoss(0)
-	user.SetParalysis(0)
-	user.SetStunned(0)
-	user.SetWeakened(0)
-	user.radiation = 0
-	user.heal_overall_damage(user.getBruteLoss(), user.getFireLoss())
-	user.reagents.clear_reagents()
+/obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user)
+	user.revive()
 	to_chat(user, "<span class='notice'>You feel great!</span>")
 	charges--
 	..()
 
+/////////////////////////////////////
+//WAND OF POLYMORPH
+/////////////////////////////////////
+
 /obj/item/weapon/gun/magic/wand/polymorph
 	name = "wand of polymorph"
 	desc = "This wand is attuned to chaos and will radically alter the victim's form."
-	projectile_type = "/obj/item/projectile/magic/change"
+	ammo_type = /obj/item/ammo_casing/magic/change
 	icon_state = "polywand"
 	max_charges = 10 //10, 5, 5, 4
 
-/obj/item/weapon/gun/magic/wand/polymorph/zap_self(mob/living/user as mob)
-	if(alert(user, "Your new form might not have arms to zap with... Continue?",, "Yes", "No") == "Yes" && charges && user.get_active_hand() == src && isliving(user))
-		..() //because the user mob ceases to exists by the time wabbajack fully resolves
-		wabbajack(user)
-		charges--
+/obj/item/weapon/gun/magic/wand/polymorph/zap_self(mob/living/user)
+	..() //because the user mob ceases to exists by the time wabbajack fully resolves
+	wabbajack(user)
+	charges--
+
+/////////////////////////////////////
+//WAND OF TELEPORTATION
+/////////////////////////////////////
 
 /obj/item/weapon/gun/magic/wand/teleport
 	name = "wand of teleportation"
 	desc = "This wand will wrench targets through space and time to move them somewhere else."
-	projectile_type = "/obj/item/projectile/magic/teleport"
+	ammo_type = /obj/item/ammo_casing/magic/teleport
 	icon_state = "telewand"
 	max_charges = 10 //10, 5, 5, 4
 	no_den_usage = 1
 
-/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user as mob)
+/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user)
 	do_teleport(user, user, 10)
 	var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
 	smoke.set_up(10, 0, user.loc)
@@ -128,25 +124,34 @@
 	charges--
 	..()
 
+/////////////////////////////////////
+//WAND OF DOOR CREATION
+/////////////////////////////////////
+
 /obj/item/weapon/gun/magic/wand/door
 	name = "wand of door creation"
 	desc = "This particular wand can create doors in any wall for the unscrupulous wizard who shuns teleportation magics."
-	projectile_type = "/obj/item/projectile/magic/door"
+	ammo_type = /obj/item/ammo_casing/magic/door
 	icon_state = "doorwand"
 	max_charges = 20 //20, 10, 10, 7
 
-/obj/item/weapon/gun/magic/wand/door/zap_self()
-	return
+/obj/item/weapon/gun/magic/wand/door/zap_self(mob/living/user)
+	to_chat(user, "<span class='notice'>You feel vaguely more open with your feelings.</span>")
+	charges--
+	..()
+
+/////////////////////////////////////
+//WAND OF FIREBALL
+/////////////////////////////////////
 
 /obj/item/weapon/gun/magic/wand/fireball
 	name = "wand of fireball"
 	desc = "This wand shoots scorching balls of fire that explode into destructive flames."
-	projectile_type = "/obj/item/projectile/magic/fireball"
+	ammo_type = /obj/item/ammo_casing/magic/fireball
 	icon_state = "firewand"
 	max_charges = 8 //8, 4, 4, 3
 
-/obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user as mob)
-	if(alert(user, "Zapping yourself with a wand of fireball is probably a bad idea, do it anyway?",, "Yes", "No") == "Yes" && charges && user.get_active_hand() == src && isliving(user))
-		explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
-		charges--
-		..()
\ No newline at end of file
+/obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user)
+	explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
+	charges--
+	..()
diff --git a/code/modules/projectiles/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
similarity index 91%
rename from code/modules/projectiles/medbeam.dm
rename to code/modules/projectiles/guns/medbeam.dm
index 04f8f4b6862..032874c4918 100644
--- a/code/modules/projectiles/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/chronos.dmi'
 	icon_state = "chronogun"
 	item_state = "chronogun"
-	w_class = 3.0
+	w_class = 3
 
 	var/mob/living/current_target
 	var/last_check = 0
@@ -13,7 +13,7 @@
 	var/active = 0
 	var/datum/beam/current_beam = null
 
-	heavy_weapon = 1
+	weapon_weight = WEAPON_MEDIUM
 
 /obj/item/weapon/gun/medbeam/New()
 	..()
@@ -34,7 +34,7 @@
 		on_beam_release(current_target)
 	current_target = null
 
-/obj/item/weapon/gun/medbeam/Fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
+/obj/item/weapon/gun/medbeam/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
 	add_fingerprint(user)
 
 	if(current_target)
@@ -48,7 +48,7 @@
 	spawn(0)
 		current_beam.Start()
 
-	feedback_add_details("gun_fired","[src.type]")
+	feedback_add_details("gun_fired","[type]")
 
 /obj/item/weapon/gun/medbeam/process()
 	var/mob/living/carbon/human/H = loc
@@ -113,4 +113,4 @@
 	return
 
 /obj/effect/ebeam/medical
-	name = "medical beam"
\ No newline at end of file
+	name = "medical beam"
diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm
index d0e023d0d6d..ae9c8f06d09 100644
--- a/code/modules/projectiles/guns/mounted.dm
+++ b/code/modules/projectiles/guns/mounted.dm
@@ -1,31 +1,30 @@
-/obj/item/weapon/gun/energy/advtaser/mounted
+/obj/item/weapon/gun/energy/gun/advtaser/mounted
 	name = "mounted taser"
 	desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
-	icon_state = "armcannonstun"
-	item_state = "armcannonstun"
-	modifystate = "armcannonstun"
+	icon_state = "armcannon"
 	force = 5
-	self_recharge = 1
 	flags = NODROP
-	slot_flags = null
-	w_class = 5.0
+	w_class = 5
 	can_flashlight = 0
+	selfcharge = 1
+	trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses neural signals instead
 
-/obj/item/weapon/gun/energy/advtaser/mounted/dropped()//if somebody manages to drop this somehow...
-	src.loc = null//send it to nullspace to get retrieved by the implant later on. gotta cover those edge cases.
+/obj/item/weapon/gun/energy/gun/advtaser/mounted/dropped()//if somebody manages to drop this somehow...
+	..()
+	loc = null//send it to nullspace to get retrieved by the implant later on. gotta cover those edge cases.
 
 /obj/item/weapon/gun/energy/laser/mounted
 	name = "mounted laser"
 	desc = "An arm mounted cannon that fires lethal lasers. Doesn't come with a charge beam."
-	icon_state = "armcannonlase"
+	icon_state = "armcannon"
 	item_state = "armcannonlase"
-	modifystate = "armcannonlase"
 	force = 5
-	self_recharge = 1
 	flags = NODROP
-	slot_flags = null
-	w_class = 5.0
+	w_class = 5
 	materials = null
+	selfcharge = 1
+	trigger_guard = TRIGGER_GUARD_ALLOW_ALL
 
 /obj/item/weapon/gun/energy/laser/mounted/dropped()
-	src.loc = null
\ No newline at end of file
+	..()
+	loc = null
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index ffe2cd269b5..03519770eee 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -1,22 +1,13 @@
-#define SPEEDLOADER 0
-#define FROM_BOX 1
-#define MAGAZINE 2
-
 /obj/item/weapon/gun/projectile
 	desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason"
 	name = "projectile gun"
 	icon_state = "pistol"
 	origin_tech = "combat=2;materials=2"
-	w_class = 3.0
+	w_class = 3
 	materials = list(MAT_METAL=1000)
-//	recoil = 1
-	var/mag_type = "/obj/item/ammo_box/magazine/m10mm" //Removes the need for max_ammo and caliber info
+
+	var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
 	var/obj/item/ammo_box/magazine/magazine
-//	var/obj/item/ammo_casing/chambered = null // The round (not bullet) that is in the chamber.
-
-
-
-
 
 /obj/item/weapon/gun/projectile/New()
 	..()
@@ -26,31 +17,26 @@
 	update_icon()
 	return
 
+/obj/item/weapon/gun/projectile/update_icon()
+	..()
+	if(current_skin)
+		icon_state = "[current_skin][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""]"
+	else
+		icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""]"
 
-/obj/item/weapon/gun/projectile/process_chambered(var/eject_casing = 1, var/empty_chamber = 1 )
-//	if(in_chamber)
-//		return 1
-
+/obj/item/weapon/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1)
 	var/obj/item/ammo_casing/AC = chambered //Find chambered round
 	if(isnull(AC) || !istype(AC))
-		return 0
+		chamber_round()
+		return
 	if(eject_casing)
 		AC.loc = get_turf(src) //Eject casing onto ground.
 		AC.SpinAnimation(10, 1) //next gen special effects
+
 	if(empty_chamber)
 		chambered = null
 	chamber_round()
-	if(AC.BB)
-		if(AC.reagents && AC.BB.reagents)
-			var/datum/reagents/casting_reagents = AC.reagents
-			casting_reagents.trans_to(AC.BB, casting_reagents.total_volume) //For chemical darts/bullets
-			qdel(casting_reagents)
-		in_chamber = AC.BB //Load projectile into chamber.
-		AC.BB.loc = src //Set projectile loc to gun.
-		AC.update_icon()
-		return 1
-	return 0
-
+	return
 
 /obj/item/weapon/gun/projectile/proc/chamber_round()
 	if(chambered || !magazine)
@@ -60,12 +46,16 @@
 		chambered.loc = src
 	return
 
+/obj/item/weapon/gun/projectile/can_shoot()
+	if(!magazine || !magazine.ammo_count(0))
+		return 0
+	return 1
 
 /obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob, params)
 	..()
 	if(istype(A, /obj/item/ammo_box/magazine))
 		var/obj/item/ammo_box/magazine/AM = A
-		if(!magazine && istype(AM, text2path(mag_type)))
+		if(!magazine && istype(AM, mag_type))
 			user.remove_from_mob(AM)
 			magazine = AM
 			magazine.loc = src
@@ -79,13 +69,11 @@
 	if(istype(A, /obj/item/weapon/suppressor))
 		var/obj/item/weapon/suppressor/S = A
 		if(can_suppress)
-			if(!silenced)
-				if(user.l_hand != src && user.r_hand != src)
-					to_chat(user, "<span class='notice'>You'll need [src] in your hands to do that.</span>")
+			if(!suppressed)
+				if(!user.unEquip(A))
 					return
-				user.drop_item()
 				to_chat(user, "<span class='notice'>You screw [S] onto [src].</span>")
-				silenced = A
+				suppressed = A
 				S.oldsound = fire_sound
 				S.initial_w_class = w_class
 				fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
@@ -101,39 +89,45 @@
 			return
 	return 0
 
-/obj/item/weapon/gun/projectile/attack_hand(mob/user as mob)
+/obj/item/weapon/gun/projectile/attack_hand(mob/user)
 	if(loc == user)
-		if(silenced && can_unsuppress)
-			var/obj/item/weapon/suppressor/S = silenced
+		if(suppressed && can_unsuppress)
+			var/obj/item/weapon/suppressor/S = suppressed
 			if(user.l_hand != src && user.r_hand != src)
 				..()
 				return
-			to_chat(user, "<span class='notice'>You unscrew [silenced] from [src].</span>")
-			user.put_in_hands(silenced)
+			to_chat(user, "<span class='notice'>You unscrew [suppressed] from [src].</span>")
+			user.put_in_hands(suppressed)
 			fire_sound = S.oldsound
 			w_class = S.initial_w_class
-			silenced = 0
+			suppressed = 0
 			update_icon()
 			return
 	..()
 
 /obj/item/weapon/gun/projectile/attack_self(mob/living/user as mob)
+	var/obj/item/ammo_casing/AC = chambered //Find chambered round
 	if(magazine)
-		magazine.loc = get_turf(src.loc)
+		magazine.loc = get_turf(loc)
 		user.put_in_hands(magazine)
 		magazine.update_icon()
 		magazine = null
 		to_chat(user, "<span class='notice'>You pull the magazine out of \the [src]!</span>")
+	else if(chambered)
+		AC.loc = get_turf(src)
+		AC.SpinAnimation(10, 1)
+		chambered = null
+		to_chat(user, "<span class='notice'>You unload the round from \the [src]'s chamber.</span>")
 	else
 		to_chat(user, "<span class='notice'>There's no magazine in \the [src].</span>")
 	update_icon()
 	return
 
 /obj/item/weapon/gun/projectile/examine(mob/user)
-	..(user)
+	..()
 	to_chat(user, "Has [get_ammo()] round\s remaining.")
 
-/obj/item/weapon/gun/projectile/proc/get_ammo(var/countchambered = 1)
+/obj/item/weapon/gun/projectile/proc/get_ammo(countchambered = 1)
 	var/boolets = 0 //mature var names for mature people
 	if(chambered && countchambered)
 		boolets++
@@ -141,12 +135,68 @@
 		boolets += magazine.ammo_count()
 	return boolets
 
+/obj/item/weapon/gun/projectile/suicide_act(mob/user)
+	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)
+			process_fire(user, user, 0, zone_override = "head")
+			user.visible_message("<span class='suicide'>[user] blows \his brains out with the [name]!</span>")
+			return(BRUTELOSS)
+		else
+			user.visible_message("<span class='suicide'>[user] panics and starts choking to death!</span>")
+			return(OXYLOSS)
+	else
+		user.visible_message("<span class='suicide'>[user] is pretending to blow \his brains out with the [name]! It looks like \he's trying to commit suicide!</b></span>")
+		playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
+		return (OXYLOSS)
+
+/obj/item/weapon/gun/projectile/proc/sawoff(mob/user)
+	if(sawn_state == SAWN_OFF)
+		to_chat(user, "<span class='warning'>\The [src] is already shortened!</span>")
+		return
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.visible_message("[user] begins to shorten \the [src].", "<span class='notice'>You begin to shorten \the [src]...</span>")
+
+	//if there's any live ammo inside the gun, makes it go off
+	if(blow_up(user))
+		user.visible_message("<span class='danger'>\The [src] goes off!</span>", "<span class='danger'>\The [src] goes off in your face!</span>")
+		return
+
+	if(do_after(user, 30, target = src))
+		if(sawn_state == SAWN_OFF)
+			return
+		user.visible_message("[user] shortens \the [src]!", "<span class='notice'>You shorten \the [src].</span>")
+		name = "sawn-off [name]"
+		desc = sawn_desc
+		w_class = 3
+		item_state = "gun"//phil235 is it different with different skin?
+		slot_flags &= ~SLOT_BACK	//you can't sling it on your back
+		slot_flags |= SLOT_BELT		//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+		sawn_state = SAWN_OFF
+		update_icon()
+		return 1
+
+// Sawing guns related proc
+/obj/item/weapon/gun/projectile/proc/blow_up(mob/user)
+	. = 0
+	for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
+		if(AC.BB)
+			process_fire(user, user,0)
+			. = 1
+
 /obj/item/weapon/suppressor
 	name = "suppressor"
 	desc = "A universal syndicate small-arms suppressor for maximum espionage."
-	icon = 'icons/obj/gun.dmi'
+	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "suppressor"
 	item_state = "suppressor"
 	w_class = 2
 	var/oldsound = null
 	var/initial_w_class = null
+
+/obj/item/weapon/suppressor/specialoffer
+	name = "cheap suppressor"
+	desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons."
+	icon = 'icons/obj/guns/projectile.dmi'
+	icon_state = "suppressor"
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index b56344ce039..7544ecc7b50 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -1,6 +1,5 @@
 /obj/item/weapon/gun/projectile/automatic
 	w_class = 3.0
-	automatic = 1
 	var/alarmed = 0
 	var/select = 1
 	can_suppress = 1
@@ -11,13 +10,6 @@
 /obj/item/weapon/gun/projectile/automatic/isHandgun()
 	return 0
 
-/obj/item/weapon/gun/projectile/automatic/proto
-	name = "\improper Nanotrasen Saber SMG"
-	desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
-	icon_state = "saber"
-	mag_type = "/obj/item/ammo_box/magazine/smgm9mm"
-	origin_tech = "combat=4;materials=2"
-
 /obj/item/weapon/gun/projectile/automatic/update_icon()
 	..()
 	overlays.Cut()
@@ -25,8 +17,7 @@
 		overlays += "[initial(icon_state)]semi"
 	if(select == 1)
 		overlays += "[initial(icon_state)]burst"
-	icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][silenced ? "-suppressed" : ""]"
-	return
+	icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
 
 /obj/item/weapon/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob, params)
 	. = ..()
@@ -34,17 +25,17 @@
 		return
 	if(istype(A, /obj/item/ammo_box/magazine))
 		var/obj/item/ammo_box/magazine/AM = A
-		if(istype(AM, text2path(mag_type)))
+		if(istype(AM, mag_type))
 			if(magazine)
 				to_chat(user, "<span class='notice'>You perform a tactical reload on \the [src], replacing the magazine.</span>")
-				magazine.forceMove(get_turf(src.loc))
+				magazine.loc = get_turf(loc)
 				magazine.update_icon()
 				magazine = null
 			else
 				to_chat(user, "<span class='notice'>You insert the magazine into \the [src].</span>")
 			user.remove_from_mob(AM)
 			magazine = AM
-			magazine.forceMove(src)
+			magazine.loc = src
 			chamber_round()
 			A.update_icon()
 			update_icon()
@@ -67,14 +58,22 @@
 
 	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
 	update_icon()
-	return
+
+/obj/item/weapon/gun/projectile/automatic/can_shoot()
+	return get_ammo()
 
 /obj/item/weapon/gun/projectile/automatic/proc/empty_alarm()
 	if(!chambered && !get_ammo() && !alarmed)
-		playsound(src.loc, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
+		playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
 		update_icon()
 		alarmed = 1
-	return
+
+/obj/item/weapon/gun/projectile/automatic/proto
+	name = "\improper Nanotrasen Saber SMG"
+	desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
+	icon_state = "saber"
+	mag_type = /obj/item/ammo_box/magazine/smgm9mm
+	origin_tech = "combat=4;materials=2"
 
 /obj/item/weapon/gun/projectile/automatic/c20r
 	name = "\improper C-20r SMG"
@@ -82,7 +81,7 @@
 	icon_state = "c20r"
 	item_state = "c20r"
 	origin_tech = "combat=5;materials=2;syndicate=8"
-	mag_type = "/obj/item/ammo_box/magazine/smgm45"
+	mag_type = /obj/item/ammo_box/magazine/smgm45
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
 	fire_delay = 2
 	burst_size = 2
@@ -90,24 +89,21 @@
 /obj/item/weapon/gun/projectile/automatic/c20r/New()
 	..()
 	update_icon()
-	return
 
 /obj/item/weapon/gun/projectile/automatic/c20r/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
 	..()
 	empty_alarm()
-	return
 
 /obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
 	..()
-	icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"][silenced ? "-suppressed" : ""]"
-	return
+	icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
 
 /obj/item/weapon/gun/projectile/automatic/wt550
 	name = "security auto rifle"
 	desc = "An outdated personal defense weapon utilized by law enforcement. The WT-550 Automatic Rifle fires 4.6x30mm rounds."
 	icon_state = "wt550"
 	item_state = "arg"
-	mag_type = "/obj/item/ammo_box/magazine/wt550m9"
+	mag_type = /obj/item/ammo_box/magazine/wt550m9
 	fire_delay = 2
 	can_suppress = 0
 	burst_size = 1
@@ -116,87 +112,22 @@
 /obj/item/weapon/gun/projectile/automatic/wt550/update_icon()
 	..()
 	icon_state = "wt550[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]"
-	return
 
 /obj/item/weapon/gun/projectile/automatic/mini_uzi
 	name = "\improper 'Type U3' Uzi"
 	desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds."
 	icon_state = "mini-uzi"
 	origin_tech = "combat=5;materials=2;syndicate=8"
-	mag_type = "/obj/item/ammo_box/magazine/uzim9mm"
+	mag_type = /obj/item/ammo_box/magazine/uzim9mm
 	burst_size = 2
 
-/obj/item/weapon/gun/projectile/automatic/l6_saw
-	name = "\improper L6 SAW"
-	desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
-	icon_state = "l6closed100"
-	item_state = "l6closedmag"
-	w_class = 5
-	slot_flags = 0
-	origin_tech = "combat=5;materials=1;syndicate=2"
-	mag_type = "/obj/item/ammo_box/magazine/m762"
-	fire_sound = 'sound/weapons/Gunshot3.ogg'
-
-	var/cover_open = 0
-	can_suppress = 0
-	burst_size = 5
-	fire_delay = 3
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob)
-	cover_open = !cover_open
-	to_chat(user, "<span class='notice'>You [cover_open ? "open" : "close"] [src]'s cover.</span>")
-	update_icon()
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
-	if(magazine && magazine.caliber != "a762")
-		icon_state = "l6[cover_open ? "open" : "closed"]0"
-	icon_state = "l6[cover_open ? "open" : "closed"][magazine ? round(magazine.ammo_count() * 2, 25) : "-empty"]"
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
-	if(cover_open)
-		to_chat(user, "<span class='notice'>[src]'s cover is open! Close it before firing!</span>")
-	else
-		..()
-		update_icon()
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user as mob)
-	if(loc != user)
-		..()
-		return	//let them pick it up
-	if(!cover_open || (cover_open && !magazine))
-		..()
-	else if(cover_open && magazine)
-		//drop the mag
-		magazine.update_icon()
-		magazine.loc = get_turf(src.loc)
-		user.put_in_hands(magazine)
-		magazine = null
-		update_icon()
-		to_chat(user, "<span class='notice'>You remove the magazine from [src].</span>")
-
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob, params)
-	if(!cover_open && istype(A, mag_type))
-		to_chat(user, "<span class='notice'>[src]'s cover is closed! You can't insert a new mag!</span>")
-		return
-	..()
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/devastator
-	name = "\improper 'Devastator' LMG"
-	desc = "A heavily modified L6 SAW designed to chamber wide rounds. Commonly used by elite Syndicate boarding teams "
-	mag_type = "/obj/item/ammo_box/magazine/m762/buckshot"
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/devastator/New()
-	..()
-	mag_type = "/obj/item/ammo_box/magazine/m762" // Workaround so it spawns with a shotgun mag loaded, but can still load regular LMG mags.
-
 /obj/item/weapon/gun/projectile/automatic/m90
 	name = "\improper M-90gl Carbine"
 	desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
 	icon_state = "m90"
 	item_state = "m90"
 	origin_tech = "combat=5;materials=2;syndicate=8"
-	mag_type = "/obj/item/ammo_box/magazine/m556"
+	mag_type = /obj/item/ammo_box/magazine/m556
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
 	action_button_name = "Toggle Grenade Launcher"
 	can_suppress = 0
@@ -208,19 +139,17 @@
 	..()
 	underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src)
 	update_icon()
-	return
 
 /obj/item/weapon/gun/projectile/automatic/m90/afterattack(var/atom/target, var/mob/living/user, flag, params)
 	if(select == 2)
 		underbarrel.afterattack(target, user, flag, params)
 	else
 		..()
-		empty_alarm()
 		return
 
 /obj/item/weapon/gun/projectile/automatic/m90/attackby(var/obj/item/A, mob/user, params)
 	if(istype(A, /obj/item/ammo_casing))
-		if(istype(A, text2path(underbarrel.magazine.ammo_type)))
+		if(istype(A, underbarrel.magazine.ammo_type))
 			underbarrel.attack_self()
 			underbarrel.attackby(A, user, params)
 	else
@@ -257,7 +186,6 @@
 			to_chat(user, "<span class='notice'>You switch to semi-auto.</span>")
 	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
 	update_icon()
-	return
 
 /obj/item/weapon/gun/projectile/automatic/tommygun
 	name = "\improper Thompson SMG"
@@ -267,11 +195,11 @@
 	w_class = 5
 	slot_flags = 0
 	origin_tech = "combat=5;materials=1;syndicate=2"
-	mag_type = "/obj/item/ammo_box/magazine/tommygunm45"
+	mag_type = /obj/item/ammo_box/magazine/tommygunm45
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
 	can_suppress = 0
-	fire_delay = 1
 	burst_size = 4
+	fire_delay = 1
 
 /obj/item/weapon/gun/projectile/automatic/ar
 	name = "ARG"
@@ -280,8 +208,42 @@
 	item_state = "arg"
 	slot_flags = 0
 	origin_tech = "combat=5;materials=1"
-	mag_type = "/obj/item/ammo_box/magazine/m556"
+	mag_type = /obj/item/ammo_box/magazine/m556
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
 	can_suppress = 0
 	burst_size = 3
 	fire_delay = 1
+
+// Bulldog shotgun //
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
+	name = "\improper 'Bulldog' Shotgun"
+	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
+	origin_tech = "combat=5;materials=4;syndicate=6"
+	mag_type = /obj/item/ammo_box/magazine/m12g
+	fire_sound = 'sound/weapons/Gunshot4.ogg'
+	can_suppress = 0
+	burst_size = 1
+	fire_delay = 0
+	action_button_name = null
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/New()
+	..()
+	update_icon()
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/proc/update_magazine()
+	if(magazine)
+		overlays.Cut()
+		overlays += "[magazine.icon_state]"
+		return
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/update_icon()
+	overlays.Cut()
+	update_magazine()
+	icon_state = "bulldog[chambered ? "" : "-e"]"
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+	..()
+	empty_alarm()
diff --git a/code/modules/projectiles/guns/projectile/crossbow.dm b/code/modules/projectiles/guns/projectile/crossbow.dm
deleted file mode 100644
index 3645899ab21..00000000000
--- a/code/modules/projectiles/guns/projectile/crossbow.dm
+++ /dev/null
@@ -1,323 +0,0 @@
-//AMMUNITION
-
-/obj/item/weapon/arrow
-
-	name = "bolt"
-	desc = "It's got a tip for you - get the point?"
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "bolt"
-	item_state = "bolt"
-	throwforce = 8
-	w_class = 3.0
-	sharp = 1
-	edge = 0
-
-/obj/item/weapon/arrow/proc/removed() //Helper for metal rods falling apart.
-	return
-
-/obj/item/weapon/spike
-	name = "alloy spike"
-	desc = "It's about a foot of weird silver metal with a wicked point."
-	sharp = 1
-	edge = 0
-	throwforce = 5
-	w_class = 2
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "metal-rod"
-	item_state = "bolt"
-
-/obj/item/weapon/arrow/quill
-
-	name = "vox quill"
-	desc = "A wickedly barbed quill from some bizarre animal."
-	icon_state = "quill"
-	item_state = "quill"
-	throwforce = 5
-
-/obj/item/weapon/arrow/rod
-
-	name = "metal rod"
-	desc = "Don't cry for me, Orithena."
-	icon_state = "metal-rod"
-
-/obj/item/weapon/arrow/rod/removed(mob/user)
-	if(throwforce == 15) // The rod has been superheated - we don't want it to be useable when removed from the bow.
-		to_chat(user, "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow.")
-		var/obj/item/weapon/shard/shrapnel/S = new()
-		S.loc = get_turf(src)
-		qdel(src)
-
-/obj/item/weapon/arrow/baguette
-	name = "baguette"
-	desc = "Still warm from the oven!"
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "baguette"
-	item_state = "baguette"
-	throwforce = 3
-	sharp = 0
-
-/obj/item/weapon/gun/launcher/crossbow
-
-	name = "powered crossbow"
-	desc = "A 2557AD twist on an old classic. Pick up that can."
-	icon_state = "crossbow"
-	item_state = "crossbow-solid"
-	fire_sound = 'sound/weapons/punchmiss.ogg' // TODO: Decent THWOK noise.
-//	ejectshell = 0                          // No spent shells.
-	mouthshoot = 1                          // No suiciding with this weapon, causes runtimes.
-	fire_sound_text = "a solid thunk"
-	fire_delay = 25
-
-	var/tension = 0                         // Current draw on the bow.
-	var/max_tension = 5                     // Highest possible tension.
-	var/release_speed = 5                   // Speed per unit of tension.
-	var/obj/item/weapon/stock_parts/cell/cell = null    // Used for firing superheated rods.
-	var/current_user                        // Used to check if the crossbow has changed hands since being drawn.
-
-/obj/item/weapon/gun/launcher/crossbow/emp_act(severity)
-	if(cell && severity)
-		cell.use(100*severity)
-
-/obj/item/weapon/gun/launcher/crossbow/special_check(user)
-	if(tension <= 0)
-		to_chat(user, "\red \The [src] is not drawn back!")
-		return 0
-	return 1
-
-/obj/item/weapon/gun/launcher/crossbow/update_release_force()
-	release_force = tension*release_speed
-
-/obj/item/weapon/gun/launcher/crossbow/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
-
-	if(!..()) return //Only do this on a successful shot.
-	icon_state = "crossbow"
-	tension = 0
-
-/obj/item/weapon/gun/launcher/crossbow/attack_self(mob/living/user as mob)
-	if(tension)
-		if(in_chamber && in_chamber.loc == src) //Just in case they click it the tick after firing.
-			user.visible_message("[user] relaxes the tension on [src]'s string and removes [in_chamber].","You relax the tension on [src]'s string and remove [in_chamber].")
-			in_chamber.loc = get_turf(src)
-			var/obj/item/weapon/arrow/A = in_chamber
-			in_chamber = null
-			A.removed(user)
-		else
-			user.visible_message("[user] relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.")
-		tension = 0
-		icon_state = "crossbow"
-	else
-		draw(user)
-
-/obj/item/weapon/gun/launcher/crossbow/proc/draw(var/mob/user as mob)
-
-	if(!in_chamber)
-		to_chat(user, "You don't have anything nocked to [src].")
-		return
-
-	if(user.restrained())
-		return
-
-	current_user = user
-	user.visible_message("[user] begins to draw back the string of [src].","You begin to draw back the string of [src].")
-	tension = 1
-	spawn(25) increase_tension(user) //TODO: This needs to be changed to something less shit.
-
-/obj/item/weapon/gun/launcher/crossbow/proc/increase_tension(var/mob/user as mob)
-
-	if(!in_chamber || !tension || current_user != user) //Arrow has been fired, bow has been relaxed or user has changed.
-		return
-
-	tension++
-	icon_state = "crossbow-drawn"
-
-	if(tension>=max_tension)
-		tension = max_tension
-		to_chat(usr, "[src] clunks as you draw the string to its maximum tension!")
-	else
-		user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!")
-		spawn(25) increase_tension(user)
-
-/obj/item/weapon/gun/launcher/crossbow/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(!in_chamber)
-		if (istype(W,/obj/item/weapon/arrow))
-			user.drop_item()
-			in_chamber = W
-			in_chamber.loc = src
-			user.visible_message("[user] slides [in_chamber] into [src].","You slide [in_chamber] into [src].")
-			icon_state = "crossbow-nocked"
-			return
-		else if(istype(W,/obj/item/stack/rods))
-			var/obj/item/stack/rods/R = W
-			R.use(1)
-			in_chamber = new /obj/item/weapon/arrow/rod(src)
-			in_chamber.fingerprintslast = src.fingerprintslast
-			in_chamber.loc = src
-			icon_state = "crossbow-nocked"
-			user.visible_message("[user] jams [in_chamber] into [src].","You jam [in_chamber] into [src].")
-			superheat_rod(user)
-			return
-
-	if(istype(W, /obj/item/weapon/stock_parts/cell))
-		if(!cell)
-			user.drop_item()
-			W.loc = src
-			cell = W
-			to_chat(user, "<span class='notice'>You jam [cell] into [src] and wire it to the firing coil.</span>")
-			superheat_rod(user)
-		else
-			to_chat(user, "<span class='notice'>[src] already has a cell installed.</span>")
-
-	else if(istype(W, /obj/item/weapon/screwdriver))
-		if(cell)
-			var/obj/item/C = cell
-			C.loc = get_turf(user)
-			to_chat(user, "<span class='notice'>You jimmy [cell] out of [src] with [W].</span>")
-			cell = null
-		else
-			to_chat(user, "<span class='notice'>[src] doesn't have a cell installed.</span>")
-
-	else
-		..()
-
-/obj/item/weapon/gun/launcher/crossbow/proc/superheat_rod(var/mob/user)
-
-	if(!user || !cell || !in_chamber) return
-	if(cell.charge < 500) return
-	if(in_chamber.throwforce >= 15) return
-	if(!istype(in_chamber,/obj/item/weapon/arrow/rod)) return
-
-	to_chat(user, "<span class='notice'>[in_chamber] plinks and crackles as it begins to glow red-hot.</span>")
-	in_chamber.throwforce = 15
-	in_chamber.icon_state = "metal-rod-superheated"
-	cell.use(500)
-
-
-/obj/item/weapon/gun/launcher/crossbow/french
-	name = "french powered crossbow"
-
-/obj/item/weapon/gun/launcher/crossbow/french/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(!in_chamber)
-		if (istype(W,/obj/item/weapon/reagent_containers/food/snacks/baguette))
-			user.drop_item()
-			in_chamber = W
-			in_chamber.loc = src
-			user.visible_message("[user] slides [in_chamber] into [src].","You slide [in_chamber] into [src].")
-			icon_state = "crossbow-nocked"
-			return
-
-		else if (istype(W,/obj/item/weapon/arrow))
-			user.visible_message("\The [src] only takes baguettes.")
-			return
-		else if(istype(W,/obj/item/stack/rods))
-			user.visible_message("\The [src] only takes baguettes.")
-			return
-
-	if(istype(W, /obj/item/weapon/stock_parts/cell))
-		user.visible_message("The [src] is too simple be adapted with a cell.")
-		return
-
-	else
-		..()
-
-/obj/item/weapon/gun/launcher/crossbow/french/increase_tension(var/mob/user as mob)
-
-	if(!in_chamber || !tension || current_user != user) //Arrow has been fired, bow has been relaxed or user has changed.
-		return
-
-	tension++
-	icon_state = "fcrossbow-drawn"
-
-	if(tension>=max_tension)
-		tension = max_tension
-		to_chat(usr, "[src] clunks as you draw the string to its maximum tension!")
-	else
-		user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!")
-		spawn(25) increase_tension(user)
-
-// Crossbow construction.
-/obj/item/weapon/crossbowframe
-	name = "crossbow frame"
-	desc = "A half-finished crossbow."
-	icon_state = "crossbowframe0"
-	item_state = "crossbow-solid"
-
-	var/buildstate = 0
-
-/obj/item/weapon/crossbowframe/update_icon()
-	icon_state = "crossbowframe[buildstate]"
-
-/obj/item/weapon/crossbowframe/examine(mob/user)
-	..(user)
-	switch(buildstate)
-		if(1)
-			to_chat(user, "It has a loose rod frame in place.")
-		if(2)
-			to_chat(user, "It has a steel backbone welded in place.")
-		if(3)
-			to_chat(user, "It has a steel backbone and a cell mount installed.")
-		if(4)
-			to_chat(user, "It has a steel backbone, plastic lath and a cell mount installed.")
-		if(5)
-			to_chat(user, "It has a steel cable loosely strung across the lath.")
-
-/obj/item/weapon/crossbowframe/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(istype(W,/obj/item/stack/rods))
-		if(buildstate == 0)
-			var/obj/item/stack/rods/R = W
-			if(R.amount >= 3)
-				R.use(3)
-				to_chat(user, "\blue You assemble a backbone of rods around the wooden stock.")
-				buildstate++
-				update_icon()
-			else
-				to_chat(user, "\blue You need at least three rods to complete this task.")
-			return
-	else if(istype(W,/obj/item/weapon/weldingtool))
-		if(buildstate == 1)
-			var/obj/item/weapon/weldingtool/T = W
-			if(T.remove_fuel(0,user))
-				if(!src || !T.isOn()) return
-				playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
-				to_chat(user, "\blue You weld the rods into place.")
-			buildstate++
-			update_icon()
-		return
-	else if(istype(W,/obj/item/stack/cable_coil))
-		var/obj/item/stack/cable_coil/C = W
-		if(buildstate == 2)
-			if(C.amount >= 5)
-				C.use(5)
-				to_chat(user, "\blue You wire a crude cell mount into the top of the crossbow.")
-				buildstate++
-				update_icon()
-			else
-				to_chat(user, "\blue You need at least five segments of cable coil to complete this task.")
-			return
-		else if(buildstate == 4)
-			if(C.amount >= 5)
-				C.use(5)
-				to_chat(user, "\blue You string a steel cable across the crossbow's lath.")
-				buildstate++
-				update_icon()
-			else
-				to_chat(user, "\blue You need at least five segments of cable coil to complete this task.")
-			return
-	else if(istype(W,/obj/item/stack/sheet/mineral/plastic))
-		if(buildstate == 3)
-			var/obj/item/stack/sheet/mineral/plastic/P = W
-			if(P.amount >= 3)
-				P.use(3)
-				to_chat(user, "\blue You assemble and install a heavy plastic lath onto the crossbow.")
-				buildstate++
-				update_icon()
-			else
-				to_chat(user, "\blue You need at least three plastic sheets to complete this task.")
-			return
-	else if(istype(W,/obj/item/weapon/screwdriver))
-		if(buildstate == 5)
-			to_chat(user, "\blue You secure the crossbow's various parts.")
-			new /obj/item/weapon/gun/launcher/crossbow(get_turf(src))
-			qdel(src)
-		return
-	else
-		..()
diff --git a/code/modules/projectiles/guns/projectile/grenade launcher.dm b/code/modules/projectiles/guns/projectile/grenade launcher.dm
deleted file mode 100644
index 28dc0c3a4b9..00000000000
--- a/code/modules/projectiles/guns/projectile/grenade launcher.dm	
+++ /dev/null
@@ -1,91 +0,0 @@
-/obj/item/weapon/gun/launcher
-
-	name = "launcher"
-	desc = "A device that launches things."
-	icon = 'icons/obj/weapons.dmi'
-	w_class = 5.0
-	flags =  CONDUCT
-	slot_flags = SLOT_BACK
-
-	var/release_force = 0
-	var/fire_sound_text = "a launcher firing"
-
-//Check if we're drawing and if the bow is loaded.
-/obj/item/weapon/gun/launcher/proc/chamber_round()
-	return (!isnull(in_chamber))
-
-//This should not fit in a combat belt or holster.
-/obj/item/weapon/gun/launcher/isHandgun()
-	return 0
-
-//Launchers are mechanical, no other impact.
-/obj/item/weapon/gun/launcher/emp_act(severity)
-	return
-
-//This normally uses a proc on projectiles and our ammo is not strictly speaking a projectile.
-/obj/item/weapon/gun/launcher/can_hit(var/mob/living/target as mob, var/mob/living/user as mob)
-	return
-
-//Override this to avoid a runtime with suicide handling.
-/obj/item/weapon/gun/launcher/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
-	if (M == user && user.zone_sel.selecting == "mouth")
-		to_chat(user, "\red Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it.")
-		return
-	..()
-
-/obj/item/weapon/gun/launcher/proc/update_release_force()
-	return 0
-
-/obj/item/weapon/gun/launcher/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
-
-	if (!user.IsAdvancedToolUser())
-		to_chat(user, "\red You don't have the dexterity to do this!")
-		return 0
-
-	add_fingerprint(user)
-
-	//Make sure target turfs both exist.
-	var/turf/curloc = get_turf(user)
-	var/turf/targloc = get_turf(target)
-	if (!istype(targloc) || !istype(curloc))
-		return 0
-
-	if(!special_check(user))
-		return 0
-
-	if (!ready_to_fire())
-		if (world.time % 3) //to prevent spam
-			to_chat(user, "<span class='warning'>[src] is not ready to fire again!")
-		return 0
-
-	if(!chamber_round()) //CHECK
-		return click_empty(user)
-
-	if(!in_chamber)
-		return 0
-
-	update_release_force()
-
-	playsound(user, fire_sound, 50, 1)
-	user.visible_message("<span class='warning'>[user] fires [src][reflex ? " by reflex":""]!</span>", \
-	"<span class='warning'>You fire [src][reflex ? "by reflex":""]!</span>", \
-	"You hear [fire_sound_text]!")
-
-	in_chamber.loc = get_turf(user)
-	in_chamber.throw_at(target,10,release_force)
-
-	sleep(1)
-
-	in_chamber = null
-
-	update_icon()
-
-	if(user.hand)
-		user.update_inv_l_hand()
-	else
-		user.update_inv_r_hand()
-
-	return 1
-
-/obj/item/weapon/gun/launcher/attack_self(mob/living/user as mob)
-	return
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 6bcca0cdf68..635ab22cc8c 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -1,44 +1,12 @@
 //KEEP IN MIND: These are different from gun/grenadelauncher. These are designed to shoot premade rocket and grenade projectiles, not flashbangs or chemistry casings etc.
 //Put handheld rocket launchers here if someone ever decides to make something so hilarious ~Paprika
 
-
-/obj/item/weapon/gun/projectile/automatic/gyropistol
-	name = "gyrojet pistol"
-	desc = "A prototype pistol designed to fire self propelled rockets."
-	icon_state = "gyropistol"
-	fire_sound = 'sound/effects/Explosion1.ogg'
-	origin_tech = "combat=3"
-	mag_type = "/obj/item/ammo_box/magazine/m75"
-	burst_size = 1
-	fire_delay = 0
-	
-/obj/item/weapon/gun/projectile/automatic/gyropistol/isHandgun()
-	return 1
-
-/obj/item/weapon/gun/projectile/automatic/gyropistol/New()
-	..()
-	update_icon()
-	return
-
-/obj/item/weapon/gun/projectile/automatic/gyropistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
-	..()
-	if(!chambered && !get_ammo() && !alarmed)
-		playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
-		update_icon()
-		alarmed = 1
-	return
-
-/obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon()
-	..()
-	icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
-	return
-
 /obj/item/weapon/gun/projectile/revolver/grenadelauncher//this is only used for underbarrel grenade launchers at the moment, but admins can still spawn it if they feel like being assholes
 	desc = "A break-operated grenade launcher."
 	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/cylinder/grenadelauncher
 	fire_sound = 'sound/weapons/grenadelaunch.ogg'
 	w_class = 3
 
@@ -52,7 +20,7 @@
 	name = "multi grenade launcher"
 	icon_state = "bulldog"
 	item_state = "bulldog"
-	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi
 
 /obj/item/weapon/gun/projectile/revolver/grenadelauncher/multi/cyborg
 	desc = "A 6-shot grenade launcher."
@@ -60,4 +28,57 @@
 	icon_state = "mecha_grenadelnchr"
 
 /obj/item/weapon/gun/projectile/revolver/grenadelauncher/multi/cyborg/attack_self()
-	return
\ No newline at end of file
+	return
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol
+	name = "gyrojet pistol"
+	desc = "A prototype pistol designed to fire self propelled rockets."
+	icon_state = "gyropistol"
+	fire_sound = 'sound/effects/Explosion1.ogg'
+	origin_tech = "combat=3"
+	mag_type = /obj/item/ammo_box/magazine/m75
+	burst_size = 1
+	fire_delay = 0
+	action_button_name = null
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/isHandgun()
+	return 1
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
+	return
+
+/obj/item/weapon/gun/projectile/automatic/speargun
+	name = "kinetic speargun"
+	desc = "A weapon favored by carp hunters. Fires specialized spears using kinetic energy."
+	icon_state = "speargun"
+	item_state = "speargun"
+	w_class = 4
+	force = 10
+	can_suppress = 0
+	mag_type = /obj/item/ammo_box/magazine/internal/speargun
+	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+	burst_size = 1
+	fire_delay = 0
+	select = 0
+	action_button_name = null
+
+/obj/item/weapon/gun/projectile/automatic/speargun/update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/speargun/attack_self()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/speargun/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+
+/obj/item/weapon/gun/projectile/automatic/speargun/attackby(obj/item/A, mob/user, params)
+	var/num_loaded = magazine.attackby(A, user, params, 1)
+	if(num_loaded)
+		to_chat(user, "<span class='notice'>You load [num_loaded] spear\s into \the [src].</span>")
+		update_icon()
+		chamber_round()
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 99aded2663b..b2c0aa823be 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -4,27 +4,26 @@
 	icon_state = "pistol"
 	w_class = 2
 	origin_tech = "combat=2;materials=2;syndicate=2"
-	mag_type = "/obj/item/ammo_box/magazine/m10mm"
+	mag_type = /obj/item/ammo_box/magazine/m10mm
 	can_suppress = 1
 	burst_size = 1
 	fire_delay = 0
 	action_button_name = null
-	
+
 /obj/item/weapon/gun/projectile/automatic/pistol/isHandgun()
 	return 1
 
 /obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
 	..()
-	icon_state = "[initial(icon_state)][chambered ? "" : "-e"][silenced ? "-suppressed" : ""]"
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
 	return
 
-/obj/item/weapon/gun/projectile/automatic/pistol/m2411
-	name = "M2411"
-	desc = "John Browning's classic updated for the modern day. Uses .45 rounds."
-	icon_state = "m2411"
-	w_class = 3.0
-	origin_tech = "combat=3;materials=2"
-	mag_type = "/obj/item/ammo_box/magazine/m45"
+/obj/item/weapon/gun/projectile/automatic/pistol/m1911
+	name = "\improper M1911"
+	desc = "A classic .45 handgun with a small magazine capacity."
+	icon_state = "m1911"
+	w_class = 3
+	mag_type = /obj/item/ammo_box/magazine/m45
 	can_suppress = 0
 
 /obj/item/weapon/gun/projectile/automatic/pistol/deagle
@@ -32,7 +31,7 @@
 	desc = "A robust .50 AE handgun."
 	icon_state = "deagle"
 	force = 14.0
-	mag_type = "/obj/item/ammo_box/magazine/m50"
+	mag_type = /obj/item/ammo_box/magazine/m50
 	can_suppress = 0
 
 /obj/item/weapon/gun/projectile/automatic/pistol/deagle/update_icon()
@@ -47,4 +46,16 @@
 /obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo
 	desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE ammo."
 	icon_state = "deaglecamo"
-	item_state = "deagleg"
\ No newline at end of file
+	item_state = "deagleg"
+
+/obj/item/weapon/gun/projectile/automatic/pistol/APS
+	name = "stechkin APS pistol"
+	desc = "The original russian version of a widely used Syndicate sidearm. Uses 9mm ammo."
+	icon_state = "aps"
+	w_class = 3
+	origin_tech = "combat=3;materials=2;syndicate=3"
+	mag_type = /obj/item/ammo_box/magazine/pistolm9mm
+	can_suppress = 0
+	burst_size = 3
+	fire_delay = 2
+	action_button_name = "Toggle Firemode"
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 2cb3c849e4b..299ffbc9a6c 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -2,57 +2,80 @@
 	name = "\improper .357 revolver"
 	desc = "A suspicious revolver. Uses .357 ammo."
 	icon_state = "revolver"
-	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder
 
-/obj/item/weapon/gun/projectile/revolver/chamber_round()
-	if (chambered || !magazine)
-		return
-	else if (magazine.ammo_count())
+/obj/item/weapon/gun/projectile/revolver/New()
+	..()
+	if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
+		verbs -= /obj/item/weapon/gun/projectile/revolver/verb/spin
+
+/obj/item/weapon/gun/projectile/revolver/chamber_round(var/spin = 1)
+	if(spin)
 		chambered = magazine.get_round(1)
+	else
+		chambered = magazine.stored_ammo[1]
 	return
 
-/obj/item/weapon/gun/projectile/revolver/process_chambered()
+/obj/item/weapon/gun/projectile/revolver/shoot_with_empty_chamber(mob/living/user as mob|obj)
+	..()
+	chamber_round(1)
+
+/obj/item/weapon/gun/projectile/revolver/process_chamber()
 	return ..(0, 1)
 
-/obj/item/weapon/gun/projectile/revolver/attackby(var/obj/item/A as obj, mob/user as mob, params)
-	var/num_loaded = 0
-	if(istype(A, /obj/item/ammo_box))
-		var/obj/item/ammo_box/AM = A
-		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
-			var/didload = magazine.give_round(AC)
-			if(didload)
-				AM.stored_ammo -= AC
-				num_loaded++
-			if(!didload || !magazine.multiload)
-				break
-	if(istype(A, /obj/item/ammo_casing))
-		var/obj/item/ammo_casing/AC = A
-		if(magazine.give_round(AC))
-			user.drop_item()
-			AC.loc = src
-			num_loaded++
+/obj/item/weapon/gun/projectile/revolver/attackby(obj/item/A, mob/user, params)
+	. = ..()
+	if(.)
+		return
+	var/num_loaded = magazine.attackby(A, user, params, 1)
 	if(num_loaded)
-		to_chat(user, "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>")
+		to_chat(user, "<span class='notice'>You load [num_loaded] shell\s into \the [src].</span>")
 		A.update_icon()
 		update_icon()
-		chamber_round()
+		chamber_round(0)
 
-/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user as mob)
+	if(unique_rename)
+		if(istype(A, /obj/item/weapon/pen))
+			rename_gun(user)
+
+/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user)
 	var/num_unloaded = 0
+	chambered = null
 	while (get_ammo() > 0)
 		var/obj/item/ammo_casing/CB
 		CB = magazine.get_round(0)
-		chambered = null
-		CB.loc = get_turf(src.loc)
-		CB.SpinAnimation(10, 1)
-		CB.update_icon()
-		num_unloaded++
+		if(CB)
+			CB.loc = get_turf(loc)
+			CB.SpinAnimation(10, 1)
+			CB.update_icon()
+			num_unloaded++
 	if (num_unloaded)
-		to_chat(user, "<span class = 'notice'>You unload [num_unloaded] shell\s from [src]!</span>")
+		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>")
+		to_chat(user, "<span class='warning'>[src] is empty!</span>")
 
-/obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1)
+/obj/item/weapon/gun/projectile/revolver/verb/spin()
+	set name = "Spin Chamber"
+	set category = "Object"
+	set desc = "Click to spin your revolver's chamber."
+
+	var/mob/M = usr
+
+	if(M.stat || !in_range(M,src))
+		return
+
+	if(istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
+		var/obj/item/ammo_box/magazine/internal/cylinder/C = magazine
+		C.spin()
+		chamber_round(0)
+		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
+
+/obj/item/weapon/gun/projectile/revolver/can_shoot()
+	return get_ammo(0,0)
+
+/obj/item/weapon/gun/projectile/revolver/get_ammo(countchambered = 0, countempties = 1)
 	var/boolets = 0 //mature var names for mature people
 	if (chambered && countchambered)
 		boolets++
@@ -61,119 +84,66 @@
 	return boolets
 
 /obj/item/weapon/gun/projectile/revolver/examine(mob/user)
-	..(user)
+	..()
 	to_chat(user, "[get_ammo(0,0)] of those are live rounds.")
 
-/obj/item/weapon/gun/projectile/revolver/verb/spin_revolver()
-	set name = "Spin cylinder"
-	set desc = "Fun when you're bored out of your skull."
-	set category = "Object"
-
-	usr.visible_message("<span class='warning'>[usr] spins the chamber of the revolver.</span>", "<span class='warning'>You spin the revolver's chamber.</span>")
-	playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1)
-	Spin()
-
-/obj/item/weapon/gun/projectile/revolver/proc/Spin()
-	chambered = null
-	var/random = rand(1, magazine.max_ammo)
-	if(random <= get_ammo(0,0))
-		chamber_round()
-	update_icon()
-
-/obj/item/weapon/gun/projectile/revolver/capgun
-	name = "cap gun"
-	desc = "Looks almost like the real thing! Ages 8 and up."
-	origin_tech = "combat=1;materials=1"
-	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/cap"
-
 /obj/item/weapon/gun/projectile/revolver/detective
 	desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds."
 	name = "\improper .38 Mars Special"
 	icon_state = "detective"
 	origin_tech = "combat=2;materials=2"
-	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/rev38"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
+	unique_rename = 1
+	unique_reskin = 1
 
-
-/obj/item/weapon/gun/projectile/revolver/detective/special_check(var/mob/living/carbon/human/M)
-	if(!ghettomodded)
-		return 1
-	if(prob(70 - (magazine.ammo_count() * 10)))	//minimum probability of 10, maximum of 60
-		to_chat(M, "<span class='danger'>[src] blows up in your face!</span>")
-		M.take_organ_damage(0,20)
-		M.drop_item()
-		qdel(src)
-		return 0
-	return 1
-
-/obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun()
-	set name = "Name Gun"
-	set category = "Object"
-	set desc = "Click to rename your gun."
-
-	var/mob/M = usr
-	var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN)
-
-	if(src && input && !M.stat && in_range(M,src))
-		name = input
-		to_chat(M, "You name the gun [input]. Say hello to your new friend.")
-		return 1
-
-/obj/item/weapon/gun/projectile/revolver/detective/verb/reskin_gun()
-	set name = "Reskin gun"
-	set category = "Object"
-	set desc = "Click to reskin your gun."
-
-	var/mob/M = usr
-	var/list/options = list()
+/obj/item/weapon/gun/projectile/revolver/detective/New()
+	..()
 	options["The Original"] = "detective"
 	options["Leopard Spots"] = "detective_leopard"
 	options["Black Panther"] = "detective_panther"
 	options["Gold Trim"] = "detective_gold"
 	options["The Peacemaker"] = "detective_peacemaker"
-	var/choice = input(M,"What do you want to skin the gun to?","Reskin Gun") in options
+	options["Cancel"] = null
 
-	if(src && choice && !M.stat && in_range(M,src))
-		icon_state = options[choice]
-		to_chat(M, "Your gun is now skinned as [choice]. Say hello to your new friend.")
-		return 1
-
-/obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob, params)
+/obj/item/weapon/gun/projectile/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override = "")
+	if(magazine.caliber != initial(magazine.caliber))
+		if(prob(70 - (magazine.ammo_count() * 10)))	//minimum probability of 10, maximum of 60
+			playsound(user, fire_sound, 50, 1)
+			to_chat(user, "<span class='userdanger'>[src] blows up in your face!</span>")
+			user.take_organ_damage(0,20)
+			user.unEquip(src)
+			return 0
 	..()
-	if(istype(A, /obj/item/weapon/screwdriver) || istype(A, /obj/item/weapon/conversion_kit))
+
+/obj/item/weapon/gun/projectile/revolver/detective/attackby(obj/item/A, mob/user, params)
+	..()
+	if(istype(A, /obj/item/weapon/screwdriver))
 		if(magazine.caliber == "38")
-			to_chat(user, "<span class='notice'>You begin to reinforce the barrel of [src].</span>")
+			to_chat(user, "<span class='notice'>You begin to reinforce the barrel of [src]...</span>")
 			if(magazine.ammo_count())
 				afterattack(user, user)	//you know the drill
-				user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>[src] goes off in your face!</span>")
+				user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='userdanger'>[src] goes off in your face!</span>")
 				return
 			if(do_after(user, 30, target = src))
 				if(magazine.ammo_count())
-					to_chat(user, "<span class='notice'>You can't modify it!</span>")
+					to_chat(user, "<span class='warning'>You can't modify it!</span>")
 					return
-				if (istype(A, /obj/item/weapon/conversion_kit))
-					ghettomodded = 0
-				else
-					ghettomodded = 1
 				magazine.caliber = "357"
-				desc = "[initial(desc)] The barrel and chamber assembly seems to have been modified."
-				to_chat(user, "<span class='warning'>You reinforce the barrel of [src]! Now it will fire .357 rounds.</span>")
+				desc = "The barrel and chamber assembly seems to have been modified."
+				to_chat(user, "<span class='notice'>You reinforce the barrel of [src]. Now it will fire .357 rounds.</span>")
 		else
-			to_chat(user, "<span class='notice'>You begin to revert the modifications to [src].</span>")
+			to_chat(user, "<span class='notice'>You begin to revert the modifications to [src]...</span>")
 			if(magazine.ammo_count())
 				afterattack(user, user)	//and again
-				user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>[src] goes off in your face!</span>")
+				user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='userdanger'>[src] goes off in your face!</span>")
 				return
 			if(do_after(user, 30, target = src))
 				if(magazine.ammo_count())
-					to_chat(user, "<span class='notice'>You can't modify it!</span>")
+					to_chat(user, "<span class='warning'>You can't modify it!</span>")
 					return
-				ghettomodded = 0
 				magazine.caliber = "38"
 				desc = initial(desc)
-				to_chat(user, "<span class='warning'>You remove the modifications on [src]! Now it will fire .38 rounds.</span>")
-
-
-
+				to_chat(user, "<span class='notice'>You remove the modifications on [src]. Now it will fire .38 rounds.</span>")
 
 /obj/item/weapon/gun/projectile/revolver/mateba
 	name = "\improper Unica 6 auto-revolver"
@@ -181,6 +151,21 @@
 	icon_state = "mateba"
 	origin_tech = "combat=2;materials=2"
 
+/obj/item/weapon/gun/projectile/revolver/golden
+	name = "\improper Golden revolver"
+	desc = "This ain't no game, ain't never been no show, And I'll gladly gun down the oldest lady you know. Uses .357 ammo."
+	icon_state = "goldrevolver"
+	fire_sound = 'sound/weapons/resonator_blast.ogg'
+	recoil = 8
+
+/obj/item/weapon/gun/projectile/revolver/nagant
+	name = "nagant revolver"
+	desc = "An old model of revolver that originated in Russia. Able to be suppressed. Uses 7.62x38mmR ammo."
+	icon_state = "nagant"
+	origin_tech = "combat=3"
+	can_suppress = 1
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762
+
 // A gun to play Russian Roulette!
 // You can spin the chamber to randomize the position of the bullet.
 
@@ -188,35 +173,239 @@
 	name = "\improper Russian Revolver"
 	desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism that spins the chamber before each trigger pull."
 	origin_tech = "combat=2;materials=2"
-	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/rus357"
+	mag_type = /obj/item/ammo_box/magazine/internal/rus357
+	var/spun = 0
 
 
 /obj/item/weapon/gun/projectile/revolver/russian/New()
 	..()
 	Spin()
+	update_icon()
 
-/obj/item/weapon/gun/projectile/revolver/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj)
+/obj/item/weapon/gun/projectile/revolver/russian/proc/Spin()
+	chambered = null
+	var/random = rand(1, magazine.max_ammo)
+	if(random <= get_ammo(0,0))
+		chamber_round()
+	spun = 1
 
-	if(!chambered && target == user)
-		user.visible_message("\red *click*", "\red *click*")
-		return
+/obj/item/weapon/gun/projectile/revolver/russian/attackby(obj/item/A, mob/user, params)
+	var/num_loaded = ..()
+	if(num_loaded)
+		user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "<span class='notice'>You load a single bullet into the chamber and spin it.</span>")
+	else
+		user.visible_message("[user] spins the chamber of the revolver.", "<span class='notice'>You spin the revolver's chamber.</span>")
+	if(get_ammo() > 0)
+		Spin()
+	update_icon()
+	A.update_icon()
+	return
 
-	if(isliving(target) && isliving(user))
-		if(target == user)
-			var/obj/item/organ/external/affecting = user.zone_sel.selecting
-			if(affecting == "head")
-				var/obj/item/ammo_casing/AC = chambered
-				if(!process_chambered())
-					user.visible_message("\red *click*", "\red *click*")
-					return
-				if(!in_chamber)
-					return
-				var/obj/item/projectile/P = new AC.projectile_type
-				playsound(user, fire_sound, 50, 1)
-				user.visible_message("<span class='danger'>[user.name] fires [src] at \his head!</span>", "<span class='danger'>You fire [src] at your head!</span>", "You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!")
-				if(!P.nodamage)
-					user.apply_damage(300, BRUTE, affecting, sharp=1) // You are dead, dead, dead.
+/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user)
+	if(!spun && can_shoot())
+		user.visible_message("[user] spins the chamber of the revolver.", "<span class='notice'>You spin the revolver's chamber.</span>")
+		Spin()
+	else
+		var/num_unloaded = 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)
+			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>")
+
+/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
+	if(flag)
+		if(!(target in user.contents) && ismob(target))
+			if(user.a_intent == "harm") // Flogging action
 				return
 
-	..()
+	if(isliving(user))
+		if(!can_trigger_gun(user))
+			return
+	if(target != user)
+		if(ismob(target))
+			to_chat(user, "<span class='warning'>A mechanism prevents you from shooting anyone but yourself!</span>")
+		return
 
+	if(ishuman(user))
+		if(!spun)
+			to_chat(user, "<span class='warning'>You need to spin the revolver's chamber first!</span>")
+			return
+
+		spun = 0
+
+		if(chambered)
+			var/obj/item/ammo_casing/AC = chambered
+			if(AC.fire(user, user))
+				playsound(user, fire_sound, 50, 1)
+				var/zone = check_zone(user.zone_sel.selecting)
+				if(zone == "head" || zone == "eyes" || zone == "mouth")
+					shoot_self(user, zone)
+				else
+					user.visible_message("<span class='danger'>[user.name] cowardly fires [src] at \his [zone]!</span>", "<span class='userdanger'>You cowardly fire [src] at your [zone]!</span>", "<span class='italics'>You hear a gunshot!</span>")
+				return
+
+		user.visible_message("<span class='danger'>*click*</span>")
+		playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+
+/obj/item/weapon/gun/projectile/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = "head")
+	user.apply_damage(300, BRUTE, affecting)
+	user.visible_message("<span class='danger'>[user.name] fires [src] at \his head!</span>", "<span class='userdanger'>You fire [src] at your head!</span>", "<span class='italics'>You hear a gunshot!</span>")
+
+/obj/item/weapon/gun/projectile/revolver/capgun
+	name = "cap gun"
+	desc = "Looks almost like the real thing! Ages 8 and up."
+	origin_tech = "combat=1;materials=1"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/cap
+
+/////////////////////////////
+// DOUBLE BARRELED SHOTGUN //
+/////////////////////////////
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel
+	name = "double-barreled shotgun"
+	desc = "A true classic."
+	icon_state = "dshotgun"
+	item_state = "shotgun"
+	w_class = 4
+	force = 10
+	flags = CONDUCT
+	slot_flags = SLOT_BACK
+	origin_tech = "combat=3;materials=1"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
+	sawn_desc = "Omar's coming!"
+	unique_rename = 1
+	unique_reskin = 1
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/New()
+	..()
+	options["Default"] = "dshotgun"
+	options["Dark Red Finish"] = "dshotgun-d"
+	options["Ash"] = "dshotgun-f"
+	options["Faded Grey"] = "dshotgun-g"
+	options["Maple"] = "dshotgun-l"
+	options["Rosewood"] = "dshotgun-p"
+	options["Cancel"] = null
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
+	..()
+	if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
+		chamber_round()
+	if(istype(A, /obj/item/weapon/melee/energy))
+		var/obj/item/weapon/melee/energy/W = A
+		if(W.active)
+			sawoff(user)
+	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
+		sawoff(user)
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user)
+	var/num_unloaded = 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)
+		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>")
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/isHandgun() //contrary to popular opinion, double barrels are not, shockingly, handguns
+	return 0
+
+// IMPROVISED SHOTGUN //
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
+	name = "improvised shotgun"
+	desc = "Essentially a tube that aims shotgun shells."
+	icon_state = "ishotgun"
+	item_state = "shotgun"
+	w_class = 4
+	force = 10
+	slot_flags = null
+	origin_tech = "combat=2;materials=2"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
+	sawn_desc = "I'm just here for the gasoline."
+	unique_rename = 0
+	unique_reskin = 0
+	var/slung = 0
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
+	..()
+	if(istype(A, /obj/item/stack/cable_coil) && !sawn_state)
+		var/obj/item/stack/cable_coil/C = A
+		if(C.use(10))
+			slot_flags = SLOT_BACK
+			icon_state = "ishotgunsling"
+			to_chat(user, "<span class='notice'>You tie the lengths of cable to the shotgun, making a sling.</span>")
+			slung = 1
+			update_icon()
+		else
+			to_chat(user, "<span class='warning'>You need at least ten lengths of cable if you want to make a sling.</span>")
+			return
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/update_icon()
+	..()
+	if (slung && (slot_flags & SLOT_BELT) )
+		slung = 0
+		icon_state = "ishotgun-sawn"
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user)
+	. = ..()
+	if(. && slung) //sawing off the gun removes the sling
+		new /obj/item/stack/cable_coil(get_turf(src), 10)
+		slung = 0
+		update_icon()
+
+//caneshotgun
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane
+	name = "cane"
+	desc = "A cane used by a true gentleman. Or a clown."
+	icon = 'icons/obj/weapons.dmi'
+	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+	icon_state = "cane"
+	item_state = "stick"
+	sawn_state = SAWN_OFF
+	w_class = 2
+	force = 10
+	can_unsuppress = 0
+	slot_flags = null
+	origin_tech = "" // NO GIVAWAYS
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
+	sawn_desc = "I'm sorry, but why did you saw your cane in the first place?"
+	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
+	fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
+	suppressed = 1
+	needs_permit = 0 //its just a cane beepsky.....
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane/update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane/attackby(obj/item/A, mob/user, params)
+	..()
+	if(istype(A, /obj/item/stack/cable_coil))
+		return
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane/examine(mob/user) // HAD TO REPEAT EXAMINE CODE BECAUSE GUN CODE DOESNT STEALTH
+	var/f_name = "\a [src]."
+	if(blood_DNA && !istype(src, /obj/effect/decal))
+		if(gender == PLURAL)
+			f_name = "some "
+		else
+			f_name = "a "
+		f_name += "<span class='danger'>blood-stained</span> [name]!"
+
+	to_chat(user, "\icon[src] That's [f_name]")
+
+	if(desc)
+		to_chat(user, desc)
diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm
deleted file mode 100644
index e667d9323ce..00000000000
--- a/code/modules/projectiles/guns/projectile/rocket.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-/obj/item/weapon/gun/rocketlauncher
-	var/projectile
-	name = "rocket launcher"
-	desc = "Say hello to my little friend"
-	icon_state = "rocket"
-	item_state = "rocket"
-	w_class = 4.0
-	throw_speed = 2
-	throw_range = 10
-	force = 5.0
-	flags = CONDUCT
-	origin_tech = "combat=8;materials=5"
-	projectile = /obj/item/missile
-	var/missile_speed = 2
-	var/missile_range = 30
-	var/max_rockets = 1
-	var/list/rockets = new/list()
-
-/obj/item/weapon/gun/rocketlauncher/examine(mob/user)
-	if(..(user, 2))
-		to_chat(user, "\blue [rockets.len] / [max_rockets] rockets.")
-
-/obj/item/weapon/gun/rocketlauncher/attackby(obj/item/I as obj, mob/user as mob, params)
-	if(istype(I, /obj/item/ammo_casing/rocket))
-		if(rockets.len < max_rockets)
-			user.drop_item()
-			I.loc = src
-			rockets += I
-			to_chat(user, "\blue You put the rocket in [src].")
-			to_chat(user, "\blue [rockets.len] / [max_rockets] rockets.")
-		else
-			to_chat(usr, "\red [src] cannot hold more rockets.")
-
-/obj/item/weapon/gun/rocketlauncher/can_fire()
-	return rockets.len
-
-/obj/item/weapon/gun/rocketlauncher/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
-	if(rockets.len)
-		var/obj/item/ammo_casing/rocket/I = rockets[1]
-		var/obj/item/missile/M = new projectile(user.loc)
-		playsound(user.loc, 'sound/effects/bang.ogg', 50, 1)
-		M.primed = 1
-		M.throw_at(target, missile_range, missile_speed,user)
-		message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([src.name]).")
-		log_game("[key_name_admin(user)] used a rocket launcher ([src.name]).")
-		rockets -= I
-		qdel(I)
-		return
-	else
-		to_chat(usr, "\red [src] is empty.")
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
new file mode 100644
index 00000000000..097f5fb4a58
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -0,0 +1,157 @@
+/obj/item/weapon/gun/projectile/automatic/l6_saw
+	name = "\improper L6 SAW"
+	desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
+	icon_state = "l6closed100"
+	item_state = "l6closedmag"
+	w_class = 5
+	slot_flags = 0
+	origin_tech = "combat=5;materials=1;syndicate=2"
+	mag_type = /obj/item/ammo_box/magazine/mm556x45
+	weapon_weight = WEAPON_MEDIUM
+	fire_sound = 'sound/weapons/Gunshot3.ogg'
+	var/cover_open = 0
+	can_suppress = 0
+	burst_size = 3
+	fire_delay = 1
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user)
+	cover_open = !cover_open
+	to_chat(user, "<span class='notice'>You [cover_open ? "open" : "close"] [src]'s cover.</span>")
+	update_icon()
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
+	icon_state = "l6[cover_open ? "open" : "closed"][magazine ? Ceiling(get_ammo(0)/12.5)*25 : "-empty"][suppressed ? "-suppressed" : ""]"
+	item_state = "l6[cover_open ? "openmag" : "closedmag"]"
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
+	if(cover_open)
+		to_chat(user, "<span class='notice'>[src]'s cover is open! Close it before firing!</span>")
+	else
+		..()
+		update_icon()
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user)
+	if(loc != user)
+		..()
+		return	//let them pick it up
+	if(!cover_open || (cover_open && !magazine))
+		..()
+	else if(cover_open && magazine)
+		//drop the mag
+		magazine.update_icon()
+		magazine.loc = get_turf(loc)
+		user.put_in_hands(magazine)
+		magazine = null
+		update_icon()
+		to_chat(user, "<span class='notice'>You remove the magazine from [src].</span>")
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(obj/item/A, mob/user, params)
+	. = ..()
+	if(.)
+		return
+	if(!cover_open)
+		to_chat(user, "<span class='warning'>[src]'s cover is closed! You can't insert a new mag.</span>")
+		return
+	..()
+
+//ammo//
+
+/obj/item/projectile/bullet/saw
+	damage = 45
+	armour_penetration = 5
+
+/obj/item/projectile/bullet/saw/bleeding
+	damage = 20
+	armour_penetration = 0
+
+/obj/item/projectile/bullet/saw/bleeding/on_hit(atom/target, blocked = 0, hit_zone)
+	. = ..()
+	if((blocked != 100) && istype(target, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = target
+		H.drip(350)
+
+/obj/item/projectile/bullet/saw/hollow
+	damage = 60
+	armour_penetration = -10
+
+/obj/item/projectile/bullet/saw/ap
+	damage = 40
+	armour_penetration = 75
+
+/obj/item/projectile/bullet/saw/incen
+	damage = 7
+	armour_penetration = 0
+
+obj/item/projectile/bullet/saw/incen/Move()
+	..()
+	var/turf/location = get_turf(src)
+	if(location)
+		PoolOrNew(/obj/effect/hotspot, location)
+		location.hotspot_expose(700, 50, 1)
+
+/obj/item/projectile/bullet/saw/incen/on_hit(atom/target, blocked = 0)
+	. = ..()
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		M.adjust_fire_stacks(3)
+		M.IgniteMob()
+
+//magazines//
+
+/obj/item/ammo_box/magazine/mm556x45
+	name = "box magazine (5.56x45mm)"
+	icon_state = "a762-50"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/mm556x45
+	caliber = "mm55645"
+	max_ammo = 50
+
+/obj/item/ammo_box/magazine/mm556x45/bleeding
+	name = "box magazine (Bleeding 5.56x45mm)"
+	origin_tech = "combat=3"
+	ammo_type = /obj/item/ammo_casing/mm556x45/bleeding
+
+/obj/item/ammo_box/magazine/mm556x45/hollow
+	name = "box magazine (Hollow-Point 5.56x45mm)"
+	origin_tech = "combat=3"
+	ammo_type = /obj/item/ammo_casing/mm556x45/hollow
+
+/obj/item/ammo_box/magazine/mm556x45/ap
+	name = "box magazine (Armor Penetrating 5.56x45mm)"
+	origin_tech = "combat=4"
+	ammo_type = /obj/item/ammo_casing/mm556x45/ap
+
+/obj/item/ammo_box/magazine/mm556x45/incen
+	name = "box magazine (Incendiary 5.56x45mm)"
+	origin_tech = "combat=4"
+	ammo_type = /obj/item/ammo_casing/mm556x45/incen
+
+/obj/item/ammo_box/magazine/mm556x45/update_icon()
+	..()
+	icon_state = "a762-[round(ammo_count(),10)]"
+
+//casings//
+
+/obj/item/ammo_casing/mm556x45
+	desc = "A 556x45mm bullet casing."
+	icon_state = "762-casing"
+	caliber = "mm55645"
+	projectile_type = /obj/item/projectile/bullet/saw
+
+/obj/item/ammo_casing/mm556x45/bleeding
+	desc = "A 556x45mm bullet casing with specialized inner-casing, that when it makes contact with a target, release tiny shrapnel to induce internal bleeding."
+	icon_state = "762-casing"
+	projectile_type = /obj/item/projectile/bullet/saw/bleeding
+
+/obj/item/ammo_casing/mm556x45/hollow
+	desc = "A 556x45mm bullet casing designed to cause more damage to unarmored targets."
+	projectile_type = /obj/item/projectile/bullet/saw/hollow
+
+/obj/item/ammo_casing/mm556x45/ap
+	desc = "A 556x45mm bullet casing designed with a hardened-tipped core to help penetrate armored targets."
+	projectile_type = /obj/item/projectile/bullet/saw/ap
+
+/obj/item/ammo_casing/mm556x45/incen
+	desc = "A 556x45mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames. "
+	projectile_type = /obj/item/projectile/bullet/saw/incen
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 7ae951ad908..ddec7543009 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -8,40 +8,34 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
 	origin_tech = "combat=4;materials=2"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot
 	var/recentpump = 0 // to prevent spammage
-	mag_type = "/obj/item/ammo_box/magazine/internal/shot"
 
-/obj/item/weapon/gun/projectile/shotgun/attackby(var/obj/item/A as obj, mob/user as mob, params)
-	var/num_loaded = 0
-	if(istype(A, /obj/item/ammo_box))
-		var/obj/item/ammo_box/AM = A
-		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
-			var/didload = magazine.give_round(AC)
-			if(didload)
-				AM.stored_ammo -= AC
-				num_loaded++
-			if(!didload || !magazine.multiload)
-				break
-	if(istype(A, /obj/item/ammo_casing))
-		var/obj/item/ammo_casing/AC = A
-		if(magazine && magazine.give_round(AC))
-			user.drop_item()
-			AC.loc = src
-			num_loaded++
+/obj/item/weapon/gun/projectile/shotgun/attackby(obj/item/A, mob/user, params)
+	. = ..()
+	if(.)
+		return
+	var/num_loaded = magazine.attackby(A, user, params, 1)
 	if(num_loaded)
 		to_chat(user, "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>")
 		A.update_icon()
 		update_icon()
 
 
-/obj/item/weapon/gun/projectile/shotgun/process_chambered()
+/obj/item/weapon/gun/projectile/shotgun/process_chamber()
 	return ..(0, 0)
 
 /obj/item/weapon/gun/projectile/shotgun/chamber_round()
 	return
 
-/obj/item/weapon/gun/projectile/shotgun/attack_self(mob/living/user as mob)
-	if(recentpump)	return
+/obj/item/weapon/gun/projectile/shotgun/can_shoot()
+	if(!chambered)
+		return 0
+	return (chambered.BB ? 1 : 0)
+
+/obj/item/weapon/gun/projectile/shotgun/attack_self(mob/living/user)
+	if(recentpump)
+		return
 	pump(user)
 	recentpump = 1
 	spawn(10)
@@ -49,7 +43,7 @@
 	return
 
 
-/obj/item/weapon/gun/projectile/shotgun/proc/pump(mob/M as mob)
+/obj/item/weapon/gun/projectile/shotgun/proc/pump(mob/M)
 	playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
 	pump_unload(M)
 	pump_reload(M)
@@ -61,36 +55,41 @@
 		chambered.loc = get_turf(src)//Eject casing
 		chambered.SpinAnimation(5, 1)
 		chambered = null
-		if(in_chamber)
-			in_chamber = null
 
 /obj/item/weapon/gun/projectile/shotgun/proc/pump_reload(mob/M)
-	if(!magazine.ammo_count())	return 0
+	if(!magazine.ammo_count())
+		return 0
 	var/obj/item/ammo_casing/AC = magazine.get_round() //load next casing.
 	chambered = AC
 
 /obj/item/weapon/gun/projectile/shotgun/examine(mob/user)
-	..(user)
+	..()
 	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.
 	return 0
 
+/obj/item/weapon/gun/projectile/shotgun/lethal
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
+
 // RIOT SHOTGUN //
 
 /obj/item/weapon/gun/projectile/shotgun/riot //for spawn in the armory
 	name = "riot shotgun"
 	desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control."
 	icon_state = "riotshotgun"
-	mag_type = "/obj/item/ammo_box/magazine/internal/shotriot"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
 	sawn_desc = "Come with me if you want to live."
 
-/obj/item/weapon/gun/projectile/shotgun/riot/attackby(var/obj/item/A as obj, mob/user as mob, params)
+/obj/item/weapon/gun/projectile/shotgun/riot/attackby(obj/item/A, mob/user, params)
 	..()
-	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
+	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
 		sawoff(user)
-
+	if(istype(A, /obj/item/weapon/melee/energy))
+		var/obj/item/weapon/melee/energy/W = A
+		if(W.active)
+			sawoff(user)
 
 ///////////////////////
 // BOLT ACTION RIFLE //
@@ -102,7 +101,7 @@
 	icon_state = "moistnugget"
 	item_state = "moistnugget"
 	slot_flags = 0 //no SLOT_BACK sprite, alas
-	mag_type = "/obj/item/ammo_box/magazine/internal/boltaction"
+	mag_type = /obj/item/ammo_box/magazine/internal/boltaction
 	var/bolt_open = 0
 
 /obj/item/weapon/gun/projectile/shotgun/boltaction/pump(mob/M)
@@ -115,21 +114,27 @@
 	update_icon()	//I.E. fix the desc
 	return 1
 
-/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user)
+	. = 0
+	if(chambered && chambered.BB)
+		process_fire(user, user,0)
+		. = 1
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(obj/item/A, mob/user, params)
 	if(!bolt_open)
 		to_chat(user, "<span class='notice'>The bolt is closed!</span>")
 		return
 	. = ..()
 
 /obj/item/weapon/gun/projectile/shotgun/boltaction/examine(mob/user)
-	..(user)
+	..()
 	to_chat(user, "The bolt is [bolt_open ? "open" : "closed"].")
 
 /obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted
 	name = "enchanted bolt action rifle"
 	desc = "Careful not to lose your head."
 	var/guns_left = 30
-	mag_type = "/obj/item/ammo_box/magazine/internal/boltaction/enchanted"
+	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted
 
 /obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/New()
 	..()
@@ -137,13 +142,14 @@
 	pump()
 
 /obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/dropped()
+	..()
 	guns_left = 0
 
-/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/Fire(atom/target as mob|obj|turf|area, mob/living/carbon/user as mob|obj, params, reflex = 0)
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
 	..()
 	if(guns_left)
 		var/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/GUN = new
-		GUN.guns_left = src.guns_left - 1
+		GUN.guns_left = guns_left - 1
 		user.drop_item()
 		user.swap_hand()
 		user.put_in_hands(GUN)
@@ -153,205 +159,59 @@
 		throw_at(pick(oview(7,get_turf(user))),1,1)
 	user.visible_message("<span class='warning'>[user] tosses aside the spent rifle!</span>")
 
+// Automatic Shotguns//
 
-/obj/item/ammo_box/magazine/internal/boltaction/enchanted
-	max_ammo =1
+/obj/item/weapon/gun/projectile/shotgun/automatic
 
-/////////////////////////////
-// DOUBLE BARRELED SHOTGUN //
-/////////////////////////////
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel
-	name = "double-barreled shotgun"
-	desc = "A true classic."
-	icon_state = "dshotgun"
-	item_state = "shotgun"
-	w_class = 4.0
-	force = 10
-	flags = CONDUCT
-	slot_flags = SLOT_BACK
-	origin_tech = "combat=3;materials=1"
-	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/dualshot"
-	sawn_desc = "Omar's coming!"
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob, params)
-	..()
-	if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
-		chamber_round()
-	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
-		sawoff(user)
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user as mob)
-	var/num_unloaded = 0
-	while (get_ammo() > 0)
-		var/obj/item/ammo_casing/CB
-		CB = magazine.get_round(0)
-		chambered = null
-		CB.loc = get_turf(src.loc)
-		CB.update_icon()
-		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>")
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/isHandgun() //contrary to popular opinion, double barrels are not, shockingly, handguns
-	return 0
-
-// IMPROVISED SHOTGUN //
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
-	name = "improvised shotgun"
-	desc = "Essentially a tube that aims shotgun shells."
-	icon_state = "ishotgun"
-	item_state = "shotgun"
-	w_class = 4.0
-	force = 10
-	slot_flags = null
-	origin_tech = "combat=2;materials=2"
-	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/improvised"
-	sawn_desc = "I'm just here for the gasoline."
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(var/obj/item/A as obj, mob/user as mob, params)
-	..()
-	if(istype(A, /obj/item/stack/cable_coil) && !sawn_state)
-		var/obj/item/stack/cable_coil/C = A
-		if(C.use(10))
-			slot_flags = SLOT_BACK
-			icon_state = "ishotgunsling"
-			to_chat(user, "<span class='notice'>You tie the lengths of cable to the shotgun, making a sling.</span>")
-			update_icon()
-		else
-			to_chat(user, "<span class='warning'>You need at least ten lengths of cable if you want to make a sling.</span>")
-			return
-
-// Sawing guns related procs //
-
-/obj/item/weapon/gun/projectile/proc/blow_up(mob/user as mob)
-	if(get_ammo())
-		afterattack(user, user)
-		playsound(user, fire_sound, 50, 1)
-		user.visible_message("<span class='danger'>The [src] goes off!</span>", "<span class='danger'>The [src] goes off in your face!</span>")
-		return
-
-/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob)
-	if(sawn_state == SAWN_OFF)
-		to_chat(user, "<span class='notice'>\The [src] is already shortened.</span>")
-		return
-
-	if(sawn_state == SAWN_SAWING)
-		return
-
-	user.visible_message("<span class='notice'>[user] begins to shorten \the [src].</span>", "<span class='notice'>You begin to shorten \the [src].</span>")
-
-	//if there's any live ammo inside the gun, makes it go off
-	if(blow_up(user))
-		user.visible_message("<span class='danger'>\The [src] goes off!</span>", "<span class='danger'>\The [src] goes off in your face!</span>")
-		return
-
-	sawn_state = SAWN_SAWING
-
-	if(do_after(user, 30, target = src))
-		user.visible_message("<span class='warning'>[user] shortens \the [src]!</span>", "<span class='warning'>You shorten \the [src]!</span>")
-		name = "sawn-off [src.name]"
-		desc = sawn_desc
-		icon_state = "[icon_state]-sawn"
-		w_class = 3.0
-		item_state = "gun"
-		slot_flags &= ~SLOT_BACK	//you can't sling it on your back
-		slot_flags |= SLOT_BELT		//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
-		sawn_state = SAWN_OFF
-		update_icon()
-		return
-	else
-		sawn_state = SAWN_INTACT
-
-/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
-	name = "\improper 'Bulldog' Shotgun"
-	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
-	origin_tech = "combat=5;materials=4;syndicate=6"
-	mag_type = "/obj/item/ammo_box/magazine/m12g"
-	fire_sound = 'sound/weapons/Gunshot4.ogg'
-	can_suppress = 0
-	burst_size = 1
-	fire_delay = 0
-	action_button_name = null
-
-/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/New()
-	..()
-	update_icon()
-	return
-
-/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/proc/update_magazine()
-	if(magazine)
-		overlays.Cut()
-		overlays += "[magazine.icon_state]"
-		return
-
-/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/update_icon()
-	overlays.Cut()
-	update_magazine()
-	icon_state = "bulldog[chambered ? "" : "-e"]"
-	return
-
-/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
-	..()
-	empty_alarm()
-	return
-
-/obj/item/weapon/gun/projectile/shotgun/automatic/Fire(mob/living/user as mob|obj)
+/obj/item/weapon/gun/projectile/shotgun/automatic/shoot_live_shot(mob/living/user as mob|obj)
 	..()
 	pump(user)
 
-// COMBAT SHOTGUN //
-
 /obj/item/weapon/gun/projectile/shotgun/automatic/combat
 	name = "combat shotgun"
 	desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
 	icon_state = "cshotgun"
 	origin_tech = "combat=5;materials=2"
-	mag_type = "/obj/item/ammo_box/magazine/internal/shotcom"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/com
 	w_class = 5
 
-//caneshotgun
+//Dual Feed Shotgun
 
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane
-	name = "cane"
-	desc = "A cane used by a true gentlemen. Or a clown."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "cane"
-	item_state = "stick"
-	sawn_state = SAWN_OFF
-	w_class = 2
-	force = 10
-	can_unsuppress = 0
-	slot_flags = null
-	origin_tech = "" // NO GIVAWAYS
-	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/improvised"
-	sawn_desc = "I'm sorry, but why did you saw your cane in the first place?"
-	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
-	fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
-	silenced = 1
-	needs_permit = 0 //its just a cane beepsky.....
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube
+	name = "cycler shotgun"
+	desc = "An advanced shotgun with two separate magazine tubes, allowing you to quickly toggle between ammo types."
+	icon_state = "cycler"
+	origin_tech = "combat=4;materials=2"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
+	w_class = 5
+	var/toggled = 0
+	var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine
 
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane/attackby(obj/item/A, mob/user, params)
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/New()
 	..()
-	if(istype(A, /obj/item/stack/cable_coil))
+	if (!alternate_magazine)
+		alternate_magazine = new mag_type(src)
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/attack_self(mob/living/user)
+	if(!chambered && magazine.contents.len)
+		pump()
+	else
+		toggle_tube(user)
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/proc/toggle_tube(mob/living/user)
+	var/current_mag = magazine
+	var/alt_mag = alternate_magazine
+	magazine = alt_mag
+	alternate_magazine = current_mag
+	toggled = !toggled
+	if(toggled)
+		to_chat(user, "You switch to tube B.")
+	else
+		to_chat(user, "You switch to tube A.")
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/AltClick(mob/living/user)
+	if(user.incapacitated() || !Adjacent(user) || !istype(user))
 		return
+	pump()
 
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane/examine(mob/user) // HAD TO REPEAT EXAMINE CODE BECAUSE GUN CODE DOESNT STEALTH
-	var/f_name = "\a [src]."
-	if(src.blood_DNA && !istype(src, /obj/effect/decal))
-		if(gender == PLURAL)
-			f_name = "some "
-		else
-			f_name = "a "
-		f_name += "<span class='danger'>blood-stained</span> [name]!"
-
-	to_chat(user, "\icon[src] That's [f_name]")
-
-	if(desc)
-		to_chat(user, desc)
\ No newline at end of file
+// DOUBLE BARRELED SHOTGUN, IMPROVISED SHOTGUN, and CANE SHOTGUN are in revolver.dm
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index ee70bb3f80b..59bd7fb649b 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -4,8 +4,8 @@
 	icon_state = "sniper"
 	item_state = "sniper"
 	recoil = 2
-	heavy_weapon = 1
-	mag_type = "/obj/item/ammo_box/magazine/sniper_rounds"
+	weapon_weight = WEAPON_MEDIUM
+	mag_type = /obj/item/ammo_box/magazine/sniper_rounds
 	fire_delay = 40
 	origin_tech = "combat=8"
 	can_unsuppress = 1
@@ -35,18 +35,18 @@
 	max_ammo = 6
 	caliber = ".50"
 
-/obj/item/ammo_casing/point50
-	desc = "A .50 bullet casing."
-	caliber = ".50"
-	projectile_type = /obj/item/projectile/bullet/sniper
-	icon_state = ".50"
-
 /obj/item/ammo_box/magazine/sniper_rounds/update_icon()
 	if(ammo_count())
 		icon_state = "[initial(icon_state)]-ammo"
 	else
 		icon_state = "[initial(icon_state)]"
 
+/obj/item/ammo_casing/point50
+	desc = "A .50 bullet casing."
+	caliber = ".50"
+	projectile_type = /obj/item/projectile/bullet/sniper
+	icon_state = ".50"
+
 /obj/item/projectile/bullet/sniper
 	damage = 70
 	stun = 5
@@ -69,8 +69,6 @@
 	origin_tech = "combat=6;syndicate=3"
 	ammo_type = /obj/item/ammo_casing/soporific
 	max_ammo = 3
-	caliber = ".50"
-	icon_state = ".50"
 
 /obj/item/ammo_casing/soporific
 	desc = "A .50 bullet casing, specialised in sending the target to sleep, instead of hell."
@@ -79,10 +77,10 @@
 	icon_state = ".50"
 
 /obj/item/projectile/bullet/sniper/soporific
+	armour_penetration = 0
 	nodamage = 1
 	stun = 0
 	weaken = 0
-	armour_penetration = 0
 	breakthings = FALSE
 
 /obj/item/projectile/bullet/sniper/soporific/on_hit(atom/target, blocked = 0, hit_zone)
@@ -102,8 +100,6 @@
 	origin_tech = "combat=7;syndicate=5"
 	ammo_type = /obj/item/ammo_casing/haemorrhage
 	max_ammo = 5
-	caliber = ".50"
-	icon_state = ".50"
 
 /obj/item/ammo_casing/haemorrhage
 	desc = "A .50 bullet casing, specialised in causing massive bloodloss"
@@ -112,11 +108,11 @@
 	icon_state = ".50"
 
 /obj/item/projectile/bullet/sniper/haemorrhage
+	armour_penetration = 15
 	damage = 15
 	stun = 0
 	weaken = 0
 	breakthings = FALSE
-	armour_penetration = 15
 
 /obj/item/projectile/bullet/sniper/haemorrhage/on_hit(atom/target, blocked = 0, hit_zone)
 	if((blocked != 100) && istype(target, /mob/living/carbon/human))
@@ -145,4 +141,4 @@
 	forcedodge = 1
 	stun = 0
 	weaken = 0
-	breakthings = FALSE
\ No newline at end of file
+	breakthings = FALSE
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 7bb290f4f46..c0465a83beb 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -1,10 +1,11 @@
 /obj/item/weapon/gun/projectile/automatic/toy
 	name = "foam force SMG"
 	desc = "A prototype three-round burst toy submachine gun. Ages 8 and up."
-	icon = 'icons/obj/toyguns.dmi'
+	icon = 'icons/obj/guns/toy.dmi'
 	icon_state = "saber"
 	item_state = "gun"
-	mag_type = "/obj/item/ammo_box/magazine/toy/smg"
+	mag_type = /obj/item/ammo_box/magazine/toy/smg
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
 	force = 0
 	throwforce = 0
 	burst_size = 3
@@ -12,15 +13,15 @@
 	clumsy_check = 0
 	needs_permit = 0
 
-/obj/item/weapon/gun/projectile/automatic/toy/process_chambered()
-	return ..(0, 1)
+/obj/item/weapon/gun/projectile/automatic/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
 
 /obj/item/weapon/gun/projectile/automatic/toy/pistol
 	name = "foam force pistol"
 	desc = "A small, easily concealable toy handgun. Ages 8 and up."
 	icon_state = "pistol"
 	w_class = 2
-	mag_type = "/obj/item/ammo_box/magazine/toy/pistol"
+	mag_type = /obj/item/ammo_box/magazine/toy/pistol
 	fire_sound = 'sound/weapons/Gunshot.ogg'
 	can_suppress = 0
 	burst_size = 1
@@ -34,67 +35,65 @@
 /obj/item/weapon/gun/projectile/automatic/toy/pistol/riot
 	name = "foam force riot pistol"
 	desc = "RIOT! Ages 8 and up."
+	mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot
 
 /obj/item/weapon/gun/projectile/automatic/toy/pistol/riot/New()
 	magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
 	..()
 
-/obj/item/weapon/gun/projectile/automatic/c20r/toy
-	name = "donksoft SMG"
-	desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
-	icon = 'icons/obj/toyguns.dmi'
-	can_suppress = 0
-	needs_permit = 0
-	mag_type = "/obj/item/ammo_box/magazine/toy/smgm45"
-
-/obj/item/weapon/gun/projectile/automatic/c20r/toy/process_chambered()
-	return ..(0, 1)
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/toy
-	name = "donksoft LMG"
-	desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
-	icon = 'icons/obj/toyguns.dmi'
-	can_suppress = 0
-	needs_permit = 0
-	mag_type = "/obj/item/ammo_box/magazine/toy/m762"
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chambered()
-	return ..(0, 1)
-
-
-
 /obj/item/weapon/gun/projectile/shotgun/toy
 	name = "foam force shotgun"
 	desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up."
-	icon = 'icons/obj/toyguns.dmi'
+	icon = 'icons/obj/guns/toy.dmi'
 	force = 0
 	throwforce = 0
 	origin_tech = null
-	mag_type = "/obj/item/ammo_box/magazine/internal/shot/toy"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
 	clumsy_check = 0
 	needs_permit = 0
 
-/obj/item/weapon/gun/projectile/shotgun/toy/pump_unload()
-	if(chambered)//We have a shell in the chamber
-		chambered = null
-		if(in_chamber)
-			in_chamber = null
+/obj/item/weapon/gun/projectile/shotgun/toy/process_chamber()
+	..()
+	if(chambered && !chambered.BB)
+		qdel(chambered)
 
 /obj/item/weapon/gun/projectile/shotgun/toy/crossbow
 	name = "foam force crossbow"
 	desc = "A weapon favored by many overactive children. Ages 8 and up."
 	icon_state = "crossbow"
 	item_state = "crossbow"
-	mag_type = "/obj/item/ammo_box/magazine/internal/shot/toy/crossbow"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
 	fire_sound = 'sound/items/syringeproj.ogg'
 	slot_flags = SLOT_BELT
 	w_class = 2
 
+/obj/item/weapon/gun/projectile/automatic/c20r/toy
+	name = "donksoft SMG"
+	desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
+	icon = 'icons/obj/guns/toy.dmi'
+	can_suppress = 0
+	needs_permit = 0
+	mag_type = /obj/item/ammo_box/magazine/toy/smgm45
+
+/obj/item/weapon/gun/projectile/automatic/c20r/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/toy
+	name = "donksoft LMG"
+	desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
+	icon = 'icons/obj/guns/toy.dmi'
+	can_suppress = 0
+	needs_permit = 0
+	mag_type = /obj/item/ammo_box/magazine/toy/m762
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+
 /obj/item/weapon/gun/projectile/shotgun/toy/tommygun
 	name = "tommy gun"
 	desc = "Looks almost like the real thing! Great for practicing Drive-bys. Ages 8 and up."
-	icon = 'icons/obj/gun.dmi'
+	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "tommy"
 	item_state = "shotgun"
-	mag_type = "/obj/item/ammo_box/magazine/internal/shot/toy/tommygun"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/tommygun
 	w_class = 2
diff --git a/code/modules/projectiles/guns/rocket.dm b/code/modules/projectiles/guns/rocket.dm
new file mode 100644
index 00000000000..72ab89bf40e
--- /dev/null
+++ b/code/modules/projectiles/guns/rocket.dm
@@ -0,0 +1,58 @@
+/obj/item/weapon/gun/rocketlauncher
+	var/projectile
+	name = "rocket launcher"
+	desc = "Say hello to my little friend"
+	icon_state = "rocket"
+	item_state = "rocket"
+	w_class = 4.0
+	throw_speed = 2
+	throw_range = 10
+	force = 5.0
+	flags = CONDUCT
+	origin_tech = "combat=8;materials=5"
+	var/missile_speed = 2
+	var/missile_range = 30
+	var/max_rockets = 1
+	var/list/rockets = new/list()
+
+/obj/item/weapon/gun/rocketlauncher/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>[rockets.len] / [max_rockets] rockets.</span>")
+
+/obj/item/weapon/gun/rocketlauncher/Destroy()
+	for(var/datum/D in rockets)
+		qdel(D)
+	rockets = null
+
+	return ..()
+
+/obj/item/weapon/gun/rocketlauncher/update_icon()
+	return
+
+/obj/item/weapon/gun/rocketlauncher/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/ammo_casing/rocket))
+		if(rockets.len < max_rockets)
+			user.drop_item()
+			I.loc = src
+			rockets += I
+			to_chat(user, "<span class='notice'>You put the rocket in [src].</span>")
+			to_chat(user, "<span class='notice'>[rockets.len] / [max_rockets] rockets.</span>")
+		else
+			to_chat(usr, "<span class='notice'>[src] cannot hold more rockets.</span>")
+
+/obj/item/weapon/gun/rocketlauncher/can_shoot()
+	return rockets.len
+
+/obj/item/weapon/gun/rocketlauncher/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override = "")
+	if(rockets.len)
+		var/obj/item/ammo_casing/rocket/I = rockets[1]
+		var/obj/item/missile/M = new /obj/item/missile(user.loc)
+		playsound(user.loc, 'sound/effects/bang.ogg', 50, 1)
+		M.primed = 1
+		M.throw_at(target, missile_range, missile_speed, user, 1)
+		message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([name]).")
+		log_game("[key_name_admin(user)] used a rocket launcher ([name]).")
+		rockets -= I
+		qdel(I)
+	else
+		to_chat(usr, "<span class='warning'>[src] is empty.</span>")
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 0e43d550c85..332d279376b 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -13,25 +13,41 @@
 	var/list/syringes = list()
 	var/max_syringes = 1
 
-/obj/item/weapon/gun/syringe/process_chambered()
-	if(!syringes.len) return 0
+/obj/item/weapon/gun/syringe/New()
+	..()
+	chambered = new /obj/item/ammo_casing/syringegun(src)
+
+/obj/item/weapon/gun/syringe/newshot()
+	if(!syringes.len)
+		return
 
 	var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
 
-	if(!S) return 0
+	if(!S)
+		return
 
-	in_chamber = new /obj/item/projectile/bullet/dart/syringe(src)
-	S.reagents.trans_to(in_chamber, S.reagents.total_volume)
-	in_chamber.name = S.name
+	chambered.BB = new S.projectile_type (src)
+
+	S.reagents.trans_to(chambered.BB, S.reagents.total_volume)
+	chambered.BB.name = S.name
 	syringes.Remove(S)
 
 	qdel(S)
-	return 1
+	return
+
+/obj/item/weapon/gun/syringe/process_chamber()
+	return
+
+/obj/item/weapon/gun/syringe/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
+	if(target == loc)
+		return
+	newshot()
+	..()
 
 /obj/item/weapon/gun/syringe/examine(mob/user)
-	..(user)
+	..()
 	to_chat(user, "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining.")
-	
+
 /obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob)
 	if(!syringes.len)
 		to_chat(user, "<span class='notice'>[src] is empty.</span>")
@@ -39,24 +55,26 @@
 
 	var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len]
 
-	if(!S) return 0
-	S.forceMove(user.loc)
+	if(!S)
+		return 0
+	S.loc = user.loc
 
 	syringes.Remove(S)
 	to_chat(user, "<span class='notice'>You unload [S] from \the [src]!</span>")
 
 	return 1
 
-/obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, var/show_msg = 1, params)
+/obj/item/weapon/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = 1)
 	if(istype(A, /obj/item/weapon/reagent_containers/syringe))
 		if(syringes.len < max_syringes)
-			user.drop_item()
+			if(!user.unEquip(A))
+				return
 			to_chat(user, "<span class='notice'>You load [A] into \the [src]!</span>")
 			syringes.Add(A)
-			A.forceMove(src)
+			A.loc = src
 			return 1
 		else
-			to_chat(usr, "<span class='notice'>[src] cannot hold more syringes.</span>")
+			to_chat(user, "<span class='notice'>[src] cannot hold more syringes.</span>")
 	return 0
 
 /obj/item/weapon/gun/syringe/rapidsyringe
@@ -64,7 +82,7 @@
 	desc = "A modification of the syringe gun design, using a rotating cylinder to store up to six syringes."
 	icon_state = "rapidsyringegun"
 	max_syringes = 6
-	
+
 /obj/item/weapon/gun/syringe/syndicate
 	name = "dart pistol"
 	desc = "A small spring-loaded sidearm that functions identically to a syringe gun."
@@ -73,5 +91,5 @@
 	w_class = 2
 	origin_tech = "combat=2;syndicate=2"
 	force = 2 //Also very weak because it's smaller
-	silenced = 1 //Softer fire sound
+	suppressed = 1 //Softer fire sound
 	can_unsuppress = 0 //Permanently silenced
diff --git a/code/modules/projectiles/guns/throw.dm b/code/modules/projectiles/guns/throw.dm
new file mode 100644
index 00000000000..d1bcda59067
--- /dev/null
+++ b/code/modules/projectiles/guns/throw.dm
@@ -0,0 +1,93 @@
+/obj/item/weapon/gun/throw
+	name = "abstract item thrower"
+	desc = "This shouldn't be here, yell at a coder."
+	fire_sound = 'sound/weapons/punchmiss.ogg'
+	fire_sound_text = "thwock"
+
+	var/obj/item/to_launch
+	var/list/valid_projectile_type
+	var/max_capacity = 1
+	var/list/loaded_projectiles = list()
+
+	var/projectile_speed = 1
+	var/projectile_range = 1
+
+/obj/item/weapon/gun/throw/proc/notify_ammo_count(mob/user)
+	return
+
+/obj/item/weapon/gun/throw/proc/get_throwrange()
+	return projectile_speed
+
+/obj/item/weapon/gun/throw/proc/get_throwspeed()
+	return projectile_range
+
+/obj/item/weapon/gun/throw/proc/modify_projectile(obj/item/I, on_chamber = 0)
+	return
+
+/obj/item/weapon/gun/throw/proc/get_ammocount(include_loaded = 1)
+	var/count = loaded_projectiles.len
+	if(include_loaded && to_launch)
+		count++
+	return count
+
+/obj/item/weapon/gun/throw/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>It is [to_launch ? "loaded with \a [to_launch]" : "not loaded"].</span>")
+	notify_ammo_count(user)
+
+/obj/item/weapon/gun/throw/Destroy()
+	qdel(to_launch)
+	to_launch = null
+	for(var/atom/A in loaded_projectiles)
+		qdel(A)
+	loaded_projectiles = null
+
+	return ..()
+
+/obj/item/weapon/gun/throw/update_icon()
+	return
+
+/obj/item/weapon/gun/throw/attackby(obj/item/I, mob/user, params)
+	if(istype(I, valid_projectile_type) && !(I.flags & NODROP))
+		if(get_ammocount() < max_capacity)
+			user.drop_item()
+			I.forceMove(src)
+			loaded_projectiles += I
+			to_chat(user, "<span class='notice'>You load [I] into [src].</span>")
+			if(!to_launch)
+				process_chamber()
+			notify_ammo_count(user)
+		else
+			to_chat(user, "<span class='warning'>[src] cannot hold any more projectiles.</span>")
+	else
+		to_chat(user, "<span class='warning'>You cannot load [I] into [src]!</span>")
+
+/obj/item/weapon/gun/throw/process_chamber()
+	if(!to_launch && loaded_projectiles.len)
+		to_launch = loaded_projectiles[1]
+		loaded_projectiles -= to_launch
+	return
+
+/obj/item/weapon/gun/throw/can_shoot()
+	if(to_launch)
+		return 1
+	return 0
+
+/obj/item/weapon/gun/throw/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
+	add_fingerprint(user)
+	if(semicd)
+		return
+
+	var/obj/item/I = to_launch
+	I.forceMove(get_turf(src))
+	to_launch = null
+	modify_projectile(I)
+	playsound(user, fire_sound, 50, 1)
+	I.throw_at(target, get_throwrange(), get_throwspeed(), user, 1)
+	message_admins("[key_name_admin(user)] fired \a [I] from a [src].")
+	log_game("[key_name_admin(user)] used \a [src].")
+	process_chamber()
+
+	semicd = 1
+	spawn(fire_delay)
+		semicd = 0
diff --git a/code/modules/projectiles/guns/throw/crossbow.dm b/code/modules/projectiles/guns/throw/crossbow.dm
new file mode 100644
index 00000000000..55e76bec6b7
--- /dev/null
+++ b/code/modules/projectiles/guns/throw/crossbow.dm
@@ -0,0 +1,181 @@
+#define XBOW_TENSION_20 "20%"
+#define XBOW_TENSION_40 "40%"
+#define XBOW_TENSION_60 "60%"
+#define XBOW_TENSION_80 "80%"
+#define XBOW_TENSION_FULL "100%"
+
+/obj/item/weapon/gun/throw/crossbow
+	name = "powered crossbow"
+	desc = "A modern twist on an old classic. Pick up that can."
+	icon_state = "crossbow"
+	item_state = "crossbow-solid"
+	fire_sound_text = "a solid thunk"
+	fire_delay = 25
+
+	valid_projectile_type = /obj/item/weapon/arrow
+
+	var/tension = 0
+	var/drawtension = 5
+	var/maxtension = 5
+	var/speed_multiplier = 5
+	var/range_multiplier = 3
+	var/obj/item/weapon/stock_parts/cell/cell = null    // Used for firing superheated rods.
+	var/list/possible_tensions = list(XBOW_TENSION_20, XBOW_TENSION_40, XBOW_TENSION_60, XBOW_TENSION_80, XBOW_TENSION_FULL)
+
+/obj/item/weapon/gun/throw/crossbow/emp_act(severity)
+	if(cell && severity)
+		emp_act(severity)
+
+/obj/item/weapon/gun/throw/crossbow/update_icon()
+	if(!tension)
+		if(!to_launch)
+			icon_state = "[initial(icon_state)]"
+		else
+			icon_state = "[initial(icon_state)]-nocked"
+	else
+		icon_state = "[initial(icon_state)]-drawn"
+
+/obj/item/weapon/gun/throw/crossbow/examine(mob/user)
+	..()
+	if(cell)
+		to_chat(user, "<span class='notice'>\A [cell] is mounted onto [src]. Battery cell charge: [cell.charge]/[cell.maxcharge]")
+	else
+		to_chat(user, "<span class='notice'>It has an empty mount for a battery cell.</span>")
+
+/obj/item/weapon/gun/throw/crossbow/modify_projectile(obj/item/I, on_chamber = 0)
+	if(cell && on_chamber && istype(I, /obj/item/weapon/arrow/rod))
+		var/obj/item/weapon/arrow/rod/R = I
+		visible_message("<span class='danger'>[R] plinks and crackles as it begins to glow red-hot.</span>")
+		R.throwforce = 15
+		R.superheated = 1
+		cell.use(500)
+
+/obj/item/weapon/gun/throw/crossbow/get_throwspeed()
+	return tension * speed_multiplier
+
+/obj/item/weapon/gun/throw/crossbow/get_throwrange()
+	return tension * range_multiplier
+
+/obj/item/weapon/gun/throw/crossbow/process_chamber()
+	..()
+	if(to_launch)
+		modify_projectile(to_launch, 1)
+	update_icon()
+
+/obj/item/weapon/gun/throw/crossbow/attack_self(mob/living/user)
+	if(tension)
+		if(to_launch)
+			user.visible_message("<span class='notice'>[user] relaxes the tension on [src]'s string and removes [to_launch].</span>","<span class='notice'>You relax the tension on [src]'s string and remove [to_launch].</span>")
+			to_launch.forceMove(get_turf(src))
+			var/obj/item/weapon/arrow/A = to_launch
+			to_launch = null
+			A.removed()
+			process_chamber()
+		else
+			user.visible_message("<span class='notice'>[user] relaxes the tension on [src]'s string.</span>","<span class='notice'>You relax the tension on [src]'s string.</span>")
+		tension = 0
+		update_icon()
+	else
+		draw(user)
+
+/obj/item/weapon/gun/throw/crossbow/proc/draw(mob/living/user)
+	if(user.incapacitated())
+		return
+	if(!to_launch)
+		to_chat(user, "<span class='warning'>You can't draw [src] without a bolt nocked.</span>")
+		return
+
+	user.visible_message("[user] begins to draw back the string of [src].","You begin to draw back the string of [src].")
+	if(do_after(user, 25 * drawtension, target = user))
+		tension = drawtension
+		user.visible_message("[usr] draws back the string of [src]!","[src] clunks as you draw the string to its maximum tension!!")
+		update_icon()
+
+/obj/item/weapon/gun/throw/crossbow/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/weapon/stock_parts/cell))
+		if(!cell)
+			user.drop_item()
+			W.loc = src
+			cell = W
+			to_chat(user, "<span class='notice'>You jam [cell] into [src] and wire it to the firing coil.</span>")
+			process_chamber()
+		else
+			to_chat(user, "<span class='notice'>[src] already has a cell installed.</span>")
+	else if(istype(W, /obj/item/weapon/screwdriver))
+		if(cell)
+			cell.loc = get_turf(src)
+			to_chat(user, "<span class='notice'>You jimmy [cell] out of [src] with [W].</span>")
+			cell = null
+		else
+			to_chat(user, "<span class='notice'>[src] doesn't have a cell installed.</span>")
+	else
+		..()
+
+/obj/item/weapon/gun/throw/crossbow/verb/set_tension()
+	set name = "Adjust Tension"
+	set category = "Object"
+	set src in range(0)
+
+	var/mob/user = usr
+	if(user.incapacitated())
+		return
+	var/choice = input("Select tension to draw to:", "[src]", XBOW_TENSION_FULL) as null|anything in possible_tensions
+	if(!choice)
+		return
+
+	switch(choice)
+		if(XBOW_TENSION_20)
+			drawtension = Ceiling(0.2 * maxtension)
+		if(XBOW_TENSION_40)
+			drawtension = Ceiling(0.4 * maxtension)
+		if(XBOW_TENSION_60)
+			drawtension = Ceiling(0.6 * maxtension)
+		if(XBOW_TENSION_80)
+			drawtension = Ceiling(0.8 * maxtension)
+		if(XBOW_TENSION_FULL)
+			drawtension = maxtension
+
+/obj/item/weapon/gun/throw/crossbow/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
+	..()
+	tension = 0
+	update_icon()
+/obj/item/weapon/gun/throw/crossbow/french
+	name = "french powered crossbow"
+	icon_state = "fcrossbow"
+	valid_projectile_type = /obj/item/weapon/reagent_containers/food/snacks/baguette
+
+/obj/item/weapon/gun/throw/crossbow/french/modify_projectile(obj/item/I, on_chamber = 0)
+	return
+
+/obj/item/weapon/arrow
+	name = "bolt"
+	desc = "It's got a tip for you - get the point?"
+	icon_state = "bolt"
+	item_state = "bolt"
+	throwforce = 20
+	w_class = 3.0
+	sharp = 1
+	edge = 0
+
+/obj/item/weapon/arrow/proc/removed() //Helper for metal rods falling apart.
+	return
+
+/obj/item/weapon/arrow/rod
+	name = "makeshift bolt"
+	desc = "A sharpened metal rod that can be fired out of a crossbow."
+	icon_state = "metal-rod"
+	throwforce = 8
+	var/superheated = 0
+
+/obj/item/weapon/arrow/rod/removed()
+	if(superheated) // The rod has been superheated - we don't want it to be useable when removed from the bow.
+		visible_message("[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow.")
+		var/obj/item/weapon/shard/shrapnel/S = new /obj/item/weapon/shard/shrapnel
+		S.loc = get_turf(src)
+		qdel(src)
+
+#undef XBOW_TENSION_20
+#undef XBOW_TENSION_40
+#undef XBOW_TENSION_60
+#undef XBOW_TENSION_80
+#undef XBOW_TENSION_FULL
diff --git a/code/modules/projectiles/guns/throw/pielauncher.dm b/code/modules/projectiles/guns/throw/pielauncher.dm
new file mode 100644
index 00000000000..f6405f47194
--- /dev/null
+++ b/code/modules/projectiles/guns/throw/pielauncher.dm
@@ -0,0 +1,36 @@
+/obj/item/weapon/gun/throw/piecannon
+	name = "pie cannon"
+	desc = "A projectile weapon that fires pies."
+	icon_state = "piecannon"
+	w_class = 5
+	throw_speed = 2
+	throw_range = 3
+	force = 5
+
+	clumsy_check = 0
+	valid_projectile_type = /obj/item/weapon/reagent_containers/food/snacks/pie
+	max_capacity = 5
+	projectile_speed = 2
+	projectile_range = 30
+
+
+/obj/item/weapon/gun/throw/piecannon/New()
+	..()
+	for(var/i in 1 to max_capacity)
+		var/obj/item/weapon/reagent_containers/food/snacks/pie/P = new /obj/item/weapon/reagent_containers/food/snacks/pie(src)
+		loaded_projectiles += P
+	process_chamber()
+
+/obj/item/weapon/gun/throw/piecannon/notify_ammo_count(mob/user)
+	to_chat(user, "<span class='notice'>[src] has [get_ammocount()] of [max_capacity] pies left.")
+
+/obj/item/weapon/gun/throw/piecannon/update_icon()
+	if(to_launch)
+		icon_state = "piecannon1"
+	else
+		icon_state = "piecannon0"
+	item_state = icon_state
+
+/obj/item/weapon/gun/throw/piecannon/process_chamber()
+	..()
+	update_icon()
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 5a028a1084a..5a8fa77e268 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -1,353 +1,223 @@
-/*
-#define BRUTE "brute"
-#define BURN "burn"
-#define TOX "tox"
-#define OXY "oxy"
-#define CLONE "clone"
-
-#define ADD "add"
-#define SET "set"
-*/
-
 /obj/item/projectile
 	name = "projectile"
 	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "bullet"
-	density = 1
+	density = 0
 	unacidable = 1
 	anchored = 1 //There's a reason this is here, Mport. God fucking damn it -Agouri. Find&Fix by Pete. The reason this is here is to stop the curving of emitter shots.
+	flags = ABSTRACT
 	pass_flags = PASSTABLE
 	mouse_opacity = 0
 	hitsound = 'sound/weapons/pierce.ogg'
-	animate_movement = 0
-	var/bumped = 0		//Prevents it from hitting more than one guy at once
+	var/hitsound_wall = ""
+	pressure_resistance = INFINITY
 	var/def_zone = ""	//Aiming at
 	var/mob/firer = null//Who shot it
-	var/silenced = 0	//Attack message
+	var/obj/item/ammo_casing/ammo_casing = null
+	var/suppressed = 0	//Attack message
 	var/yo = null
 	var/xo = null
 	var/current = null
-	var/obj/shot_from = null // the object which shot us
 	var/atom/original = null // the original target clicked
 	var/turf/starting = null // the projectile's starting turf
 	var/list/permutated = list() // we've passed through these atoms, don't try to hit them again
 	var/paused = FALSE //for suspending the projectile midair
-
 	var/p_x = 16
 	var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center
+	var/speed = 1			//Amount of deciseconds it takes for projectile to travel
+	var/Angle = 0
+	var/spread = 0			//amount (in degrees) of projectile spread
+	var/legacy = 0			//legacy projectile system
+	animate_movement = 0
 
 	var/damage = 10
 	var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here
 	var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
 	var/flag = "bullet" //Defines what armor to use when it hits things.  Must be set to bullet, laser, energy,or bomb	//Cael - bio and rad are also valid
 	var/projectile_type = "/obj/item/projectile"
-	var/kill_count = 50 //This will de-increment every process(). When 0, it will delete the projectile.
-		//Effects
+	var/range = 50 //This will de-increment every step. When 0, it will delete the projectile.
+	//Effects
 	var/stun = 0
 	var/weaken = 0
 	var/paralyze = 0
 	var/irradiate = 0
-	var/slur = 0
 	var/stutter = 0
+	var/slur = 0
 	var/eyeblur = 0
 	var/drowsy = 0
 	var/stamina = 0
 	var/jitter = 0
 	var/embed = 0 // whether or not the projectile can embed itself in the mob
-	var/forcedodge = 0
+	var/forcedodge = 0 //to pass through everything
 
-	var/range = 0
-	var/proj_hit = 0
+/obj/item/projectile/New()
+	permutated = list()
+	return ..()
 
-	var/chatlog_attacks = 1
+/obj/item/projectile/proc/Range()
+	range--
+	if(range <= 0 && loc)
+		on_range()
 
-	var/speed = 1 //Amount of deciseconds it takes for projectile to travel. Animation is adjusted accordingly.
-	var/Angle = 0 //For new projectiles
-	var/spread = 0 //Amount of degrees by which the projectiles will be spread DURING MOVEMENT. It exists for chaotic types of projectiles, like bees or something.
-	var/legacy = 0 //Use the legacy projectile system or new pixel movement?
+/obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range
+	qdel(src)
 
-	proc/delete()
-		// Garbage collect the projectiles
-		loc = null
-
-	proc/Range()
-		if(range)
-			range--
-			if(range <= 0)
-				on_range()
-		else
-			return
-
-	proc/on_range() //if we want there to be effects when they reach the end of their range
-		proj_hit = 1
-		del(src)
-
-	proc/on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
-		if(!isliving(target))	return 0
-		if(isanimal(target))	return 0
-		var/mob/living/L = target
-		return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
-
-	proc/OnFired()	//if assigned, allows for code when the projectile gets fired
-		return 1
-
-	proc/check_fire(var/mob/living/target as mob, var/mob/living/user as mob)  //Checks if you can hit them or not.
-		if(!istype(target) || !istype(user))
-			return 0
-		var/obj/item/projectile/test/in_chamber = new /obj/item/projectile/test(get_step_to(user,target)) //Making the test....
-		in_chamber.target = target
-		in_chamber.flags = flags //Set the flags...
-		in_chamber.pass_flags = pass_flags //And the pass flags to that of the real projectile...
-		in_chamber.firer = user
-		var/output = in_chamber.process() //Test it!
-		del(in_chamber) //No need for it anymore
-		return output //Send it back to the gun!
-
-	Bump(atom/A as mob|obj|turf|area)
-		if(A == firer)
-			loc = A.loc
-			return 0 //cannot shoot yourself
-
-		if(bumped)
-			return 1
-		bumped = 1
-		if(firer && istype(A, /mob))
-			var/mob/M = A
-			if(!istype(A, /mob/living))
-				loc = A.loc
-				return 0// nope.avi
-
-			var/reagent_note
-			if(reagents && reagents.reagent_list)
-				reagent_note = " REAGENTS:"
-				for(var/datum/reagent/R in reagents.reagent_list)
-					reagent_note += R.id + " ("
-					reagent_note += num2text(R.volume) + ") "
-			//Lower accurancy/longer range tradeoff. Distance matters a lot here, so at
-			// close distance, actually RAISE the chance to hit.
-			var/distance = get_dist(get_turf(A), starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
-			def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use.
-			/*
-			if(!def_zone)
-				visible_message("\blue \The [src] misses [M] narrowly!")
-				forcedodge = -1
-			else
-			*/
-			if(ishuman(A))
-				var/mob/living/carbon/human/H = A
-				var/obj/item/organ/external/organ = H.get_organ(check_zone(def_zone))
-				if(isnull(organ))
-					return
-			if(silenced)
-				playsound(loc, hitsound, 5, 1, -1)
-				to_chat(M, "\red You've been shot in the [parse_zone(def_zone)] by the [src.name]!")
-			else
-				playsound(loc, hitsound, 20, 1, -1)
-				visible_message("\red [A.name] is hit by the [src.name] in the [parse_zone(def_zone)]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
-			if(istype(firer, /mob))
-				M.attack_log += "\[[time_stamp()]\] <b>[key_name(firer)]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>[reagent_note]"
-				firer.attack_log += "\[[time_stamp()]\] <b>[key_name(firer)]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>[reagent_note]"
-				if(M.ckey && chatlog_attacks)
-					msg_admin_attack("[key_name_admin(firer)] shot [key_name_admin(M)] with a [src][reagent_note]") //BS12 EDIT ALG
-				if(!iscarbon(firer))
-					M.LAssailant = null
-				else
-					M.LAssailant = firer
-			else
-				M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[key_name(M)]</b> with a <b>[src]</b>[reagent_note]"
-				if(M.ckey  && chatlog_attacks)
-					msg_admin_attack("UNKNOWN shot [key_name_admin(M)] with a [src][reagent_note] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG
-
-		spawn(0)
-		if(A)
-			var/turf/new_loc = get_turf(A)
-			var/permutation = A.bullet_act(src, def_zone) // searches for return value, could be deleted after run so check A isn't null
-			if(permutation == -1 || forcedodge)// the bullet passes through a dense object!
-				spawn(1)
-					bumped = 0 // reset bumped variable... after a delay. We don't want the projectile to hit AGAIN. Fixes deflecting projectiles.
-				loc = new_loc
-				permutated.Add(A)
-				return 0
-			if(istype(A,/turf))
-				for(var/obj/O in A)
-					O.bullet_act(src)
-				for(var/mob/M in A)
-					M.bullet_act(src, def_zone)
-			if(!istype(src, /obj/item/projectile/beam/lightning))
-				density = 0
-				invisibility = 101
-			del(src)
-		return 1
-
-
-	CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-		if(air_group || (height==0)) return 1
-
-		if(istype(mover, /obj/item/projectile))
-			return prob(95)
-		else
-			return 1
-
-
-	Process_Spacemove(var/movement_dir = 0)
-		return 1 //Bullets don't drift in space
-
-
-
-	process(var/setAngle)
-		if(setAngle) Angle = setAngle
-		if(!legacy)
-			spawn() //New projectile system
-				while(loc)
-					if(kill_count < 1)
-						del(src)
-						return
-					if(!paused)
-						kill_count--
-						if((!( current ) || loc == current))
-							current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
-
-						if(!Angle)
-							Angle=round(Get_Angle(src,current))
-//						to_chat(world, "[Angle] angle")
-						//overlays.Cut()
-						//var/icon/I=new(initial(icon),icon_state) //using initial(icon) makes sure that the angle for that is reset as well
-						//I.Turn(Angle)
-						//I.DrawBox(rgb(255,0,0,50),1,1,32,32)
-						//icon = I
-						if(spread) //Chaotic spread
-							Angle += (rand() - 0.5) * spread
-						var/matrix/M = new//matrix(transform)
-						M.Turn(Angle)
-						transform = M
-
-						var/Pixel_x=round(sin(Angle)+16*sin(Angle)*2)
-						var/Pixel_y=round(cos(Angle)+16*cos(Angle)*2)
-						var/pixel_x_offset = pixel_x + Pixel_x
-						var/pixel_y_offset = pixel_y + Pixel_y
-						var/new_x = x
-						var/new_y = y
-						//Not sure if using whiles for this is good
-						while(pixel_x_offset > 16)
-//							to_chat(world, "Pre-adjust coords (x++): xy [pixel_x] xy offset [pixel_x_offset]")
-							pixel_x_offset -= 32
-							pixel_x -= 32
-							new_x++// x++
-						while(pixel_x_offset < -16)
-//							to_chat(world, "Pre-adjust coords (x--): xy [pixel_x] xy offset [pixel_x_offset]")
-							pixel_x_offset += 32
-							pixel_x += 32
-							new_x--
-
-						while(pixel_y_offset > 16)
-//							to_chat(world, "Pre-adjust coords (y++): py [pixel_y] py offset [pixel_y_offset]")
-							pixel_y_offset -= 32
-							pixel_y -= 32
-							new_y++
-						while(pixel_y_offset < -16)
-//							to_chat(world, "Pre-adjust coords (y--): py [pixel_y] py offset [pixel_y_offset]")
-							pixel_y_offset += 32
-							pixel_y += 32
-							new_y--
-
-						speed = round(speed) //Just in case.
-						step_towards(src, locate(new_x, new_y, z)) //Original projectiles stepped towards 'current'
-						if(speed <= 1) //We should really only animate at speed 2
-							pixel_x = pixel_x_offset
-							pixel_y = pixel_y_offset
-						else
-							animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (speed <= 3 ? speed - 1 : speed)))
-
-	/*
-						var/turf/T = get_turf(src)
-						if(T)
-							T.color = "#6666FF"
-							spawn(10)
-								T.color = initial(T.color)
-	*/
-
-						if(!bumped && ((original && original.layer>=2.75) || ismob(original)))
-							if(loc == get_turf(original))
-								if(!(original in permutated))
-									Bump(original)
-					Range()
-					sleep(max(1, speed))
-		else
-			spawn() //Old projectile system
-				while(loc)
-					if(kill_count < 1)
-						del(src)
-						return
-					if(!paused)
-						kill_count--
-						if((!( current ) || loc == current))
-							current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
-						if(!Angle)
-							Angle=round(Get_Angle(src,current))
-						var/matrix/M = new//matrix(transform)
-						M.Turn(Angle)
-						transform = M //So there's no need to give icons directions again
-						step_towards(src, current)
-						if(!bumped && ((original && original.layer>=2.75) || ismob(original)))
-							if(loc == get_turf(original))
-								if(!(original in permutated))
-									Bump(original)
-					Range()
-					sleep(1)
-
-	proc/dumbfire(var/dir)
-		current = get_ranged_target_turf(src, dir, world.maxx) //world.maxx is the range. Not sure how to handle this better.
-		process()
-
-/obj/item/projectile/test //Used to see if you can hit them.
-	invisibility = 101 //Nope!  Can't see me!
-	yo = null
-	xo = null
-	var/target = null
-	var/result = 0 //To pass the message back to the gun.
-
-	Bump(atom/A as mob|obj|turf|area)
-		if(A == firer)
-			loc = A.loc
-			return //cannot shoot yourself
-		if(istype(A, /obj/item/projectile))
-			return
-		if(istype(A, /mob/living) || istype(A, /obj/mecha) || istype(A, /obj/spacepod) || istype(A, /obj/vehicle))
-			result = 2 //We hit someone, return 1!
-			return
-		result = 1
-		return
-
-	process()
-		var/turf/curloc = get_turf(src)
-		var/turf/targloc = get_turf(target)
-		if(!curloc || !targloc)
-			return 0
-		yo = targloc.y - curloc.y
-		xo = targloc.x - curloc.x
-		target = targloc
-		while(src) //Loop on through!
-			if(result)
-				return (result - 1)
-			if((!( target ) || loc == target))
-				target = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z) //Finding the target turf at map edge
-			step_towards(src, target)
-			var/mob/living/M = locate() in get_turf(src)
-			if(istype(M)) //If there is someting living...
-				return 1 //Return 1
-			else
-				M = locate() in get_step(src,target)
-				if(istype(M))
-					return 1
-
-/proc/check_trajectory(atom/target as mob|obj, atom/firer as mob|obj, var/pass_flags=PASSTABLE|PASSGLASS|PASSGRILLE, flags=null)  //Checks if you can hit them or not.
-	if(!istype(target) || !istype(firer))
+/obj/item/projectile/proc/on_hit(atom/target, blocked = 0, hit_zone)
+	if(!isliving(target))
 		return 0
-	var/obj/item/projectile/test/trace = new /obj/item/projectile/test(get_turf(firer)) //Making the test....
-	trace.target = target
-	if(!isnull(flags))
-		trace.flags = flags //Set the flags...
-	trace.pass_flags = pass_flags //And the pass flags to that of the real projectile...
-	var/output = trace.process() //Test it!
-	qdel(trace) //No need for it anymore
-	return output //Send it back to the gun!
+	var/mob/living/L = target
+	if(blocked < 100) // not completely blocked
+		var/organ_hit_text = ""
+		if(L.has_limbs)
+			organ_hit_text = " in \the [parse_zone(def_zone)]"
+		if(suppressed)
+			playsound(loc, hitsound, 5, 1, -1)
+			to_chat(L, "<span class='userdanger'>You're shot by \a [src][organ_hit_text]!</span>")
+		else
+			if(hitsound)
+				var/volume = vol_by_damage()
+				playsound(loc, hitsound, volume, 1, -1)
+			L.visible_message("<span class='danger'>[L] is hit by \a [src][organ_hit_text]!</span>", \
+								"<span class='userdanger'>[L] is hit by \a [src][organ_hit_text]!</span>")	//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
+
+	var/reagent_note
+	if(reagents && reagents.reagent_list)
+		reagent_note = " REAGENTS:"
+		for(var/datum/reagent/R in reagents.reagent_list)
+			reagent_note += R.id + " ("
+			reagent_note += num2text(R.volume) + ") "
+	add_logs(L, firer, "shot", src, reagent_note)
+	return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
+
+/obj/item/projectile/proc/vol_by_damage()
+	if(damage)
+		return Clamp((damage) * 0.67, 30, 100)// Multiply projectile damage by 0.67, then clamp the value between 30 and 100
+	else
+		return 50 //if the projectile doesn't do damage, play its hitsound at 50% volume
+
+/obj/item/projectile/Bump(atom/A, yes)
+	if(!yes) //prevents double bumps.
+		return
+	if(firer)
+		if(A == firer || (A == firer.loc && istype(A, /obj/mecha))) //cannot shoot yourself or your mech
+			loc = A.loc
+			return 0
+
+	var/distance = get_dist(get_turf(A), starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
+	def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use.
+
+	if(isturf(A) && hitsound_wall)
+		var/volume = Clamp(vol_by_damage() + 20, 0, 100)
+		if(suppressed)
+			volume = 5
+		playsound(loc, hitsound_wall, volume, 1, -1)
+	else if(ishuman(A))
+		var/mob/living/carbon/human/H = A
+		var/obj/item/organ/external/organ = H.get_organ(check_zone(def_zone))
+		if(isnull(organ))
+			return
+
+	var/turf/target_turf = get_turf(A)
+
+	var/permutation = A.bullet_act(src, def_zone) // searches for return value, could be deleted after run so check A isn't null
+	if(permutation == -1 || forcedodge)// the bullet passes through a dense object!
+		loc = target_turf
+		if(A)
+			permutated.Add(A)
+		return 0
+	else
+		if(A && A.density && !ismob(A) && !(A.flags & ON_BORDER)) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs on that tile.
+			var/list/mobs_list = list()
+			for(var/mob/living/L in target_turf)
+				mobs_list += L
+			if(mobs_list.len)
+				var/mob/living/picked_mob = pick(mobs_list)
+				picked_mob.bullet_act(src, def_zone)
+	qdel(src)
+
+/obj/item/projectile/Process_Spacemove(var/movement_dir = 0)
+	return 1 //Bullets don't drift in space
+
+/obj/item/projectile/proc/fire(var/setAngle)
+	if(setAngle)
+		Angle = setAngle
+	if(!legacy) //new projectiles
+		set waitfor = 0
+		while(loc)
+			if(!paused)
+				if((!( current ) || loc == current))
+					current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
+
+				if(!Angle)
+					Angle=round(Get_Angle(src,current))
+				if(spread)
+					Angle += (rand() - 0.5) * spread
+				var/matrix/M = new
+				M.Turn(Angle)
+				transform = M
+
+				var/Pixel_x=round(sin(Angle)+16*sin(Angle)*2)
+				var/Pixel_y=round(cos(Angle)+16*cos(Angle)*2)
+				var/pixel_x_offset = pixel_x + Pixel_x
+				var/pixel_y_offset = pixel_y + Pixel_y
+				var/new_x = x
+				var/new_y = y
+
+				while(pixel_x_offset > 16)
+					pixel_x_offset -= 32
+					pixel_x -= 32
+					new_x++// x++
+				while(pixel_x_offset < -16)
+					pixel_x_offset += 32
+					pixel_x += 32
+					new_x--
+
+				while(pixel_y_offset > 16)
+					pixel_y_offset -= 32
+					pixel_y -= 32
+					new_y++
+				while(pixel_y_offset < -16)
+					pixel_y_offset += 32
+					pixel_y += 32
+					new_y--
+
+				speed = round(speed)
+				step_towards(src, locate(new_x, new_y, z))
+				if(speed <= 1)
+					pixel_x = pixel_x_offset
+					pixel_y = pixel_y_offset
+				else
+					animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (speed <= 3 ? speed - 1 : speed)))
+
+				if(original && (original.layer>=2.75) || ismob(original))
+					if(loc == get_turf(original))
+						if(!(original in permutated))
+							Bump(original, 1)
+				Range()
+			sleep(max(1, speed))
+	else //old projectile system
+		set waitfor = 0
+		while(loc)
+			if(!paused)
+				if((!( current ) || loc == current))
+					current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
+				step_towards(src, current)
+				if(original && (original.layer>=2.75) || ismob(original))
+					if(loc == get_turf(original))
+						if(!(original in permutated))
+							Bump(original, 1)
+				Range()
+			sleep(1)
+
+obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
+	..()
+	if(isliving(AM) && AM.density && !checkpass(PASSMOB))
+		Bump(AM, 1)
+
+/obj/item/projectile/Destroy()
+	ammo_casing = null
+	return ..()
+
+/obj/item/projectile/proc/dumbfire(var/dir)
+	current = get_ranged_target_turf(src, dir, world.maxx) //world.maxx is the range. Not sure how to handle this better.
+	fire()
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index e86d8e7a739..d9cf8360d2a 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -5,56 +5,34 @@
 	damage = 20
 	damage_type = BURN
 	hitsound = 'sound/weapons/sear.ogg'
+	hitsound_wall = 'sound/weapons/effects/searwall.ogg'
 	flag = "laser"
 	eyeblur = 2
 
-/obj/item/projectile/practice
-	name = "laser"
-	icon_state = "laser"
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
+/obj/item/projectile/beam/laser
+
+/obj/item/projectile/beam/laser/heavylaser
+	name = "heavy laser"
+	icon_state = "heavylaser"
+	damage = 40
+
+/obj/item/projectile/beam/practice
+	name = "practice laser"
 	damage = 0
-	hitsound = null
-	damage_type = BURN
-	flag = "laser"
-	eyeblur = 2
-	chatlog_attacks = 0
+	nodamage = 1
 
 /obj/item/projectile/beam/scatter
 	name = "laser pellet"
 	icon_state = "scatterlaser"
 	damage = 5
 
-
-/obj/item/projectile/beam/heavylaser
-	name = "heavy laser"
-	icon_state = "heavylaser"
-	damage = 40
-
-/obj/item/projectile/beam/sniper
-	name = "sniper beam"
-	icon_state = "sniperlaser"
-	damage = 60
-	stun = 5
-	weaken = 5
-	stutter = 5
-
-
-/obj/item/projectile/beam/immolator
-	name = "immolation beam"
-
-/obj/item/projectile/beam/immolator/on_hit(var/atom/target, var/blocked = 0)
-	. = ..()
-	if(istype(target, /mob/living/carbon))
-		var/mob/living/carbon/M = target
-		M.adjust_fire_stacks(1)
-		M.IgniteMob()
-
 /obj/item/projectile/beam/xray
 	name = "xray beam"
 	icon_state = "xray"
 	damage = 15
 	irradiate = 30
 	forcedodge = 1
+	range = 15
 
 /obj/item/projectile/beam/disabler
 	name = "disabler beam"
@@ -82,204 +60,75 @@
 	name = "emitter beam"
 	icon_state = "emitter"
 	damage = 30
+	legacy = 1
+	animate_movement = SLIDE_STEPS
 
 /obj/item/projectile/beam/emitter/singularity_pull()
 	return //don't want the emitters to miss
 
-/obj/item/projectile/lasertag
+/obj/item/projectile/beam/lasertag
 	name = "laser tag beam"
 	icon_state = "omnilaser"
 	hitsound = null
 	damage = 0
 	damage_type = STAMINA
 	flag = "laser"
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
-	chatlog_attacks = 0
 
-/obj/item/projectile/lasertag/on_hit(var/atom/target, var/blocked = 0)
-	if(istype(target, /mob/living/carbon/human))
+/obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0)
+	. = ..()
+	if(ishuman(target))
 		var/mob/living/carbon/human/M = target
 		if(istype(M.wear_suit))
 			if(M.wear_suit.type in suit_types)
 				M.adjustStaminaLoss(34)
 	return 1
 
-/obj/item/projectile/lasertag/omni
+/obj/item/projectile/beam/lasertag/omni
 	name = "laser tag beam"
 	icon_state = "omnilaser"
 
-/obj/item/projectile/lasertag/red
+/obj/item/projectile/beam/lasertag/redtag
 	icon_state = "laser"
 	suit_types = list(/obj/item/clothing/suit/bluetag)
 
-/obj/item/projectile/lasertag/blue
+/obj/item/projectile/beam/lasertag/bluetag
 	icon_state = "bluelaser"
 	suit_types = list(/obj/item/clothing/suit/redtag)
 
-/obj/item/projectile/beam/lightning
-	invisibility = 101
-	name = "lightning"
-	damage = 0
-	icon = 'icons/obj/lightning.dmi'
-	icon_state = "lightning"
-	stun = 10
-	weaken = 10
-	stutter = 50
-	eyeblur = 50
-	var/tang = 0
-	layer = 3
-	var/turf/last = null
-	kill_count = 6
-	var/bullet_acted = 0
+/obj/item/projectile/beam/sniper
+	name = "sniper beam"
+	icon_state = "sniperlaser"
+	damage = 60
+	stun = 5
+	weaken = 5
+	stutter = 5
 
-	Bump(var/atom/A)
-		if((A != firer) && !bullet_acted)
-			A.bullet_act(src)
-			bullet_acted = 1
+/obj/item/projectile/beam/immolator
+	name = "immolation beam"
 
-	proc/adjustAngle(angle)
-		angle = round(angle) + 45
-		if(angle > 180)
-			angle -= 180
-		else
-			angle += 180
-		if(!angle)
-			angle = 1
-		/*if(angle < 0)
-			//angle = (round(abs(get_angle(A, user))) + 45) - 90
-			angle = round(angle) + 45 + 180
-		else
-			angle = round(angle) + 45*/
-		return angle
+/obj/item/projectile/beam/immolator/on_hit(var/atom/target, var/blocked = 0)
+	. = ..()
+	if(istype(target, /mob/living/carbon))
+		var/mob/living/carbon/M = target
+		M.adjust_fire_stacks(1)
+		M.IgniteMob()
 
-	process()
-		var/first = 1 //So we don't make the overlay in the same tile as the firer
-		var/broke = 0
-		var/broken
-		var/atom/curr = current
-		var/Angle=round(Get_Angle(firer,curr))
-		var/icon/I=new('icons/obj/zap.dmi',"lightning")
-		I.Turn(Angle)
-		var/DX=(32*curr.x+curr.pixel_x)-(32*firer.x+firer.pixel_x)
-		var/DY=(32*curr.y+curr.pixel_y)-(32*firer.y+firer.pixel_y)
-		var/N=0
-		var/length=round(sqrt((DX)**2+(DY)**2))
-		var/count = 0
-		for(N,N<length,N+=32)
-			if(count >= kill_count)
-				break
-			count++
-			var/obj/effect/overlay/beam/X=new(loc)
-			X.BeamSource=src
-			if(N+32>length)
-				var/icon/II=new(icon,icon_state)
-				II.DrawBox(null,1,(length-N),32,32)
-				II.Turn(Angle)
-				X.icon=II
-			else X.icon=I
-			var/Pixel_x=round(sin(Angle)+32*sin(Angle)*(N+16)/32)
-			var/Pixel_y=round(cos(Angle)+32*cos(Angle)*(N+16)/32)
-			if(DX==0) Pixel_x=0
-			if(DY==0) Pixel_y=0
-			if(Pixel_x>32)
-				for(var/a=0, a<=Pixel_x,a+=32)
-					X.x++
-					Pixel_x-=32
-			if(Pixel_x<-32)
-				for(var/a=0, a>=Pixel_x,a-=32)
-					X.x--
-					Pixel_x+=32
-			if(Pixel_y>32)
-				for(var/a=0, a<=Pixel_y,a+=32)
-					X.y++
-					Pixel_y-=32
-			if(Pixel_y<-32)
-				for(var/a=0, a>=Pixel_y,a-=32)
-					X.y--
-					Pixel_y+=32
-			X.pixel_x=Pixel_x
-			X.pixel_y=Pixel_y
-			var/turf/TT = get_turf(X.loc)
-			if(TT == firer.loc)
-				continue
-			if(TT.density)
-				qdel(X)
-				break
-			for(var/atom/O in TT)
-				if(istype(O,/mob/living))
-					if(O.density)
-						qdel(X)
-						broke = 1
-						break
-				if(!O.CanPass(src))
-					qdel(X)
-					broke = 1
-					break
-			if(broke)
-				if(X)
-					qdel(X)
-				break
-		spawn
-			while(src) //Move until we hit something
-				if(first)
-					icon = midicon
-				if((!( current ) || loc == current)) //If we pass our target
-					broken = 1
-					icon = endicon
-					tang = adjustAngle(get_angle(original,current))
-					if(tang > 180)
-						tang -= 180
-					else
-						tang += 180
-					icon_state = "[tang]"
-					var/turf/simulated/floor/f = current
-					if(f && istype(f))
-						if(!bullet_acted)
-							f.break_tile()
-							f.hotspot_expose(1000,CELL_VOLUME)
-				if((x == 1 || x == world.maxx || y == 1 || y == world.maxy))
-//					to_chat(world, "deleting")
-					//qdel(src) //Delete if it passes the world edge
-					broken = 1
-					return
-				if(kill_count < 1)
-//					to_chat(world, "deleting")
-					//qdel(src)
-					broken = 1
-				kill_count--
-//				to_chat(world, "[x] [y]")
-				if(!bumped && !isturf(original))
-					if(loc == get_turf(original))
-						if(!(original in permutated))
-							icon = endicon
-						if(!broken)
-							tang = adjustAngle(get_angle(original,current))
-							if(tang > 180)
-								tang -= 180
-							else
-								tang += 180
-							icon_state = "[tang]"
-						Bump(original)
-				first = 0
-				if(broken)
-//					to_chat(world, "breaking")
-					break
-				else
-					last = get_turf(src.loc)
-					step_towards(src, current) //Move~
-					if(src.loc != current)
-						tang = adjustAngle(get_angle(src.loc,current))
-					icon_state = "[tang]"
-			qdel(src)
-		return
-	/*cleanup(reference) //Waits .3 seconds then removes the overlay.
-//		to_chat(world, "setting invisibility")
-		sleep(50)
-		src.invisibility = 101
-		return*/
-	on_hit(atom/target, blocked = 0)
-		if(istype(target, /mob/living))
-			var/mob/living/M = target
-			M.playsound_local(src, "explosion", 50, 1)
-		..()
\ No newline at end of file
+/obj/item/projectile/beam/instakill
+	name = "instagib laser"
+	icon_state = "purple_laser"
+	damage = 200
+	damage_type = BURN
+
+/obj/item/projectile/beam/instakill/blue
+	icon_state = "blue_laser"
+
+/obj/item/projectile/beam/instakill/red
+	icon_state = "red_laser"
+
+/obj/item/projectile/beam/instakill/on_hit(atom/target)
+	. = ..()
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		M.visible_message("<span class='danger'>[M] explodes into a shower of gibs!</span>")
+		M.gib()
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 879bbf7fad0..8f8809c504f 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -3,21 +3,10 @@
 	icon_state = "bullet"
 	damage = 60
 	damage_type = BRUTE
-	nodamage = 0
 	flag = "bullet"
 	embed = 1
 	sharp = 1
-
-/obj/item/projectile/bullet/cap
-	name = "cap"
-	damage = 0
-	nodamage = 1
-	embed = 0
-	sharp = 0
-
-/obj/item/projectile/bullet/cap/process()
-	loc = null
-	del(src)
+	hitsound_wall = "ricochet"
 
 /obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage
 	damage = 5
@@ -27,6 +16,26 @@
 	embed = 0
 	sharp = 0
 
+/obj/item/projectile/bullet/weakbullet/booze
+	embed = 0
+
+/obj/item/projectile/bullet/weakbullet/booze/on_hit(atom/target, blocked = 0)
+	if(..(target, blocked))
+		var/mob/living/M = target
+		M.dizziness += 20
+		M.slurring += 20
+		M.confused += 20
+		M.eye_blurry += 20
+		M.drowsyness += 20
+		for(var/datum/reagent/ethanol/A in M.reagents.reagent_list)
+			M.AdjustParalysis(2)
+			M.dizziness += 10
+			M.slurring += 10
+			M.confused += 10
+			M.eye_blurry += 10
+			M.drowsyness += 10
+			A.volume += 5 //Because we can
+
 /obj/item/projectile/bullet/weakbullet2  //detective revolver instastuns, but multiple shots are better for keeping punks down
 	damage = 5
 	weaken = 3
@@ -44,6 +53,15 @@
 	damage = 15
 	damage_type = TOX
 
+/obj/item/projectile/bullet/incendiary
+
+/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)
+	..()
+	if(istype(target, /mob/living/carbon))
+		var/mob/living/carbon/M = target
+		M.adjust_fire_stacks(1)
+		M.IgniteMob()
+
 /obj/item/projectile/bullet/incendiary/firebullet
 	damage = 10
 
@@ -55,15 +73,34 @@
 	name = "pellet"
 	damage = 15
 
-/obj/item/projectile/bullet/blank
-	name = "blankshot"
-	nodamage = 1
-
 /obj/item/projectile/bullet/pellet/weak
+	damage = 6
+
+/obj/item/projectile/bullet/pellet/weak/New()
+	range = rand(8)
+
+/obj/item/projectile/bullet/pellet/weak/on_range()
+ 	var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+ 	sparks.set_up(1, 1, src)
+ 	sparks.start()
+ 	..()
+
+/obj/item/projectile/bullet/pellet/overload
 	damage = 3
 
-/obj/item/projectile/bullet/pellet/random/New()
-	damage = rand(10)
+/obj/item/projectile/bullet/pellet/overload/New()
+	range = rand(10)
+
+/obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = 0)
+ 	..()
+ 	explosion(target, 0, 0, 2)
+
+/obj/item/projectile/bullet/pellet/overload/on_range()
+ 	explosion(src, 0, 0, 2)
+ 	var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+ 	sparks.set_up(3, 3, src)
+ 	sparks.start()
+ 	..()
 
 /obj/item/projectile/bullet/midbullet
 	damage = 20
@@ -89,39 +126,11 @@
 	weaken = 5
 	stutter = 5
 	jitter = 20
-	icon_state = "spark"
 	range = 7
 	embed = 0
 	sharp = 0
-
-
-/obj/item/projectile/bullet/weakbullet/booze
-	embed = 0
-	on_hit(var/atom/target, var/blocked = 0)
-		if(..(target, blocked))
-			var/mob/living/M = target
-			M.dizziness += 20
-			M.slurring += 20
-			M.confused += 20
-			M.eye_blurry += 20
-			M.drowsyness += 20
-			for(var/datum/reagent/ethanol/A in M.reagents.reagent_list)
-				M.AdjustParalysis(2)
-				M.dizziness += 10
-				M.slurring += 10
-				M.confused += 10
-				M.eye_blurry += 10
-				M.drowsyness += 10
-				A.volume += 5 //Because we can
-
-/obj/item/projectile/bullet/incendiary
-
-/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)
-	..()
-	if(istype(target, /mob/living/carbon))
-		var/mob/living/carbon/M = target
-		M.adjust_fire_stacks(1)
-		M.IgniteMob()
+	icon_state = "spark"
+	color = "#FFFF00"
 
 /obj/item/projectile/bullet/incendiary/shell
 	name = "incendiary slug"
@@ -130,8 +139,9 @@
 /obj/item/projectile/bullet/incendiary/shell/Move()
 	..()
 	var/turf/location = get_turf(src)
-	new /obj/effect/hotspot(location)
-	location.hotspot_expose(700, 50, 1)
+	if(location)
+		new /obj/effect/hotspot(location)
+		location.hotspot_expose(700, 50, 1)
 
 /obj/item/projectile/bullet/incendiary/shell/dragonsbreath
 	name = "dragonsbreath round"
@@ -157,7 +167,26 @@
 	..()
 	SpinAnimation()
 
+/obj/item/projectile/bullet/meteorshot/weak
+	damage = 10
+	weaken = 4
+	stun = 4
 
+/obj/item/projectile/bullet/honker
+	damage = 0
+	weaken = 5
+	stun = 5
+	forcedodge = 1
+	nodamage = 1
+	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
+	hitsound = 'sound/items/bikehorn.ogg'
+	icon = 'icons/obj/harvest.dmi'
+	icon_state = "banana"
+	range = 200
+
+/obj/item/projectile/bullet/honker/New()
+	..()
+	SpinAnimation()
 
 /obj/item/projectile/bullet/mime
 	damage = 0
@@ -168,7 +197,7 @@
 
 /obj/item/projectile/bullet/mime/on_hit(var/atom/target, var/blocked = 0)
 	..(target, blocked)
-	if(istype(target, /mob/living/carbon))
+	if(iscarbon(target))
 		var/mob/living/carbon/M = target
 		M.silent = max(M.silent, 10)
 	else if(istype(target, /obj/mecha/combat/honker))
@@ -184,32 +213,38 @@
 	damage = 6
 	embed = 0
 	sharp = 0
+	var/piercing = 0
 
-	New()
-		..()
-		flags |= NOREACT
-		create_reagents(50)
+/obj/item/projectile/bullet/dart/New()
+	..()
+	flags |= NOREACT
+	create_reagents(50)
 
-	on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
-		if(istype(target, /mob/living/carbon))
-			var/mob/living/carbon/M = target
+/obj/item/projectile/bullet/dart/on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		if(blocked != 100)
 			if(M.can_inject(null,0,hit_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
+				..()
 				reagents.reaction(M, INGEST)
 				reagents.trans_to(M, reagents.total_volume)
 				return 1
 			else
+				blocked = 100
 				target.visible_message("<span class='danger'>The [name] was deflected!</span>", \
-									   "<span class='userdanger'>You were protected against the [name]!</span>")
-		flags &= ~NOREACT
-		reagents.handle_reactions()
-		return 1
+									"<span class='userdanger'>You were protected against the [name]!</span>")
+	..(target, blocked, hit_zone)
+	flags &= ~NOREACT
+	reagents.handle_reactions()
+	return 1
 
 /obj/item/projectile/bullet/dart/metalfoam
-	New()
-		..()
-		reagents.add_reagent("aluminum", 15)
-		reagents.add_reagent("fluorosurfactant", 5)
-		reagents.add_reagent("sacid", 5)
+
+/obj/item/projectile/bullet/dart/metalfoam/New()
+	..()
+	reagents.add_reagent("aluminum", 15)
+	reagents.add_reagent("fluorosurfactant", 5)
+	reagents.add_reagent("sacid", 5)
 
 //This one is for future syringe guns update
 /obj/item/projectile/bullet/dart/syringe
@@ -218,9 +253,9 @@
 	icon_state = "syringeproj"
 
 /obj/item/projectile/bullet/dart/syringe/tranquilizer
-	New()
-		..()
-		reagents.add_reagent("haloperidol", 15)
+/obj/item/projectile/bullet/dart/syringe/tranquilizer/New()
+	..()
+	reagents.add_reagent("haloperidol", 15)
 
 /obj/item/projectile/bullet/neurotoxin
 	name = "neurotoxin spit"
@@ -231,5 +266,17 @@
 
 /obj/item/projectile/bullet/neurotoxin/on_hit(var/atom/target, var/blocked = 0)
 	if(isalien(target))
-		return 0
-	..() // Execute the rest of the code.
+		weaken = 0
+		nodamage = 1
+	. = ..() // Execute the rest of the code.
+
+/obj/item/projectile/bullet/cap
+	name = "cap"
+	damage = 0
+	nodamage = 1
+	embed = 0
+	sharp = 0
+
+/obj/item/projectile/bullet/cap/fire()
+	loc = null
+	qdel(src)
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index b5665a6af1c..79ffc1d0898 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -5,7 +5,6 @@
 	damage_type = BURN
 	flag = "energy"
 
-
 /obj/item/projectile/energy/electrode
 	name = "electrode"
 	icon_state = "spark"
@@ -20,26 +19,23 @@
 	//Damage will be handled on the MOB side, to prevent window shattering.
 
 /obj/item/projectile/energy/electrode/on_hit(var/atom/target, var/blocked = 0)
-	if(!proj_hit)
-		if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - burst into sparks!
-			var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
-			sparks.set_up(1, 1, src)
-			sparks.start()
-			proj_hit = 1
-		else if(iscarbon(target))
-			var/mob/living/carbon/C = target
-			if(HULK in C.mutations)
-				C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-			else if(C.status_flags & CANWEAKEN)
-				C.do_jitter_animation(jitter)
-	..()
-
-/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
-	if(!proj_hit)
+	. = ..()
+	if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - burst into sparks!
 		var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
 		sparks.set_up(1, 1, src)
 		sparks.start()
-		proj_hit = 1
+	else if(iscarbon(target))
+		var/mob/living/carbon/C = target
+		if(HULK in C.mutations)
+			C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+		else if(C.status_flags & CANWEAKEN)
+			spawn(5)
+				C.do_jitter_animation(jitter)
+
+/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
+	var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+	sparks.set_up(1, 1, src)
+	sparks.start()
 	..()
 
 /obj/item/projectile/energy/declone
@@ -49,7 +45,6 @@
 	damage_type = CLONE
 	irradiate = 10
 
-
 /obj/item/projectile/energy/dart
 	name = "dart"
 	icon_state = "toxin"
@@ -63,7 +58,6 @@
 	icon_state = "toxin"
 	damage = 10
 	damage_type = TOX
-	nodamage = 0
 	weaken = 5
 	stutter = 5
 
@@ -77,12 +71,28 @@
 	stutter = 5
 
 /obj/item/projectile/energy/bolt/large
-	name = "largebolt"
 	damage = 20
 
-/obj/item/projectile/energy/plasma
+/obj/item/projectile/energy/shock_revolver
+	name = "shock bolt"
+	icon_state = "purple_laser"
+	var/chain
+
+/obj/item/ammo_casing/energy/shock_revolver/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
+	..()
+	var/obj/item/projectile/energy/shock_revolver/P = BB
+	spawn(1)
+		P.chain = P.Beam(user,icon_state="purple_lightning",icon = 'icons/effects/effects.dmi',time=1000, maxdistance = 30)
+
+/obj/item/projectile/energy/shock_revolver/on_hit(atom/target)
+	. = ..()
+	if(isliving(target))
+		tesla_zap(src, 3, 10000)
+	qdel(chain)
+
+/obj/item/projectile/energy/toxplasma
 	name = "plasma bolt"
 	icon_state = "energy"
 	damage = 20
 	damage_type = TOX
-	irradiate = 20
\ No newline at end of file
+	irradiate = 20
diff --git a/code/modules/projectiles/projectile/force.dm b/code/modules/projectiles/projectile/force.dm
index 2fab1a4da18..4e5c6d27700 100644
--- a/code/modules/projectiles/projectile/force.dm
+++ b/code/modules/projectiles/projectile/force.dm
@@ -10,21 +10,8 @@
 	name = "force bolt"
 
 /obj/item/projectile/forcebolt/on_hit(var/atom/target, var/blocked = 0)
-
-	var/obj/T = target
-	var/throwdir = get_dir(firer,target)
-	T.throw_at(get_edge_target_turf(target, throwdir),10,10)
-	return 1
-
-/*
-/obj/item/projectile/forcebolt/strong/on_hit(var/atom/target, var/blocked = 0)
-
-	// NONE OF THIS WORKS. DO NOT USE.
-	var/throwdir = null
-
-	for(var/mob/M in hearers(2, src))
-		if(M.loc != src.loc)
-			throwdir = get_dir(src,target)
-			M.throw_at(get_edge_target_turf(M, throwdir),15,1)
-	return ..()
-*/
\ No newline at end of file
+	. = ..()
+	if(blocked < 100)
+		var/obj/T = target
+		var/throwdir = get_dir(firer,target)
+		T.throw_at(get_edge_target_turf(target, throwdir),10,10)
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index ecbbfb530f8..1d1f6dc93a8 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -4,15 +4,14 @@
 	damage = 0
 	damage_type = OXY
 	nodamage = 1
+	armour_penetration = 100
 	flag = "magic"
 
 /obj/item/projectile/magic/death
 	name = "bolt of death"
 	icon_state = "pulse1_bl"
-	damage = 9001
-	damage_type = OXY
-	nodamage = 0
-	flag = "magic"
+	damage_type = BURN //OXY does not kill IPCs
+	damage = 50000
 
 /obj/item/projectile/magic/fireball
 	name = "bolt of fireball"
@@ -20,9 +19,22 @@
 	damage = 10
 	damage_type = BRUTE
 	nodamage = 0
-	flag = "magic"
+
+/obj/item/projectile/magic/fireball/Range()
+	var/turf/T1 = get_step(src,turn(dir, -45))
+	var/turf/T2 = get_step(src,turn(dir, 45))
+	var/mob/living/L = locate(/mob/living) in T1 //if there's a mob alive in our front right diagonal, we hit it.
+	if(L && L.stat != DEAD)
+		Bump(L) //Magic Bullet #teachthecontroversy
+		return
+	L = locate(/mob/living) in T2
+	if(L && L.stat != DEAD)
+		Bump(L)
+		return
+	..()
 
 /obj/item/projectile/magic/fireball/on_hit(var/target)
+	. = ..()
 	var/turf/T = get_turf(target)
 	explosion(T, -1, 0, 2, 3, 0, flame_range = 2)
 	if(ismob(target)) //multiple flavors of pain
@@ -32,35 +44,13 @@
 /obj/item/projectile/magic/resurrection
 	name = "bolt of resurrection"
 	icon_state = "ion"
-	damage = 0
-	damage_type = OXY
-	nodamage = 1
-	flag = "magic"
 
 /obj/item/projectile/magic/resurrection/on_hit(var/mob/living/carbon/target)
-
-	if(istype(target,/mob))
+	. = ..()
+	if(ismob(target))
 		var/old_stat = target.stat
-		if(isanimal(target) && target.stat == DEAD)
-			var/mob/living/simple_animal/O = target
-			var/mob/living/simple_animal/A = new O.type(O.loc)
-			A.real_name = O.real_name
-			A.name = O.name
-			if(iscorgi(O))
-				var/mob/living/simple_animal/pet/corgi/C = O
-				if(C.inventory_head)
-					C.inventory_head.loc = C.loc
-				if(C.inventory_back)
-					C.inventory_back.loc = C.loc
-			if(O.mind)
-				O.mind.transfer_to(A)
-			else
-				A.key = O.key
-			qdel(O)
-			target = A
-		else
-			target.revive()
-			target.suiciding = 0
+		target.suiciding = 0
+		target.revive()
 		if(!target.ckey)
 			for(var/mob/dead/observer/ghost in player_list)
 				if(target.real_name == ghost.real_name)
@@ -74,14 +64,11 @@
 /obj/item/projectile/magic/teleport
 	name = "bolt of teleportation"
 	icon_state = "bluespace"
-	damage = 0
-	damage_type = OXY
-	nodamage = 1
-	flag = "magic"
 	var/inner_tele_radius = 0
 	var/outer_tele_radius = 6
 
 /obj/item/projectile/magic/teleport/on_hit(var/mob/target)
+	. = ..()
 	var/teleammount = 0
 	var/teleloc = target
 	if(!isturf(target))
@@ -97,37 +84,46 @@
 /obj/item/projectile/magic/door
 	name = "bolt of door creation"
 	icon_state = "energy"
-	damage = 0
-	damage_type = OXY
-	nodamage = 1
-	flag = "magic"
+	var/list/door_types = list(/obj/structure/mineral_door/wood,/obj/structure/mineral_door/iron,/obj/structure/mineral_door/silver,\
+		/obj/structure/mineral_door/gold,/obj/structure/mineral_door/uranium,/obj/structure/mineral_door/sandstone,/obj/structure/mineral_door/transparent/plasma,\
+		/obj/structure/mineral_door/transparent/diamond)
 
 /obj/item/projectile/magic/door/on_hit(var/atom/target)
+	. = ..()
 	var/atom/T = target.loc
-	if(isturf(target))
-		if(target.density)
-			new /obj/structure/mineral_door/wood(target)
-			target:ChangeTurf(/turf/simulated/floor/plating)
-	else if (isturf(T))
-		if(T.density)
-			new /obj/structure/mineral_door/wood(T)
-			T:ChangeTurf(/turf/simulated/floor/plating)
+	if(isturf(target) && target.density)
+		CreateDoor(target)
+	else if (isturf(T) && T.density)
+		CreateDoor(T)
+	else if(istype(target, /obj/machinery/door))
+		OpenDoor(target)
+
+/obj/item/projectile/magic/door/proc/CreateDoor(turf/T)
+	var/door_type = pick(door_types)
+	var/obj/structure/mineral_door/D = new door_type(T)
+	T.ChangeTurf(/turf/simulated/floor/plasteel)
+	D.Open()
+
+/obj/item/projectile/magic/door/proc/OpenDoor(var/obj/machinery/door/D)
+	if(istype(D,/obj/machinery/door/airlock))
+		var/obj/machinery/door/airlock/A = D
+		A.locked = 0
+	D.open()
 
 /obj/item/projectile/magic/change
 	name = "bolt of change"
 	icon_state = "ice_1"
-	damage = 0
 	damage_type = BURN
-	nodamage = 1
-	flag = "magic"
 
 /obj/item/projectile/magic/change/on_hit(var/atom/change)
+	. = ..()
 	wabbajack(change)
 
 proc/wabbajack(mob/living/M)
 	if(istype(M))
 		if(istype(M, /mob/living) && M.stat != DEAD)
-			if(M.notransform)	return
+			if(M.notransform)
+				return
 			M.notransform = 1
 			M.canmove = 0
 			M.icon = null
@@ -136,7 +132,9 @@ proc/wabbajack(mob/living/M)
 
 			if(istype(M, /mob/living/silicon/robot))
 				var/mob/living/silicon/robot/Robot = M
-				if(Robot.mmi)	qdel(Robot.mmi)
+				if(Robot.mmi)
+					qdel(Robot.mmi)
+				Robot.notify_ai(1)
 			else
 				if(ishuman(M))
 					var/mob/living/carbon/human/H = M
@@ -146,7 +144,8 @@ proc/wabbajack(mob/living/M)
 					for(var/i in H.internal_organs)
 						qdel(i)
 				for(var/obj/item/W in M)
-					M.unEquip(W)
+					M.unEquip(W, 1)
+					qdel(W)
 
 			var/mob/living/new_mob
 
@@ -166,8 +165,6 @@ proc/wabbajack(mob/living/M)
 						Robot.mmi.transfer_identity(M)	//Does not transfer key/client.
 				if("slime")
 					new_mob = new /mob/living/carbon/slime(M.loc)
-/*					if(prob(50))
-						new_mob.is_adult = 1*/
 					new_mob.universal_speak = 1
 				if("xeno")
 					if(prob(50))
@@ -175,14 +172,6 @@ proc/wabbajack(mob/living/M)
 					else
 						new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)
 					new_mob.universal_speak = 1
-
-					/*var/alien_caste = pick("Hunter","Sentinel","Drone","Larva")
-					switch(alien_caste)
-						if("Hunter")	new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
-						if("Sentinel")	new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)
-						if("Drone")		new_mob = new /mob/living/carbon/alien/humanoid/drone(M.loc)
-						else			new_mob = new /mob/living/carbon/alien/larva(M.loc)
-					new_mob.universal_speak = 1*/
 				if("animal")
 					if(prob(50))
 						var/beast = pick("carp","bear","mushroom","statue", "bat", "goat", "tomato")
@@ -225,7 +214,6 @@ proc/wabbajack(mob/living/M)
 					randomize = picked_species
 					var/datum/preferences/A = new()	//Randomize appearance for the human
 					A.copy_to(new_mob)
-
 				else
 					return
 
@@ -246,13 +234,10 @@ proc/wabbajack(mob/living/M)
 /obj/item/projectile/magic/animate
 	name = "bolt of animation"
 	icon_state = "red_1"
-	damage = 0
 	damage_type = BURN
-	nodamage = 1
-	flag = "magic"
 
 /obj/item/projectile/magic/animate/Bump(var/atom/change)
-	. = ..()
+	..()
 	if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
 		if(istype(change, /obj/structure/closet/statue))
 			for(var/mob/living/carbon/human/H in change.contents)
@@ -273,4 +258,4 @@ proc/wabbajack(mob/living/M)
 	else if(istype(change, /mob/living/simple_animal/hostile/mimic/copy))
 		// Change our allegiance!
 		var/mob/living/simple_animal/hostile/mimic/copy/C = change
-		C.ChangeOwner(firer)
\ No newline at end of file
+		C.ChangeOwner(firer)
diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm
index 81defd55743..12e7b30c759 100644
--- a/code/modules/projectiles/projectile/reusable.dm
+++ b/code/modules/projectiles/projectile/reusable.dm
@@ -1,42 +1,63 @@
 /obj/item/projectile/bullet/reusable
 	name = "reusable bullet"
 	desc = "How do you even reuse a bullet?"
-	var/obj/item/ammo_casing/caseless/ammo_type = /obj/item/ammo_casing/caseless/
-	var/hit = 0
+	var/ammo_type = /obj/item/ammo_casing/caseless/
+	var/dropped = 0
 
-/obj/item/projectile/bullet/reusable/on_hit(var/atom/target, var/blocked = 0)
-	if(!proj_hit)
-		proj_hit = 1
-		if (src.contents.len)
-			var/obj/content
-			for(content in src.contents)
-				content.loc = src.loc
-		else
-			new ammo_type(src.loc)
-	..()
+/obj/item/projectile/bullet/reusable/on_hit(atom/target, blocked = 0)
+	. = ..()
+	handle_drop()
 
 /obj/item/projectile/bullet/reusable/on_range()
-	if(!proj_hit)
-		if (src.contents.len)
-			var/obj/content
-			for(content in src.contents)
-				content.loc = src.loc
-		else
-			new ammo_type(src.loc)
+	handle_drop()
 	..()
 
+/obj/item/projectile/bullet/reusable/proc/handle_drop()
+	if(!dropped)
+		new ammo_type(loc)
+		dropped = 1
+
+/obj/item/projectile/bullet/reusable/magspear
+	name = "magnetic spear"
+	desc = "WHITE WHALE, HOLY GRAIL"
+	damage = 30 //takes 3 spears to kill a mega carp, one to kill a normal carp
+	icon_state = "magspear"
+	ammo_type = /obj/item/ammo_casing/caseless/magspear
+
 /obj/item/projectile/bullet/reusable/foam_dart
 	name = "foam dart"
 	desc = "I hope you're wearing eye protection."
 	damage = 0 // It's a damn toy.
 	damage_type = OXY
 	nodamage = 1
-	edge = 0
-	embed = 0
-	icon = 'icons/obj/toyguns.dmi'
+	icon = 'icons/obj/guns/toy.dmi'
 	icon_state = "foamdart"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
-	range = 10	
+	range = 10
+	var/obj/item/weapon/pen/pen = null
+	edge = 0
+	embed = 0
+
+/obj/item/projectile/bullet/reusable/foam_dart/handle_drop()
+	if(dropped)
+		return
+	dropped = 1
+	var/obj/item/ammo_casing/caseless/foam_dart/newdart = new ammo_type(loc)
+	var/obj/item/ammo_casing/caseless/foam_dart/old_dart = ammo_casing
+	newdart.modified = old_dart.modified
+	if(pen)
+		var/obj/item/projectile/bullet/reusable/foam_dart/newdart_FD = newdart.BB
+		newdart_FD.pen = pen
+		pen.loc = newdart_FD
+		pen = null
+	newdart.BB.damage = damage
+	newdart.BB.nodamage = nodamage
+	newdart.BB.damage_type = damage_type
+	newdart.update_icon()
+
+/obj/item/projectile/bullet/reusable/foam_dart/Destroy()
+	pen = null
+	return ..()
 
 /obj/item/projectile/bullet/reusable/foam_dart/riot
 	name = "riot foam dart"
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index ed64d73df4e..0d0eba709ff 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -6,15 +6,15 @@
 	nodamage = 1
 	flag = "energy"
 
-
-	on_hit(var/atom/target, var/blocked = 0)
-		empulse(target, 1, 1)
-		return 1
-
+/obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0)
+	..()
+	empulse(target, 1, 1)
+	return 1
 
 /obj/item/projectile/ion/weak
 
 /obj/item/projectile/ion/weak/on_hit(atom/target, blocked = 0)
+	..()
 	empulse(target, 0, 0)
 	return 1
 
@@ -26,9 +26,10 @@
 	sharp = 1
 	edge = 1
 
-	on_hit(var/atom/target, var/blocked = 0)
-		explosion(target, -1, 0, 2)
-		return 1
+/obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0)
+	..()
+	explosion(target, -1, 0, 2)
+	return 1
 
 /obj/item/projectile/bullet/a40mm
 	name ="40mm grenade"
@@ -43,18 +44,17 @@
 	return 1
 
 /obj/item/projectile/temp
-	name = "freeze beam"
+	name = "temperature beam"
 	icon_state = "temp_4"
 	damage = 0
 	damage_type = BURN
 	nodamage = 1
 	flag = "energy"
-	var/temperature = 300
-	var/obj/item/weapon/gun/energy/temperature/T = null
+	var/temperature = null
+	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 
-	OnFired()
-		T = shot_from
-		temperature = T.temperature
+/obj/item/projectile/temp/New()
+	spawn(1)
 		switch(temperature)
 			if(501 to INFINITY)
 				name = "searing beam"	//if emagged
@@ -86,47 +86,40 @@
 			else
 				name = "temperature beam"//failsafe
 				icon_state = "temp_4"
+	..()
 
 
-	on_hit(var/atom/target, var/blocked = 0)//These two could likely check temp protection on the mob
-		if(istype(target, /mob/living))
-			var/mob/living/M = target
-			M.bodytemperature = temperature
-			if(temperature > 500)//emagged
-				M.adjust_fire_stacks(0.5)
-				M.IgniteMob()
-				playsound(M.loc, 'sound/effects/bamf.ogg', 50, 0)
-		return 1
+/obj/item/projectile/temp/on_hit(var/atom/target, var/blocked = 0)//These two could likely check temp protection on the mob
+	..()
+	if(isliving(target))
+		var/mob/living/M = target
+		M.bodytemperature = temperature
+		if(temperature > 500)//emagged
+			M.adjust_fire_stacks(0.5)
+			M.IgniteMob()
+			playsound(M.loc, 'sound/effects/bamf.ogg', 50, 0)
+	return 1
 
 /obj/item/projectile/meteor
 	name = "meteor"
 	icon = 'icons/obj/meteor.dmi'
-	icon_state = "smallf"
+	icon_state = "small"
 	damage = 0
 	damage_type = BRUTE
 	nodamage = 1
 	flag = "bullet"
 
-	Bump(atom/A as mob|obj|turf|area)
-		if(A == firer)
-			loc = A.loc
-			return
-
-		sleep(-1) //Might not be important enough for a sleep(-1) but the sleep/spawn itself is necessary thanks to explosions and metoerhits
-
-		if(src)//Do not add to this if() statement, otherwise the meteor won't delete them
-			if(A)
-
-				A.ex_act(2)
-				playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
-
-				for(var/mob/M in range(10, src))
-					if(!M.stat && !istype(M, /mob/living/silicon/ai))\
-						shake_camera(M, 3, 1)
-				qdel(src)
-				return 1
-		else
-			return 0
+/obj/item/projectile/meteor/Bump(atom/A, yes)
+	if(yes)
+		return
+	if(A == firer)
+		loc = A.loc
+		return
+	playsound(loc, 'sound/effects/meteorimpact.ogg', 40, 1)
+	for(var/mob/M in urange(10, src))
+		if(!M.stat)
+			shake_camera(M, 3, 1)
+	qdel(src)
 
 /obj/item/projectile/energy/floramut
 	name = "alpha somatoray"
@@ -136,36 +129,31 @@
 	nodamage = 1
 	flag = "energy"
 
-	on_hit(var/atom/target, var/blocked = 0)
-		var/mob/living/M = target
-		if(ishuman(target))
-			var/mob/living/carbon/human/H = M
-			if((H.species.flags & IS_PLANT) && (M.nutrition < 500))
-				if(prob(15))
-					M.apply_effect((rand(30,80)),IRRADIATE)
-					M.Weaken(5)
-					for (var/mob/V in viewers(src))
-						V.show_message("\red [M] writhes in pain as \his vacuoles boil.", 3, "\red You hear the crunching of leaves.", 2)
-				if(prob(35))
-				//	for (var/mob/V in viewers(src)) //Public messages commented out to prevent possible metaish genetics experimentation and stuff. - Cheridan
-				//		V.show_message("\red [M] is mutated by the radiation beam.", 3, "\red You hear the snapping of twigs.", 2)
-					if(prob(80))
-						randmutb(M)
-						domutcheck(M,null)
-					else
-						randmutg(M)
-						domutcheck(M,null)
+/obj/item/projectile/energy/floramut/on_hit(var/atom/target, var/blocked = 0)
+	..()
+	var/mob/living/M = target
+	if(ishuman(target))
+		var/mob/living/carbon/human/H = M
+		if((H.species.flags & IS_PLANT) && (M.nutrition < 500))
+			if(prob(15))
+				M.apply_effect((rand(30,80)),IRRADIATE)
+				M.Weaken(5)
+				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))
+					randmutb(M)
+					domutcheck(M,null)
 				else
-					M.adjustFireLoss(rand(5,15))
-					M.show_message("\red The radiation beam singes you!")
-				//	for (var/mob/V in viewers(src))
-				//		V.show_message("\red [M] is singed by the radiation beam.", 3, "\red You hear the crackle of burning leaves.", 2)
-		else if(istype(target, /mob/living/carbon/))
-		//	for (var/mob/V in viewers(src))
-		//		V.show_message("The radiation beam dissipates harmlessly through [M]", 3)
-			M.show_message("\blue The radiation beam dissipates harmlessly through your body.")
-		else
-			return 1
+					randmutg(M)
+					domutcheck(M,null)
+			else
+				M.adjustFireLoss(rand(5,15))
+				M.show_message("<span class='warning'>The radiation beam singes you!</span>")
+	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
 
 /obj/item/projectile/energy/florayield
 	name = "beta somatoray"
@@ -175,40 +163,42 @@
 	nodamage = 1
 	flag = "energy"
 
-	on_hit(var/atom/target, var/blocked = 0)
-		var/mob/M = target
-		if(ishuman(target)) //These rays make plantmen fat.
-			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/))
-			M.show_message("\blue The radiation beam dissipates harmlessly through your body.")
-		else
-			return 1
+/obj/item/projectile/energy/florayield/on_hit(var/atom/target, var/blocked = 0)
+	..()
+	var/mob/M = target
+	if(ishuman(target)) //These rays make plantmen fat.
+		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/))
+		M.show_message("<span class='notice'>The radiation beam dissipates harmlessly through your body.</span>")
+	else
+		return 1
 
 
 /obj/item/projectile/beam/mindflayer
 	name = "flayer ray"
 
-	on_hit(var/atom/target, var/blocked = 0)
-		if(ishuman(target))
-			var/mob/living/carbon/human/M = target
-			M.adjustBrainLoss(20)
-			M.hallucination += 20
+/obj/item/projectile/beam/mindflayer/on_hit(var/atom/target, var/blocked = 0)
+	. = ..()
+	if(ishuman(target))
+		var/mob/living/carbon/human/M = target
+		M.adjustBrainLoss(20)
+		M.hallucination += 20
 
 /obj/item/projectile/clown
 	name = "snap-pop"
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "snappop"
 
-	Bump(atom/A as mob|obj|turf|area)
-		var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
-		s.set_up(3, 1, src)
-		s.start()
-		new /obj/effect/decal/cleanable/ash(src.loc)
-		src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
-		playsound(src, 'sound/effects/snap.ogg', 50, 1)
-		qdel(src)
+/obj/item/projectile/clown/Bump(atom/A as mob|obj|turf|area)
+	var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+	s.set_up(3, 1, src)
+	s.start()
+	new /obj/effect/decal/cleanable/ash(loc)
+	visible_message("<span class='warning'>The [name] explodes!</span>","<span class='warning'>You hear a snap!</span>")
+	playsound(src, 'sound/effects/snap.ogg', 50, 1)
+	qdel(src)
 
 /obj/item/projectile/kinetic
 	name = "kinetic force"
@@ -239,11 +229,9 @@ obj/item/projectile/kinetic/New()
 		damage *= 4
 	..()
 
-/obj/item/projectile/kinetic/Range()
-	range--
-	if(range <= 0)
-		new /obj/item/effect/kinetic_blast(src.loc)
-		qdel(src)
+/obj/item/projectile/kinetic/on_range()
+	new /obj/effect/kinetic_blast(loc)
+	..()
 
 /obj/item/projectile/kinetic/on_hit(atom/target)
 	. = ..()
@@ -251,23 +239,57 @@ obj/item/projectile/kinetic/New()
 	if(istype(target_turf, /turf/simulated/mineral))
 		var/turf/simulated/mineral/M = target_turf
 		M.gets_drilled(firer)
-	new /obj/item/effect/kinetic_blast(target_turf)
-	if(src.splash)
+	new /obj/effect/kinetic_blast(target_turf)
+	if(splash)
 		for(var/turf/T in range(splash, target_turf))
 			if(istype(T, /turf/simulated/mineral))
 				var/turf/simulated/mineral/M = T
 				M.gets_drilled(firer)
 
-/obj/item/effect/kinetic_blast
+/obj/effect/kinetic_blast
 	name = "kinetic explosion"
 	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "kinetic_blast"
 	layer = 4.1
 
-/obj/item/effect/kinetic_blast/New()
+/obj/effect/kinetic_blast/New()
 	spawn(4)
 		qdel(src)
 
+/obj/item/projectile/beam/wormhole
+	name = "bluespace beam"
+	icon_state = "spark"
+	hitsound = "sparks"
+	damage = 3
+	var/obj/item/weapon/gun/energy/wormhole_projector/gun
+	color = "#33CCFF"
+
+/obj/item/projectile/beam/wormhole/orange
+	name = "orange bluespace beam"
+	color = "#FF6600"
+
+/obj/item/projectile/beam/wormhole/New(var/obj/item/ammo_casing/energy/wormhole/casing)
+	if(casing)
+		gun = casing.gun
+
+/obj/item/projectile/beam/wormhole/on_hit(atom/target)
+	if(ismob(target))
+		var/turf/portal_destination = pick(orange(6, src))
+		do_teleport(target, portal_destination)
+		return ..()
+	if(!gun)
+		qdel(src)
+	gun.create_portal(src)
+
+/obj/item/projectile/beam/wormhole/on_hit(atom/target)
+	if(ismob(target))
+		var/turf/portal_destination = pick(orange(6, src))
+		do_teleport(target, portal_destination)
+		return ..()
+	if(!gun)
+		qdel(src)
+	gun.create_portal(src)
+
 /obj/item/projectile/bullet/frag12
 	name ="explosive slug"
 	damage = 25
@@ -278,25 +300,6 @@ obj/item/projectile/kinetic/New()
 	explosion(target, -1, 0, 1)
 	return 1
 
-/obj/item/projectile/energy/teleport
-	name = "teleportation burst"
-	icon_state = "bluespace"
-	damage = 0
-	nodamage = 1
-	var/obj/item/weapon/gun/energy/telegun/T = null
-	var/teleport_target = null
-
-	OnFired()
-		T = shot_from
-		teleport_target = T.teleport_target
-
-/obj/item/projectile/energy/teleport/on_hit(var/atom/target, var/blocked = 0)
-	if(isliving(target))
-		if(teleport_target)
-			do_teleport(target, teleport_target, 0)//teleport what's in the tile to the beacon
-		else
-			do_teleport(target, target, 15) //Otherwise it just warps you off somewhere.
-
 /obj/item/projectile/plasma
 	name = "plasma blast"
 	icon_state = "plasmacutter"
@@ -321,8 +324,9 @@ obj/item/projectile/kinetic/New()
 	if(istype(target, /turf/simulated/mineral))
 		var/turf/simulated/mineral/M = target
 		M.gets_drilled(firer)
-		range = max(range - 1, 1)
-		return -1
+		Range()
+		if(range > 0)
+			return -1
 
 /obj/item/projectile/plasma/adv
 	range = 5
@@ -331,29 +335,19 @@ obj/item/projectile/kinetic/New()
 	damage = 10
 	range = 6
 
-/obj/item/projectile/beam/wormhole
-	name = "bluespace beam"
-	icon_state = "spark"
-	hitsound = "sparks"
-	damage = 3
-	var/obj/item/weapon/gun/energy/wormhole_projector/gun = null
-	color = "#33CCFF"
+/obj/item/projectile/energy/teleport
+	name = "teleportation burst"
+	icon_state = "bluespace"
+	damage = 0
+	nodamage = 1
+	var/teleport_target = null
 
-/obj/item/projectile/beam/wormhole/orange
-	name = "orange bluespace beam"
-	color = "#FF6600"
-
-/obj/item/projectile/beam/wormhole/OnFired()
-	gun = shot_from
-
-/obj/item/projectile/beam/wormhole/on_hit(atom/target)
-	if(ismob(target))
-		var/turf/portal_destination = pick(orange(6, src))
-		do_teleport(target, portal_destination)
-		return ..()
-	if(!gun)
-		qdel(src)
-	gun.create_portal(src)
+/obj/item/projectile/energy/teleport/on_hit(var/atom/target, var/blocked = 0)
+	if(isliving(target))
+		if(teleport_target)
+			do_teleport(target, teleport_target, 0)//teleport what's in the tile to the beacon
+		else
+			do_teleport(target, target, 15) //Otherwise it just warps you off somewhere.
 
 /obj/item/projectile/snowball
 	name = "snowball"
@@ -363,6 +357,7 @@ obj/item/projectile/kinetic/New()
 	damage_type = BURN
 
 /obj/item/projectile/snowball/on_hit(atom/target)	//chilling
+	. = ..()
 	if(istype(target, /mob/living))
 		var/mob/living/M = target
 		M.bodytemperature = max(0, M.bodytemperature - 50)	//each hit will drop your body temp, so don't get surrounded!
@@ -380,9 +375,10 @@ obj/item/projectile/kinetic/New()
 	..()
 
 /obj/item/projectile/ornament/on_hit(atom/target)	//knockback
+	..()
 	if(istype(target, /turf))
 		return 0
 	var/obj/T = target
 	var/throwdir = get_dir(firer,target)
 	T.throw_at(get_edge_target_turf(target, throwdir),10,10)
-	return 1
\ No newline at end of file
+	return 1
diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm
deleted file mode 100644
index 9b9484ba60e..00000000000
--- a/code/modules/reagents/grenade_launcher.dm
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-/obj/item/weapon/gun/grenadelauncher
-	name = "grenade launcher"
-	icon = 'icons/obj/gun.dmi'
-	icon_state = "riotgun"
-	item_state = "riotgun"
-	w_class = 4.0
-	throw_speed = 2
-	throw_range = 10
-	force = 5.0
-	var/list/grenades = new/list()
-	var/max_grenades = 3
-	var/ammo_name = "grenade"
-	var/ammo_type = /obj/item/weapon/grenade
-	var/unloaded
-
-	materials = list(MAT_METAL=2000)
-
-/obj/item/weapon/gun/grenadelauncher/examine(mob/user)
-	if(..(user, 2))
-		to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.")
-
-/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params)
-
-	if((istype(I, ammo_type)))
-		if(grenades.len < max_grenades)
-			user.drop_item()
-			I.loc = src
-			grenades += I
-			to_chat(user, "\blue You put the [ammo_name] in the [name].")
-			to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.")
-		else
-			to_chat(usr, "\red The grenade launcher cannot hold more [ammo_name]s.")
-
-/obj/item/weapon/gun/grenadelauncher/afterattack(obj/target, mob/user , flag)
-
-	if (istype(target, /obj/item/weapon/storage/backpack ))
-		return
-
-	else if (locate (/obj/structure/table, src.loc))
-		return
-
-	else if(target == user)
-		return
-
-	if(grenades.len)
-		spawn(0) fire_grenade(target,user)
-	else
-		to_chat(usr, "\red The [name] is empty.")
-
-/obj/item/weapon/gun/grenadelauncher/proc/fire_grenade(atom/target, mob/user)
-	for(var/mob/O in viewers(world.view, user))
-		O.show_message(text("\red [] fired a [ammo_name]!", user), 1)
-	to_chat(user, "\red You fire the [name]!")
-	var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta!
-	grenades -= F
-	F.loc = user.loc
-	F.throw_at(target, 30, 2, user)
-	message_admins("[key_name_admin(user)] fired a [ammo_name] ([F.name]) from a launcher ([name]).")
-	log_game("[key_name_admin(user)] used a [ammo_name] ([name]).")
-	F.active = 1
-	F.icon_state = initial(icon_state) + "_active"
-	playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
-	spawn(15)
-		F.prime()
-
-
-/obj/item/weapon/gun/grenadelauncher/piecannon
-	name = "pie cannon"
-	icon = 'icons/obj/gun.dmi'
-	icon_state = "piecannon1"
-	item_state = "piecannon1"
-	w_class = 4.0
-	throw_speed = 2
-	throw_range = 10
-	force = 5.0
-	clumsy_check = 0
-	grenades = new/list()
-	max_grenades = 5
-	ammo_name = "cream pie"
-	ammo_type = /obj/item/weapon/reagent_containers/food/snacks/pie
-
-/obj/item/weapon/gun/grenadelauncher/piecannon/New()
-	..()
-	for(var/i=0, i < max_grenades, i++)
-		var/obj/item/weapon/reagent_containers/food/snacks/pie/P = new /obj/item/weapon/reagent_containers/food/snacks/pie(src)
-		grenades += P
-
-/obj/item/weapon/gun/grenadelauncher/piecannon/attackby(obj/item/I as obj, mob/user as mob, params)
-	if((istype(I, ammo_type)))
-		if(grenades.len < max_grenades)
-			user.drop_item()
-			I.loc = src
-			grenades += I
-			to_chat(user, "\blue You put the [ammo_name] in the [name].")
-			to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.")
-			icon_state = "piecannon1"
-		else
-			to_chat(usr, "\red The grenade launcher cannot hold more [ammo_name]s.")
-
-/obj/item/weapon/gun/grenadelauncher/piecannon/fire_grenade(atom/target, mob/user)
-	for(var/mob/O in viewers(world.view, user))
-		O.show_message(text("\red [] fired a [ammo_name]!", user), 1)
-	to_chat(user, "\red You fire the [name]!")
-	var/obj/item/weapon/reagent_containers/food/snacks/pie/P = grenades[1] //Now with less copypasta!
-	grenades -= P
-	P.loc = user.loc
-	P.throw_at(target, 30, 2, user)
-	if(!grenades.len)
-		icon_state = "piecannon0"
diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm
index 4479d24aa7c..c394af15a4e 100644
--- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm
+++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm
@@ -509,6 +509,14 @@
 	result_amount = 2
 	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
 
+/datum/chemical_reaction/cafe_mocha
+	name = "Cafe Mocha"
+	id = "cafe_mocha"
+	result = "cafe_mocha"
+	required_reagents = list("cafe_latte" = 1, "chocolate" = 1)
+	result_amount = 2
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
 /datum/chemical_reaction/acidspit
 	name = "Acid Spit"
 	id = "acidspit"
diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm
index 65b19133fa3..5f96f794b34 100644
--- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm
+++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm
@@ -110,6 +110,16 @@
 	mix_message = "Ice forms as the water freezes."
 	mix_sound = null
 
+/datum/chemical_reaction/water
+	name = "Water"
+	id = "water"
+	result = "water"
+	required_reagents = list("ice" = 1)
+	result_amount = 1
+	min_temp = 301 // In Space.....ice melts at 82F...don't ask
+	mix_message = "Water pools as the ice melts."
+	mix_sound = null
+
 /datum/chemical_reaction/dough
 	name = "Dough"
 	id = "dough"
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
index 45e0e2e8ac2..d52743c6ae6 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
@@ -241,6 +241,12 @@
 		M.adjustBruteLoss(-1)
 		return
 
+/datum/reagent/drink/coffee/cafe_latte/cafe_mocha
+	name = "Cafe Mocha"
+	id = "cafe_mocha"
+	description = "The perfect blend of coffe, milk, and chocolate."
+	color = "#673629"
+
 /datum/reagent/drink/tea
 	name = "Tea"
 	id = "tea"
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index c7351d1c3fd..981bb7148a2 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -459,6 +459,10 @@
 					icon_state = "cafe_latte"
 					name = "Cafe Latte"
 					desc = "A nice, strong and refreshing beverage while you are reading."
+				if("cafe_mocha")
+					icon_state = "cafe_latte"
+					name = "Cafe Mocha"
+					desc = "The perfect blend of coffe, milk, and chocolate."
 				if("acidspit")
 					icon_state = "acidspitglass"
 					name = "Acid Spit"
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 32a0e752913..efc6a48b1f9 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -155,7 +155,7 @@
 /obj/item/weapon/reagent_containers/spray/chemsprayer
 	name = "chem sprayer"
 	desc = "A utility used to spray large amounts of reagents in a given area."
-	icon = 'icons/obj/gun.dmi'
+	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "chemsprayer"
 	item_state = "chemsprayer"
 	throwforce = 0
@@ -234,4 +234,4 @@
 	if (istype(A, /obj/effect/blob)) // blob damage in blob code
 		return
 
-	..()
\ No newline at end of file
+	..()
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index bd8a22cd06f..332375dae8d 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -17,6 +17,7 @@
 	w_class = 1
 	sharp = 1
 	var/mode = SYRINGE_DRAW
+	var/projectile_type = /obj/item/projectile/bullet/dart/syringe
 
 /obj/item/weapon/reagent_containers/syringe/on_reagent_change()
 	update_icon()
@@ -533,4 +534,4 @@
 		reagents.add_reagent("capulettium_plus", 5)
 		reagents.add_reagent("sodium_thiopental", 5)
 		mode = SYRINGE_INJECT
-		update_icon()
\ No newline at end of file
+		update_icon()
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 00530d2a8a3..7bcc42e4979 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -280,6 +280,17 @@
 	build_path = /obj/item/organ/internal/cyberimp/brain/anti_stun
 	category = list("Misc", "Medical")
 
+/datum/design/cyberimp_clownvoice
+	name = "Comical implant"
+	desc = "<span class='sans'>Uh oh.</span>"
+	id = "ci-clownvoice"
+	req_tech = list("materials" = 2, "biotech" = 2)
+	build_type = PROTOLATHE | MECHFAB
+	construction_time = 60
+	materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_BANANIUM = 200)
+	build_path = /obj/item/organ/internal/cyberimp/brain/clown_voice
+	category = list("Misc", "Medical")
+
 /datum/design/cyberimp_nutriment
 	name = "Nutriment pump implant"
 	desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 38004bd49fa..c9ed686645a 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -219,6 +219,7 @@
 			--cloneCount
 			if(cloneCount == 0)
 				cloneMode = FALSE
+			return
 		var/turf/dropturf = get_turf(pick(view(1,src)))
 		if(!dropturf) //Failsafe to prevent the object being lost in the void forever.
 			dropturf = get_turf(src)
@@ -373,8 +374,7 @@
 				FB.current = start
 				FB.yo = MT.y - start.y
 				FB.xo = MT.x - start.x
-				spawn(1)
-					FB.process()
+				FB.fire()
 		if(prob(EFFECT_PROB_LOW-badThingCoeff))
 			visible_message("<span class='danger'>[src] malfunctions, melting [exp_on] and releasing a burst of flame!</span>")
 			explosion(src.loc, -1, 0, 0, 0, 0, flame_range = 2)
@@ -406,7 +406,7 @@
 		visible_message("[src] lowers [exp_on]'s temperature.")
 		if(prob(EFFECT_PROB_LOW) && criticalReaction)
 			visible_message("<span class='warning'>[src]'s emergency coolant system gives off a small ding!</span>")
-			var/obj/machinery/vending/coffee/C = new /obj/machinery/vending/coffee(get_turf(pick(oview(1,src))))
+			var/obj/item/weapon/reagent_containers/food/drinks/coffee/C = new /obj/item/weapon/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
 			playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready!
 			chosenchem = pick("uranium","frostoil","ephedrine")
 			C.reagents.remove_any(25)
@@ -492,7 +492,7 @@
 		ejectItem()
 
 	//Global reactions
-	
+
 	if(prob(EFFECT_PROB_VERYLOW) && prob(13))
 		visible_message("<span class='warning'>[src] improves [exp_on], drawing the life essence of those nearby!</span>")
 		for(var/mob/living/m in view(4,src))
@@ -504,7 +504,7 @@
 			reqs[T] = reqs[T] + 1
 		exp_on.origin_tech = list2params(reqs)
 		investigate_log("Experimentor has set the origin tech of [exp_on] to [exp_on.origin_tech]", "experimentor")
-	
+
 	if(prob(EFFECT_PROB_VERYLOW-badThingCoeff) && prob(87))
 		var/globalMalf = rand(1,87)
 		if(globalMalf < 15)
diff --git a/code/modules/research/xenoarchaeology/machinery/coolant.dm b/code/modules/research/xenoarchaeology/machinery/coolant.dm
index f6d844fb889..b2dd9ce2a9e 100644
--- a/code/modules/research/xenoarchaeology/machinery/coolant.dm
+++ b/code/modules/research/xenoarchaeology/machinery/coolant.dm
@@ -27,7 +27,7 @@ datum/chemical_reaction/coolant
 
 /obj/structure/reagent_dispensers/coolanttank/bullet_act(var/obj/item/projectile/Proj)
 	if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet))
-		if(!istype(Proj ,/obj/item/projectile/lasertag) && !istype(Proj ,/obj/item/projectile/practice) )
+		if(!Proj.damage)
 			explode()
 
 /obj/structure/reagent_dispensers/coolanttank/blob_act()
diff --git a/code/modules/spacepods/equipment.dm b/code/modules/spacepods/equipment.dm
index 24c4fa5110b..ead021dac06 100644
--- a/code/modules/spacepods/equipment.dm
+++ b/code/modules/spacepods/equipment.dm
@@ -30,11 +30,9 @@
 		var/obj/item/projectile/projone = new proj_type(firstloc)
 		var/obj/item/projectile/projtwo = new proj_type(secondloc)
 		projone.starting = get_turf(my_atom)
-		projone.shot_from = src
 		projone.firer = usr
 		projone.def_zone = "chest"
 		projtwo.starting = get_turf(my_atom)
-		projtwo.shot_from = src
 		projtwo.firer = usr
 		projtwo.def_zone = "chest"
 		spawn()
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index a5af2caca3d..b753bcf71a5 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -144,6 +144,13 @@
 	spawn(90 / severity)
 		crit_fail = 0
 
+/obj/item/organ/internal/cyberimp/brain/clown_voice
+	name = "Comical implant"
+	desc = "<span class='sans'>Uh oh.</span>"
+	implant_color = "#DEDE00"
+	slot = "brain_clownvoice"
+	origin_tech = "materials=2;biotech=2"
+
 //[[[[CHEST]]]]
 /obj/item/organ/internal/cyberimp/chest
 	name = "cybernetic torso implant"
@@ -315,7 +322,7 @@
 	organ_action_name = "Toggle Arm Cannon Taser"
 
 /obj/item/organ/internal/cyberimp/chest/arm_mod/tase/New()//when the implant is created...
-	holder = new /obj/item/weapon/gun/energy/advtaser/mounted(src)//assign a brand new item to it. (in this case, a gun)
+	holder = new /obj/item/weapon/gun/energy/gun/advtaser/mounted(src)//assign a brand new item to it. (in this case, a gun)
 
 /obj/item/organ/internal/cyberimp/chest/arm_mod/lase//mounted, self-charging laser!
 	name = "Arm-cannon laser implant"
@@ -351,4 +358,4 @@
 	var/implant
 	while(contents.len <= amount + 1) // +1 for the autoimplanter.
 		implant = pick(boxed)
-		new implant(src)
\ No newline at end of file
+		new implant(src)
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 5982237cbac..57e2934dbb4 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -10,6 +10,7 @@
 	vital = 0
 	var/organ_action_name = null
 	var/non_primary = 0
+	action_button_custom_type = /datum/action/item_action/organ_action
 
 /obj/item/organ/internal/New(var/mob/living/carbon/holder)
 	if(istype(holder))
diff --git a/dm.sh b/dm.sh
index 3d04531b3f4..d77cabc637a 100644
--- a/dm.sh
+++ b/dm.sh
@@ -79,7 +79,7 @@ else
 	then
 		DreamMaker $dmepath.mdme 2>&1 | tee result.log
 		retval=$?
-		if ! grep '0 errors, 0 warnings' result.log
+		if ! grep '\- 0 errors, 0 warnings' result.log
 		then
 			retval=1 #hard fail, due to warnings or errors
 		fi
@@ -94,4 +94,4 @@ mv $dmepath.mdme.rsc $dmepath.rsc
 
 rm $dmepath.mdme
 
-exit $retval
\ No newline at end of file
+exit $retval
diff --git a/html/changelog.html b/html/changelog.html
index 095d98ad174..8265f956302 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,49 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">02 June 2016</h2>
+			<h3 class="author">CrAzYPiLoT updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed a text problem in virtual gameboard description.</li>
+				<li class="rscadd">Made gameboards deconstructable and movable.</li>
+				<li class="tweak">Added a light to gameboards. Pretty!</li>
+			</ul>
+			<h3 class="author">Crazylemon64 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">There will no longer be a mountain of startup runtimes when people have custom languages.</li>
+			</ul>
+			<h3 class="author">DaveTheHeadcrab updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Removes xenobio golem rune creation sound</li>
+				<li class="rscadd">Added overlays for sec belts that reflect the items stored therein.</li>
+			</ul>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes Chapel and Chaplain's office not having a light switch</li>
+				<li class="bugfix">Fixes mass driver only being usable once due to weird pressure</li>
+				<li class="bugfix">Fixes chapel being overly dark near coffins</li>
+				<li class="bugfix">Fixes not being able to sheath the claymore in the Crusader Armor</li>
+			</ul>
+			<h3 class="author">IK3I updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">crate cargo system</li>
+				<li class="rscadd">passenger seat system</li>
+				<li class="rscadd">loot box secondary cargo system (install it and your pod has a standard inventory)</li>
+				<li class="rscadd">lock busters for the CE and Armory</li>
+				<li class="bugfix">incappacitated people can't operate the door controls anymore</li>
+				<li class="bugfix">Items dropped in a pod can now be scrounged up</li>
+				<li class="bugfix">security can rip you out of an unlocked pod</li>
+				<li class="bugfix">The pod code isn't full of tumors any more</li>
+			</ul>
+			<h3 class="author">Tastyfish updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Holsters now have an action button while on your suit again.</li>
+			</ul>
+			<h3 class="author">monster860 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds the following words to the AI announcer: active, airlock, alcohol, arrival, arrivals, becoming, between, blob, briefing, camp, chair, chapel, closet, cyberiad, declared, detective, diona, dock, docked, docking, docks, drask, drunk, emag, equipment, evacuation, experimentor, gateway, hail, hallway, holoparasite, honk, hull, ian, imminent, interested, intruders, kida, kidan, labor, library, mime, mimes, miner, miners, mining, n2o, nuke, office, op, operational, ops, pod, pods, poly, pun, renault, representative, runtime, scrubbers, sequencer, skree, skrek, skrell, space, spider, spiders, still, stupid, swarmer, swarmers, sword, technology, teleport, teleported, teleporter, teleporting, tesla, tool, unathi, vacant, vault, vents, vulpkanin, weld, window, windows, yet</li>
+			</ul>
+
 			<h2 class="date">31 May 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 9ae2b44105f..7756fe95cb5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1624,3 +1624,42 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       with any access.
   - rscadd: Adds the HoP guest pass computer to the HoP office.
   - rscadd: Moves the guest pass computer in robotics to RnD.
+2016-06-02:
+  CrAzYPiLoT:
+  - bugfix: Fixed a text problem in virtual gameboard description.
+  - rscadd: Made gameboards deconstructable and movable.
+  - tweak: Added a light to gameboards. Pretty!
+  Crazylemon64:
+  - bugfix: There will no longer be a mountain of startup runtimes when people have
+      custom languages.
+  DaveTheHeadcrab:
+  - tweak: Removes xenobio golem rune creation sound
+  - rscadd: Added overlays for sec belts that reflect the items stored therein.
+  Fox McCloud:
+  - bugfix: Fixes Chapel and Chaplain's office not having a light switch
+  - bugfix: Fixes mass driver only being usable once due to weird pressure
+  - bugfix: Fixes chapel being overly dark near coffins
+  - bugfix: Fixes not being able to sheath the claymore in the Crusader Armor
+  IK3I:
+  - rscadd: crate cargo system
+  - rscadd: passenger seat system
+  - rscadd: loot box secondary cargo system (install it and your pod has a standard
+      inventory)
+  - rscadd: lock busters for the CE and Armory
+  - bugfix: incappacitated people can't operate the door controls anymore
+  - bugfix: Items dropped in a pod can now be scrounged up
+  - bugfix: security can rip you out of an unlocked pod
+  - bugfix: The pod code isn't full of tumors any more
+  Tastyfish:
+  - bugfix: Holsters now have an action button while on your suit again.
+  monster860:
+  - rscadd: 'Adds the following words to the AI announcer: active, airlock, alcohol,
+      arrival, arrivals, becoming, between, blob, briefing, camp, chair, chapel, closet,
+      cyberiad, declared, detective, diona, dock, docked, docking, docks, drask, drunk,
+      emag, equipment, evacuation, experimentor, gateway, hail, hallway, holoparasite,
+      honk, hull, ian, imminent, interested, intruders, kida, kidan, labor, library,
+      mime, mimes, miner, miners, mining, n2o, nuke, office, op, operational, ops,
+      pod, pods, poly, pun, renault, representative, runtime, scrubbers, sequencer,
+      skree, skrek, skrell, space, spider, spiders, still, stupid, swarmer, swarmers,
+      sword, technology, teleport, teleported, teleporter, teleporting, tesla, tool,
+      unathi, vacant, vault, vents, vulpkanin, weld, window, windows, yet'
diff --git a/html/changelogs/AutoChangeLog-pr-4383.yml b/html/changelogs/AutoChangeLog-pr-4383.yml
deleted file mode 100644
index ea862e39a05..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4383.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: IK3I
-delete-after: True
-changes: 
-  - rscadd: "crate cargo system"
-  - rscadd: "passenger seat system"
-  - rscadd: "loot box secondary cargo system (install it and your pod has a standard inventory)"
-  - rscadd: "lock busters for the CE and Armory"
-  - bugfix: "incappacitated people can't operate the door controls anymore"
-  - bugfix: "Items dropped in a pod can now be scrounged up"
-  - bugfix: "security can rip you out of an unlocked pod"
-  - bugfix: "The pod code isn't full of tumors any more"
diff --git a/html/changelogs/AutoChangeLog-pr-4515.yml b/html/changelogs/AutoChangeLog-pr-4515.yml
new file mode 100644
index 00000000000..9702d75f4b1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4515.yml
@@ -0,0 +1,21 @@
+author: Many -tg-station Coders, TheDZD
+delete-after: True
+changes: 
+  - rscdel: "Old gun code is now gone."
+  - rscadd: "Ports the vast majority of TG's gun code and their guns (any previously unavailable guns, and newly-added guns will remain unavailable to players). Expect some changes that might not be listed here due to the sheer scope of this refactor."
+  - rscadd: "Probably some new bugs."
+  - bugfix: "A lot of old gun bugs."
+  - rscadd: "Mouth suiciding with a gun no longer instantly kills you, you fire the gun at yourself at 5x damage (assuming it even did damage to begin with)."
+  - tweak: "Mouth suicide shooting does not work on harm intent."
+  - tweak: "You can now bash people with guns while on harm intent instead of shooting them point-blank."
+  - rscadd: "You can now mouth suicide other people, doing so still takes the full 12 seconds to mouth suicide, but has the same 5x damage multiplier."
+  - tweak: "Vox spike throwers are real guns that fire spike bullets now, instead of just being fake guns that threw spikes. They do 25 damage per hit, have 30 armor piercing, cause a 1 second stun (not the kind that drops you to the floor), and cause some bleeding. They have 2 round burst fire as well, and have 10 shots per clip. A new should should recharge every 20 or so seconds."
+  - tweak: "Xray lasers now have a maximum range of 15 tiles."
+  - bugfix: "Zoomed guns now actually fire accurately while zoomed."
+  - rscadd: "Using Suicide with guns now actually does gun-like things."
+  - tweak: "The clown no longer deletes guns if he fucks up with them due to being clumsy."
+  - bugfix: "Emitters no longer become inaccurate over long ranges."
+  - tweak: "Power gloves now override middle-click and alt-click when worn."
+  - tweak: "Power gloves give a notification when worn."
+  - tweak: "Power gloves now have special examine text when examined by an antagonist."
+  - tweak: "Proto SMGs now only have a 21 shot clip."
diff --git a/html/changelogs/AutoChangeLog-pr-4541.yml b/html/changelogs/AutoChangeLog-pr-4541.yml
deleted file mode 100644
index d8bb77d3f58..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4541.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: DaveTheHeadcrab
-delete-after: True
-changes: 
-  - tweak: "Removes xenobio golem rune creation sound"
diff --git a/html/changelogs/AutoChangeLog-pr-4545.yml b/html/changelogs/AutoChangeLog-pr-4545.yml
deleted file mode 100644
index 03d1f21b0c6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4545.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Crazylemon64
-delete-after: True
-changes: 
-  - bugfix: "There will no longer be a mountain of startup runtimes when people have custom languages."
diff --git a/html/changelogs/AutoChangeLog-pr-4558.yml b/html/changelogs/AutoChangeLog-pr-4558.yml
new file mode 100644
index 00000000000..78f9175f665
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4558.yml
@@ -0,0 +1,5 @@
+author: monster860
+delete-after: True
+changes: 
+  - rscadd: "Adds comical implant. It is an implant that causes you to have a comic sans voice. It can be made in the protolathe using bananium."
+  - rscadd: "The comical implant now spawns by default inside IPC clowns"
diff --git a/html/changelogs/AutoChangeLog-pr-4573.yml b/html/changelogs/AutoChangeLog-pr-4573.yml
new file mode 100644
index 00000000000..f7cecd4dd78
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4573.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - rscadd: "Adds in a mocha drink"
diff --git a/html/changelogs/AutoChangeLog-pr-4574.yml b/html/changelogs/AutoChangeLog-pr-4574.yml
new file mode 100644
index 00000000000..bc5f9d3a518
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4574.yml
@@ -0,0 +1,4 @@
+author: KasparoVy
+delete-after: True
+changes: 
+  - tweak: "Old placeholder IPC butt sprite replaced with the finished QR-code sprite."
diff --git a/html/changelogs/AutoChangeLog-pr-4576.yml b/html/changelogs/AutoChangeLog-pr-4576.yml
new file mode 100644
index 00000000000..684fb8c1773
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4576.yml
@@ -0,0 +1,4 @@
+author: Twinmold
+delete-after: True
+changes: 
+  - rscadd: "Nar'Sie AI Hologram and Error Sprite"
diff --git a/html/changelogs/AutoChangeLog-pr-4577.yml b/html/changelogs/AutoChangeLog-pr-4577.yml
new file mode 100644
index 00000000000..85e2c7f961a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4577.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - bugfix: "Fixes ice being unobtainable for the jobs that use it most"
diff --git a/html/changelogs/AutoChangeLog-pr-4584.yml b/html/changelogs/AutoChangeLog-pr-4584.yml
new file mode 100644
index 00000000000..f9d4cca5f9e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4584.yml
@@ -0,0 +1,4 @@
+author: Crazylemon64
+delete-after: True
+changes: 
+  - bugfix: "No more language message-spam on roundstart"
diff --git a/html/changelogs/AutoChangeLog-pr-4586.yml b/html/changelogs/AutoChangeLog-pr-4586.yml
new file mode 100644
index 00000000000..4ea6931368a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4586.yml
@@ -0,0 +1,4 @@
+author: Krausus
+delete-after: True
+changes: 
+  - bugfix: "Fixes ghosts failing to follow mobs that move in unusual ways"
diff --git a/html/changelogs/AutoChangeLog-pr-4591.yml b/html/changelogs/AutoChangeLog-pr-4591.yml
new file mode 100644
index 00000000000..f0908fb8b15
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4591.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - bugfix: "Fixes laser armor losing its reflecting ability"
diff --git a/html/changelogs/AutoChangeLog-pr-4593.yml b/html/changelogs/AutoChangeLog-pr-4593.yml
new file mode 100644
index 00000000000..52e307fa37e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4593.yml
@@ -0,0 +1,4 @@
+author: pinatacolada
+delete-after: True
+changes: 
+  - bugfix: "removes atmos tech SOP from supply SOP"
diff --git a/html/changelogs/AutoChangeLog-pr-4597.yml b/html/changelogs/AutoChangeLog-pr-4597.yml
new file mode 100644
index 00000000000..3b1b0b199f5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4597.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - bugfix: "Fixes the lack of progress bars for more stack-based construction"
diff --git a/html/changelogs/AutoChangeLog-pr-4605.yml b/html/changelogs/AutoChangeLog-pr-4605.yml
new file mode 100644
index 00000000000..2ebddedb965
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4605.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - bugfix: "Fixes Experimentor producing coffee machines instead of cups"
diff --git a/html/changelogs/AutoChangeLog-pr-4613.yml b/html/changelogs/AutoChangeLog-pr-4613.yml
new file mode 100644
index 00000000000..bf33a553ecd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4613.yml
@@ -0,0 +1,5 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - bugfix: "Fixes being able to duplicate just about anything in the Experimentor"
+  - bugfix: "Fixes not being able to use tank transfer valves or one tank bombs in the Experimentor."
diff --git a/icons/mob/AI.dmi b/icons/mob/AI.dmi
index 13c653883ef..4c879d066b1 100644
Binary files a/icons/mob/AI.dmi and b/icons/mob/AI.dmi differ
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index 63fbda7a4bd..1064c55f48b 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index d8fada37744..93e30e4e812 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index ddf9bc91d3c..61c176bd08a 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 8fd47551efa..652996f8d8c 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 07455bdf920..6fed8c42c66 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 7e588ec2210..b6bbd8ab349 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/butts.dmi b/icons/obj/butts.dmi
index 9a71d519a19..104906120d4 100644
Binary files a/icons/obj/butts.dmi and b/icons/obj/butts.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index afe27ae192d..54ed8f57927 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 7427f32fd3e..71d51209dbc 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
deleted file mode 100644
index 45e4265c292..00000000000
Binary files a/icons/obj/gun.dmi and /dev/null differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
new file mode 100644
index 00000000000..39b73d8052b
Binary files /dev/null and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/gun_temperature.dmi b/icons/obj/guns/gun_temperature.dmi
similarity index 100%
rename from icons/obj/gun_temperature.dmi
rename to icons/obj/guns/gun_temperature.dmi
diff --git a/icons/obj/guns/magic.dmi b/icons/obj/guns/magic.dmi
new file mode 100644
index 00000000000..2f3fc52957a
Binary files /dev/null and b/icons/obj/guns/magic.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
new file mode 100644
index 00000000000..cd1eed09f02
Binary files /dev/null and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/toyguns.dmi b/icons/obj/guns/toy.dmi
similarity index 81%
rename from icons/obj/toyguns.dmi
rename to icons/obj/guns/toy.dmi
index bd2ff273a40..d05231e7718 100644
Binary files a/icons/obj/toyguns.dmi and b/icons/obj/guns/toy.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 23ee204e96a..5a780217109 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index 6e6d268c9bd..b7f40b4cdbb 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 416b1c8b932..01609b50824 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/interface/interface.dm b/interface/interface.dm
index 589a5e0dc86..81fe75b269b 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -40,9 +40,7 @@
 	src << browse('html/changelog.html', "window=changes;size=675x650")
 
 	if(prefs.lastchangelog != changelog_hash) //if it's already opened, no need to tell them they have unread changes
-		prefs.lastchangelog = changelog_hash
-		prefs.save_preferences()
-		winset(src, "rpane.changelog", "background-color=none;font-style=")
+		prefs.SetChangelog(src,changelog_hash)
 
 /client/verb/forum()
 	set name = "forum"
diff --git a/nano/assets/nano.js b/nano/assets/nano.js
index 7e07be10238..b8dc6890872 100644
--- a/nano/assets/nano.js
+++ b/nano/assets/nano.js
@@ -1 +1 @@
-function NanoStateDefaultClass(){this.key="default",this.key=this.key.toLowerCase(),NanoStateManager.addState(this)}function NanoStatePDAClass(){this.key="pda",this.key=this.key.toLowerCase(),this.current_template="",NanoStateManager.addState(this)}function NanoStateClass(){}var NanoUtility=function(){var e={};return{init:function(){var t=$("body");e=t.data("urlParameters")},generateHref:function(t){var n="?";for(var a in e)e.hasOwnProperty(a)&&("?"!==n&&(n+=";"),n+=a+"="+e[a]);for(var a in t)t.hasOwnProperty(a)&&("?"!==n&&(n+=";"),n+=a+"="+t[a]);return n},winset:function(e,t,n){var a,r;return null==n&&(n=NanoStateManager.getData().config.window.ref),a={},a[n+"."+e]=t,r=a,location.href=NanoUtility.href("winset",r)},extend:function(e,t){return Object.keys(t).forEach(function(n){var a;return a=t[n],a&&"[object Object]"===Object.prototype.toString.call(a)?(e[n]=e[n]||{},NanoUtility.extend(e[n],a)):e[n]=a}),e},href:function(e,t){return null==e&&(e=""),null==t&&(t={}),e=new Url("byond://"+e),NanoUtility.extend(e.query,t),e},close:function(){var t;return t={command:"nanoclose "+e.src},this.winset("is-visible","false"),location.href=NanoUtility.href("winset",t)}}}();"undefined"==typeof jQuery&&reportError("ERROR: Javascript library failed to load!"),"undefined"==typeof doT&&reportError("ERROR: Template engine failed to load!");var reportError=function(e){window.location="byond://?nano_err="+encodeURIComponent(e),alert(e)};$(document).ready(function(){NanoUtility.init(),NanoStateManager.init(),NanoTemplate.init(),NanoWindow.init()}),Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var t=this.length,n=Number(arguments[1])||0;for(n=0>n?Math.ceil(n):Math.floor(n),0>n&&(n+=t);t>n;n++)if(n in this&&this[n]===e)return n;return-1}),String.prototype.format||(String.prototype.format=function(e){var t=this;return t.replace(String.prototype.format.regex,function(t){var n,a=parseInt(t.substring(1,t.length-1));return n=a>=0?e[a]:-1===a?"{":-2===a?"}":""})},String.prototype.format.regex=new RegExp("{-?[0-9]+}","g")),Object.size=function(e){var t,n=0;for(var t in e)e.hasOwnProperty(t)&&n++;return n},window.console||(window.console={log:function(e){return!1}}),String.prototype.toTitleCase=function(){var e=/^(a|an|and|as|at|but|by|en|for|if|in|of|on|or|the|to|vs?\.?|via)$/i;return this.replace(/([^\W_]+[^\s-]*) */g,function(t,n,a,r){return a>0&&a+n.length!==r.length&&n.search(e)>-1&&":"!==r.charAt(a-2)&&r.charAt(a-1).search(/[^\s-]/)<0?t.toLowerCase():n.substr(1).search(/[A-Z]|\../)>-1?t:t.charAt(0).toUpperCase()+t.substr(1)})},$.ajaxSetup({cache:!1}),Function.prototype.inheritsFrom=function(e){return this.prototype=new e,this.prototype.constructor=this,this.prototype.parent=e.prototype,this},String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")}),String.prototype.ckey||(String.prototype.ckey=function(){return this.replace(/\W/g,"").toLowerCase()}),NanoStateManager=function(){var e=!1,t=null,n={},a={},r={},o=null,i=function(){t=$("body").data("initialData"),null!=t&&t.hasOwnProperty("config")&&t.hasOwnProperty("data")||reportError("Error: Initial data did not load correctly.");var n="default";t.config.hasOwnProperty("stateKey")&&t.config.stateKey&&(n=t.config.stateKey.toLowerCase()),NanoStateManager.setCurrentState(n),$(document).on("templatesLoaded",function(){l(t),e=!0})},s=function(n){var a;try{a=jQuery.parseJSON(n)}catch(r){return void reportError("recieveUpdateData failed. <br>Error name: "+r.name+"<br>Error Message: "+r.message)}a.hasOwnProperty("data")||(t&&t.hasOwnProperty("data")?a.data=t.data:a.data={}),e?l(a):t=a},l=function(e){if(null!=o){if(e=o.onBeforeUpdate(e),e===!1)return void reportError("data is false, return");t=e,o.onUpdate(t),o.onAfterUpdate(t)}},u=function(e,t){for(var n in e)e.hasOwnProperty(n)&&jQuery.isFunction(e[n])&&(t=e[n].call(this,t));return t};return{init:function(){i()},receiveUpdateData:function(e){s(e)},addBeforeUpdateCallback:function(e,t){n[e]=t},addBeforeUpdateCallbacks:function(e){for(var t in e)e.hasOwnProperty(t)&&NanoStateManager.addBeforeUpdateCallback(t,e[t])},removeBeforeUpdateCallback:function(e){n.hasOwnProperty(e)&&delete n[e]},executeBeforeUpdateCallbacks:function(e){return u(n,e)},addAfterUpdateCallback:function(e,t){a[e]=t},addAfterUpdateCallbacks:function(e){for(var t in e)e.hasOwnProperty(t)&&NanoStateManager.addAfterUpdateCallback(t,e[t])},removeAfterUpdateCallback:function(e){a.hasOwnProperty(e)&&delete a[e]},executeAfterUpdateCallbacks:function(e){return u(a,e)},addState:function(e){return e instanceof NanoStateClass?e.key?void(r[e.key]=e):void reportError("ERROR: Attempted to add a state with an invalid stateKey"):void reportError("ERROR: Attempted to add a state which is not instanceof NanoStateClass")},setCurrentState:function(e){if("undefined"==typeof e||!e)return reportError("ERROR: No state key was passed!"),!1;if(!r.hasOwnProperty(e))return reportError("ERROR: Attempted to set a current state which does not exist: "+e),!1;var t=o;return o=r[e],null!=t&&t.onRemove(o),o.onAdd(t),!0},getCurrentState:function(){return o},getData:function(){return t}}}(),NanoBaseCallbacks=function(){var e=!0,t={},n={status:function(t){var n;return 2==t.config.status?(n="good",$(".linkActive").removeClass("inactive")):1==t.config.status?(n="average",$(".linkActive").addClass("inactive")):(n="bad",$(".linkActive").addClass("inactive")),$(".statusicon").removeClass("good bad average").addClass(n),$(".linkActive").stopTime("linkPending"),$(".linkActive").removeClass("linkPending"),$(".linkActive").off("click").on("click",function(n){n.preventDefault();var a=$(this).data("href");null!=a&&e&&(e=!1,$("body").oneTime(300,"enableClick",function(){e=!0}),2==t.config.status&&$(this).oneTime(300,"linkPending",function(){$(this).addClass("linkPending")}),window.location.href=a)}),t},nanomap:function(e){return $(".mapIcon").off("mouseenter mouseleave").on("mouseenter",function(e){$("#uiMapTooltip").html($(this).children(".tooltip").html()).show().stopTime().oneTime(5e3,"hideTooltip",function(){$(this).fadeOut(500)})}),$(".zoomLink").off("click").on("click",function(e){e.preventDefault();var t=$(this).data("zoomLevel"),n=$("#uiMap"),a=n.width()*t,r=n.height()*t;n.css({zoom:t,left:"50%",top:"50%",marginLeft:"-"+Math.floor(a/2)+"px",marginTop:"-"+Math.floor(r/2)+"px"})}),$("#uiMapImage").attr("src","nanomap_z"+e.config.mapZLevel+".png"),e}};return{addCallbacks:function(){NanoStateManager.addBeforeUpdateCallbacks(t),NanoStateManager.addAfterUpdateCallbacks(n)},removeCallbacks:function(){for(var e in t)t.hasOwnProperty(e)&&NanoStateManager.removeBeforeUpdateCallback(e);for(var e in n)n.hasOwnProperty(e)&&NanoStateManager.removeAfterUpdateCallback(e)}}}(),NanoBaseHelpers=function(){var e={syndicateMode:function(){return $("body").css("background-color","#8f1414"),$("body").css("background-image","url('uiBackground-Syndicate.png')"),$("body").css("background-position","50% 0"),$("body").css("background-repeat","repeat-x"),$("#uiTitleFluff").css("background-image","url('uiTitleFluff-Syndicate.png')"),$("#uiTitleFluff").css("background-position","50% 50%"),$("#uiTitleFluff").css("background-repeat","no-repeat"),""},combine:function(e,t){return e&&t?e.concat(t):e||t},dump:function(e){return JSON.stringify(e)},link:function(e,t,n,a,r,o){var i="",s="noIcon";"undefined"!=typeof t&&t&&(i='<div class="uiLinkPendingIcon"></div><i class="fa fa-fw fa-'+t+'"></i>',s="hasIcon"),"undefined"!=typeof r&&r||(r="link");var l="";"undefined"!=typeof o&&o&&(l='id="'+o+'"');var u=NanoTransition.allocID(l+"_"+e.toString().replace(/[^a-z0-9_]/gi,"_")+"_"+t);return"undefined"!=typeof a&&a?'<div unselectable="on" class="link '+s+" "+u+'" '+l+">"+i+e+'</div><script>$(function() { var newState = {"..class": "'+r+" "+a+'"}; var old = NanoTransition.transitionElement("'+u+'", null, newState, 200); NanoTransition.animateHover("'+u+'", null, old, newState); });</script>':'<div unselectable="on" class="linkActive '+s+" "+u+'" data-href="'+NanoUtility.generateHref(n)+'" '+l+">"+i+e+'</div><script>$(function() { var newState = {"..class": "'+r+'"}; var old = NanoTransition.transitionElement("'+u+'", null, newState, 200); NanoTransition.animateHover("'+u+'", null, old, newState); });</script>'},xor:function(e,t){return e^t},precisionRound:function(e,t){if(0==t)return Math.round(number);var n=Math.pow(10,t);return Math.round(e*n)/n},round:function(e){return Math.round(e)},fixed:function(e){return Math.round(10*e)/10},floor:function(e){return Math.floor(e)},ceil:function(e){return Math.ceil(e)},string:function(){if(0==arguments.length)return"";if(1==arguments.length)return arguments[0];if(arguments.length>1){stringArgs=[];for(var e=1;e<arguments.length;e++)stringArgs.push(arguments[e]);return arguments[0].format(stringArgs)}return""},formatNumber:function(e){var t=e.toString().split(".");return t[0]=t[0].replace(/\B(?=(\d{3})+(?!\d))/g,","),t.join(".")},capitalizeFirstLetter:function(e){return e.charAt(0).toUpperCase()+e.slice(1)},displayBar:function(e,t,n,a,r){n>t?t>e?e=t:e>n&&(e=n):e>t?e=t:n>e&&(e=n),"undefined"!=typeof a&&a||(a=""),"undefined"!=typeof r&&r||(r="");var o=Math.round((e-t)/(n-t)*100),i=NanoTransition.allocID(t+"_"+n);return'<div class="displayBar '+i+" "+a+'"><div class="displayBarFill"></div><div class="displayBarText '+a+'">'+r+'</div></div><script>$(function() { NanoTransition.transitionElement("'+i+'", ".displayBarFill", {width: "'+o+'%", "..class": "'+a+'"}); });</script>'},dangerToClass:function(e){return 0==e?"good":1==e?"average":"bad"},dangerToSpan:function(e){return 0==e?'"<span class="good">Good</span>"':1==e?'"<span class="average">Minor Alert</span>"':'"<span class="bad">Major Alert</span>"'},generateHref:function(e){var t=$("body");_urlParameters=t.data("urlParameters");var n="?";for(var a in _urlParameters)_urlParameters.hasOwnProperty(a)&&("?"!==n&&(n+=";"),n+=a+"="+_urlParameters[a]);for(var a in e)e.hasOwnProperty(a)&&("?"!==n&&(n+=";"),n+=a+"="+e[a]);return n},displayDNABlocks:function(e,t,n,a,r){if(!e)return'<div class="notice">Please place a valid subject into the DNA modifier.</div>';var o=e.split(""),i='<div class="dnaBlock"><div class="link dnaBlockNumber">1</div>',s=1,l=1;for(var u in o)if(o.hasOwnProperty(u)&&"object"!=typeof o[u]){var c;c="UI"==r.toUpperCase()?{selectUIBlock:s,selectUISubblock:l}:{selectSEBlock:s,selectSESubblock:l};var d="linkActive";s==t&&l==n&&(d="selected"),i+='<div class="link '+d+' dnaSubBlock" data-href="'+NanoUtility.generateHref(c)+'" id="dnaBlock'+u+'">'+o[u]+"</div>",u++,u%a==0&&u<o.length?(s++,l=1,i+='</div><div class="dnaBlock"><div class="link dnaBlockNumber">'+s+"</div>"):l++}return i+="</div>"},cMirror:function(e){CodeMirror.fromTextArea(document.getElementById(e),{lineNumbers:!0,indentUnit:4,indentWithTabs:!0,theme:"lesser-dark"})},smoothNumber:function(e){var t=NanoTransition.allocID("n");return'<span class="'+t+'"></span><script>$(function() { var newState = {value: '+e+'}; var old = NanoTransition.updateElement("'+t+'", newState); NanoTransition.animateTextValue("'+t+'", null, -1, old["value"], newState["value"]); });</script>'},smoothRound:function(e,t){var n=NanoTransition.allocID(t);return void 0===t&&(placed=0),'<span class="'+n+'"></span><script>$(function() { var newState = {value: '+e.toFixed(t)+'}; var old = NanoTransition.updateElement("'+n+'", newState); NanoTransition.animateTextValue("'+n+'", null, '+t+', old["value"], newState["value"]); });</script>'}};return{addHelpers:function(){NanoTemplate.addHelpers(e)},removeHelpers:function(){for(var t in e)e.hasOwnProperty(t)&&NanoTemplate.removeHelper(t)}}}(),NanoStateDefaultClass.inheritsFrom(NanoStateClass);var NanoStateDefault=new NanoStateDefaultClass;NanoStatePDAClass.inheritsFrom(NanoStateClass);var NanoStatePDA=new NanoStatePDAClass;NanoStatePDAClass.prototype.onUpdate=function(e){NanoStateClass.prototype.onUpdate.call(this,e);var t=this;try{if(null!=e.data.app){var n=e.data.app.template;null!=n&&n!=t.current_template?$.when($.ajax({url:n+".tmpl",cache:!1,dataType:"text"})).done(function(a){a+='<div class="clearBoth"></div>';try{NanoTemplate.addTemplate("app",a),NanoTemplate.resetTemplate("app"),$("#uiApp").html(NanoTemplate.parse("app",e)),t.current_template=n,t.onAfterUpdate(e)}catch(r){return void reportError("ERROR: An error occurred while loading the PDA App UI: "+r.message)}}).fail(function(){reportError("ERROR: Loading template app("+n+") failed!")}):NanoTemplate.templateExists("app")&&$("#uiApp").html(NanoTemplate.parse("app",e))}}catch(a){return void reportError("ERROR: An error occurred while rendering the PDA App UI: "+a.message)}},NanoStateClass.prototype.key=null,NanoStateClass.prototype.layoutRendered=!1,NanoStateClass.prototype.contentRendered=!1,NanoStateClass.prototype.mapInitialised=!1,NanoStateClass.prototype.isCurrent=function(){return NanoStateManager.getCurrentState()==this},NanoStateClass.prototype.onAdd=function(e){NanoBaseCallbacks.addCallbacks(),NanoBaseHelpers.addHelpers()},NanoStateClass.prototype.onRemove=function(e){NanoBaseCallbacks.removeCallbacks(),NanoBaseHelpers.removeHelpers()},NanoStateClass.prototype.onBeforeUpdate=function(e){return e=NanoStateManager.executeBeforeUpdateCallbacks(e)},NanoStateClass.prototype.onUpdate=function(e){try{(!this.layoutRendered||e.config.hasOwnProperty("autoUpdateLayout")&&e.config.autoUpdateLayout)&&($("#uiLayout").html(NanoTemplate.parse("layout",e)),this.layoutRendered=!0),(!this.contentRendered||e.config.hasOwnProperty("autoUpdateContent")&&e.config.autoUpdateContent)&&($("#uiContent").html(NanoTemplate.parse("main",e)),this.contentRendered=!0),NanoTemplate.templateExists("mapContent")&&(this.mapInitialised||($("#uiMap").draggable(),$("#uiMapTooltip").off("click").on("click",function(e){e.preventDefault(),$(this).fadeOut(400)}),this.mapInitialised=!0),$("#uiMapContent").html(NanoTemplate.parse("mapContent",e)),e.config.hasOwnProperty("showMap")&&e.config.showMap?($("#uiContent").addClass("hidden"),$("#uiMapWrapper").removeClass("hidden")):($("#uiMapWrapper").addClass("hidden"),$("#uiContent").removeClass("hidden"))),NanoTemplate.templateExists("mapHeader")&&$("#uiMapHeader").html(NanoTemplate.parse("mapHeader",e)),NanoTemplate.templateExists("mapFooter")&&$("#uiMapFooter").html(NanoTemplate.parse("mapFooter",e))}catch(t){return void reportError("ERROR: An error occurred while rendering the UI: "+t.message)}},NanoStateClass.prototype.onAfterUpdate=function(e){NanoStateManager.executeAfterUpdateCallbacks(e)},NanoStateClass.prototype.alertText=function(e){alert(e)};var NanoTemplate=function(){var e={},t={},n={},a={},r=function(){e=$("body").data("templateData"),null==e&&reportError("Error: Template data did not load correctly."),o()},o=function(){var t=Object.size(e);if(!t)return void $(document).trigger("templatesLoaded");for(var n in e)if(e.hasOwnProperty(n))return void $.when($.ajax({url:e[n],cache:!1,dataType:"text"})).done(function(t){t+='<div class="clearBoth"></div>';try{NanoTemplate.addTemplate(n,t)}catch(a){return void reportError("ERROR: An error occurred while loading the UI: "+a.message)}delete e[n],o()}).fail(function(){reportError("ERROR: Loading template "+n+"("+e[n]+") failed!")})},i=function(){for(var e in t)try{n[e]=doT.template(t[e],null,t)}catch(a){reportError(a.message)}};return{init:function(){r()},addTemplate:function(e,n){t[e]=n},templateExists:function(e){return t.hasOwnProperty(e)},resetTemplate:function(e){n[e]=null},parse:function(e,r){if(!n.hasOwnProperty(e)||!n[e]){if(!t.hasOwnProperty(e))return reportError('ERROR: Template "'+e+'" does not exist in _compiledTemplates!'),"<h2>Template error (does not exist)</h2>";i()}return"function"!=typeof n[e]?(reportError(n[e]),reportError('ERROR: Template "'+e+'" failed to compile!'),"<h2>Template error (failed to compile)</h2>"):n[e].call(this,r.data,r.config,a)},addHelper:function(e,t){return jQuery.isFunction(t)?void(a[e]=t):void reportError("NanoTemplate.addHelper failed to add "+e+" as it is not a function.")},addHelpers:function(e){for(var t in e)e.hasOwnProperty(t)&&NanoTemplate.addHelper(t,e[t])},removeHelper:function(e){helpers.hasOwnProperty(e)&&delete a[e]}}}();NanoTransition=function(){var e={},t={},n=0;NanoStateManager.addBeforeUpdateCallback("TransitionReset",function(e){return n=0,e});var a=function(e){return"_Hide_Map_close"==e?"transition__map":(void 0===e&&(e=""),"transition__"+n++ +"_"+e.toString())},r=function(n,a,r){var o,i=e[n];void 0===r&&(r=!1);var s=document.getElementsByClassName(n);if(0==s.length)return a;if(s=s[0],i&&i.tagName==s.tagName&&i.tabIndex==s.tabIndex&&i.parent==s.parentNode.tagName&&i.children==s.children.length){if(o=t[n],r){var l={};for(k in o)l[k]=o[k];for(k in a)l[k]=a[k];a=l}}else o=a,e[n]={tagName:s.tagName,tabIndex:s.tabIndex,parent:s.parentNode.tagName,children:s.children.length};return t[n]=a,o},o=function(e,t){var n=$("."+e);return t?$(n).children(t):$(n)},i=function(e,t,n,a,r){var i=o(e,t);void 0===r&&(r=1900),i.css(n).animate(a,{duration:r,queue:!1});var s=n["..class"],l=a["..class"];if(s&&l&&(i.addClass(s),s!=l)){var s=s.split(" "),l=l.split(" "),u=s.filter(function(e){return-1==l.indexOf(e)}),c=l.filter(function(e){return-1==s.indexOf(e)});s=u.join(" "),l=c.join(" "),i.switchClass(s,l,{duration:r,queue:!1})}},s=function(e,t,n,a,r,i){var s=o(e,t);void 0===i&&(i=1900),-1==n?s.text(a.toString()):s.text(a.toFixed(n)),a!=r&&s.animate({i:1},{duration:i,queue:!1,step:function(e,t){-1==n?t.elem.textContent=(a*(1-e)+r*e).toString():t.elem.textContent=(a*(1-e)+r*e).toFixed(n)}})},l=function(e,t,n,a,i){var s=o(e,t);void 0===i&&(i=200),n["..hover"]&&s.addClass("hover"),s.hover(function(){s.stop(1,1).addClass("hover",{duration:i,queue:!1}),r(e,{"..hover":!0},!0)},function(){s.stop(1,1).removeClass("hover",{duration:i,queue:!1}),r(e,{"..hover":!1},!0)})},u=function(e,t,n,a){var o=r(e,n);return i(e,t,o,n,a),o};return{allocID:a,updateElement:r,animateElement:i,animateTextValue:s,animateHover:l,transitionElement:u}}();var NanoWindow=function(){var e,t,n,a,r,o,i=function(e,t){NanoUtility.winset("pos",e+","+t)},s=function(e,t){NanoUtility.winset("size",e+","+t)},l=function(){NanoStateManager.getData().config.user.fancy&&(u(),c(),d(),f())},u=function(){NanoUtility.winset("titlebar",0),NanoUtility.winset("can-resize",0),$(".fancy").show(),$("#uiTitleFluff").css("right","65px")},c=function(){var e=function(){return NanoUtility.close()},t=function(){return NanoUtility.winset("is-minimized","true")};$(".close").on("click",function(t){e()}),$(".minimize").on("click",function(e){t()})},d=function(){$("#uiTitleWrapper").on("mousemove",function(e){p()}),$("#uiTitleWrapper").on("mousedown",function(t){e=!0}),$("#uiTitleWrapper").on("mouseup",function(a){e=!1,t=null,n=null})},p=function(a){var r,o;null==a&&(a=window.event),e&&(null==t&&(t=a.screenX),null==n&&(n=a.screenY),r=a.screenX-t+window.screenLeft,o=a.screenY-n+window.screenTop,i(r,o),t=a.screenX,n=a.screenY)},f=function(){$("#resize").on("mousemove",function(e){v()}),$("#resize").on("mousedown",function(e){a=!0}),$("#resize").on("mouseup",function(e){a=!1})},v=function(){var e,t;null==event&&(event=window.event),a&&(null==r&&(r=event.screenX),null==o&&(o=event.screenY),e=Math.max(150,event.screenX-r+window.innerWidth),t=Math.max(150,event.screenY-o+window.innerHeight),s(e,t),r=event.screenX,o=event.screenY)};return{init:function(){$(document).on("templatesLoaded",function(){l()})}}}();
\ No newline at end of file
+function NanoStateDefaultClass(){this.key="default",this.key=this.key.toLowerCase(),NanoStateManager.addState(this)}function NanoStatePDAClass(){this.key="pda",this.key=this.key.toLowerCase(),this.current_template="",NanoStateManager.addState(this)}function NanoStateClass(){}var NanoUtility=function(){var e={};return{init:function(){var t=$("body");e=t.data("urlParameters")},generateHref:function(t){var n="?";for(var a in e)e.hasOwnProperty(a)&&("?"!==n&&(n+=";"),n+=a+"="+e[a]);for(var a in t)t.hasOwnProperty(a)&&("?"!==n&&(n+=";"),n+=a+"="+t[a]);return n},winset:function(e,t,n){var a,r;return null==n&&(n=NanoStateManager.getData().config.window.ref),a={},a[n+"."+e]=t,r=a,location.href=NanoUtility.href("winset",r)},extend:function(e,t){return Object.keys(t).forEach(function(n){var a;return a=t[n],a&&"[object Object]"===Object.prototype.toString.call(a)?(e[n]=e[n]||{},NanoUtility.extend(e[n],a)):e[n]=a}),e},href:function(e,t){return null==e&&(e=""),null==t&&(t={}),e=new Url("byond://"+e),NanoUtility.extend(e.query,t),e},close:function(){var t;return t={command:"nanoclose "+e.src},this.winset("is-visible","false"),location.href=NanoUtility.href("winset",t)}}}();"undefined"==typeof jQuery&&reportError("ERROR: Javascript library failed to load!"),"undefined"==typeof doT&&reportError("ERROR: Template engine failed to load!");var reportError=function(e){window.location="byond://?nano_err="+encodeURIComponent(e),alert(e)};$(document).ready(function(){NanoUtility.init(),NanoStateManager.init(),NanoTemplate.init(),NanoWindow.init()}),Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var t=this.length,n=Number(arguments[1])||0;for(n=0>n?Math.ceil(n):Math.floor(n),0>n&&(n+=t);t>n;n++)if(n in this&&this[n]===e)return n;return-1}),String.prototype.format||(String.prototype.format=function(e){var t=this;return t.replace(String.prototype.format.regex,function(t){var n,a=parseInt(t.substring(1,t.length-1));return n=a>=0?e[a]:-1===a?"{":-2===a?"}":""})},String.prototype.format.regex=new RegExp("{-?[0-9]+}","g")),Object.size=function(e){var t,n=0;for(var t in e)e.hasOwnProperty(t)&&n++;return n},window.console||(window.console={log:function(e){return!1}}),String.prototype.toTitleCase=function(){var e=/^(a|an|and|as|at|but|by|en|for|if|in|of|on|or|the|to|vs?\.?|via)$/i;return this.replace(/([^\W_]+[^\s-]*) */g,function(t,n,a,r){return a>0&&a+n.length!==r.length&&n.search(e)>-1&&":"!==r.charAt(a-2)&&r.charAt(a-1).search(/[^\s-]/)<0?t.toLowerCase():n.substr(1).search(/[A-Z]|\../)>-1?t:t.charAt(0).toUpperCase()+t.substr(1)})},$.ajaxSetup({cache:!1}),Function.prototype.inheritsFrom=function(e){return this.prototype=new e,this.prototype.constructor=this,this.prototype.parent=e.prototype,this},String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")}),String.prototype.ckey||(String.prototype.ckey=function(){return this.replace(/\W/g,"").toLowerCase()}),NanoStateManager=function(){var e=!1,t=null,n={},a={},r={},o=null,i=function(){t=$("body").data("initialData"),null!=t&&t.hasOwnProperty("config")&&t.hasOwnProperty("data")||reportError("Error: Initial data did not load correctly.");var n="default";t.config.hasOwnProperty("stateKey")&&t.config.stateKey&&(n=t.config.stateKey.toLowerCase()),NanoStateManager.setCurrentState(n),$(document).on("templatesLoaded",function(){l(t),e=!0})},s=function(n){var a;try{a=jQuery.parseJSON(n)}catch(r){return void reportError("recieveUpdateData failed. <br>Error name: "+r.name+"<br>Error Message: "+r.message)}a.hasOwnProperty("data")||(t&&t.hasOwnProperty("data")?a.data=t.data:a.data={}),e?l(a):t=a},l=function(e){if(null!=o){if(e=o.onBeforeUpdate(e),e===!1)return void reportError("data is false, return");t=e,o.onUpdate(t),o.onAfterUpdate(t)}},u=function(e,t){for(var n in e)e.hasOwnProperty(n)&&jQuery.isFunction(e[n])&&(t=e[n].call(this,t));return t};return{init:function(){i()},receiveUpdateData:function(e){s(e)},addBeforeUpdateCallback:function(e,t){n[e]=t},addBeforeUpdateCallbacks:function(e){for(var t in e)e.hasOwnProperty(t)&&NanoStateManager.addBeforeUpdateCallback(t,e[t])},removeBeforeUpdateCallback:function(e){n.hasOwnProperty(e)&&delete n[e]},executeBeforeUpdateCallbacks:function(e){return u(n,e)},addAfterUpdateCallback:function(e,t){a[e]=t},addAfterUpdateCallbacks:function(e){for(var t in e)e.hasOwnProperty(t)&&NanoStateManager.addAfterUpdateCallback(t,e[t])},removeAfterUpdateCallback:function(e){a.hasOwnProperty(e)&&delete a[e]},executeAfterUpdateCallbacks:function(e){return u(a,e)},addState:function(e){return e instanceof NanoStateClass?e.key?void(r[e.key]=e):void reportError("ERROR: Attempted to add a state with an invalid stateKey"):void reportError("ERROR: Attempted to add a state which is not instanceof NanoStateClass")},setCurrentState:function(e){if("undefined"==typeof e||!e)return reportError("ERROR: No state key was passed!"),!1;if(!r.hasOwnProperty(e))return reportError("ERROR: Attempted to set a current state which does not exist: "+e),!1;var t=o;return o=r[e],null!=t&&t.onRemove(o),o.onAdd(t),!0},getCurrentState:function(){return o},getData:function(){return t}}}(),NanoBaseCallbacks=function(){var e=!0,t={},n={status:function(t){var n;return 2==t.config.status?(n="good",$(".linkActive").removeClass("inactive")):1==t.config.status?(n="average",$(".linkActive").addClass("inactive")):(n="bad",$(".linkActive").addClass("inactive")),$(".statusicon").removeClass("good bad average").addClass(n),$(".linkActive").stopTime("linkPending"),$(".linkActive").removeClass("linkPending"),$(".linkActive").off("click").on("click",function(n){n.preventDefault();var a=$(this).data("href");null!=a&&e&&(e=!1,$("body").oneTime(300,"enableClick",function(){e=!0}),2==t.config.status&&$(this).oneTime(300,"linkPending",function(){$(this).addClass("linkPending")}),window.location.href=a)}),t},nanomap:function(e){return $(".mapIcon").off("mouseenter mouseleave").on("mouseenter",function(e){$("#uiMapTooltip").html($(this).children(".tooltip").html()).show().stopTime().oneTime(5e3,"hideTooltip",function(){$(this).fadeOut(500)})}),$(".zoomLink").off("click").on("click",function(e){e.preventDefault();var t=$(this).data("zoomLevel"),n=$("#uiMap"),a=n.width()*t,r=n.height()*t;n.css({zoom:t,left:"50%",top:"50%",marginLeft:"-"+Math.floor(a/2)+"px",marginTop:"-"+Math.floor(r/2)+"px"})}),$("#uiMapImage").attr("src","nanomap_z"+e.config.mapZLevel+".png"),e}};return{addCallbacks:function(){NanoStateManager.addBeforeUpdateCallbacks(t),NanoStateManager.addAfterUpdateCallbacks(n)},removeCallbacks:function(){for(var e in t)t.hasOwnProperty(e)&&NanoStateManager.removeBeforeUpdateCallback(e);for(var e in n)n.hasOwnProperty(e)&&NanoStateManager.removeAfterUpdateCallback(e)}}}(),NanoBaseHelpers=function(){var e={syndicateMode:function(){return $("body").css("background-color","#8f1414"),$("body").css("background-image","url('uiBackground-Syndicate.png')"),$("body").css("background-position","50% 0"),$("body").css("background-repeat","repeat-x"),$("#uiTitleFluff").css("background-image","url('uiTitleFluff-Syndicate.png')"),$("#uiTitleFluff").css("background-position","50% 50%"),$("#uiTitleFluff").css("background-repeat","no-repeat"),""},combine:function(e,t){return e&&t?e.concat(t):e||t},dump:function(e){return JSON.stringify(e)},link:function(e,t,n,a,r,o){var i="",s="noIcon";"undefined"!=typeof t&&t&&(i='<div class="uiLinkPendingIcon"></div><i class="fa fa-fw fa-'+t+'"></i>',s="hasIcon"),"undefined"!=typeof r&&r||(r="link");var l="";"undefined"!=typeof o&&o&&(l='id="'+o+'"');var u=NanoTransition.allocID(l+"_"+e.toString().replace(/[^a-z0-9_]/gi,"_")+"_"+t);return"undefined"!=typeof a&&a?'<div unselectable="on" class="link '+s+" "+u+'" '+l+">"+i+e+'</div><script>$(function() { var newState = {"..class": "'+r+" "+a+'"}; var old = NanoTransition.transitionElement("'+u+'", null, newState, 200); NanoTransition.animateHover("'+u+'", null, old, newState); });</script>':'<div unselectable="on" class="linkActive '+s+" "+u+'" data-href="'+NanoUtility.generateHref(n)+'" '+l+">"+i+e+'</div><script>$(function() { var newState = {"..class": "'+r+'"}; var old = NanoTransition.transitionElement("'+u+'", null, newState, 200); NanoTransition.animateHover("'+u+'", null, old, newState); });</script>'},xor:function(e,t){return e^t},precisionRound:function(e,t){if(0==t)return Math.round(number);var n=Math.pow(10,t);return Math.round(e*n)/n},round:function(e){return Math.round(e)},fixed:function(e){return Math.round(10*e)/10},floor:function(e){return Math.floor(e)},ceil:function(e){return Math.ceil(e)},string:function(){if(0==arguments.length)return"";if(1==arguments.length)return arguments[0];if(arguments.length>1){stringArgs=[];for(var e=1;e<arguments.length;e++)stringArgs.push(arguments[e]);return arguments[0].format(stringArgs)}return""},formatNumber:function(e){var t=e.toString().split(".");return t[0]=t[0].replace(/\B(?=(\d{3})+(?!\d))/g,","),t.join(".")},capitalizeFirstLetter:function(e){return e.charAt(0).toUpperCase()+e.slice(1)},displayBar:function(e,t,n,a,r){n>t?t>e?e=t:e>n&&(e=n):e>t?e=t:n>e&&(e=n),"undefined"!=typeof a&&a||(a=""),"undefined"!=typeof r&&r||(r="");var o=Math.round((e-t)/(n-t)*100),i=NanoTransition.allocID(t+"_"+n);return'<div class="displayBar '+i+" "+a+'"><div class="displayBarFill"></div><div class="displayBarText '+a+'">'+r+'</div></div><script>$(function() { NanoTransition.transitionElement("'+i+'", ".displayBarFill", {width: "'+o+'%", "..class": "'+a+'"}); });</script>'},dangerToClass:function(e){return 0==e?"good":1==e?"average":"bad"},dangerToSpan:function(e){return 0==e?'"<span class="good">Good</span>"':1==e?'"<span class="average">Minor Alert</span>"':'"<span class="bad">Major Alert</span>"'},generateHref:function(e){var t=$("body");_urlParameters=t.data("urlParameters");var n="?";for(var a in _urlParameters)_urlParameters.hasOwnProperty(a)&&("?"!==n&&(n+=";"),n+=a+"="+_urlParameters[a]);for(var a in e)e.hasOwnProperty(a)&&("?"!==n&&(n+=";"),n+=a+"="+e[a]);return n},displayDNABlocks:function(e,t,n,a,r){if(!e)return'<div class="notice">Please place a valid subject into the DNA modifier.</div>';var o=e.split(""),i='<div class="dnaBlock"><div class="link dnaBlockNumber">1</div>',s=1,l=1;for(var u in o)if(o.hasOwnProperty(u)&&"object"!=typeof o[u]){var c;c="UI"==r.toUpperCase()?{selectUIBlock:s,selectUISubblock:l}:{selectSEBlock:s,selectSESubblock:l};var d="linkActive";s==t&&l==n&&(d="selected"),i+='<div class="link '+d+' dnaSubBlock" data-href="'+NanoUtility.generateHref(c)+'" id="dnaBlock'+u+'">'+o[u]+"</div>",u++,u%a==0&&u<o.length?(s++,l=1,i+='</div><div class="dnaBlock"><div class="link dnaBlockNumber">'+s+"</div>"):l++}return i+="</div>"},cMirror:function(e){CodeMirror.fromTextArea(document.getElementById(e),{lineNumbers:!0,indentUnit:4,indentWithTabs:!0,theme:"lesser-dark"})},smoothNumber:function(e){var t=NanoTransition.allocID("n");return'<span class="'+t+'"></span><script>$(function() { var newState = {value: '+e+'}; var old = NanoTransition.updateElement("'+t+'", newState); NanoTransition.animateTextValue("'+t+'", null, -1, old["value"], newState["value"]); });</script>'},smoothRound:function(e,t){var n=NanoTransition.allocID(t);return void 0===t&&(placed=0),'<span class="'+n+'"></span><script>$(function() { var newState = {value: '+e.toFixed(t)+'}; var old = NanoTransition.updateElement("'+n+'", newState); NanoTransition.animateTextValue("'+n+'", null, '+t+', old["value"], newState["value"]); });</script>'}};return{addHelpers:function(){NanoTemplate.addHelpers(e)},removeHelpers:function(){for(var t in e)e.hasOwnProperty(t)&&NanoTemplate.removeHelper(t)}}}(),NanoStateDefaultClass.inheritsFrom(NanoStateClass);var NanoStateDefault=new NanoStateDefaultClass;NanoStatePDAClass.inheritsFrom(NanoStateClass);var NanoStatePDA=new NanoStatePDAClass;NanoStatePDAClass.prototype.onUpdate=function(e){NanoStateClass.prototype.onUpdate.call(this,e);var t=this;try{if(null!=e.data.app){var n=e.data.app.template;null!=n&&n!=t.current_template?$.when($.ajax({url:n+".tmpl",cache:!1,dataType:"text"})).done(function(a){a+='<div class="clearBoth"></div>';try{NanoTemplate.addTemplate("app",a),NanoTemplate.resetTemplate("app"),$("#uiApp").html(NanoTemplate.parse("app",e)),t.current_template=n,t.onAfterUpdate(e)}catch(r){return void reportError("ERROR: An error occurred while loading the PDA App UI: "+r.message)}}).fail(function(){reportError("ERROR: Loading template app("+n+") failed!")}):NanoTemplate.templateExists("app")&&$("#uiApp").html(NanoTemplate.parse("app",e))}}catch(a){return void reportError("ERROR: An error occurred while rendering the PDA App UI: "+a.message)}},NanoStateClass.prototype.key=null,NanoStateClass.prototype.layoutRendered=!1,NanoStateClass.prototype.contentRendered=!1,NanoStateClass.prototype.mapInitialised=!1,NanoStateClass.prototype.isCurrent=function(){return NanoStateManager.getCurrentState()==this},NanoStateClass.prototype.onAdd=function(e){NanoBaseCallbacks.addCallbacks(),NanoBaseHelpers.addHelpers()},NanoStateClass.prototype.onRemove=function(e){NanoBaseCallbacks.removeCallbacks(),NanoBaseHelpers.removeHelpers()},NanoStateClass.prototype.onBeforeUpdate=function(e){return e=NanoStateManager.executeBeforeUpdateCallbacks(e)},NanoStateClass.prototype.onUpdate=function(e){try{(!this.layoutRendered||e.config.hasOwnProperty("autoUpdateLayout")&&e.config.autoUpdateLayout)&&($("#uiLayout").html(NanoTemplate.parse("layout",e)),this.layoutRendered=!0),(!this.contentRendered||e.config.hasOwnProperty("autoUpdateContent")&&e.config.autoUpdateContent)&&($("#uiContent").html(NanoTemplate.parse("main",e)),this.contentRendered=!0),NanoTemplate.templateExists("mapContent")&&(this.mapInitialised||($("#uiMap").draggable(),$("#uiMapTooltip").off("click").on("click",function(e){e.preventDefault(),$(this).fadeOut(400)}),this.mapInitialised=!0),$("#uiMapContent").html(NanoTemplate.parse("mapContent",e)),e.config.hasOwnProperty("showMap")&&e.config.showMap?($("#uiContent").addClass("hidden"),$("#uiMapWrapper").removeClass("hidden")):($("#uiMapWrapper").addClass("hidden"),$("#uiContent").removeClass("hidden"))),NanoTemplate.templateExists("mapHeader")&&$("#uiMapHeader").html(NanoTemplate.parse("mapHeader",e)),NanoTemplate.templateExists("mapFooter")&&$("#uiMapFooter").html(NanoTemplate.parse("mapFooter",e))}catch(t){return void reportError("ERROR: An error occurred while rendering the UI: "+t.message)}},NanoStateClass.prototype.onAfterUpdate=function(e){NanoStateManager.executeAfterUpdateCallbacks(e)},NanoStateClass.prototype.alertText=function(e){alert(e)};var NanoTemplate=function(){var e={},t={},n={},a={},r=function(){e=$("body").data("templateData"),null==e&&reportError("Error: Template data did not load correctly."),o()},o=function(){var t=Object.size(e);if(!t)return void $(document).trigger("templatesLoaded");for(var n in e)if(e.hasOwnProperty(n))return void $.when($.ajax({url:e[n],cache:!1,dataType:"text"})).done(function(t){t+='<div class="clearBoth"></div>';try{NanoTemplate.addTemplate(n,t)}catch(a){return void reportError("ERROR: An error occurred while loading the UI: "+a.message)}delete e[n],o()}).fail(function(){reportError("ERROR: Loading template "+n+"("+e[n]+") failed!")})},i=function(){for(var e in t)try{n[e]=doT.template(t[e],null,t)}catch(a){reportError(a.message)}};return{init:function(){r()},addTemplate:function(e,n){t[e]=n},templateExists:function(e){return t.hasOwnProperty(e)},resetTemplate:function(e){n[e]=null},parse:function(e,r){if(!n.hasOwnProperty(e)||!n[e]){if(!t.hasOwnProperty(e))return reportError('ERROR: Template "'+e+'" does not exist in _compiledTemplates!'),"<h2>Template error (does not exist)</h2>";i()}return"function"!=typeof n[e]?(reportError(n[e]),reportError('ERROR: Template "'+e+'" failed to compile!'),"<h2>Template error (failed to compile)</h2>"):n[e].call(this,r.data,r.config,a)},addHelper:function(e,t){return jQuery.isFunction(t)?void(a[e]=t):void reportError("NanoTemplate.addHelper failed to add "+e+" as it is not a function.")},addHelpers:function(e){for(var t in e)e.hasOwnProperty(t)&&NanoTemplate.addHelper(t,e[t])},removeHelper:function(e){helpers.hasOwnProperty(e)&&delete a[e]}}}();NanoTransition=function(){var e={},t={},n=0;NanoStateManager.addBeforeUpdateCallback("TransitionReset",function(e){return n=0,e});var a=function(e){return"_Hide_Map_close"==e?"transition__map":(void 0===e&&(e=""),"transition__"+n++ +"_"+e.toString())},r=function(n,a,r){var o,i=e[n];void 0===r&&(r=!1);var s=$("."+n);if(0==s.length)return a;if(s=s[0],i&&i.tagName==s.tagName&&i.tabIndex==s.tabIndex&&i.parent==s.parentNode.tagName&&i.children==s.children.length){if(o=t[n],r){var l={};for(k in o)l[k]=o[k];for(k in a)l[k]=a[k];a=l}}else o=a,e[n]={tagName:s.tagName,tabIndex:s.tabIndex,parent:s.parentNode.tagName,children:s.children.length};return t[n]=a,o},o=function(e,t){var n=$("."+e);return t?$(n).children(t):$(n)},i=function(e,t,n,a,r){var i=o(e,t);void 0===r&&(r=1900),i.css(n).animate(a,{duration:r,queue:!1});var s=n["..class"],l=a["..class"];if(s&&l&&(i.addClass(s),s!=l)){var s=s.split(" "),l=l.split(" "),u=s.filter(function(e){return-1==l.indexOf(e)}),c=l.filter(function(e){return-1==s.indexOf(e)});s=u.join(" "),l=c.join(" "),i.switchClass(s,l,{duration:r,queue:!1})}},s=function(e,t,n,a,r,i){var s=o(e,t);void 0===i&&(i=1900),-1==n?s.text(a.toString()):s.text(a.toFixed(n)),a!=r&&s.animate({i:1},{duration:i,queue:!1,step:function(e,t){-1==n?t.elem.textContent=(a*(1-e)+r*e).toString():t.elem.textContent=(a*(1-e)+r*e).toFixed(n)}})},l=function(e,t,n,a,i){var s=o(e,t);void 0===i&&(i=200),n["..hover"]&&s.addClass("hover"),s.hover(function(){s.stop(1,1).addClass("hover",{duration:i,queue:!1}),r(e,{"..hover":!0},!0)},function(){s.stop(1,1).removeClass("hover",{duration:i,queue:!1}),r(e,{"..hover":!1},!0)})},u=function(e,t,n,a){var o=r(e,n);return i(e,t,o,n,a),o};return{allocID:a,updateElement:r,animateElement:i,animateTextValue:s,animateHover:l,transitionElement:u}}();var NanoWindow=function(){var e,t,n,a,r,o,i=function(e,t){NanoUtility.winset("pos",e+","+t)},s=function(e,t){NanoUtility.winset("size",e+","+t)},l=function(){NanoStateManager.getData().config.user.fancy&&(u(),c(),d(),f())},u=function(){NanoUtility.winset("titlebar",0),NanoUtility.winset("can-resize",0),$(".fancy").show(),$("#uiTitleFluff").css("right","65px")},c=function(){var e=function(){return NanoUtility.close()},t=function(){return NanoUtility.winset("is-minimized","true")};$(".close").on("click",function(t){e()}),$(".minimize").on("click",function(e){t()})},d=function(){$("#uiTitleWrapper").on("mousemove",function(e){p()}),$("#uiTitleWrapper").on("mousedown",function(t){e=!0}),$("#uiTitleWrapper").on("mouseup",function(a){e=!1,t=null,n=null})},p=function(a){var r,o;null==a&&(a=window.event),e&&(null==t&&(t=a.screenX),null==n&&(n=a.screenY),r=a.screenX-t+window.screenLeft,o=a.screenY-n+window.screenTop,i(r,o),t=a.screenX,n=a.screenY)},f=function(){$("#resize").on("mousemove",function(e){v()}),$("#resize").on("mousedown",function(e){a=!0}),$("#resize").on("mouseup",function(e){a=!1})},v=function(){var e,t;null==event&&(event=window.event),a&&(null==r&&(r=event.screenX),null==o&&(o=event.screenY),e=Math.max(150,event.screenX-r+window.innerWidth),t=Math.max(150,event.screenY-o+window.innerHeight),s(e,t),r=event.screenX,o=event.screenY)};return{init:function(){$(document).on("templatesLoaded",function(){l()})}}}();
\ No newline at end of file
diff --git a/nano/scripts/nano/nano_transition.js b/nano/scripts/nano/nano_transition.js
index d40d9575bf3..ab124cc75f7 100644
--- a/nano/scripts/nano/nano_transition.js
+++ b/nano/scripts/nano/nano_transition.js
@@ -26,7 +26,7 @@ NanoTransition = function() {
 		if(merge === undefined)
 			merge = false;
 
-		var element = document.getElementsByClassName(id);
+		var element = $("." + id);
 		if(element.length == 0)
 			return newState;
 
diff --git a/nano/templates/chem_dispenser.tmpl b/nano/templates/chem_dispenser.tmpl
index dc2dd687d9f..cec3028652e 100644
--- a/nano/templates/chem_dispenser.tmpl
+++ b/nano/templates/chem_dispenser.tmpl
@@ -61,7 +61,7 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm
 				{{if data.beakerCurrentVolume}}
 					<span class="floatRight" style="width: 115px;"><b>Dispose:</b></span>
 				{{/if}}
-				<b>Volume:&nbsp;{{:helper.smoothRound(data.beakerCurrentVolume)}}&nbsp;/&nbsp;{{:data.beakerMaxVolume}}</b><br>
+				<b>Volume:&nbsp;{{:data.beakerCurrentVolume}}&nbsp;/&nbsp;{{:data.beakerMaxVolume}}</b><br>
 				{{for data.beakerContents}}
 					<div style="min-height: 22px;">
 						<div class="floatLeft">
diff --git a/paradise.dme b/paradise.dme
index bf55518d633..fc1095b97dd 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1748,40 +1748,43 @@
 #include "code\modules\procedural_mapping\mapGenerators\nature.dm"
 #include "code\modules\procedural_mapping\mapGenerators\syndicate.dm"
 #include "code\modules\projectiles\ammunition.dm"
+#include "code\modules\projectiles\firing.dm"
 #include "code\modules\projectiles\gun.dm"
-#include "code\modules\projectiles\medbeam.dm"
 #include "code\modules\projectiles\projectile.dm"
 #include "code\modules\projectiles\ammunition\ammo_casings.dm"
 #include "code\modules\projectiles\ammunition\boxes.dm"
+#include "code\modules\projectiles\ammunition\energy.dm"
 #include "code\modules\projectiles\ammunition\magazines.dm"
+#include "code\modules\projectiles\ammunition\special.dm"
 #include "code\modules\projectiles\guns\alien.dm"
+#include "code\modules\projectiles\guns\dartgun.dm"
 #include "code\modules\projectiles\guns\energy.dm"
+#include "code\modules\projectiles\guns\grenade_launcher.dm"
 #include "code\modules\projectiles\guns\magic.dm"
+#include "code\modules\projectiles\guns\medbeam.dm"
 #include "code\modules\projectiles\guns\mounted.dm"
 #include "code\modules\projectiles\guns\projectile.dm"
+#include "code\modules\projectiles\guns\rocket.dm"
 #include "code\modules\projectiles\guns\syringe_gun.dm"
-#include "code\modules\projectiles\guns\energy\advtaser.dm"
-#include "code\modules\projectiles\guns\energy\blueshield.dm"
-#include "code\modules\projectiles\guns\energy\hos.dm"
+#include "code\modules\projectiles\guns\throw.dm"
 #include "code\modules\projectiles\guns\energy\laser.dm"
 #include "code\modules\projectiles\guns\energy\nuclear.dm"
 #include "code\modules\projectiles\guns\energy\pulse.dm"
 #include "code\modules\projectiles\guns\energy\special.dm"
 #include "code\modules\projectiles\guns\energy\stun.dm"
 #include "code\modules\projectiles\guns\energy\telegun.dm"
-#include "code\modules\projectiles\guns\energy\temperature.dm"
 #include "code\modules\projectiles\guns\magic\staff.dm"
 #include "code\modules\projectiles\guns\magic\wand.dm"
 #include "code\modules\projectiles\guns\projectile\automatic.dm"
-#include "code\modules\projectiles\guns\projectile\crossbow.dm"
-#include "code\modules\projectiles\guns\projectile\grenade launcher.dm"
 #include "code\modules\projectiles\guns\projectile\launchers.dm"
 #include "code\modules\projectiles\guns\projectile\pistol.dm"
 #include "code\modules\projectiles\guns\projectile\revolver.dm"
-#include "code\modules\projectiles\guns\projectile\rocket.dm"
+#include "code\modules\projectiles\guns\projectile\saw.dm"
 #include "code\modules\projectiles\guns\projectile\shotgun.dm"
 #include "code\modules\projectiles\guns\projectile\sniper.dm"
 #include "code\modules\projectiles\guns\projectile\toy.dm"
+#include "code\modules\projectiles\guns\throw\crossbow.dm"
+#include "code\modules\projectiles\guns\throw\pielauncher.dm"
 #include "code\modules\projectiles\projectile\beams.dm"
 #include "code\modules\projectiles\projectile\bullets.dm"
 #include "code\modules\projectiles\projectile\energy.dm"
@@ -1793,8 +1796,6 @@
 #include "code\modules\reagents\Chemistry-Holder.dm"
 #include "code\modules\reagents\Chemistry-Machinery.dm"
 #include "code\modules\reagents\Chemistry-Readme.dm"
-#include "code\modules\reagents\dartgun.dm"
-#include "code\modules\reagents\grenade_launcher.dm"
 #include "code\modules\reagents\pandemic.dm"
 #include "code\modules\reagents\reagent_containers.dm"
 #include "code\modules\reagents\reagent_dispenser.dm"
diff --git a/sound/vox_fem/active.ogg b/sound/vox_fem/active.ogg
new file mode 100644
index 00000000000..731020160c2
Binary files /dev/null and b/sound/vox_fem/active.ogg differ
diff --git a/sound/vox_fem/airlock.ogg b/sound/vox_fem/airlock.ogg
new file mode 100644
index 00000000000..5eb6920f016
Binary files /dev/null and b/sound/vox_fem/airlock.ogg differ
diff --git a/sound/vox_fem/alcohol.ogg b/sound/vox_fem/alcohol.ogg
new file mode 100644
index 00000000000..313bb0f9799
Binary files /dev/null and b/sound/vox_fem/alcohol.ogg differ
diff --git a/sound/vox_fem/arrival.ogg b/sound/vox_fem/arrival.ogg
new file mode 100644
index 00000000000..f3eea1ebc10
Binary files /dev/null and b/sound/vox_fem/arrival.ogg differ
diff --git a/sound/vox_fem/arrivals.ogg b/sound/vox_fem/arrivals.ogg
new file mode 100644
index 00000000000..bb3af84dc8c
Binary files /dev/null and b/sound/vox_fem/arrivals.ogg differ
diff --git a/sound/vox_fem/becoming.ogg b/sound/vox_fem/becoming.ogg
new file mode 100644
index 00000000000..4d96fc9399b
Binary files /dev/null and b/sound/vox_fem/becoming.ogg differ
diff --git a/sound/vox_fem/between.ogg b/sound/vox_fem/between.ogg
new file mode 100644
index 00000000000..f23d4eb838a
Binary files /dev/null and b/sound/vox_fem/between.ogg differ
diff --git a/sound/vox_fem/blob.ogg b/sound/vox_fem/blob.ogg
new file mode 100644
index 00000000000..d8a445d7e00
Binary files /dev/null and b/sound/vox_fem/blob.ogg differ
diff --git a/sound/vox_fem/briefing.ogg b/sound/vox_fem/briefing.ogg
new file mode 100644
index 00000000000..4b2ce6d2942
Binary files /dev/null and b/sound/vox_fem/briefing.ogg differ
diff --git a/sound/vox_fem/camp.ogg b/sound/vox_fem/camp.ogg
new file mode 100644
index 00000000000..cbb5f1daaaf
Binary files /dev/null and b/sound/vox_fem/camp.ogg differ
diff --git a/sound/vox_fem/chair.ogg b/sound/vox_fem/chair.ogg
new file mode 100644
index 00000000000..a58b9e2059f
Binary files /dev/null and b/sound/vox_fem/chair.ogg differ
diff --git a/sound/vox_fem/chapel.ogg b/sound/vox_fem/chapel.ogg
new file mode 100644
index 00000000000..80ce922fa56
Binary files /dev/null and b/sound/vox_fem/chapel.ogg differ
diff --git a/sound/vox_fem/closet.ogg b/sound/vox_fem/closet.ogg
new file mode 100644
index 00000000000..9e388fc46d5
Binary files /dev/null and b/sound/vox_fem/closet.ogg differ
diff --git a/sound/vox_fem/cyberiad.ogg b/sound/vox_fem/cyberiad.ogg
new file mode 100644
index 00000000000..b951309061d
Binary files /dev/null and b/sound/vox_fem/cyberiad.ogg differ
diff --git a/sound/vox_fem/declared.ogg b/sound/vox_fem/declared.ogg
new file mode 100644
index 00000000000..294206a6006
Binary files /dev/null and b/sound/vox_fem/declared.ogg differ
diff --git a/sound/vox_fem/detective.ogg b/sound/vox_fem/detective.ogg
new file mode 100644
index 00000000000..cd8cba63f51
Binary files /dev/null and b/sound/vox_fem/detective.ogg differ
diff --git a/sound/vox_fem/diona.ogg b/sound/vox_fem/diona.ogg
new file mode 100644
index 00000000000..defd627bc01
Binary files /dev/null and b/sound/vox_fem/diona.ogg differ
diff --git a/sound/vox_fem/dock.ogg b/sound/vox_fem/dock.ogg
new file mode 100644
index 00000000000..df6e6579e63
Binary files /dev/null and b/sound/vox_fem/dock.ogg differ
diff --git a/sound/vox_fem/docked.ogg b/sound/vox_fem/docked.ogg
new file mode 100644
index 00000000000..1b7e8495374
Binary files /dev/null and b/sound/vox_fem/docked.ogg differ
diff --git a/sound/vox_fem/docking.ogg b/sound/vox_fem/docking.ogg
new file mode 100644
index 00000000000..2d7e2edd6fa
Binary files /dev/null and b/sound/vox_fem/docking.ogg differ
diff --git a/sound/vox_fem/docks.ogg b/sound/vox_fem/docks.ogg
new file mode 100644
index 00000000000..2345da5f437
Binary files /dev/null and b/sound/vox_fem/docks.ogg differ
diff --git a/sound/vox_fem/drask.ogg b/sound/vox_fem/drask.ogg
new file mode 100644
index 00000000000..b05f4e76ee1
Binary files /dev/null and b/sound/vox_fem/drask.ogg differ
diff --git a/sound/vox_fem/drunk.ogg b/sound/vox_fem/drunk.ogg
new file mode 100644
index 00000000000..b6f6c42c8e0
Binary files /dev/null and b/sound/vox_fem/drunk.ogg differ
diff --git a/sound/vox_fem/emag.ogg b/sound/vox_fem/emag.ogg
new file mode 100644
index 00000000000..4a3b3786f8c
Binary files /dev/null and b/sound/vox_fem/emag.ogg differ
diff --git a/sound/vox_fem/equipment.ogg b/sound/vox_fem/equipment.ogg
new file mode 100644
index 00000000000..424aae47a9e
Binary files /dev/null and b/sound/vox_fem/equipment.ogg differ
diff --git a/sound/vox_fem/evacuation.ogg b/sound/vox_fem/evacuation.ogg
new file mode 100644
index 00000000000..add8dd9adad
Binary files /dev/null and b/sound/vox_fem/evacuation.ogg differ
diff --git a/sound/vox_fem/experimentor.ogg b/sound/vox_fem/experimentor.ogg
new file mode 100644
index 00000000000..b21602f9932
Binary files /dev/null and b/sound/vox_fem/experimentor.ogg differ
diff --git a/sound/vox_fem/gateway.ogg b/sound/vox_fem/gateway.ogg
new file mode 100644
index 00000000000..61ce808aac1
Binary files /dev/null and b/sound/vox_fem/gateway.ogg differ
diff --git a/sound/vox_fem/hail.ogg b/sound/vox_fem/hail.ogg
new file mode 100644
index 00000000000..7e76db003da
Binary files /dev/null and b/sound/vox_fem/hail.ogg differ
diff --git a/sound/vox_fem/hallway.ogg b/sound/vox_fem/hallway.ogg
new file mode 100644
index 00000000000..307becd533d
Binary files /dev/null and b/sound/vox_fem/hallway.ogg differ
diff --git a/sound/vox_fem/holoparasite.ogg b/sound/vox_fem/holoparasite.ogg
new file mode 100644
index 00000000000..862bc86c346
Binary files /dev/null and b/sound/vox_fem/holoparasite.ogg differ
diff --git a/sound/vox_fem/honk.ogg b/sound/vox_fem/honk.ogg
new file mode 100644
index 00000000000..91e05bdf679
Binary files /dev/null and b/sound/vox_fem/honk.ogg differ
diff --git a/sound/vox_fem/hull.ogg b/sound/vox_fem/hull.ogg
new file mode 100644
index 00000000000..65aacf7d216
Binary files /dev/null and b/sound/vox_fem/hull.ogg differ
diff --git a/sound/vox_fem/ian.ogg b/sound/vox_fem/ian.ogg
new file mode 100644
index 00000000000..f1da8bd7b76
Binary files /dev/null and b/sound/vox_fem/ian.ogg differ
diff --git a/sound/vox_fem/imminent.ogg b/sound/vox_fem/imminent.ogg
new file mode 100644
index 00000000000..87f40306ee8
Binary files /dev/null and b/sound/vox_fem/imminent.ogg differ
diff --git a/sound/vox_fem/interested.ogg b/sound/vox_fem/interested.ogg
new file mode 100644
index 00000000000..87a5af9e990
Binary files /dev/null and b/sound/vox_fem/interested.ogg differ
diff --git a/sound/vox_fem/intruders.ogg b/sound/vox_fem/intruders.ogg
new file mode 100644
index 00000000000..c622d9e01e0
Binary files /dev/null and b/sound/vox_fem/intruders.ogg differ
diff --git a/sound/vox_fem/kida.ogg b/sound/vox_fem/kida.ogg
new file mode 100644
index 00000000000..e9831a06b78
Binary files /dev/null and b/sound/vox_fem/kida.ogg differ
diff --git a/sound/vox_fem/kidan.ogg b/sound/vox_fem/kidan.ogg
new file mode 100644
index 00000000000..6a1f3775051
Binary files /dev/null and b/sound/vox_fem/kidan.ogg differ
diff --git a/sound/vox_fem/labor.ogg b/sound/vox_fem/labor.ogg
new file mode 100644
index 00000000000..184474e6a40
Binary files /dev/null and b/sound/vox_fem/labor.ogg differ
diff --git a/sound/vox_fem/library.ogg b/sound/vox_fem/library.ogg
new file mode 100644
index 00000000000..a760be722c0
Binary files /dev/null and b/sound/vox_fem/library.ogg differ
diff --git a/sound/vox_fem/mime.ogg b/sound/vox_fem/mime.ogg
new file mode 100644
index 00000000000..0c99e7f6227
Binary files /dev/null and b/sound/vox_fem/mime.ogg differ
diff --git a/sound/vox_fem/mimes.ogg b/sound/vox_fem/mimes.ogg
new file mode 100644
index 00000000000..36487a145ee
Binary files /dev/null and b/sound/vox_fem/mimes.ogg differ
diff --git a/sound/vox_fem/miner.ogg b/sound/vox_fem/miner.ogg
new file mode 100644
index 00000000000..71def18b022
Binary files /dev/null and b/sound/vox_fem/miner.ogg differ
diff --git a/sound/vox_fem/miners.ogg b/sound/vox_fem/miners.ogg
new file mode 100644
index 00000000000..3390bda010f
Binary files /dev/null and b/sound/vox_fem/miners.ogg differ
diff --git a/sound/vox_fem/mining.ogg b/sound/vox_fem/mining.ogg
new file mode 100644
index 00000000000..3c7a4df1a86
Binary files /dev/null and b/sound/vox_fem/mining.ogg differ
diff --git a/sound/vox_fem/n2o.ogg b/sound/vox_fem/n2o.ogg
new file mode 100644
index 00000000000..eb085d2f24d
Binary files /dev/null and b/sound/vox_fem/n2o.ogg differ
diff --git a/sound/vox_fem/nuke.ogg b/sound/vox_fem/nuke.ogg
new file mode 100644
index 00000000000..20a0184373d
Binary files /dev/null and b/sound/vox_fem/nuke.ogg differ
diff --git a/sound/vox_fem/office.ogg b/sound/vox_fem/office.ogg
new file mode 100644
index 00000000000..72c04fb1946
Binary files /dev/null and b/sound/vox_fem/office.ogg differ
diff --git a/sound/vox_fem/op.ogg b/sound/vox_fem/op.ogg
new file mode 100644
index 00000000000..7b3c393bdd3
Binary files /dev/null and b/sound/vox_fem/op.ogg differ
diff --git a/sound/vox_fem/operational.ogg b/sound/vox_fem/operational.ogg
new file mode 100644
index 00000000000..13a903f16bb
Binary files /dev/null and b/sound/vox_fem/operational.ogg differ
diff --git a/sound/vox_fem/ops.ogg b/sound/vox_fem/ops.ogg
new file mode 100644
index 00000000000..a1140b4029c
Binary files /dev/null and b/sound/vox_fem/ops.ogg differ
diff --git a/sound/vox_fem/pod.ogg b/sound/vox_fem/pod.ogg
new file mode 100644
index 00000000000..0c26d50977b
Binary files /dev/null and b/sound/vox_fem/pod.ogg differ
diff --git a/sound/vox_fem/pods.ogg b/sound/vox_fem/pods.ogg
new file mode 100644
index 00000000000..1fd095c59ee
Binary files /dev/null and b/sound/vox_fem/pods.ogg differ
diff --git a/sound/vox_fem/poly.ogg b/sound/vox_fem/poly.ogg
new file mode 100644
index 00000000000..91dfa8f22ce
Binary files /dev/null and b/sound/vox_fem/poly.ogg differ
diff --git a/sound/vox_fem/pun.ogg b/sound/vox_fem/pun.ogg
new file mode 100644
index 00000000000..19000f98f9f
Binary files /dev/null and b/sound/vox_fem/pun.ogg differ
diff --git a/sound/vox_fem/renault.ogg b/sound/vox_fem/renault.ogg
new file mode 100644
index 00000000000..acea4a7731c
Binary files /dev/null and b/sound/vox_fem/renault.ogg differ
diff --git a/sound/vox_fem/representative.ogg b/sound/vox_fem/representative.ogg
new file mode 100644
index 00000000000..09baf77940a
Binary files /dev/null and b/sound/vox_fem/representative.ogg differ
diff --git a/sound/vox_fem/runtime.ogg b/sound/vox_fem/runtime.ogg
new file mode 100644
index 00000000000..0a43c429355
Binary files /dev/null and b/sound/vox_fem/runtime.ogg differ
diff --git a/sound/vox_fem/scrubbers.ogg b/sound/vox_fem/scrubbers.ogg
new file mode 100644
index 00000000000..caae84dac41
Binary files /dev/null and b/sound/vox_fem/scrubbers.ogg differ
diff --git a/sound/vox_fem/sequencer.ogg b/sound/vox_fem/sequencer.ogg
new file mode 100644
index 00000000000..6fb668d8985
Binary files /dev/null and b/sound/vox_fem/sequencer.ogg differ
diff --git a/sound/vox_fem/skree.ogg b/sound/vox_fem/skree.ogg
new file mode 100644
index 00000000000..4480d923be0
Binary files /dev/null and b/sound/vox_fem/skree.ogg differ
diff --git a/sound/vox_fem/skrek.ogg b/sound/vox_fem/skrek.ogg
new file mode 100644
index 00000000000..81fef09383e
Binary files /dev/null and b/sound/vox_fem/skrek.ogg differ
diff --git a/sound/vox_fem/skrell.ogg b/sound/vox_fem/skrell.ogg
new file mode 100644
index 00000000000..a5cb267c27e
Binary files /dev/null and b/sound/vox_fem/skrell.ogg differ
diff --git a/sound/vox_fem/space.ogg b/sound/vox_fem/space.ogg
new file mode 100644
index 00000000000..9a2ee667320
Binary files /dev/null and b/sound/vox_fem/space.ogg differ
diff --git a/sound/vox_fem/spider.ogg b/sound/vox_fem/spider.ogg
new file mode 100644
index 00000000000..6bad7eaa24d
Binary files /dev/null and b/sound/vox_fem/spider.ogg differ
diff --git a/sound/vox_fem/spiders.ogg b/sound/vox_fem/spiders.ogg
new file mode 100644
index 00000000000..601e53bca74
Binary files /dev/null and b/sound/vox_fem/spiders.ogg differ
diff --git a/sound/vox_fem/still.ogg b/sound/vox_fem/still.ogg
new file mode 100644
index 00000000000..0ee8f6bc513
Binary files /dev/null and b/sound/vox_fem/still.ogg differ
diff --git a/sound/vox_fem/stupid.ogg b/sound/vox_fem/stupid.ogg
new file mode 100644
index 00000000000..80d8399bf33
Binary files /dev/null and b/sound/vox_fem/stupid.ogg differ
diff --git a/sound/vox_fem/swarmer.ogg b/sound/vox_fem/swarmer.ogg
new file mode 100644
index 00000000000..fe750eb8961
Binary files /dev/null and b/sound/vox_fem/swarmer.ogg differ
diff --git a/sound/vox_fem/swarmers.ogg b/sound/vox_fem/swarmers.ogg
new file mode 100644
index 00000000000..54415b44861
Binary files /dev/null and b/sound/vox_fem/swarmers.ogg differ
diff --git a/sound/vox_fem/sword.ogg b/sound/vox_fem/sword.ogg
new file mode 100644
index 00000000000..5f8891db78a
Binary files /dev/null and b/sound/vox_fem/sword.ogg differ
diff --git a/sound/vox_fem/technology.ogg b/sound/vox_fem/technology.ogg
new file mode 100644
index 00000000000..60602a4294b
Binary files /dev/null and b/sound/vox_fem/technology.ogg differ
diff --git a/sound/vox_fem/teleport.ogg b/sound/vox_fem/teleport.ogg
new file mode 100644
index 00000000000..67270957d52
Binary files /dev/null and b/sound/vox_fem/teleport.ogg differ
diff --git a/sound/vox_fem/teleported.ogg b/sound/vox_fem/teleported.ogg
new file mode 100644
index 00000000000..314d27ba75a
Binary files /dev/null and b/sound/vox_fem/teleported.ogg differ
diff --git a/sound/vox_fem/teleporter.ogg b/sound/vox_fem/teleporter.ogg
new file mode 100644
index 00000000000..29ff68f82fc
Binary files /dev/null and b/sound/vox_fem/teleporter.ogg differ
diff --git a/sound/vox_fem/teleporting.ogg b/sound/vox_fem/teleporting.ogg
new file mode 100644
index 00000000000..1fd6e81ac84
Binary files /dev/null and b/sound/vox_fem/teleporting.ogg differ
diff --git a/sound/vox_fem/tesla.ogg b/sound/vox_fem/tesla.ogg
new file mode 100644
index 00000000000..d45cc8c02e3
Binary files /dev/null and b/sound/vox_fem/tesla.ogg differ
diff --git a/sound/vox_fem/tool.ogg b/sound/vox_fem/tool.ogg
new file mode 100644
index 00000000000..07075884a1a
Binary files /dev/null and b/sound/vox_fem/tool.ogg differ
diff --git a/sound/vox_fem/unathi.ogg b/sound/vox_fem/unathi.ogg
new file mode 100644
index 00000000000..52c0ebf2ef0
Binary files /dev/null and b/sound/vox_fem/unathi.ogg differ
diff --git a/sound/vox_fem/vacant.ogg b/sound/vox_fem/vacant.ogg
new file mode 100644
index 00000000000..b4fb4ddef3d
Binary files /dev/null and b/sound/vox_fem/vacant.ogg differ
diff --git a/sound/vox_fem/vault.ogg b/sound/vox_fem/vault.ogg
new file mode 100644
index 00000000000..55fe3b6beb7
Binary files /dev/null and b/sound/vox_fem/vault.ogg differ
diff --git a/sound/vox_fem/vents.ogg b/sound/vox_fem/vents.ogg
new file mode 100644
index 00000000000..ef7e9a9b9b3
Binary files /dev/null and b/sound/vox_fem/vents.ogg differ
diff --git a/sound/vox_fem/vulpkanin.ogg b/sound/vox_fem/vulpkanin.ogg
new file mode 100644
index 00000000000..bf86c6caafb
Binary files /dev/null and b/sound/vox_fem/vulpkanin.ogg differ
diff --git a/sound/vox_fem/weld.ogg b/sound/vox_fem/weld.ogg
new file mode 100644
index 00000000000..21b8a75b9b8
Binary files /dev/null and b/sound/vox_fem/weld.ogg differ
diff --git a/sound/vox_fem/window.ogg b/sound/vox_fem/window.ogg
new file mode 100644
index 00000000000..a542d49d385
Binary files /dev/null and b/sound/vox_fem/window.ogg differ
diff --git a/sound/vox_fem/windows.ogg b/sound/vox_fem/windows.ogg
new file mode 100644
index 00000000000..b6ba584e792
Binary files /dev/null and b/sound/vox_fem/windows.ogg differ
diff --git a/sound/vox_fem/yet.ogg b/sound/vox_fem/yet.ogg
new file mode 100644
index 00000000000..330daa6d859
Binary files /dev/null and b/sound/vox_fem/yet.ogg differ
diff --git a/sound/weapons/effects/ric1.ogg b/sound/weapons/effects/ric1.ogg
new file mode 100644
index 00000000000..9f228887228
Binary files /dev/null and b/sound/weapons/effects/ric1.ogg differ
diff --git a/sound/weapons/effects/ric2.ogg b/sound/weapons/effects/ric2.ogg
new file mode 100644
index 00000000000..03d02b8c457
Binary files /dev/null and b/sound/weapons/effects/ric2.ogg differ
diff --git a/sound/weapons/effects/ric3.ogg b/sound/weapons/effects/ric3.ogg
new file mode 100644
index 00000000000..2d7a3ce8a06
Binary files /dev/null and b/sound/weapons/effects/ric3.ogg differ
diff --git a/sound/weapons/effects/ric4.ogg b/sound/weapons/effects/ric4.ogg
new file mode 100644
index 00000000000..e0193a690bf
Binary files /dev/null and b/sound/weapons/effects/ric4.ogg differ
diff --git a/sound/weapons/effects/ric5.ogg b/sound/weapons/effects/ric5.ogg
new file mode 100644
index 00000000000..b1064eece15
Binary files /dev/null and b/sound/weapons/effects/ric5.ogg differ
diff --git a/sound/weapons/effects/searwall.ogg b/sound/weapons/effects/searwall.ogg
new file mode 100644
index 00000000000..6a29326f24b
Binary files /dev/null and b/sound/weapons/effects/searwall.ogg differ