From 6f1dd34c9118e302f8ffdac02de0e748a1bf52c0 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jun 2020 11:57:11 -0700 Subject: [PATCH 1/4] Update plushes.dm --- code/game/objects/items/plushes.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index bfbfdf9762..03f8238691 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -140,7 +140,8 @@ if(jsonlist["icon_state"]) icon_state = jsonlist["icon_state"] item_state = jsonlist["item_state"] - icon = 'config/plushies/sprites.dmi' + var/static/icon/config_sprites = icon(file("config/plushies/sprites.dmi")) + icon = config_sprites if(jsonlist["attack_verb"]) attack_verb = jsonlist["attack_verb"] if(jsonlist["squeak_override"]) From 278dfab74ae2c61189655fd4b2abfd66fdb14d70 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jun 2020 13:10:14 -0700 Subject: [PATCH 2/4] Update plushes.dm --- code/game/objects/items/plushes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 03f8238691..bf298c84b6 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -140,7 +140,7 @@ if(jsonlist["icon_state"]) icon_state = jsonlist["icon_state"] item_state = jsonlist["item_state"] - var/static/icon/config_sprites = icon(file("config/plushies/sprites.dmi")) + var/static/icon/config_sprites = icon(file("config/plushes/sprites.dmi")) icon = config_sprites if(jsonlist["attack_verb"]) attack_verb = jsonlist["attack_verb"] From 6230e11f16af1666f6ceadae10fa910cd122705d Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jun 2020 13:19:32 -0700 Subject: [PATCH 3/4] Update plushes.dm --- code/game/objects/items/plushes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index bf298c84b6..fff1f91ac0 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -140,7 +140,7 @@ if(jsonlist["icon_state"]) icon_state = jsonlist["icon_state"] item_state = jsonlist["item_state"] - var/static/icon/config_sprites = icon(file("config/plushes/sprites.dmi")) + var/static/icon/config_sprites = icon("config/plushies/sprites.dmi") icon = config_sprites if(jsonlist["attack_verb"]) attack_verb = jsonlist["attack_verb"] From 398651626d17300883769037a59c2a0893f1f73b Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jun 2020 13:31:33 -0700 Subject: [PATCH 4/4] Update plushes.dm --- code/game/objects/items/plushes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index fff1f91ac0..00a9ff22f4 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -140,7 +140,7 @@ if(jsonlist["icon_state"]) icon_state = jsonlist["icon_state"] item_state = jsonlist["item_state"] - var/static/icon/config_sprites = icon("config/plushies/sprites.dmi") + var/static/config_sprites = file("config/plushies/sprites.dmi") icon = config_sprites if(jsonlist["attack_verb"]) attack_verb = jsonlist["attack_verb"]