cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Datumizes spells (#24242)

Browse Source 
* datumized spells

* finished

* last changes

* conflict

* Update code/datums/spells/alien_spells/transfer_plasma.dm

* conflicts

* shitty runtime fix until i get to this tomorrow

* Update code/datums/spell.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spell_handler/alien_spell_handler.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/alien_spells/regurgitate.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/alien_spells/regurgitate.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/bloodcrawl.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/bloodcrawl.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/awaymissions/mission_code/ruins/wizardcrash.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/research/xenobiology/xenobiology.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/superheroes.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/conjure.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/ethereal_jaunt.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/emplosion.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/turf_teleport.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/wizard_spells.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/wizard_spells.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/dna/mutations/mutation_powers.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/wizard_spells.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/spells/wizard_spells.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/dna/mutations/mutation_powers.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/revenant/revenant_abilities.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* guess who just rework the entire malf ai actionsf ai

* gc better

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
GDN
2024-04-01 02:42:21 -05:00
committed by GitHub
parent d52535a041
commit eee8878024
149 changed files with 1358 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_internal.dm
+8 -8
View File
@@ -472,7 +472,7 @@
/obj/item/organ/internal/cyberimp/brain/hackerman_deck/remove(mob/living/carbon/M, special = 0)
. = ..()
if(M.mind)
M.mind.RemoveSpell(/obj/effect/proc_holder/spell/hackerman_deck)
M.mind.RemoveSpell(/datum/spell/hackerman_deck)
UnregisterSignal(M, COMSIG_BODY_TRANSFER_TO)
/obj/item/organ/internal/cyberimp/brain/hackerman_deck/proc/on_body_transfer()
@@ -485,8 +485,8 @@
/obj/item/organ/internal/cyberimp/brain/hackerman_deck/proc/add_spell()
if(owner.mind)
owner.mind.RemoveSpell(/obj/effect/proc_holder/spell/hackerman_deck) //Just to be sure.
owner.mind.AddSpell(new /obj/effect/proc_holder/spell/hackerman_deck(null))
owner.mind.RemoveSpell(/datum/spell/hackerman_deck) //Just to be sure.
owner.mind.AddSpell(new /datum/spell/hackerman_deck(null))
/obj/item/organ/internal/cyberimp/brain/hackerman_deck/emp_act(severity)
owner.adjustStaminaLoss(40 / severity)
@@ -494,7 +494,7 @@
to_chat(owner, "<span class='warning'>Your [name] heats up drastically!</span>")
return TRUE
/obj/effect/proc_holder/spell/hackerman_deck
/datum/spell/hackerman_deck
name = "Activate Ranged Hacking"
desc = "Click on any machine to hack them. Has a short range of only three tiles."
base_cooldown = 10 SECONDS
@@ -508,13 +508,13 @@
/// How many times have we successfully hacked in the last minute? Increases burn damage by 3 for each value above 0.
var/recent_hacking = 0
/obj/effect/proc_holder/spell/hackerman_deck/create_new_targeting()
/datum/spell/hackerman_deck/create_new_targeting()
var/datum/spell_targeting/clicked_atom/C = new()
C.range = 3
C.try_auto_target = FALSE
return C
/obj/effect/proc_holder/spell/hackerman_deck/on_mind_transfer(mob/living/L)
/datum/spell/hackerman_deck/on_mind_transfer(mob/living/L)
if(!ishuman(L))
return FALSE
var/mob/living/carbon/human/H = L
@@ -523,7 +523,7 @@
return FALSE
return TRUE
/obj/effect/proc_holder/spell/hackerman_deck/cast(list/targets, mob/user)
/datum/spell/hackerman_deck/cast(list/targets, mob/user)
var/atom/target = targets[1]
if(get_dist(user, target) > 3) //fucking cameras holy shit
to_chat(user, "<span class='warning'>Your implant is not robust enough to hack at that distance!</span>")
@@ -557,7 +557,7 @@
recent_hacking++
addtimer(CALLBACK(src, PROC_REF(lower_recent_hacking)), 1 MINUTES)
/obj/effect/proc_holder/spell/hackerman_deck/proc/lower_recent_hacking()
/datum/spell/hackerman_deck/proc/lower_recent_hacking()
recent_hacking--
//[[[[MOUTH]]]]
code/modules/surgery/organs/subtypes/xenos.dm
+11 -11
View File
@@ -60,8 +60,8 @@
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "biotech=5;plasmatech=4"
slot = "plasmavessel"
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/plant_weeds, /obj/effect/proc_holder/spell/alien_spell/transfer_plasma)
human_powers = list(/obj/effect/proc_holder/spell/alien_spell/syphon_plasma)
alien_powers = list(/datum/spell/alien_spell/plant_weeds, /datum/spell/alien_spell/transfer_plasma)
human_powers = list(/datum/spell/alien_spell/syphon_plasma)
var/stored_plasma = 100
var/max_plasma = 300
@@ -130,8 +130,8 @@
icon_state = "acid"
slot = "acid"
origin_tech = "biotech=5;materials=2;combat=2"
alien_powers = list(/obj/effect/proc_holder/spell/touch/alien_spell/corrosive_acid)
human_powers = list(/obj/effect/proc_holder/spell/touch/alien_spell/burning_touch)
alien_powers = list(/datum/spell/touch/alien_spell/corrosive_acid)
human_powers = list(/datum/spell/touch/alien_spell/burning_touch)
/obj/item/organ/internal/alien/hivenode
name = "xeno hive node"
@@ -139,7 +139,7 @@
slot = "hivenode"
origin_tech = "biotech=5;magnets=4;bluespace=3"
w_class = WEIGHT_CLASS_TINY
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/whisper)
alien_powers = list(/datum/spell/alien_spell/whisper)
/obj/item/organ/internal/alien/hivenode/insert(mob/living/carbon/M, special = 0)
..()
@@ -160,16 +160,16 @@
icon_state = "neurotox"
slot = "neurotox"
origin_tech = "biotech=5;combat=5"
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/neurotoxin)
human_powers = list(/obj/effect/proc_holder/spell/alien_spell/neurotoxin/death_to_xenos)
alien_powers = list(/datum/spell/alien_spell/neurotoxin)
human_powers = list(/datum/spell/alien_spell/neurotoxin/death_to_xenos)
/obj/item/organ/internal/alien/resinspinner
name = "xeno resin organ"
icon_state = "liver-x"
slot = "spinner"
origin_tech = "biotech=5;materials=4"
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/build_resin)
human_powers = list(/obj/effect/proc_holder/spell/touch/alien_spell/consume_resin)
alien_powers = list(/datum/spell/alien_spell/build_resin)
human_powers = list(/datum/spell/touch/alien_spell/consume_resin)
/obj/item/organ/internal/alien/eggsac
name = "xeno egg sac"
@@ -177,6 +177,6 @@
slot = "eggsac"
w_class = WEIGHT_CLASS_BULKY
origin_tech = "biotech=6"
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/plant_weeds/eggs)
human_powers = list(/obj/effect/proc_holder/spell/alien_spell/combust_facehuggers)
alien_powers = list(/datum/spell/alien_spell/plant_weeds/eggs)
human_powers = list(/datum/spell/alien_spell/combust_facehuggers)
cargo_profit = 1000