From 3162c723d99a280feab6bb78b709521706eef2e2 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 13 Feb 2017 15:48:13 +0000 Subject: [PATCH] Security non-lethal balance --- code/game/machinery/vending_vr.dm | 3 ++- code/game/objects/items/devices/flash.dm | 2 +- code/game/objects/items/devices/flash_vr.dm | 2 ++ code/modules/projectiles/guns/energy/stun_vr.dm | 6 ++++++ code/modules/projectiles/guns/projectile/pistol_vr.dm | 2 ++ code/modules/projectiles/projectile/beams_vr.dm | 3 +++ code/modules/projectiles/projectile/energy_vr.dm | 11 +++++++++++ vorestation.dme | 4 ++++ 8 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 code/game/objects/items/devices/flash_vr.dm create mode 100644 code/modules/projectiles/guns/energy/stun_vr.dm create mode 100644 code/modules/projectiles/guns/projectile/pistol_vr.dm create mode 100644 code/modules/projectiles/projectile/energy_vr.dm diff --git a/code/game/machinery/vending_vr.dm b/code/game/machinery/vending_vr.dm index 8bfbff7754..2e8c1c52de 100644 --- a/code/game/machinery/vending_vr.dm +++ b/code/game/machinery/vending_vr.dm @@ -11,7 +11,8 @@ products = list(/obj/item/weapon/handcuffs = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5, /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6, /obj/item/weapon/gun/energy/taser = 8,/obj/item/weapon/gun/energy/stunrevolver = 4, - /obj/item/weapon/reagent_containers/spray/pepper = 6,/obj/item/taperoll/police = 6) + /obj/item/weapon/reagent_containers/spray/pepper = 6,/obj/item/taperoll/police = 6, + /obj/item/weapon/gun/projectile/sec/flash = 4) /* var/list/log = list() var/req_log_access = access_armory diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index b553f4416c..d1a5b63e82 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -86,7 +86,7 @@ if(C.stat != DEAD) var/safety = C.eyecheck() if(safety <= 0) - var/flash_strength = 5 + var/flash_strength = 10 //Vorestation edit, making flashes behave the same as flash rounds if(ishuman(C)) var/mob/living/carbon/human/H = C flash_strength *= H.species.flash_mod diff --git a/code/game/objects/items/devices/flash_vr.dm b/code/game/objects/items/devices/flash_vr.dm new file mode 100644 index 0000000000..dcc7b1a0f4 --- /dev/null +++ b/code/game/objects/items/devices/flash_vr.dm @@ -0,0 +1,2 @@ +/obj/item/device/flash + halloss_per_flash = 22 \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/stun_vr.dm b/code/modules/projectiles/guns/energy/stun_vr.dm new file mode 100644 index 0000000000..b0bfd53e46 --- /dev/null +++ b/code/modules/projectiles/guns/energy/stun_vr.dm @@ -0,0 +1,6 @@ +/obj/item/weapon/gun/energy/taser + charge_cost = 160 + fire_delay = 4 + +/obj/item/weapon/gun/energy/stunrevolver + charge_cost = 400 \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/pistol_vr.dm b/code/modules/projectiles/guns/projectile/pistol_vr.dm new file mode 100644 index 0000000000..9f11eefdb1 --- /dev/null +++ b/code/modules/projectiles/guns/projectile/pistol_vr.dm @@ -0,0 +1,2 @@ +/obj/item/weapon/gun/projectile/sec/flash + name = ".45 pistol" \ No newline at end of file diff --git a/code/modules/projectiles/projectile/beams_vr.dm b/code/modules/projectiles/projectile/beams_vr.dm index f6738fc597..c9325109e4 100644 --- a/code/modules/projectiles/projectile/beams_vr.dm +++ b/code/modules/projectiles/projectile/beams_vr.dm @@ -10,3 +10,6 @@ muzzle_type = /obj/effect/projectile/laser_omni/muzzle tracer_type = /obj/effect/projectile/laser_omni/tracer impact_type = /obj/effect/projectile/laser_omni/impact + +/obj/item/projectile/beam/stun + agony = 35 \ No newline at end of file diff --git a/code/modules/projectiles/projectile/energy_vr.dm b/code/modules/projectiles/projectile/energy_vr.dm new file mode 100644 index 0000000000..5148c831bd --- /dev/null +++ b/code/modules/projectiles/projectile/energy_vr.dm @@ -0,0 +1,11 @@ +/obj/item/projectile/energy/electrode/strong + agony = 70 + +/obj/item/projectile/energy + flash_strength = 10 + +/obj/item/projectile/energy/flash + flash_range = 1 + +/obj/item/projectile/energy/flash/flare + flash_range = 2 \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 09625b10f5..09d0f0f16f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -792,6 +792,7 @@ #include "code\game\objects\items\devices\debugger.dm" #include "code\game\objects\items\devices\defib.dm" #include "code\game\objects\items\devices\flash.dm" +#include "code\game\objects\items\devices\flash_vr.dm" #include "code\game\objects\items\devices\flashlight.dm" #include "code\game\objects\items\devices\floor_painter.dm" #include "code\game\objects\items\devices\hacktool.dm" @@ -1955,6 +1956,7 @@ #include "code\modules\projectiles\guns\energy\pulse.dm" #include "code\modules\projectiles\guns\energy\special.dm" #include "code\modules\projectiles\guns\energy\stun.dm" +#include "code\modules\projectiles\guns\energy\stun_vr.dm" #include "code\modules\projectiles\guns\energy\temperature.dm" #include "code\modules\projectiles\guns\launcher\crossbow.dm" #include "code\modules\projectiles\guns\launcher\grenade_launcher.dm" @@ -1966,6 +1968,7 @@ #include "code\modules\projectiles\guns\projectile\boltaction.dm" #include "code\modules\projectiles\guns\projectile\dartgun.dm" #include "code\modules\projectiles\guns\projectile\pistol.dm" +#include "code\modules\projectiles\guns\projectile\pistol_vr.dm" #include "code\modules\projectiles\guns\projectile\revolver.dm" #include "code\modules\projectiles\guns\projectile\shotgun.dm" #include "code\modules\projectiles\guns\projectile\sniper.dm" @@ -1977,6 +1980,7 @@ #include "code\modules\projectiles\projectile\bullets_vr.dm" #include "code\modules\projectiles\projectile\change.dm" #include "code\modules\projectiles\projectile\energy.dm" +#include "code\modules\projectiles\projectile\energy_vr.dm" #include "code\modules\projectiles\projectile\force.dm" #include "code\modules\projectiles\projectile\special.dm" #include "code\modules\projectiles\targeting\targeting_client.dm"