diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 181db77e91..a715fee32c 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -167,10 +167,43 @@ storage_slots = 6 drop_sound = 'sound/items/drop/box.ogg' use_sound = 'sound/items/storage/box.ogg' + var/open = 0 + var/open_state + var/closed_state -/obj/item/weapon/storage/box/fancy/chewables/tobacco/update_icon() - icon_state = "[initial(icon_state)][contents.len]" +/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico/New() + if(!open_state) + open_state = "[initial(icon_state)]0" + if(!closed_state) + closed_state = "[initial(icon_state)]" + ..() +/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico/update_icon() + cut_overlays() + if(open) + icon_state = open_state + if(contents.len >= 1) + add_overlay("chew_nico[contents.len]") + else + icon_state = closed_state + +/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico/open(mob/user as mob) + if(open) + return + open = TRUE + if(contents.len == 0) + icon_state = "[initial(icon_state)]_empty" + else + update_icon() + ..() + +/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico/close(mob/user as mob) + open = FALSE + if(contents.len == 0) + icon_state = "[initial(icon_state)]_empty" + else + update_icon() + ..() /obj/item/clothing/mask/chewable/candy name = "wad" diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 5a751e3527..04a8b9b2c5 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -1,5 +1,3 @@ -//cleansed 9/15/2012 17:48 - /* CONTAINS: MATCHES diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index aa0e4598ea..13a7d7ca3d 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -9,7 +9,10 @@ * Egg Box * Candle Box * Crayon Box - * Cigarette Box + * Cracker Pack + * Cigarette Pack + * Cigar Box + * Extra Tobacco Bits * Vial Box * Box of Chocolates */ @@ -21,6 +24,9 @@ var/icon_type = "donut" drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + var/open = 0 + var/open_state + var/closed_state /obj/item/weapon/storage/fancy/update_icon(var/itemremoved = 0) var/total_contents = contents.len - itemremoved @@ -41,7 +47,6 @@ /* * Egg Box */ - /obj/item/weapon/storage/fancy/egg_box icon = 'icons/obj/food.dmi' icon_state = "eggbox" @@ -55,10 +60,37 @@ ) starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/egg = 12) +/obj/item/weapon/storage/fancy/egg_box/New() + if(!open_state) + open_state = "[initial(icon_state)]0" + if(!closed_state) + closed_state = "[initial(icon_state)]" + ..() + +/obj/item/weapon/storage/fancy/egg_box/update_icon() + cut_overlays() + if(open) + icon_state = open_state + if(contents.len >= 1) + add_overlay("eggbox[contents.len]") + else + icon_state = closed_state + +/obj/item/weapon/storage/fancy/egg_box/open(mob/user as mob) + if(open) + return + open = TRUE + update_icon() + ..() + +/obj/item/weapon/storage/fancy/egg_box/close(mob/user as mob) + open = FALSE + update_icon() + ..() + /* * Candle Boxes */ - /obj/item/weapon/storage/fancy/candle_box name = "red candle pack" desc = "A pack of red candles." @@ -102,7 +134,6 @@ /* * Crayon Box */ - /obj/item/weapon/storage/fancy/crayons name = "box of crayons" desc = "A box of crayons for all your rune drawing needs." @@ -187,9 +218,8 @@ ..() /* - * Cracker Packet + * Cracker Pack */ - /obj/item/weapon/storage/fancy/crackers name = "\improper Getmore Crackers" icon = 'icons/obj/food.dmi' @@ -201,9 +231,9 @@ can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/cracker) starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/cracker = 6) -//////////// -//CIG PACK// -//////////// +/* + * Cigarette Pack + */ /obj/item/weapon/storage/fancy/cigarettes name = "\improper pack of Trans-Stellar Duty-frees" desc = "A ubiquitous brand of cigarettes, found in every major spacefaring corporation in the universe. As mild and flavorless as it gets." @@ -230,9 +260,39 @@ C.brand = brand C.desc += " This one is \a [brand]." +/obj/item/weapon/storage/fancy/cigarettes/New() + if(!open_state) + open_state = "[initial(icon_state)]_open" + if(!closed_state) + closed_state = "[initial(icon_state)]" + ..() + /obj/item/weapon/storage/fancy/cigarettes/update_icon() - icon_state = "[initial(icon_state)][contents.len]" - return + cut_overlays() + if(open) + icon_state = open_state + if(contents.len >= 1) + add_overlay("cig[contents.len]") + else + icon_state = closed_state + +/obj/item/weapon/storage/fancy/cigarettes/open(mob/user as mob) + if(open) + return + open = TRUE + if(contents.len == 0) + icon_state = "[initial(icon_state)]_empty" + else + update_icon() + ..() + +/obj/item/weapon/storage/fancy/cigarettes/close(mob/user as mob) + open = FALSE + if(contents.len == 0) + icon_state = "[initial(icon_state)]_empty" + else + update_icon() + ..() /obj/item/weapon/storage/fancy/cigarettes/remove_from_storage(obj/item/W as obj, atom/new_location) // Don't try to transfer reagents to lighters @@ -283,8 +343,6 @@ icon_state = "Apacket" brand = "\improper Acme Co. cigarette" -// New exciting ways to kill your lungs! - Earthcrusher // - /obj/item/weapon/storage/fancy/cigarettes/luckystars name = "\improper pack of Lucky Stars" desc = "A mellow blend made from synthetic, pod-grown tobacco. The commercial jingle is guaranteed to get stuck in your head." @@ -319,6 +377,9 @@ icon_state = "P100packet" brand = "\improper Professional 120" +/* + * Cigar Box + */ /obj/item/weapon/storage/fancy/cigar name = "cigar case" desc = "A case for holding your cigars when you are not smoking them." @@ -331,23 +392,50 @@ storage_slots = 7 can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/trash/cigbutt/cigarbutt) icon_type = "cigar" - starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar = 7) + starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar = 8) /obj/item/weapon/storage/fancy/cigar/Initialize() . = ..() flags |= NOREACT create_reagents(15 * storage_slots) -/obj/item/weapon/storage/fancy/cigar/update_icon() - icon_state = "[initial(icon_state)][contents.len]" - return - /obj/item/weapon/storage/fancy/cigar/remove_from_storage(obj/item/W as obj, atom/new_location) var/obj/item/clothing/mask/smokable/cigarette/cigar/C = W if(!istype(C)) return reagents.trans_to_obj(C, (reagents.total_volume/contents.len)) return ..() +/obj/item/weapon/storage/fancy/cigar/New() + if(!open_state) + open_state = "[initial(icon_state)]0" + if(!closed_state) + closed_state = "[initial(icon_state)]" + ..() + +/obj/item/weapon/storage/fancy/cigar/update_icon() + cut_overlays() + if(open) + icon_state = open_state + if(contents.len >= 1) + add_overlay("cigarcase[contents.len]") + else + icon_state = closed_state + +/obj/item/weapon/storage/fancy/cigar/open(mob/user as mob) + if(open) + return + open = TRUE + update_icon() + ..() + +/obj/item/weapon/storage/fancy/cigar/close(mob/user as mob) + open = FALSE + update_icon() + ..() + +/* + * Tobacco Bits + */ /obj/item/weapon/storage/rollingpapers name = "rolling paper pack" desc = "A small cardboard pack containing several folded rolling papers." @@ -371,7 +459,6 @@ /* * Vial Box */ - /obj/item/weapon/storage/fancy/vials icon = 'icons/obj/vialbox.dmi' icon_state = "vialbox6" @@ -414,9 +501,8 @@ update_icon() /* - * Box of Chocolates/Heart Box + * Box of Chocolates */ - /obj/item/weapon/storage/fancy/heartbox icon_state = "heartbox" name = "box of chocolates" diff --git a/code/game/objects/structures/under_wardrobe.dm b/code/game/objects/structures/under_wardrobe.dm index 5da83511c6..5849085b1d 100644 --- a/code/game/objects/structures/under_wardrobe.dm +++ b/code/game/objects/structures/under_wardrobe.dm @@ -1,5 +1,5 @@ /obj/structure/undies_wardrobe - name = "underwear wardrobe" + name = "underwear dresser" desc = "Holds item of clothing you shouldn't be showing off in the hallways." icon = 'icons/obj/closets/undies_wardrobe.dmi' icon_state = "wardrobe" diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index d9d24d5bb2..96ea7e77a0 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1368,6 +1368,34 @@ w_class = ITEMSIZE_TINY starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 7) +/obj/item/weapon/storage/fancy/fluff/charlotte/New() + if(!open_state) + open_state = "[initial(icon_state)]0" + if(!closed_state) + closed_state = "[initial(icon_state)]" + ..() + +/obj/item/weapon/storage/fancy/fluff/charlotte/update_icon() + cut_overlays() + if(open) + icon_state = open_state + if(contents.len >= 1) + add_overlay("charlottebox[contents.len]") + else + icon_state = closed_state + +/obj/item/weapon/storage/fancy/fluff/charlotte/open(mob/user as mob) + if(open) + return + open = TRUE + update_icon() + ..() + +/obj/item/weapon/storage/fancy/fluff/charlotte/close(mob/user as mob) + open = FALSE + update_icon() + ..() + //Ashling - Antoinette deKaultieste /obj/item/weapon/material/knife/machete/hatchet/unathiknife/fluff/antoinette name = "sawtooth ritual knife" diff --git a/icons/obj/beekeeping.dmi b/icons/obj/beekeeping.dmi index ae5fd457e9..3fa8f15167 100644 Binary files a/icons/obj/beekeeping.dmi and b/icons/obj/beekeeping.dmi differ diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index b85ea96357..da355f3e97 100644 Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ diff --git a/icons/obj/closets/undies_wardrobe.dmi b/icons/obj/closets/undies_wardrobe.dmi index c412cd0b76..b25846890f 100644 Binary files a/icons/obj/closets/undies_wardrobe.dmi and b/icons/obj/closets/undies_wardrobe.dmi differ diff --git a/icons/obj/zippo.dmi b/icons/obj/zippo.dmi index 0d4416cc64..17288a981a 100644 Binary files a/icons/obj/zippo.dmi and b/icons/obj/zippo.dmi differ diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index 45d064e1b6..4dbaf4f08c 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