diff --git a/code/game/magic/Uristrunes.dm b/code/game/magic/Uristrunes.dm index 5cb7dc4127e..ed881c71fb1 100644 --- a/code/game/magic/Uristrunes.dm +++ b/code/game/magic/Uristrunes.dm @@ -17,7 +17,10 @@ var/runetype = "rune" /proc/get_rune(symbol_bits, animated = 0) var/lookup = "[symbol_bits]-[animated]" - if(ticker.mode.cultdat.theme == "fire") + + if(!ticker.mode)//work around for maps with runes and cultdat is not loaded all the way + runetype = "rune" + else if(ticker.mode.cultdat.theme == "fire") runetype = "fire-rune" if(lookup in rune_cache) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 5f1418fcae5..fd1b35efeca 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -29,10 +29,17 @@ /mob/living/simple_animal/hostile/construct/New() ..() - name = "[ticker.mode.cultdat.get_name(const_type)] ([rand(1, 1000)])" - real_name = ticker.mode.cultdat.get_name(const_type) - icon_living = ticker.mode.cultdat.get_icon(const_type) - icon_state = ticker.mode.cultdat.get_icon(const_type) + if(!ticker.mode)//work around for maps with runes and cultdat is not loaded all the way + name = "[const_type] ([rand(1, 1000)])" + real_name = const_type + icon_living = const_type + icon_state = const_type + else + name = "[ticker.mode.cultdat.get_name(const_type)] ([rand(1, 1000)])" + real_name = ticker.mode.cultdat.get_name(const_type) + icon_living = ticker.mode.cultdat.get_icon(const_type) + icon_state = ticker.mode.cultdat.get_icon(const_type) + for(var/spell in construct_spells) AddSpell(new spell(null)) diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 86a544fa278..7c50369b1f9 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