cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

These might be bad

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-21 01:38:44 +00:00
parent 4a6c523aa6
commit b83a5c7990
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/controllers/subsystems/assets.dm
View File

@@ -6,11 +6,23 @@ SUBSYSTEM_DEF(assets)
var/list/preload = list() var/list/preload = list()
/datum/controller/subsystem/assets/Initialize(timeofday) /datum/controller/subsystem/assets/Initialize(timeofday)
<<<<<<< HEAD
for(var/type in typesof(/datum/asset)) for(var/type in typesof(/datum/asset))
var/datum/asset/A = type var/datum/asset/A = type
if (type != initial(A._abstract)) if (type != initial(A._abstract))
get_asset_datum(type) get_asset_datum(type)
||||||| parent of 70cccc775a... Merge pull request #11192 from VOREStation/Arokha/hmm
for(var/datum/asset/A as anything in typesof(/datum/asset))
if (type != initial(A._abstract))
get_asset_datum(type)
=======
for(var/typepath in typesof(/datum/asset))
var/datum/asset/A = typepath
if (typepath != initial(A._abstract))
get_asset_datum(typepath)
>>>>>>> 70cccc775a... Merge pull request #11192 from VOREStation/Arokha/hmm
preload = cache.Copy() //don't preload assets generated during the round preload = cache.Copy() //don't preload assets generated during the round

10
code/modules/food/kitchen/microwave.dm
View File

@@ -43,10 +43,20 @@
if(!available_recipes) if(!available_recipes)
available_recipes = new available_recipes = new
<<<<<<< HEAD
for(var/T in (typesof(/datum/recipe)-/datum/recipe)) for(var/T in (typesof(/datum/recipe)-/datum/recipe))
var/datum/recipe/type = T var/datum/recipe/type = T
if((initial(type.appliance) & appliancetype)) if((initial(type.appliance) & appliancetype))
available_recipes += new type available_recipes += new type
||||||| parent of 70cccc775a... Merge pull request #11192 from VOREStation/Arokha/hmm
for(var/datum/recipe/type as anything in subtypesof(/datum/recipe))
if((initial(type.appliance) & appliancetype))
available_recipes += new type
=======
for(var/datum/recipe/typepath as anything in subtypesof(/datum/recipe))
if((initial(typepath.appliance) & appliancetype))
available_recipes += new typepath
>>>>>>> 70cccc775a... Merge pull request #11192 from VOREStation/Arokha/hmm
acceptable_items = new acceptable_items = new
acceptable_reagents = new acceptable_reagents = new