cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports Anti-magic from TG. (#27560)

Browse Source 
* the rest of the fucking owl

* OK hands need work but otherwise good

* fuck time out fix vampire after

* temporary codersprite do not merge this lmao

* codersprite up

* pause, time out

* deploy the antimagic

* Update code/__HELPERS/trait_helpers.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* Update code/datums/status_effects/buffs.dm

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/gamemodes/wizard/magic_tarot.dm

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2025-01-02 03:36:07 -05:00
committed by GitHub
parent 6057ff5c31
commit 7bbebbb23f
62 changed files with 580 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/loot/tendril_loot.dm
+17 -1
View File
@@ -338,6 +338,7 @@
max_charges = 1
flags = NOBLUDGEON
force = 18
antimagic_flags = NONE
/obj/item/ammo_casing/magic/hook
name = "hook"
@@ -384,7 +385,7 @@
//Immortality Talisman
/obj/item/immortality_talisman
name = "Immortality Talisman"
name = "\improper Immortality Talisman"
desc = "A dread talisman that can render you completely invulnerable."
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "talisman"
@@ -393,6 +394,21 @@
actions_types = list(/datum/action/item_action/immortality)
var/cooldown = 0
/obj/item/immortality_talisman/Initialize(mapload)
. = ..()
AddComponent(/datum/component/anti_magic, ALL)
/obj/item/immortality_talisman/equipped(mob/user, slot)
..()
if(slot != ITEM_SLOT_IN_BACKPACK)
var/user_UID = user.UID()
ADD_TRAIT(user, TRAIT_ANTIMAGIC_NO_SELFBLOCK, user_UID)
/obj/item/immortality_talisman/dropped(mob/user, silent)
. = ..()
var/user_UID = user.UID()
REMOVE_TRAIT(user, TRAIT_ANTIMAGIC_NO_SELFBLOCK, user_UID)
/datum/action/item_action/immortality
name = "Immortality"
code/modules/mining/lavaland/necropolis_chests.dm
+4
View File
@@ -184,6 +184,10 @@
)
hide_tail_by_species = list("Unathi", "Tajaran", "Vox", "Vulpkanin")
/obj/item/clothing/suit/hooded/berserker/Initialize(mapload)
. = ..()
AddComponent(/datum/component/anti_magic, ALL, inventory_flags = ITEM_SLOT_OUTER_SUIT)
/obj/item/clothing/head/hooded/berserker
name = "berserker helmet"
desc = "Peering into the eyes of the helmet is enough to seal damnation."