Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/computer/camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@

/obj/machinery/computer/security/telescreen/entertainment
name = "entertainment monitor"
desc = "Damn, they better have the /tg/ channel on these things."
desc = "Damn, they better have the Yogs Channel on these things... Nope, just the /tg/ channel! Aww..."
icon = 'icons/obj/status_display.dmi'
icon_state = "entertainment_blank"
network = list("thunder")
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/dna_console.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
if(LAZYLEN(stored_chromosomes) < max_chromosomes)
I.forceMove(src)
stored_chromosomes += I
to_chat(user, "<span class='notice'>You insert [I]</span>")
to_chat(user, "<span class='notice'>You insert [I].</span>")
else
to_chat(user, "<span class='warnning'>You cannot store any more chromosomes.</span>")
return
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/slotmachine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@
var/obj/item/holochip/H = I
if(!user.temporarilyRemoveItemFromInventory(H))
return
to_chat(user, "<span class='notice'>You insert [H.credits] holocredits into [src]'s!</span>")
to_chat(user, "<span class='notice'>You insert [H.credits] holocredits into [src]'s holoreader!</span>")
balance += H.credits
qdel(H)
else
to_chat(user, "<span class='warning'>This machine is only accepting coins!</span>")
else if(I.tool_behaviour == TOOL_MULTITOOL)
if(balance > 0)
visible_message("<b>[src]</b> says, 'ERROR! Please empty the machine balance before altering paymode'") //Prevents converting coins into holocredits and vice versa
visible_message("<b>[src]</b> says, 'ERROR! Please empty the machine balance before altering paymode.'") //Prevents converting coins into holocredits and vice versa
else
if(paymode == HOLOCHIP)
paymode = COIN
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
return
storage = I

visible_message("<span class='notice'>[user] inserts [I] into [src]</span>", "<span class='notice'>You load [I] into [src].</span>")
visible_message("<span class='notice'>[user] inserts [I] into [src].</span>", "<span class='notice'>You load [I] into [src].</span>")
update_icon()
return

Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/devices/scanners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -654,21 +654,21 @@ GENE SCANNER
to_chat(user, "<span class='warning'>Warning: slime is starving!</span>")
else if (T.nutrition < T.get_hunger_nutrition())
to_chat(user, "<span class='warning'>Warning: slime is hungry</span>")
to_chat(user, "Electric change strength: [T.powerlevel]")
to_chat(user, "Electric charge strength: [T.powerlevel]")
to_chat(user, "Health: [round(T.health/T.maxHealth,0.01)*100]%")
if (T.slime_mutation[4] == T.colour)
to_chat(user, "This slime does not evolve any further.")
else
if (T.slime_mutation[3] == T.slime_mutation[4])
if (T.slime_mutation[2] == T.slime_mutation[1])
to_chat(user, "Possible mutation: [T.slime_mutation[3]]")
to_chat(user, "Genetic destability: [T.mutation_chance/2] % chance of mutation on splitting")
to_chat(user, "Genetic instability: [T.mutation_chance/2] % chance of mutation on splitting")
else
to_chat(user, "Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]] (x2)")
to_chat(user, "Genetic destability: [T.mutation_chance] % chance of mutation on splitting")
to_chat(user, "Genetic instability: [T.mutation_chance] % chance of mutation on splitting")
else
to_chat(user, "Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]], [T.slime_mutation[4]]")
to_chat(user, "Genetic destability: [T.mutation_chance] % chance of mutation on splitting")
to_chat(user, "Genetic instability: [T.mutation_chance] % chance of mutation on splitting")
if (T.cores > 1)
to_chat(user, "Multiple cores detected")
to_chat(user, "Growth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]")
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stunbaton.dm
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
return
else
M.visible_message("<span class='warning'>[user] has prodded [M] with [src]. Luckily it was off.</span>", \
"<span class='warning'>[user] has prodded you with [src]. Luckily it was off</span>")
"<span class='warning'>[user] has prodded you with [src]. Luckily it was off.</span>")
else
if(status)
baton_stun(M, user)
Expand Down
14 changes: 7 additions & 7 deletions code/game/objects/structures/signs/signs_departments.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@
icon_state = "minskymedicb"

