cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Proper fix for minebot damage issue

Browse Source
This commit is contained in:
Markolie
2017-02-15 17:23:57 +01:00
parent 519749cf8d
commit 56dd8b189e
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/minebot.dm
+1 -1
View File
@@ -32,7 +32,7 @@
sentience_type = SENTIENCE_MINEBOT
ranged_message = "shoots"
ranged_cooldown_time = 30
projectiletype = /obj/item/projectile/kinetic/minebot
projectiletype = /obj/item/projectile/kinetic
projectilesound = 'sound/weapons/Gunshot4.ogg'
speak_emote = list("states")
wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+9 -13
View File
@@ -153,15 +153,15 @@
var/obj/item/weapon/gun/energy/kinetic_accelerator/KA = loc
KA.modify_projectile(BB)
var/turf/proj_turf = get_turf(BB)
if(!isturf(proj_turf))
return
var/datum/gas_mixture/environment = proj_turf.return_air()
var/pressure = environment.return_pressure()
if(pressure > 50)
BB.name = "weakened [BB.name]"
var/obj/item/projectile/kinetic/K = BB
K.damage *= K.pressure_decrease
var/turf/proj_turf = get_turf(BB)
if(!isturf(proj_turf))
return
var/datum/gas_mixture/environment = proj_turf.return_air()
var/pressure = environment.return_pressure()
if(pressure > 50)
BB.name = "weakened [BB.name]"
var/obj/item/projectile/kinetic/K = BB
K.damage *= K.pressure_decrease
//Projectiles
@@ -178,10 +178,6 @@
var/turf_aoe = FALSE
var/mob_aoe = FALSE
var/list/hit_overlays = list()
/obj/item/projectile/kinetic/minebot
damage = 10
pressure_decrease = 1
/obj/item/projectile/kinetic/on_range()
strike_thing()