cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-05

Browse Source
This commit is contained in:
Roxy
2025-11-05 19:43:07 -05:00
parent 7ebdda5853 7e6a7978c3
commit d0ca474789
461 changed files with 41708 additions and 37517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/processing/instruments.dm
+1 -3
View File
@@ -36,10 +36,8 @@ PROCESSING_SUBSYSTEM_DEF(instruments)
songs -= S
/datum/controller/subsystem/processing/instruments/proc/initialize_instrument_data()
for(var/path in subtypesof(/datum/instrument))
for(var/path in valid_subtypesof(/datum/instrument))
var/datum/instrument/I = path
if(initial(I.abstract_type) == path)
continue
I = new path
I.Initialize()
if(!I.id)
code/controllers/subsystem/processing/station.dm
+1 -4
View File
@@ -94,16 +94,13 @@ PROCESSING_SUBSYSTEM_DEF(station)
return
for(var/datum/station_trait/trait_typepath as anything in subtypesof(/datum/station_trait))
for(var/datum/station_trait/trait_typepath as anything in valid_subtypesof(/datum/station_trait))
// If forced, (probably debugging), just set it up now, keep it out of the pool.
if(initial(trait_typepath.force))
setup_trait(trait_typepath)
continue
if(initial(trait_typepath.abstract_type) == trait_typepath)
continue //Dont add abstract ones to it
if(!(initial(trait_typepath.trait_flags) & STATION_TRAIT_PLANETARY) && SSmapping.is_planetary()) // we're on a planet but we can't do planet ;_;
continue