/obj/structure/sign/departments/minsky/medical/clone/cloning1
name = "Cloning Division"
desc = "A sign labeling the cloning division of the station. Your last hope."
name = "Cloning Ward"
desc = "A sign labeling the cloning facilities on the station. Your last hope."
icon_state = "minskyclone"

/obj/structure/sign/departments/minsky/medical/clone/cloning2
name = "Cloning Division"
desc = "A sign labeling the cloning division of the station. Your last hope."
name = "Cloning Ward"
desc = "A sign labeling the cloning facilities on the station. Your last hope."
icon_state = "minskycloneb"

/obj/structure/sign/departments/minsky/medical/chemistry/chemical1
Expand All @@ -140,12 +140,12 @@

/obj/structure/sign/departments/minsky/medical/virology/virology1
name = "Virology Division"
desc = "A sign labeling the virology division of the station. Free hugs!!!."
desc = "A sign labeling the virology division of the station. Free hugs!!"
icon_state = "minskyviro"

/obj/structure/sign/departments/minsky/medical/virology/virology2
name = "Virology Division"
desc = "A sign labeling the virology division of the station. Free hugs!!!."
desc = "A sign labeling the virology division of the station. Free hugs!!"
icon_state = "minskyvirob"

/obj/structure/sign/departments/minsky/security/security
Expand All @@ -165,7 +165,7 @@

/obj/structure/sign/departments/minsky/supply/janitorial
name = "Janitorial Division"
desc = "A sign labeling the janitorial closet of the station. Clean up after yourself.... please."
desc = "A sign labeling the janitorial closet of the station. Clean up after yourself... please."
icon_state = "minskyjani"

/obj/structure/sign/departments/minsky/supply/hydroponics
Expand Down
2 changes: 1 addition & 1 deletion code/modules/assembly/mousetrap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
if(H.m_intent == MOVE_INTENT_RUN)
triggered(H)
H.visible_message("<span class='warning'>[H] accidentally steps on [src].</span>", \
"<span class='warning'>You accidentally step on [src]</span>")
"<span class='warning'>You accidentally step on [src].</span>")
else if(ismouse(MM))
triggered(MM)
else if(AM.density) // For mousetrap grenades, set off by anything heavy
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/silicon/pai/pai_shell.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
return FALSE
chassis = choice
update_resting()
to_chat(src, "<span class='boldnotice'>You switch your holochassis projection composite to [chassis]</span>")
to_chat(src, "<span class='boldnotice'>You switch your holochassis projection composite to [chassis].</span>")

/mob/living/silicon/pai/update_resting()
. = ..()
Expand All @@ -84,7 +84,7 @@
else
icon_state = "[chassis]"
if(loc != card)
visible_message("<span class='notice'>[src] [resting? "lays down for a moment..." : "perks up from the ground"]</span>")
visible_message("<span class='notice'>[src] [resting? "lays down for a moment..." : "perks up from the ground."]</span>")

