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

converts our spans (#9185)

Browse Source
This commit is contained in:
Kashargul
2024-10-07 20:47:23 +02:00
committed by GitHub
parent f4155aa973
commit a92a42b85b
162 changed files with 1360 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/projectiles/guns/energy/pump_ch.dm
View File

@@ -91,10 +91,10 @@
if(istype(id) && lockable)
if(check_access(id))
locked = !locked
to_chat(user, "<span class='warning'>You [locked ? "enable" : "disable"] the safety lock on \the [src].</span>")
to_chat(user, span_warning("You [locked ? "enable" : "disable"] the safety lock on \the [src]."))
else
to_chat(user, "<span class='warning'>Access denied.</span>")
user.visible_message("<span class='notice'>[user] swipes \the [I] against \the [src].</span>")
to_chat(user, span_warning("Access denied."))
user.visible_message(span_notice("[user] swipes \the [I] against \the [src]."))
else
return ..()
@@ -102,13 +102,13 @@
..()
if(lockable)
locked = !locked
to_chat(user, "<span class='warning'>You [locked ? "enable" : "disable"] the safety lock on \the [src]!</span>")
to_chat(user, span_warning("You [locked ? "enable" : "disable"] the safety lock on \the [src]!"))
/obj/item/gun/energy/locked/special_check(mob/user)
if(locked)
var/turf/T = get_turf(src)
if(T.z in using_map.station_levels)
to_chat(user, "<span class='warning'>The safety device prevents the gun from firing this close to the facility.</span>")
to_chat(user, span_warning("The safety device prevents the gun from firing this close to the facility."))
return 0
return ..()
@@ -133,11 +133,11 @@
var/phase_power = 15
projectile_type = /obj/item/projectile/beam/phaser
//CHOMP Edit: Changed beam type to new phaser beam type.
//CHOMP Edit: Changed beam type to new phaser beam type.
firemodes = list(
list(mode_name="lethal", fire_delay=10, projectile_type=/obj/item/projectile/beam/phaser, charge_cost = 80), //Chompedit Reduced cost
list(mode_name="low-power", fire_delay=5, projectile_type=/obj/item/projectile/beam/phaser/light, charge_cost = 40), //Chompedit Reduced cost
) //CHOMPedit Adjusts cost and fire delay to match adjusted beams.
) //CHOMPedit Adjusts cost and fire delay to match adjusted beams.
recoil_mode = 0 //CHOMP Addition: Removes recoil for micros.
/obj/item/gun/energy/locked/frontier/unload_ammo(var/mob/user)
@@ -145,8 +145,8 @@
return
recharging = 1
update_icon()
user.visible_message("<span class='notice'>[user] opens \the [src] and starts pumping the handle.</span>", \
"<span class='notice'>You open \the [src] and start pumping the handle.</span>")
user.visible_message(span_notice("[user] opens \the [src] and starts pumping the handle."), \
span_notice("You open \the [src] and start pumping the handle."))
while(recharging)
if(!do_after(user, 10, src))
break
@@ -295,7 +295,7 @@
icon = 'icons/obj/gun_vr.dmi'
icon_state = "handbowkill"
item_state = null
phase_power = 20
phase_power = 20
w_class = ITEMSIZE_SMALL
charge_cost = 200 //Chompedit Reduced cost

16
code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
View File

