Skip to content

Commit

Permalink
Resprites - 2/2024 Edition (cmss13-devs#5838)
Browse files Browse the repository at this point in the history
# About the pull request

Resprites various items in the game to be subjectively prettier and more
up-to-date with modern standards. Among them are the following:
- First aid kits.
- Coffins.
- Material stacks.
- Mortar shells.
- Beakers, bottles and pill bottles (sprites ported and hue-shifted from
Baystation/Aurora).

# Explain why it's good for the game
# Sprites
<details>
<summary>Sprites</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/55491249/79852605-cdf4-4520-8340-8807a9bd15cd)

![image](https://github.com/cmss13-devs/cmss13/assets/55491249/01e368d4-66ae-413b-9609-3fb1705aaa63)

![image](https://github.com/cmss13-devs/cmss13/assets/55491249/00c0ca83-ddd1-4e96-a692-6db5a6095dac)

![image](https://github.com/cmss13-devs/cmss13/assets/55491249/baed398b-eff1-4dc2-9f44-c7a09da068c5)

![image](https://github.com/cmss13-devs/cmss13/assets/55491249/21f3aef6-eec7-4880-a20f-a1897ef69c93)

</details>


# Changelog
:cl: nauticall
imageadd: Resprites first aid kits, coffins, material stacks, mortar
shells, and chemistry items. Chemistry sprites ported from Baystation /
Aurora.
fix: Recolors several reagent sprites to be more in-line with their
established colors, such as on autoinjectors.
fix: Fixed invisible cloth tables.
fix: Fixed wrong shading on the large floodlight.
/:cl:
  • Loading branch information
nauticall authored Mar 13, 2024
1 parent 4292b4c commit ca94d2e
Show file tree
Hide file tree
Showing 21 changed files with 90 additions and 133 deletions.
1 change: 0 additions & 1 deletion code/datums/diseases/black_goo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@
/obj/item/reagent_container/glass/bottle/labeled_black_goo_cure
name = "\"Pathogen\" cure bottle"
desc = "The bottle has a biohazard symbol on the front, and has a label, designating its use against Agent A0-3959X.91–15, colloquially known as the \"Black Goo\"."
icon_state = "bottle20"

/obj/item/reagent_container/glass/bottle/labeled_black_goo_cure/Initialize()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/autolathe_datums.dm
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
path = /obj/item/reagent_container/blood

/datum/autolathe/recipe/medilathe/bluespace
name = "bluespace beaker"
name = "high-capacity beaker"
path = /obj/item/reagent_container/glass/beaker/bluespace

/datum/autolathe/recipe/medilathe/bonesetter
Expand Down
19 changes: 9 additions & 10 deletions code/game/objects/items/reagent_containers/glass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -217,17 +217,16 @@
overlays.Cut()

if(reagents && reagents.total_volume)
var/image/filling = image('icons/obj/items/reagentfillings.dmi', src, "[icon_state]10")
var/image/filling = image('icons/obj/items/reagentfillings.dmi', src, "[icon_state]-20")

var/percent = round((reagents.total_volume / volume) * 100)
switch(percent)
if(0 to 9) filling.icon_state = "[icon_state]-10"
if(10 to 24) filling.icon_state = "[icon_state]10"
if(25 to 49) filling.icon_state = "[icon_state]25"
if(50 to 74) filling.icon_state = "[icon_state]50"
if(75 to 79) filling.icon_state = "[icon_state]75"
if(80 to 90) filling.icon_state = "[icon_state]80"
if(91 to INFINITY) filling.icon_state = "[icon_state]100"
if(0) filling.icon_state = null
if(1 to 20) filling.icon_state = "[icon_state]-20"
if(21 to 40) filling.icon_state = "[icon_state]-40"
if(41 to 60) filling.icon_state = "[icon_state]-60"
if(61 to 80) filling.icon_state = "[icon_state]-80"
if(81 to INFINITY) filling.icon_state = "[icon_state]-100"

filling.color = mix_color_from_reagents(reagents.reagent_list)
overlays += filling
Expand Down Expand Up @@ -345,8 +344,8 @@
flags_atom = FPRINT|OPENCONTAINER|NOREACT

/obj/item/reagent_container/glass/beaker/bluespace
name = "bluespace beaker"
desc = "A beaker with an enlarged holding capacity, made with blue-tinted plexiglass in order to withstand greater pressure - affectionately nicknamed \"bluespace\". Can hold up to 300 units."
name = "high-capacity beaker"
desc = "A beaker with an enlarged holding capacity, made with blue-tinted plexiglass in order to withstand greater pressure. Can hold up to 300 units."
icon_state = "beakerbluespace"
matter = list("glass" = 10000)
volume = 300
Expand Down
Loading

0 comments on commit ca94d2e

Please sign in to comment.