/mob/living/silicon/pai/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE)
return FALSE
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mob/living/simple_animal/bot/construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@
qdel(I)
qdel(src)
if(I.tool_behaviour == TOOL_WRENCH)
to_chat(user, "You adjust [src]'s arm slots to mount extra weapons")
to_chat(user, "You adjust [src]'s arm slots to mount extra weapons.")
build_step ++
return
if(istype(I, /obj/item/toy/sword))
Expand All @@ -422,7 +422,7 @@
else
if(!can_finish_build(I, user))
return
to_chat(user, "<span class='notice'>You complete the Securitron!...Something seems a bit wrong with it..?</span>")
to_chat(user, "<span class='notice'>You complete the Securitron! Something seems a bit wrong with it...?</span>")
var/mob/living/simple_animal/bot/secbot/grievous/toy/S = new(Tsec)
S.name = created_name
S.robot_arm = robot_arm
Expand Down Expand Up @@ -456,7 +456,7 @@
else
if(!can_finish_build(I, user))
return
to_chat(user, "<span class='notice'>You complete the Securitron!...Something seems a bit wrong with it..?</span>")
to_chat(user, "<span class='notice'>You complete the Securitron! Something seems a bit wrong with it...?</span>")
var/mob/living/simple_animal/bot/secbot/grievous/S = new(Tsec)
S.name = created_name
S.robot_arm = robot_arm
Expand All @@ -466,7 +466,7 @@
build_step--
swordamt = 0
icon_state = initial(icon_state)
to_chat(user, "<span class='notice'>You unbolt [src]'s energy swords</span>")
to_chat(user, "<span class='notice'>You unbolt [src]'s energy swords from the chassis.</span>")
for(var/IS in 1 to swordamt)
new /obj/item/melee/transforming/energy/sword/saber(Tsec)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/friendly/lizard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

/mob/living/simple_animal/hostile/lizard/AttackingTarget()
if(is_type_in_typecache(target,edibles)) //Makes sure player lizards only consume edibles.
visible_message("[name] consumes [target] in a single gulp", "<span class='notice'>You consume [target] in a single gulp</span>")
visible_message("[name] consumes [target] in a single gulp.", "<span class='notice'>You consume [target] in a single gulp!</span>")
QDEL_NULL(target) //Nom
adjustBruteLoss(-2)
return TRUE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
taste_description = "death, the destroyer of worlds"
glass_icon_state = "proj_manhattanglass"
glass_name = "Manhattan Project"
glass_desc = "A scientist's drink of choice, for thinking how to blow up the station."
glass_desc = "A scientist's drink of choice, for pondering ways to blow up the station."


/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/M)
Expand Down
2 changes: 1 addition & 1 deletion yogstation/code/game/objects/items/devices/scanners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ TRICORDER
icon = 'yogstation/icons/obj/device.dmi'
icon_state = "tricorder"
item_state = "analyzer"
desc = "A multifunction hand-held device useful for data sensing, analysis, and recording"
desc = "A multifunction handheld device useful for data sensing, analysis, and recording."
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
flags_1 = CONDUCT_1
Expand Down
3 changes: 1 addition & 2 deletions yogstation/code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@

/obj/item/storage/backpack/snail/green
name = "green shell backpack"
desc = "An emerald-green snail shell converted into a backpack. Still smells of salt"
desc = "An emerald-green snail shell converted into a backpack. Still smells of salt."
item_state = "snail_green"
icon_state = "snail_green"

Expand All @@ -210,4 +210,3 @@
alternate_worn_icon = 'yogstation/icons/mob/back.dmi'
icon_state = "clownfacebackpack"
item_state = "clownfacebackpack"

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ GLOBAL_LIST_EMPTY(bluespace_pipe_networks)

/obj/machinery/atmospherics/pipe/bluespace/examine(user)
. = ..()
. += "<span class='notice'>This one is connected to the \"[html_encode(bluespace_network_name)]\" network</span>"
. += "<span class='notice'>This one is connected to the \"[html_encode(bluespace_network_name)]\" network.</span>"

/obj/machinery/atmospherics/pipe/bluespace/SetInitDirections()
initialize_directions = dir
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/design/nanite_heart
name = "Nanite Heart"
desc = "A heart that improves the functions of nanites"
desc = "A heart made of nanites that improves their function in the body."
id = "nanite_heart"
build_type = PROTOLATHE | MECHFAB
construction_time = 80
Expand Down
2 changes: 1 addition & 1 deletion yogstation/code/modules/research/designs/tool_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/datum/design/tricorder
name = "Tricorder"
desc = "A multifunction hand-held device useful for data sensing, analysis, and recording"
desc = "A multifunction handheld device useful for data sensing, analysis, and recording."
id = "tricorder"
build_type = PROTOLATHE
materials = list(MAT_METAL=500,MAT_SILVER=300,MAT_GOLD=300)
Expand Down