mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 11:05:03 +01:00
Fixes issue 521.
Fixes issue 676. Fixes issue 700. Fixes issue 753. Fixes issue 754. Fixes issue 755. Additionally I slightly cleaned up grenade code and stunglove code, and removed mustardbomb.dm (because it was fucking awful). THIS BUGFIX TRAIN AIN'T STOPPIN' Thanks QualityVan for the issue 521 fix, and thanks Nodrak & Tobba for pointing out my dumbness for issues 753 & 754 respectively. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4382 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -6,7 +6,6 @@
|
||||
protective_temperature = 400
|
||||
heat_transfer_coefficient = 0.25
|
||||
siemens_coefficient = 0.50
|
||||
var/siemens_coefficient_archived = 0
|
||||
var/wired = 0
|
||||
var/obj/item/weapon/cell/cell = 0
|
||||
body_parts_covered = HANDS
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
updateicon()
|
||||
|
||||
/obj/item/weapon/cell/proc/updateicon()
|
||||
|
||||
overlays = null
|
||||
|
||||
if(charge < 0.01)
|
||||
@@ -68,34 +67,8 @@
|
||||
call(/obj/item/clothing/gloves/space_ninja/proc/drain)("CELL",src,user:wear_suit)
|
||||
return
|
||||
|
||||
//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)
|
||||
..()
|
||||
//HONK HONK GLOVES NERF -Pete
|
||||
/*
|
||||
var/obj/item/clothing/gloves/G = W
|
||||
if(istype(G))
|
||||
// var/datum/effect/system/spark_spread/s = new /datum/effect/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(!istype(W, /obj/item/clothing/gloves/yellow))
|
||||
if(!G.wired)
|
||||
user << "You run an electrical current through the gloves, but nothing happens!"
|
||||
return
|
||||
|
||||
if(charge < 1000)
|
||||
return
|
||||
|
||||
// G.siemens_coefficient = max(G.siemens_coefficient,0.3)
|
||||
G.elecgen = 1
|
||||
G.uses = min(5, round(charge / 1000))
|
||||
use(G.uses*1000)
|
||||
updateicon()
|
||||
user << "\red These gloves are now electrically charged!"
|
||||
*/
|
||||
|
||||
if(istype(W, /obj/item/weapon/reagent_containers/syringe))
|
||||
var/obj/item/weapon/reagent_containers/syringe/S = W
|
||||
|
||||
|
||||
Reference in New Issue
Block a user