diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 482ec0389df..d1beea37f7c 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -815,6 +815,7 @@ /obj/item/material/kitchen/utensil/fork = 12, /obj/item/material/kitchen/utensil/knife = 12, /obj/item/material/kitchen/utensil/spoon = 12, + /obj/item/material/kitchen/utensil/fork/chopsticks = 12, /obj/item/material/knife = 2, /obj/item/material/hatchet/butch = 2, /obj/item/reagent_containers/food/drinks/drinkingglass = 12, @@ -849,6 +850,7 @@ /obj/item/material/kitchen/utensil/fork/plastic = 12, /obj/item/material/kitchen/utensil/spoon/plastic = 12, /obj/item/material/kitchen/utensil/knife/plastic = 12, + /obj/item/material/kitchen/utensil/fork/chopsticks/cheap = 12, /obj/item/reagent_containers/food/drinks/drinkingglass = 12 ) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 370b7dbe01c..228fedda602 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -213,6 +213,18 @@ name = "empty rice tub" icon_state = "ricetub" +/obj/item/trash/ricetub/attackby(obj/item/W, mob/living/user) + if(istype(W, /obj/item/material/kitchen/utensil/fork/chopsticks)) + var/obj/item/trash/ricetub_s/T = new() + to_chat(user, SPAN_NOTICE("You reattach the [W] to \the [src]")) + src.Destroy() + W.Destroy() + user.put_in_inactive_hand(T) //Because the chopsticks are in the active hand + +/obj/item/trash/ricetub_s + name = "empty rice tub" + icon_state = "ricetub_s" + /obj/item/trash/seaweed name = "empty moss pack" icon_state = "seaweed" diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index b613159c68d..69533a10411 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -23,6 +23,7 @@ var/loaded //Descriptive string for currently loaded food object. var/is_liquid = FALSE //whether you've got liquid on your utensil var/scoop_food = 1 + var/transfer_amt = 5 /obj/item/material/kitchen/utensil/New() ..() @@ -80,6 +81,19 @@ /obj/item/material/kitchen/utensil/fork/plastic default_material = MATERIAL_PLASTIC +/obj/item/material/kitchen/utensil/fork/chopsticks + name = "chopsticks" + desc = "A pair of chopsticks. The most challenging utensil in the Spur." + icon_state = "chopsticks" + default_material = MATERIAL_WOOD + transfer_amt = 2 //Chopsticks are hard to grab stuff with + +/obj/item/material/kitchen/utensil/fork/chopsticks/cheap + name = "cheap chopsticks" + desc = "A pair of cheap, disposable chopsticks." + use_material_name = 0 + applies_material_colour = 0 + /obj/item/material/kitchen/utensil/spoon name = "spoon" desc = "It's a spoon. You can see your own upside-down face in it." diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 8f5bd96db56..5ed1d968b2b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -233,7 +233,7 @@ holobadges["holobadge cord"] = /obj/item/clothing/accessory/badge/holo/cord gear_tweaks += new/datum/gear_tweak/path(holobadges) -/datum/gear/accessory/wardenbadge +/datum/gear/accessory/officerbadge display_name = "badge, officer" path = /obj/item/clothing/accessory/badge/officer allowed_roles = list("Security Officer") diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 7f70aea25e1..1cca87f102e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -217,10 +217,21 @@ allowed_roles = list("Head of Security") /datum/gear/suit/dominia_cape - display_name = "dominia cape" + display_name = "dominian cape" path = /obj/item/clothing/accessory/poncho/dominia_cape flags = GEAR_HAS_DESC_SELECTION +/datum/gear/suit/dominia_cape/New() + ..() + var/dominiacape = list() + dominiacape["dominian cape"] = /obj/item/clothing/accessory/poncho/dominia_cape + dominiacape["dominian cape, strelitz"] = /obj/item/clothing/accessory/poncho/dominia_cape/strelitz + dominiacape["dominian cape, volvalaad"] = /obj/item/clothing/accessory/poncho/dominia_cape/volvalaad + dominiacape["dominian cape, kazhkz"] = /obj/item/clothing/accessory/poncho/dominia_cape/kazhkz + dominiacape["dominian cape, caladius"] = /obj/item/clothing/accessory/poncho/dominia_cape/caladius + dominiacape["dominian cape, zhao"] = /obj/item/clothing/accessory/poncho/dominia_cape/zhao + gear_tweaks += new/datum/gear_tweak/path(dominiacape) + /datum/gear/suit/dominia display_name = "dominia coat and jacket selection" description = "A selection of Dominian coats and jackets." diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 63969926f42..91134d1b919 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -41,14 +41,44 @@ contained_sprite = TRUE /obj/item/clothing/accessory/poncho/dominia_cape - name = "dominia cape" - desc = "This is a cape in the style of Dominia nobility. It's the latest fashion across Dominian space." + name = "dominian cape" + desc = "This is a cape in the style of Dominian nobility. It's the latest fashion across Dominian space." icon = 'icons/clothing/suits/capes/dominia.dmi' icon_state = "dominian_cape" item_state = "dominian_cape" icon_override = null contained_sprite = TRUE +/obj/item/clothing/accessory/poncho/dominia_cape/strelitz + name = "house strelitz cape" + desc = "This is a cape in the style of Dominian nobility. This one is in the colours of House Strelitz." + icon_state = "strelitz_cape" + item_state = "strelitz_cape" + +/obj/item/clothing/accessory/poncho/dominia_cape/volvalaad + name = "house volvalaad cape" + desc = "This is a cape in the style of Dominian nobility. This one is in the colours of House Volvalaad." + icon_state = "volvalaad_cape" + item_state = "volvalaad_cape" + +/obj/item/clothing/accessory/poncho/dominia_cape/kazhkz + name = "house kazhkz cape" + desc = "This is a cape in the style of Dominian nobility. This one is in the colours of House Kazhkz." + icon_state = "kazhkz_cape" + item_state = "kazhkz_cape" + +/obj/item/clothing/accessory/poncho/dominia_cape/caladius + name = "house caladius cape" + desc = "This is a cape in the style of Dominian nobility. This one is in the colours of House Caladius." + icon_state = "caladius_cape" + item_state = "caladius_cape" + +/obj/item/clothing/accessory/poncho/dominia_cape/zhao + name = "house zhao cape" + desc = "This is a cape in the style of Dominian nobility. This one is in the colours of House Zhao." + icon_state = "zhao_cape" + item_state = "zhao_cape" + /obj/item/clothing/suit/storage/toggle/dominia name = "dominia great coat" desc = "This is a great coat in the style of Dominia nobility. It's the latest fashion across Dominian space." diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 11c8dffdb98..cc0fcbb574a 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -205,7 +205,7 @@ I.color = src.filling_color U.add_overlay(I) - reagents.trans_to_obj(U, min(reagents.total_volume,5)) + reagents.trans_to_obj(U, min(reagents.total_volume,U.transfer_amt)) if(is_liquid) U.is_liquid = TRUE on_consume(user, user) @@ -3625,19 +3625,48 @@ name = "packed rice bowl" desc = "Boiled rice packed in a sealed plastic tub with the Nojosuru Foods logo on it. There appears to be a pair of chopsticks clipped to the side." icon_state = "ricetub" - trash = /obj/item/trash/ricetub + trash = /obj/item/trash/ricetub_s filling_color = "#A66829" center_of_mass = list("x"=17, "y"=16) reagents_to_add = list(/datum/reagent/nutriment = 5) reagent_data = list(/datum/reagent/nutriment = list("rice" = 1)) + var/sticks = 1 + +/obj/item/reagent_containers/food/snacks/ricetub/verb/remove_sticks() + set name = "Remove Chopsticks" + set category = "Object" + set src in usr + + var/obj/item/material/kitchen/utensil/fork/chopsticks/cheap/S = new() + + if(use_check_and_message(usr)) + return + + if(!sticks) + to_chat(usr, SPAN_WARNING("There are no chopsticks attached to \the [src].")) + return + + sticks = 0 + trash = /obj/item/trash/ricetub + desc = "Boiled rice packed in a sealed plastic tub with the Nojosuru Foods logo on it. There appears to have once been something clipped to the side." + usr.put_in_hands(S) + + update_icon() + to_chat(usr, SPAN_NOTICE("You remove the chopsticks from \the [src].")) /obj/item/reagent_containers/food/snacks/ricetub/update_icon() var/percent = round((reagents.total_volume / 5) * 100) switch(percent) if(0 to 90) - icon_state = "ricetub_90" + if(sticks) + icon_state = "ricetub_s_90" + else + icon_state = "ricetub_90" if(91 to INFINITY) - icon_state = "ricetub" + if(sticks) + icon_state = "ricetub_s" + else + icon_state = "ricetub" /obj/item/reagent_containers/food/snacks/seaweed name = "Go-Go Gwok! Authentic Konyanger moss" diff --git a/html/changelog.html b/html/changelog.html index a57513c256a..0e912f8ab06 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,25 @@ -->
+

11 December 2020

+

Geeves updated:

+ +

Sparky_Hotdog updated:

+ +

TheDocOct updated:

+ +

Wowzewow (Wezzy) updated:

+ +

10 December 2020

Wowzewow (Wezzy) updated: