From 2e7c58bfa86aaf18b4ffce8ae7cf7d101d894f6e Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Mon, 21 Nov 2022 14:33:14 +1000
Subject: [PATCH] Merge pull request #14096 from Novacat/nova-basicfixes

Trash pile adjustments
---
 code/game/objects/structures/trash_pile_vr.dm   | 7 ++++---
 code/modules/clothing/under/miscellaneous_vr.dm | 9 +++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm
index dbcbe447b3..c364425344 100644
--- a/code/game/objects/structures/trash_pile_vr.dm
+++ b/code/game/objects/structures/trash_pile_vr.dm
@@ -22,8 +22,6 @@
 		/obj/item/weapon/bluespace_harpoon,
 		/obj/item/clothing/glasses/thermal/syndi,
 		/obj/item/weapon/gun/energy/netgun,
-		/obj/item/weapon/gun/projectile/pirate,
-		/obj/item/clothing/accessory/permit/gun,
 		/obj/item/weapon/gun/projectile/dartgun,
 		/obj/item/clothing/gloves/black/bloodletter,
 		/obj/item/weapon/gun/energy/mouseray/metamorphosis
@@ -270,7 +268,7 @@
 					prob(1);/obj/item/device/flashlight/glowstick/yellow,
 					prob(1);/obj/item/device/flashlight/pen,
 					prob(1);/obj/item/device/paicard,
-					prob(1);/obj/item/weapon/card/emag,
+					prob(1);/obj/item/clothing/accessory/permit/gun,
 					prob(1);/obj/item/clothing/mask/gas/voice,
 					prob(1);/obj/item/weapon/spacecash/c100,
 					prob(1);/obj/item/weapon/spacecash/c50,
@@ -302,6 +300,7 @@
 					prob(2);/obj/item/clothing/under/hyperfiber/bluespace,
 					prob(2);/obj/item/selectable_item/chemistrykit/size,
 					prob(2);/obj/item/selectable_item/chemistrykit/gender,
+					prob(2);/obj/item/clothing/gloves/bluespace/emagged,
 					prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
 					prob(1);/obj/item/device/nif/bad,
 					prob(1);/obj/item/device/radio_jammer,
@@ -317,6 +316,8 @@
 					prob(1);/obj/item/device/survivalcapsule/popcabin,
 					prob(1);/obj/item/weapon/reagent_containers/syringe/steroid,
 					prob(1);/obj/item/capture_crystal,
+					prob(1);/obj/item/device/perfect_tele/one_beacon,
+					prob(1);/obj/item/clothing/gloves/bluespace,
 					prob(1);/obj/item/weapon/gun/energy/mouseray)
 
 	var/obj/item/I = new path()
diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm
index e66947796b..90285f561c 100644
--- a/code/modules/clothing/under/miscellaneous_vr.dm
+++ b/code/modules/clothing/under/miscellaneous_vr.dm
@@ -178,6 +178,15 @@
 		user.visible_message("<span class='notice'>\The [user] swipes the [emag_source] over the \the [src].</span>","<span class='notice'>You swipes the [emag_source] over the \the [src].</span>")
 		return 1
 
+/obj/item/clothing/gloves/bluespace/emagged
+	emagged = TRUE
+
+/obj/item/clothing/gloves/bluespace/emagged/Initialize()
+	. = ..()
+	target_size = (rand(1,300)) /100
+	if(target_size < 0.1)
+		target_size = 0.1
+
 //Same as Nanotrasen Security Uniforms
 /obj/item/clothing/under/ert
 	armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0)