mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 14:07:51 +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
@@ -395,6 +395,12 @@
|
||||
source.UpdateButtonIcon()
|
||||
return ..()
|
||||
|
||||
/obj/item/melee/blood_magic/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 blood-red fire.</span>"
|
||||
|
||||
/obj/item/melee/blood_magic/attack_self(mob/living/user)
|
||||
afterattack(user, user, TRUE)
|
||||
|
||||
|
||||
@@ -23,6 +23,12 @@
|
||||
attached_spell.UnregisterSignal(attached_spell.action.owner, COMSIG_MOB_WILLINGLY_DROP)
|
||||
return ..()
|
||||
|
||||
/obj/item/melee/touch_attack/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 magic fire.</span>"
|
||||
|
||||
/obj/item/melee/touch_attack/attack(mob/target, mob/living/carbon/user)
|
||||
if(!iscarbon(user)) //Look ma, no hands
|
||||
return
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -125,6 +125,8 @@
|
||||
// All the things wielded/worn that can be reasonably described with a common template:
|
||||
var/list/message_parts = examine_visible_clothing(skipgloves, skipsuitstorage, skipjumpsuit, skipshoes, skipmask, skipears, skipeyes, skipface)
|
||||
|
||||
var/list/abstract_items = list()
|
||||
|
||||
for(var/parts in message_parts)
|
||||
var/action = parts[1]
|
||||
var/obj/item/item = parts[2]
|
||||
@@ -134,20 +136,23 @@
|
||||
if(length(parts) >= 5)
|
||||
accessories = parts[5]
|
||||
|
||||
if(item && !(item.flags & ABSTRACT))
|
||||
var/item_words = item.name
|
||||
if(item.blood_DNA)
|
||||
item_words = "[item.blood_color != "#030303" ? "blood-stained" : "oil-stained"] [item_words]"
|
||||
var/submsg = "[p_they(TRUE)] [action] [bicon(item)] \a [item_words]"
|
||||
if(accessories)
|
||||
submsg += " with [accessories]"
|
||||
if(limb_name)
|
||||
submsg += " [preposition] [p_their()] [limb_name]"
|
||||
if(item.blood_DNA)
|
||||
submsg = "<span class='warning'>[submsg]!</span>\n"
|
||||
if(item)
|
||||
if(item.flags & ABSTRACT)
|
||||
abstract_items |= item
|
||||
else
|
||||
submsg = "[submsg].\n"
|
||||
msg += submsg
|
||||
var/item_words = item.name
|
||||
if(item.blood_DNA)
|
||||
item_words = "[item.blood_color != "#030303" ? "blood-stained" : "oil-stained"] [item_words]"
|
||||
var/submsg = "[p_they(TRUE)] [action] [bicon(item)] \a [item_words]"
|
||||
if(accessories)
|
||||
submsg += " with [accessories]"
|
||||
if(limb_name)
|
||||
submsg += " [preposition] [p_their()] [limb_name]"
|
||||
if(item.blood_DNA)
|
||||
submsg = "<span class='warning'>[submsg]!</span>\n"
|
||||
else
|
||||
submsg = "[submsg].\n"
|
||||
msg += submsg
|
||||
else
|
||||
// add any extra info on the limbs themselves
|
||||
msg += examine_handle_individual_limb(limb_name)
|
||||
@@ -170,6 +175,12 @@
|
||||
else
|
||||
msg += "<span class='warning'>[p_they(TRUE)] [p_are()] [bicon(legcuffed)] legcuffed!</span>\n"
|
||||
|
||||
for(var/obj/item/abstract_item in abstract_items)
|
||||
var/text = abstract_item.customised_abstract_text()
|
||||
if(!text)
|
||||
continue
|
||||
msg += "[text]\n"
|
||||
|
||||
//Jitters
|
||||
switch(AmountJitter())
|
||||
if(600 SECONDS to INFINITY)
|
||||
|
||||
@@ -484,6 +484,11 @@
|
||||
var/disabled = FALSE
|
||||
var/force_when_disabled = 5 //still basically a metal pipe, just hard to move
|
||||
|
||||
/obj/item/shield/v1_arm/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"] is covered in metal.</span>"
|
||||
|
||||
/obj/item/shield/v1_arm/emp_act(severity)
|
||||
if(disabled)
|
||||
|
||||
Reference in New Issue
Block a user