From 436dff332c9f3b78ecd22c0e29f6d9105cf970a6 Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Sun, 8 Aug 2021 10:47:35 -0400 Subject: [PATCH] Removes Traitor/Wizard tips, organizes the rest by antagonist (#297) --- code/___fulp_defines/fulp_defines.dm | 4 -- .../antag_tips/code/antag_tip_integration.dm | 12 ---- .../features/antag_tips/code/asset_cache.dm | 63 +++++++++--------- .../features/antag_tips/html/imposter.html | 13 ---- .../features/antag_tips/html/traitor.html | 16 ----- .../antag_tips/html/wiz_apprentice.html | 16 ----- .../features/antag_tips/html/wizard.html | 15 ----- .../features/antag_tips/icons/headset.png | Bin 199 -> 0 bytes .../features/antag_tips/icons/pda.png | Bin 273 -> 0 bytes .../features/antag_tips/icons/pen.png | Bin 266 -> 0 bytes .../features/antag_tips/icons/scroll.png | Bin 294 -> 0 bytes .../features/antag_tips/icons/spellbook.png | Bin 568 -> 0 bytes .../features/antag_tips/icons/traitor.png | Bin 808 -> 0 bytes .../features/antag_tips/icons/wizard.png | Bin 3858 -> 0 bytes 14 files changed, 32 insertions(+), 107 deletions(-) delete mode 100644 fulp_modules/features/antag_tips/html/imposter.html delete mode 100644 fulp_modules/features/antag_tips/html/traitor.html delete mode 100644 fulp_modules/features/antag_tips/html/wiz_apprentice.html delete mode 100644 fulp_modules/features/antag_tips/html/wizard.html delete mode 100644 fulp_modules/features/antag_tips/icons/headset.png delete mode 100644 fulp_modules/features/antag_tips/icons/pda.png delete mode 100644 fulp_modules/features/antag_tips/icons/pen.png delete mode 100644 fulp_modules/features/antag_tips/icons/scroll.png delete mode 100644 fulp_modules/features/antag_tips/icons/spellbook.png delete mode 100644 fulp_modules/features/antag_tips/icons/traitor.png delete mode 100644 fulp_modules/features/antag_tips/icons/wizard.png diff --git a/code/___fulp_defines/fulp_defines.dm b/code/___fulp_defines/fulp_defines.dm index 73c32b3bb34..816eea570d2 100644 --- a/code/___fulp_defines/fulp_defines.dm +++ b/code/___fulp_defines/fulp_defines.dm @@ -103,12 +103,8 @@ #define CHANGELING_TIPS "changeling" #define CULTIST_TIPS "cultist" #define HERETIC_TIPS "heretic" -#define IMPOSTER_TIPS "imposter" #define MALF_TIPS "malf_ai" #define MONSTERHUNTER_TIPS "monsterhunter" #define NUKIE_TIPS "nukie" #define REVOLUTIONARY_TIPS "revolutionary" -#define TRAITOR_TIPS "traitor" #define VASSAL_TIPS "vassal" -#define WIZARD_APPRENTICE_TIPS "wiz_apprentice" -#define WIZARD_TIPS "wizard" diff --git a/fulp_modules/features/antag_tips/code/antag_tip_integration.dm b/fulp_modules/features/antag_tips/code/antag_tip_integration.dm index 9054b639ece..c985b3372a8 100644 --- a/fulp_modules/features/antag_tips/code/antag_tip_integration.dm +++ b/fulp_modules/features/antag_tips/code/antag_tip_integration.dm @@ -18,15 +18,3 @@ /datum/antagonist/rev tips = REVOLUTIONARY_TIPS - -/datum/antagonist/traitor - tips = TRAITOR_TIPS - -/datum/antagonist/wizard - tips = WIZARD_TIPS - -/datum/antagonist/wizard/apprentice - tips = WIZARD_APPRENTICE_TIPS - -/datum/antagonist/wizard/imposter - tips = IMPOSTER_TIPS diff --git a/fulp_modules/features/antag_tips/code/asset_cache.dm b/fulp_modules/features/antag_tips/code/asset_cache.dm index 4792eac3e9a..e128b2cc398 100644 --- a/fulp_modules/features/antag_tips/code/asset_cache.dm +++ b/fulp_modules/features/antag_tips/code/asset_cache.dm @@ -1,54 +1,55 @@ /datum/asset/simple/antag_tip_icons assets = list( + ///Abductor "abaton.png"= 'fulp_modules/features/antag_tips/icons/abaton.png', "abductor.png" = 'fulp_modules/features/antag_tips/icons/abductor.png', - "absorb.png" = 'fulp_modules/features/antag_tips/icons/absorb.png', + "scitool.png" = 'fulp_modules/features/antag_tips/icons/scitool.png', "alienorgan.png"= 'fulp_modules/features/antag_tips/icons/alienorgan.png', - "apc.png" = 'fulp_modules/features/antag_tips/icons/apc.png', - "archives.png" = 'fulp_modules/features/antag_tips/icons/archives.png', - "beepsky.png" = 'fulp_modules/features/antag_tips/icons/beepsky.png', - "bloodcult.png" = 'fulp_modules/features/antag_tips/icons/bloodcult.png', + ///Changeling + "absorb.png" = 'fulp_modules/features/antag_tips/icons/absorb.png', "changeling.png" = 'fulp_modules/features/antag_tips/icons/changeling.png', - "cicatrix.png" = 'fulp_modules/features/antag_tips/icons/cicatrix.png', - "cyborg.png" = 'fulp_modules/features/antag_tips/icons/cyborg.png', - "dagger.png" = 'fulp_modules/features/antag_tips/icons/dagger.png', - "disk.png" = 'fulp_modules/features/antag_tips/icons/disk.png', "emporium.png" = 'fulp_modules/features/antag_tips/icons/emporium.png', - "eshield.png" = 'fulp_modules/features/antag_tips/icons/eshield.png', - "flash.png" = 'fulp_modules/features/antag_tips/icons/flash.png', - "headrevhud.png" = 'fulp_modules/features/antag_tips/icons/headrevhud.png', - "headset.png" = 'fulp_modules/features/antag_tips/icons/headset.png', + "sting_extract.png" = 'fulp_modules/features/antag_tips/icons/sting_extract.png', + "tentacle.png" = 'fulp_modules/features/antag_tips/icons/tentacle.png', + ///Malf AI + "apc.png" = 'fulp_modules/features/antag_tips/icons/apc.png', + "beepsky.png" = 'fulp_modules/features/antag_tips/icons/beepsky.png', + "cyborg.png" = 'fulp_modules/features/antag_tips/icons/cyborg.png', + "malf_ai.png" = 'fulp_modules/features/antag_tips/icons/malf_ai.png', + ///Cultist + "archives.png" = 'fulp_modules/features/antag_tips/icons/archives.png', + "bloodcult.png" = 'fulp_modules/features/antag_tips/icons/bloodcult.png', + "dagger.png" = 'fulp_modules/features/antag_tips/icons/dagger.png', + "sacrune.png" = 'fulp_modules/features/antag_tips/icons/sacrune.png', + ///Heretic + "cicatrix.png" = 'fulp_modules/features/antag_tips/icons/cicatrix.png', "heart.png" = 'fulp_modules/features/antag_tips/icons/heart.png', "heretic.png" = 'fulp_modules/features/antag_tips/icons/heretic.png', "heretic_rune.png" = 'fulp_modules/features/antag_tips/icons/heretic_rune.png', - "implanter.png" = 'fulp_modules/features/antag_tips/icons/implanter.png', "influence.png" = 'fulp_modules/features/antag_tips/icons/influence.png', - "malf_ai.png" = 'fulp_modules/features/antag_tips/icons/malf_ai.png', "mansus.png" = 'fulp_modules/features/antag_tips/icons/mansus.png', + ///Nukie + "disk.png" = 'fulp_modules/features/antag_tips/icons/disk.png', + "eshield.png" = 'fulp_modules/features/antag_tips/icons/eshield.png', "mauler.png" = 'fulp_modules/features/antag_tips/icons/mauler.png', - "mjolnir.png" = 'fulp_modules/features/antag_tips/icons/mjolnir.png', "nuke.png" = 'fulp_modules/features/antag_tips/icons/nuke.png', "nukie.png" = 'fulp_modules/features/antag_tips/icons/nukie.png', - "pda.png" = 'fulp_modules/features/antag_tips/icons/pda.png', - "pen.png" = 'fulp_modules/features/antag_tips/icons/pen.png', - "radio.png" = 'fulp_modules/features/antag_tips/icons/radio.png', - "revhud.png" = 'fulp_modules/features/antag_tips/icons/revhud.png', - "sacrune.png" = 'fulp_modules/features/antag_tips/icons/sacrune.png', - "scitool.png" = 'fulp_modules/features/antag_tips/icons/scitool.png', - "scroll.png" = 'fulp_modules/features/antag_tips/icons/scroll.png', - "spellbook.png" = 'fulp_modules/features/antag_tips/icons/spellbook.png', - "sting_extract.png" = 'fulp_modules/features/antag_tips/icons/sting_extract.png', - "stunprod.png" = 'fulp_modules/features/antag_tips/icons/stunprod.png', "tablet.png" = 'fulp_modules/features/antag_tips/icons/tablet.png', - "tentacle.png" = 'fulp_modules/features/antag_tips/icons/tentacle.png', - "traitor.png" = 'fulp_modules/features/antag_tips/icons/traitor.png', - "wizard.png" = 'fulp_modules/features/antag_tips/icons/wizard.png', - // Bloodsucker icons + "radio.png" = 'fulp_modules/features/antag_tips/icons/radio.png', + ///Revolutionary + "flash.png" = 'fulp_modules/features/antag_tips/icons/flash.png', // Also used in Nukie + "headrevhud.png" = 'fulp_modules/features/antag_tips/icons/headrevhud.png', + "implanter.png" = 'fulp_modules/features/antag_tips/icons/implanter.png', + "revhud.png" = 'fulp_modules/features/antag_tips/icons/revhud.png', + "stunprod.png" = 'fulp_modules/features/antag_tips/icons/stunprod.png', + ///Bloodsucker "bloodsucker.png" = 'fulp_modules/features/antag_tips/icons/bloodsucker.png', "coffin.png" = 'fulp_modules/features/antag_tips/icons/coffin.png', - "day.png" = 'fulp_modules/features/antag_tips/icons/day.png', + "day.png" = 'fulp_modules/features/antag_tips/icons/day.png', // Also used in Vassal "vassalrack.png" = 'fulp_modules/features/antag_tips/icons/vassalrack.png', "masquerade.png" = 'fulp_modules/features/antag_tips/icons/masquerade.png', + ///Monster Hunter "monsterhunter.png" = 'fulp_modules/features/antag_tips/icons/monsterhunter.png', + ///Vassal "vassal.png" = 'fulp_modules/features/antag_tips/icons/vassal.png', ) diff --git a/fulp_modules/features/antag_tips/html/imposter.html b/fulp_modules/features/antag_tips/html/imposter.html deleted file mode 100644 index 6ade7570aeb..00000000000 --- a/fulp_modules/features/antag_tips/html/imposter.html +++ /dev/null @@ -1,13 +0,0 @@ - -
- You are a wizard imposter, tasked with fooling the crew away from the original wizard.
-You have been given 3 spells to accomplish this:
-Teleport:Long cooldown spell that lets you teleport to any general area in the station.
-Blink:Short cooldown spell that teleports you a few tiles away with a random pattern.
-Ethereal Jaunt:A spell that manifests you away from the physical realm, allowing free movement for a few seconds past any structures.
-Don't be afraid to ask mentors for help using the mentorhelp button.
-For further information visit https://tgstation13.org/wiki/Wizard
-
- The syndicate has provided you with a disguised uplink. It can either be your PDA, your headset, your pen or an internal uplink.
-The details of your objective are stored within your notes, to see them use the Notes verb.
-
To utilize your PDA uplink, enter the messenger tab and set the ringtone as the code you have been provided.
To utilize your Headset uplink, change its frequency to the frequency provided.
To utilize the pen uplink, twist it to the first setting, then to the second one.
To utilize the internal uplink, use the action button on the top left of your screen to access the uplink menu.
The uplink starts out with 20 telecrystals (16 if you use the internal uplink) which are utilized to purchase different items to aid you in fulfilling your objectives.
-The Syndicate has also given you and any other agents on board code-words which can be used to find eachother. They're highlighted in red and blue.
-Don't be afraid to ask mentors for help using the mentorhelp button.
-For further information visit https://tgstation13.org/wiki/Traitor
-
- You are a wizard apprentice, summoned by your master.
-
Your primary objective is to help your master, depending on which spells they picked for you.
Use your lesser scroll of teleportation to get to the station.
There are 4 loadouts which your master has possibly picked for you:
-Destruction:Contains the spells fireball and magic missile. Perfect for a hostile wizard, keep in mind that these can hit your master too.
-Bluespace:Contains the spells ethereal jaunt and teleport. Best used to sneak around for your own equipment.
-Healing:Contains a healing staff, and the spells charge and forcewall. You can help as a support, able to heal your master's damage.
-Robeless:Contains the robeless spells knock and mind transfer. Effective for stealth and impersonating someone.
-Don't be afraid to ask mentors for help using the mentorhelp button.
-For further information visit https://tgstation13.org/wiki/Wizard
-
- You are a wizard sent by the Wizard Federation.
-
You have been granted a spellbook with 10 spellpoints that you can spend to buy new spells. It can only be used on board of the Wizard's den.
Use your scroll of teleportation to get to the station.
The details of your objective are stored within your notes, although they are merely a suggestion.
-Spells can be upgraded by putting more points into them or refunded.
-As a wizard, you have a versatile loadout that can adapt depending on which playstyle you wish to adopt.
You might be an agent of chaos, but how you choose to act is up to you.
-Don't be afraid to ask mentors for help using the mentorhelp button.
-For further information visit https://tgstation13.org/wiki/Wizard
-^+=9#J#eTv6WYS3cg@odJHVA9RMnhPd>VOyxsZ##yGakoV+_E(`Z!nSS>hXA}uC9(=
z^w-kM-@4@bqQ912C*Ndc=|FcUwLRS+PfVl(-JR5AWfig+1){OBG297NV8n47Vl*Vz
z5yx$?78kX*w=39