From 4d9af38a9ba46510bae1a82d40a622da2b63cfcf Mon Sep 17 00:00:00 2001 From: VerySoft Date: Wed, 9 Feb 2022 19:00:46 -0500 Subject: [PATCH] One last one! --- .../objects/items/weapons/id cards/cards.dm | 1 - .../clothing/under/miscellaneous_vr.dm | 27 ++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 4831d92e56f..260eff8539b 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -116,7 +116,6 @@ else log_and_message_admins("attempted to emag \an [A].") // Vorestation Edit: End of Edit - log_and_message_admins("emagged \an [A].") if(uses<1) user.visible_message("\The [src] fizzles and sparks - it seems it's been used once too often, and is now spent.") diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 244cbec2b9b..b5cde697cf3 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -123,6 +123,8 @@ w_class = ITEMSIZE_TINY var/original_size var/last_activated + var/emagged = FALSE + var/target_size = 1 /obj/item/clothing/gloves/bluespace/mob_can_equip(mob/M, gloves, disable_warning = 0) . = ..() @@ -130,13 +132,13 @@ var/mob/living/carbon/human/H = M if(!H.resizable) return - if(H.size_multiplier != 1) + if(H.size_multiplier != target_size) if(!(world.time - last_activated > 10 SECONDS)) to_chat(M, "\The [src] flickers. It seems to be recharging.") return last_activated = world.time original_size = H.size_multiplier - H.resize(1, ignore_prefs = FALSE) //In case someone else tries to put it on you. + H.resize(target_size, uncapped = emagged, ignore_prefs = FALSE) //In case someone else tries to put it on you. H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") log_admin("Admin [key_name(M)]'s size was altered by a bluespace bracelet.") @@ -147,12 +149,31 @@ if(!H.resizable) return last_activated = world.time - H.resize(original_size, ignore_prefs = FALSE) + H.resize(original_size, uncapped = emagged, ignore_prefs = FALSE) original_size = null H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") log_admin("Admin [key_name(M)]'s size was altered by a bluespace bracelet.") to_chat(M, "\The [src] flickers. It is now recharging and will be ready again in thirty seconds.") +/obj/item/clothing/gloves/bluespace/examine(var/mob/user) + . = ..() + var/cooldowntime = round((10 SECONDS - (world.time - last_activated)) * 0.1) + if(Adjacent(user)) + if(cooldowntime >= 0) + . += "It appears to be recharging." + if(emagged) + . += "The crystal is flickering." + +/obj/item/clothing/gloves/bluespace/emag_act(R_charges, var/mob/user, emag_source) + . = ..() + if(!emagged) + emagged = TRUE + target_size = (rand(1,300)) /100 + if(target_size < 0.1) + target_size = 0.1 + user.visible_message("\The [user] swipes the [emag_source] over the \the [src].","You swipes the [emag_source] over the \the [src].") + return 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)