Merge pull request #14353 from KillianKirilenko/kk-duffs
Tilted Duffles
@@ -47,7 +47,32 @@
|
|||||||
|
|
||||||
/obj/item/weapon/storage/backpack/holding/duffle
|
/obj/item/weapon/storage/backpack/holding/duffle
|
||||||
name = "dufflebag of holding"
|
name = "dufflebag of holding"
|
||||||
|
var/tilted = 0
|
||||||
icon_state = "holdingduffle"
|
icon_state = "holdingduffle"
|
||||||
|
|
||||||
|
/obj/item/weapon/storage/backpack/holding/duffle/Initialize()
|
||||||
|
. = ..()
|
||||||
|
if(prob(50))
|
||||||
|
icon_state = "[icon_state]_tilted"
|
||||||
|
tilted = 1
|
||||||
|
|
||||||
|
/obj/item/weapon/storage/backpack/holding/duffle/verb/tilt()
|
||||||
|
set name = "Adjust Duffelbag Angle"
|
||||||
|
set desc = "Adjust the angle of your dufflebag for cosmetic effect"
|
||||||
|
set category = "Object"
|
||||||
|
set src in usr
|
||||||
|
if(!usr.canmove || usr.stat || usr.restrained())
|
||||||
|
return
|
||||||
|
if(tilted)
|
||||||
|
icon_state = "[initial(icon_state)]"
|
||||||
|
to_chat(usr, "You adjust the angle of \the [src] to rest across your lower back.")
|
||||||
|
tilted = 0
|
||||||
|
else
|
||||||
|
icon_state = "[icon_state]_tilted"
|
||||||
|
to_chat(usr, "You adjust the angle of \the [src] to rest diagonally across your back.")
|
||||||
|
tilted = 1
|
||||||
|
update_icon()
|
||||||
|
usr.update_inv_back()
|
||||||
|
|
||||||
/obj/item/weapon/storage/backpack/holding/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
/obj/item/weapon/storage/backpack/holding/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||||
if(istype(W, /obj/item/weapon/storage/backpack/holding))
|
if(istype(W, /obj/item/weapon/storage/backpack/holding))
|
||||||
@@ -147,7 +172,36 @@
|
|||||||
desc = "A large dufflebag for holding extra things."
|
desc = "A large dufflebag for holding extra things."
|
||||||
icon_state = "duffle"
|
icon_state = "duffle"
|
||||||
slowdown = 0.5
|
slowdown = 0.5
|
||||||
|
var/tilted = 0
|
||||||
|
var/can_tilt = 1
|
||||||
max_storage_space = INVENTORY_DUFFLEBAG_SPACE
|
max_storage_space = INVENTORY_DUFFLEBAG_SPACE
|
||||||
|
|
||||||
|
/obj/item/weapon/storage/backpack/dufflebag/Initialize()
|
||||||
|
. = ..()
|
||||||
|
if(prob(50))
|
||||||
|
icon_state = "[icon_state]_tilted"
|
||||||
|
tilted = 1
|
||||||
|
|
||||||
|
/obj/item/weapon/storage/backpack/dufflebag/verb/tilt()
|
||||||
|
set name = "Adjust Duffelbag Angle"
|
||||||
|
set desc = "Adjust the angle of your dufflebag for cosmetic effect"
|
||||||
|
set category = "Object"
|
||||||
|
set src in usr
|
||||||
|
if(!usr.canmove || usr.stat || usr.restrained())
|
||||||
|
return
|
||||||
|
if(!can_tilt)
|
||||||
|
to_chat(usr, "[src] can't be adjusted like that.")
|
||||||
|
return
|
||||||
|
if(tilted)
|
||||||
|
icon_state = "[initial(icon_state)]"
|
||||||
|
to_chat(usr, "You adjust the angle of \the [src] to rest across your lower back.")
|
||||||
|
tilted = 0
|
||||||
|
else
|
||||||
|
icon_state = "[icon_state]_tilted"
|
||||||
|
to_chat(usr, "You adjust the angle of \the [src] to rest diagonally across your back.")
|
||||||
|
tilted = 1
|
||||||
|
update_icon()
|
||||||
|
usr.update_inv_back()
|
||||||
|
|
||||||
/obj/item/weapon/storage/backpack/dufflebag/syndie
|
/obj/item/weapon/storage/backpack/dufflebag/syndie
|
||||||
name = "black dufflebag"
|
name = "black dufflebag"
|
||||||
@@ -203,7 +257,7 @@
|
|||||||
/obj/item/weapon/storage/backpack/dufflebag/cursed
|
/obj/item/weapon/storage/backpack/dufflebag/cursed
|
||||||
name = "cursed dufflebag"
|
name = "cursed dufflebag"
|
||||||
desc = "That probably shouldn't be moving..."
|
desc = "That probably shouldn't be moving..."
|
||||||
icon_state = "duffle_cursed"
|
icon_state = "duffle_curse"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Satchel Types
|
* Satchel Types
|
||||||
|
|||||||
@@ -138,6 +138,7 @@
|
|||||||
icon = 'icons/vore/custom_items_vr.dmi'
|
icon = 'icons/vore/custom_items_vr.dmi'
|
||||||
item_state = "duffle_med"
|
item_state = "duffle_med"
|
||||||
slowdown = 0
|
slowdown = 0
|
||||||
|
can_tilt = 0
|
||||||
|
|
||||||
/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu/New()
|
/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu/New()
|
||||||
..()
|
..()
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 134 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 34 KiB |