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

New opendream pragmas (#20260)

Browse Source 
Enabled new opendream pragmas
Fixed some runtime access check operators (`:`) around the codebase (not
all, some are unfixable as they're used in macros)

No player facing changes (hopefully)
This commit is contained in:
Fluffy
2024-12-29 11:12:09 +00:00
committed by GitHub
parent f55072cc42
commit 1ba0b35838
60 changed files with 324 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+2 -2
View File
@@ -123,7 +123,7 @@
// Process the beaker
if(beaker)
var/datum/reagents/beaker_reagents = beaker:reagents
var/datum/reagents/beaker_reagents = beaker.reagents
for(var/reagent in beaker_reagents.reagent_volumes)
var/singleton/reagent/reagent_singleton = GET_SINGLETON(reagent)
@@ -199,7 +199,7 @@
// These actions makes sense only if there's a beaker in
if(beaker)
if(action == "analyze")
var/datum/reagents/R = beaker:reagents
var/datum/reagents/R = beaker.reagents
if(!condi)
if(params["name"] == "Blood")
var/singleton/reagent/blood/G = GET_SINGLETON(/singleton/reagent/blood)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
+1 -1
View File
@@ -141,7 +141,7 @@
var/hotspot = (locate(/obj/fire) in T)
if(hotspot && !istype(T, /turf/space))
var/datum/gas_mixture/lowertemp = T.remove_air(T:air:total_moles)
var/datum/gas_mixture/lowertemp = T.remove_air(T.air.total_moles)
lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, T0C)
lowertemp.react()
T.assume_air(lowertemp)
code/modules/reagents/dispenser/cartridge.dm
+4 -3
View File
@@ -101,9 +101,10 @@
return
else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
target.add_fingerprint(user)
var/obj/structure/reagent_dispensers/reagent_dispensers = target
reagent_dispensers.add_fingerprint(user)
if(!target.reagents.total_volume && target.reagents)
if(!reagent_dispensers.reagents.total_volume && reagent_dispensers.reagents)
to_chat(user, SPAN_WARNING("\The [target] is empty."))
return
@@ -111,7 +112,7 @@
to_chat(user, SPAN_WARNING("\The [src] is full."))
return
var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
var/trans = reagent_dispensers.reagents.trans_to(src, reagent_dispensers.amount_per_transfer_from_this)
to_chat(user, SPAN_NOTICE("You fill \the [src] with [trans] units of the contents of \the [target]."))
else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it.