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

Yogvoxneo #2

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
39bd223
add dna blocks
13spacemen Jan 18, 2024
38a46bb
remove vox eyes option
13spacemen Jan 20, 2024
12fd874
vox hair icon gen in handle_hair proc
13spacemen Jan 20, 2024
04099b5
add 2nd mutant color
13spacemen Jan 21, 2024
536ecca
vox V blue blood type
13spacemen Jan 21, 2024
2d158d5
lungs work properly
13spacemen Jan 22, 2024
1eef3b2
colortone proc grayscale arg
13spacemen Jan 23, 2024
a6992f7
more husking improvements
13spacemen Jan 24, 2024
3bba8c2
add husk color for dynamic husk icons
13spacemen Jan 24, 2024
4b3b206
arg for drawing blood in husk image gen
13spacemen Jan 25, 2024
8908c8c
vox bodies replaced by skin tone
13spacemen Jan 28, 2024
56a3d25
uncapitalized vox tail types
13spacemen Jan 29, 2024
7ee6665
update skin tone and tail procs
13spacemen Jan 29, 2024
05f8643
added some vox specific underwear
13spacemen Jan 29, 2024
1a717a3
improved skin tone and limb variant code
13spacemen Jan 29, 2024
a72722c
vox underwear pref icons
13spacemen Jan 29, 2024
ac57d29
sprite sheets system in icon code
13spacemen Jan 29, 2024
97f9a8e
many sprites added
13spacemen Jan 29, 2024
5fd34c7
changesource flags
13spacemen Jan 30, 2024
fa0673a
done underwear and undershirts
13spacemen Jan 30, 2024
318a04b
name procs
13spacemen Jan 30, 2024
4603efb
hair, facial hair progress, renamed hair to quills
13spacemen Jan 30, 2024
4c668ca
all hair and facial hair in
13spacemen Jan 30, 2024
0c834a0
add n2 pref, big n2 tank, suicide messages, butt sprites, tail wont u…
13spacemen Jan 30, 2024
e561d42
flag renames, add no vox allowed sign, default n2 tank is specialized
13spacemen Jan 30, 2024
9b73711
vox heart sprite, lang sprite, some lore
13spacemen Jan 30, 2024
82133e7
vox armalis scream added until armalis exist
13spacemen Jan 30, 2024
fb6feee
added bay vox clothes, disabled armalis scream for regular vox, added…
13spacemen Jan 31, 2024
04b48de
fix species specific icons, fix other sprites
13spacemen Jan 31, 2024
149327e
rearrange clothing, add scrap armor, crimson tail enabled
13spacemen Jan 31, 2024
6149175
all colored jumpsuits done
13spacemen Jan 31, 2024
e97811f
renamed a ton of vox icon states
13spacemen Jan 31, 2024
fb55a80
more sprite work
13spacemen Jan 31, 2024
6f41ca8
more sprite sheet stuff, if no species icon fall back to original icon
13spacemen Jan 31, 2024
445ebc1
color defines, code cleanup, commented out paradise race flags, get r…
13spacemen Jan 31, 2024
e9aa5bb
attempted repairing chest
13spacemen Feb 1, 2024
25088fe
fixed crimson tails
13spacemen Feb 1, 2024
98a8bb4
more sprite stuff
13spacemen Feb 1, 2024
6ef5318
less pointless sprite sheets definitions, singlelined sprite sheets d…
13spacemen Feb 6, 2024
ca08bb5
moved all undershirts to one file
13spacemen Feb 6, 2024
bb7da5d
head sprite stuff
13spacemen Feb 6, 2024
4ee38bf
fixed tail sprite errors
13spacemen Feb 8, 2024
c57a8b0
completed all heads
13spacemen Feb 8, 2024
7f94474
all legs done
13spacemen Feb 8, 2024
e6543e0
completed all arms
13spacemen Feb 8, 2024
a6ba035
completed all chest sprites
13spacemen Feb 8, 2024
a036737
added classic vox sprite
13spacemen Feb 8, 2024
2bdd4aa
vox organ and tail stuff
13spacemen Feb 9, 2024
5174a0b
hair gradient support, eyes static moved to species, order prefix for…
13spacemen Feb 9, 2024
a47dc22
undid random newlines and spaces, butt sprites in a dmi and based on …
13spacemen Feb 10, 2024
d06ebe2
added a ton of vox clothing sprites, species clothing defines, vox ca…
13spacemen Feb 10, 2024
f55fd6c
moth species define, removed redundant survival box code, lazy fetch …
13spacemen Feb 10, 2024
d8c7647
more code cleanup
13spacemen Feb 10, 2024
08b1216
vox organs no longer ORGAN_ROBOTIC, changed some descs of organs
13spacemen Feb 10, 2024
370ea1a
mmi proper cortical stack sprite, made some references to "brain" con…
13spacemen Feb 11, 2024
a474a92
add vox bird traumas, vox hide to maint loot, vox plushie to crate an…
13spacemen Feb 11, 2024
e5cb7b9
cold resist is back, removed burn and stun mods
13spacemen Feb 12, 2024
7784d2b
basic hair color and style changing support
13spacemen Feb 12, 2024
dad6abc
vox med jumpsuit crosses are blue
13spacemen Feb 12, 2024
5471d3e
correct vox skin tone colors in tgui, green renamed to lime, delete p…
13spacemen Feb 12, 2024
da6da9f
species sprite support for chameleon items
13spacemen Feb 12, 2024
a8bc46f
fixed vox prefs, removed plasmaman specific boxes, telomeres traits c…
13spacemen Feb 15, 2024
22c9358
fix dwarven miner box, fix linters
13spacemen Feb 15, 2024
85f8855
sorted and renamed many icon states
13spacemen Feb 15, 2024
5ec6395
lizard robe correctly in uniforms, sprited new signaltech vox jumpsui…
13spacemen Feb 16, 2024
da23a3f
vox blood color defines, maint loot, traumas
13spacemen Feb 17, 2024
fa9711f
added artist, recovery, clerk uniforms by Falcon2346 from /vg/station
13spacemen Feb 18, 2024
6ce012a
vox shaped bloody mob overlays, more use of species defines, species …
13spacemen Feb 19, 2024
28bd6e7
new winterhood, labcoat, chem labcoat, atmos, engine, rsecurity, para…
13spacemen Feb 25, 2024
a8554d8
unbound keys dont print message to chat
13spacemen Feb 25, 2024
9d8d10e
vox gene, cmo, green, tox, vir, robo labcoats done by me
13spacemen Feb 25, 2024
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 sprite sheet stuff, if no species icon fall back to original icon
  • Loading branch information
