diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm
index 9c6fd0d870f..7b109d81633 100644
--- a/code/game/objects/effects/decals/Cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/Cleanable/fuel.dm
@@ -1,5 +1,7 @@
/obj/effect/decal/cleanable/liquid_fuel
//Liquid fuel is used for things that used to rely on volatile fuels or phoron being contained to a couple tiles.
+ name = "liquid fuel"
+ desc = "Some kind of sticky, flammable liquid."
icon = 'icons/effects/effects.dmi'
icon_state = "fuel"
layer = TURF_LAYER+0.2
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index 8855f21358a..dca14d184e5 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -184,7 +184,6 @@
name = "chewing gum"
desc = "A chewy wad of fine synthetic rubber and artificial flavoring."
icon_state = "gum"
- item_state = "gum"
wrapped = TRUE
/obj/item/clothing/mask/chewable/candy/gum/Initialize()
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 52c176124e2..8751c6b645c 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -37,6 +37,7 @@
slowdown = 1 // All rigs by default should have slowdown.
var/has_sealed_state = FALSE
+ var/has_hidden_jumpsuit = FALSE
var/interface_path = "hardsuit.tmpl"
var/ai_interface_path = "hardsuit.tmpl"
@@ -180,6 +181,10 @@
armor_component.RemoveComponent()
piece.AddComponent(/datum/component/armor, armor, ARMOR_TYPE_STANDARD|ARMOR_TYPE_RIG)
+ if(chest.flags_inv & HIDEJUMPSUIT)
+ has_hidden_jumpsuit = TRUE
+ chest.flags_inv &= ~HIDEJUMPSUIT
+
set_vision(!offline)
update_icon(1)
@@ -255,7 +260,7 @@
seal_delay = is_in_cycler ? 1 : initial(seal_delay)
var/jumpsuit_was_hidden = FALSE
- if(suit_is_deployed() && (wearer.wear_suit.flags_inv & HIDEJUMPSUIT) && !instant)
+ if(suit_is_deployed() && (wearer.wear_suit.flags_inv & HIDEJUMPSUIT) && !instant && has_hidden_jumpsuit)
/// Don't hide the jumpsuit while removing the rig.
wearer.wear_suit.flags_inv &= ~HIDEJUMPSUIT
wearer.update_inv_wear_suit()
@@ -308,10 +313,11 @@
wearer.update_inv_gloves()
if("chest")
to_chat(wearer, "\The [piece] [!seal_target ? "cinches your chest tightly" : "releases your chest"].")
- if(!seal_target)
- piece.flags_inv |= HIDEJUMPSUIT
- else
- piece.flags_inv &= ~HIDEJUMPSUIT
+ if(has_hidden_jumpsuit)
+ if(!seal_target)
+ piece.flags_inv |= HIDEJUMPSUIT
+ else
+ piece.flags_inv &= ~HIDEJUMPSUIT
wearer.update_inv_wear_suit()
if("helmet")
to_chat(wearer, "\The [piece] hisses [!seal_target ? "closed" : "open"].")
@@ -341,7 +347,7 @@
canremove = !seal_target
if(airtight)
update_component_sealed()
- if(jumpsuit_was_hidden && wearer.wear_suit == chest)
+ if(jumpsuit_was_hidden && wearer.wear_suit == chest && has_hidden_jumpsuit)
wearer.wear_suit.flags_inv |= HIDEJUMPSUIT
update_icon(1)
return 0
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
index c174b2bf38a..c7cd7c29802 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
@@ -40,7 +40,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- flags_inv = HIDETAIL
+ flags_inv = HIDEJUMPSUIT|HIDETAIL
item_flags = THICKMATERIAL|AIRTIGHT|INJECTIONPORT
slowdown = 0
//will reach 10 breach damage after 25 laser carbine blasts, 3 revolver hits, or ~1 PTR hit. Completely immune to smg or sts hits.
@@ -91,6 +91,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ flags_inv = HIDEJUMPSUIT
item_flags = THICKMATERIAL|INJECTIONPORT
/obj/item/clothing/shoes/lightrig
diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm
index 88711ec2b4e..a9bff962b92 100644
--- a/code/modules/mob/abstract/new_player/sprite_accessories.dm
+++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm
@@ -5795,7 +5795,7 @@ Follow by example and make good judgement based on length which list to include
name = "Tattoo (Koi, L. Arm)"
body_parts = list(BP_L_ARM)
-/datum/sprite_accessory/marking/tat_koiright_arm
+/datum/sprite_accessory/marking/tat_koi/right_arm
name = "Tattoo (Koi, R. Arm)"
body_parts = list(BP_R_ARM)
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 40411ab6059..b29b3c4d96b 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -319,6 +319,8 @@
var/mob/living/carbon/human/A = affecting
if (!(A.species.flags & NO_BREATHE))
A.losebreath += 4
+ var/obj/item/organ/external/O = A.get_organ(BP_HEAD)
+ O.add_autopsy_data("Strangling")
affecting.set_dir(WEST)
else if(state == GRAB_KILL)
hud.icon_state = "kill"
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 87a32a12bba..ed23fb121d0 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -15,8 +15,8 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
icon = 'icons/obj/drinks.dmi'
drop_sound = 'sound/items/drop/bottle.ogg'
pickup_sound = 'sound/items/pickup/bottle.ogg'
- contained_sprite = TRUE
icon_state = null
+ item_state = "glass_empty"
flags = OPENCONTAINER
amount_per_transfer_from_this = 5
volume = 50
diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm
index 94bc88c5c68..c87ae13b76a 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm
@@ -604,7 +604,7 @@
nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/sourcream
avahtrans = /obj/item/reagent_containers/food/snacks/chip/miniavah/sourcream
chiptrans = /obj/item/reagent_containers/food/snacks/chip/sourcream
- icon = 'icons/obj/item/reagent_containers/food/mexican.dmi'
+ icon = 'icons/obj/item/reagent_containers/food/cultural/tajara.dmi'
icon_state = "dip_sourcream"
reagents_to_add = list(/singleton/reagent/nutriment = 20)
reagent_data = list(/singleton/reagent/nutriment = list("sour cream" = 20))
@@ -616,7 +616,7 @@
nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/tajhummus
avahtrans = /obj/item/reagent_containers/food/snacks/chip/miniavah/tajhummus
chiptrans = /obj/item/reagent_containers/food/snacks/chip/tajhummus
- icon = 'icons/obj/item/reagent_containers/food/mexican.dmi'
+ icon = 'icons/obj/item/reagent_containers/food/cultural/tajara.dmi'
icon_state = "dip_hummus"
reagents_to_add = list(/singleton/reagent/nutriment = 20)
reagent_data = list(/singleton/reagent/nutriment = list("sweet hummus" = 20))
diff --git a/html/changelogs/wezzy_spritecupfixes.yml b/html/changelogs/wezzy_spritecupfixes.yml
new file mode 100644
index 00000000000..72e4da74400
--- /dev/null
+++ b/html/changelogs/wezzy_spritecupfixes.yml
@@ -0,0 +1,47 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Fixes drink inhands."
+ - bugfix: "Fixes tajaran dip sprites."
+ - bugfix: "Fixes gum sprites."
+ - bugfix: "Fixes Koi tattoo properly."
+ - bugfix: "Strangulation should now show up in autopsy reports."
+ - bugfix: "Fixes Offworlder RIGsuit sprite hiding jumpsuits."
+ - bugfix: "Fixes spilled fuel not having a proper name and description."
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 1cefe79d409..0edb982b360 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 073fdc9d7bc..6e8d54d38a7 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