cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Academy wizard won't buy scanner wands (#96789)

Browse Source 
## About The Pull Request

Why would he buy a scanner wand? They're not mapped in to the academy.
They're not mapped in anywhere, because they're not... anything? This is
extremely odd. It better not be because the word "wand" is in the
typepath and they just added items with "wand" in their typepaths
without checking.

also wow these were not proof read even one single time

## Why It's Good For The Game

infinite money glitch, yeah, but even getting 2k credits once for what
is not a wand is stupid

closes #96787

## Changelog
🆑

fix: Academy businessman doesn't buy a scanner wand, as it is not a wand
spellcheck: Academy wizard dialogue has been cleared of all glaring
spelling and capitalization errors

/🆑
This commit is contained in:
Leland Kemble
2026-07-04 18:41:10 +02:00
committed by GitHub
parent 3a87bab186
commit 2b17ee5e9a
1 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/mission_code/academy/academy_trader_data.dm
+45 -46
View File
@@ -22,53 +22,52 @@
/obj/item/fake_items/abductor_win_stick/no_anchor = list(PAYCHECK_CREW * 40, INFINITY, "Good work killing that wizard"),
/obj/item/clothing/head/collectable/paper = list(PAYCHECK_CREW * 40, INFINITY, "Good work killing that wizard"),
/obj/item/clothing/suit/wizrobe/paper = list(PAYCHECK_CREW * 40, INFINITY, "Good work killing that wizard"),
/obj/item/gun/magic/wand/disabler = list(PAYCHECK_CREW * 40, INFINITY, "Good work retriving the relic"),
/obj/item/boulder/true_boulder = list(PAYCHECK_CREW * 40, INFINITY, "Good work retriving the relic"),
/obj/item/gun/magic/wand/fireball/inert = list(PAYCHECK_CREW * 40, INFINITY, "Good work retriving the relic"),
/obj/item/scanner_wand = list(PAYCHECK_CREW * 40, INFINITY, "Good work retriving the relic"),
/obj/item/gun/magic/wand/resurrection/inert = list(PAYCHECK_CREW * 40, INFINITY, "Good work retriving the relic"),
/obj/item/soulstone = list(PAYCHECK_CREW * 40, INFINITY, "Good work retriving the relic"),
/obj/item/soulstone/anybody = list(PAYCHECK_CREW * 5, 1, "Good work retriving the con- oh, i recognize this, ill see if i can scramble a team for the station"),//to-do, spawn a red alert security ert if this item is sold
/obj/item/soulstone/anybody/chaplain = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the relic"),
/obj/item/soulstone/anybody/chaplain/sparring = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the relic"),
/obj/item/soulstone/anybody/mining = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the relic"),
/obj/item/soulstone/anybody/purified = list(PAYCHECK_CREW * 10, INFINITY, "Good work retriving the relic"),
/obj/item/soulstone/anybody/revolver = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the relic"),
/obj/item/soulstone/mystic = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the relic"),
/obj/item/guardian_creator/miner = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the relic"),
/obj/item/guardian_creator/wizard = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the relic"),
/obj/item/guardian_creator/carp = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the relic"),
/obj/item/card/emag = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/item/card/emag/doorjack = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/item/card/emag/battlecruiser = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the con- oh, i recognize this, ill see if i can scramble a team for the station"),//to-do, spawn a red alert security ert if this item is sold
/obj/item/disk/nuclear/fake = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband, hard to tell these apart."),
/obj/item/gun/ballistic/revolver/badass = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/item/crowbar/power/syndicate = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/item/documents/syndicate = list(PAYCHECK_CREW * 5, INFINITY, "sorry but these are out-dated, we cant gleem much from this"),
/obj/item/documents/syndicate/blue = list(PAYCHECK_CREW * 50, INFINITY, "hope you didnt look over these, here take some extra"),
/obj/item/documents/syndicate/red = list(PAYCHECK_CREW * 50, INFINITY, "hope you didnt look over these, here take some extra"),
/obj/item/documents/syndicate/mining = list(PAYCHECK_CREW * 5, INFINITY, "sorry but these are out-dated, we cant gleem much from this"),
/obj/item/gun/ballistic/rifle/sniper_rifle/syndicate = list(PAYCHECK_CREW * 60, INFINITY, "Well ho-lee-shit *whistles* a nice point fifty sniper rifle, ill be- taking that."),//to-do, make it appear on his back after purchasing this
/obj/item/mod/control/pre_equipped/empty/syndicate = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/item/storage/toolbox/syndicate = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the contraband"),
/obj/item/toy/cards/deck/syndicate = list(PAYCHECK_CREW * 1, INFINITY, "this is not- really contraband, but ill take it anyhow"),
/obj/item/syndicate_teleporter = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the contraband"),
/obj/item/encryptionkey/syndicate = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the contraband"),
/obj/item/clothing/suit/space/syndicate/black/red = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the contraband"),
/obj/item/clothing/head/helmet/space/syndicate/black/red = list(PAYCHECK_CREW * 5, INFINITY, "Good work retriving the contraband"),
/obj/item/gun/ballistic/automatic/pistol/contraband = list(PAYCHECK_CREW * 10, INFINITY, "Good work retriving the contraband"),
/obj/item/gun/ballistic/rifle/rebarxbow/syndie = list(PAYCHECK_CREW * 10, INFINITY, "Good work retriving the contraband"),
/obj/item/mod/control/pre_equipped/traitor = list(PAYCHECK_CREW * 10, INFINITY, "Good work retriving the contraband"),
/obj/item/mod/control/pre_equipped/traitor_elite = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/item/melee/energy/sword = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/item/gun/magic/wand/disabler = list(PAYCHECK_CREW * 40, INFINITY, "Good work retrieving the relic"),
/obj/item/boulder/true_boulder = list(PAYCHECK_CREW * 40, INFINITY, "Good work retrieving the relic"),
/obj/item/gun/magic/wand/fireball/inert = list(PAYCHECK_CREW * 40, INFINITY, "Good work retrieving the relic"),
/obj/item/gun/magic/wand/resurrection/inert = list(PAYCHECK_CREW * 40, INFINITY, "Good work retrieving the relic"),
/obj/item/soulstone = list(PAYCHECK_CREW * 40, INFINITY, "Good work retrieving the relic"),
/obj/item/soulstone/anybody = list(PAYCHECK_CREW * 5, 1, "Good work retrieving the con- oh, I recognize this, I'll see if I can scramble a team for the station"),//to-do, spawn a red alert security ert if this item is sold
/obj/item/soulstone/anybody/chaplain = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the relic"),
/obj/item/soulstone/anybody/chaplain/sparring = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the relic"),
/obj/item/soulstone/anybody/mining = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the relic"),
/obj/item/soulstone/anybody/purified = list(PAYCHECK_CREW * 10, INFINITY, "Good work retrieving the relic"),
/obj/item/soulstone/anybody/revolver = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the relic"),
/obj/item/soulstone/mystic = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the relic"),
/obj/item/guardian_creator/miner = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the relic"),
/obj/item/guardian_creator/wizard = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the relic"),
/obj/item/guardian_creator/carp = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the relic"),
/obj/item/card/emag = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
/obj/item/card/emag/doorjack = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
/obj/item/card/emag/battlecruiser = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the con- oh, I recognize this, I'll see if I can scramble a team for the station"),//to-do, spawn a red alert security ert if this item is sold
/obj/item/disk/nuclear/fake = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband, hard to tell these apart"),
/obj/item/gun/ballistic/revolver/badass = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
/obj/item/crowbar/power/syndicate = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
/obj/item/documents/syndicate = list(PAYCHECK_CREW * 5, INFINITY, "Sorry, but these are out-dated, We cant glean much from this."),
/obj/item/documents/syndicate/blue = list(PAYCHECK_CREW * 50, INFINITY, "Hope you didnt look over these. Here, take some extra dough"),
/obj/item/documents/syndicate/red = list(PAYCHECK_CREW * 50, INFINITY, "Hope you didnt look over these. Here, take some extra doug."),
/obj/item/documents/syndicate/mining = list(PAYCHECK_CREW * 5, INFINITY, "Sorry, but these are outdated. We cant glean much from this"),
/obj/item/gun/ballistic/rifle/sniper_rifle/syndicate = list(PAYCHECK_CREW * 60, INFINITY, "Well ho-lee-shit *whistles* a nice point fifty sniper rifle, I'll be taking that"),//to-do, make it appear on his back after purchasing this
/obj/item/mod/control/pre_equipped/empty/syndicate = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
/obj/item/storage/toolbox/syndicate = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the contraband"),
/obj/item/toy/cards/deck/syndicate = list(PAYCHECK_CREW * 1, INFINITY, "this is not REALLY contraband, but I'll take it anyhow"),
/obj/item/syndicate_teleporter = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the contraband"),
/obj/item/encryptionkey/syndicate = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the contraband"),
/obj/item/clothing/suit/space/syndicate/black/red = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the contraband"),
/obj/item/clothing/head/helmet/space/syndicate/black/red = list(PAYCHECK_CREW * 5, INFINITY, "Good work retrieving the contraband"),
/obj/item/gun/ballistic/automatic/pistol/contraband = list(PAYCHECK_CREW * 10, INFINITY, "Good work retrieving the contraband"),
/obj/item/gun/ballistic/rifle/rebarxbow/syndie = list(PAYCHECK_CREW * 10, INFINITY, "Good work retrieving the contraband"),
/obj/item/mod/control/pre_equipped/traitor = list(PAYCHECK_CREW * 10, INFINITY, "Good work retrieving the contraband"),
/obj/item/mod/control/pre_equipped/traitor_elite = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
/obj/item/melee/energy/sword = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
/obj/item/melee/energy/axe = list(PAYCHECK_CREW * 100, INFINITY, "How the fuck- whatever, here is your money"),
/obj/item/dualsaber = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/item/dualsaber/red = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/effect/fun_balloon = list(PAYCHECK_CREW * 0, INFINITY, "Why would i care about a red balloon with an S on it?!"),
/obj/item/nuke_core = list(PAYCHECK_CREW * 40, INFINITY, "*he puts his hands up shielding himself from the plutonium rock* OH MY GOD WHY DID YOU BRING ME THIS THING?! *he then seems to remember that his suit is radiation proof to which he snatches it out of your hand*"),
/obj/item/melee/supermatter_sword = list(PAYCHECK_CREW * 200, INFINITY, "*he stares at you completely silent for what feels like two minutes* W-Well- that is, an interesting product of your stations rnd- ill just be taking that."),
/obj/item/melee/cultblade/haunted = list(PAYCHECK_CREW * 20, 1, "Good work retriving the cont- oh, this is specialized nar'si equipment... ill send a team over to the station"),//to-do, spawn a red alert inquisition ert if this item is sold
/obj/item/seeds/kudzu = list(PAYCHECK_CREW * 20, INFINITY, "Good work retriving the contraband"),
/obj/item/dualsaber = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
/obj/item/dualsaber/red = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
/obj/effect/fun_balloon = list(PAYCHECK_CREW * 0, INFINITY, "Why would I care about a red balloon with an S on it?!"),
/obj/item/nuke_core = list(PAYCHECK_CREW * 40, INFINITY, "*He puts his hands up, shielding himself from the plutonium rock* OH MY GOD WHY DID YOU BRING ME THIS THING?! *he then seems to remember that his suit is radiation proof, after which he snatches it out of your hand*"),
/obj/item/melee/supermatter_sword = list(PAYCHECK_CREW * 200, INFINITY, "*He stares at you completely silent for what feels like two minutes* W-Well- that is, an interesting product of your stations rnd- ill just be taking that"),
/obj/item/melee/cultblade/haunted = list(PAYCHECK_CREW * 20, 1, "Good work retrieving the cont- oh, this is specialized nar'sien equipment... I'll send a team over to the station"),//to-do, spawn a red alert inquisition ert if this item is sold
/obj/item/seeds/kudzu = list(PAYCHECK_CREW * 20, INFINITY, "Good work retrieving the contraband"),
)
say_phrases = list(