13spacemen committed Feb 25, 2024
commit 6f41ca8dab048d5b16ee04ab368827e15b6b634e
1 change: 1 addition & 0 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
slot_flags = ITEM_SLOT_BACK //ERROOOOO
resistance_flags = NONE
max_integrity = 300
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/back.dmi')

/obj/item/storage/backpack/Initialize(mapload)
. = ..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/ears/_ears.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
throwforce = 0
slot_flags = ITEM_SLOT_EARS
resistance_flags = NONE
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/ears.dmi')

/obj/item/clothing/ears/earmuffs
name = "earmuffs"
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/glasses/_glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
equip_delay_other = 25
resistance_flags = NONE
materials = list(/datum/material/glass = 250)
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/eyes.dmi')
var/vision_flags = 0
var/invis_view = SEE_INVISIBLE_LIVING //admin only for now
/// Override to allow glasses to set higher than normal see_invis
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/gloves/_gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
strip_delay = 20
equip_delay_other = 40
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, ELECTRIC = 50)
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/gloves.dmi')

/obj/item/clothing/gloves/wash(clean_types)
. = ..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/head/_head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/// Can land on someones head
var/hattable = TRUE
dynamic_hair_suffix = "+generic"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi')

/obj/item/clothing/head/Initialize(mapload)
. = ..()
Expand Down
3 changes: 1 addition & 2 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
flags_cover = HEADCOVERSEYES
flags_inv = HIDEHAIR
hattable = FALSE

dog_fashion = /datum/dog_fashion/head/helmet

sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
var/can_flashlight = FALSE //if a flashlight can be mounted. if it has a flashlight and this is false, it is permanently attached.
var/obj/item/flashlight/seclite/attached_light
var/datum/action/item_action/toggle_helmet_flashlight/alight
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/masks/_masks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
slot_flags = ITEM_SLOT_MASK
strip_delay = 40
equip_delay_other = 40
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi')
var/modifies_speech = FALSE
var/mask_adjusted = 0
var/adjusted_flags = null
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/shoes/_shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

body_parts_covered = FEET
slot_flags = ITEM_SLOT_FEET

sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/shoes.dmi')
slowdown = SHOES_SLOWDOWN
var/footprint_sprite = FOOTPRINT_SPRITE_SHOES
var/offset = 0
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/suits/_suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
limb_integrity = 0 // disabled for most exo-suits
var/obj/item/badge/attached_badge
var/mutable_appearance/badge_overlay
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')

/obj/item/clothing/suit/Destroy()
if(attached_badge)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/mob/living/carbon/human/update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -581,10 +581,16 @@ generate/load female uniform sprites matching all previously decided variables

var/mob/living/carbon/human/H = loc
if(!isinhands)
var/previous_icon = file2use
var/previous_state = t_state
if(icon_override)
file2use = icon_override
else if(sprite_sheets?[H?.dna?.species?.name])
file2use = sprite_sheets[H.dna.species.name]
if(!icon_exists(file2use, t_state))
file2use = previous_icon
t_state = previous_state

var/mutable_appearance/standing
if(femaleuniform)
if(HAS_TRAIT(H, TRAIT_SKINNY) && (H.underwear == "Nude"))
Expand Down