cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +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/game/objects/structures/ai_core.dm
+4 -4
View File
@@ -75,7 +75,7 @@
/obj/structure/AIcore/latejoin_inactive/attackby(obj/item/P, mob/user, params)
if(P.tool_behaviour == TOOL_MULTITOOL)
active = !active
to_chat(user, "You [active? "activate" : "deactivate"] \the [src]'s transmitters.")
to_chat(user, "<span class='notice'>You [active? "activate" : "deactivate"] \the [src]'s transmitters.</span>")
return
return ..()
@@ -316,7 +316,7 @@ That prevents a few funky behaviors.
/atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
if(istype(card))
if(card.flush)
to_chat(user, "<span class='boldannounce'>ERROR</span>: AI flush is in progress, cannot execute transfer protocol.")
to_chat(user, "<span class='alert'>ERROR: AI flush is in progress, cannot execute transfer protocol.</span>")
return FALSE
return TRUE
@@ -328,13 +328,13 @@ That prevents a few funky behaviors.
AI.control_disabled = FALSE
AI.radio_enabled = TRUE
AI.forceMove(loc) // to replace the terminal.
to_chat(AI, "You have been uploaded to a stationary terminal. Remote device connection restored.")
to_chat(AI, "<span class='notice'>You have been uploaded to a stationary terminal. Remote device connection restored.</span>")
to_chat(user, "<span class='boldnotice'>Transfer successful</span>: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.")
card.AI = null
AI.battery = circuit.battery
qdel(src)
else //If for some reason you use an empty card on an empty AI terminal.
to_chat(user, "There is no AI loaded on this terminal!")
to_chat(user, "<span class='alert'>There is no AI loaded on this terminal.</span>")
/obj/item/circuitboard/aicore
name = "AI core (AI Core Board)" //Well, duh, but best to be consistent
code/game/objects/structures/beds_chairs/chair.dm
+3 -3
View File
@@ -288,14 +288,14 @@
/obj/item/chair/proc/plant(mob/user)
var/turf/T = get_turf(loc)
if(!isfloorturf(T))
to_chat(user, "<span class='danger'>You need ground to plant this on!</span>")
to_chat(user, "<span class='warning'>You need ground to plant this on!</span>")
return
for(var/obj/A in T)
if(istype(A, /obj/structure/chair))
to_chat(user, "<span class='danger'>There is already a chair here.</span>")
to_chat(user, "<span class='warning'>There is already a chair here!</span>")
return
if(A.density && !(A.flags_1 & ON_BORDER_1))
to_chat(user, "<span class='danger'>There is already something here.</span>")
to_chat(user, "<span class='warning'>There is already something here!</span>")
return
user.visible_message("<span class='notice'>[user] rights \the [src.name].</span>", "<span class='notice'>You right \the [name].</span>")
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -434,7 +434,7 @@
"<span class='notice'>You [locked ? null : "un"]lock [src].</span>")
update_icon()
else if(!silent)
to_chat(user, "<span class='notice'>Access Denied</span>")
to_chat(user, "<span class='alert'>Access Denied.</span>")
else if(secure && broken)
to_chat(user, "<span class='warning'>\The [src] is broken!</span>")
code/game/objects/structures/displaycase.dm
+7 -7
View File
@@ -104,13 +104,13 @@
to_chat(user, "<span class='notice'>You [open ? "close":"open"] [src].</span>")
toggle_lock(user)
else
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, "<span class='alert'>Access denied.</span>")
else if(W.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP && !broken)
if(obj_integrity < max_integrity)
if(!W.tool_start_check(user, amount=5))
return
to_chat(user, "<span class='notice'>You begin repairing [src].</span>")
to_chat(user, "<span class='notice'>You begin repairing [src]...</span>")
if(W.use_tool(src, user, 40, amount=5, volume=50))
obj_integrity = max_integrity
update_icon()
@@ -121,19 +121,19 @@
else if(!alert && W.tool_behaviour == TOOL_CROWBAR && openable) //Only applies to the lab cage and player made display cases
if(broken)
if(showpiece)
to_chat(user, "<span class='notice'>Remove the displayed object first.</span>")
to_chat(user, "<span class='warning'>Remove the displayed object first!</span>")
else
to_chat(user, "<span class='notice'>You remove the destroyed case</span>")
to_chat(user, "<span class='notice'>You remove the destroyed case.</span>")
qdel(src)
else
to_chat(user, "<span class='notice'>You start to [open ? "close":"open"] [src].</span>")
to_chat(user, "<span class='notice'>You start to [open ? "close":"open"] [src]...</span>")
if(W.use_tool(src, user, 20))
to_chat(user, "<span class='notice'>You [open ? "close":"open"] [src].</span>")
toggle_lock(user)
else if(open && !showpiece)
if(user.transferItemToLoc(W, src))
showpiece = W
to_chat(user, "<span class='notice'>You put [W] on display</span>")
to_chat(user, "<span class='notice'>You put [W] on display.</span>")
update_icon()
else if(istype(W, /obj/item/stack/sheet/glass) && broken)
var/obj/item/stack/sheet/glass/G = W
@@ -268,7 +268,7 @@
if(user.is_holding_item_of_type(/obj/item/key/displaycase))
if(added_roundstart)
is_locked = !is_locked
to_chat(user, "You [!is_locked ? "un" : ""]lock the case.")
to_chat(user, "<span class='notice'>You [!is_locked ? "un" : ""]lock the case.</span>")
else
to_chat(user, "<span class='warning'>The lock is stuck shut!</span>")
return
code/game/objects/structures/fence.dm
+2 -2
View File
@@ -63,11 +63,11 @@
to_chat(user, "<span class='warning'>This section of the fence can't be cut!</span>")
return
if(invulnerable)
to_chat(user, "<span class='notice'>This fence is too strong to cut through.</span>")
to_chat(user, "<span class='warning'>This fence is too strong to cut through!</span>")
return
var/current_stage = hole_size
if(current_stage >= MAX_HOLE_SIZE)
to_chat(user, "<span class='notice'>This fence has too much cut out of it already.</span>")
to_chat(user, "<span class='warning'>This fence has too much cut out of it already!</span>")
return
user.visible_message("<span class='danger'>\The [user] starts cutting through \the [src] with \the [W].</span>",\
code/game/objects/structures/ghost_role_spawners.dm
+2 -2
View File
@@ -358,7 +358,7 @@
/obj/effect/mob_spawn/human/demonic_friend/Initialize(mapload, datum/mind/owner_mind, obj/effect/proc_holder/spell/targeted/summon_friend/summoning_spell)
. = ..()
owner = owner_mind
flavour_text = "<span class='big bold'>You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil.</span><b> Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell.</b>"
flavour_text = "<span class='big bold'>You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil.</span><b> Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell.</b>"
var/area/A = get_area(src)
if(!mapload && A)
notify_ghosts("\A friendship shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
@@ -379,7 +379,7 @@
id.registered_name = L.real_name
id.update_label()
else
to_chat(L, "<span class='userdanger'>Your owner is already dead! You will soon perish.</span>")
to_chat(L, "<span class='userdanger'>Your owner is already dead! You will soon perish.</span>")
addtimer(CALLBACK(L, /mob.proc/dust, 150)) //Give em a few seconds as a mercy.
/datum/outfit/demonic_friend
code/game/objects/structures/guillotine.dm
+2 -2
View File
@@ -35,7 +35,7 @@
/obj/structure/guillotine/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/stack/sheet/plasteel))
to_chat(user, "<span class='notice'>You start repairing the guillotine with the plasteel.</span>")
to_chat(user, "<span class='notice'>You start repairing the guillotine with the plasteel...</span>")
if(blade_sharpness<10)
if(do_after(user,100,target=user))
blade_sharpness = min(10,blade_sharpness+3)
@@ -44,7 +44,7 @@
else
to_chat(user, "<span class='notice'>You stop repairing the guillotine with the plasteel.</span>")
else
to_chat(user, "<span class='notice'>The guillotine is already fully repaired!</span>")
to_chat(user, "<span class='warning'>The guillotine is already fully repaired!</span>")
/obj/structure/guillotine/examine(mob/user)
. = ..()
code/game/objects/structures/lavaland/geyser.dm
+3 -3
View File
@@ -35,10 +35,10 @@
to_chat(user, "<span class='warning'>The [P.name] isn't strong enough!</span>")
return
if(activated)
to_chat(user, "<span class'warning'>The [name] is already active!")
to_chat(user, "<span class'warning'>The [name] is already active!</span>")
return
to_chat(user, "<span class='notice'>You start vigorously plunging [src]!")
to_chat(user, "<span class='notice'>You start vigorously plunging [src]!</span>")
if(do_after(user, 50*P.plunge_mod, target = src) && !activated)
start_chemming()
@@ -67,7 +67,7 @@
/obj/item/plunger/reinforced
name = "reinforced plunger"
desc = " It's an M. 7 Reinforced Plunger© for heavy duty plunging."
desc = "It's an M. 7 Reinforced Plunger© for heavy duty plunging."
icon_state = "reinforced_plunger"
reinforced = TRUE
code/game/objects/structures/mineral_doors.dm
+2 -2
View File
@@ -164,7 +164,7 @@
user.visible_message("<span class='notice'>[user] starts to weld apart [src]!</span>", "<span class='notice'>You start welding apart [src].</span>")
if(!I.use_tool(src, user, 60, 5, 50))
to_chat(user, "<span class='warning'>You failed to weld apart [src]!/span>")
to_chat(user, "<span class='warning'>You failed to weld apart [src]!</span>")
return
user.visible_message("<span class='notice'>[user] welded [src] into pieces!</span>", "<span class='notice'>You welded apart [src]!</span>")
@@ -178,7 +178,7 @@
user.visible_message("<span class='notice'>[user] starts to pry apart [src]!</span>", "<span class='notice'>You start prying apart [src].</span>")
if(!I.use_tool(src, user, 60, volume = 50))
to_chat(user, "<span class='warning'>You failed to pry apart [src]!/span>")
to_chat(user, "<span class='warning'>You failed to pry apart [src]!</span>")
return
user.visible_message("<span class='notice'>[user] pried [src] into pieces!</span>", "<span class='notice'>You pried apart [src]!</span>")
code/game/objects/structures/mop_bucket.dm
+1 -1
View File
@@ -14,7 +14,7 @@
/obj/structure/mopbucket/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/mop))
if(reagents.total_volume < 1)
to_chat(user, "[src] is out of water!</span>")
to_chat(user, "<span class='warning'>[src] is out of water!</span>")
else
reagents.trans_to(I, 5, transfered_by = user)
to_chat(user, "<span class='notice'>You wet [I] in [src].</span>")
code/game/objects/structures/noticeboard.dm
+3 -3
View File
@@ -26,7 +26,7 @@
/obj/structure/noticeboard/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/paper) || istype(O, /obj/item/photo))
if(!allowed(user))
to_chat(user, "<span class='info'>You are not authorized to add notices</span>")
to_chat(user, "<span class='warning'>You are not authorized to add notices!</span>")
return
if(notices < 5)
if(!user.transferItemToLoc(O, src))
@@ -35,7 +35,7 @@
icon_state = "nboard0[notices]"
to_chat(user, "<span class='notice'>You pin the [O] to the noticeboard.</span>")
else
to_chat(user, "<span class='notice'>The notice board is full</span>")
to_chat(user, "<span class='warning'>The notice board is full!</span>")
else
return ..()
@@ -77,7 +77,7 @@
add_fingerprint(usr)
P.attackby(I, usr)
else
to_chat(usr, "<span class='notice'>You'll need something to write with!</span>")
to_chat(usr, "<span class='warning'>You'll need something to write with!</span>")
if(href_list["read"])
var/obj/item/I = locate(href_list["read"]) in contents
code/game/objects/structures/petrified_statue.dm
+1 -1
View File
@@ -15,7 +15,7 @@
petrified_mob = L
if(L.buckled)
L.buckled.unbuckle_mob(L,force=1)
L.visible_message("<span class='warning'>[L]'s skin rapidly turns to marble!</span>", "<span class='userdanger'>Your body freezes up! Can't... move... can't... think...</span>")
L.visible_message("<span class='warning'>[L]'s skin rapidly turns to marble!</span>", "<span class='userdanger'>Your body freezes up! Can't... move... can't... think...</span>")
L.forceMove(src)
ADD_TRAIT(L, TRAIT_MUTE, STATUE_MUTE)
L.faction += "mimic" //Stops mimics from instaqdeling people in statues
code/game/objects/structures/votingbox.dm
+9 -9
View File
@@ -1,10 +1,10 @@
/obj/structure/votebox
name = "voting box"
desc = "A automatic voting box."
icon = 'icons/obj/votebox.dmi'
icon_state = "votebox_maint"
anchored = TRUE
var/obj/item/card/id/owner //Slapping the box with this ID starts/ends the vote.
@@ -24,7 +24,7 @@
if(voting_active)
apply_vote(I,user)
else
to_chat(user,"<span class='notice'>[src] is in maintenance mode. Voting is not possible at the moment.</span>")
to_chat(user,"<span class='warning'>[src] is in maintenance mode. Voting is not possible at the moment.</span>")
return
return ..()
@@ -58,7 +58,7 @@
var/mob/user = usr
if(!is_operator(user))
to_chat(user,"<span class='notice'>Voting box operator authorization required.</span>")
to_chat(user,"<span class='warning'>Voting box operator authorization required!</span>")
return
if(href_list["act"])
@@ -99,7 +99,7 @@
var/obj/item/card/id/voter_card = user.get_idcard()
if(id_auth)
if(!voter_card)
to_chat(user,"<span class='warning'>[src] requires a valid id card to vote!</span>")
to_chat(user,"<span class='warning'>[src] requires a valid ID card to vote!</span>")
return
if(voted && (voter_card in voted))
to_chat(user,"<span class='warning'>[src] allows only one vote per person.</span>")
@@ -123,7 +123,7 @@
/obj/structure/votebox/crowbar_act(mob/living/user, obj/item/I)
. = ..()
if(voting_active)
to_chat(user,"<span class='notice'>You can only retrieve votes if maintenance mode is active.</span>")
to_chat(user,"<span class='warning'>You can only retrieve votes if maintenance mode is active!</span>")
return FALSE
dump_contents()
to_chat(user,"<span class='notice'>You open vote retrieval hatch and dump all the votes.</span>")
@@ -143,7 +143,7 @@
for(var/obj/item/paper/P in contents)
options += P
if(!length(options))
to_chat(user,"<span class='notice>[src] is empty!</span>")
to_chat(user,"<span class='warning>[src] is empty!</span>")
else
var/obj/item/paper/P = pick(options)
user.put_in_hands(P)
@@ -187,8 +187,8 @@
P.name = "Voting Results"
P.update_icon()
user.put_in_hands(P)
to_chat(user,"<span class='notice'>[src] prints out the voting tally</span>")
to_chat(user,"<span class='notice'>[src] prints out the voting tally.</span>")
/obj/structure/votebox/update_icon()
. = ..()
icon_state = "votebox_[voting_active ? "active" : "maint"]"
icon_state = "votebox_[voting_active ? "active" : "maint"]"
code/game/objects/structures/watercloset.dm
+3 -3
View File
@@ -153,7 +153,7 @@
else if(exposed)
if(!hiddenitem)
to_chat(user, "<span class='notice'>There is nothing in the drain holder.</span>")
to_chat(user, "<span class='warning'>There is nothing in the drain holder!</span>")
else
if(ishuman(user))
user.put_in_hands(hiddenitem)
@@ -167,7 +167,7 @@
/obj/structure/urinal/attackby(obj/item/I, mob/living/user, params)
if(exposed)
if (hiddenitem)
to_chat(user, "<span class='warning'>There is already something in the drain enclosure.</span>")
to_chat(user, "<span class='warning'>There is already something in the drain enclosure!</span>")
return
if(I.w_class > 1)
to_chat(user, "<span class='warning'>[I] is too large for the drain enclosure.</span>")
@@ -236,7 +236,7 @@
return
if(busy)
to_chat(user, "<span class='notice'>Someone's already washing here.</span>")
to_chat(user, "<span class='warning'>Someone's already washing here!</span>")
return
var/selected_area = parse_zone(user.zone_selected)
var/washing_face = 0