diff --git a/code/datums/components/crafting/glassware/glassware.dm b/code/datums/components/crafting/glassware/glassware.dm index 50137733ee..f37efedc8a 100644 --- a/code/datums/components/crafting/glassware/glassware.dm +++ b/code/datums/components/crafting/glassware/glassware.dm @@ -39,7 +39,7 @@ name = "tea cup" desc = "A glass cup made for sipping tea!" icon = 'icons/obj/glass_ware.dmi' - icon_state = "tea_plate" + icon_state = "tea_cup" //////////////////////Chem Disk///////////////////// //Two Steps // @@ -145,7 +145,7 @@ qdel(src) /obj/item/glasswork/glass_base/glass_lens_part5 - name = "unpolished glass lens" + name = "unpolished glass (lens)" desc = "An unpolished glass lens. It needs to be polished with some dry cloth." icon = 'icons/obj/glass_ware.dmi' icon_state = "glass_optics" @@ -159,7 +159,7 @@ qdel(src) /obj/item/glasswork/glass_base/glass_lens_part6 - name = "unrefined glass lens" + name = "unrefined glass (lens)" desc = "A polished glass lens. It needs to be refined with some sandstone." icon = 'icons/obj/glass_ware.dmi' icon_state = "glass_optics" @@ -179,7 +179,7 @@ /obj/item/glasswork/glass_base/spouty name = "Glass fodder sheet (spout)" - desc = "A set of glass sheets set aside for glass working. This one is ideal for a spouty flask. It needs to heated with something very hot." + desc = "A set of glass sheets set aside for glass working. This one is ideal for a spouty flask. It needs to be cut with some glassworking tools." next_step = /obj/item/glasswork/glass_base/spouty_part2 /obj/item/glasswork/glass_base/spouty/attackby(obj/item/I, mob/user, params) @@ -413,7 +413,7 @@ qdel(src) qdel(I) -/obj/item/glasswork/glass_base/tea_cupe2 +/obj/item/glasswork/glass_base/tea_cup2 name = "glassblowing rod (tea cup)" desc = "A hollow metal rod made for blowing glass. There is a blob of shapen glass at the end of it that needs to be cut off with some glassworking tools." icon_state = "blowing_rods_inuse" @@ -433,7 +433,7 @@ icon_state = "glass_base_half" next_step = /obj/item/glasswork/glass_base/tea_cup4 -/obj/item/glasswork/glass_base/cup3/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/tea_cup3/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/sheet/cloth)) if(do_after(user,10, target = src)) @@ -446,7 +446,7 @@ icon_state = "glass_base_half" next_step = /obj/item/tea_cup -/obj/item/glasswork/glass_base/cup4/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/tea_cup4/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/sheet/glass)) if(do_after(user,10, target = src)) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index ece4d6bae2..bea05f6ef1 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -22,8 +22,8 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ new/datum/stack_recipe("spout flask", /obj/item/glasswork/glass_base/spouty, 20), \ new/datum/stack_recipe("small bulb flask", /obj/item/glasswork/glass_base/flask_small, 5), \ new/datum/stack_recipe("large bottle flask", /obj/item/glasswork/glass_base/flask_large, 15), \ - new/datum/stack_recipe("tea cup", /obj/item/glasswork/glass_base/tea_plate, 5), \ - new/datum/stack_recipe("tea plate", /obj/item/glasswork/glass_base/tea_cup, 5), \ + new/datum/stack_recipe("tea cup", /obj/item/glasswork/glass_base/tea_cup, 5), \ + new/datum/stack_recipe("tea plate", /obj/item/glasswork/glass_base/tea_plate, 5), \ )), \ )) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ad07257e3d..646fa753ff 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -69,6 +69,7 @@ GLOBAL_PROTECT(admin_verbs_admin) /client/proc/cmd_admin_man_up, //CIT CHANGE - adds man up verb /client/proc/cmd_admin_man_up_global, //CIT CHANGE - ditto /client/proc/cmd_admin_create_centcom_report, + /client/proc/cmd_admin_make_priority_announcement, //CIT CHANGE /client/proc/cmd_change_command_name, /client/proc/cmd_admin_check_player_exp, /* shows players by playtime */ /client/proc/toggle_combo_hud, // toggle display of the combination pizza antag and taco sci/med/eng hud diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index 1882d5fe97..7771d24e16 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -11,8 +11,8 @@ growthstages = 1 instability = 40 growing_icon = 'goon/icons/obj/hydroponics.dmi' - icon_grow = "cannabis-grow" // Uses one growth icons set for all the subtypes - icon_dead = "cannabis-dead" // Same for the dead icon + icon_grow = "cannabis-grow" + icon_dead = "cannabis-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) mutatelist = list(/obj/item/seeds/cannabis/rainbow, /obj/item/seeds/cannabis/death) @@ -26,6 +26,8 @@ species = "megacannabis" plantname = "Rainbow Weed" product = /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow + icon_grow = "megacannabis-grow" + icon_dead = "megacannabis-dead" mutatelist = list(/obj/item/seeds/cannabis/ultimate) reagents_add = list(/datum/reagent/toxin/mindbreaker = 0.15, /datum/reagent/toxin/lipolicide = 0.35) rarity = 40 @@ -37,6 +39,8 @@ species = "blackcannabis" plantname = "Deathweed" product = /obj/item/reagent_containers/food/snacks/grown/cannabis/death + icon_grow = "blackcannabis-grow" + icon_dead = "blackcannabis-dead" mutatelist = list(/obj/item/seeds/cannabis/white) reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15) rarity = 40 @@ -48,6 +52,8 @@ species = "whitecannabis" plantname = "Lifeweed" product = /obj/item/reagent_containers/food/snacks/grown/cannabis/white + icon_grow = "whitecannabis-grow" + icon_dead = "whitecannabis-dead" mutatelist = list() reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15) rarity = 40 @@ -60,6 +66,8 @@ species = "ocannabis" plantname = "Omega Weed" product = /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate + icon_grow = "ocannabis-grow" + icon_dead = "ocannabis-dead" genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green) mutatelist = list() reagents_add = list(/datum/reagent/drug/space_drugs = 0.3,