cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] next set of spans (#9247)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-17 16:33:07 -07:00
committed by GitHub
parent bc6662ef9e
commit 7416cbea22
599 changed files with 2619 additions and 2564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/gun.dm
View File

@@ -190,7 +190,7 @@
if(!attached_lock.exploding)
if(attached_lock.safety_level == 1)
to_chat(M, span_danger("\The [src] hisses in dissapointment."))
visible_message(span_game(span_say("<span class='name'>\The [src]</span> announces, \"Self-destruct occurring in ten seconds.\"")), span_game(span_say("<span class='name'>\The [src]</span> announces, \"Self-destruct occurring in ten seconds.\"")))
visible_message(span_game(span_say(span_name("\The [src]") + " announces, \"Self-destruct occurring in ten seconds.\"")), span_game(span_say(span_name("\The [src]") + " announces, \"Self-destruct occurring in ten seconds.\"")))
attached_lock.exploding = 1
spawn(100)
explosion(src, 0, 0, 3, 4)
@@ -730,10 +730,10 @@
return
var/obj/item/projectile/in_chamber = consume_next_projectile()
if (istype(in_chamber))
user.visible_message("<span class = 'warning'>[user] pulls the trigger.</span>")
user.visible_message(span_warning("[user] pulls the trigger."))
play_fire_sound(M, in_chamber)
if(istype(in_chamber, /obj/item/projectile/beam/lasertag))
user.show_message("<span class = 'warning'>You feel rather silly, trying to commit suicide with a toy.</span>")
user.show_message(span_warning("You feel rather silly, trying to commit suicide with a toy."))
mouthshoot = 0
return
@@ -743,7 +743,7 @@
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp = TRUE)
user.death()
else if(in_chamber.damage_type == HALLOSS)
to_chat(user, "<span class = 'notice'>Ow...</span>")
to_chat(user, span_notice("Ow..."))
user.apply_effect(110,AGONY,0)
qdel(in_chamber)
mouthshoot = 0

14
code/modules/projectiles/guns/energy/bsharpoon_vr.dm
View File

@@ -68,23 +68,23 @@
if(!user || !A || isstorage(A))
return
if(!scanmod)
to_chat(user,"<span class = 'warning'>The scanning module has been removed from [src]!</span>")
to_chat(user,span_warning("The scanning module has been removed from [src]!"))
return
if(transforming)
to_chat(user,"<span class = 'warning'>You can't fire while \the [src] transforming!</span>")
to_chat(user,span_warning("You can't fire while \the [src] transforming!"))
return
if(!firable)
to_chat(user,"<span class = 'warning'>\The [src] is recharging...</span>")
to_chat(user,span_warning("\The [src] is recharging..."))
return
if(is_jammed(A) || is_jammed(user))
firable = FALSE
VARSET_IN(src, firable, TRUE, 30 SECONDS)
to_chat(user,"<span class = 'warning'>\The [src] shot fizzles due to interference!</span>")
to_chat(user,span_warning("\The [src] shot fizzles due to interference!"))
playsound(src, 'sound/weapons/wave.ogg', 60, 1)
return
var/turf/T = get_turf(A)
if(!T || (T.check_density(ignore_mobs = TRUE) && mode == 1))
to_chat(user,"<span class = 'warning'>That's a little too solid to harpoon into!</span>")
to_chat(user,span_warning("That's a little too solid to harpoon into!"))
return
var/turf/ownturf = get_turf(src)
if(ownturf.z != T.z || get_dist(T,ownturf) > world.view)
@@ -211,7 +211,7 @@
if(transforming) return
mode = !mode
transforming = 1
to_chat(user,"<span class = 'info'>You change \the [src]'s mode to [mode ? "transmiting" : "receiving"].</span>")
to_chat(user,span_info("You change \the [src]'s mode to [mode ? "transmiting" : "receiving"]."))
update_icon()
/obj/item/bluespace_harpoon/verb/chande_dropnom_mode(mob/user as mob)
@@ -220,7 +220,7 @@
set src in range(0)
dropnoms_active = !dropnoms_active
to_chat(user,"<span class = 'info'>You switch \the [src]'s spatial rearrangement [dropnoms_active ? "on" : "off"]. (Telenoms [dropnoms_active ? "enabled" : "disabled"])</span>")
to_chat(user,span_info("You switch \the [src]'s spatial rearrangement [dropnoms_active ? "on" : "off"]. (Telenoms [dropnoms_active ? "enabled" : "disabled"])"))
/obj/item/bluespace_harpoon/update_icon()
if(transforming)

