diff --git a/code/datums/components/reactive_icon_update.dm b/code/datums/components/reactive_icon_update.dm index dffe5faa5f..9d6a8f60f1 100644 --- a/code/datums/components/reactive_icon_update.dm +++ b/code/datums/components/reactive_icon_update.dm @@ -148,7 +148,7 @@ icon = 'icons/obj/directional_test.dmi' /obj/item/tool/screwdriver/test_driver/Initialize(mapload) - ..() + . = ..() icon_state = "screwdriver" AddComponent(/datum/component/reactive_icon_update, directions = list(NORTH, EAST, SOUTH, WEST, SOUTHWEST, SOUTHEAST, NORTHEAST, NORTHWEST), range = 3) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 5222ad2b4f..22be2e8c95 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -27,8 +27,10 @@ var/list/holder_mob_icon_cache = list() var/original_vis_flags = NONE /obj/item/holder/Initialize(mapload, mob/held) - ASSERT(ismob(held)) . = ..() + if(!ismob(held)) + stack_trace("Holder was not passed a mob.") + return INITIALIZE_HINT_QDEL held.forceMove(src) START_PROCESSING(SSobj, src) diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index 3e4b9f5216..c4a97ae1ab 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -199,6 +199,7 @@ item_type = "tool" var/possible_object_paths = list() possible_object_paths += subtypesof(/obj/item/tool) + possible_object_paths -= /obj/item/tool/screwdriver/test_driver var/new_tool = pick(possible_object_paths) new_item = new new_tool(src.loc) new_item.color = rgb(rand(0,255),rand(0,255),rand(0,255)) diff --git a/config/example/config.txt b/config/example/config.txt index f6a8e72cbf..49db53c7d2 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -55,9 +55,6 @@ BAN_LEGACY_SYSTEM ## Non-automatic antagonist recruitment, such as being converted to cultism is not affected. Has the same database requirements and notes as USE_AGE_RESTRICTION_FOR_JOBS. #USE_AGE_RESTRICTION_FOR_ANTAGS -## Unhash this to use recursive explosions, keep it hashed to use circle explosions. Recursive explosions react to walls, airlocks and blast doors, making them look a lot cooler than the boring old circular explosions. They require more CPU and are (as of january 2013) experimental -#USE_RECURSIVE_EXPLOSIONS - ## Configure how fast explosion strength diminishes when travelling up/down z levels. All explosion distances are multiplied by this each time they go up/down z-levels. #MULTI_Z_EXPLOSION_SCALAR 0.5