@@ -1020,7 +1020,7 @@
/*
/obj/item/gun/projectile/automatic/serdy/kord/afteratt(atom/A, mob/living/user, adjacent, params)
if(user.size_multiplier <= 0.5) //They're 50% or lower. If they fire this gun, they're gonna get obliterated.
to_chat(user,"<span class='warning'>You struggle to reach the trigger. Maybe shooting such a big gun isn't such a good idea...</span>")
to_chat(user,span_warning("You struggle to reach the trigger. Maybe shooting such a big gun isn't such a good idea..."))
if(do_after(user, 5 SECONDS)) //Give them a chance to take it back.
. = ..() //RIP
@@ -1041,8 +1041,8 @@
if(is_human && H.eyecheck() < 1)
user.flash_eyes() //Flashbang effect
user.visible_message(/*What other people experience*/"<span class='notice'>[user] manages to pull the trigger on the [src], causing a large bang and a big flash before [src] recoils backwards, crashing violently into [user] and causing them to go flying!</span>", \
/*What you experience*/ "<span class='warning'>As you pull the trigger, you suddenly see a flash of bright white light and a loud bang which immediately triggers ringing in your ears. Before you can even react, you feel the giant gun crashing into you and propelling you backwards, and then everything goes black!</span>")
user.visible_message(/*What other people experience*/span_notice("[user] manages to pull the trigger on the [src], causing a large bang and a big flash before [src] recoils backwards, crashing violently into [user] and causing them to go flying!"), \
/*What you experience*/ span_warning("As you pull the trigger, you suddenly see a flash of bright white light and a loud bang which immediately triggers ringing in your ears. Before you can even react, you feel the giant gun crashing into you and propelling you backwards, and then everything goes black!"))
if(user.organs && user.organs.len) //You are going to break a lot of bones.
user.apply_damage(15, BRUTE, BP_L_ARM)
user.apply_damage(15, BRUTE, BP_R_ARM)
@@ -1071,7 +1071,7 @@
var/damage_factor = (1 - unhappy_factor) //Unhappy factor is 0 at max unhappiness. Damage_factor is 1 at max unhappiness.
var/prob_to_drop = (33 + damage_factor*66) //100% if just above 50%, 33% if just below 125%
var/damage_taken = 5 + 10 * damage_factor //15 damage if just above 50%, 5 if just below 125%
var/message_on_fire = "<span class='notice'>As you pull the trigger, you feel the gun painfully slam into your shoulder, leaving a painful bruise!</span>"
var/message_on_fire = span_notice("As you pull the trigger, you feel the gun painfully slam into your shoulder, leaving a painful bruise!")
var/in_left_hand = TRUE
if(user.r_hand == src)
in_left_hand = FALSE
@@ -1079,7 +1079,7 @@
user.apply_damage(damage_taken,BRUTE,damaged_body_part) //Bruise
user.apply_damage(damage_taken * 3,HALLOSS) //Ouchie juice
if(prob(prob_to_drop))
message_on_fire += "<span class='notice'> The force causes you to stumble backwards, dropping the gun and falling to the ground.</span>"
message_on_fire += span_notice(" The force causes you to stumble backwards, dropping the gun and falling to the ground.")
user.drop_item()
user.apply_effect(25,WEAKEN)
*/
@@ -1637,11 +1637,11 @@
if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter))
if(sawn_off) //Don't do anything if we were already sawed off.
return
to_chat(user, "<span class='notice'>You begin to shorten the barrel of \the [src].</span>")
to_chat(user, span_notice("You begin to shorten the barrel of \the [src]."))
if(loaded.len)
var/burstsetting = burst
burst = 2
user.visible_message("<span class='danger'>The shotgun goes off!</span>", "<span class='danger'>The shotgun goes off in your face!</span>")
user.visible_message(span_danger("The shotgun goes off!"), span_danger("The shotgun goes off in your face!"))
Fire_userless(user)
burst = burstsetting
return
@@ -1650,7 +1650,7 @@
item_state = "sawnshotgun"
desc = "Omar's coming!"
to_chat(user, "<span class='warning'>You shorten the barrel of \the [src]!</span>")
to_chat(user, span_warning("You shorten the barrel of \the [src]!"))
else
..()

100
code/modules/projectiles/guns/projectile_ch.dm
View File

