Skip to content

Commit

Permalink
slight fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Szyszkrzyneczka committed Nov 29, 2024
1 parent c0a3a0c commit 49b0844
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
new /obj/item/clothing/gloves/color/purple(get_turf(user))//To complete the outfit
new /obj/item/clothing/mask/breath(get_turf(user)) // so the air gets to your mouth. Just an average mask.
new /obj/item/tank/internals/emergency_oxygen/magic_oxygen(get_turf(user)) // so you have something to actually breathe. Near infinite.
new /obj/item/clothing/suit/space/hardsuit/wizard(get_turf(user))


/datum/spellbook_entry/item/battlemage_charge
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/spacesuits/hardsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@
item_state = "wiz_hardsuit"
w_class = WEIGHT_CLASS_NORMAL
resistance_flags = FIRE_PROOF | ACID_PROOF
clothing_flags = CASTING_CLOTHES
armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 50, BOMB = 35, BIO = 100, RAD = 50, FIRE = 100, ACID = 100, STAMINA = 70, BLEED = 70)
allowed = list(/obj/item/teleportation_scroll, /obj/item/tank/internals)
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection
Expand Down
21 changes: 6 additions & 15 deletions code/modules/spells/spell_types/bee_spells/cluwnecurse.dm
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
/datum/action/cooldown/spell/list_target/cluwnecurse
/datum/action/cooldown/spell/pointed/cluwnecurse
name = "Curse of the Cluwne"
desc = "This spell dooms the fate of any unlucky soul to the live of a pitiful cluwne, a terrible creature that is hunted for fun."
school = "transmutation"
cooldown_time = 300 SECONDS
invocation = "CLU WO'NIS CA'TE'BEST'IS MAXIMUS!"
invocation_type = INVOCATION_SHOUT
target_radius = 3
cast_range = 3
icon_icon = 'icons/obj/clothing/masks.dmi'
ranged_mousepointer = 'icons/effects/mouse_pointers/cluwne.dmi'
button_icon_state = "cluwne"
choose_target_message = "Choose your victim"

/// Get a list of living targets in radius of the center to put in the target list.
/datum/action/cooldown/spell/list_target/cluwnecurse/get_list_targets(atom/center, target_radius = 7)
var/list/things = list()
for(var/mob/living/carbon/nearby_living_carbon in view(target_radius, center))
if(nearby_living_carbon == owner || nearby_living_carbon == center)
continue

things += nearby_living_carbon

return things

/datum/action/cooldown/spell/list_target/cluwnecurse/cast(mob/living/carbon/human/cast_on)
. = ..()
cast_on.cluwneify()
if(cast_on == owner)
if(tgui_alert(usr, "Are you sure you want to curse yourself to become a cluwne?", "Fool's choice", list("Yes!", "No...")) == "Yes")
cast_on.cluwneify()

/datum/spellbook_entry/cluwnecurse
name = "Cluwne Curse"
Expand Down
Binary file added icons/effects/mouse_pointers/cluwne.dmi
Binary file not shown.

0 comments on commit 49b0844

Please sign in to comment.