Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Fixes bag of holding inhands and mob sprites #17093

Merged
Moltijoe merged 3 commits into from
Dec 18, 2022
Merged

Fixes bag of holding inhands and mob sprites #17093

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cb3ffe
Fixes boh inhands (maybe without causing horrible runtimes)
Notamaniac Dec 15, 2022
afe2d58
tuuurdis
Notamaniac Dec 16, 2022
4be4552
Revert "tuuurdis"
Notamaniac Dec 16, 2022
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
7 changes: 1 addition & 6 deletions yogstation/code/game/objects/items/storage/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
var/cut = FALSE
var/appears_split = FALSE

/obj/item/storage/backpack/holding/build_worn_icon(var/state = "", var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM)
state = item_state
/obj/item/storage/backpack/holding/build_worn_icon(var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM)
if(default_icon_file == 'icons/mob/clothing/head/head.dmi')
default_icon_file = 'yogstation/icons/mob/clothing/head/head.dmi' // thats a fun dilemma.... how to keep the tg sprites when doing back but do yogs sprites when worn on head.
return ..()
Expand Down Expand Up @@ -173,10 +172,6 @@
item_flags = NO_MAT_REDEMPTION
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 60, ACID = 50)

/obj/item/disabled_boh/build_worn_icon(var/state = "", var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM)
state = "brokenpack"
return ..()

//Nick's snail shit

/obj/item/storage/backpack/snail
Expand Down