Skip to content

Commit 6f32230

Browse files
fix some missing icons (#7398)
## About The Pull Request chameleon items appearing blank now support teshari biomatter magazines now have their icon ## Why It's Good For The Game fixes missing icons ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: chameleon items appearing blank now support teshari fix: biomatter magazines now have their icon /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
1 parent ccbbf38 commit 6f32230

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

code/modules/clothing/chameleon.dm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
item_state_slots = copy.item_state_slots.Copy()
3737
if(copy.sprite_sheets)
3838
sprite_sheets = copy.sprite_sheets.Copy()
39+
if(copy.sprite_sheets_obj)
40+
sprite_sheets_obj = copy.sprite_sheets_obj.Copy()
3941

4042
OnDisguise(copy, user)
4143
qdel(copy)
@@ -56,11 +58,12 @@
5658
item_icons = null
5759
item_state_slots = null
5860
sprite_sheets = null
61+
sprite_sheets_obj = null
62+
worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
5963

6064
// Subtypes shall override this, not /disguise()
6165
/obj/item/proc/OnDisguise(var/obj/item/copy, var/mob/user)
6266
return
63-
//copying sprite_sheets_obj should be unnecessary as chameleon items are not refittable.
6467

6568

6669
/proc/generate_chameleon_choices(var/basetype, var/blacklist = list())

code/modules/projectiles/ammunition/calibers/special/biomatter.dm

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
name = "magazine (Compressed Biomatter)"
2222
desc = "An advanced matter compression unit, used to feed biomass into a Rapid On-board Fabricator. Accepts biomass globules."
2323

24+
icon = 'icons/modules/projectiles/magazines/bio.dmi'
2425
icon_state = "bio-4"
2526
base_icon_state = "bio"
2627
rendering_system = GUN_RENDERING_STATES
@@ -31,9 +32,6 @@
3132
materials_base = list("flesh" = 1000)
3233
ammo_max = 10
3334

34-
/obj/item/ammo_magazine/biomatter
35-
ammo_max = 10
36-
3735
/obj/item/ammo_magazine/biomatter/large
3836
icon_state = "bio-large-5"
3937
base_icon_state = "bio-large"

0 commit comments

Comments
 (0)