cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

makes foam touch (#18463)

Browse Source
This commit is contained in:
Molti
2023-04-17 09:08:55 -05:00
committed by GitHub
parent 9678a4beeb
commit b0fd165e9f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__DEFINES/reagents.dm
View File

@@ -16,9 +16,9 @@
#define OPENCONTAINER (REFILLABLE | DRAINABLE | TRANSPARENT)
#define TOUCH 1 // splashing
#define TOUCH 1 // splashing, foam
#define INGEST 2 // ingestion
#define VAPOR 3 // foam, spray, blob attack
#define VAPOR 3 // spray, blob attack
#define PATCH 4 // patches
#define INJECT 5 // injection

6
code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm
View File

@@ -91,7 +91,7 @@
var/turf/turf = object.loc
if(turf.intact && object.level == 1) //hidden under the floor
continue
reagents.reaction(object, VAPOR, fraction)
reagents.reaction(object, TOUCH, fraction)
var/hit = 0
for(var/mob/living/foamer in location)
@@ -99,7 +99,7 @@
if(hit)
lifetime += ds_delta_time //this is so the decrease from mobs hit and the natural decrease don't cumulate.
reagents.reaction(location, VAPOR, fraction)
reagents.reaction(location, TOUCH, fraction)
/**
* Applies the effect of this foam to a mob.
@@ -120,7 +120,7 @@
delta_time = min(delta_time SECONDS, lifetime)
var/fraction = (delta_time * MINIMUM_FOAM_DILUTION) / (initial(lifetime) * max(MINIMUM_FOAM_DILUTION, group.total_size))
reagents.reaction(foaming, VAPOR, fraction)
reagents.reaction(foaming, TOUCH, fraction)
lifetime -= delta_time
return TRUE