Jackriip · Nov 11, 2026 · Nov 11, 2026 · Nov 11, 2026 · Nov 11, 2026 · Nov 11, 2026
diff --git a/__byond_var_id_padding.dm b/__byond_var_id_padding.dm
@@ -0,0 +1,105 @@
+// BYOND bug workaround (VOIDCREW): DM numbers every variable name from one table, and a proc static,
+// global or local that lands on id 65535 compiles wrong. A static or global fails with "<name>: invalid
+// variable", and a local gets a false "variable defined but not used" warning and reads the wrong value.
+// Object vars and proc arguments on that id are fine. Once a build has more than 65535 names, about half
+// of all changes put some static or local on the broken id. Seen on 516.1659 and 516.1667.
+//
+// This file is included first, so its 70,000 unused var names take ids 0 to 69999, and id 65535 always
+// falls on one of them. A type holds at most about 65k vars, so they are split over seven subtypes.
+// Nothing ever makes a /datum/byond_var_id_padding. Remove this once BYOND fixes it.
+
+#define VAR_ID_PAD_1(a, b, c, d, e) var/var_id_pad_##a##b##c##d##e
+#define VAR_ID_PAD_10(a, b, c, d) VAR_ID_PAD_1(a, b, c, d, 0);VAR_ID_PAD_1(a, b, c, d, 1);VAR_ID_PAD_1(a, b, c, d, 2);VAR_ID_PAD_1(a, b, c, d, 3);VAR_ID_PAD_1(a, b, c, d, 4);VAR_ID_PAD_1(a, b, c, d, 5);VAR_ID_PAD_1(a, b, c, d, 6);VAR_ID_PAD_1(a, b, c, d, 7);VAR_ID_PAD_1(a, b, c, d, 8);VAR_ID_PAD_1(a, b, c, d, 9)
+#define VAR_ID_PAD_100(a, b, c) VAR_ID_PAD_10(a, b, c, 0);VAR_ID_PAD_10(a, b, c, 1);VAR_ID_PAD_10(a, b, c, 2);VAR_ID_PAD_10(a, b, c, 3);VAR_ID_PAD_10(a, b, c, 4);VAR_ID_PAD_10(a, b, c, 5);VAR_ID_PAD_10(a, b, c, 6);VAR_ID_PAD_10(a, b, c, 7);VAR_ID_PAD_10(a, b, c, 8);VAR_ID_PAD_10(a, b, c, 9)
+#define VAR_ID_PAD_1000(a, b) VAR_ID_PAD_100(a, b, 0);VAR_ID_PAD_100(a, b, 1);VAR_ID_PAD_100(a, b, 2);VAR_ID_PAD_100(a, b, 3);VAR_ID_PAD_100(a, b, 4);VAR_ID_PAD_100(a, b, 5);VAR_ID_PAD_100(a, b, 6);VAR_ID_PAD_100(a, b, 7);VAR_ID_PAD_100(a, b, 8);VAR_ID_PAD_100(a, b, 9)
+
+/datum/byond_var_id_padding
+
+/datum/byond_var_id_padding/part_0
+	VAR_ID_PAD_1000(0, 0)
+	VAR_ID_PAD_1000(0, 1)
+	VAR_ID_PAD_1000(0, 2)
+	VAR_ID_PAD_1000(0, 3)
+	VAR_ID_PAD_1000(0, 4)
+	VAR_ID_PAD_1000(0, 5)
+	VAR_ID_PAD_1000(0, 6)
+	VAR_ID_PAD_1000(0, 7)
+	VAR_ID_PAD_1000(0, 8)
+	VAR_ID_PAD_1000(0, 9)
+
+/datum/byond_var_id_padding/part_1
+	VAR_ID_PAD_1000(1, 0)
+	VAR_ID_PAD_1000(1, 1)
+	VAR_ID_PAD_1000(1, 2)
+	VAR_ID_PAD_1000(1, 3)
+	VAR_ID_PAD_1000(1, 4)
+	VAR_ID_PAD_1000(1, 5)
+	VAR_ID_PAD_1000(1, 6)
+	VAR_ID_PAD_1000(1, 7)
+	VAR_ID_PAD_1000(1, 8)
+	VAR_ID_PAD_1000(1, 9)
+
+/datum/byond_var_id_padding/part_2
+	VAR_ID_PAD_1000(2, 0)
+	VAR_ID_PAD_1000(2, 1)
+	VAR_ID_PAD_1000(2, 2)
+	VAR_ID_PAD_1000(2, 3)
+	VAR_ID_PAD_1000(2, 4)
+	VAR_ID_PAD_1000(2, 5)
+	VAR_ID_PAD_1000(2, 6)
+	VAR_ID_PAD_1000(2, 7)
+	VAR_ID_PAD_1000(2, 8)
+	VAR_ID_PAD_1000(2, 9)
+
+/datum/byond_var_id_padding/part_3
+	VAR_ID_PAD_1000(3, 0)
+	VAR_ID_PAD_1000(3, 1)
+	VAR_ID_PAD_1000(3, 2)
+	VAR_ID_PAD_1000(3, 3)
+	VAR_ID_PAD_1000(3, 4)
+	VAR_ID_PAD_1000(3, 5)
+	VAR_ID_PAD_1000(3, 6)
+	VAR_ID_PAD_1000(3, 7)
+	VAR_ID_PAD_1000(3, 8)
+	VAR_ID_PAD_1000(3, 9)
+
+/datum/byond_var_id_padding/part_4
+	VAR_ID_PAD_1000(4, 0)
+	VAR_ID_PAD_1000(4, 1)
+	VAR_ID_PAD_1000(4, 2)
+	VAR_ID_PAD_1000(4, 3)
+	VAR_ID_PAD_1000(4, 4)
+	VAR_ID_PAD_1000(4, 5)
+	VAR_ID_PAD_1000(4, 6)
+	VAR_ID_PAD_1000(4, 7)
+	VAR_ID_PAD_1000(4, 8)
+	VAR_ID_PAD_1000(4, 9)
+
+/datum/byond_var_id_padding/part_5
+	VAR_ID_PAD_1000(5, 0)
+	VAR_ID_PAD_1000(5, 1)
+	VAR_ID_PAD_1000(5, 2)
+	VAR_ID_PAD_1000(5, 3)
+	VAR_ID_PAD_1000(5, 4)
+	VAR_ID_PAD_1000(5, 5)
+	VAR_ID_PAD_1000(5, 6)
+	VAR_ID_PAD_1000(5, 7)
+	VAR_ID_PAD_1000(5, 8)
+	VAR_ID_PAD_1000(5, 9)
+
+/datum/byond_var_id_padding/part_6
+	VAR_ID_PAD_1000(6, 0)
+	VAR_ID_PAD_1000(6, 1)
+	VAR_ID_PAD_1000(6, 2)
+	VAR_ID_PAD_1000(6, 3)
+	VAR_ID_PAD_1000(6, 4)
+	VAR_ID_PAD_1000(6, 5)
+	VAR_ID_PAD_1000(6, 6)
+	VAR_ID_PAD_1000(6, 7)
+	VAR_ID_PAD_1000(6, 8)
+	VAR_ID_PAD_1000(6, 9)
+
+#undef VAR_ID_PAD_1000
+#undef VAR_ID_PAD_100
+#undef VAR_ID_PAD_10
+#undef VAR_ID_PAD_1
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -664,7 +664,7 @@
 		owner.visible_message(span_danger("[owner] blocks [attack_text] with [src]!"))
 		var/owner_turf = get_turf(owner)
 		new block_effect(owner_turf, COLOR_YELLOW)
