cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 08:31:57 +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

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

@@ -14,9 +14,9 @@
matter = list(DEFAULT_WALL_MATERIAL = 90)
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
var/spray_particles = 6
var/spray_amount = 8 //units of liquid per particle
var/max_water = 240
var/spray_particles = 3
var/spray_amount = 10 //units of liquid per particle
var/max_water = 300
var/last_use = 1.0
var/safety = 1
var/sprite_name = "fire_extinguisher"
@@ -30,8 +30,8 @@
throwforce = 2
w_class = 2.0
force = 3.0
max_water = 120
spray_particles = 5
max_water = 150
spray_particles = 3
sprite_name = "miniFE"
/obj/item/weapon/extinguisher/New()
@@ -63,7 +63,7 @@
if(C) C.propelled = (6-i)
O.Move(get_step(user,movementdirection), movementdirection)
sleep(move_speed[i])
//additional movement
for(var/i in 1 to 3)
O.Move(get_step(user,movementdirection), movementdirection)
@@ -106,7 +106,7 @@
for(var/a = 1 to spray_particles)
spawn(0)
if(!src || !reagents.total_volume) return
var/obj/effect/effect/water/W = PoolOrNew(/obj/effect/effect/water, get_turf(src))
var/turf/my_target
if(a <= the_targets.len)