cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17822 from optimumtact/keepphilfromkillinme

Browse Source 
MakeSlippery proc made more readable with named arguments
This commit is contained in:
Cheridan
2016-05-24 11:59:24 -05:00
parent 3c4b771c13 f2bf80843f
commit 6d6711facb
7 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/simple_animal/bot/cleanbot.dm
View File

@@ -105,7 +105,7 @@
if(prob(10)) //Wets floors randomly
var/turf/open/OT = get_turf(loc)
OT.MakeSlippery(min = 5, max = 1)
OT.MakeSlippery(min_wet_time = 5, wet_time_to_add = 1)
if(prob(5)) //Spawns foam!
visible_message("<span class='danger'>[src] whirs and bubbles violently, before releasing a plume of froth!</span>")

6
code/modules/reagents/chemistry/reagents/blob_reagents.dm
View File

@@ -565,7 +565,7 @@
reac_volume = ..()
var/turf/open/T = get_turf(M)
if(istype(T) && prob(reac_volume))
T.MakeSlippery(min = 5, max = 1)
T.MakeSlippery(min_wet_time = 5, wet_time_to_add = 1)
M.adjust_fire_stacks(-(reac_volume / 10))
M.ExtinguishMob()
M.apply_damage(0.1*reac_volume, BRUTE)
@@ -586,7 +586,7 @@
/datum/reagent/blob/pressurized_slime/proc/extinguisharea(obj/effect/blob/B, probchance)
for(var/turf/open/T in range(1, B))
if(prob(probchance))
T.MakeSlippery(min = 5, max = 1)
T.MakeSlippery(min_wet_time = 5, wet_time_to_add = 1)
for(var/obj/O in T)
O.extinguish()
for(var/mob/living/L in T)
@@ -663,4 +663,4 @@
if(message_living && !issilicon(M))
totalmessage += message_living
totalmessage += "!"
M << "<span class='userdanger'>[totalmessage]</span>"
M << "<span class='userdanger'>[totalmessage]</span>"

4
code/modules/reagents/chemistry/reagents/food_reagents.dm
View File

@@ -155,7 +155,7 @@
if(reac_volume >= 1) // Make Freezy Foam and anti-fire grenades!
if(istype(T, /turf/open))
var/turf/open/OT = T
OT.MakeSlippery(TURF_WET_ICE, 5, reac_volume*0.5) // Is less effective in high pressure/high heat capacity environments. More effective in low pressure.
OT.MakeSlippery(wet_setting=TURF_WET_ICE, min_wet_time=5, wet_time_to_add=reac_volume*0.5) // Is less effective in high pressure/high heat capacity environments. More effective in low pressure.
OT.air.temperature -= MOLES_CELLSTANDARD*100*reac_volume/OT.air.heat_capacity() // reduces environment temperature by 5K per unit.
/datum/reagent/consumable/condensedcapsaicin
@@ -324,7 +324,7 @@
/datum/reagent/consumable/cornoil/reaction_turf(turf/open/T, reac_volume)
if (!istype(T))
return
T.MakeSlippery(min = 5, max = reac_volume*2)
T.MakeSlippery(min_wet_time = 5, wet_time_to_add = reac_volume*2)
var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
if(hotspot)
var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() )

4
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -123,7 +123,7 @@
var/CT = cooling_temperature
if(reac_volume >= 5)
T.MakeSlippery(min = 5, max = reac_volume*0.2)
T.MakeSlippery(min_wet_time = 5, wet_time_to_add = reac_volume*0.2)
for(var/mob/living/simple_animal/slime/M in T)
M.apply_water()
@@ -258,7 +258,7 @@
/datum/reagent/lube/reaction_turf(turf/open/T, reac_volume)
if (!istype(T)) return
if(reac_volume >= 1)
T.MakeSlippery(TURF_WET_LUBE, 5, reac_volume)
T.MakeSlippery(wet_setting=TURF_WET_LUBE, min_wet_time=5, wet_time_to_add=reac_volume)
/datum/reagent/spraytan
name = "Spray Tan"