cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict fixes for chat filters PR

Browse Source
This commit is contained in:
Seris02
2023-03-09 17:19:02 +08:00
parent dd1e58acc7
commit 0cdc45eddf
40 changed files with 128 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown.dm
+6 -34
View File
@@ -210,11 +210,7 @@
if(G.get_amount() >= G.max_amount)
continue
G.attackby(NG, user)
<<<<<<< HEAD
to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.")
=======
to_chat(user, "<span class='filter_notice'>You add the newly-formed wood to the stack. It now contains [NG.amount] planks.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
to_chat(user, "<span class='filter_notice'>You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.</span>")
qdel(src)
return
@@ -225,46 +221,26 @@
return
if(seed.kitchen_tag == "potato" || !isnull(seed.chems["potato"]))
<<<<<<< HEAD
to_chat(user, "You slice \the [src] into sticks.")
new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src))
=======
to_chat(user, "<span class='filter_notice'>You slice \the [src] into sticks.</span>")
new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src))
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src))
qdel(src)
return
if(!isnull(seed.chems["carrotjuice"]))
<<<<<<< HEAD
to_chat(user, "You slice \the [src] into sticks.")
new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
=======
to_chat(user, "<span class='filter_notice'>You slice \the [src] into sticks.</span>")
new /obj/item/reagent_containers/food/snacks/carrotfries(get_turf(src))
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
qdel(src)
return
if(!isnull(seed.chems["pineapplejuice"]))
<<<<<<< HEAD
to_chat(user, "You slice \the [src] into rings.")
new /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring(get_turf(src))
=======
to_chat(user, "<span class='filter_notice'>You slice \the [src] into rings.</span>")
new /obj/item/reagent_containers/food/snacks/pineapple_ring(get_turf(src))
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
new /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring(get_turf(src))
qdel(src)
return
if(!isnull(seed.chems["soymilk"]))
<<<<<<< HEAD
to_chat(user, "You roughly chop up \the [src].")
new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
=======
to_chat(user, "<span class='filter_notice'>You roughly chop up \the [src].</span>")
new /obj/item/reagent_containers/food/snacks/soydope(get_turf(src))
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
qdel(src)
return
@@ -340,11 +316,7 @@
if(NG.get_amount() >= NG.max_amount)
continue
NG.attackby(G, user)
<<<<<<< HEAD
to_chat(user, "You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles.")
=======
to_chat(user, "<span class='filter_notice'>You add the newly-formed grass to the stack. It now contains [G.amount] tiles.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
to_chat(user, "<span class='filter_notice'>You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles.</span>")
qdel(src)
return
code/modules/hydroponics/seed_machines.dm
+3 -52
View File
@@ -68,25 +68,15 @@
active = 0
if(failed_task)
failed_task = 0
<<<<<<< HEAD
visible_message("\icon[src][bicon(src)] [src] pings unhappily, flashing a red warning light.")
visible_message("<span class='filter_notice'>\icon[src][bicon(src)] [src] pings unhappily, flashing a red warning light.</span>")
else
visible_message("\icon[src][bicon(src)] [src] pings happily.")
=======
visible_message("<span class='filter_notice'>[bicon(src)] [src] pings unhappily, flashing a red warning light.</span>")
else
visible_message("<span class='filter_notice'>[bicon(src)] [src] pings happily.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
visible_message("<span class='filter_notice'>\icon[src][bicon(src)] [src] pings happily.</span>")
if(eject_disk)
eject_disk = 0
if(loaded_disk)
loaded_disk.loc = get_turf(src)
<<<<<<< HEAD
visible_message("\icon[src][bicon(src)] [src] beeps and spits out [loaded_disk].")
=======
visible_message("<span class='filter_notice'>[bicon(src)] [src] beeps and spits out [loaded_disk].</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
visible_message("<span class='filter_notice'>\icon[src][bicon(src)] [src] beeps and spits out [loaded_disk].</span>")
loaded_disk = null
/obj/machinery/botany/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -179,46 +169,7 @@
data["hasGenetics"] = 0
data["sourceName"] = 0
<<<<<<< HEAD
return data
=======
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, "botany_isolator.tmpl", "Lysis-isolation Centrifuge UI", 470, 450)
ui.set_initial_data(data)
ui.open()
ui.set_auto_update(1)
/obj/machinery/botany/Topic(href, href_list)
if(..())
return 1
if(href_list["eject_packet"])
if(!seed) return
seed.loc = get_turf(src)
if(seed.seed.name == "new line" || isnull(plant_controller.seeds[seed.seed.name]))
seed.seed.uid = plant_controller.seeds.len + 1
seed.seed.name = "[seed.seed.uid]"
plant_controller.seeds[seed.seed.name] = seed.seed
seed.update_seed()
visible_message("<span class='filter_notice'>[bicon(src)] [src] beeps and spits out [seed].</span>")
seed = null
if(href_list["eject_disk"])
if(!loaded_disk) return
loaded_disk.loc = get_turf(src)
visible_message("<span class='filter_notice'>[bicon(src)] [src] beeps and spits out [loaded_disk].</span>")
loaded_disk = null
usr.set_machine(src)
src.add_fingerprint(usr)
/obj/machinery/botany/extractor/Topic(href, href_list)
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
/obj/machinery/botany/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
if(..())
code/modules/hydroponics/trays/tray_tools.dm
-14
View File
@@ -39,25 +39,11 @@
ui = new(user, src, "PlantAnalyzer", name)
ui.open()
<<<<<<< HEAD
/obj/item/device/analyzer/plant_analyzer/tgui_state(mob/user)
return GLOB.tgui_inventory_state
/obj/item/device/analyzer/plant_analyzer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = ..()
=======
/obj/item/analyzer/plant_analyzer/proc/print_report(var/mob/living/user)
if(!last_data)
to_chat(user, "<span class='filter_notice'>There is no scan data to print.</span>")
return
var/obj/item/paper/P = new /obj/item/paper(get_turf(src))
P.name = "paper - [form_title]"
P.info = "[last_data]"
if(istype(user,/mob/living/carbon/human))
user.put_in_hands(P)
user.visible_message("<span class='filter_notice'>\The [src] spits out a piece of paper.</span>")
return
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
var/datum/seed/grown_seed = last_seed
if(!istype(grown_seed))