cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some balancing tweaks with the new guns firecage added.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1857 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Superxpdude@gmail.com
2011-07-15 17:46:31 +00:00
parent 0931d9b3b2
commit 1c44f7da15
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/guns_new.dm
+5 -4
View File
@@ -751,6 +751,7 @@ var/const/PROJECTILE_SHOCK = 9
taser
name = "taser gun"
desc = "A small, low capacity gun used for non-lethal takedowns."
icon_state = "taser"
fire_sound = 'Taser.ogg'
charge_cost = 100
@@ -786,7 +787,7 @@ var/const/PROJECTILE_SHOCK = 9
name = "shock gun"
icon_state = "shockgun"
fire_sound = 'Laser.ogg'
charge_cost = 50
charge_cost = 250
load_into_chamber()
if(in_chamber)
@@ -801,14 +802,14 @@ var/const/PROJECTILE_SHOCK = 9
return
New()
power_supply = new /obj/item/weapon/cell/super(src)
power_supply = new /obj/item/weapon/cell(src)
power_supply.give(power_supply.maxcharge)
stunrevolver
name = "stun revolver"
icon_state = "stunrevolver"
fire_sound = 'Gunshot.ogg'
charge_cost = 25
charge_cost = 125
load_into_chamber()
if(in_chamber)
@@ -823,7 +824,7 @@ var/const/PROJECTILE_SHOCK = 9
return
New()
power_supply = new /obj/item/weapon/cell/crap(src)
power_supply = new /obj/item/weapon/cell(src)
power_supply.give(power_supply.maxcharge)
freeze
code/game/research/designs.dm
+5 -7
View File
@@ -933,21 +933,19 @@ datum
stunrevolver
name = "Stun Revolver"
desc = "The prize of the Head of Security."
id = "nuclear_gun"
req_tech = list("combat" = 2, "materials" = 2)
id = "stunrevolver"
req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2)
build_type = PROTOLATHE
materials = list("$metal" = 4000)
reliability_base = 76
materials = list("$metal" = 4000, "$gold" = 500)
build_path = "/obj/item/weapon/gun/energy/stunrevolver"
shockgun
name = "Shock Gun"
desc = "Your opponent has just lost THE GAME."
id = "shockgun"
req_tech = list("combat" = 4, "materials" = 4, "powerstorage" = 3)
req_tech = list("combat" = 6, "materials" = 4, "powerstorage" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 8000, "$silver" = 3000)
reliability_base = 76
materials = list("$metal" = 8000, "$silver" = 3000, "$gold" = 500)
build_path = "/obj/item/weapon/gun/energy/shockgun"
chemsprayer