cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds message boxes to the chat system (#22280)

Browse Source 
* initial working commit

* fix this

* helpers

* tweaks

* text being silly moment

* antags are red

* Update goon/browserassets/css/browserOutput-dark.css

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/brain/robotic_brain.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* review and warning fixes

* refactor antag greetings

* tweaks to include more things

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/antagonists/traitor/datum_mindslave.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* fixes vial spawned antags

* Update code/datums/mind.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
S34N
2023-10-12 23:15:03 +01:00
committed by GitHub
co-authored by Burzah Luc Contrabang
parent 7d47f4d54b
commit a029cf2502
48 changed files with 273 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown.dm
+1 -2
View File
@@ -90,7 +90,7 @@
return ..()
if (istype(O, /obj/item/plant_analyzer))
var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src].</span>\n"
var/msg = "<span class='info'>This is \a <span class='name'>[src].</span>\n"
if(seed)
msg += seed.get_analyzer_text()
var/reag_txt = ""
@@ -102,7 +102,6 @@
if(reag_txt)
msg += reag_txt
msg += "<br><span class='info'>*---------*</span>"
to_chat(user, msg)
else
if(seed)
code/modules/hydroponics/growninedible.dm
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/item/grown/attackby(obj/item/O, mob/user, params)
..()
if (istype(O, /obj/item/plant_analyzer))
var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>\n"
var/msg = "<span class='info'>This is \a <span class='name'>[src]</span>\n"
if(seed)
msg += seed.get_analyzer_text()
msg += "</span>"
code/modules/hydroponics/sample.dm
+1 -1
View File
@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(chem_t4_reagents, list(
overlays += I
/obj/item/seeds/sample/get_analyzer_text()
return " The DNA of this sample is damaged beyond recovery, it can't support life on it's own.\n*---------*"
return " The DNA of this sample is damaged beyond recovery, it can't support life on it's own."
/obj/item/seeds/sample/alienweed
name = "alien weed sample"
code/modules/hydroponics/seeds.dm
+1 -3
View File
@@ -306,8 +306,6 @@
all_traits += " [traits.get_name()]"
text += "- Plant Traits:[all_traits]\n"
text += "*---------*"
return text
/obj/item/seeds/proc/on_chem_reaction(datum/reagents/S) // In case seeds have some special interaction with special chems
@@ -315,7 +313,7 @@
/obj/item/seeds/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/plant_analyzer))
to_chat(user, "<span class='info'>*---------*\n This is \a <span class='name'>[src].</span></span>")
to_chat(user, "<span class='info'>This is \a <span class='name'>[src].</span></span>")
var/text = get_analyzer_text()
if(text)
to_chat(user, "<span class='notice'>[text]</span>")