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

Removes Deformed Sprites (#15588)

Browse Source
This commit is contained in:
Fox McCloud
2021-02-24 12:45:58 +00:00
committed by GitHub
parent 78cb60f160
commit 7b7ea0a191
40 changed files with 10 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -1770,9 +1770,9 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
to_chat(src, "<span class='warning'>[mind.martial_art.no_guns_message]</span>")
return FALSE
/mob/living/carbon/human/proc/change_icobase(var/new_icobase, var/new_deform, var/owner_sensitive)
/mob/living/carbon/human/proc/change_icobase(new_icobase, owner_sensitive)
for(var/obj/item/organ/external/O in bodyparts)
O.change_organ_icobase(new_icobase, new_deform, owner_sensitive) //Change the icobase/deform of all our organs. If owner_sensitive is set, that means the proc won't mess with frankenstein limbs.
O.change_organ_icobase(new_icobase, owner_sensitive) //Change the icobase of all our organs. If owner_sensitive is set, that means the proc won't mess with frankenstein limbs.
/mob/living/carbon/human/serialize()
// Currently: Limbs/organs only
code/modules/mob/living/carbon/human/species/_species.dm
-1
View File
@@ -2,7 +2,6 @@
var/name // Species name.
var/name_plural // Pluralized name (since "[name]s" is not always valid)
var/icobase = 'icons/mob/human_races/r_human.dmi' // Normal icon set.
var/deform = 'icons/mob/human_races/r_def_human.dmi' // Mutated icon set.
// Damage overlay and masks.
var/damage_overlays = 'icons/mob/human_races/masks/dam_human.dmi'
code/modules/mob/living/carbon/human/species/abductor.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Abductor"
name_plural = "Abductors"
icobase = 'icons/mob/human_races/r_abductor.dmi'
deform = 'icons/mob/human_races/r_abductor.dmi'
language = "Abductor Mindlink"
default_language = "Abductor Mindlink"
eyes = "blank_eyes"
code/modules/mob/living/carbon/human/species/diona.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Diona"
name_plural = "Dionaea"
icobase = 'icons/mob/human_races/r_diona.dmi'
deform = 'icons/mob/human_races/r_def_plant.dmi'
language = "Rootspeak"
speech_sounds = list('sound/voice/dionatalk1.ogg') //Credit https://www.youtube.com/watch?v=ufnvlRjsOTI [0:13 - 0:16]
speech_chance = 20
code/modules/mob/living/carbon/human/species/drask.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Drask"
name_plural = "Drask"
icobase = 'icons/mob/human_races/r_drask.dmi'
deform = 'icons/mob/human_races/r_drask.dmi'
language = "Orluum"
eyes = "drask_eyes_s"
code/modules/mob/living/carbon/human/species/golem.dm
-1
View File
@@ -3,7 +3,6 @@
name_plural = "Golems"
icobase = 'icons/mob/human_races/r_golem.dmi'
deform = 'icons/mob/human_races/r_golem.dmi'
species_traits = list(NO_BLOOD)
inherent_traits = list(TRAIT_RESISTHEAT, TRAIT_NOBREATH, TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, TRAIT_NOFIRE, TRAIT_CHUNKYFINGERS, TRAIT_RADIMMUNE, TRAIT_PIERCEIMMUNE, TRAIT_NOPAIN)
code/modules/mob/living/carbon/human/species/grey.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Grey"
name_plural = "Greys"
icobase = 'icons/mob/human_races/r_grey.dmi'
deform = 'icons/mob/human_races/r_def_grey.dmi'
language = "Psionic Communication"
eyes = "grey_eyes_s"
butt_sprite = "grey"
code/modules/mob/living/carbon/human/species/human.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Human"
name_plural = "Humans"
icobase = 'icons/mob/human_races/r_human.dmi'
deform = 'icons/mob/human_races/r_def_human.dmi'
primitive_form = /datum/species/monkey
language = "Sol Common"
species_traits = list(LIPS)
code/modules/mob/living/carbon/human/species/kidan.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Kidan"
name_plural = "Kidan"
icobase = 'icons/mob/human_races/r_kidan.dmi'
deform = 'icons/mob/human_races/r_def_kidan.dmi'
language = "Chittin"
unarmed_type = /datum/unarmed_attack/claws
code/modules/mob/living/carbon/human/species/machine.dm
-1
View File
@@ -9,7 +9,6 @@
inhuman in outlook and perspective."
icobase = 'icons/mob/human_races/r_machine.dmi'
deform = 'icons/mob/human_races/r_machine.dmi'
language = "Trinary"
remains_type = /obj/effect/decal/remains/robot
skinned_type = /obj/item/stack/sheet/metal // Let's grind up IPCs for station resources!
code/modules/mob/living/carbon/human/species/monkey.dm
-5
View File
@@ -4,7 +4,6 @@
blurb = "Ook."
icobase = 'icons/mob/human_races/monkeys/r_monkey.dmi'
deform = 'icons/mob/human_races/monkeys/r_monkey.dmi'
damage_overlays = 'icons/mob/human_races/masks/dam_monkey.dmi'
damage_mask = 'icons/mob/human_races/masks/dam_mask_monkey.dmi'
blood_mask = 'icons/mob/human_races/masks/blood_monkey.dmi'
@@ -66,7 +65,6 @@
name_plural = "Farwa"
icobase = 'icons/mob/human_races/monkeys/r_farwa.dmi'
deform = 'icons/mob/human_races/monkeys/r_farwa.dmi'
greater_form = /datum/species/tajaran
default_language = "Farwa"
@@ -90,7 +88,6 @@
name_plural = "Wolpin"
icobase = 'icons/mob/human_races/monkeys/r_wolpin.dmi'
deform = 'icons/mob/human_races/monkeys/r_wolpin.dmi'
greater_form = /datum/species/vulpkanin
default_language = "Wolpin"
@@ -114,7 +111,6 @@
name_plural = "Neara"
icobase = 'icons/mob/human_races/monkeys/r_neara.dmi'
deform = 'icons/mob/human_races/monkeys/r_neara.dmi'
greater_form = /datum/species/skrell
default_language = "Neara"
@@ -140,7 +136,6 @@
name_plural = "Stok"
icobase = 'icons/mob/human_races/monkeys/r_stok.dmi'
deform = 'icons/mob/human_races/monkeys/r_stok.dmi'
tail = "stoktail"
greater_form = /datum/species/unathi
code/modules/mob/living/carbon/human/species/plasmaman.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Plasmaman"
name_plural = "Plasmamen"
icobase = 'icons/mob/human_races/r_plasmaman_sb.dmi'
deform = 'icons/mob/human_races/r_plasmaman_pb.dmi' // TODO: Need deform.
dangerous_existence = TRUE //So so much
//language = "Clatter"
code/modules/mob/living/carbon/human/species/shadow.dm
-1
View File
@@ -3,7 +3,6 @@
name_plural = "Shadows"
icobase = 'icons/mob/human_races/r_shadow.dmi'
deform = 'icons/mob/human_races/r_shadow.dmi'
dangerous_existence = TRUE
inherent_factions = list("faithless")
code/modules/mob/living/carbon/human/species/shadowling.dm
-2
View File
@@ -3,7 +3,6 @@
name = "Shadowling"
icobase = 'icons/mob/human_races/r_shadowling.dmi'
deform = 'icons/mob/human_races/r_shadowling.dmi'
blacklisted = TRUE
blood_color = "#555555"
@@ -55,7 +54,6 @@
name = "Lesser Shadowling"
icobase = 'icons/mob/human_races/r_lshadowling.dmi'
deform = 'icons/mob/human_races/r_lshadowling.dmi'
blood_color = "#CCCCCC"
flesh_color = "#AAAAAA"
code/modules/mob/living/carbon/human/species/skeleton.dm
-1
View File
@@ -5,7 +5,6 @@
blurb = "Spoopy and scary."
icobase = 'icons/mob/human_races/r_skeleton.dmi'
deform = 'icons/mob/human_races/r_skeleton.dmi'
blood_color = "#FFFFFF"
flesh_color = "#E6E6C6"
code/modules/mob/living/carbon/human/species/skrell.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Skrell"
name_plural = "Skrell"
icobase = 'icons/mob/human_races/r_skrell.dmi'
deform = 'icons/mob/human_races/r_def_skrell.dmi'
language = "Skrellian"
primitive_form = /datum/species/monkey/skrell
code/modules/mob/living/carbon/human/species/slime.dm
-1
View File
@@ -11,7 +11,6 @@
name_plural = "Slime People"
language = "Bubblish"
icobase = 'icons/mob/human_races/r_slime.dmi'
deform = 'icons/mob/human_races/r_slime.dmi'
remains_type = /obj/effect/decal/remains/slime
inherent_factions = list("slime")
code/modules/mob/living/carbon/human/species/tajaran.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Tajaran"
name_plural = "Tajaran"
icobase = 'icons/mob/human_races/r_tajaran.dmi'
deform = 'icons/mob/human_races/r_def_tajaran.dmi'
language = "Siik'tajr"
tail = "tajtail"
skinned_type = /obj/item/stack/sheet/fur
code/modules/mob/living/carbon/human/species/unathi.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Unathi"
name_plural = "Unathi"
icobase = 'icons/mob/human_races/r_lizard.dmi'
deform = 'icons/mob/human_races/r_def_lizard.dmi'
language = "Sinta'unathi"
tail = "sogtail"
skinned_type = /obj/item/stack/sheet/animalhide/lizard
code/modules/mob/living/carbon/human/species/vox.dm
+1 -9
View File
@@ -2,7 +2,6 @@
name = "Vox"
name_plural = "Vox"
icobase = 'icons/mob/human_races/vox/r_vox.dmi'
deform = 'icons/mob/human_races/vox/r_def_vox.dmi'
dangerous_existence = TRUE
language = "Vox-pidgin"
tail = "voxtail"
@@ -107,32 +106,26 @@
/datum/species/vox/updatespeciescolor(mob/living/carbon/human/H, owner_sensitive = 1) //Handling species-specific skin-tones for the Vox race.
if(H.dna.species.bodyflags & HAS_ICON_SKIN_TONE) //Making sure we don't break Armalis.
var/new_icobase = 'icons/mob/human_races/vox/r_vox.dmi' //Default Green Vox.
var/new_deform = 'icons/mob/human_races/vox/r_def_vox.dmi' //Default Green Vox.
switch(H.s_tone)
if(6) //Azure Vox.
new_icobase = 'icons/mob/human_races/vox/r_voxazu.dmi'
new_deform = 'icons/mob/human_races/vox/r_def_voxazu.dmi'
H.tail = "voxtail_azu"
if(5) //Emerald Vox.
new_icobase = 'icons/mob/human_races/vox/r_voxemrl.dmi'
new_deform = 'icons/mob/human_races/vox/r_def_voxemrl.dmi'
H.tail = "voxtail_emrl"
if(4) //Grey Vox.
new_icobase = 'icons/mob/human_races/vox/r_voxgry.dmi'
new_deform = 'icons/mob/human_races/vox/r_def_voxgry.dmi'
H.tail = "voxtail_gry"
if(3) //Brown Vox.
new_icobase = 'icons/mob/human_races/vox/r_voxbrn.dmi'
new_deform = 'icons/mob/human_races/vox/r_def_voxbrn.dmi'
H.tail = "voxtail_brn"
if(2) //Dark Green Vox.
new_icobase = 'icons/mob/human_races/vox/r_voxdgrn.dmi'
new_deform = 'icons/mob/human_races/vox/r_def_voxdgrn.dmi'
H.tail = "voxtail_dgrn"
else //Default Green Vox.
H.tail = "voxtail" //Ensures they get an appropriately coloured tail depending on the skin-tone.
H.change_icobase(new_icobase, new_deform, owner_sensitive) //Update the icobase/deform of all our organs, but make sure we don't mess with frankenstein limbs in doing so.
H.change_icobase(new_icobase, owner_sensitive) //Update the icobase of all our organs, but make sure we don't mess with frankenstein limbs in doing so.
/datum/species/vox/handle_reagents(mob/living/carbon/human/H, datum/reagent/R)
if(R.id == "oxygen") //Armalis are above such petty things.
@@ -146,7 +139,6 @@
name = "Vox Armalis"
name_plural = "Vox Armalis"
icobase = 'icons/mob/human_races/r_armalis.dmi'
deform = 'icons/mob/human_races/r_armalis.dmi'
unarmed_type = /datum/unarmed_attack/claws/armalis
blacklisted = TRUE
code/modules/mob/living/carbon/human/species/vulpkanin.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Vulpkanin"
name_plural = "Vulpkanin"
icobase = 'icons/mob/human_races/r_vulpkanin.dmi'
deform = 'icons/mob/human_races/r_vulpkanin.dmi'
language = "Canilunzt"
primitive_form = /datum/species/monkey/vulpkanin
tail = "vulptail"
code/modules/mob/living/carbon/human/species/wryn.dm
-1
View File
@@ -2,7 +2,6 @@
name = "Wryn"
name_plural = "Wryn"
icobase = 'icons/mob/human_races/r_wryn.dmi'
deform = 'icons/mob/human_races/r_wryn.dmi'
blacklisted = TRUE
language = "Wryn Hivemind"
tail = "wryntail"
code/modules/surgery/organs/organ_external.dm
+2 -8
View File
@@ -19,7 +19,6 @@
var/force_icon
var/icobase = 'icons/mob/human_races/r_human.dmi' // Normal icon set.
var/deform = 'icons/mob/human_races/r_def_human.dmi' // Mutated icon set.
var/damage_state = "00"
var/brute_dam = 0
@@ -109,7 +108,6 @@
..()
var/mob/living/carbon/human/H = holder
icobase = dna.species.icobase
deform = dna.species.deform
if(istype(H))
replaced(H)
sync_colour_to_human(H)
@@ -674,14 +672,10 @@ Note that amputating the affected organ does in fact remove the infection from t
desc = "[R.desc]"
/obj/item/organ/external/proc/mutate()
src.status |= ORGAN_MUTATED
if(owner)
owner.update_body(TRUE) //Forces all bodyparts to update in order to correctly render the deformed sprite.
status |= ORGAN_MUTATED
/obj/item/organ/external/proc/unmutate()
src.status &= ~ORGAN_MUTATED
if(owner)
owner.update_body(TRUE) //Forces all bodyparts to update in order to correctly return them to normal.
status &= ~ORGAN_MUTATED
/obj/item/organ/external/proc/get_damage() //returns total damage
return max(brute_dam + burn_dam - perma_injury, perma_injury) //could use health?
code/modules/surgery/organs/organ_icon.dm
+5 -9
View File
@@ -14,15 +14,14 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
overlays += organ.mob_icon
child_icons += organ.mob_icon
/obj/item/organ/external/proc/change_organ_icobase(var/new_icobase, var/new_deform, var/owner_sensitive) //Change the icobase/deform of this organ. If owner_sensitive is set, that means the proc won't mess with frankenstein limbs.
if(owner_sensitive) //This and the below statements mean that the icobase/deform will only get updated if the limb is the same species as and is owned by the mob it's attached to.
/obj/item/organ/external/proc/change_organ_icobase(new_icobase, owner_sensitive) //Change the icobase of this organ. If owner_sensitive is set, that means the proc won't mess with frankenstein limbs.
if(owner_sensitive) //This and the below statements mean that the icobase will only get updated if the limb is the same species as and is owned by the mob it's attached to.
if(dna.species && owner.dna.species && dna.species.name != owner.dna.species.name)
return
if(dna.unique_enzymes != owner.dna.unique_enzymes) // This isn't MY arm
return
icobase = new_icobase ? new_icobase : icobase
deform = new_deform ? new_deform : deform
/obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/H)
if(is_robotic() && !istype(dna.species, /datum/species/machine)) //machine people get skin color
@@ -41,7 +40,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
s_col = H.skin_colour
if(H.dna.species.bodyflags & HAS_ICON_SKIN_TONE)
var/obj/item/organ/external/chest/C = H.get_organ("chest")
change_organ_icobase(C.icobase, C.deform)
change_organ_icobase(C.icobase)
/obj/item/organ/external/proc/sync_colour_to_dna()
if(is_robotic())
@@ -180,11 +179,8 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
else if(is_robotic())
icon_file = 'icons/mob/human_races/robotic.dmi'
else
if(status & ORGAN_MUTATED)
icon_file = deform
else
// Congratulations, you are normal
icon_file = icobase
// Congratulations, you are normal
icon_file = icobase
return list(icon_file, new_icon_state)
// new damage icon system