cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 00:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fire extinguisher fixes and tweaks

Browse Source 
Port of https://github.com/PolarisSS13/Polaris/pull/713.
This commit is contained in:
PsiOmegaDelta
2016-01-08 14:44:26 +01:00
parent 875d8455f0
commit afd526126d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/items/weapons/extinguisher.dm
View File

@@ -14,9 +14,9 @@
matter = list(DEFAULT_WALL_MATERIAL = 90) matter = list(DEFAULT_WALL_MATERIAL = 90)
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
var/spray_particles = 6 var/spray_particles = 3
var/spray_amount = 8 //units of liquid per particle var/spray_amount = 10 //units of liquid per particle
var/max_water = 240 var/max_water = 300
var/last_use = 1.0 var/last_use = 1.0
var/safety = 1 var/safety = 1
var/sprite_name = "fire_extinguisher" var/sprite_name = "fire_extinguisher"
@@ -30,8 +30,8 @@
throwforce = 2 throwforce = 2
w_class = 2.0 w_class = 2.0
force = 3.0 force = 3.0
max_water = 120 max_water = 150
spray_particles = 5 spray_particles = 3
sprite_name = "miniFE" sprite_name = "miniFE"
/obj/item/weapon/extinguisher/New() /obj/item/weapon/extinguisher/New()

2
code/modules/mob/living/carbon/carbon.dm
View File

@@ -235,8 +235,8 @@
M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames!</span>", M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames!</span>",
"<span class='warning'>You try to pat out [src]'s flames! Hot!</span>") "<span class='warning'>You try to pat out [src]'s flames! Hot!</span>")
if(do_mob(M, src, 15)) if(do_mob(M, src, 15))
src.fire_stacks -= 0.5
if (prob(10) && (M.fire_stacks <= 0)) if (prob(10) && (M.fire_stacks <= 0))
src.fire_stacks -= 0.5
M.fire_stacks += 1 M.fire_stacks += 1
M.IgniteMob() M.IgniteMob()
if (M.on_fire) if (M.on_fire)