From 2d07f1ac1fa5964b63aab741770372c91a7cb485 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 20 Feb 2021 13:28:02 -0500 Subject: [PATCH] Emag Changes - Trash pile Emags are a lot rarer now. - Gun Permits are no longer gamma trash pile loot - You can now find out how many uses are remaining on an emag - Adds a 'used' variant of emag for adminbus purposes --- code/game/objects/items/weapons/id cards/cards_vr.dm | 10 ++++++++++ code/game/objects/structures/trash_pile_vr.dm | 6 +++--- vorestation.dme | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 code/game/objects/items/weapons/id cards/cards_vr.dm diff --git a/code/game/objects/items/weapons/id cards/cards_vr.dm b/code/game/objects/items/weapons/id cards/cards_vr.dm new file mode 100644 index 00000000000..c7abd117d6e --- /dev/null +++ b/code/game/objects/items/weapons/id cards/cards_vr.dm @@ -0,0 +1,10 @@ +/obj/item/weapon/card/emag/examine(mob/user) + . = ..() + . += "[uses] uses remaining." + +/obj/item/weapon/card/emag/used + uses = 1 + +/obj/item/weapon/card/emag/used/Initialize() + . = ..() + uses = rand(1, 5) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index d2772caa4bd..af6e7fdce1b 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -23,8 +23,8 @@ /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/weapon/gun/projectile/dartgun, + /obj/item/weapon/card/emag ) var/global/list/allocated_gamma = list() @@ -214,7 +214,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, diff --git a/vorestation.dme b/vorestation.dme index eeb1ef69d2e..0b7879eb73f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1301,6 +1301,7 @@ #include "code\game\objects\items\weapons\grenades\spawnergrenade_vr.dm" #include "code\game\objects\items\weapons\grenades\supermatter.dm" #include "code\game\objects\items\weapons\id cards\cards.dm" +#include "code\game\objects\items\weapons\id cards\cards_vr.dm" #include "code\game\objects\items\weapons\id cards\station_ids.dm" #include "code\game\objects\items\weapons\id cards\station_ids_vr.dm" #include "code\game\objects\items\weapons\id cards\syndicate_ids.dm"