Unders Resprite v2 #14383
+178
−129
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -516,7 +516,7 @@ BLIND // can't see anything | |
| 3 = Report location | ||
| */ | ||
| var/displays_id = 1 | ||
| var/rolled_down = FALSE | ||
| var/basecolor | ||
|
|
||
| var/fresh_laundered_until = 0 | ||
|
|
@@ -529,6 +529,7 @@ BLIND // can't see anything | |
|
|
||
| /obj/item/clothing/under/equipped(mob/user, slot) | ||
| ..() | ||
| rolled_down = FALSE | ||
| if(slot == SLOT_W_UNIFORM && fresh_laundered_until > world.time) | ||
| fresh_laundered_until = world.time | ||
| SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "fresh_laundry", /datum/mood_event/fresh_laundry) | ||
|
|
@@ -631,18 +632,23 @@ BLIND // can't see anything | |
| if(usr.incapacitated()) | ||
| return | ||
|
|
||
| if(rolled_down) | ||
| to_chat(usr, "<span class='notice'>Вы пытаетесь распахнуть униформу.</span>") | ||
| else | ||
| to_chat(usr, "<span class='notice'>Вы пытаетесь застягнуть униформу.</span>") | ||
volas marked this conversation as resolved.
Show resolved
Hide resolved
volas marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| rolled_down = !rolled_down | ||
| update_inv_mob() | ||
|
|
||
| /obj/item/clothing/under/wash_act(w_color) | ||
| . = ..() | ||
| fresh_laundered_until = world.time + 5 MINUTES | ||
|
|
||
| var/obj/item/clothing/dye_type = get_dye_type(w_color) | ||
|
Contributor
There was a problem hiding this comment. не уверен что понимаю что тут происходит
Member
There was a problem hiding this comment. вроде ты когда-то и писал, #9117 😆 не проблема, но вообще согласен |
||
| if(!dye_type) | ||
| return | ||
| color = dye_type.color | ||
|
|
||
|
|
||
| /obj/item/clothing/under/rank/atom_init() | ||
| sensor_mode = pick(SUIT_SENSOR_OFF, SUIT_SENSOR_BINARY, SUIT_SENSOR_VITAL, SUIT_SENSOR_TRACKING) | ||
| . = ..() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,133 +1,155 @@ | ||
|
|
||
| /obj/item/clothing/under/color | ||
| name = "colored uniform" | ||
| icon_state = "colored" | ||
| item_state_inventory= "colored" | ||
| item_state_world = "colored_w" | ||
| item_state = "colored" | ||
| color = "#818181" | ||
| flags = ONESIZEFITSALL|HEAR_TALK | ||
| var/mutable_appearance/item_under_overlay | ||
|
|
||
| // if needed, this can easily be changed to /obj/item/clothing/under | ||
| // in case of adding support for /obj/item/clothing, this proc will require some tweaking | ||
| /obj/item/clothing/under/color/get_standing_overlay(mob/living/carbon/human/H, def_icon_path, sprite_sheet_slot, layer, bloodied_icon_state = null, icon_state_appendix = null) | ||
|
Member
There was a problem hiding this comment. склейка standing_overlay сейчас очень костыльная, какая-то часть кода униформы уже оказалась в родителе с проверкой на SPRITE_SHEET_UNIFORM, и потом тут еще раз проходимся и переприклеиваем все оверлеи. Надо как-то сделать по другому, но я сходу не могу вникнуть и предложить лучший вариант.
Member
There was a problem hiding this comment. Может быть какой-то общий флаг для вещей с покраской через color, но там еще с rolldown что-то надо делать. Может надо изменить логику get_standing_overlay, делать не снизу вверх, а наоборот (сначала клеить что-то на уровне предмета, а потом в родительском проке). Но это сейчас я просто тыкаю наугад. |
||
| var/mutable_appearance/I = ..() | ||
|
|
||
| var/icon_path = def_icon_path | ||
| var/t_state = item_state ? item_state : icon_state | ||
|
|
||
| var/datum/species/S = H.species | ||
|
|
||
| if(S.sprite_sheets[sprite_sheet_slot]) | ||
| icon_path = S.sprite_sheets[sprite_sheet_slot] | ||
|
|
||
| var/fem_appendix = "" | ||
|
|
||
| // we dont have female sprites for fat uniforms | ||
| if(H.gender == FEMALE && S.gender_limb_icons && sprite_sheet_slot != SPRITE_SHEET_UNIFORM_FAT) | ||
| fem_appendix = "_fem" | ||
|
|
||
| // checks if we have a colorless overlay we need to apply | ||
| if(rolled_down || !icon_exists(icon_path, "[t_state]_overlay[fem_appendix]")) | ||
| return I | ||
|
|
||
| // add the colorless overlay | ||
| I.cut_overlays() | ||
|
Contributor
There was a problem hiding this comment. зачем удалять все предыдущие оверлеи |
||
| var/mutable_appearance/under_mob_overlay = mutable_appearance(icon = icon_path, icon_state = "[t_state]_overlay[fem_appendix]") | ||
| under_mob_overlay.appearance_flags = RESET_COLOR | ||
| I.add_overlay(under_mob_overlay) | ||
|
|
||
| // re-apply blood & dirt | ||
| if(dirt_overlay && bloodied_icon_state) | ||
| var/mutable_appearance/bloodsies = mutable_appearance(icon = 'icons/effects/blood.dmi', icon_state = bloodied_icon_state) | ||
| bloodsies.color = dirt_overlay.color | ||
| I.add_overlay(bloodsies) | ||
|
|
||
| return I | ||
|
|
||
| /obj/item/clothing/under/color/update_icon() | ||
| ..() | ||
|
|
||
| // add the colorless overlay | ||
| //var/mutable_appearance/under_overlay = mutable_appearance(icon, "[icon_state]_overlay") | ||
| //under_overlay.appearance_flags = RESET_COLOR | ||
| //add_overlay(under_overlay) | ||
|
Comment on lines
+49
to
+55
Contributor
There was a problem hiding this comment. если код не юзается зачем его оставлять |
||
|
|
||
| /obj/item/clothing/under/color/dropped() | ||
| . = ..() | ||
| update_world_icon() | ||
|
|
||
| // cut_overlay just isnt fast enough for this, unfortunately. | ||
|
Contributor
There was a problem hiding this comment. ну конечно, он же выполняется в оверлей контроллере скорее всего в следующий тик. |
||
| /obj/item/clothing/under/color/putdown_animation() | ||
|
Contributor
There was a problem hiding this comment. будто бы можно сделать какие-то лайфхаки с кешем и подтягиванием нужного готового спрайта прямо в анимации. |
||
| return | ||
|
|
||
| /obj/item/clothing/under/color/update_world_icon() | ||
| ..() | ||
|
|
||
| // add the colorless overlay | ||
|
Contributor
There was a problem hiding this comment. зачем этот комментарий |
||
| cut_overlay(item_under_overlay) | ||
| item_under_overlay = image(icon, "[icon_state]_overlay") | ||
| item_under_overlay.appearance_flags = RESET_COLOR | ||
| add_overlay(item_under_overlay) | ||
|
|
||
| /obj/item/clothing/under/color/black | ||
| name = "black jumpsuit" | ||
| color = "#303030" | ||
|
|
||
| /obj/item/clothing/under/color/blue | ||
| name = "blue jumpsuit" | ||
| color = "#2b4e95" | ||
|
|
||
| /obj/item/clothing/under/color/green | ||
| name = "green jumpsuit" | ||
| color = "#477238" | ||
|
|
||
| /obj/item/clothing/under/color/grey | ||
| name = "grey jumpsuit" | ||
| color = "#818181" | ||
|
|
||
| /obj/item/clothing/under/color/orange | ||
| name = "orange jumpsuit" | ||
| desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position." | ||
| color = "#b9451d" | ||
| has_sensor = 2 | ||
| sensor_mode = SUIT_SENSOR_TRACKING | ||
|
|
||
| /obj/item/clothing/under/color/pink | ||
| name = "pink jumpsuit" | ||
| color = "#e27285" | ||
|
|
||
| /obj/item/clothing/under/color/red | ||
| name = "red jumpsuit" | ||
| color = "#b91d1d" | ||
|
|
||
| /obj/item/clothing/under/color/white | ||
| name = "white jumpsuit" | ||
| color = "#f1ebdb" | ||
|
|
||
| /obj/item/clothing/under/color/yellow | ||
| name = "yellow jumpsuit" | ||
| color = "#f8c53a" | ||
|
|
||
| /obj/item/clothing/under/color/lightblue | ||
| name = "lightblue jumpsuit" | ||
| color = "#42bfe8" | ||
|
|
||
| /obj/item/clothing/under/color/aqua | ||
| name = "aqua jumpsuit" | ||
| color = "#59cf93" | ||
|
|
||
| /obj/item/clothing/under/color/purple | ||
| name = "purple jumpsuit" | ||
| color = "#9052bc" | ||
|
|
||
| /obj/item/clothing/under/color/lightpurple | ||
| name = "lightpurple jumpsuit" | ||
| color = "#ceaaed" | ||
|
|
||
| /obj/item/clothing/under/color/lightgreen | ||
| name = "lightgreen jumpsuit" | ||
| color = "#c4f129" | ||
|
|
||
| /obj/item/clothing/under/color/lightbrown | ||
| name = "lightbrown jumpsuit" | ||
| color = "#d39741" | ||
|
|
||
| /obj/item/clothing/under/color/brown | ||
| name = "brown jumpsuit" | ||
| color = "#855f39" | ||
|
|
||
| /obj/item/clothing/under/color/yellowgreen | ||
| name = "yellowgreen jumpsuit" | ||
| color = "#b0dc1d" | ||
|
|
||
| /obj/item/clothing/under/color/darkblue | ||
| name = "darkblue jumpsuit" | ||
| color = "#1b2447" | ||
|
|
||
| /obj/item/clothing/under/color/lightred | ||
| name = "lightred jumpsuit" | ||
| color = "#e27272" | ||
|
|
||
| /obj/item/clothing/under/color/darkred | ||
| name = "darkred jumpsuit" | ||
| color = "#612721" | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.