Merge pull request tgstation#130 from Fikou/patch-74

glass shards EXPLODE nonviolently on creation
ishitbyabullet · Oct 16, 2020 · 24f2a78 · 24f2a78
2 parents 46f2791 + 65b8113
commit 24f2a78
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
@@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
 	return (BRUTELOSS)
 
 
-/obj/item/shard/Initialize()
+/obj/item/shard/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/caltrop, force)
 	AddComponent(/datum/component/butchering, 150, 65)
@@ -291,6 +291,10 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
 	var/turf/T = get_turf(src)
 	if(T && is_station_level(T.z))
 		SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
+	if(!(istype(get_area(src), /area/tdome/arena)) && !mapload)
+		visible_message("<span class='warning'>...Just kidding. [src] explodes, causing a miniature black hole.</span>")
+		message_admins("A glass shard was created out of the arena at [ADMIN_VERBOSEJMP(src.loc)].")
+		qdel(src)
 
 /obj/item/shard/Destroy()
 	. = ..()