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

tanks

Browse Source
This commit is contained in:
adacovsk
2022-05-21 07:10:39 -04:00
parent aad07045fe
commit 0fbd36436b
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
__DEFINES/reagents.dm
View File

@@ -547,7 +547,7 @@ var/list/cheartstopper = list(/*"potassium_chloride",*/ CHEESYGLOOP) //this stop
#define LEXORINS list(LEXORIN, CORIAMYRTIN) #define LEXORINS list(LEXORIN, CORIAMYRTIN)
#define DEXALINS list(DEXALIN, THYMOL) #define DEXALINS list(DEXALIN, THYMOL)
#define PETRITRICINCURES list(SACID, PACID, FORMIC_ACID, PACID, PHENOL, ACIDSPIT, ACIDTEA) #define PETRITRICINCURES list(SACID, PACID, FORMIC_ACID, PACID, PHENOL, ACIDSPIT, ACIDTEA)
#define WATERS list(WATER, HOLYWATER) #define WATERS list(WATER, HOLYWATER, ICE)
#define CORES list(SOFTCORES, MEDCORES) #define CORES list(SOFTCORES, MEDCORES)
#define ALLNANITES list(NANITES, AUTISTNANITES) #define ALLNANITES list(NANITES, AUTISTNANITES)

24
code/modules/fish/fish_tank.dm
View File

@@ -52,6 +52,7 @@
var/leaking = NO_LEAK var/leaking = NO_LEAK
var/shard_count = 0 // Number of glass shards to salvage when broken (1 less than the number of sheets to build the tank) var/shard_count = 0 // Number of glass shards to salvage when broken (1 less than the number of sheets to build the tank)
var/automated = 0 // Cleans the aquarium on its own var/automated = 0 // Cleans the aquarium on its own
var/acidic = FALSE
/obj/machinery/fishtank/bowl /obj/machinery/fishtank/bowl
name = "fish bowl" name = "fish bowl"
@@ -234,12 +235,15 @@
water_type = "clean" water_type = "clean"
if (FILTH_THRESHOLD to MAX_FILTH) if (FILTH_THRESHOLD to MAX_FILTH)
water_type = "dirty" water_type = "dirty"
// Lest there can be fish in waterless environments
switch (water_level/water_capacity) if(!acidic && water_level/water_capacity < 0.85))
if (0.01 to 0.85) // Lest there can be fish in waterless environements
overlays += icon('icons/obj/fish_items.dmi', "over_[tank_type]_half_[water_type]", WATER_LAYER) overlays += icon('icons/obj/fish_items.dmi', "over_[tank_type]_half_[water_type]", WATER_LAYER)
if (0.85 to 1) else if (!acidic)
overlays += icon('icons/obj/fish_items.dmi', "over_[tank_type]_full_[water_type]", WATER_LAYER) overlays += icon('icons/obj/fish_items.dmi', "over_[tank_type]_full_[water_type]", WATER_LAYER)
else if (water_level/water_capacity < 0.85)
overlays += icon('icons/obj/fish_items.dmi', "over_[tank_type]_full_[water_type]_acidic", WATER_LAYER)
else
overlays += icon('icons/obj/fish_items.dmi', "over_[tank_type]_full_[water_type]_acidic", WATER_LAYER)
////////////////////////////// //////////////////////////////
// PROCESS PROC // // PROCESS PROC //
@@ -670,10 +674,20 @@
//Containers with any reagents will get dumped in //Containers with any reagents will get dumped in
if(C.reagents.total_volume) if(C.reagents.total_volume)
var/water_value = 0 var/water_value = 0
if(C.reagents.get_reagent_amount(WATERS) > 0 && acidic)
acidic = FALSE
water_value += C.reagents.get_reagent_amount(WATER) //Water is full value water_value += C.reagents.get_reagent_amount(WATER) //Water is full value
water_value += C.reagents.get_reagent_amount(HOLYWATER) *1.1 //Holywater is (somehow) better. Who said religion had to make sense? water_value += C.reagents.get_reagent_amount(HOLYWATER) *1.1 //Holywater is (somehow) better. Who said religion had to make sense?
water_value += C.reagents.get_reagent_amount(ICE) * 0.80 //Ice is 80% value water_value += C.reagents.get_reagent_amount(ICE) * 0.80 //Ice is 80% value
else if(C.reagents.get_reagent_amount(PACIDS) > 0 || C.reagents.get_reagent_amount(SACIDS) > 0 && !acidic)
acidic = TRUE
water_value += C.reagents.get_reagent_amount(PACIDS) * 2
water_value += C.reagents.get_reagent_amount(SACIDS)
else
water_value += C.reagents.get_reagent_amount(WATER)
water_value += C.reagents.get_reagent_amount(HOLYWATER) *1.1
water_value += C.reagents.get_reagent_amount(ICE) * 0.80
var/message = "" var/message = ""
if(!water_value) //The container has no water value, clear everything in it if(!water_value) //The container has no water value, clear everything in it
message = "<span class='warning'>The filtration process removes everything, leaving the water level unchanged.</span>" message = "<span class='warning'>The filtration process removes everything, leaving the water level unchanged.</span>"