mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Abstract items can be shown (#22183)
* 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:
co-authored by
Contrabang
Luc
parent
83be35a3ea
commit
aa33cb211a
@@ -153,6 +153,10 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
|
||||
if(isstorage(loc)) //marks all items in storage as being such
|
||||
in_storage = TRUE
|
||||
|
||||
// this proc is used to add text for items with ABSTRACT flag after default examine text
|
||||
/obj/item/proc/customised_abstract_text()
|
||||
return
|
||||
|
||||
/obj/item/proc/determine_move_resist()
|
||||
switch(w_class)
|
||||
if(WEIGHT_CLASS_TINY)
|
||||
|
||||
@@ -122,6 +122,12 @@
|
||||
damtype = BURN
|
||||
attack_verb = list("punched", "cross countered", "pummeled")
|
||||
|
||||
/obj/item/nullrod/godhand/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 hand" : "right hand"] is burning in holy fire.</span>"
|
||||
|
||||
/obj/item/nullrod/staff
|
||||
name = "red holy staff"
|
||||
desc = "It has a mysterious, protective aura."
|
||||
@@ -429,6 +435,12 @@
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
sharp = TRUE
|
||||
|
||||
/obj/item/nullrod/armblade/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>"
|
||||
|
||||
/obj/item/nullrod/armblade/mining
|
||||
flags = NODROP
|
||||
reskin_selectable = FALSE //So 2 of the same nullrod doesnt show up.
|
||||
|
||||
@@ -749,6 +749,12 @@
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
/obj/item/pyro_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)] energy claws extending [owner.p_their(FALSE)] wrists.</span>"
|
||||
|
||||
/obj/item/pyro_claws/process()
|
||||
lifetime -= 2 SECONDS
|
||||
if(lifetime <= 0)
|
||||
|
||||
Reference in New Issue
Block a user