2
code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm
View File

@@ -102,7 +102,7 @@
/obj/item/gun/energy/kinetic_accelerator/examine(mob/user)
. = ..()
if(max_mod_capacity)
. += "<b>[get_remaining_mod_capacity()]%</b> mod capacity remaining."
. += span_bold("[get_remaining_mod_capacity()]%") + " mod capacity remaining."
for(var/A in get_modkits())
var/obj/item/borg/upgrade/modkit/M = A
. += span_notice("There is \a [M] installed, using <b>[M.cost]%</b> capacity.")

16
code/modules/projectiles/guns/launcher/bows.dm
View File

@@ -72,14 +72,14 @@
/obj/item/gun/launcher/crossbow/bow/attack_hand(mob/living/user)
if(loc == user && bolt && !drawn)
user.visible_message("<b>[user]</b> removes [bolt] from [src].","You remove [bolt] from [src].")
user.visible_message(span_infoplain(span_bold("[user]") + " removes [bolt] from [src]."),span_infoplain("You remove [bolt] from [src]."))
unload(user)
else
return ..()
/obj/item/gun/launcher/crossbow/bow/attack_self(mob/living/user)
if(drawn)
user.visible_message("<b>[user]</b> relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.")
user.visible_message(span_infoplain(span_bold("[user]") + " relaxes the tension on [src]'s string."),span_infoplain("You relax the tension on [src]'s string."))
drawn = FALSE
update_icon()
else
@@ -87,24 +87,24 @@
/obj/item/gun/launcher/crossbow/bow/draw(var/mob/user)
if(!bolt)
to_chat(user, "You don't have anything nocked to [src].")
to_chat(user, span_infoplain("You don't have anything nocked to [src]."))
return
if(user.restrained())
return
current_user = user
user.visible_message("<b>[user]</b> begins to draw back the string of [src].",span_notice("You begin to draw back the string of [src]."))
user.visible_message(span_infoplain(span_bold("[user]") + " begins to draw back the string of [src]."),span_notice("You begin to draw back the string of [src]."))
if(do_after(user, 25, src, exclusive = TASK_ALL_EXCLUSIVE))
drawn = TRUE
user.visible_message("<b>[user]</b> draws the string on [src] back fully!", "You draw the string on [src] back fully!")
user.visible_message(span_infoplain(span_bold("[user]") + "draws the string on [src] back fully!"), span_infoplain("You draw the string on [src] back fully!"))
update_icon()
/obj/item/gun/launcher/crossbow/bow/attackby(obj/item/W as obj, mob/user)
if(!bolt && istype(W,/obj/item/arrow/standard))
user.drop_from_inventory(W, src)
bolt = W
user.visible_message("[user] slides [bolt] into [src].","You slide [bolt] into [src].")
user.visible_message(span_infoplain("[user] slides [bolt] into [src]."),span_infoplain("You slide [bolt] into [src]."))
update_icon()
/obj/item/gun/launcher/crossbow/bow/update_icon()
@@ -129,11 +129,11 @@
/obj/item/gun/launcher/crossbow/bow/hardlight/attack_self(mob/living/user)
if(drawn)
user.visible_message("<b>[user]</b> relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.")
user.visible_message(span_infoplain(span_bold("[user]") + " relaxes the tension on [src]'s string."),span_infoplain("You relax the tension on [src]'s string."))
drawn = FALSE
update_icon()
else if(!bolt)
user.visible_message("<b>[user]</b> fabricates a new hardlight projectile with [src].","You fabricate a new hardlight projectile with [src].")
user.visible_message(span_infoplain(span_bold("[user]") + " fabricates a new hardlight projectile with [src]."),span_infoplain("You fabricate a new hardlight projectile with [src]."))
bolt = new /obj/item/arrow/energy(src)
update_icon()
else

