Skip to content

Commit

Permalink
Couple of extra bits
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreML committed Dec 6, 2023
1 parent 2f612e8 commit 6f2753f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
5 changes: 2 additions & 3 deletions code/modules/hydroponics/hydro_tray.dm
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
if(!user || !dead) return

if(closed_system)
to_chat(user, "You can't remove the dead plant while the lid is shut.")
to_chat(user, SPAN_WARNING("You can't remove the dead plant while the lid is shut."))
return

seed = null
Expand All @@ -369,10 +369,9 @@
yield_mod = 0
mutation_mod = 0

to_chat(user, "You remove the dead plant from [src].")
to_chat(user, SPAN_NOTICE("You remove the dead plant from [src]."))
check_level_sanity()
update_icon()
return

//Refreshes the icon and sets the luminosity
/obj/structure/machinery/portable_atmospherics/hydroponics/update_icon()
Expand Down
18 changes: 9 additions & 9 deletions code/modules/projectiles/ammo_boxes/box_structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
if(istype(W, /obj/item/storage/box/m94))
var/obj/item/storage/box/m94/flare_pack = W
if(flare_pack.contents.len < flare_pack.max_storage_space)
to_chat(user, SPAN_WARNING("\The [W] is not full."))
to_chat(user, SPAN_WARNING("[W] is not full."))
return
var/flare_type
if(istype(W, /obj/item/storage/box/m94/signal))
Expand All @@ -143,28 +143,28 @@
flare_type = /obj/item/device/flashlight/flare
for(var/obj/item/device/flashlight/flare/F in flare_pack.contents)
if(F.fuel < 1)
to_chat(user, SPAN_WARNING("Some flares in \the [F] are used."))
to_chat(user, SPAN_WARNING("Some flares in [F] are used."))
return
if(F.type != flare_type)
to_chat(user, SPAN_WARNING("Some flares in \the [W] are not of the correct type."))
to_chat(user, SPAN_WARNING("Some flares in [W] are not of the correct type."))
return
else if(istype(W, /obj/item/storage/box/MRE))
var/obj/item/storage/box/MRE/mre_pack = W
if(mre_pack.isopened)
to_chat(user, SPAN_WARNING("\The [W] was already opened and isn't suitable for storing in \the [src]."))
to_chat(user, SPAN_WARNING("[W] was already opened and isn't suitable for storing in [src]."))
return
else if(istype(W, /obj/item/cell/high))
var/obj/item/cell/high/cell = W
if(cell.charge != cell.maxcharge)
to_chat(user, SPAN_WARNING("\The [W] needs to be fully charged before it can be stored in \the [src]."))
to_chat(user, SPAN_WARNING("[W] needs to be fully charged before it can be stored in [src]."))
return
if(item_box.contents.len < item_box.num_of_magazines)
user.drop_inv_item_to_loc(W, src)
item_box.contents += W
to_chat(user, SPAN_NOTICE("You put \a [W] into [src]"))
update_icon()
else
to_chat(user, SPAN_WARNING("\The [src] is full."))
to_chat(user, SPAN_WARNING("[src] is full."))
else
to_chat(user, SPAN_WARNING("You don't want to mix different magazines in one box."))
else
Expand All @@ -175,10 +175,10 @@
return
if(O.default_ammo == AM.default_ammo)
if(O.current_rounds <= 0)
to_chat(user, SPAN_WARNING("\The [O] is empty."))
to_chat(user, SPAN_WARNING("[O] is empty."))
return
if(AM.current_rounds >= AM.max_rounds)
to_chat(user, SPAN_WARNING("\The [src] is full."))
to_chat(user, SPAN_WARNING("[src] is full."))
return
else
if(!do_after(user, 15, INTERRUPT_ALL, BUSY_ICON_FRIENDLY))
Expand All @@ -187,7 +187,7 @@
var/S = min(O.current_rounds, AM.max_rounds - AM.current_rounds)
AM.current_rounds += S
O.current_rounds -= S
to_chat(user, SPAN_NOTICE("You transfer shells from [O] into \the [src]"))
to_chat(user, SPAN_NOTICE("You transfer shells from [O] into [src]"))
update_icon()
O.update_icon()
else
Expand Down

0 comments on commit 6f2753f

Please sign in to comment.