From 5a295da794669837402937ebe6a87b9be100e120 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 16 Nov 2022 22:37:09 -0500 Subject: [PATCH 1/4] Trash pile adjustments. --- code/game/objects/items/weapons/id cards/cards_vr.dm | 3 +++ code/game/objects/structures/trash_pile_vr.dm | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/id cards/cards_vr.dm b/code/game/objects/items/weapons/id cards/cards_vr.dm index c7abd117d6e..1f066f0fe10 100644 --- a/code/game/objects/items/weapons/id cards/cards_vr.dm +++ b/code/game/objects/items/weapons/id cards/cards_vr.dm @@ -8,3 +8,6 @@ /obj/item/weapon/card/emag/used/Initialize() . = ..() uses = rand(1, 5) + +/obj/item/weapon/card/emag/one + uses = 1 diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index ccd069386bf..6f8d24e45cd 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -23,7 +23,7 @@ /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/card/emag/one, /obj/item/weapon/gun/projectile/dartgun, /obj/item/clothing/gloves/black/bloodletter, /obj/item/weapon/gun/energy/mouseray/metamorphosis @@ -263,7 +263,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, From cb641251ea851b1668353d8e1090a2a50164f1b2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 16 Nov 2022 22:40:46 -0500 Subject: [PATCH 2/4] More tweaks --- code/game/objects/structures/trash_pile_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 6f8d24e45cd..fb3179f15c8 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -22,7 +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/weapon/card/emag/one, /obj/item/weapon/gun/projectile/dartgun, /obj/item/clothing/gloves/black/bloodletter, @@ -309,6 +308,7 @@ 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/weapon/gun/energy/mouseray) var/obj/item/I = new path() From c946a1db67a6024d870369151dfd55881fa99d88 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 17 Nov 2022 00:31:17 -0500 Subject: [PATCH 3/4] Removes emags from trash piles entirely. --- code/game/objects/items/weapons/id cards/cards_vr.dm | 3 --- code/game/objects/structures/trash_pile_vr.dm | 1 - 2 files changed, 4 deletions(-) diff --git a/code/game/objects/items/weapons/id cards/cards_vr.dm b/code/game/objects/items/weapons/id cards/cards_vr.dm index 1f066f0fe10..c7abd117d6e 100644 --- a/code/game/objects/items/weapons/id cards/cards_vr.dm +++ b/code/game/objects/items/weapons/id cards/cards_vr.dm @@ -8,6 +8,3 @@ /obj/item/weapon/card/emag/used/Initialize() . = ..() uses = rand(1, 5) - -/obj/item/weapon/card/emag/one - uses = 1 diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index fb3179f15c8..bbfbfa41654 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -22,7 +22,6 @@ /obj/item/weapon/bluespace_harpoon, /obj/item/clothing/glasses/thermal/syndi, /obj/item/weapon/gun/energy/netgun, - /obj/item/weapon/card/emag/one, /obj/item/weapon/gun/projectile/dartgun, /obj/item/clothing/gloves/black/bloodletter, /obj/item/weapon/gun/energy/mouseray/metamorphosis From 80726f79dfcbaa4e9183b3351d3ec3f05b375549 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 17 Nov 2022 08:46:30 -0500 Subject: [PATCH 4/4] Adds size standardization bracelets (including emagged variant) --- code/game/objects/structures/trash_pile_vr.dm | 2 ++ code/modules/clothing/under/miscellaneous_vr.dm | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index bbfbfa41654..054da3a31dc 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -292,6 +292,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, @@ -308,6 +309,7 @@ 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 f4557c70eff..aacd217cd69 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -175,6 +175,15 @@ user.visible_message("\The [user] swipes the [emag_source] over the \the [src].","You swipes the [emag_source] over the \the [src].") 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)