8
code/modules/projectiles/guns/magnetic/bore.dm
View File

@@ -63,7 +63,7 @@
if(removing)
user.put_in_hands(removing)
user.visible_message("<b>\The [user]</b> removes \the [removing] from \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " removes \the [removing] from \the [src]."))
playsound(src, 'sound/machines/click.ogg', 10, 1)
update_icon()
return
@@ -93,7 +93,7 @@
to_chat(user, span_warning("\The [src] has no manipulator installed."))
return
user.put_in_hands(manipulator)
user.visible_message("<b>\The [user]</b> levers \the [manipulator] from \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " levers \the [manipulator] from \the [src]."))
playsound(src, thing.usesound, 50, 1)
mat_cost = initial(mat_cost)
manipulator = null
@@ -109,7 +109,7 @@
user.drop_from_inventory(manipulator, src)
playsound(src, 'sound/machines/click.ogg', 10,1)
mat_cost = initial(mat_cost) / (2*manipulator.rating)
user.visible_message("<b>\The [user]</b> slots \the [manipulator] into \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " slots \the [manipulator] into \the [src]."))
update_icon()
update_rating_mod()
return
@@ -144,7 +144,7 @@
mat_storage += (SHEET_MATERIAL_AMOUNT/2*0.8) //two plasma ores needed per sheet, some inefficiency for not using refined product
success = TRUE
if(success)
user.visible_message("<b>\The [user]</b> loads \the [src] with \the [M].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " loads \the [src] with \the [M]."))
playsound(src, 'sound/weapons/flipblade.ogg', 50, 1)
update_icon()
return

10
code/modules/projectiles/guns/magnetic/magnetic.dm
View File

@@ -151,7 +151,7 @@
cell = thing
user.drop_from_inventory(cell, src)
playsound(src, 'sound/machines/click.ogg', 10, 1)
user.visible_message("<b>\The [user]</b> slots \the [cell] into \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " slots \the [cell] into \the [src]."))
update_icon()
return
@@ -160,7 +160,7 @@
to_chat(user, span_warning("\The [src] has no capacitor installed."))
return
user.put_in_hands(capacitor)
user.visible_message("<b>\The [user]</b> unscrews \the [capacitor] from \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " unscrews \the [capacitor] from \the [src]."))
playsound(src, thing.usesound, 50, 1)
capacitor = null
update_icon()
@@ -174,7 +174,7 @@
user.drop_from_inventory(capacitor, src)
playsound(src, 'sound/machines/click.ogg', 10, 1)
power_per_tick = (power_cost*0.15) * capacitor.rating
user.visible_message("<b>\The [user]</b> slots \the [capacitor] into \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " slots \the [capacitor] into \the [src]."))
update_icon()
return
@@ -195,7 +195,7 @@
loaded = new load_type(src, 1)
ammo.use(1)
user.visible_message("<b>\The [user]</b> loads \the [src] with \the [loaded].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " loads \the [src] with \the [loaded]."))
playsound(src, 'sound/weapons/flipblade.ogg', 50, 1)
update_icon()
return
@@ -215,7 +215,7 @@
if(removing)
removing.forceMove(get_turf(src))
user.put_in_hands(removing)
user.visible_message("<b>\The [user]</b> removes \the [removing] from \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " removes \the [removing] from \the [src]."))
playsound(src, 'sound/machines/click.ogg', 10, 1)
update_icon()
return

14
code/modules/projectiles/guns/magnetic/magnetic_construction.dm
View File

@@ -17,19 +17,19 @@
to_chat(user, span_warning("You need at least 5 [reinforcing.singular_name]\s for this task."))
return
reinforcing.use(5)
user.visible_message("<b>\The [user]</b> shapes some steel sheets around \the [src] to form a body.")
user.visible_message(span_infoplain(span_bold("\The [user]") + " shapes some steel sheets around \the [src] to form a body."))
increment_construction_stage()
return
if(istype(thing, /obj/item/tape_roll) && construction_stage == 2)
user.visible_message("<b>\The [user]</b> secures \the [src] together with \the [thing].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " secures \the [src] together with \the [thing]."))
increment_construction_stage()
return
if(istype(thing, /obj/item/pipe) && construction_stage == 3)
user.drop_from_inventory(thing)
qdel(thing)
user.visible_message("<b>\The [user]</b> jams \the [thing] into \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " jams \the [thing] into \the [src]."))
increment_construction_stage()
return
@@ -44,7 +44,7 @@
to_chat(user, span_warning("You need more fuel!"))
return
user.visible_message("<b>\The [user]</b> welds the barrel of \the [src] into place.")
user.visible_message(span_infoplain(span_bold("\The [user]") + " welds the barrel of \the [src] into place."))
playsound(src, 'sound/items/Welder2.ogg', 100, 1)
increment_construction_stage()
return
@@ -55,19 +55,19 @@
to_chat(user, span_warning("You need at least 5 lengths of cable for this task."))
return
cable.use(5)
user.visible_message("<b>\The [user]</b> wires \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " wires \the [src]."))
increment_construction_stage()
return
if(istype(thing, /obj/item/smes_coil) && construction_stage >= 6 && construction_stage <= 8)
user.visible_message("<b>\The [user]</b> installs \a [thing] into \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " installs \a [thing] into \the [src]."))
user.drop_from_inventory(thing)
qdel(thing)
increment_construction_stage()
return
if(thing.has_tool_quality(TOOL_SCREWDRIVER) && construction_stage >= 9)
user.visible_message("<b>\The [user]</b> secures \the [src] and finishes it off.")
user.visible_message(span_infoplain(span_bold("\The [user]") + " secures \the [src] and finishes it off."))
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
var/obj/item/gun/magnetic/coilgun = new(loc)
var/put_in_hands

2
code/modules/projectiles/guns/projectile/dartgun.dm
View File

@@ -134,7 +134,7 @@
/obj/item/gun/projectile/dartgun/attack_self(mob/user)
user.set_machine(src)
var/dat = "<b>[src] mixing control:</b><br><br>"
var/dat = span_bold("[src] mixing control:") + "<br><br>"
if (beakers.len)
var/i = 1

2
code/modules/projectiles/guns/projectile/shotgun_vr.dm
View File

@@ -54,7 +54,7 @@
one_handed_penalty = 15 //Stock extended to steady it, even with just the one hand.
recoil = 1 //As above, stock and foregrip would help with the kick
else
user.visible_message("<b>\The [user]</b> collapses their shotgun's stock and fold it's foregrip.",\
user.visible_message(span_infoplain(span_bold("\The [user]") + " collapses their shotgun's stock and fold it's foregrip."),\
span_notice("You fold the shotgun's stock and foregrip."),\
"You hear a click.")
icon_state = "compshotc"

2
code/modules/projectiles/projectile.dm
View File

@@ -705,7 +705,7 @@
if(result == PROJECTILE_FORCE_MISS)
if(!silenced)
target_mob.visible_message("<b>\The [src]</b> misses \the [target_mob] narrowly!")
target_mob.visible_message(span_infoplain(span_bold("\The [src]") + " misses \the [target_mob] narrowly!"))
playsound(target_mob, "bullet_miss", 75, 1)
return FALSE

4
code/modules/projectiles/targeting/targeting_overlay.dm
View File

@@ -109,7 +109,7 @@
if(!locked && lock_time <= world.time)
locked = 1
to_chat(owner, "<span class ='notice'>You are locked onto your target.</span>")
to_chat(owner, span_notice("You are locked onto your target."))
to_chat(aiming_at, span_danger("The gun is trained on you!"))
update_icon()
@@ -217,7 +217,7 @@
if(istype(aiming_with, /obj/item/gun))
playsound(owner, 'sound/weapons/TargetOff.ogg', 50,1)
if(!no_message)
owner.visible_message("<b>\The [owner]</b> lowers \the [aiming_with].")
owner.visible_message(span_infoplain(span_bold("\The [owner]") + " lowers \the [aiming_with]."))
aiming_with = null
aiming_at.aimed -= src