Skip to content

Commit

Permalink
I'm great at naming commits
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreML committed Dec 3, 2023
1 parent 31da57d commit c2e20f5
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion code/game/machinery/computer/dropship_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
power = MATRIX.power

else
to_chat(user, SPAN_WARNING("matrix is not complete!"))
to_chat(user, SPAN_WARNING("Matrix is not complete!"))

/obj/structure/machinery/computer/dropship_weapons/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
var/data[0]
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/props/helmetgarb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
to_chat(user, SPAN_WARNING("Nothing to fix."))
else if(shape == NVG_SHAPE_COSMETIC)

to_chat(user, SPAN_WARNING("it's nothing but a husk of what it used to be."))
to_chat(user, SPAN_WARNING("It's nothing but a husk of what it used to be."))

else
to_chat(user, "You begin to repair \the [src].")
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/reagent_containers/food/condiment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
to_chat(user, SPAN_DANGER("[src] is empty."))
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
to_chat(user, SPAN_DANGER("you can't add anymore to [target]."))
to_chat(user, SPAN_DANGER("You can't add any more to [target]."))
return
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, SPAN_NOTICE(" You transfer [trans] units of the condiment to [target]."))
Expand Down Expand Up @@ -202,7 +202,7 @@
/obj/item/reagent_container/food/condiment/hotsauce/franks
name = "\improper Frank's Red Hot bottle"
desc = "A bottle of Weyland-Yutani brand Frank's Red Hot hot sauce."
desc_lore = "Supposedly designed as a middle-ground flavor between ketchup and cayenne, this brand of spicy goodness achieved critical acclaim throughout UA space within both colonies and vessels alike. The sudden and widespread adoption was curiously timed with the near-simultaneous shelving of the original Frank's 'ULTRA' hot sauce."
desc_lore = "Supposedly designed as a middle-ground flavor between ketchup and cayenne, this brand of spicy goodness achieved critical acclaim throughout UA space within both colonies and vessels alike. The sudden and widespread adoption was curiously timed with the near-simultaneous shelving of the original Frank's 'ULTRA' hot sauce."
icon_state = "hotsauce_franks"
item_state = "hotsauce_franks"

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/tools/shovel_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@

/obj/item/tool/shovel/proc/dump_shovel(atom/target, mob/user)
var/turf/T = target
to_chat(user, SPAN_NOTICE("you dump the [dirt_type_to_name(dirt_type)]!"))
to_chat(user, SPAN_NOTICE("You dump the [dirt_type_to_name(dirt_type)]!"))
playsound(user.loc, "rustle", 30, 1, 6)
if(dirt_type == DIRT_TYPE_SNOW)
var/obj/item/stack/snow/S = locate() in T
Expand Down
8 changes: 4 additions & 4 deletions code/modules/admin/topic/topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@

var/mob/M = locate(href_list["forcespeech"])
if(!ismob(M))
to_chat(usr, "this can only be used on instances of type /mob")
to_chat(usr, "This can only be used on instances of type /mob")
return

var/speech = input("What will [key_name(M)] say?.", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins.
Expand All @@ -603,7 +603,7 @@
if(!check_rights(R_ADMIN)) return
var/mob/living/carbon/human/H = locate(href_list["zombieinfect"])
if(!istype(H))
to_chat(usr, "this can only be used on instances of type /human")
to_chat(usr, "This can only be used on instances of type /human")
return

if(alert(usr, "Are you sure you want to infect them with a ZOMBIE VIRUS? This can trigger a major event!", "Message", "Yes", "No") != "Yes")
Expand All @@ -622,7 +622,7 @@
if(!check_rights(R_ADMIN)) return
var/mob/living/carbon/human/H = locate(href_list["larvainfect"])
if(!istype(H))
to_chat(usr, "this can only be used on instances of type /human")
to_chat(usr, "This can only be used on instances of type /human")
return

if(alert(usr, "Are you sure you want to infect them with a xeno larva?", "Message", "Yes", "No") != "Yes")
Expand Down Expand Up @@ -704,7 +704,7 @@

var/mob/M = locate(href_list["forceemote"])
if(!ismob(M))
to_chat(usr, "this can only be used on instances of type /mob")
to_chat(usr, "This can only be used on instances of type /mob")

var/speech = input("What will [key_name(M)] emote?.", "Force emote", "")// Don't need to sanitize, since it does that in say(), we also trust our admins.
if(!speech) return
Expand Down
7 changes: 3 additions & 4 deletions code/modules/cm_marines/orbital_cannon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ GLOBAL_LIST(ob_type_fuel_requirements)

if(!tray.warhead)
if(user)
to_chat(user, "no warhead in the tray, loading operation cancelled.")
to_chat(user, SPAN_WARNING("No warhead in the tray, loading operation cancelled."))
return

if(tray.fuel_amt < 1)
to_chat(user, "no solid fuel in the tray, loading operation cancelled.")
to_chat(user, SPAN_WARNING("No solid fuel in the tray, loading operation cancelled."))
return

if(loaded_tray)
to_chat(user, "Tray is already loaded.")
to_chat(user, SPAN_WARNING("Tray is already loaded."))
return

tray.forceMove(src)
Expand Down Expand Up @@ -685,4 +685,3 @@ GLOBAL_LIST_EMPTY(orbital_cannon_cancellation)
return TRUE

tgui_interact(user)

2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@
target.xenos_tracking |= src
tracked_marker = target
to_chat(src, SPAN_XENONOTICE("You start tracking the [target.mark_meaning.name] resin mark."))
to_chat(src, SPAN_INFO("shift click the compass to watch the mark, alt click to stop tracking"))
to_chat(src, SPAN_INFO("Shift click the compass to watch the mark, alt click to stop tracking"))

/mob/living/carbon/xenomorph/proc/stop_tracking_resin_mark(destroyed, silent = FALSE) //tracked_marker shouldnt be nulled outside this PROC!! >:C
if(QDELETED(src))
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/mob_transformation_simple.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//Note that this proc does NOT do MMI related stuff!
/mob/proc/change_mob_type(new_type = null, turf/location = null, new_name = null as text, delete_old_mob = 0 as num, subspecies)
if(istype(src,/mob/new_player))
to_chat(usr, SPAN_DANGER("cannot convert players who have not entered yet."))
to_chat(usr, SPAN_DANGER("Cannot convert players who have not entered yet."))
return

if(!new_type)
Expand All @@ -18,7 +18,7 @@
return

if( new_type == /mob/new_player )
to_chat(usr, SPAN_DANGER("cannot convert into a new_player mob type."))
to_chat(usr, SPAN_DANGER("Cannot convert into a new_player mob type."))
return

var/mob/M
Expand Down

0 comments on commit c2e20f5

Please sign in to comment.