-		playsound(src, block_sound, BLOCK_SOUND_VOLUME, vary = TRUE)
+		playsound(src, hitby?.blocked_sound_for(src) || block_sound, BLOCK_SOUND_VOLUME, vary = TRUE) // VOIDCREW EDIT CHANGE - plasma_weapons: a bolt can carry its own shield block sound
 		return TRUE
 
 /**

diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -17,7 +17,8 @@
 	if(!silent)
 		limb_owner.visible_message(span_danger("<B>[limb_owner]'s [name] is violently dismembered!</B>"))
 	INVOKE_ASYNC(limb_owner, TYPE_PROC_REF(/mob, emote), "scream")
-	playsound(get_turf(limb_owner), 'sound/effects/dismember.ogg', 80, TRUE)
+	if(!plasma_melt_in_progress(limb_owner)) // VOIDCREW EDIT CHANGE - plasma_weapons: a plasma melt plays its own sound
+		playsound(get_turf(limb_owner), 'sound/effects/dismember.ogg', 80, TRUE)
 	limb_owner.add_mood_event("dismembered_[body_zone]", /datum/mood_event/dismembered, src)
 	limb_owner.add_mob_memory(/datum/memory/was_dismembered, lost_limb = src)
 

diff --git a/sound/items/weapons/attributions.txt b/sound/items/weapons/attributions.txt
@@ -2,3 +2,5 @@
 	rust_sower_armbomb.ogg - EnterTheJake
 	rust_sower_explode.ogg - EnterTheJake
 }
+
+laser.ogg and laser2.ogg are e-fire.ogg and heavy_laser.ogg from Shiptest (https://github.com/shiptest-ss13/Shiptest), CC BY-SA 3.0.
diff --git a/sound/items/weapons/laser.ogg b/sound/items/weapons/laser.ogg
diff --git a/sound/items/weapons/laser2.ogg b/sound/items/weapons/laser2.ogg
diff --git a/strings/wounds/plasma_scar_desc.json b/strings/wounds/plasma_scar_desc.json
@@ -0,0 +1,18 @@
+{
+	"plasmamoderate": [
+		"a scatter of small, glossy pockmarks",
+		"a spray of pale pinprick scars"
+	],
+
+	"plasmasevere": [
+		"a cluster of smooth, glassy pits",
+		"round scars with a faint green sheen",
+		"dimpled skin flecked with black glass"
+	],
+
+	"plasmacritical": [
+		"a sunken, glass-smooth crater of scar tissue",
+		"a puckered scar the width of a fist, shot through with green-black glass",
+		"a knot of shiny scar tissue where something burned clean through"
+	]
+}
diff --git a/tgstation.dme b/tgstation.dme
@@ -18,6 +18,7 @@
 // END_PREFERENCES
 
 // BEGIN_INCLUDE
+#include "__byond_var_id_padding.dm"
 #include "__odlint.dm"
 #include "_maps\_basemap.dm"
 #include "code\__byond_version_compat.dm"
@@ -34,6 +35,7 @@
 #include "code\__DEFINES\_tick.dm"
 #include "voidcrew\_DEFINES\core_integration.dm" // VOIDCREW EDIT: shared hooks must precede upstream macro use.
 #include "voidcrew\_DEFINES\modular_hooks.dm" // VOIDCREW EDIT: shared hooks must precede upstream macro use.
+#include "voidcrew\_DEFINES\plasma_weapons.dm" // VOIDCREW EDIT: the plasma_weapons unit tests read these defines, and tests compile before voidcrew\_DEFINES.
 #include "code\__DEFINES\access.dm"
 #include "code\__DEFINES\achievements.dm"
 #include "code\__DEFINES\acid.dm"
@@ -6925,6 +6927,7 @@
 #include "voidcrew\edits\modules\power\supermatter_anomalies.dm"
 #include "voidcrew\edits\modules\power\turbine\turbine.dm"
 #include "voidcrew\edits\modules\projectiles\boxes_magazines\_box_magazine.dm"
+#include "voidcrew\edits\modules\projectiles\projectile\beams.dm"
 #include "voidcrew\edits\modules\research\designs.dm"
 #include "voidcrew\edits\modules\research\designs\comp_board_designs.dm"
 #include "voidcrew\edits\modules\research\designs\machine_designs.dm"
@@ -7468,6 +7471,23 @@
 #include "voidcrew\modules\overmap\code\modules\overmap\zones\zone_teleport.dm"
 #include "voidcrew\modules\overmap\code\modules\overmap\zones\zone_weather.dm"
 #include "voidcrew\modules\paperwork\faxes.dm"
+#include "voidcrew\modules\plasma_weapons\burn_wound_looks.dm"
+#include "voidcrew\modules\plasma_weapons\frontier_lasers.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_ash.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_bolt.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_chamber.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_effects.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_flask.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_guns.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_heat.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_melt.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_pinch.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_pirates.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_shop.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_types.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_wound_care.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_wound_looks.dm"
+#include "voidcrew\modules\plasma_weapons\plasma_wounds.dm"
 #include "voidcrew\modules\player_outposts\outpost_admin.dm"
 #include "voidcrew\modules\player_outposts\outpost_admin_bays.dm"
 #include "voidcrew\modules\player_outposts\outpost_admin_checkpoints.dm"

diff --git a/tools/gear_catalog/ratings/guns.json b/tools/gear_catalog/ratings/guns.json
@@ -1,3 +1,3 @@
 {
 "category": "guns",
 "groups": [
@@ -1183,6 +1183,26 @@
    "reason": "Only affects plants.",
    "tier": "none"
   },
+  "/obj/item/gun/energy/frontier_laser/pistol": {
+   "confidence": "medium",
+   "group": "beam weapons",
+   "hash": "",
+   "name": "Kestrel laser pistol",
+   "rank": 16,
+   "reason": "A weaker laser gun: 20 a shot, 20 shots, fits a belt.",
+   "score": 28,
+   "tier": "green"
+  },
+  "/obj/item/gun/energy/frontier_laser/smg": {
+   "confidence": "medium",
+   "group": "beam weapons",
+   "hash": "",
+   "name": "Hornet laser SMG",
+   "rank": 9,
+   "reason": "The laser gun's beam on a held trigger: a laser carbine's damage per second in bigger hits.",
+   "score": 55,
+   "tier": "yellow"
+  },
   "/obj/item/gun/energy/gravity_gun": {
    "confidence": "low",
    "group": "launchers and exotics",
@@ -1465,6 +1485,66 @@
    },
    "tier": "yellow"
   },
+  "/obj/item/gun/energy/plasma_weapon/pistol": {
+   "confidence": "low",
+   "group": "sidearms",
+   "hash": "",
+   "name": "Cinder plasma pistol",
+   "rank": 10,
+   "reason": "A plasma sidearm: slow bolts that burn, fed by hand from sheets or ore.",
+   "score": 55,
+   "score_inputs": {
+    "cell_fed": {
+     "value": false,
+     "why": "Fed by hand with plasma sheets or ore; no recharger."
+    },
+    "points": {
+     "value": 15,
+     "why": "Bolts can't be reflected, break windows and doors faster, leave deep burns and can melt off a hurt limb."
+    }
+   },
+   "tier": "yellow"
+  },
+  "/obj/item/gun/energy/plasma_weapon/rifle": {
+   "confidence": "low",
+   "group": "rifles",
+   "hash": "",
+   "name": "Furnace plasma rifle",
+   "rank": 5,
+   "reason": "Close-range plasma rifle that overheats, fed by hand from sheets or ore.",
+   "score": 113,
+   "score_inputs": {
+    "cell_fed": {
+     "value": false,
+     "why": "Fed by hand with plasma sheets or ore; no recharger."
+    },
+    "points": {
+     "value": 75,
+     "why": "Beats ablative armour and mirrors, breaks windows and doors twice as fast, lights fuel, leaves deep burns and melts off limbs that can't be reattached. Its bolts can be dodged at range."
+    }
+   },
+   "tier": "red"
+  },
+  "/obj/item/gun/energy/plasma_weapon/rifle/old_furnace": {
+   "confidence": "low",
+   "group": "rifles",
+   "hash": "",
+   "name": "Old Furnace",
+   "rank": 3,
+   "reason": "A Furnace that runs cooler and shoots straighter.",
+   "score": 123,
+   "score_inputs": {
+    "cell_fed": {
+     "value": false,
+     "why": "Fed by hand with plasma sheets or ore; no recharger."
+    },
+    "points": {
+     "value": 85,
+     "why": "A Furnace that runs cooler and shoots straighter."
+    }
+   },
+   "tier": "red"
+  },
   "/obj/item/gun/energy/plasmacutter": {
    "confidence": "medium",
    "group": "tools and support",