cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Abstract items can be shown (#22183)

Browse Source 
* abstract weapons can be shown

* customised messages, no force visible flag

* forgot this

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* return nothing if we want to return nothing

* vortex arm abstract text

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* \n moved to examine code

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
HMBGERDO
2023-10-20 19:58:51 +01:00
committed by GitHub
co-authored by Contrabang Luc
parent 83be35a3ea
commit aa33cb211a
9 changed files with 81 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/changeling/powers/mutations.dm
+12
View File
@@ -160,6 +160,12 @@
var/obj/machinery/computer/C = target
C.attack_alien(user) //muh copypasta
/obj/item/melee/arm_blade/customised_abstract_text()
if(!ishuman(loc))
return
var/mob/living/carbon/human/owner = loc
return "<span class='warning'>[owner.p_their(TRUE)] [owner.l_hand == src ? "left arm" : "right arm"] has been turned into a grotesque meat-blade.</span>"
/***************************************\
|***********COMBAT TENTACLES*************|
\***************************************/
@@ -201,6 +207,12 @@
throw_speed = 0
var/datum/action/changeling/weapon/parent_action
/obj/item/gun/magic/tentacle/customised_abstract_text()
if(!ishuman(loc))
return
var/mob/living/carbon/human/owner = loc
return "<span class='warning'>[owner.p_their(TRUE)] [owner.l_hand == src ? "left arm" : "right arm"] has been turned into a grotesque tentacle.</span>"
/obj/item/gun/magic/tentacle/Initialize(mapload, silent, new_parent_action)
. = ..()
parent_action = new_parent_action
code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
+6
View File
@@ -68,6 +68,12 @@
parent_spell = null
return ..()
/obj/item/vamp_claws/customised_abstract_text()
if(!ishuman(loc))
return
var/mob/living/carbon/human/owner = loc
return "<span class='warning'>[owner.p_they(TRUE)] [owner.p_have(FALSE)] bloodied claws extending from [owner.p_their(FALSE)] wrists.</span>"
/obj/item/vamp_claws/afterattack(atom/target, mob/user, proximity)
if(!proximity)
return