From bfd97b4100e356104912e9af111e95e2aa9db9b2 Mon Sep 17 00:00:00 2001 From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon, 28 Mar 2022 14:30:39 -0400 Subject: [PATCH] Initial Commit Setting the stage for xenobio guns --- code/modules/xenobio/items/weapons_vr.dm | 44 ++++++++++++++++++++++++ vorestation.dme | 3 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 code/modules/xenobio/items/weapons_vr.dm diff --git a/code/modules/xenobio/items/weapons_vr.dm b/code/modules/xenobio/items/weapons_vr.dm new file mode 100644 index 0000000000..1271d641c8 --- /dev/null +++ b/code/modules/xenobio/items/weapons_vr.dm @@ -0,0 +1,44 @@ +/obj/item/weapon/gun/energy/xenobio + name = "xenobio gun" + desc = "You shouldn't see this!" + icon_state = "taserblue" + fire_sound = 'sound/weapons/taser2.ogg' + charge_cost = 120 // Twice as many shots. + projectile_type = /obj/item/projectile/beam/stun/xeno // Place holder for now + accuracy = 30 // Just use the same hit rate as xenotasers + var/loadable_item = null + var/loaded_item = null + +/obj/item/weapon/gun/energy/xenobio/examine(var/mob/user) + . = ..() + if(loaded_item) + .+= "A [loaded_item] is slotted into the side." + else + .+= "There appears to be an empty slot for attaching a [loadable_item]." + +/obj/item/weapon/gun/energy/xenobio/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I, loadable_item)) + if(loaded_item) + to_chat(user, "[I] doesn't seem to fit into [src].") + return + //var/obj/item/weapon/reagent_containers/glass/beaker/B = I + user.drop_item() + I.loc = src + loaded_item = I + to_chat(user, "You slot [B] into [src].") + return 1 + ..() +/obj/item/weapon/gun/energy/xenobio/monkey_gun + name = "Bluespace Cube Rehydrater" + desc = "This advanced weapon will rehydrate and deploy a loaded cube at your target position." + loadable_item = /obj/item/weapon/reagent_containers/food/snacks/monkeycube + +/obj/item/weapon/gun/energy/xenobio/potion_gun + name = "Ranged Potion Delivery Device" + desc = "This device is designed to deliver a potion to your target at range, it has a slot to attach a xenobio potion. + loadable_item = /obj/item/slimepotion + +/obj/item/weapon/gun/energy/xenobio/extract_gun + name = "Ranged Extract Interaction Device" + desc = "This is the latest in extract interaction technology! No longer shall you stand in harms way when activating a gold slime." + loadable_item = /obj/item/slime_extract \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index ca6633e66b..08c9871c56 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4056,6 +4056,7 @@ #include "code\modules\xenobio\items\slimepotions.dm" #include "code\modules\xenobio\items\slimepotions_vr.dm" #include "code\modules\xenobio\items\weapons.dm" +#include "code\modules\xenobio\items\weapons_vr.dm" #include "code\modules\xenobio\machinery\processor.dm" #include "code\modules\xgm\xgm_gas_data.dm" #include "code\modules\xgm\xgm_gas_mixture.dm" @@ -4103,7 +4104,6 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" -#include "maps\stellardelight\stellar_delight.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\engine_submaps\engine.dm" @@ -4113,5 +4113,6 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" +#include "maps\virgo_minitest\virgo_minitest.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE