cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Security non-lethal balance

Browse Source
This commit is contained in:
Yoshax
2017-02-13 15:48:13 +00:00
parent 5ea40be101
commit 3162c723d9
8 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/machinery/vending_vr.dm
View File

@@ -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

2
code/game/objects/items/devices/flash.dm
View File

@@ -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

2
code/game/objects/items/devices/flash_vr.dm Normal file
View File

@@ -0,0 +1,2 @@
/obj/item/device/flash
halloss_per_flash = 22

6
code/modules/projectiles/guns/energy/stun_vr.dm Normal file
View File

@@ -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

2
code/modules/projectiles/guns/projectile/pistol_vr.dm Normal file
View File

@@ -0,0 +1,2 @@
/obj/item/weapon/gun/projectile/sec/flash
name = ".45 pistol"

3
code/modules/projectiles/projectile/beams_vr.dm
View File

@@ -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

11
code/modules/projectiles/projectile/energy_vr.dm Normal file
View File

@@ -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

4
vorestation.dme
View File

@@ -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"