Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slime People and IPC; Imitating Species Cosmetically. #27359

Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c570e5b
Pain
Spaghetti-bit Oct 1, 2024
b0e1e77
More transparency / alpha
Spaghetti-bit Oct 1, 2024
5e5b6e3
Vulp + Name override
Spaghetti-bit Oct 1, 2024
4114b67
more transparency alpha stuff
Spaghetti-bit Oct 1, 2024
d30735d
Reworks species subtype for slimepeople
Spaghetti-bit Oct 3, 2024
82659f6
Iteration 3...
Spaghetti-bit Oct 12, 2024
da8ba6e
Merge branch 'default' into TerminatorMachinesAndMorphlingSlimes
Spaghetti-bit Nov 14, 2024
4fa8dec
Me when initial
Spaghetti-bit Nov 14, 2024
1c7e807
60 - 61
Spaghetti-bit Nov 14, 2024
2cc5eea
Character.dm select query changes.
Spaghetti-bit Nov 15, 2024
9cbbcf3
Merge branch 'master' into TerminatorMachinesAndMorphlingSlimes
Spaghetti-bit Nov 15, 2024
2b63b99
61-62
Spaghetti-bit Nov 15, 2024
52c7836
The real 61-62
Spaghetti-bit Nov 15, 2024
1ebdbfb
Merge branch 'master' into TerminatorMachinesAndMorphlingSlimes
Spaghetti-bit Nov 15, 2024
d2b1971
Update to IPC imitation
Spaghetti-bit Nov 16, 2024
2b5614e
Merge branch 'TerminatorMachinesAndMorphlingSlimes' of https://github…
Spaghetti-bit Nov 16, 2024
0276079
Merge branch 'TerminatorMachinesAndMorphlingSlimes' of https://github…
Spaghetti-bit Jan 30, 2025
bec00d1
+63-64.sql
Spaghetti-bit Jan 30, 2025
9b9683f
Pain2
Spaghetti-bit Jan 30, 2025
19a8910
SQL
Spaghetti-bit Jan 30, 2025
f458218
Merge branch 'master' into TerminatorMachinesAndMorphlingSlimes
Spaghetti-bit Jan 30, 2025
87aa43b
Frankenstein monster fix
Spaghetti-bit Jan 30, 2025
5c159f9
Slimify! ...no longer applies to robotic limbs.
Spaghetti-bit Jan 30, 2025
6fc73d3
220 Alpha to 200
Spaghetti-bit Jan 30, 2025
dd4b80a
Ordering issue fix.
Spaghetti-bit Feb 2, 2025
e44583b
Last ordering issue.
Spaghetti-bit Feb 2, 2025
10cf4f4
Merge branch 'master' into TerminatorMachinesAndMorphlingSlimes
Spaghetti-bit Feb 8, 2025
69f4f7f
aa review, paradise_schema.sql
Spaghetti-bit Feb 8, 2025
c3c96c8
Apply suggestions from code review
Spaghetti-bit Feb 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More transparency / alpha
  • Loading branch information
Spaghetti-bit committed Oct 1, 2024
commit b0e1e77610fd014130b99d8a5786eb0ec1721a17
18 changes: 15 additions & 3 deletions code/modules/mob/living/carbon/human/human_update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1244,9 +1244,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(HAS_TRAIT(src, TRAIT_I_WANT_BRAINS))
wings_icon.ColorTone(COLORTONE_DEAD_EXT_ORGAN)
wings_icon.SetIntensity(0.7)
if(istype(src.dna.species, /datum/species/slime) && species_subtype != "None") // Slimfies the wings
if(istype(src.dna.species, /datum/species/slime)) // Slimfies the wings
wings_icon.GrayScale()
wings_icon.Blend("[skin_colour]DC", ICON_AND) //DC = 220 alpha.
wings_icon.Blend("[skin_colour]A0", ICON_AND) //DC = 160 alpha.
var/mutable_appearance/wings = mutable_appearance(wings_icon, layer = -WING_LAYER)
wings.pixel_x = body_accessory.pixel_x_offset
wings.pixel_y = body_accessory.pixel_y_offset
Expand Down Expand Up @@ -1292,7 +1292,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(tail_marking_icon && (body_accessory.name in tail_marking_style.tails_allowed))
accessory_s.Blend(tail_marking_icon, ICON_OVERLAY)

