cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Singletons + refactor of /datum/observ (#15487)

Browse Source
This commit is contained in:
Fluffy
2023-01-05 18:41:40 +01:00
committed by GitHub
parent 95f8207f08
commit 0ddcf0817a
507 changed files with 7603 additions and 7214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
code/modules/events/vent_clog.dm
View File

@@ -5,45 +5,45 @@
var/interval = 2
var/list/vents = list()
var/list/gunk = list(
/decl/reagent/water = 10,
/decl/reagent/carbon = 5,
/decl/reagent/nutriment/flour = 8,
/decl/reagent/spacecleaner = 6,
/decl/reagent/nutriment = 6,
/decl/reagent/capsaicin/condensed = 2,
/decl/reagent/mindbreaker = 0.5,
/decl/reagent/lube = 4,
/decl/reagent/drink/banana = 3,
/decl/reagent/space_drugs = 3,
/decl/reagent/water/holywater = 1,
/decl/reagent/drink/hot_coco = 3,
/decl/reagent/hyperzine = 0.75,
/decl/reagent/luminol = 2,
/decl/reagent/fuel = 3,
/decl/reagent/blood = 2,
/decl/reagent/sterilizine = 3,
/decl/reagent/verunol = 3,
/decl/reagent/toxin/fertilizer/monoammoniumphosphate = 1,
/decl/reagent/saline = 2,
/decl/reagent/mental/kokoreed = 0.5,
/decl/reagent/toxin/tobacco = 3,
/decl/reagent/stone_dust = 0.5,
/decl/reagent/crayon_dust = 1,
/decl/reagent/alcohol/butanol = 2,
/decl/reagent/alcohol = 2,
/decl/reagent/sugar = 2,
/decl/reagent/drink/coffee = 4,
/decl/reagent/wulumunusha = 0.25,
/decl/reagent/nutriment/virusfood = 2,
/decl/reagent/sodiumchloride = 2,
/decl/reagent/drink/zorasoda/venomgrass = 1,
/decl/reagent/nutriment/protein/egg = 2,
/decl/reagent/serotrotium = 1,
/decl/reagent/psilocybin = 0.5,
/decl/reagent/toxin/spectrocybin = 0.1,
/decl/reagent/ambrosia_extract = 0.3,
/decl/reagent/skrell_nootropic = 0.5,
/decl/reagent/xuxigas = 2
/singleton/reagent/water = 10,
/singleton/reagent/carbon = 5,
/singleton/reagent/nutriment/flour = 8,
/singleton/reagent/spacecleaner = 6,
/singleton/reagent/nutriment = 6,
/singleton/reagent/capsaicin/condensed = 2,
/singleton/reagent/mindbreaker = 0.5,
/singleton/reagent/lube = 4,
/singleton/reagent/drink/banana = 3,
/singleton/reagent/space_drugs = 3,
/singleton/reagent/water/holywater = 1,
/singleton/reagent/drink/hot_coco = 3,
/singleton/reagent/hyperzine = 0.75,
/singleton/reagent/luminol = 2,
/singleton/reagent/fuel = 3,
/singleton/reagent/blood = 2,
/singleton/reagent/sterilizine = 3,
/singleton/reagent/verunol = 3,
/singleton/reagent/toxin/fertilizer/monoammoniumphosphate = 1,
/singleton/reagent/saline = 2,
/singleton/reagent/mental/kokoreed = 0.5,
/singleton/reagent/toxin/tobacco = 3,
/singleton/reagent/stone_dust = 0.5,
/singleton/reagent/crayon_dust = 1,
/singleton/reagent/alcohol/butanol = 2,
/singleton/reagent/alcohol = 2,
/singleton/reagent/sugar = 2,
/singleton/reagent/drink/coffee = 4,
/singleton/reagent/wulumunusha = 0.25,
/singleton/reagent/nutriment/virusfood = 2,
/singleton/reagent/sodiumchloride = 2,
/singleton/reagent/drink/zorasoda/venomgrass = 1,
/singleton/reagent/nutriment/protein/egg = 2,
/singleton/reagent/serotrotium = 1,
/singleton/reagent/psilocybin = 0.5,
/singleton/reagent/toxin/spectrocybin = 0.1,
/singleton/reagent/ambrosia_extract = 0.3,
/singleton/reagent/skrell_nootropic = 0.5,
/singleton/reagent/xuxigas = 2
)
/datum/event/vent_clog/setup()
@@ -62,7 +62,7 @@
var/obj/machinery/atmospherics/unary/vent_scrubber/vent = pick_n_take(vents)
if(vent && vent.loc && !vent.is_welded())
var/decl/reagent/chem = pickweight(gunk)
var/singleton/reagent/chem = pickweight(gunk)
var/reagent_amount = rand(2,5) * 5 //10 to 25 units
var/datum/reagents/R = new/datum/reagents(reagent_amount)
R.my_atom = vent