mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 11:34:19 +01:00
Merge pull request #4276 from tigercat2000/WHAT_THE_FUCK
Fix multiple instances of to_chat not being used
This commit is contained in:
@@ -387,7 +387,7 @@ so as to remain in compliance with the most up-to-date laws."
|
||||
return
|
||||
var/paramslist = params2list(params)
|
||||
if(paramslist["shift"]) // screen objects don't do the normal Click() stuff so we'll cheat
|
||||
usr << "<span class='boldnotice'>[name]</span> - <span class='info'>[desc]</span>"
|
||||
to_chat(usr, "<span class='boldnotice'>[name]</span> - <span class='info'>[desc]</span>")
|
||||
return
|
||||
if(master)
|
||||
return usr.client.Click(master, location, control, params)
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
|
||||
/obj/item/weapon/dnainjector/attack(mob/M as mob, mob/user as mob)
|
||||
if(used)
|
||||
user << "<span class='warning'>This injector is used up!</span>"
|
||||
to_chat(user, "<span class='warning'>This injector is used up!</span>")
|
||||
return
|
||||
if(!M.dna) //You know what would be nice? If the mob you're injecting has DNA, and so doesn't cause runtimes.
|
||||
return 0
|
||||
@@ -151,7 +151,7 @@
|
||||
"<span class='userdanger'>[user] injects [M] with the syringe with [src]!")
|
||||
|
||||
else
|
||||
user << "<span class='notice'>You inject yourself with [src].</span>"
|
||||
to_chat(user, "<span class='notice'>You inject yourself with [src].</span>")
|
||||
|
||||
inject(M, user)
|
||||
used = 1
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
if(!map)
|
||||
return
|
||||
if(copytext("[map]",-4) != ".dmm")
|
||||
usr << "Bad map file: [map]"
|
||||
to_chat(usr, "Bad map file: [map]")
|
||||
return
|
||||
|
||||
var/datum/map_template/M = new(map=map, rename="[map]")
|
||||
|
||||
@@ -293,7 +293,7 @@
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/attack(var/mob/living/carbon/M, var/mob/user, var/def_zone)
|
||||
if(awakening)
|
||||
user << "<span class='warning'>The [src] is twitching and shaking, preventing you from eating it.</span>"
|
||||
to_chat(user, "<span class='warning'>The [src] is twitching and shaking, preventing you from eating it.</span>")
|
||||
return
|
||||
if(user == M)
|
||||
return ..()
|
||||
@@ -451,7 +451,7 @@
|
||||
if("killertomato")
|
||||
if(awakening || istype(user.loc,/turf/space))
|
||||
return
|
||||
user << "<span class='notice'>You begin to awaken the Killer Tomato...</span>"
|
||||
to_chat(user, "<span class='notice'>You begin to awaken the Killer Tomato...</span>")
|
||||
awakening = 1
|
||||
|
||||
spawn(30)
|
||||
|
||||
@@ -761,7 +761,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
|
||||
buckled.user_unbuckle_mob(src,src)
|
||||
else
|
||||
if(src && buckled)
|
||||
src << "<span class='warning'>You fail to unbuckle yourself!</span>"
|
||||
to_chat(src, "<span class='warning'>You fail to unbuckle yourself!</span>")
|
||||
else
|
||||
buckled.user_unbuckle_mob(src,src)
|
||||
|
||||
|
||||
@@ -99,6 +99,6 @@
|
||||
if(!istype(pAI))
|
||||
return 0
|
||||
if(!pAI.software["messenger"])
|
||||
usr << "<span class='warning'>You have not purchased the digital messenger!</span>"
|
||||
to_chat(usr, "<span class='warning'>You have not purchased the digital messenger!</span>")
|
||||
return 0
|
||||
return ..() && !pAI.silence_time
|
||||
Reference in New Issue
Block a user