cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Custom items 03/06 (#6529)

Browse Source
This commit is contained in:
Alberyk
2019-06-09 09:30:12 -03:00
committed by Werner
parent dd0025f7db
commit 673d45b4ff
4 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/customitems/item_defines.dm
View File

@@ -2868,10 +2868,28 @@ All custom items with worn sprites must follow the contained sprite system: http
contained_sprite = TRUE
/obj/item/clothing/suit/storage/fluff/imari_hoodie //adinkra hoodie - Imari Idris - P - ornias
/obj/item/clothing/suit/storage/fluff/imari_hoodie //Adinkra Hoodie - Imari Idris - P - ornias
name = "adinkra hoodie"
desc = "A large, immaculate white hoodie adorned with seven Adinkra symbols on the back. Below the large central symbol is the text \"MMERE DANE\". There is a small 'Idris Incorporated' logo below the left drawstring."
icon = 'icons/obj/custom_items/imari_hoodie.dmi'
icon_state = "imari_hoodie"
item_state = "imari_hoodie"
contained_sprite = TRUE
/obj/item/weapon/reagent_containers/glass/bucket/fluff/khasan_bucket //Battered Metal Bucket - Khasan Mikhnovsky - alberyk
name = "battered metal bucket"
desc = "A battered rusty metal bucket. It has seen a lot of use and little maintenance."
icon = 'icons/obj/custom_items/khasan_bucket.dmi'
icon_state = "khasan_bucket"
item_state = "khasan_bucket"
contained_sprite = TRUE
helmet_type = /obj/item/clothing/head/helmet/bucket/fluff/khasan_bucket
drop_sound = 'sound/items/drop/axe.ogg'
/obj/item/clothing/head/helmet/bucket/fluff/khasan_bucket
name = "battered metal bucket helmet"
icon = 'icons/obj/custom_items/khasan_bucket.dmi'
icon_state = "khasan_helmet"
item_state = "khasan_helmet"
contained_sprite = TRUE

24
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -200,6 +200,8 @@
flags = OPENCONTAINER
unacidable = 0
drop_sound = 'sound/items/drop/helm.ogg'
var/carving_weapon = /obj/item/weapon/wirecutters
var/helmet_type = /obj/item/clothing/head/helmet/bucket
/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/D, mob/user as mob)
if(isprox(D))
@@ -208,9 +210,9 @@
user.put_in_hands(new /obj/item/weapon/bucket_sensor)
qdel(src)
return
else if(istype(D, /obj/item/weapon/wirecutters))
else if(istype(D, carving_weapon))
to_chat(user, "<span class='notice'>You cut a big hole in \the [src] with \the [D].</span>")
user.put_in_hands(new /obj/item/clothing/head/helmet/bucket)
user.put_in_hands(new helmet_type)
qdel(src)
return
else if(istype(D, /obj/item/weapon/mop))
@@ -246,23 +248,11 @@ obj/item/weapon/reagent_containers/glass/bucket/wood
item_state = "woodbucket"
matter = list("wood" = 50)
drop_sound = 'sound/items/drop/wooden.ogg'
carving_weapon = /obj/item/weapon/material/hatchet
helmet_type = /obj/item/clothing/head/helmet/bucket/wood
/obj/item/weapon/reagent_containers/glass/bucket/wood/attackby(var/obj/D, mob/user as mob)
if(isprox(D))
to_chat(user, "This wooden bucket doesn't play well with electronics.")
return
else if(istype(D, /obj/item/weapon/material/hatchet))
to_chat(user, "<span class='notice'>You cut a big hole in \the [src] with \the [D].</span>")
user.put_in_hands(new /obj/item/clothing/head/helmet/bucket/wood)
qdel(src)
return
else if(istype(D, /obj/item/weapon/mop))
if(reagents.total_volume < 1)
to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
else
reagents.trans_to_obj(D, 5)
to_chat(user, "<span class='notice'>You wet \the [D] in \the [src].</span>")
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
return
else
return ..()
..()