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

Revert "Singletons + refactor of /datum/observ (#15487)" (#15515)

Browse Source
This commit is contained in:
Matt Atlas
2023-01-05 19:21:22 +01:00
committed by GitHub
parent 34b1bcd055
commit b1869884c1
506 changed files with 7214 additions and 7561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/integrated_electronics/passive/power.dm
View File

@@ -130,7 +130,7 @@
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2)
var/volume = 60
var/list/fuel = list(/singleton/reagent/toxin/phoron = 50000, /singleton/reagent/slimejelly = 25000, /singleton/reagent/fuel = 15000, /singleton/reagent/carbon = 10000, /singleton/reagent/alcohol = 10000, /singleton/reagent/nutriment = 8000, /singleton/reagent/blood = 5000)
var/list/fuel = list(/decl/reagent/toxin/phoron = 50000, /decl/reagent/slimejelly = 25000, /decl/reagent/fuel = 15000, /decl/reagent/carbon = 10000, /decl/reagent/alcohol = 10000, /decl/reagent/nutriment = 8000, /decl/reagent/blood = 5000)
/obj/item/integrated_circuit/passive/power/chemical_cell/New()
..()

4
code/modules/integrated_electronics/subtypes/manipulation.dm
View File

@@ -38,7 +38,7 @@
installed_gun = gun
size += gun.w_class
to_chat(user, "<span class='notice'>You slide \the [gun] into the firing mechanism.</span>")
playsound(src.loc, /singleton/sound_category/crowbar_sound, 50, 1)
playsound(src.loc, /decl/sound_category/crowbar_sound, 50, 1)
else
..()
@@ -47,7 +47,7 @@
installed_gun.forceMove(get_turf(src))
to_chat(user, "<span class='notice'>You slide \the [installed_gun] out of the firing mechanism.</span>")
size = initial(size)
playsound(loc, /singleton/sound_category/crowbar_sound, 50, 1)
playsound(loc, /decl/sound_category/crowbar_sound, 50, 1)
installed_gun = null
else
to_chat(user, "<span class='notice'>There's no weapon to remove from the mechanism.</span>")

4
code/modules/integrated_electronics/subtypes/reagents.dm
View File

@@ -283,7 +283,7 @@
/obj/item/integrated_circuit/reagent/storage/scan/do_work()
var/list/cont = list()
for(var/_RE in reagents.reagent_volumes)
var/singleton/reagent/RE = GET_SINGLETON(_RE)
var/decl/reagent/RE = decls_repository.get_decl(_RE)
cont += RE.name
set_pin_data(IC_OUTPUT, 3, cont)
set_pin_data(IC_OUTPUT, 4, reagents.generate_taste_message(src))
@@ -338,7 +338,7 @@
if(!REAGENTS_FREE_SPACE(target.reagents))
return
for(var/_G in source.reagents.reagent_volumes)
var/singleton/reagent/G = GET_SINGLETON(_G)
var/decl/reagent/G = decls_repository.get_decl(_G)
if (!direc)
if(lowertext(G.name) in demand)
source.reagents.trans_type_to(target, _G, transfer_amount)