Merge branch 'master' into WanderingFox95-TheUnrollingPin

This commit is contained in:
WanderingFox95
2021-04-29 10:54:00 +02:00
committed by GitHub
155 changed files with 4299 additions and 1203 deletions
@@ -272,7 +272,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
. = ..()
. += GLOB.plastitaniumglass_recipes
/obj/item/stack/sheet/titaniumglass/on_solar_construction(obj/machinery/power/solar/S)
/obj/item/stack/sheet/plastitaniumglass/on_solar_construction(obj/machinery/power/solar/S)
S.max_integrity *= 2
S.efficiency *= 2