Skip to content

Commit

Permalink
Speedmerge this PR, fixes triumph buy + Totod tweaks (#1237)
Browse files Browse the repository at this point in the history
* Fixes Totod helmet and triumph buy

* More Totod fixes

---------

Co-authored-by: NPC1314 <110836368+NPC1314@users.noreply.github.com>
  • Loading branch information
BadAtThisGame302 and NPC1314 authored Dec 11, 2024
1 parent da89b55 commit 0a76704
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/datum/triumph_buy/pick_any_class
triumph_buy_id = "PickAny"
desc = "Get single run of a class that can pick any class BYPASSING CLASS RESTRICTIONS on any class selection! WARNING: MAY BE BUGGY"
triumph_cost = 40
triumph_cost = 20
category = TRIUMPH_CAT_CHARACTER
pre_round_only = FALSE
visible_on_active_menu = TRUE
Expand Down Expand Up @@ -52,6 +52,14 @@
continue
if(CTAG_MERCENARY in CHECKS.category_tags)
continue
if(CTAG_TOWNER in CHECKS.category_tags)
continue
if(CTAG_GARRISON in CHECKS.category_tags)
continue
if(CTAG_ADEPT in CHECKS.category_tags)
continue
if(CTAG_CONSORT in CHECKS.category_tags)
continue
possible_classes += CHECKS

var/datum/advclass/C = input(H.client, "What is my class?", "Adventure") as null|anything in possible_classes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
pants = /obj/item/clothing/under/roguetown/chainlegs
shoes = /obj/item/clothing/shoes/roguetown/boots/armor/light
backr = /obj/item/rogueweapon/shield/tower/metal
backl = /obj/item/clothing/cloak/cape/crusader
backl = /obj/item/storage/backpack/rogue/satchel
belt = /obj/item/storage/belt/rogue/leather/plaquesilver
beltl = /obj/item/rogueweapon/sword/silver
backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/rich = 1)
Expand Down Expand Up @@ -149,7 +149,9 @@
mob_overlay_icon = 'icons/roguetown/clothing/special/onmob/crusader.dmi'

/obj/item/clothing/head/roguetown/helmet/heavy/crusader_totod
name = "totod helm"
desc = "Proud knights of the Totod order displays their faith and their allegiance openly."
icon_state = "totodhelm"
mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
bloody_icon = 'icons/effects/blood64x64.dmi'
bloody_icon_state = "helmetblood_big"
Expand Down

0 comments on commit 0a76704

Please sign in to comment.