if(istype(src.dna.species, /datum/species/slime) && species_subtype != "None") // Slimfies the tail
if(istype(src.dna.species, /datum/species/slime)) // Slimfies the tail
accessory_s.GrayScale()
accessory_s.Blend("[skin_colour]A0", ICON_AND) //DC = 160 alpha. Less alpha here because the tail is generally stubborn...

Expand Down Expand Up @@ -1334,6 +1334,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
tail_s.Blend(skin_colour, ICON_ADD)
if(tail_marking_icon && !tail_marking_style.tails_allowed)
tail_s.Blend(tail_marking_icon, ICON_OVERLAY)

if(istype(src.dna.species, /datum/species/slime)) // Slimifies the tail
tail_s.GrayScale()
tail_s.Blend("[skin_colour]A0", ICON_AND) //DC = 160 alpha.

if((!body_accessory || istype(body_accessory, /datum/body_accessory/tail)) && dna.species.bodyflags & TAIL_OVERLAPPED) // If the player has a species whose tail is overlapped by limbs... (having a non-tail body accessory like the snake body will override this)
// Gives the underlimbs layer SEW direction icons since it's overlayed by limbs and just about everything else anyway.
var/icon/under = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "blank")
Expand Down Expand Up @@ -1373,11 +1378,15 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
var/icon/accessory_s = new/icon("icon" = body_accessory.get_animated_icon(), "icon_state" = body_accessory.get_animated_icon_state())
if(dna.species.bodyflags & HAS_SKIN_COLOR)
accessory_s.Blend(skin_colour, body_accessory.blend_mode)
if(istype(src.dna.species, /datum/species/slime)) // Slimfies the wings
accessory_s.GrayScale()
accessory_s.Blend("[skin_colour]A0", ICON_AND) //DC = 160 alpha.
if(tail_marking_icon && (body_accessory.name in tail_marking_style.tails_allowed))
accessory_s.Blend(tail_marking_icon, ICON_OVERLAY)
if((!body_accessory || istype(body_accessory, /datum/body_accessory/tail)) && dna.species.bodyflags & TAIL_OVERLAPPED) // If the player has a species whose tail is overlapped by limbs... (having a non-tail body accessory like the snake body will override this)
// Gives the underlimbs layer SEW direction icons since it's overlayed by limbs and just about everything else anyway.
var/icon/under = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "Vulpkanin_tail_delay")

if(body_accessory.allowed_species && (dna.species.name in body_accessory.allowed_species))
under = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.species.name]_tail_delay")
under.Insert(new/icon(accessory_s, dir=SOUTH), dir=SOUTH)
Expand Down Expand Up @@ -1409,6 +1418,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
var/icon/tailw_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[tail]w_s")
if(dna.species.bodyflags & HAS_SKIN_COLOR)
tailw_s.Blend(skin_colour, ICON_ADD)
if(istype(src.dna.species, /datum/species/slime)) // Slimfies the wings
tailw_s.GrayScale()
tailw_s.Blend("[skin_colour]A0", ICON_AND) //DC = 160 alpha.
if(tail_marking_icon && !tail_marking_style.tails_allowed)
tailw_s.Blend(tail_marking_icon, ICON_OVERLAY)
if((!body_accessory || istype(body_accessory, /datum/body_accessory/tail)) && dna.species.bodyflags & TAIL_OVERLAPPED) // If the player has a species whose tail is overlapped by limbs... (having a non-tail body accessory like the snake body will override this)
Expand Down