cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-24 05:06:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace all modular HTML spans with defines spans

Browse Source 
In total:
- Adds span defines for `reallybig hypnophrase`, `big warning`, `header`
- Fixes a missing apostrophe for hypno stare
- Makes a special exception for cuddling.dm, which uses an irregular span
- Puts the spans file back
This commit is contained in:
Darius
2023-01-16 04:05:27 -05:00
parent 41e15dd097
commit ad0239b5de
108 changed files with 779 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_splurt/code/game/objects/structures/cannons/cannon.dm
+12 -12
View File
@@ -25,8 +25,8 @@
/obj/structure/cannon/examine(mob/user)
. = ..()
. += "<span class='notice'>[src] accepts gunpowder or welding fuel.</span>"
. += "<span class='warning'>Using welding fuel will weaken the force of the projectile fired.</span>"
. += span_notice("[src] accepts gunpowder or welding fuel.")
. += span_warning("Using welding fuel will weaken the force of the projectile fired.")
/obj/structure/cannon/proc/fire()
for(var/mob/shaken_mob in urange(10, src))
@@ -48,24 +48,24 @@
/obj/structure/cannon/attackby(obj/item/used_item, mob/user, params)
if(charge_ignited)
to_chat(user, "<span class='warning'>It's gonna fire!</span>")
to_chat(user, span_warning("It's gonna fire!"))
return
var/ignition_message = used_item.ignition_effect(src, user)
if(istype(used_item, /obj/item/stack/cannonball))
if(loaded_cannonball)
to_chat(user, "<span class='warning'>[src] is already loaded!</span>")
to_chat(user, span_warning("[src] is already loaded!"))
else
var/obj/item/stack/cannonball/cannoneers_balls = used_item
loaded_cannonball = new cannoneers_balls.type(src, 1)
loaded_cannonball.copy_evidences(cannoneers_balls)
to_chat(user, "<span class='notice'>You load a [cannoneers_balls.singular_name] into \the [src].</span>")
to_chat(user, span_notice("You load a [cannoneers_balls.singular_name] into \the [src]."))
cannoneers_balls.use(1, transfer = TRUE)
return
else if(ignition_message)
if(!reagents.has_reagent(/datum/reagent/blackpowder,charge_size) && !reagents.has_reagent(/datum/reagent/fuel,charge_size))
to_chat(user, "<span class='warning'>[src] needs [reagents.maximum_volume]u of charge!</span>")
to_chat(user, span_warning("[src] needs [reagents.maximum_volume]u of charge!"))
return
visible_message(ignition_message)
log_game("Cannon fired by [key_name(user)] in [AREACOORD(src)]")
@@ -81,7 +81,7 @@
return ..()
if(!powder_keg.reagents.total_volume)
to_chat(user, "<span class='warning'>[powder_keg] is empty!</span>")
to_chat(user, span_warning("[powder_keg] is empty!"))
return
if(reagents.total_volume >= reagents.maximum_volume)
to_chat(user, "<span class='warning'[src] is full!</span>")
@@ -89,15 +89,15 @@
var/has_enough_gunpowder = powder_keg.reagents.has_reagent(/datum/reagent/blackpowder, charge_size)
var/has_enough_alt_fuel = powder_keg.reagents.has_reagent(/datum/reagent/fuel, charge_size)
if(!has_enough_gunpowder && !has_enough_alt_fuel)
to_chat(user, "<span class='warning'>[powder_keg] doesn't have at least 15u of fuel to fill [src]!</span>")
to_chat(user, span_warning("[powder_keg] doesn't have at least 15u of fuel to fill [src]!"))
return
if(has_enough_gunpowder)
powder_keg.reagents.trans_id_to(src, /datum/reagent/blackpowder, amount = charge_size)
to_chat(user, "<span class='notice'>You load [src] with gunpowder.</span>")
to_chat(user, span_notice("You load [src] with gunpowder."))
return
if(has_enough_alt_fuel)
powder_keg.reagents.trans_id_to(src, /datum/reagent/fuel, amount = charge_size)
to_chat(user, "<span class='notice'>You load [src] with welding fuel.</span>")
to_chat(user, span_notice("You load [src] with welding fuel."))
return
if(anchorable_cannon && used_item.tool_behaviour == TOOL_WRENCH)
if(default_unfasten_wrench(user, used_item, time = 2 SECONDS))
@@ -122,11 +122,11 @@
if(used_alt_fuel)
fires_before_deconstruction--
if(prob(explode_chance))
visible_message("<span class='warning'>[src] explodes!</span>")
visible_message(span_warning("[src] explodes!"))
explosion(src, heavy_impact_range = 1, light_impact_range = 5, flame_range = 5)
return
if(fires_before_deconstruction <= 0)
visible_message("<span class='warning'>[src] falls apart from operation!</span>")
visible_message(span_warning("[src] falls apart from operation!"))
qdel(src)
/obj/structure/cannon/trash/Destroy()