From c344beff5898547bbc5e622ba700c3cb11e8d131 Mon Sep 17 00:00:00 2001 From: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com> Date: Sat, 6 Feb 2021 16:46:43 +0200 Subject: [PATCH] Adds special descs to chameleon items , energy swords(toy and real) , chameleon projector , implanters. (#3136) * the descs * Update chameleonproj.dm * Update dualsaber.dm * Update implant_misc.dm * Update energy.dm * Update toys.dm * Update toys.dm * Update chameleon.dm * Update pen.dm * grammar * Update implantuplink.dm * Update implant_stealth.dm * Update energy.dm * Update chameleon.dm * Update pen.dm Co-authored-by: MLGTASTICa --- .../objects/items/devices/chameleonproj.dm | 4 ++- code/game/objects/items/dualsaber.dm | 2 ++ .../objects/items/implants/implant_freedom.dm | 4 ++- .../objects/items/implants/implant_misc.dm | 8 +++-- .../objects/items/implants/implant_stealth.dm | 4 ++- .../objects/items/implants/implant_storage.dm | 4 ++- .../objects/items/implants/implantuplink.dm | 8 +++-- code/game/objects/items/melee/energy.dm | 2 ++ code/game/objects/items/toys.dm | 12 +++++--- code/modules/clothing/chameleon.dm | 30 +++++++++++++++++++ code/modules/paperwork/pen.dm | 5 ++++ 11 files changed, 71 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 878eadf73d5..fc7c2a3795a 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -1,5 +1,5 @@ /obj/item/chameleon - name = "chameleon projector" + name = "Strange object" // Skyrat edit , original was Chameleon projector icon = 'icons/obj/device.dmi' icon_state = "shield0" flags_1 = CONDUCT_1 @@ -13,6 +13,8 @@ throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_SMALL + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A projector used to seamlessly camouflage syndicate operatives into the background" // Skyrat edit var/can_use = 1 var/obj/effect/dummy/chameleon/active_dummy = null var/saved_appearance = null diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 3e855d8d79b..827592ba5ae 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -28,6 +28,8 @@ resistance_flags = FIRE_PROOF wound_bonus = -10 bare_wound_bonus = 20 + special_desc_requirement = EXAMINE_CHECK_SYNDICATE_TOY // Skyrat edit + special_desc = "A double bladed energy sword employed by the Syndicate in raids" // Skyrat edit var/w_class_on = WEIGHT_CLASS_BULKY var/saber_color = "green" var/two_hand_force = 34 diff --git a/code/game/objects/items/implants/implant_freedom.dm b/code/game/objects/items/implants/implant_freedom.dm index af4e8e7b11d..20ab0665c75 100644 --- a/code/game/objects/items/implants/implant_freedom.dm +++ b/code/game/objects/items/implants/implant_freedom.dm @@ -35,8 +35,10 @@ No Implant Specifics"} /obj/item/implanter/freedom - name = "implanter (freedom)" + name = "implanter" // Skyrat edit , was implanter (freedom) imp_type = /obj/item/implant/freedom + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A Syndicate implanter used for a freedom implant" // Skyrat edit /obj/item/implantcase/freedom name = "implant case - 'Freedom'" diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index a136b9c84d7..72107310fe2 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -26,8 +26,10 @@ qdel(src) /obj/item/implanter/emp - name = "implanter (EMP)" + name = "implanter" // Skyrat edit, was implanter (EMP) imp_type = /obj/item/implant/emp + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A Syndicate implanter used for a EMP implant" // Skyrat edit //Health Tracker Implant @@ -102,6 +104,8 @@ imp_type = /obj/item/implant/radio /obj/item/implanter/radio/syndicate - name = "implanter (internal syndicate radio)" + name = "implanter" // Skyrat edit , was originally implanter (internal syndicate radio) imp_type = /obj/item/implant/radio/syndicate + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A Syndicate implanter used for a internal radio implant" // Skyrat edit diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm index d225e7180db..eaa664be070 100644 --- a/code/game/objects/items/implants/implant_stealth.dm +++ b/code/game/objects/items/implants/implant_stealth.dm @@ -4,8 +4,10 @@ actions_types = list(/datum/action/item_action/agent_box) /obj/item/implanter/stealth - name = "implanter (stealth)" + name = "implanter" // Skyrat edit , was originaly implanter (stealth) imp_type = /obj/item/implant/stealth + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A Syndicate implanter used for a stealth implant" // Skyrat edit //Box Object diff --git a/code/game/objects/items/implants/implant_storage.dm b/code/game/objects/items/implants/implant_storage.dm index a0ad3b721cf..40937be795a 100644 --- a/code/game/objects/items/implants/implant_storage.dm +++ b/code/game/objects/items/implants/implant_storage.dm @@ -36,5 +36,7 @@ return ..() /obj/item/implanter/storage - name = "implanter (storage)" + name = "implanter" // Skyrat edit , original was implanter (storage) imp_type = /obj/item/implant/storage + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A Syndicate implanter used for a storage implant" // Skyrat edit diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm index 6936602576f..090cbaeb348 100644 --- a/code/game/objects/items/implants/implantuplink.dm +++ b/code/game/objects/items/implants/implantuplink.dm @@ -24,12 +24,16 @@ qdel(src) /obj/item/implanter/uplink - name = "implanter (uplink)" + name = "implanter" // Skyrat edit , original was implanter (uplink) imp_type = /obj/item/implant/uplink + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A Syndicate implanter for an uplink" // Skyrat edit /obj/item/implanter/uplink/precharged - name = "implanter (precharged uplink)" + name = "implanter" // Skyrat edit , original was implanter (precharged uplink) imp_type = /obj/item/implant/uplink/precharged + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A Syndicate implanter for a precharged uplink" // Skyrat edit /obj/item/implant/uplink/precharged starting_tc = TELECRYSTALS_PRELOADED_IMPLANT diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 60b22c2e036..97adeb45a14 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -104,6 +104,8 @@ embedding = list("embed_chance" = 75, "impact_pain_mult" = 10) armour_penetration = 35 block_chance = 50 + special_desc_requirement = EXAMINE_CHECK_SYNDICATE_TOY // Skyrat edit + special_desc = "A energy sword employed by syndicate operatives" // Skyrat edit /obj/item/melee/transforming/energy/sword/transform_weapon(mob/living/user, supress_message_text) . = ..() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8d8f400284f..f8afbb4d5b3 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -315,13 +315,15 @@ * Toy swords */ /obj/item/toy/sword - name = "toy sword" - desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up." + name = "energy sword" // Skyrat edit , was Toy Sword + desc = "May the force be with you." // Skyrat edit icon = 'icons/obj/transforming_energy.dmi' icon_state = "sword0" inhand_icon_state = "sword0" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + special_desc_requirement = EXAMINE_CHECK_SYNDICATE_TOY // Skyrat edit + special_desc = "A cheap imitation of an energy sword" // Skyrat edit var/active = 0 w_class = WEIGHT_CLASS_SMALL attack_verb_continuous = list("attacks", "strikes", "hits") @@ -444,8 +446,8 @@ * Subtype of Double-Bladed Energy Swords */ /obj/item/dualsaber/toy - name = "double-bladed toy sword" - desc = "A cheap, plastic replica of TWO energy swords. Double the fun!" + name = "double-bladed energy sword" // Skyrat edit , was double-bladed toy sword + desc = "Handle with care!" // Skyrat edit force = 0 throwforce = 0 throw_speed = 3 @@ -453,6 +455,8 @@ two_hand_force = 0 attack_verb_continuous = list("attacks", "strikes", "hits") attack_verb_simple = list("attack", "strike", "hit") + special_desc_requirement = EXAMINE_CHECK_SYNDICATE_TOY // Skyrat edit + special_desc = "A imitation of an double-bladed energy sword" // Skyrat edit /obj/item/dualsaber/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return 0 diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index ef7e280f941..129eaa6804e 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -303,6 +303,8 @@ random_sensor = FALSE resistance_flags = NONE can_adjust = FALSE + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A chameleon jumpsuit employed by the Syndicate in infiltration operations." // Skyrat edit armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) var/datum/action/item_action/chameleon/change/chameleon_action @@ -333,6 +335,8 @@ blood_overlay_type = "armor" resistance_flags = NONE armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A chameleon vest employed by the Syndicate in infiltration operations." // Skyrat edit var/datum/action/item_action/chameleon/change/chameleon_action @@ -361,6 +365,8 @@ inhand_icon_state = "meson" resistance_flags = NONE armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "Chameleon glasses employed by the Syndicate in infiltration operations." // Skyrat edit var/datum/action/item_action/chameleon/change/chameleon_action @@ -387,6 +393,8 @@ name = "insulated gloves" icon_state = "yellow" inhand_icon_state = "ygloves" + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A pair of chameleon gloves employed by the Syndicate in infiltration operations." // Skyrat edit resistance_flags = NONE armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) @@ -415,6 +423,8 @@ name = "grey cap" desc = "It's a baseball hat in a tasteful grey colour." icon_state = "greysoft" + special_desc_requirement = EXAMINE_CHECK_SYNDICATE + special_desc = "A chameleon hat employed by the Syndicate in infiltration operations." resistance_flags = NONE armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) @@ -467,6 +477,8 @@ permeability_coefficient = 0.01 flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH w_class = WEIGHT_CLASS_SMALL + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A chameleon mask employed by the Syndicate in infiltration operations, frequently used to mimic the voice of other crewmembers using fake id's." // Skyrat edit var/voice_change = 1 ///This determines if the voice changer is on or off. @@ -521,6 +533,9 @@ resistance_flags = NONE armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A pair of chameleon shoes employed by the Syndicate in infiltration operations." // Skyrat edit + var/datum/action/item_action/chameleon/change/chameleon_action @@ -544,6 +559,9 @@ desc = "A pair of black shoes." clothing_flags = NOSLIP can_be_bloody = FALSE + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A pair of chameleon shoes with an anti-slip coating employed by the Syndicate in infiltration operations." // Skyrat edit + /obj/item/clothing/shoes/chameleon/noslip/broken/Initialize() . = ..() @@ -551,6 +569,9 @@ /obj/item/storage/backpack/chameleon name = "backpack" + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A chameleon backpack employed by the Syndicate in infiltration operations." // Skyrat edit + var/datum/action/item_action/chameleon/change/chameleon_action /obj/item/storage/backpack/chameleon/Initialize() @@ -573,6 +594,9 @@ /obj/item/storage/belt/chameleon name = "toolbelt" desc = "Holds tools." + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A chameleon belt employed by the Syndicate in infiltration operations." // Skyrat edit + var/datum/action/item_action/chameleon/change/chameleon_action /obj/item/storage/belt/chameleon/Initialize() @@ -600,6 +624,9 @@ /obj/item/radio/headset/chameleon name = "radio headset" + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A chameleon headset employed by the Syndicate in infiltration operations." // Skyrat edit + var/datum/action/item_action/chameleon/change/chameleon_action /obj/item/radio/headset/chameleon/Initialize() @@ -662,6 +689,9 @@ resistance_flags = NONE armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) w_class = WEIGHT_CLASS_SMALL + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A chameleon tie employed by the Syndicate in infiltration operations." // Skyrat edit + /obj/item/clothing/neck/chameleon var/datum/action/item_action/chameleon/change/chameleon_action diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index a163394d606..12719a1fd66 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -194,6 +194,9 @@ /* * Sleepypens */ +/obj/item/pen/sleepy + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A Armour piercing syringe concealed in a pen , used by the Syndicate in covert operations." // Skyrat edit /obj/item/pen/sleepy/attack(mob/living/M, mob/user) if(!istype(M)) @@ -220,6 +223,8 @@ attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") //these won't show up if the pen is off attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") sharpness = SHARP_EDGED + special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit + special_desc = "A concealed energy dagger , used by the Syndicate in covert operations." // Skyrat edit var/on = FALSE /obj/item/pen/edagger/ComponentInitialize()