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

MODsuits (#59109)

Browse Source
This commit is contained in:
Fikou
2021-12-24 12:00:24 -08:00
committed by GitHub
parent fc5c9e2900
commit 7b38dd4ff7
191 changed files with 6749 additions and 2189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell.dm
+8 -28
View File
@@ -120,7 +120,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
var/holder_var_amount = 20 //same. The amount adjusted with the mob's var when the spell is used
var/clothes_req = TRUE //see if it requires clothes
var/cult_req = FALSE //SPECIAL SNOWFLAKE clothes required for cult only spells
var/human_req = FALSE //spell can only be cast by humans
var/nonabstract_req = FALSE //spell can only be cast by mobs that are physical entities
var/stat_allowed = FALSE //see if it requires being conscious/alive, need to set to 1 for ghostpells
@@ -198,27 +197,19 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
var/mob/living/carbon/human/H = user
var/static/list/casting_clothes = typecacheof(list(/obj/item/clothing/suit/wizrobe,
/obj/item/clothing/suit/space/hardsuit/wizard,
/obj/item/clothing/head/wizard,
/obj/item/clothing/head/helmet/space/hardsuit/wizard,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard,
/obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard))
var/static/list/casting_clothes = typecacheof(list(/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard))
if(clothes_req) //clothes check
if(!is_type_in_typecache(H.wear_suit, casting_clothes))
var/passes_req = FALSE
if(istype(H.back, /obj/item/mod/control))
var/obj/item/mod/control/mod = H.back
if(istype(mod.theme, /datum/mod_theme/enchanted))
passes_req = TRUE
if(!passes_req && !is_type_in_typecache(H.wear_suit, casting_clothes))
to_chat(H, span_warning("You don't feel strong enough without your robe!"))
return FALSE
if(!is_type_in_typecache(H.head, casting_clothes))
if(!passes_req && !is_type_in_typecache(H.head, casting_clothes))
to_chat(H, span_warning("You don't feel strong enough without your hat!"))
return FALSE
if(cult_req) //CULT_REQ CLOTHES CHECK
if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult))
to_chat(H, span_warning("You don't feel strong enough without your armor."))
return FALSE
if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult))
to_chat(H, span_warning("You don't feel strong enough without your helmet."))
return FALSE
else
if(clothes_req || human_req)
to_chat(user, span_warning("This spell can only be cast by humans!"))
@@ -595,11 +586,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
else
VV_DROPDOWN_OPTION(VV_HK_SPELL_UNSET_ROBELESS, "Unset Robeless")
if(cult_req)
VV_DROPDOWN_OPTION(VV_HK_SPELL_SET_CULT, "Set Cult Robeless")
else
VV_DROPDOWN_OPTION(VV_HK_SPELL_UNSET_CULT, "Unset Cult Robeless")
if(human_req)
VV_DROPDOWN_OPTION(VV_HK_SPELL_UNSET_HUMANONLY, "Unset Require Humanoid Mob")
else
@@ -618,12 +604,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if(href_list[VV_HK_SPELL_UNSET_ROBELESS])
clothes_req = TRUE
return
if(href_list[VV_HK_SPELL_SET_CULT])
cult_req = FALSE
return
if(href_list[VV_HK_SPELL_UNSET_CULT])
cult_req = TRUE
return
if(href_list[VV_HK_SPELL_UNSET_HUMANONLY])
human_req = FALSE
return
code/modules/spells/spell_types/rightandwrong.dm
-2
View File
@@ -74,7 +74,6 @@ GLOBAL_LIST_INIT(summoned_magic, list(
/obj/item/gun/magic/staff/door,
/obj/item/scrying,
/obj/item/warpwhistle,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard,
/obj/item/immortality_talisman,
/obj/item/melee/ghost_sword))
@@ -89,7 +88,6 @@ GLOBAL_LIST_INIT(summoned_special_magic, list(
//everything above except for single use spellbooks, because they are counted separately (and are for basic bitches anyways)
GLOBAL_LIST_INIT(summoned_magic_objectives, list(
/obj/item/antag_spawner/contract,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard,
/obj/item/gun/magic,
/obj/item/immortality_talisman,
/obj/item/melee/ghost_sword,