Skip to content

Commit

Permalink
SPAN conversions and to_world comment removals
Browse files Browse the repository at this point in the history
  • Loading branch information
CM Dev committed May 24, 2019
1 parent 4c72bd3 commit cef5b81
Show file tree
Hide file tree
Showing 607 changed files with 4,372 additions and 4,321 deletions.
8 changes: 4 additions & 4 deletions code/ATMOSPHERICS/atmospherics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,12 @@ obj/machinery/atmospherics/proc/check_connect_types_construction(obj/machinery/a
if(ventcrawl_message_busy > world.time)
return
ventcrawl_message_busy = world.time + 20
target_move.visible_message("<span class='warning'>You hear something squeezing through the ducts.</span>")
target_move.visible_message(SPAN_WARNING("You hear something squeezing through the ducts."))
to_chat(user, SPAN_NOTICE("You begin to climb out of [target_move]"))
if(do_after(user, 20, INTERRUPT_NO_NEEDHAND))
user.remove_ventcrawl()
user.forceMove(target_move.loc) //handles entering and so on
user.visible_message("<span class='warning'>[user] climbs out of [target_move].</span>", \
user.visible_message(SPAN_WARNING("[user] climbs out of [target_move]."), \
SPAN_NOTICE("You climb out of [target_move]."))
pick(playsound(user, 'sound/effects/alien_ventpass1.ogg', 35, 1), playsound(user, 'sound/effects/alien_ventpass2.ogg', 35, 1))
else if(target_move.can_crawl_through())
Expand All @@ -187,12 +187,12 @@ obj/machinery/atmospherics/proc/check_connect_types_construction(obj/machinery/a
if(ventcrawl_message_busy > world.time)
return
ventcrawl_message_busy = world.time + 20
visible_message("<span class='warning'>You hear something squeezing through the ducts.</span>")
visible_message(SPAN_WARNING("You hear something squeezing through the ducts."))
to_chat(user, SPAN_NOTICE("You begin to climb out of [src]"))
if(do_after(user, 20, INTERRUPT_NO_NEEDHAND))
user.remove_ventcrawl()
user.forceMove(src.loc)
user.visible_message("<span class='warning'>[user] climbs out of [src].</span>", \
user.visible_message(SPAN_WARNING("[user] climbs out of [src]."), \
SPAN_NOTICE("You climb out of [src]."))
pick(playsound(user, 'sound/effects/alien_ventpass1.ogg', 35, 1), playsound(user, 'sound/effects/alien_ventpass2.ogg', 35, 1))
user.canmove = 0
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
return
src.add_fingerprint(usr)
if(!src.allowed(user))
to_chat(user, "<span class='danger'>Access denied.</span>")
to_chat(user, SPAN_DANGER("Access denied."))
return
usr.set_interaction(src)
ui_interact(user)
Expand Down Expand Up @@ -198,7 +198,7 @@
if(!iswrench(W))
return ..()
if(on)
to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first.</span>")
to_chat(user, SPAN_WARNING("You cannot unwrench [src], turn it off first."))
return 1

playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/binary_devices/pump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ node2, network2 correspond to output
return
src.add_fingerprint(usr)
if(!src.allowed(user))
to_chat(user, "<span class='danger'>Access denied.</span>")
to_chat(user, SPAN_DANGER("Access denied."))
return
usr.set_interaction(src)
ui_interact(user)
Expand Down Expand Up @@ -191,7 +191,7 @@ node2, network2 correspond to output
if(!iswrench(W))
return ..()
if(!(stat & NOPOWER) && on)
to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first.</span>")
to_chat(user, SPAN_WARNING("You cannot unwrench [src], turn it off first."))
return 1

playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/components/portables_connector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
if(!iswrench(W))
return ..()
if(connected_device)
to_chat(user, "<span class='warning'>You cannot unwrench [src], dettach [connected_device] first.</span>")
to_chat(user, SPAN_WARNING("You cannot unwrench [src], dettach [connected_device] first."))
return 1
if(locate(/obj/machinery/portable_atmospherics, loc))
return 1
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/components/trinary_devices/filter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
return

if(!src.allowed(user))
to_chat(user, "<span class='danger'>Access denied.</span>")
to_chat(user, SPAN_DANGER("Access denied."))
return

var/dat
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/components/trinary_devices/mixer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
return
src.add_fingerprint(usr)
if(!src.allowed(user))
to_chat(user, "<span class='danger'>Access denied.</span>")
to_chat(user, SPAN_DANGER("Access denied."))
return
usr.set_interaction(src)
var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
Expand Down
6 changes: 3 additions & 3 deletions code/ATMOSPHERICS/components/tvalve.dm
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
if(!powered())
return
if(!src.allowed(user))
to_chat(user, "<span class='danger'>Access denied.</span>")
to_chat(user, SPAN_DANGER("Access denied."))
return
..()

Expand Down Expand Up @@ -349,7 +349,7 @@
if(!iswrench(W))
return ..()
if(istype(src, /obj/machinery/atmospherics/tvalve/digital))
to_chat(user, "<span class='warning'>You cannot unwrench [src], it's too complicated.</span>")
to_chat(user, SPAN_WARNING("You cannot unwrench [src], it's too complicated."))
return 1

playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
Expand Down Expand Up @@ -442,7 +442,7 @@
if(!powered())
return
if(!src.allowed(user))
to_chat(user, "<span class='danger'>Access denied.</span>")
to_chat(user, SPAN_DANGER("Access denied."))
return
..()

Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/components/unary/heat_exchanger.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
return ..()
var/turf/T = loc
if(level == 1 && isturf(T) && T.intact_tile)
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
to_chat(user, SPAN_WARNING("You must remove the plating first."))
return 1

playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
Expand Down
14 changes: 7 additions & 7 deletions code/ATMOSPHERICS/components/unary/vent_pump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -306,20 +306,20 @@
update_icon()
return 1
else
to_chat(user, "<span class='warning'>[W] needs to be on to start this task.</span>")
to_chat(user, SPAN_WARNING("[W] needs to be on to start this task."))
return 0
else
to_chat(user, "<span class='warning'>You need more welding fuel to complete this task.</span>")
to_chat(user, SPAN_WARNING("You need more welding fuel to complete this task."))
return 1

if(!iswrench(W))
return ..()
if(!(stat & NOPOWER) && on)
to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first.</span>")
to_chat(user, SPAN_WARNING("You cannot unwrench [src], turn it off first."))
return 1
var/turf/T = src.loc
if(node && node.level == 1 && isturf(T) && T.intact_tile)
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
to_chat(user, SPAN_WARNING("You must remove the plating first."))
return 1

playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
Expand All @@ -335,11 +335,11 @@
/obj/machinery/atmospherics/unary/vent_pump/examine(mob/user)
..()
if(get_dist(user, src) <= 1)
to_chat(user, "<span class='info'>A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s; [round(last_power_draw)] W.</span>")
to_chat(user, SPAN_INFO("A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s; [round(last_power_draw)] W."))
else
to_chat(user, "<span class='info'>You are too far away to read the gauge.</span>")
to_chat(user, SPAN_INFO("You are too far away to read the gauge."))
if(welded)
to_chat(user, "<span class='info'>It seems welded shut.</span>")
to_chat(user, SPAN_INFO("It seems welded shut."))

/obj/machinery/atmospherics/unary/vent_pump/power_change()
var/old_stat = stat
Expand Down
14 changes: 7 additions & 7 deletions code/ATMOSPHERICS/components/unary/vent_scrubber.dm
Original file line number Diff line number Diff line change
Expand Up @@ -243,18 +243,18 @@
welded = 0
update_icon()
else
to_chat(user, "<span class='warning'>[WT] needs to be on to start this task.</span>")
to_chat(user, SPAN_WARNING("[WT] needs to be on to start this task."))
else
to_chat(user, "<span class='warning'>You need more welding fuel to complete this task.</span>")
to_chat(user, SPAN_WARNING("You need more welding fuel to complete this task."))
return
if(!iswrench(W))
return ..()
if(!(stat & NOPOWER) && on)
to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first.</span>")
to_chat(user, SPAN_WARNING("You cannot unwrench [src], turn it off first."))
return 1
var/turf/T = loc
if(node && node.level == 1 && isturf(T) && T.intact_tile)
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
to_chat(user, SPAN_WARNING("You must remove the plating first."))
return 1

playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
Expand All @@ -270,11 +270,11 @@
/obj/machinery/atmospherics/unary/vent_scrubber/examine(mob/user)
..()
if(get_dist(user, src) <= 1)
to_chat(user, "<span class='info'>A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s; [round(last_power_draw)] W.</span>")
to_chat(user, SPAN_INFO("A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s; [round(last_power_draw)] W."))
else
to_chat(user, "<span class='info'>You are too far away to read the gauge.</span>")
to_chat(user, SPAN_INFO("You are too far away to read the gauge."))
if(welded)
to_chat(user, "<span class='info'>It seems welded shut.</span>")
to_chat(user, SPAN_INFO("It seems welded shut."))

/obj/machinery/atmospherics/unary/vent_scrubber/Dispose()
if(initial_loc)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/valve.dm
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
if(!powered())
return
if(!src.allowed(user))
to_chat(user, "<span class='danger'>Access denied.</span>")
to_chat(user, SPAN_DANGER("Access denied."))
return
..()

Expand Down Expand Up @@ -295,7 +295,7 @@
if(!iswrench(W))
return ..()
if(istype(src, /obj/machinery/atmospherics/valve/digital))
to_chat(user, "<span class='warning'>You cannot unwrench [src], it's too complicated.</span>")
to_chat(user, SPAN_WARNING("You cannot unwrench [src], it's too complicated."))
return 1

playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/mainspipe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ obj/machinery/atmospherics/mains_pipe/valve
attack_hand(mob/user as mob)
if(!src.allowed(user))
to_chat(user, "<span class='danger'>Access denied.</span>")
to_chat(user, SPAN_DANGER("Access denied."))
return
..()
Expand Down
6 changes: 3 additions & 3 deletions code/ATMOSPHERICS/pipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
return ..()
var/turf/T = src.loc
if(level == 1 && isturf(T) && T.intact_tile)
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
to_chat(user, SPAN_WARNING("You must remove the plating first."))
return 1

playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
Expand Down Expand Up @@ -207,7 +207,7 @@
return 1

/obj/machinery/atmospherics/pipe/simple/proc/burst()
src.visible_message("<span class='danger'>\bold [src] bursts!</span>");
src.visible_message(SPAN_DANGER("\bold [src] bursts!"));
playsound(src.loc, 'sound/effects/bang.ogg', 50, 1)
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(0,0, src.loc, 0)
Expand Down Expand Up @@ -1106,7 +1106,7 @@

if(istype(W, /obj/item/device/analyzer) && in_range(user, src))
for (var/mob/O in viewers(user, null))
to_chat(O, "<span class='danger'>[user] has used the analyzer on \icon[icon]</span>")
to_chat(O, SPAN_DANGER("[user] has used the analyzer on \icon[icon]"))

to_chat(user, SPAN_NOTICE(" Results of analysis of \icon[icon]"))
if (pressure>0)
Expand Down
5 changes: 1 addition & 4 deletions code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
//loop over the walls in the temple and make them a random pre-chosen mineral (null is a stand in for phoron, which the walls already are)
//treat phoron slightly differently because it's the default wall type
var/mineral = pick("uranium","sandstone","gold","iron","silver","diamond","clown","phoron")
//to_world("init [mineral]")
var/area/my_area = get_area(src)
var/list/temple_turfs = get_area_turfs(my_area.type)

Expand All @@ -90,13 +89,11 @@
T.icon_state = oldreplacetext(T.icon_state, "phoron", mineral)

/*for(var/obj/effect/landmark/falsewall_spawner/F in T.contents)
//to_world("falsewall_spawner found in wall")
var/obj/structure/temple_falsewall/fwall = new(F.loc)
fwall.mineral = mineral
qdel(F)
for(var/obj/effect/landmark/door_spawner/D in T.contents)
//to_world("door_spawner found in wall")
T = new /turf/open/floor(T.loc)
T.icon_state = "dark"
var/spawn_type = text2path("/obj/machinery/door/airlock/[door_mineral]")
Expand Down Expand Up @@ -135,7 +132,7 @@


/obj/machinery/jungle_controller/initialize()
to_world("<span class='danger'>\b Setting up jungle, this may take a bleeding eternity...</span>")
to_world(SPAN_DANGER("\b Setting up jungle, this may take a bleeding eternity..."))

//crash dat shuttle
var/area/start_location = locate(/area/jungle/crash_ship_source)
Expand Down
2 changes: 1 addition & 1 deletion code/WorkInProgress/Cael_Aislinn/Jungle/jungle_animals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
if(istype(L))
if(prob(15))
L.KnockDown(3)
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
L.visible_message(SPAN_DANGER("\the [src] knocks down \the [L]!"))

/mob/living/simple_animal/hostile/panther/AttackTarget()
..()
Expand Down
14 changes: 7 additions & 7 deletions code/WorkInProgress/Cael_Aislinn/Jungle/jungle_plants.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@
if(0 to 4)
H.next_move_slowdown += rand(2,3)
if(prob(2))
to_chat(H, "<span class='warning'>Moving through [src] slows you down.</span>")
to_chat(H, SPAN_WARNING("Moving through [src] slows you down."))
if(5 to 7)
H.next_move_slowdown += rand(4,7)
if(prob(10))
to_chat(H, "<span class='warning'>It is very hard to move trough this [src]...</span>")
to_chat(H, SPAN_WARNING("It is very hard to move trough this [src]..."))
if(8 to 9)
H.next_move_slowdown += rand(8,11)
to_chat(H, "<span class='warning'>You got tangeled in [src]!</span>")
to_chat(H, SPAN_WARNING("You got tangeled in [src]!"))
if(10)
H.next_move_slowdown += rand(12,20)
to_chat(H, "<span class='warning'>You got completely tangeled in [src]! Oh boy...</span>")
to_chat(H, SPAN_WARNING("You got completely tangeled in [src]! Oh boy..."))

/obj/structure/bush/attackby(var/obj/I as obj, var/mob/user as mob)
//hatchets and shiet can clear away undergrowth
Expand All @@ -74,9 +74,9 @@
damage = rand(8,18)
if(indestructable)
//this bush marks the edge of the map, you can't destroy it
to_chat(user, "<span class='danger'>You flail away at the undergrowth, but it's too thick here.</span>")
to_chat(user, SPAN_DANGER("You flail away at the undergrowth, but it's too thick here."))
else
user.visible_message("<span class='danger'>[user] flails away at the [src] with [I].</span>","<span class='danger'>You flail away at the [src] with [I].</span>")
user.visible_message(SPAN_DANGER("[user] flails away at the [src] with [I]."),SPAN_DANGER("You flail away at the [src] with [I]."))
playsound(src.loc, 'sound/effects/vegetation_hit.ogg', 25, 1)
health -= damage
if(health < 0)
Expand Down Expand Up @@ -186,4 +186,4 @@ var/jungle_plants_init = 0
fruit_overlay.Blend(rgb(fruit_r, fruit_g, fruit_b), ICON_ADD)
overlays += fruit_overlay
else
to_chat(user, "<span class='danger'>There are no fruit left on [src].</span>")
to_chat(user, SPAN_DANGER("There are no fruit left on [src]."))
8 changes: 4 additions & 4 deletions code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@

switch(trap_type)
if("sawburst")
to_chat(M, "<span class='warning'><b>A sawblade shoots out of the ground and strikes you!</b></span>")
to_chat(M, SPAN_WARNING("<b>A sawblade shoots out of the ground and strikes you!</b>"))
M.apply_damage(rand(5,10), BRUTE, sharp=1, edge=1)

var/atom/myloc = src.loc
Expand All @@ -309,7 +309,7 @@
qdel(flicker)
//flick("sawblade",src)
if("poison_dart")
to_chat(M, "<span class='warning'><b>You feel something small and sharp strike you!</b></span>")
to_chat(M, SPAN_WARNING("<b>You feel something small and sharp strike you!</b>"))
M.apply_damage(rand(5,10), TOX)

var/atom/myloc = src.loc
Expand All @@ -320,7 +320,7 @@
qdel(flicker)
//flick("dart[rand(1,3)]",src)
if("flame_burst")
to_chat(M, "<span class='warning'><b>A jet of fire comes out of nowhere!</b></span>")
to_chat(M, SPAN_WARNING("<b>A jet of fire comes out of nowhere!</b>"))
M.apply_damage(rand(5,10), BURN)

var/atom/myloc = src.loc
Expand All @@ -337,7 +337,7 @@
if("thrower")
//edited version of obj/effect/step_trigger/thrower
var/throw_dir = pick(1,2,4,8)
M.visible_message("<span class='danger'><b>The floor under [M] suddenly tips upward!</b></span>","<span class='danger'><b>The floor tips upward under you!</b></span>")
M.visible_message(SPAN_DANGER("<b>The floor under [M] suddenly tips upward!</b>"),SPAN_DANGER("<b>The floor tips upward under you!</b>"))

var/atom/myloc = src.loc
var/image/flicker = image('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"throw[throw_dir]")
Expand Down
2 changes: 1 addition & 1 deletion code/WorkInProgress/Cael_Aislinn/Jungle/jungle_tribe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
emote("waves a spear at [.]")

/mob/living/simple_animal/hostile/tribesman/OpenFire(target_mob)
visible_message("<span class='danger'><b>[src]</b> throws a spear at [target_mob]!</span>", 1)
visible_message(SPAN_DANGER("<b>[src]</b> throws a spear at [target_mob]!"), 1)
flick(src, "native[my_type]_act")

var/tturf = get_turf(target_mob)
Expand Down
2 changes: 1 addition & 1 deletion code/WorkInProgress/Ported/policetape.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
add_fingerprint(M)
if(!allowed(M)) //only select few learn art of not crumpling the tape
if(ishuman(M))
to_chat(M, "<span class='warning'>You are not supposed to go past [src]...</span>")
to_chat(M, SPAN_WARNING("You are not supposed to go past [src]..."))
crumple()

/obj/item/tape/attackby(obj/item/W as obj, mob/user as mob)
Expand Down
Loading

0 comments on commit cef5b81

Please sign in to comment.