diff --git a/monkestation/code/modules/art_sci_overrides/artifact_components/_base_component.dm b/monkestation/code/modules/art_sci_overrides/artifact_components/_base_component.dm index 5163bf0a2aae..7ff954c428be 100644 --- a/monkestation/code/modules/art_sci_overrides/artifact_components/_base_component.dm +++ b/monkestation/code/modules/art_sci_overrides/artifact_components/_base_component.dm @@ -72,7 +72,7 @@ var/datum/artifact_fault/chosen_fault ///the amount of freebies we get var/freebies = 3 - ///if we have a special examine IE borgers + ///if we have a special examine var/explict_examine /datum/component/artifact/Initialize(forced_origin = null) diff --git a/monkestation/code/modules/art_sci_overrides/artifact_components/borger.dm b/monkestation/code/modules/art_sci_overrides/artifact_components/borger.dm deleted file mode 100644 index cb57a7dbc55f..000000000000 --- a/monkestation/code/modules/art_sci_overrides/artifact_components/borger.dm +++ /dev/null @@ -1,46 +0,0 @@ -/datum/component/artifact/borger - associated_object = /obj/structure/artifact/borger - weight = ARTIFACT_UNCOMMON - type_name = "Borger" - activation_message = "opens up!" - deactivation_message = "closes up." - valid_activators = list( - /datum/artifact_activator/touch/carbon, - /datum/artifact_activator/touch/silicon - ) - explict_examine = "Vaguely Foreboding" - ///the time between each limb replacement - var/limb_replace_time = 1 SECONDS - COOLDOWN_DECLARE(borg_cooldown) - -/datum/component/artifact/borger/effect_touched(mob/living/user) - if(!iscarbon(user) || !COOLDOWN_FINISHED(src, borg_cooldown)) - holder.visible_message(span_smallnoticeital("[holder] does not react to [user].")) - return - - var/mob/living/carbon/carbon_target = user - var/timer = 2 SECONDS - for (var/_limb in carbon_target.bodyparts) - var/obj/item/bodypart/limb = _limb - if (limb.body_part == HEAD || limb.body_part == CHEST) - continue - switch(limb.body_part) - if(ARM_RIGHT) - var/obj/item/bodypart/arm/right/robot/new_limb = new - addtimer(CALLBACK(new_limb, TYPE_PROC_REF(/obj/item/bodypart/, try_attach_limb), carbon_target), timer + 5) - if(ARM_LEFT) - var/obj/item/bodypart/arm/left/robot/new_limb = new - addtimer(CALLBACK(new_limb, TYPE_PROC_REF(/obj/item/bodypart/, try_attach_limb), carbon_target), timer + 5) - if(LEG_RIGHT) - var/obj/item/bodypart/leg/right/robot/new_limb = new - addtimer(CALLBACK(new_limb, TYPE_PROC_REF(/obj/item/bodypart/, try_attach_limb), carbon_target), timer + 5) - if(LEG_LEFT) - var/obj/item/bodypart/leg/left/robot/new_limb = new - addtimer(CALLBACK(new_limb, TYPE_PROC_REF(/obj/item/bodypart/, try_attach_limb), carbon_target), timer + 5) - - addtimer(CALLBACK(limb, TYPE_PROC_REF(/obj/item/bodypart/, dismember)), timer) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), carbon_target, 'sound/effects/cartoon_pop.ogg', 70), timer) - addtimer(CALLBACK(carbon_target, TYPE_PROC_REF(/mob/living/, spin), 4, 1), timer - 0.4 SECONDS) - timer += 2 SECONDS - addtimer(CALLBACK(carbon_target, TYPE_PROC_REF(/mob/, Robotize)), timer + 5) - COOLDOWN_START(src, borg_cooldown, 10 SECONDS) diff --git a/monkestation/code/modules/art_sci_overrides/generic_artifact_objects.dm b/monkestation/code/modules/art_sci_overrides/generic_artifact_objects.dm index 3ac5b1964ed6..4f121583ba3c 100644 --- a/monkestation/code/modules/art_sci_overrides/generic_artifact_objects.dm +++ b/monkestation/code/modules/art_sci_overrides/generic_artifact_objects.dm @@ -53,9 +53,6 @@ ARTIFACT_SETUP(/obj/structure/artifact, SSobj) /obj/structure/artifact/vomit assoc_comp = /datum/component/artifact/vomit -/obj/structure/artifact/borger - assoc_comp = /datum/component/artifact/borger - /obj/structure/artifact/emotegen assoc_comp = /datum/component/artifact/emotegen diff --git a/tgstation.dme b/tgstation.dme index b9cf0383be47..e2dca73d7545 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5901,7 +5901,6 @@ #include "monkestation\code\modules\art_sci_overrides\artifact_components\_base_subtype_helpers.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_components\bomb.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_components\bonk.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\borger.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_components\cell.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_components\emoter.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_components\forcegen.dm"