cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extinguisher/smoke puddle nerfs (#32215)

Browse Source 
* Extinguisher/smoke puddle nerfs

* Slight buff but still overall nerf of smoke on turfs

Co-authored-by: kanef <kanef9x@protonmail.com>
This commit is contained in:
kane-f
2022-03-17 09:32:38 +00:00
committed by GitHub
parent f0ec7882fd
commit 2666d512b8
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/objects/effects/effect_system.dm
View File

@@ -442,11 +442,12 @@ steam.start() -- spawns the effect
/obj/effect/smoke/chem/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, glide_size_override = 0) /obj/effect/smoke/chem/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, glide_size_override = 0)
..() ..()
for(var/atom/A in view(2, src)) for(var/atom/A in view(2, src))
var/multiplier = !isturf(A) ? 1 : (1 / 9) // If a turf, evenly distribute the reaction amount across all of them in a 3x3 view
if(reagents.has_reagent(RADIUM)||reagents.has_reagent(URANIUM)||reagents.has_reagent(CARBON)||reagents.has_reagent(THERMITE)||reagents.has_reagent(BLEACH))//Prevents unholy radium spam by reducing the number of 'greenglows' down to something reasonable -Sieve if(reagents.has_reagent(RADIUM)||reagents.has_reagent(URANIUM)||reagents.has_reagent(CARBON)||reagents.has_reagent(THERMITE)||reagents.has_reagent(BLEACH))//Prevents unholy radium spam by reducing the number of 'greenglows' down to something reasonable -Sieve
if(prob(5)) if(prob(5))
reagents.reaction(A) reagents.reaction(A, volume_multiplier = multiplier)
else else
reagents.reaction(A) reagents.reaction(A, volume_multiplier = multiplier)
return return

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

@@ -202,11 +202,11 @@
R.my_atom = W R.my_atom = W
if(!W || !src) if(!W || !src)
return return
for(var/b=0, b<5, b++) for(var/b=0, b<REAGENT_USE, b++)
step_towards(W,my_target) step_towards(W,my_target)
if(!W || !W.reagents) if(!W || !W.reagents)
return return
W.reagents.reaction(get_turf(W), TOUCH) W.reagents.reaction(get_turf(W), TOUCH, volume_multiplier = 1 / (REAGENT_USE ** 2))
for(var/atom/atm in get_turf(W)) for(var/atom/atm in get_turf(W))
if(!W) if(!W)
return return
@@ -281,12 +281,12 @@
var/turf/my_target = pick(the_targets) var/turf/my_target = pick(the_targets)
if(!W || !src) if(!W || !src)
return return
for(var/b=0, b<5, b++) for(var/b=0, b<REAGENT_USE, b++)
var/turf/oldturf = get_turf(W) var/turf/oldturf = get_turf(W)
step_towards(W,my_target) step_towards(W,my_target)
if(!W || !W.reagents) if(!W || !W.reagents)
return return
W.reagents.reaction(get_turf(W), TOUCH) W.reagents.reaction(get_turf(W), TOUCH, volume_multiplier = 1 / (REAGENT_USE ** 2))
for(var/atom/atm in get_turf(W)) for(var/atom/atm in get_turf(W))
if(!W) if(!W)
return return

14
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -693,8 +693,6 @@
qdel(hotspot) qdel(hotspot)
/datum/reagent/water/reaction_obj(var/obj/O, var/volume) /datum/reagent/water/reaction_obj(var/obj/O, var/volume)
var/datum/reagent/self = src
if(..()) if(..())
return 1 return 1
@@ -704,9 +702,6 @@
if(ismob(O.loc)) if(ismob(O.loc))
var/mob/M = O.loc var/mob/M = O.loc
M.regenerate_icons() M.regenerate_icons()
if(isturf(O.loc))
var/turf/T = get_turf(O)
self.reaction_turf(T, volume)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube)) if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
@@ -2287,15 +2282,6 @@
glass_icon_state = "dr_gibb_glass" glass_icon_state = "dr_gibb_glass"
glass_desc = "Unless you are an industrial tool, this is probably not safe for consumption." glass_desc = "Unless you are an industrial tool, this is probably not safe for consumption."
/datum/reagent/fuel/reaction_obj(var/obj/O, var/volume)
var/datum/reagent/self = src
if(..())
return 1
if(isturf(O.loc))
var/turf/T = get_turf(O)
self.reaction_turf(T, volume)
/datum/reagent/fuel/on_mob_life(var/mob/living/M) /datum/reagent/fuel/on_mob_life(var/mob/living/M)
if(..()) if(..())