cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 23:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Trolley tanker draining fix, and memory savings (#19341)

Browse Source 
* fix trolly tankers and don't make lists on everything

* a better solution

* same line

* fix those too

* moved to correct file
This commit is contained in:
Will
2026-03-26 23:20:52 -04:00
committed by GitHub
parent d1c534bdbb
commit b13f03bcda
5 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/detectivework/tools/rag.dm
+1 -1
View File
@@ -20,8 +20,8 @@
amount_per_transfer_from_this = 5
max_transfer_amount = 5
volume = 10
can_be_placed_into = null
flags = OPENCONTAINER | NOBLUDGEON
container_can_be_placed_into = REAGENT_CONTAINER_CAN_BE_PLACED_INTO_NONE
unacidable = FALSE
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
code/modules/reagents/reagent_containers/glass.dm
+3 -34
View File
@@ -23,35 +23,9 @@
var/label_text = ""
var/container_can_be_placed_into = REAGENT_CONTAINER_CAN_BE_PLACED_INTO_DEFAULT
var/list/prefill = null //Reagents to fill the container with on New(), formatted as "reagentID" = quantity
var/list/can_be_placed_into = list(
/obj/machinery/chem_master/,
/obj/machinery/chemical_dispenser,
/obj/machinery/reagentgrinder,
/obj/structure/table,
/obj/structure/closet,
/obj/structure/sink,
/obj/item/storage,
/obj/machinery/atmospherics/unary/cryo_cell,
/obj/machinery/dna_scannernew,
/obj/item/grenade/chem_grenade,
/mob/living/bot/medbot,
/obj/item/storage/secure/safe,
/obj/machinery/iv_drip,
/obj/structure/medical_stand,
/obj/machinery/disposal,
/mob/living/simple_mob/animal/passive/cow,
/mob/living/simple_mob/animal/goat,
/obj/machinery/sleeper,
/obj/machinery/smartfridge/,
/obj/machinery/biogenerator,
/obj/structure/frame,
/obj/machinery/radiocarbon_spectrometer,
/obj/machinery/portable_atmospherics/powered/reagent_distillery,
/obj/machinery/computer/pandemic
)
///Var for attack_self chain
var/special_handling = FALSE
@@ -138,7 +112,7 @@
/obj/item/reagent_containers/glass/afterattack(var/obj/target, var/mob/user, var/proximity)
if(!proximity || !is_open_container()) //Is the container open & are they next to whatever they're clicking?
return 1 //If not, do nothing.
for(var/type in can_be_placed_into) //Is it something it can be placed into?
for(var/type in GLOB.reagent_containers_can_be_placed_into[container_can_be_placed_into]) //Is it something it can be placed into?
if(istype(target, type))
return 1
if(standard_dispenser_refill(user, target)) //Are they clicking a water tank/some dispenser?
@@ -421,12 +395,7 @@
max_transfer_amount = 120
volume = 2000
slowdown = 2
can_be_placed_into = list(
/obj/structure/table,
/obj/structure/closet,
/obj/structure/sink
)
container_can_be_placed_into = REAGENT_CONTAINER_CAN_BE_PLACED_INTO_WATERCOOLER
/obj/item/reagent_containers/glass/pint_mug
desc = "A rustic pint mug designed for drinking ale."