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

Stun glove changes reverted.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@939 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
bizarre.babel@gmail.com
2011-02-02 09:11:15 +00:00
parent b2ec4cbf5e
commit 57dc9a25e9
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/carbon/human/human.dm
View File

@@ -2645,8 +2645,8 @@
if (istype(id))
return id
/mob/living/carbon/human/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0)
if(src.gloves)
var/obj/item/clothing/gloves/G = src.gloves
siemens_coeff = G.siemens_coefficient
return ..(shock_damage,source,siemens_coeff)
///mob/living/carbon/human/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0)
// if(src.gloves)
// var/obj/item/clothing/gloves/G = src.gloves
// siemens_coeff = G.siemens_coefficient
// return ..(shock_damage,source,siemens_coeff)

14
code/modules/power/cell.dm
View File

@@ -53,19 +53,19 @@
else
usr << "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!!!\nThe charge meter reads [round(src.percent() )]%."
//Just because someone gets you occasionally with stun gloves doesn't mean you can put in code to kill everyone who tries to make some.
/obj/item/weapon/cell/attackby(obj/item/W, mob/user)
var/obj/item/clothing/gloves/G = W
if(istype(G))
var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
s.set_up(3, 1, src)
// var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
// s.set_up(3, 1, src)
s.start()
if (prob(80+(G.siemens_coefficient*100)) && electrocute_mob(user, src, src))
return 1
// if (prob(80+(G.siemens_coefficient*100)) && electrocute_mob(user, src, src))
// return 1
if(charge < 1000)
return
G.siemens_coefficient = max(G.siemens_coefficient,0.3)
// G.siemens_coefficient = max(G.siemens_coefficient,0.3)
G.elecgen = 1
G.uses = min(5, round(charge / 1000))
use(G.uses*1000)
@@ -133,7 +133,7 @@
if (prob(25))
corrupt()
return
/obj/item/weapon/cell/blob_act()
if(prob(75))
explode()