From 099b908d6432876d661b8f1722912eb0a85f3c7a Mon Sep 17 00:00:00 2001 From: cebutris Date: Sat, 15 Jul 2017 14:48:56 -0400 Subject: [PATCH] Fixes traitor holoparasites (#1904) * fixes holoparasites * adds #1051 and #1066 * as it turns out I'm blind * fixes line 500 indentation --- .../modules/mob/living/simple_animal/guardian/guardian.dm | 7 ++++++- code/modules/uplink/uplink_item_cit.dm | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 7a212c8dd9..48c6484c87 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -467,6 +467,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/used_message = "All the cards seem to be blank now." var/failure_message = "..And draw a card! It's...blank? Maybe you should try again later." var/ling_failure = "The deck refuses to respond to a souless creature such as you." + var/activation_message = "The rest of the deck rapidly flashes to ash!" var/list/possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support") var/random = TRUE var/allowmultiple = FALSE @@ -495,6 +496,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(candidates.len) theghost = pick(candidates) spawn_guardian(user, theghost.key) + to_chat(user, "[activation_message]") + qdel(src) else to_chat(user, "[failure_message]") used = FALSE @@ -588,6 +591,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians used_message = "The injector has already been used." failure_message = "...ERROR. BOOT SEQUENCE ABORTED. AI FAILED TO INTIALIZE. PLEASE CONTACT SUPPORT OR TRY AGAIN LATER." ling_failure = "The holoparasites recoil in horror. They want nothing to do with a creature like you." + activation_message = "The injector self destructs after you inject yourself with it." /obj/item/weapon/guardiancreator/tech/choose/traitor possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support") @@ -600,7 +604,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians /obj/item/weapon/paper/guardian name = "Holoparasite Guide" - icon_state = "paper_words" + icon_state = "alienpaper_words" info = {"A list of Holoparasite Types

@@ -671,6 +675,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians used_message = "Someone's already taken a bite out of these fishsticks! Ew." failure_message = "You couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up." ling_failure = "Carp'sie is fine with changelings, so you shouldn't be seeing this message." + activation_message = "You finish eating the fishsticks! Delicious!>" allowmultiple = TRUE allowling = TRUE random = TRUE diff --git a/code/modules/uplink/uplink_item_cit.dm b/code/modules/uplink/uplink_item_cit.dm index fbbab69031..3ea3e7f63c 100644 --- a/code/modules/uplink/uplink_item_cit.dm +++ b/code/modules/uplink/uplink_item_cit.dm @@ -11,12 +11,12 @@ /datum/uplink_item/stealthy_tools/holoparasite name="Holoparasite Injector" - desc="It contains an alien nanoswarm of unknown origin.\ - Though capable of near sorcerous feats via use of hardlight holograms and nanomachines.\ - It requires an organic host as a home base and source of fuel." //This is the description of the actual injector. Feel free to change this for uplink purposes// + desc="An injector containing a swarm of holographic parasites. \ + They mimic the function of the guardians employed by the Space Wizard Federation, and their form can be selected upon application \ + NOTE: The precise nature of the symbiosis required by the parasites renders them incompatible with changelings" //updated to actually describe what they do and warn traitorchans not to buy it item = /obj/item/weapon/storage/box/syndie_kit/holoparasite refundable = TRUE - cost = 15 //I'm working off the borer. Price subject to change + cost = 15 surplus = 20 //Nobody needs a ton of parasites exclude_modes = list(/datum/game_mode/nuclear) refund_path = /obj/item/weapon/guardiancreator/tech/choose/traitor