MinorSpriteFix+CentcomHeadset+GunWeightChange

_maps/map_files/generic/z2.dmm

@@ -592,13 +592,13 @@
 "lt" = (/turf/simulated/shuttle/wall{icon_state = "swall11"; dir = 2},/area/shuttle/escape/centcom)
 "lu" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"},/area/syndicate_mothership)
 "lv" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/repair_droid,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
-"lw" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
+"lw" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/syringes,/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
 "lx" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tool/sleeper,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry)
 "ly" = (/obj/machinery/suit_storage_unit/ertMed,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
 "lz" = (/obj/structure/rack,/obj/item/clothing/glasses/hud/health,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/fire{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/toxin{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/o2{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/reagent_containers/hypospray/medipen/adminordrazine,/obj/item/weapon/reagent_containers/hypospray/medipen/adminordrazine,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
 "lA" = (/obj/structure/rack,/obj/item/weapon/storage/box/emps,/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
 "lB" = (/obj/structure/mirror{pixel_y = 28},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
-"lC" = (/obj/structure/rack,/obj/item/device/aicard,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
+"lC" = (/obj/structure/rack,/obj/item/device/aicard,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
 "lD" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/ferry)
 "lE" = (/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/shuttle/escape/centcom)
 "lF" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/shuttle/escape/centcom)
@@ -753,7 +753,7 @@
 "oy" = (/obj/machinery/computer/telecrystals/uplinker,/turf/unsimulated/floor{tag = "icon-podhatch (WEST)"; icon_state = "podhatch"; dir = 8},/area/syndicate_mothership)
 "oz" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/fancy/donut_box,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
 "oA" = (/obj/machinery/suit_storage_unit/ertSec,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
-"oB" = (/obj/structure/rack,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/flashbangs,/obj/item/clothing/glasses/hud/security/sunglasses,/obj/item/weapon/storage/belt/security,/obj/item/weapon/melee/baton/loaded,/obj/item/device/flash,/obj/item/weapon/shield/riot/tele,/obj/item/weapon/gun/energy/pulse_rifle/pulse_carbine,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
+"oB" = (/obj/structure/rack,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/flashbangs,/obj/item/clothing/glasses/hud/security/sunglasses,/obj/item/weapon/storage/belt/security,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/shield/riot/tele,/obj/item/weapon/gun/energy/pulse_rifle/pulse_carbine,/obj/item/device/flash/handheld,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
 "oC" = (/obj/machinery/suit_storage_unit/ertEngi,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
 "oD" = (/obj/structure/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/clothing/glasses/meson,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/device/multitool,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/rcd{matter = 200; name = "military rapid-construction-device (RCD)"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry)
 "oE" = (/turf/unsimulated/wall/fakeglass{color = "#008000"; dir = 6; icon_state = "fakewindows2"},/area/wizard_station)
@@ -927,8 +927,8 @@
 "rQ" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
 "rR" = (/obj/structure/table,/obj/item/device/sbeacondrop/bomb{pixel_y = 5},/obj/item/device/sbeacondrop/bomb,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
 "rS" = (/obj/structure/table,/obj/item/weapon/grenade/syndieminibomb{pixel_x = 4; pixel_y = 2},/obj/item/weapon/grenade/syndieminibomb{pixel_x = -1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
-"rT" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry)
-"rU" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry)
+"rT" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/storage/backpack/security,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry)
+"rU" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/storage/backpack/security,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry)
 "rV" = (/obj/machinery/camera{pixel_x = 10; network = list("thunder"); c_tag = "Arena"},/turf/simulated/floor/bluegrid,/area/tdome/arena)
 "rW" = (/obj/structure/stool/bed/chair/wood/wings{tag = "icon-wooden_chair_wings (NORTH)"; icon_state = "wooden_chair_wings"; dir = 1},/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station)
 "rX" = (/obj/structure/cult/pylon,/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station)

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -7,32 +7,35 @@
 
 /obj/structure/closet/syndicate/ertSec/New()
 	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
-	new /obj/item/device/radio/headset/headset_com(src)
 	new /obj/item/weapon/card/id/ertsSecurity(src)
 	new /obj/item/clothing/shoes/combat/swat(src)
 	new /obj/item/clothing/under/rank/centcom_officer(src)
 	new /obj/item/clothing/gloves/combat(src)
 	new /obj/item/weapon/storage/backpack/security(src)
+	var/obj/item/device/radio/headset/R = new /obj/item/device/radio/headset/headset_cent(src)
+	R.set_frequency(1441)
 	return
 
 /obj/structure/closet/syndicate/ertMed/New()
 	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
-	new /obj/item/device/radio/headset/headset_com(src)
 	new /obj/item/weapon/card/id/ertsMedical(src)
 	new /obj/item/clothing/shoes/combat/swat(src)
 	new /obj/item/clothing/under/rank/centcom_officer(src)
 	new /obj/item/clothing/gloves/combat(src)
 	new /obj/item/weapon/storage/backpack/medic(src)
+	var/obj/item/device/radio/headset/R = new /obj/item/device/radio/headset/headset_cent(src)
+	R.set_frequency(1441)
 	return
 
 /obj/structure/closet/syndicate/ertEngi/New()
 	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
-	new /obj/item/device/radio/headset/headset_com(src)
 	new /obj/item/weapon/card/id/ertsEngineer(src)
 	new /obj/item/clothing/shoes/combat/swat(src)
 	new /obj/item/clothing/under/rank/centcom_officer(src)
 	new /obj/item/clothing/gloves/combat(src)
 	new /obj/item/weapon/storage/backpack/industrial(src)
+	var/obj/item/device/radio/headset/R = new /obj/item/device/radio/headset/headset_cent(src)
+	R.set_frequency(1441)
 	return
 
 /obj/structure/closet/syndicate/personal

code/modules/projectiles/guns/energy/pulse.dm

@@ -16,13 +16,15 @@
 /obj/item/weapon/gun/energy/pulse_rifle/pulse_carbine
 	name = "pulse carbine"
 	desc = "A ligther weight varient of the pulse rifle, a multifaceted energy carbine with three modes."
+	w_class = 3.0
 	icon_state = "pulse_carbine"
 	item_state = "pulse"
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/carbine, /obj/item/ammo_casing/energy/electrode/carbine, /obj/item/ammo_casing/energy/laser/carbine)
 
 /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol
-	name = "pulse carbine"
+	name = "pulse pistol"
 	desc = "A ligther weight varient of the pulse rifle, a multifaceted energy pistol with three modes."
+	w_class = 2.0
 	icon_state = "pulse_pistol"
 	item_state = "pulse"
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/pistol, /obj/item/ammo_casing/energy/electrode/pistol, /obj/item/ammo_casing/energy/laser/pistol)