cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

no relative pathing (#16234)

Browse Source 
* the voices win in the end

* cleanup

* changelog

* secure.dm hates me

* make_exact_fit() in initialize instead of whatever was happening before
This commit is contained in:
harryob
2023-04-30 21:10:13 +00:00
committed by GitHub
parent ad29453d4a
commit 578bae6f6f
144 changed files with 9951 additions and 9675 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/liquid/splash_simulation.dm
+27 -25
View File
@@ -4,10 +4,10 @@ var/liquid_delay = 4
var/list/datum/puddle/puddles = list()
datum/puddle
/datum/puddle
var/list/obj/effect/liquid/liquid_objects = list()
datum/puddle/process()
/datum/puddle/process()
for(var/obj/effect/liquid/L in liquid_objects)
L.spread()
@@ -17,17 +17,17 @@ datum/puddle/process()
if(liquid_objects.len == 0)
qdel(src)
datum/puddle/New()
/datum/puddle/New()
..()
puddles += src
datum/puddle/Destroy()
/datum/puddle/Destroy()
puddles -= src
for(var/obj/O in liquid_objects)
qdel(O)
return ..()
client/proc/splash()
/client/proc/splash()
var/volume = input("Volume?","Volume?", 0 ) as num
if(!isnum(volume)) return
if(volume <= LIQUID_TRANSFER_THRESHOLD) return
@@ -35,7 +35,7 @@ client/proc/splash()
if(!isturf(T)) return
trigger_splash(T, volume)
proc/trigger_splash(turf/epicenter as turf, volume as num)
/proc/trigger_splash(turf/epicenter as turf, volume as num)
if(!epicenter)
return
if(volume <= 0)
@@ -51,7 +51,7 @@ proc/trigger_splash(turf/epicenter as turf, volume as num)
obj/effect/liquid
/obj/effect/liquid
icon = 'icons/effects/liquid.dmi'
icon_state = "0"
name = "liquid"
@@ -59,7 +59,7 @@ obj/effect/liquid
var/new_volume = 0
var/datum/puddle/controller
obj/effect/liquid/New()
/obj/effect/liquid/New()
..()
if( !isturf(loc) )
qdel(src)
@@ -68,7 +68,7 @@ obj/effect/liquid/New()
if(L != src)
qdel(L)
obj/effect/liquid/proc/spread()
/obj/effect/liquid/proc/spread()
var/surrounding_volume = 0
var/list/spread_directions = list(1,2,4,8)
@@ -114,7 +114,7 @@ obj/effect/liquid/proc/spread()
src.volume -= volume_per_tile //Remove the volume from this tile
L.new_volume = L.new_volume + volume_per_tile //Add it to the volume to the other tile
obj/effect/liquid/proc/apply_calculated_effect()
/obj/effect/liquid/proc/apply_calculated_effect()
volume += new_volume
if(volume < LIQUID_TRANSFER_THRESHOLD)
@@ -122,14 +122,14 @@ obj/effect/liquid/proc/apply_calculated_effect()
new_volume = 0
update_icon2()
obj/effect/liquid/Move()
/obj/effect/liquid/Move()
return 0
obj/effect/liquid/Destroy()
/obj/effect/liquid/Destroy()
src.controller.liquid_objects.Remove(src)
return ..()
obj/effect/liquid/proc/update_icon2()
/obj/effect/liquid/proc/update_icon2()
//icon_state = num2text( max(1,min(7,(floor(volume),10)/10)) )
switch(volume)
@@ -150,17 +150,19 @@ obj/effect/liquid/proc/update_icon2()
if(50 to INFINITY)
icon_state = "7"
turf/proc/can_accept_liquid(from_direction)
return 0
turf/proc/can_leave_liquid(from_direction)
/turf/proc/can_accept_liquid(from_direction)
return 0
turf/space/can_accept_liquid(from_direction)
return 1
turf/space/can_leave_liquid(from_direction)
/turf/proc/can_leave_liquid(from_direction)
return 0
/turf/space/can_accept_liquid(from_direction)
return 1
turf/simulated/floor/can_accept_liquid(from_direction)
/turf/space/can_leave_liquid(from_direction)
return 1
/turf/simulated/floor/can_accept_liquid(from_direction)
for(var/obj/structure/window/W in src)
if(W.dir in list(5,6,9,10))
return 0
@@ -171,7 +173,7 @@ turf/simulated/floor/can_accept_liquid(from_direction)
return 0
return 1
turf/simulated/floor/can_leave_liquid(to_direction)
/turf/simulated/floor/can_leave_liquid(to_direction)
for(var/obj/structure/window/W in src)
if(W.dir in list(5,6,9,10))
return 0
@@ -182,15 +184,15 @@ turf/simulated/floor/can_leave_liquid(to_direction)
return 0
return 1
turf/simulated/wall/can_accept_liquid(from_direction)
/turf/simulated/wall/can_accept_liquid(from_direction)
return 0
turf/simulated/wall/can_leave_liquid(from_direction)
/turf/simulated/wall/can_leave_liquid(from_direction)
return 0
obj/proc/liquid_pass()
/obj/proc/liquid_pass()
return 1
obj/machinery/door/liquid_pass()
/obj/machinery/door/liquid_pass()
return !density
#undef LIQUID_TRANSFER_THRESHOLD