diff --git a/code/game/objects/items/devices/machineprototype.dm b/code/game/objects/items/devices/machineprototype.dm index 7bfed75c1d4..062676b0280 100644 --- a/code/game/objects/items/devices/machineprototype.dm +++ b/code/game/objects/items/devices/machineprototype.dm @@ -5,3 +5,9 @@ icon_state = "machineprototype" materials = list(MAT_METAL=1000, MAT_GLASS=500) origin_tech = "engineering=6" + +/obj/item/machineprototype/alien + name = "unknown alien prototype" + icon_state = "ayyy_prototype" + desc = "A complicated alien machine of unknown origin. You have no idea how it works." + origin_tech = "materials=7;abductor=5" diff --git a/code/modules/asset_cache/assets/asset_roboquest.dm b/code/modules/asset_cache/assets/asset_roboquest.dm index 17b64b40b05..32a85d18fcc 100644 --- a/code/modules/asset_cache/assets/asset_roboquest.dm +++ b/code/modules/asset_cache/assets/asset_roboquest.dm @@ -1,5 +1,6 @@ /datum/asset/spritesheet/roboquest name = "roboquest" + cross_round_cachable = FALSE /datum/asset/spritesheet/roboquest/create_spritesheets() for(var/equip_path in subtypesof(/obj/item/mecha_parts/mecha_equipment)) diff --git a/code/modules/economy/robotic_quests/robo_quests.dm b/code/modules/economy/robotic_quests/robo_quests.dm index 44265027a70..d6499498d92 100644 --- a/code/modules/economy/robotic_quests/robo_quests.dm +++ b/code/modules/economy/robotic_quests/robo_quests.dm @@ -179,6 +179,11 @@ cost = list("working" = 0, "medical" = 0, "security" = 0, "robo" = 20) emag_only = TRUE +/datum/roboshop_item/alien_prototype + name = "unknown alien prototype" + visual_item = /obj/item/machineprototype/alien + cost = list("working" = 0, "medical" = 0, "security" = 0, "robo" = 10) + /datum/roboshop_item/bbag path = /obj/item/disk/design_disk/roboquest/bluespace_bag_disk visual_item = /obj/item/bodybag/bluespace diff --git a/icons/obj/machineprototype.dmi b/icons/obj/machineprototype.dmi index f5312bdba60..22dd23fcf53 100644 Binary files a/icons/obj/machineprototype.dmi and b/icons/obj/machineprototype.dmi differ diff --git a/paradise.dme b/paradise.dme index d45215a6bca..bda16161d16 100644 --- a/paradise.dme +++ b/paradise.dme @@ -469,10 +469,10 @@ #include "code\datums\diseases\appendicitis.dm" #include "code\datums\diseases\berserker.dm" #include "code\datums\diseases\critical.dm" +#include "code\datums\diseases\ectoplasmic.dm" #include "code\datums\diseases\food_poisoning.dm" #include "code\datums\diseases\kuru.dm" #include "code\datums\diseases\vampire.dm" -#include "code\datums\diseases\ectoplasmic.dm" #include "code\datums\diseases\viruses\_virus.dm" #include "code\datums\diseases\viruses\anxiety.dm" #include "code\datums\diseases\viruses\beesease.dm" @@ -1567,6 +1567,12 @@ #include "code\modules\antagonists\blob\blob_actions.dm" #include "code\modules\antagonists\blob\blob_infected_datum.dm" #include "code\modules\antagonists\blob\blob_overmind_datum.dm" +#include "code\modules\antagonists\borer\borer_action.dm" +#include "code\modules\antagonists\borer\borer_datum.dm" +#include "code\modules\antagonists\borer\borer_focus.dm" +#include "code\modules\antagonists\borer\borer_rank.dm" +#include "code\modules\antagonists\borer\borer_reagent.dm" +#include "code\modules\antagonists\borer\borer_spell.dm" #include "code\modules\antagonists\changeling\changeling_datum.dm" #include "code\modules\antagonists\changeling\changeling_power.dm" #include "code\modules\antagonists\changeling\evolution_menu.dm" @@ -1593,12 +1599,6 @@ #include "code\modules\antagonists\changeling\powers\swap_form.dm" #include "code\modules\antagonists\changeling\powers\tiny_prick.dm" #include "code\modules\antagonists\changeling\powers\transform.dm" -#include "code\modules\antagonists\borer\borer_datum.dm" -#include "code\modules\antagonists\borer\borer_rank.dm" -#include "code\modules\antagonists\borer\borer_focus.dm" -#include "code\modules\antagonists\borer\borer_reagent.dm" -#include "code\modules\antagonists\borer\borer_action.dm" -#include "code\modules\antagonists\borer\borer_spell.dm" #include "code\modules\antagonists\malf_ai\malf_ai_datum.dm" #include "code\modules\antagonists\space_dragon\action.dm" #include "code\modules\antagonists\space_dragon\carp.dm"