mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 15:17:01 +01:00
[MIRROR] Fixes plasma lava limb conversion bug (#3532)
* Fixes plasma lava limb conversion bug * Update human_update_icons.dm Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com> Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
co-authored by
ArcaneDefence
Gandalf
parent
f39c5d0a63
commit
0e3a2d8577
@@ -231,11 +231,10 @@
|
||||
PP.adjustToxLoss(15)
|
||||
PP.adjustFireLoss(25)
|
||||
if(plasma_parts.len)
|
||||
var/obj/item/bodypart/NB = pick(plasma_parts) //using the above-mentioned list to get a choice of limbs for dismember() to use
|
||||
var/obj/item/bodypart/NB = pick(plasma_parts) //using the above-mentioned list to get a choice of limbs
|
||||
PP.emote("scream")
|
||||
NB.species_id = "plasmaman"//change the species_id of the limb to that of a plasmaman
|
||||
NB.no_update = TRUE
|
||||
NB.change_bodypart_status()
|
||||
ADD_TRAIT(NB, TRAIT_PLASMABURNT, src)
|
||||
PP.update_body_parts()
|
||||
PP.visible_message("<span class='warning'>[L] screams in pain as [L.p_their()] [NB] melts down to the bone!</span>", \
|
||||
"<span class='userdanger'>You scream out in pain as your [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!</span>")
|
||||
if(!plasma_parts.len && !robo_parts.len) //a person with no potential organic limbs left AND no robotic limbs, time to turn them into a plasmaman
|
||||
|
||||
@@ -603,11 +603,15 @@ generate/load female uniform sprites matching all previously decided variables
|
||||
. += "-digitigrade[BP.use_digitigrade]"
|
||||
if(BP.dmg_overlay_type)
|
||||
. += "-[BP.dmg_overlay_type]"
|
||||
|
||||
//SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION
|
||||
if(BP.organic_render)
|
||||
. += "-OR"
|
||||
//SKYRAT EDIT ADDITION END
|
||||
|
||||
if(HAS_TRAIT(BP, TRAIT_PLASMABURNT))
|
||||
. += "-plasmaburnt"
|
||||
|
||||
if(HAS_TRAIT(src, TRAIT_HUSK))
|
||||
. += "-husk"
|
||||
|
||||
|
||||
@@ -791,6 +791,13 @@
|
||||
should_draw_greyscale = FALSE
|
||||
no_update = TRUE
|
||||
|
||||
if(HAS_TRAIT(src, TRAIT_PLASMABURNT) && is_organic_limb())
|
||||
species_id = "plasmaman"
|
||||
dmg_overlay_type = ""
|
||||
should_draw_gender = FALSE
|
||||
should_draw_greyscale = FALSE
|
||||
no_update = TRUE
|
||||
|
||||
if(no_update)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user