diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 5707d9ac80..66a99d9e71 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -281,4 +281,28 @@ var/obj/effect/decal/cleanable/C = locate() in target del(C) target.clean_blood() - return \ No newline at end of file + return + +/obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun //Not a taser, but it's being used as a base so it takes energy and actually works. + name = "disabler" + desc = "A small and nonlethal gun produced by NT.." + icon = 'icons/mob/dogborg_vr.dmi' + icon_state = "projgun" + fire_sound = 'sound/weapons/eLuger.ogg' + projectile_type = /obj/item/projectile/beam/disable + charge_cost = 1000 //High cost. + recharge_time = 10 //Takes ten ticks to recharge a laser, so don't waste them all! + +/obj/item/weapon/dogborg/swordtail + name = "sword tail" + icon = 'icons/mob/dogborg_vr.dmi' + icon_state = "swordtail" + desc = "A glowing pink dagger normally attached to the end of a cyborg's tail. It appears to be extremely sharp." + flags = CONDUCT + force = 20 //Takes 5 hits to 100-0 + sharp = 1 + edge = 1 + throwforce = 0 //This shouldn't be thrown in the first place. + hitsound = 'sound/weapons/blade1.ogg' + attack_verb = list("slashed", "stabbed", "jabbed", "mauled", "sliced") + w_class = ITEMSIZE_NORMAL \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index aa3640a52e..fb69bdd672 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -249,6 +249,7 @@ if(crisis || security_level == SEC_LEVEL_RED || crisis_override) // VOREStation Edit src << "\red Crisis mode active. Combat module available." modules+="Combat" + modules+="ERT" //VOREStation Edit modtype = input("Please, select a module!", "Robot module", null, null) as null|anything in modules if(module) diff --git a/code/modules/mob/living/silicon/robot/robot_modules_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules_vr.dm index 6950ec13e3..c4ac313906 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules_vr.dm @@ -1,6 +1,7 @@ /hook/startup/proc/robot_modules_vr() robot_modules["Medihound"] = /obj/item/weapon/robot_module/medihound robot_modules["K9"] = /obj/item/weapon/robot_module/knine + robot_modules["ERT"] = /obj/item/weapon/robot_module/ert return 1 @@ -76,4 +77,31 @@ //R.icon_state = "medihound" R.pixel_x = -16 R.old_x = -16 - ..() \ No newline at end of file + ..() + +/obj/item/weapon/robot_module/ert + name = "Emergency Responce module" + channels = list("Security" = 1) + networks = list(NETWORK_SECURITY) + can_be_pushed = 0 + sprites = list( + "Standard" = "ert" + ) + +/obj/item/weapon/robot_module/ert/New(var/mob/living/silicon/robot/R) + src.modules += new /obj/item/device/flash(src) + src.modules += new /obj/item/weapon/handcuffs/cyborg(src) + src.modules += new /obj/item/weapon/dogborg/jaws/big(src) + src.modules += new /obj/item/weapon/melee/baton/robot(src) + src.modules += new /obj/item/device/dogborg/tongue(src) + src.modules += new /obj/item/taperoll/police(src) + src.modules += new /obj/item/device/dogborg/sleeper/K9(src) + src.modules += new /obj/item/borg/sight/hud/sec(src) + src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun(src) + src.modules += new /obj/item/weapon/dogborg/swordtail(src) + src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) + R.icon = 'icons/mob/62x62robot_vr.dmi' + R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' + R.pixel_x = -16 + R.old_x = -16 + ..() diff --git a/code/modules/projectiles/projectile/beams_vr.dm b/code/modules/projectiles/projectile/beams_vr.dm new file mode 100644 index 0000000000..a80e58ecd9 --- /dev/null +++ b/code/modules/projectiles/projectile/beams_vr.dm @@ -0,0 +1,12 @@ +/obj/item/projectile/beam/disable + name = "disabler beam" + icon_state = "omnilaser" + nodamage = 1 + taser_effect = 1 + agony = 60 // Does as much damage as a heavy bullet, but in agony damage. + damage_type = HALLOSS + light_color = "#FFFFFF" + + muzzle_type = /obj/effect/projectile/laser_omni/muzzle + tracer_type = /obj/effect/projectile/laser_omni/tracer + impact_type = /obj/effect/projectile/laser_omni/impact \ No newline at end of file diff --git a/icons/mob/62x62robot_vr.dmi b/icons/mob/62x62robot_vr.dmi new file mode 100644 index 0000000000..0aaf9f189d Binary files /dev/null and b/icons/mob/62x62robot_vr.dmi differ diff --git a/icons/mob/dogborg_vr.dmi b/icons/mob/dogborg_vr.dmi index ea5a095bb9..b06b9a9ab0 100644 Binary files a/icons/mob/dogborg_vr.dmi and b/icons/mob/dogborg_vr.dmi differ diff --git a/icons/mob/screen1_robot_vr.dmi b/icons/mob/screen1_robot_vr.dmi index 310df85058..306e957c71 100644 Binary files a/icons/mob/screen1_robot_vr.dmi and b/icons/mob/screen1_robot_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 0b62919e7d..4613e98d3a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1930,6 +1930,7 @@ #include "code\modules\projectiles\guns\projectile\sniper_vr.dm" #include "code\modules\projectiles\projectile\animate.dm" #include "code\modules\projectiles\projectile\beams.dm" +#include "code\modules\projectiles\projectile\beams_vr.dm" #include "code\modules\projectiles\projectile\bullets.dm" #include "code\modules\projectiles\projectile\change.dm" #include "code\modules\projectiles\projectile\energy.dm" @@ -2218,9 +2219,9 @@ #include "code\modules\xenoarcheaology\tools\geosample_scanner.dm" #include "code\modules\xenoarcheaology\tools\suspension_generator.dm" #include "code\modules\xenoarcheaology\tools\tools.dm" -#include "code\modules\xenoarcheaology\tools\tools_vr.dm" #include "code\modules\xenoarcheaology\tools\tools_pickaxe.dm" #include "code\modules\xenoarcheaology\tools\tools_pickaxe_vr.dm" +#include "code\modules\xenoarcheaology\tools\tools_vr.dm" #include "code\modules\xenobio2\_xeno_setup.dm" #include "code\modules\xenobio2\_xeno_setup_vr.dm" #include "code\modules\xenobio2\controller.dm"