cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 08:36:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #11110

Browse Source
This commit is contained in:
c0
2015-08-09 15:22:25 +03:00
parent 999641a36b
commit 73b4e8f5a6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implant_explosive.dm
+6 -6
View File
@@ -3,9 +3,9 @@
desc = "And boom goes the weasel."
icon_state = "explosive"
origin_tech = "materials=2;combat=3;biotech=4;syndicate=4"
var/weak = 1.6
var/medium = 0.8
var/heavy = 0.4
var/weak = 2
var/medium = 1
var/heavy = 0.5
var/delay = 7
/obj/item/weapon/implant/explosive/get_data()
@@ -42,7 +42,7 @@
/obj/item/weapon/implant/explosive/implant(mob/source)
var/obj/item/weapon/implant/explosive/imp_e = locate(src.type) in source
if(imp_e)
if(imp_e && imp_e != src)
imp_e.heavy += heavy
imp_e.medium += medium
imp_e.weak += weak
@@ -89,10 +89,10 @@
/obj/item/weapon/implant/explosive/macro/implant(mob/source)
var/obj/item/weapon/implant/explosive/imp_e = locate(src.type) in source
if(imp_e)
if(imp_e && imp_e != src)
return 0
imp_e = locate(/obj/item/weapon/implant/explosive) in source
if(imp_e)
if(imp_e && imp_e != src)
heavy += imp_e.heavy
medium += imp_e.medium
weak += imp_e.weak
code/game/objects/items/weapons/implants/implantuplink.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/obj/item/weapon/implant/uplink/implant(mob/source)
var/obj/item/weapon/implant/imp_e = locate(src.type) in source
if(imp_e)
if(imp_e && imp_e != src)
imp_e.hidden_uplink.uses += hidden_uplink.uses
qdel(src)
return 1