cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47052 from kingofkosmos/misc_span_fixes1

Browse Source 
Misc span fixes
This commit is contained in:
81Denton
2019-10-20 18:46:54 +02:00
committed by GitHub
parent c292e945d0 56b8461580
commit f5bd6a381d
249 changed files with 654 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/kinetic_crusher.dm
+1 -1
View File
@@ -63,7 +63,7 @@
/obj/item/twohanded/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user)
if(!wielded)
to_chat(user, "<span class='warning'>[src] is too heavy to use with one hand. You fumble and drop everything.")
to_chat(user, "<span class='warning'>[src] is too heavy to use with one hand! You fumble and drop everything.</span>")
user.drop_all_held_items()
return
var/datum/status_effect/crusher_damage/C = target.has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
code/modules/mining/equipment/mining_tools.dm
+2 -2
View File
@@ -18,7 +18,7 @@
attack_verb = list("hit", "pierced", "sliced", "attacked")
/obj/item/pickaxe/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.visible_message("<span class='suicide'>[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!</span>")
if(use_tool(user, user, 30, volume=50))
return BRUTELOSS
user.visible_message("<span class='suicide'>[user] couldn't do it!</span>")
@@ -115,7 +115,7 @@
AddComponent(/datum/component/butchering, 150, 40) //it's sharp, so it works, but barely.
/obj/item/shovel/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] begins digging their own grave! It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.visible_message("<span class='suicide'>[user] begins digging their own grave! It looks like [user.p_theyre()] trying to commit suicide!</span>")
if(use_tool(user, user, 30, volume=50))
return BRUTELOSS
user.visible_message("<span class='suicide'>[user] couldn't do it!</span>")
code/modules/mining/equipment/wormhole_jaunter.dm
+2 -2
View File
@@ -71,11 +71,11 @@
/obj/item/wormhole_jaunter/proc/chasm_react(mob/user)
if(user.get_item_by_slot(SLOT_BELT) == src)
to_chat(user, "Your [name] activates, saving you from the chasm!</span>")
to_chat(user, "<span class='notice'>Your [name] activates, saving you from the chasm!</span>")
SSblackbox.record_feedback("tally", "jaunter", 1, "Chasm") // chasm automatic activation
activate(user, FALSE)
else
to_chat(user, "[src] is not attached to your belt, preventing it from saving you from the chasm. RIP.</span>")
to_chat(user, "<span class='userdanger'>[src] is not attached to your belt, preventing it from saving you from the chasm. RIP.</span>")
//jaunter tunnel
/obj/effect/portal/jaunt_tunnel
code/modules/mining/fulton.dm
+2 -2
View File
@@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
possible_beacons += EP
if(!possible_beacons.len)
to_chat(user, "There are no extraction beacons in existence!")
to_chat(user, "<span class='warning'>There are no extraction beacons in existence!</span>")
return
else
@@ -36,7 +36,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
if(!A)
return
beacon = A
to_chat(user, "You link the extraction pack to the beacon system.")
to_chat(user, "<span class='notice'>You link the extraction pack to the beacon system.</span>")
/obj/item/extraction_pack/afterattack(atom/movable/A, mob/living/carbon/human/user, flag, params)
. = ..()
code/modules/mining/laborcamp/laborstacker.dm
+6 -6
View File
@@ -10,7 +10,7 @@ GLOBAL_LIST(labor_sheet_values)
density = FALSE
ui_x = 450
ui_y = 475
var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
var/machinedir = SOUTH
var/obj/machinery/door/airlock/release_door
@@ -82,18 +82,18 @@ GLOBAL_LIST(labor_sheet_values)
stacking_machine.points = 0
to_chat(usr, "<span class='notice'>Points transferred.</span>")
else
to_chat(usr, "<span class='notice'>No valid id for point transfer detected.</span>")
to_chat(usr, "<span class='alert'>No valid id for point transfer detected.</span>")
if("move_shuttle")
if(!alone_in_area(get_area(src), usr))
to_chat(usr, "<span class='warning'>Prisoners are only allowed to be released while alone.</span>")
to_chat(usr, "<span class='alert'>Prisoners are only allowed to be released while alone.</span>")
else
switch(SSshuttle.moveShuttle("laborcamp", "laborcamp_home", TRUE))
if(1)
to_chat(usr, "<span class='notice'>Shuttle not found.</span>")
to_chat(usr, "<span class='alert'>Shuttle not found.</span>")
if(2)
to_chat(usr, "<span class='notice'>Shuttle already at station.</span>")
to_chat(usr, "<span class='alert'>Shuttle already at station.</span>")
if(3)
to_chat(usr, "<span class='notice'>No permission to dock could be granted.</span>")
to_chat(usr, "<span class='alert'>No permission to dock could be granted.</span>")
else
if(!(obj_flags & EMAGGED))
Radio.set_frequency(FREQ_SECURITY)
code/modules/mining/lavaland/necropolis_chests.dm
+4 -4
View File
@@ -341,7 +341,7 @@
/obj/item/warp_cube/attack_self(mob/user)
if(!linked)
to_chat(user, "[src] fizzles uselessly.")
to_chat(user, "<span class='warning'>[src] fizzles uselessly.</span>")
return
if(teleporting)
return
@@ -583,7 +583,7 @@
/obj/item/book_of_babel/attack_self(mob/user)
if(!user.can_read(src))
return FALSE
to_chat(user, "You flip through the pages of the book, quickly and conveniently learning every language in existence. Somewhat less conveniently, the aging book crumbles to dust in the process. Whoops.")
to_chat(user, "<span class='notice'>You flip through the pages of the book, quickly and conveniently learning every language in existence. Somewhat less conveniently, the aging book crumbles to dust in the process. Whoops.</span>")
user.grant_all_languages(omnitongue=TRUE)
new /obj/effect/decal/cleanable/ash(get_turf(user))
qdel(src)
@@ -1051,11 +1051,11 @@
used = FALSE
return
if(!(isliving(choice)))
to_chat(user, "[choice] is already dead!")
to_chat(user, "<span class='warning'>[choice] is already dead!</span>")
used = FALSE
return
if(choice == user)
to_chat(user, "You feel like writing your own name into a cursed death warrant would be unwise.")
to_chat(user, "<span class='warning'>You feel like writing your own name into a cursed death warrant would be unwise.</span>")
used = FALSE
return
code/modules/mining/machine_redemption.dm
+1 -1
View File
@@ -189,7 +189,7 @@
var/obj/item/stack/ore/O = W
if(istype(O))
if(O.refined_type == null)
to_chat(user, "<span class='notice'>[O] has already been refined!</span>")
to_chat(user, "<span class='warning'>[O] has already been refined!</span>")
return
return ..()
code/modules/mining/machine_vending.dm
+7 -7
View File
@@ -99,11 +99,11 @@
if(istype(I))
var/datum/data/mining_equipment/prize = locate(href_list["purchase"]) in prize_list
if (!prize || !(prize in prize_list))
to_chat(usr, "<span class='warning'>Error: Invalid choice!</span>")
to_chat(usr, "<span class='alert'>Error: Invalid choice!</span>")
flick(icon_deny, src)
return
if(prize.cost > I.mining_points)
to_chat(usr, "<span class='warning'>Error: Insufficient points for [prize.equipment_name] on [I]!</span>")
to_chat(usr, "<span class='alert'>Error: Insufficient points for [prize.equipment_name] on [I]!</span>")
flick(icon_deny, src)
else
if (I.mining_points -= prize.cost)
@@ -111,10 +111,10 @@
new prize.equipment_path(src.loc)
SSblackbox.record_feedback("nested tally", "mining_equipment_bought", 1, list("[type]", "[prize.equipment_path]"))
else
to_chat(usr, "<span class='warning'>Error: Transaction failure, please try again later!</span>")
to_chat(usr, "<span class='alert'>Error: Transaction failure, please try again later!</span>")
flick(icon_deny, src)
else
to_chat(usr, "<span class='warning'>Error: An ID is required!</span>")
to_chat(usr, "<span class='alert'>Error: An ID is required!</span>")
flick(icon_deny, src)
updateUsrDialog()
return
@@ -213,12 +213,12 @@
to_chat(user, "<span class='info'>You transfer [points] points to [C].</span>")
points = 0
else
to_chat(user, "<span class='info'>There's no points left on [src].</span>")
to_chat(user, "<span class='alert'>There's no points left on [src].</span>")
..()
/obj/item/card/mining_point_card/examine(mob/user)
..()
to_chat(user, "There's [points] point\s on the card.")
to_chat(user, "<span class='alert'>There's [points] point\s on the card.</span>")
///Conscript kit
/obj/item/card/mining_access_card
@@ -235,7 +235,7 @@
I.access |= ACCESS_MECH_MINING
I.access |= ACCESS_MINERAL_STOREROOM
I.access |= ACCESS_CARGO
to_chat(user, "You upgrade [I] with mining access.")
to_chat(user, "<span class='notice'>You upgrade [I] with mining access.</span>")
qdel(src)
/obj/item/storage/backpack/duffelbag/mining_conscript