@@ -36,24 +36,24 @@
switch(one_handed_penalty)
if(1 to 15)
if(prob(50)) //don't need to tell them every single time
to_chat(user, "<span class='warning'>Your aim wavers slightly.</span>")
to_chat(user, span_warning("Your aim wavers slightly."))
if(16 to 30)
to_chat(user, "<span class='warning'>Your aim wavers as you fire \the [src] with just one hand.</span>")
to_chat(user, span_warning("Your aim wavers as you fire \the [src] with just one hand."))
if(31 to 45)
to_chat(user, "<span class='warning'>You have trouble keeping \the [src] on target with just one hand.</span>")
to_chat(user, span_warning("You have trouble keeping \the [src] on target with just one hand."))
if(46 to INFINITY)
to_chat(user, "<span class='warning'>You struggle to keep \the [src] on target with just one hand!</span>")
to_chat(user, span_warning("You struggle to keep \the [src] on target with just one hand!"))
else if(!user.can_wield_item(src))
switch(one_handed_penalty)
if(1 to 15)
if(prob(50)) //don't need to tell them every single time
to_chat(user, "<span class='warning'>Your aim wavers slightly.</span>")
to_chat(user, span_warning("Your aim wavers slightly."))
if(16 to 30)
to_chat(user, "<span class='warning'>Your aim wavers as you try to hold \the [src] steady.</span>")
to_chat(user, span_warning("Your aim wavers as you try to hold \the [src] steady."))
if(31 to 45)
to_chat(user, "<span class='warning'>You have trouble holding \the [src] steady.</span>")
to_chat(user, span_warning("You have trouble holding \the [src] steady."))
if(46 to INFINITY)
to_chat(user, "<span class='warning'>You struggle to hold \the [src] steady!</span>")
to_chat(user, span_warning("You struggle to hold \the [src] steady!"))
if(recoil)
spawn()
@@ -80,7 +80,7 @@
var/result = bolt_toggle(TRUE)
update_icon()
if(!result)
to_chat(user,"<span class='notice'>Nothing happens.</span>")
to_chat(user,span_notice("Nothing happens."))
else
var/closed = CHECK_BITFIELD(result,BOLT_CLOSED)
var/opened = CHECK_BITFIELD(result,BOLT_OPENED)
@@ -93,38 +93,38 @@
var/casing_chambered = CHECK_BITFIELD(result,BOLT_CASING_CHAMBERED) ? ", chambering a new round" : ""
if(closed && opened)
playsound(src, sound_ejectchamber, 50, 0)
user.visible_message("<span class='notice'>[user] pulls back \the [bolt_name] before releasing it[close_open_ejected] causing it to slide forward again[casing_chambered].</span>", \
"<span class='notice'>You pull back \the [bolt_name] before releasing it[close_open_ejected] causing it to slide forward again[casing_chambered].</span>")
user.visible_message(span_notice("[user] pulls back \the [bolt_name] before releasing it[close_open_ejected] causing it to slide forward again[casing_chambered]."), \
span_notice("You pull back \the [bolt_name] before releasing it[close_open_ejected] causing it to slide forward again[casing_chambered]."))
user.hud_used.update_ammo_hud(user, src)
else if(opened)
playsound(src, sound_eject, 50, 0)
if(locked)
if(CHECK_BITFIELD(auto_loading_type,LOCK_MANUAL_LOCK))
playsound(src, sound_ejectchamber, 50, 0)
user.visible_message("<span class='notice'>[user] pulls back \the [bolt_name] and locks it in the open position[casing_chambered][other_ejected].</span>", \
"<span class='notice'>You pull back \the [bolt_name] and lock it in the open position[other_ejected][casing_chambered].</span>")
user.visible_message(span_notice("[user] pulls back \the [bolt_name] and locks it in the open position[casing_chambered][other_ejected]."), \
span_notice("You pull back \the [bolt_name] and lock it in the open position[other_ejected][casing_chambered]."))
else
user.visible_message("<span class='notice'>[user] pulls back \the [bolt_name] before releasing it, causing it to lock in the open position[casing_chambered][other_ejected].</span>", \
"<span class='notice'>You pull back \the [bolt_name] before releasing it, causing it to lock in the open position[casing_chambered][other_ejected].</span>")
user.visible_message(span_notice("[user] pulls back \the [bolt_name] before releasing it, causing it to lock in the open position[casing_chambered][other_ejected]."), \
span_notice("You pull back \the [bolt_name] before releasing it, causing it to lock in the open position[casing_chambered][other_ejected]."))
else
user.visible_message("<span class='notice'>[user] opens \the [bolt_name][casing_chambered][other_ejected].</span>", \
"<span class='notice'>You pull back \the [bolt_name][casing_chambered][other_ejected].</span>")
user.visible_message(span_notice("[user] opens \the [bolt_name][casing_chambered][other_ejected]."), \
span_notice("You pull back \the [bolt_name][casing_chambered][other_ejected]."))
else if(closed)
playsound(src, sound_chamber, 50, 0)
if(unlocked)
if(bolt_release)
if(user.a_intent == I_HURT && CHECK_BITFIELD(auto_loading_type,LOCK_SLAPPABLE))
user.visible_message("<span class='notice'>[user] slaps the [bolt_release], causing \the [bolt_name] to slide forward[casing_chambered]!</span>", \
"<span class='notice'>You slap the [bolt_release], causing \the [bolt_name] to slide forward[casing_chambered]!</span>")
user.visible_message(span_notice("[user] slaps the [bolt_release], causing \the [bolt_name] to slide forward[casing_chambered]!"), \
span_notice("You slap the [bolt_release], causing \the [bolt_name] to slide forward[casing_chambered]!"))
else
user.visible_message("<span class='notice'>[user] presses the [bolt_release], causing \the [bolt_name] to slide forward[casing_chambered].</span>", \
"<span class='notice'>You press the [bolt_release], causing \the [bolt_name] to slide forward[casing_chambered].</span>")
user.visible_message(span_notice("[user] presses the [bolt_release], causing \the [bolt_name] to slide forward[casing_chambered]."), \
span_notice("You press the [bolt_release], causing \the [bolt_name] to slide forward[casing_chambered]."))
else
user.visible_message("<span class='notice'>[user] pulls \the [bolt_name] back the rest of the way, causing it to slide forward[casing_chambered].</span>", \
"<span class='notice'>You pull \the [bolt_name] back the rest of the way, causing it to slide forward[casing_chambered].</span>")
user.visible_message(span_notice("[user] pulls \the [bolt_name] back the rest of the way, causing it to slide forward[casing_chambered]."), \
span_notice("You pull \the [bolt_name] back the rest of the way, causing it to slide forward[casing_chambered]."))
else
user.visible_message("<span class='notice'>[user] closes \the [bolt_name][casing_chambered].</span>", \
"<span class='notice'>You close \the [bolt_name][casing_chambered].</span>")
user.visible_message(span_notice("[user] closes \the [bolt_name][casing_chambered]."), \
span_notice("You close \the [bolt_name][casing_chambered]."))
user.hud_used.update_ammo_hud(user, src)
/obj/item/gun/projectile/proc/bolt_toggle(var/manual)
@@ -146,7 +146,7 @@
return output
else
if(!manual)
visible_message(src,"<span class='notice'>The [src] fires its last round, causing the [bolt_name] to lock.</span>")
visible_message(src,span_notice("The [src] fires its last round, causing the [bolt_name] to lock."))
bolt_open = TRUE
bolt_locked = TRUE
var/ejected = process_chambered()
@@ -271,22 +271,22 @@
if(istype(A, /obj/item/ammo_magazine))
var/obj/item/ammo_magazine/AM = A
if(!(load_method & AM.mag_type) || caliber != AM.caliber || allowed_magazines && !is_type_in_list(A, allowed_magazines))
to_chat(user, "<span class='warning'>[AM] won't load into [src]!</span>")
to_chat(user, span_warning("[AM] won't load into [src]!"))
return
var/loading_method = AM.mag_type & load_method
if(loading_method == (MAGAZINE & SPEEDLOADER)) loading_method = MAGAZINE //Default to magazine if both are valid
switch(loading_method)
if(MAGAZINE)
if(ammo_magazine)
to_chat(user, "<span class='warning'>[src] already has a magazine loaded.</span>") //already a magazine here
to_chat(user, span_warning("[src] already has a magazine loaded.")) //already a magazine here
return
if(manual_chamber && CHECK_BITFIELD(auto_loading_type,OPEN_BOLT) && bolt_open)
to_chat(user, "<span class='warning'>This is an open bolt gun. Make sure you close the bolt before inserting a new magazine.</span>")
to_chat(user, span_warning("This is an open bolt gun. Make sure you close the bolt before inserting a new magazine."))
return
user.remove_from_mob(AM)
AM.loc = src
ammo_magazine = AM
user.visible_message("[user] inserts [AM] into [src].", "<span class='notice'>You insert [AM] into [src].</span>")
user.visible_message("[user] inserts [AM] into [src].", span_notice("You insert [AM] into [src]."))
if(manual_chamber && CHECK_BITFIELD(auto_loading_type,CHAMBER_ON_RELOAD) && bolt_open && !chambered)
chamber_bullet()
bolt_toggle()
@@ -294,10 +294,10 @@
user.hud_used.update_ammo_hud(user, src)
if(SPEEDLOADER)
if(only_open_load && !bolt_open)
to_chat(user, "<span_class='warning'>[src] must have its bolt open to be loaded!</span>")
to_chat(user, span_warning("[src] must have its bolt open to be loaded!"))
return
if(loaded.len >= max_shells)
to_chat(user, "<span class='warning'>[src] is full!</span>")
to_chat(user, span_warning("[src] is full!"))
return
var/count = 0
for(var/obj/item/ammo_casing/C in AM.stored_ammo)
@@ -309,7 +309,7 @@
AM.stored_ammo -= C //should probably go inside an ammo_magazine proc, but I guess less proc calls this way...
count++
if(count)
user.visible_message("[user] reloads [src].", "<span class='notice'>You load [count] round\s into [src].</span>")
user.visible_message("[user] reloads [src].", span_notice("You load [count] round\s into [src]."))
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
user.hud_used.update_ammo_hud(user, src)
AM.update_icon()
@@ -323,27 +323,27 @@
if(!chambered)
if(bolt_open)
if(do_after(user,5))
user.visible_message("<span class='notice'>[user] slides \the [C] into the [src]'s chamber.</span>","<span class='notice'>You slide \the [C] into the [src]'s chamber.</span>")
user.visible_message(span_notice("[user] slides \the [C] into the [src]'s chamber."),span_notice("You slide \the [C] into the [src]'s chamber."))
chambered = C
user.hud_used.update_ammo_hud(user, src)
else
return
else if(!(CHECK_BITFIELD(auto_loading_type,LOCK_OPEN_EMPTY) || (CHECK_BITFIELD(auto_loading_type,LOCK_MANUAL_LOCK))))
if(do_after(user,15))
user.visible_message("<span class='notice'>[user] holds open \the [src]'s [bolt_name] and slides [C] into the chamber before letting the bolt close again.</span>","<span class='notice'>You slide \the [C] into the [src]'s chamber.</span>")
user.visible_message(span_notice("[user] holds open \the [src]'s [bolt_name] and slides [C] into the chamber before letting the bolt close again."),span_notice("You slide \the [C] into the [src]'s chamber."))
chambered = C
user.hud_used.update_ammo_hud(user, src)
else
return
else
to_chat(user,"<span class='warning'>Open the bolt first before chambering a round!</span>")
to_chat(user,span_warning("Open the bolt first before chambering a round!"))
return
else
to_chat(user,"<span class='warning'>Eject the current chambered round before trying to chamber a new one!</span>")
to_chat(user,span_warning("Eject the current chambered round before trying to chamber a new one!"))
return
else
to_chat(user,"<span class='warning'>You can't manually chamber rounds with an open bolt gun!</span>")
to_chat(user,span_warning("You can't manually chamber rounds with an open bolt gun!"))
return
user.remove_from_mob(C)
C.loc = src
@@ -352,16 +352,16 @@
else
return
if(only_open_load && !bolt_open)
to_chat(user, "<span_class='warning'>[src] must have its bolt open to be loaded!</span>")
to_chat(user, span_warning("[src] must have its bolt open to be loaded!"))
return
if(loaded.len >= max_shells)
to_chat(user, "<span class='warning'>[src] is full.</span>")
to_chat(user, span_warning("[src] is full."))
return
user.remove_from_mob(C)
C.loc = src
loaded.Insert(1, C) //add to the head of the list
user.visible_message("[user] inserts \a [C] into [src].", "<span class='notice'>You insert \a [C] into [src].</span>")
user.visible_message("[user] inserts \a [C] into [src].", span_notice("You insert \a [C] into [src]."))
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
user.hud_used.update_ammo_hud(user, src)
@@ -370,7 +370,7 @@
if(!(load_method & SINGLE_CASING))
return //incompatible
to_chat(user, "<span class='notice'>You start loading \the [src].</span>")
to_chat(user, span_notice("You start loading \the [src]."))
sleep(1 SECOND)
for(var/obj/item/ammo_casing/ammo in storage.contents)
if(caliber != ammo.caliber)
@@ -380,7 +380,7 @@
user.hud_used.update_ammo_hud(user, src)
if(loaded.len >= max_shells)
to_chat(user, "<span class='warning'>[src] is full.</span>")
to_chat(user, span_warning("[src] is full."))
break
sleep(1 SECOND)
@@ -392,7 +392,7 @@
ammo_magazine.loc = get_turf(src.loc)
user.visible_message(
"[ammo_magazine] falls out and clatters on the floor!",
"<span class='notice'>[ammo_magazine] falls out and clatters on the floor!</span>"
span_notice("[ammo_magazine] falls out and clatters on the floor!")
)
if(auto_eject_sound)
playsound(src, auto_eject_sound, 40, 1)
@@ -411,7 +411,7 @@
return
if(user && user.a_intent == I_HELP && user.read_preference(/datum/preference/toggle/safefiring)) //regardless of what happens, refuse to shoot if help intent is on
to_chat(user, "<span class='warning'>You refrain from firing your [src] as your intent is set to help.</span>")
to_chat(user, span_warning("You refrain from firing your [src] as your intent is set to help."))
return
else
@@ -422,13 +422,13 @@
if(..())
if(manual_chamber)
if(CHECK_BITFIELD(auto_loading_type,OPEN_BOLT) && !bolt_open)
to_chat(user,"<span class='warning'>This is an open bolt gun! You need to open the bolt before firing it!</span>")
to_chat(user,span_warning("This is an open bolt gun! You need to open the bolt before firing it!"))
return 0
else if(CHECK_BITFIELD(auto_loading_type,CLOSED_BOLT) && bolt_open)
to_chat(user,"<span class='warning'>This is a closed bolt gun! You need to close the bolt before firing it!</span>")
to_chat(user,span_warning("This is a closed bolt gun! You need to close the bolt before firing it!"))
return 0
else if((!auto_loading_type) && bolt_open)
to_chat(user,"<span class='warning'>This is a manual action gun, the bolt or chamber must be closed before firing it!</span>")
to_chat(user,span_warning("This is a manual action gun, the bolt or chamber must be closed before firing it!"))
return 0
else
return 1
@@ -437,13 +437,13 @@
/obj/item/gun/projectile/unload_ammo(mob/user, var/allow_dump=1)
if(manual_chamber && only_open_load && !bolt_open)
to_chat(user,"<span class='warning'>You must open the bolt to load or unload this gun!</span>")
to_chat(user,span_warning("You must open the bolt to load or unload this gun!"))
else
return ..()
/obj/item/gun/projectile/handle_click_empty(mob/user)
if (user)
user.visible_message("*click click*", "<span class='danger'>*click*</span>")
user.visible_message("*click click*", span_danger("*click*"))
else
src.visible_message("*click click*")
playsound(src, 'sound/weapons/empty.ogg', 100, 1)

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

@@ -30,6 +30,6 @@
var/mob/living/M = A
if(istype(M) && M.maxHealth<=200)
M.dust()
visible_message("<span class='warning'>\The [src] impacts energetically with its target and shatters in a violent explosion!</span>")
visible_message(span_warning("\The [src] impacts energetically with its target and shatters in a violent explosion!"))
explosion(src.loc, 3, 4, 5, 10)
..(A)