cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactors most spans

Browse Source
This commit is contained in:
Kashargul
2024-10-02 21:10:31 +02:00
parent 5417c7772c
commit a2c673ab7a
1517 changed files with 12436 additions and 12347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/bot/SLed209bot.dm
+12 -13
View File
@@ -81,7 +81,7 @@
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add the robot leg to [src].</span>")
to_chat(user, span_notice("You add the robot leg to [src]."))
name = "legs/frame assembly"
if(build_step == 1)
icon_state = "ed209_leg"
@@ -93,7 +93,7 @@
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add the armor to [src].</span>")
to_chat(user, span_notice("You add the armor to [src]."))
name = "vest/legs/frame assembly"
item_state = "ed209_shell"
icon_state = "ed209_shell"
@@ -104,13 +104,13 @@
if(WT.remove_fuel(0, user))
build_step++
name = "shielded frame assembly"
to_chat(user, "<span class='notice'>You welded the vest to [src].</span>")
to_chat(user, span_notice("You welded the vest to [src]."))
if(4)
if(istype(W, /obj/item/clothing/head/helmet))
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add the helmet to [src].</span>")
to_chat(user, span_notice("You add the helmet to [src]."))
name = "covered and shielded frame assembly"
item_state = "ed209_hat"
icon_state = "ed209_hat"
@@ -120,7 +120,7 @@
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add the prox sensor to [src].</span>")
to_chat(user, span_notice("You add the prox sensor to [src]."))
name = "covered, shielded and sensored frame assembly"
item_state = "ed209_prox"
icon_state = "ed209_prox"
@@ -129,13 +129,13 @@
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if (C.get_amount() < 1)
to_chat(user, "<span class='warning'>You need one coil of wire to wire [src].</span>")
to_chat(user, span_warning("You need one coil of wire to wire [src]."))
return
to_chat(user, "<span class='notice'>You start to wire [src].</span>")
to_chat(user, span_notice("You start to wire [src]."))
if(do_after(user, 40) && build_step == 6)
if(C.use(1))
build_step++
to_chat(user, "<span class='notice'>You wire the ED-209 assembly.</span>")
to_chat(user, span_notice("You wire the ED-209 assembly."))
name = "wired ED-209 assembly"
return
@@ -145,7 +145,7 @@
item_state = "sled209_taser"
icon_state = "sled209_taser"
build_step++
to_chat(user, "<span class='notice'>You add [W] to [src].</span>")
to_chat(user, span_notice("You add [W] to [src]."))
user.drop_item()
qdel(W)
@@ -153,21 +153,20 @@
if(W.has_tool_quality(TOOL_SCREWDRIVER))
playsound(src, W.usesound, 100, 1)
var/turf/T = get_turf(user)
to_chat(user, "<span class='notice'>Now attaching the gun to the frame...</span>")
to_chat(user, span_notice("Now attaching the gun to the frame..."))
sleep(40)
if(get_turf(user) == T && build_step == 8)
build_step++
name = "armed [name]"
to_chat(user, "<span class='notice'>Taser gun attached.</span>")
to_chat(user, span_notice("Taser gun attached."))
if(9)
if(istype(W, /obj/item/cell))
build_step++
to_chat(user, "<span class='notice'>You complete the ED-209.</span>")
to_chat(user, span_notice("You complete the ED-209."))
var/turf/T = get_turf(src)
new /mob/living/bot/secbot/ed209/slime(T,created_name,lasercolor)
user.drop_item()
qdel(W)
user.drop_from_inventory(src)
qdel(src)
code/modules/mob/living/bot/bot.dm
+11 -11
View File
@@ -115,23 +115,23 @@
if(O.GetID())
if(access_scanner.allowed(user) && !open)
locked = !locked
to_chat(user, "<span class='notice'>Controls are now [locked ? "locked." : "unlocked."]</span>")
to_chat(user, span_notice("Controls are now [locked ? "locked." : "unlocked."]"))
attack_hand(user)
if(emagged)
to_chat(user, "<span class='warning'>ERROR! SYSTEMS COMPROMISED!</span>")
to_chat(user, span_warning("ERROR! SYSTEMS COMPROMISED!"))
else
if(open)
to_chat(user, "<span class='warning'>Please close the access panel before locking it.</span>")
to_chat(user, span_warning("Please close the access panel before locking it."))
else
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return
else if(O.has_tool_quality(TOOL_SCREWDRIVER))
if(!locked)
open = !open
to_chat(user, "<span class='notice'>Maintenance panel is now [open ? "opened" : "closed"].</span>")
to_chat(user, span_notice("Maintenance panel is now [open ? "opened" : "closed"]."))
playsound(src, O.usesound, 50, 1)
else
to_chat(user, "<span class='notice'>You need to unlock the controls first.</span>")
to_chat(user, span_notice("You need to unlock the controls first."))
return
else if(O.has_tool_quality(TOOL_WELDER))
if(health < getMaxHealth())
@@ -145,20 +145,20 @@
else
fireloss = fireloss - 10
updatehealth()
user.visible_message("<span class='notice'>[user] repairs [src].</span>","<span class='notice'>You repair [src].</span>")
user.visible_message(span_notice("[user] repairs [src]."),span_notice("You repair [src]."))
playsound(src, O.usesound, 50, 1)
else
to_chat(user, "<span class='notice'>Unable to repair with the maintenance panel closed.</span>")
to_chat(user, span_notice("Unable to repair with the maintenance panel closed."))
else
to_chat(user, "<span class='notice'>[src] does not need a repair.</span>")
to_chat(user, span_notice("[src] does not need a repair."))
return
else if(istype(O, /obj/item/assembly/prox_sensor) && emagged)
if(open)
to_chat(user, "<span class='notice'>You repair the bot's systems.</span>")
to_chat(user, span_notice("You repair the bot's systems."))
emagged = 0
qdel(O)
else
to_chat(user, "<span class='notice'>Unable to repair with the maintenance panel closed.</span>")
to_chat(user, span_notice("Unable to repair with the maintenance panel closed."))
else if(istype(O, /obj/item/paicard))
if(open)
insertpai(user, O)
code/modules/mob/living/bot/cleanbot.dm
+5 -5
View File
@@ -154,7 +154,7 @@
/mob/living/bot/cleanbot/explode()
on = 0
visible_message("<span class='danger'>[src] blows apart!</span>")
visible_message(span_danger("[src] blows apart!"))
var/turf/Tsec = get_turf(src)
new /obj/item/reagent_containers/glass/bucket(Tsec)
@@ -222,18 +222,18 @@
. = TRUE
if("wet_floors")
wet_floors = !wet_floors
to_chat(usr, "<span class='notice'>You twiddle the screw.</span>")
to_chat(usr, span_notice("You twiddle the screw."))
. = TRUE
if("spray_blood")
spray_blood = !spray_blood
to_chat(usr, "<span class='notice'>You press the weird button.</span>")
to_chat(usr, span_notice("You press the weird button."))
. = TRUE
/mob/living/bot/cleanbot/emag_act(var/remaining_uses, var/mob/user)
. = ..()
if(!wet_floors || !spray_blood)
if(user)
to_chat(user, "<span class='notice'>The [src] buzzes and beeps.</span>")
to_chat(user, span_notice("The [src] buzzes and beeps."))
playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0)
spray_blood = 1
wet_floors = 1
@@ -264,7 +264,7 @@
var/turf/T = get_turf(loc)
var/mob/living/bot/cleanbot/A = new /mob/living/bot/cleanbot(T)
A.name = created_name
to_chat(user, "<span class='notice'>You add the robot arm to the bucket and sensor assembly. Beep boop!</span>")
to_chat(user, span_notice("You add the robot arm to the bucket and sensor assembly. Beep boop!"))
user.drop_from_inventory(src)
qdel(src)
code/modules/mob/living/bot/ed209bot.dm
+14 -14
View File
@@ -27,7 +27,7 @@
icon_state = "ed209[on]"
/mob/living/bot/secbot/ed209/explode()
visible_message("<span class='warning'>[src] blows apart!</span>")
visible_message(span_warning("[src] blows apart!"))
var/turf/Tsec = get_turf(src)
new /obj/item/secbot_assembly/ed209_assembly(Tsec)
@@ -101,7 +101,7 @@
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add the robot leg to [src].</span>")
to_chat(user, span_notice("You add the robot leg to [src]."))
name = "legs/frame assembly"
if(build_step == 1)
icon_state = "ed209_leg"
@@ -113,7 +113,7 @@
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add the armor to [src].</span>")
to_chat(user, span_notice("You add the armor to [src]."))
name = "vest/legs/frame assembly"
item_state = "ed209_shell"
icon_state = "ed209_shell"
@@ -124,13 +124,13 @@
if(WT.remove_fuel(0, user))
build_step++
name = "shielded frame assembly"
to_chat(user, "<span class='notice'>You welded the vest to [src].</span>")
to_chat(user, span_notice("You welded the vest to [src]."))
if(4)
if(istype(W, /obj/item/clothing/head/helmet))
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add the helmet to [src].</span>")
to_chat(user, span_notice("You add the helmet to [src]."))
name = "covered and shielded frame assembly"
item_state = "ed209_hat"
icon_state = "ed209_hat"
@@ -140,7 +140,7 @@
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add the prox sensor to [src].</span>")
to_chat(user, span_notice("You add the prox sensor to [src]."))
name = "covered, shielded and sensored frame assembly"
item_state = "ed209_prox"
icon_state = "ed209_prox"
@@ -149,13 +149,13 @@
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if (C.get_amount() < 1)
to_chat(user, "<span class='warning'>You need one coil of wire to wire [src].</span>")
to_chat(user, span_warning("You need one coil of wire to wire [src]."))
return
to_chat(user, "<span class='notice'>You start to wire [src].</span>")
to_chat(user, span_notice("You start to wire [src]."))
if(do_after(user, 40) && build_step == 6)
if(C.use(1))
build_step++
to_chat(user, "<span class='notice'>You wire the ED-209 assembly.</span>")
to_chat(user, span_notice("You wire the ED-209 assembly."))
name = "wired ED-209 assembly"
return
@@ -165,7 +165,7 @@
item_state = "sled209_taser"
icon_state = "sled209_taser"
build_step++
to_chat(user, "<span class='notice'>You add [W] to [src].</span>")
to_chat(user, span_notice("You add [W] to [src]."))
user.drop_item()
qdel(W)
var/turf/T = get_turf(src)
@@ -183,7 +183,7 @@
item_state = "ed209_taser"
icon_state = "ed209_taser"
build_step++
to_chat(user, "<span class='notice'>You add [W] to [src].</span>")
to_chat(user, span_notice("You add [W] to [src]."))
user.drop_item()
qdel(W)
@@ -191,17 +191,17 @@
if(W.has_tool_quality(TOOL_SCREWDRIVER))
playsound(src, W.usesound, 100, 1)
var/turf/T = get_turf(user)
to_chat(user, "<span class='notice'>Now attaching the gun to the frame...</span>")
to_chat(user, span_notice("Now attaching the gun to the frame..."))
sleep(40)
if(get_turf(user) == T && build_step == 8)
build_step++
name = "armed [name]"
to_chat(user, "<span class='notice'>Taser gun attached.</span>")
to_chat(user, span_notice("Taser gun attached."))
if(9)
if(istype(W, /obj/item/cell))
build_step++
to_chat(user, "<span class='notice'>You complete the ED-209.</span>")
to_chat(user, span_notice("You complete the ED-209."))
var/turf/T = get_turf(src)
var/mob/living/bot/secbot/ed209/S = new /mob/living/bot/secbot/ed209(T)
S.name = created_name
code/modules/mob/living/bot/edCLNbot.dm
+17 -17
View File
@@ -44,7 +44,7 @@
if(!red_switch && !blue_switch && green_switch && prob(10) || src.emagged)
if(istype(loc, /turf/simulated))
var/turf/simulated/T = loc
visible_message("<span class='warning'>\The [src] stomps on \the [T], breaking it!</span>")
visible_message(span_warning("\The [src] stomps on \the [T], breaking it!"))
qdel(T)
if(red_switch && blue_switch && green_switch && prob(1))
@@ -52,7 +52,7 @@
/mob/living/bot/cleanbot/edCLN/explode()
on = 0
visible_message("<span class='danger'>[src] blows apart!</span>")
visible_message(span_danger("[src] blows apart!"))
var/turf/Tsec = get_turf(src)
new /obj/item/secbot_assembly/ed209_assembly(Tsec)
@@ -87,22 +87,22 @@
switch(action)
if("red_switch")
red_switch = !red_switch
to_chat(usr, "<span class='notice'>You flip the red switch [red_switch ? "on" : "off"].</span>")
to_chat(usr, span_notice("You flip the red switch [red_switch ? "on" : "off"]."))
. = TRUE
if("green_switch")
green_switch = !green_switch
to_chat(usr, "<span class='notice'>You flip the green switch [green_switch ? "on" : "off"].</span>")
to_chat(usr, span_notice("You flip the green switch [green_switch ? "on" : "off"]."))
. = TRUE
if("blue_switch")
blue_switch = !blue_switch
to_chat(usr, "<span class='notice'>You flip the blue switch [blue_switch ? "on" : "off"].</span>")
to_chat(usr, span_notice("You flip the blue switch [blue_switch ? "on" : "off"]."))
. = TRUE
/mob/living/bot/cleanbot/edCLN/emag_act(var/remaining_uses, var/mob/user)
. = ..()
if(!emagged)
if(user)
to_chat(user, "<span class='notice'>The [src] buzzes and beeps.</span>")
to_chat(user, span_notice("The [src] buzzes and beeps."))
playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0)
emagged = 1
return 1
@@ -135,7 +135,7 @@
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add \the [W] to \the [src].</span>")
to_chat(user, span_notice("You add \the [W] to \the [src]."))
name = "legs/frame assembly"
if(build_step == 1)
icon_state = "ed209_leg"
@@ -147,7 +147,7 @@
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add \the [W] to \the [src].</span>")
to_chat(user, span_notice("You add \the [W] to \the [src]."))
name = "bucket/legs/frame assembly"
item_state = "edCLN_bucket"
icon_state = "edCLN_bucket"
@@ -158,13 +158,13 @@
if(WT.remove_fuel(0, user))
build_step++
name = "bucketed frame assembly"
to_chat(user, "<span class='notice'>You welded the bucket to \the [src].</span>")
to_chat(user, span_notice("You welded the bucket to \the [src]."))
if(4)
if(isprox(W))
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add \the [W] to \the [src].</span>")
to_chat(user, span_notice("You add \the [W] to \the [src]."))
name = "proximity bucket ED assembly"
item_state = "edCLN_prox"
icon_state = "edCLN_prox"
@@ -173,13 +173,13 @@
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if (C.get_amount() < 1)
to_chat(user, "<span class='warning'>You need one coil of wire to wire \the [src].</span>")
to_chat(user, span_warning("You need one coil of wire to wire \the [src]."))
return
to_chat(user, "<span class='notice'>You start to wire \the [src].</span>")
to_chat(user, span_notice("You start to wire \the [src]."))
if(do_after(user, 40))
if(C.use(1))
build_step++
to_chat(user, "<span class='notice'>You wire the ED-CLN assembly.</span>")
to_chat(user, span_notice("You wire the ED-CLN assembly."))
name = "wired ED-CLN assembly"
return
@@ -187,7 +187,7 @@
if(istype(W, /obj/item/mop))
name = "mop ED-CLN assembly"
build_step++
to_chat(user, "<span class='notice'>You add \the [W] to \the [src].</span>")
to_chat(user, span_notice("You add \the [W] to \the [src]."))
item_state = "edCLN_mop"
icon_state = "edCLN_mop"
user.drop_item()
@@ -197,16 +197,16 @@
if(W.has_tool_quality(TOOL_SCREWDRIVER))
playsound(src, W.usesound, 100, 1)
var/turf/T = get_turf(user)
to_chat(user, "<span class='notice'>Attatching the mop to the frame...</span>")
to_chat(user, span_notice("Attatching the mop to the frame..."))
if(do_after(user, 40) && get_turf(user) == T)
build_step++
name = "mopped ED-CLN assembly"
to_chat(user, "<span class='notice'>Mop attached.</span>")
to_chat(user, span_notice("Mop attached."))
if(8)
if(istype(W, /obj/item/cell))
build_step++
to_chat(user, "<span class='notice'>You complete the ED-CLN.</span>")
to_chat(user, span_notice("You complete the ED-CLN."))
var/turf/T = get_turf(src)
var/mob/living/bot/cleanbot/edCLN/S = new /mob/living/bot/cleanbot/edCLN(T)
S.name = created_name
code/modules/mob/living/bot/farmbot.dm
+15 -15
View File
@@ -74,9 +74,9 @@
. = ..()
if(!emagged)
if(user)
to_chat(user, "<span class='notice'>You short out [src]'s plant identifier circuits.</span>")
to_chat(user, span_notice("You short out [src]'s plant identifier circuits."))
spawn(rand(30, 50))
visible_message("<span class='warning'>[src] buzzes oddly.</span>")
visible_message(span_warning("[src] buzzes oddly."))
emagged = 1
return 1
@@ -189,40 +189,40 @@
if(FARMBOT_COLLECT)
action = "water" // Needs a better one
update_icons()
visible_message("<span class='notice'>[src] starts [T.dead? "removing the plant from" : "harvesting"] \the [A].</span>")
visible_message(span_notice("[src] starts [T.dead? "removing the plant from" : "harvesting"] \the [A]."))
busy = 1
if(do_after(src, 30, A))
visible_message("<span class='notice'>[src] [T.dead? "removes the plant from" : "harvests"] \the [A].</span>")
visible_message(span_notice("[src] [T.dead? "removes the plant from" : "harvests"] \the [A]."))
T.attack_hand(src)
if(FARMBOT_WATER)
action = "water"
update_icons()
visible_message("<span class='notice'>[src] starts watering \the [A].</span>")
visible_message(span_notice("[src] starts watering \the [A]."))
busy = 1
if(do_after(src, 30, A))
playsound(src, 'sound/effects/slosh.ogg', 25, 1)
visible_message("<span class='notice'>[src] waters \the [A].</span>")
visible_message(span_notice("[src] waters \the [A]."))
tank.reagents.trans_to(T, 100 - T.waterlevel)
if(FARMBOT_UPROOT)
action = "hoe"
update_icons()
visible_message("<span class='notice'>[src] starts uprooting the weeds in \the [A].</span>")
visible_message(span_notice("[src] starts uprooting the weeds in \the [A]."))
busy = 1
if(do_after(src, 30))
visible_message("<span class='notice'>[src] uproots the weeds in \the [A].</span>")
visible_message(span_notice("[src] uproots the weeds in \the [A]."))
T.weedlevel = 0
if(FARMBOT_NUTRIMENT)
action = "fertile"
update_icons()
visible_message("<span class='notice'>[src] starts fertilizing \the [A].</span>")
visible_message(span_notice("[src] starts fertilizing \the [A]."))
busy = 1
if(do_after(src, 30, A))
visible_message("<span class='notice'>[src] fertilizes \the [A].</span>")
visible_message(span_notice("[src] fertilizes \the [A]."))
T.reagents.add_reagent("ammonia", 10)
busy = 0
@@ -234,7 +234,7 @@
return
action = "water"
update_icons()
visible_message("<span class='notice'>[src] starts refilling its tank from \the [A].</span>")
visible_message(span_notice("[src] starts refilling its tank from \the [A]."))
busy = 1
while(do_after(src, 10) && tank.reagents.total_volume < tank.reagents.maximum_volume)
@@ -245,7 +245,7 @@
busy = 0
action = ""
update_icons()
visible_message("<span class='notice'>[src] finishes refilling its tank.</span>")
visible_message(span_notice("[src] finishes refilling its tank."))
else if(emagged && ishuman(A))
var/action = pick("weed", "water")
@@ -258,18 +258,18 @@
flick("farmbot_hoe", src)
do_attack_animation(A)
if(prob(50))
visible_message("<span class='danger'>[src] swings wildly at [A] with a minihoe, missing completely!</span>")
visible_message(span_danger("[src] swings wildly at [A] with a minihoe, missing completely!"))
return
var/t = pick("slashed", "sliced", "cut", "clawed")
A.attack_generic(src, 5, t)
if("water")
flick("farmbot_water", src)
visible_message("<span class='danger'>[src] splashes [A] with water!</span>")
visible_message(span_danger("[src] splashes [A] with water!"))
tank.reagents.splash(A, 100)
/mob/living/bot/farmbot/explode()
visible_message("<span class='danger'>[src] blows apart!</span>")
visible_message(span_danger("[src] blows apart!"))
var/turf/Tsec = get_turf(src)
new /obj/item/material/minihoe(Tsec)
code/modules/mob/living/bot/floorbot.dm
+9 -9
View File
@@ -68,7 +68,7 @@
if(!emagged)
emagged = 1
if(user)
to_chat(user, "<span class='notice'>The [src] buzzes and beeps.</span>")
to_chat(user, span_notice("The [src] buzzes and beeps."))
playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0)
return 1
@@ -208,12 +208,12 @@
busy = 1
update_icons()
if(F.flooring)
visible_message("<span class='warning'>\The [src] begins to tear the floor tile from the floor!</span>")
visible_message(span_warning("\The [src] begins to tear the floor tile from the floor!"))
if(do_after(src, 50))
F.break_tile_to_plating()
addTiles(1)
else
visible_message("<span class='danger'>\The [src] begins to tear through the floor!</span>")
visible_message(span_danger("\The [src] begins to tear through the floor!"))
if(do_after(src, 150)) // Extra time because this can and will kill.
F.ReplaceWithLattice()
addTiles(1)
@@ -289,7 +289,7 @@
/mob/living/bot/floorbot/explode()
turn_off()
visible_message("<span class='danger'>\The [src] blows apart!</span>")
visible_message(span_danger("\The [src] blows apart!"))
playsound(src, "sparks", 50, 1)
var/turf/Tsec = get_turf(src)
@@ -345,18 +345,18 @@
..()
return
if(contents.len >= 1)
to_chat(user, "<span class='notice'>They wont fit in as there is already stuff inside.</span>")
to_chat(user, span_notice("They wont fit in as there is already stuff inside."))
return
if(user.s_active)
user.s_active.close(user)
if(T.use(10))
var/obj/item/toolbox_tiles/B = new /obj/item/toolbox_tiles
user.put_in_hands(B)
to_chat(user, "<span class='notice'>You add the tiles into the empty toolbox. They protrude from the top.</span>")
to_chat(user, span_notice("You add the tiles into the empty toolbox. They protrude from the top."))
user.drop_from_inventory(src)
qdel(src)
else
to_chat(user, "<span class='warning'>You need 10 floor tiles for a floorbot.</span>")
to_chat(user, span_warning("You need 10 floor tiles for a floorbot."))
return
/obj/item/toolbox_tiles
@@ -378,7 +378,7 @@
var/obj/item/toolbox_tiles_sensor/B = new /obj/item/toolbox_tiles_sensor()
B.created_name = created_name
user.put_in_hands(B)
to_chat(user, "<span class='notice'>You add the sensor to the toolbox and tiles!</span>")
to_chat(user, span_notice("You add the sensor to the toolbox and tiles!"))
user.drop_from_inventory(src)
qdel(src)
else if (istype(W, /obj/item/pen))
@@ -408,7 +408,7 @@
var/turf/T = get_turf(user.loc)
var/mob/living/bot/floorbot/A = new /mob/living/bot/floorbot(T)
A.name = created_name
to_chat(user, "<span class='notice'>You add the robot arm to the odd looking toolbox assembly! Boop beep!</span>")
to_chat(user, span_notice("You add the robot arm to the odd looking toolbox assembly! Boop beep!"))
user.drop_from_inventory(src)
qdel(src)
else if(istype(W, /obj/item/pen))
code/modules/mob/living/bot/medbot.dm
+21 -21
View File
@@ -143,7 +143,7 @@
if(!t)
return
visible_message("<span class='warning'>[src] is trying to inject [H]!</span>")
visible_message(span_warning("[src] is trying to inject [H]!"))
if(declare_treatment)
var/area/location = get_area(src)
global_announcer.autosay("[src] is treating <b>[H]</b> in <b>[location]</b>", "[src]", "Medical")
@@ -154,7 +154,7 @@
reagent_glass.reagents.trans_to_mob(H, injection_amount, CHEM_BLOOD)
else
H.reagents.add_reagent(t, injection_amount)
visible_message("<span class='warning'>[src] injects [H] with the syringe!</span>")
visible_message(span_warning("[src] injects [H] with the syringe!"))
if(H.stat == DEAD) // This is down here because this proc won't be called again due to losing a target because of parent AI loop.
target = null
@@ -197,7 +197,7 @@
/mob/living/bot/medbot/attack_hand(mob/living/carbon/human/H)
if(istype(H) && H.a_intent == I_DISARM && !is_tipped)
H.visible_message("<span class='danger'>[H] begins tipping over [src].</span>", "<span class='warning'>You begin tipping over [src]...</span>")
H.visible_message(span_danger("[H] begins tipping over [src]."), span_warning("You begin tipping over [src]..."))
if(world.time > last_tipping_action_voice + 15 SECONDS)
last_tipping_action_voice = world.time // message for tipping happens when we start interacting, message for righting comes after finishing
@@ -210,7 +210,7 @@
tip_over(H)
else if(istype(H) && H.a_intent == I_HELP && is_tipped)
H.visible_message("<span class='notice'>[H] begins righting [src].</span>", "<span class='notice'>You begin righting [src]...</span>")
H.visible_message(span_notice("[H] begins righting [src]."), span_notice("You begin righting [src]..."))
if(do_after(H, 3 SECONDS, target=src))
set_right(H)
else
@@ -251,16 +251,16 @@
/mob/living/bot/medbot/attackby(var/obj/item/O, var/mob/user)
if(istype(O, /obj/item/reagent_containers/glass))
if(locked)
to_chat(user, "<span class='notice'>You cannot insert a beaker because the panel is locked.</span>")
to_chat(user, span_notice("You cannot insert a beaker because the panel is locked."))
return
if(!isnull(reagent_glass))
to_chat(user, "<span class='notice'>There is already a beaker loaded.</span>")
to_chat(user, span_notice("There is already a beaker loaded."))
return
user.drop_item()
O.loc = src
reagent_glass = O
to_chat(user, "<span class='notice'>You insert [O].</span>")
to_chat(user, span_notice("You insert [O]."))
return
else
..()
@@ -316,8 +316,8 @@
. = ..()
if(!emagged)
if(user)
to_chat(user, "<span class='warning'>You short out [src]'s reagent synthesis circuits.</span>")
visible_message("<span class='warning'>[src] buzzes oddly!</span>")
to_chat(user, span_warning("You short out [src]'s reagent synthesis circuits."))
visible_message(span_warning("[src] buzzes oddly!"))
flick("medibot_spark", src)
target = null
busy = 0
@@ -329,7 +329,7 @@
/mob/living/bot/medbot/explode()
on = 0
visible_message("<span class='danger'>[src] blows apart!</span>")
visible_message(span_danger("[src] blows apart!"))
var/turf/Tsec = get_turf(src)
new /obj/item/storage/firstaid(Tsec)
@@ -360,7 +360,7 @@
/mob/living/bot/medbot/proc/tip_over(mob/user)
playsound(src, 'sound/machines/warning-buzzer.ogg', 50)
user.visible_message("<span class='danger'>[user] tips over [src]!</span>", "<span class='danger'>You tip [src] over!</span>")
user.visible_message(span_danger("[user] tips over [src]!"), span_danger("You tip [src] over!"))
is_tipped = TRUE
tipper_name = user.name
var/matrix/mat = transform
@@ -369,13 +369,13 @@
/mob/living/bot/medbot/proc/set_right(mob/user)
var/list/messagevoice
if(user)
user.visible_message("<span class='notice'>[user] sets [src] right-side up!</span>", "<span class='green'>You set [src] right-side up!</span>")
user.visible_message(span_notice("[user] sets [src] right-side up!"), span_green("You set [src] right-side up!"))
if(user.name == tipper_name)
messagevoice = list("I forgive you." = 'sound/voice/medbot/forgive.ogg')
else
messagevoice = list("Thank you!" = 'sound/voice/medbot/thank_you.ogg', "You are a good person." = 'sound/voice/medbot/youre_good.ogg')
else
visible_message("<span class='notice'>[src] manages to [pick("writhe", "wriggle", "wiggle")] enough to right itself.</span>")
visible_message(span_notice("[src] manages to [pick("writhe", "wriggle", "wiggle")] enough to right itself."))
messagevoice = list("Fuck you." = 'sound/voice/medbot/fuck_you.ogg', "Your behavior has been reported, have a nice day." = 'sound/voice/medbot/reported.ogg')
tipper_name = null
@@ -430,9 +430,9 @@
if(MEDBOT_PANIC_MED to MEDBOT_PANIC_HIGH)
. += "They are tipped over and appear visibly distressed." // now we humanize the medbot as a they, not an it
if(MEDBOT_PANIC_HIGH to MEDBOT_PANIC_FUCK)
. += "<span class='warning'>They are tipped over and visibly panicking!</span>"
. += span_warning("They are tipped over and visibly panicking!")
if(MEDBOT_PANIC_FUCK to INFINITY)
. += "<span class='warning'><b>They are freaking out from being tipped over!</b></span>"
. += span_warning("<b>They are freaking out from being tipped over!</b>")
/mob/living/bot/medbot/confirmTarget(var/mob/living/carbon/human/H)
if(!..())
@@ -477,7 +477,7 @@
return
if(contents.len >= 1)
to_chat(user, "<span class='notice'>You need to empty [src] out first.</span>")
to_chat(user, span_notice("You need to empty [src] out first."))
return
var/obj/item/firstaid_arm_assembly/A = new /obj/item/firstaid_arm_assembly
@@ -490,7 +490,7 @@
qdel(S)
user.put_in_hands(A)
to_chat(user, "<span class='notice'>You add the robot arm to the first aid kit.</span>")
to_chat(user, span_notice("You add the robot arm to the first aid kit."))
user.drop_from_inventory(src)
qdel(src)
@@ -500,7 +500,7 @@
return
if(contents.len >= 1)
to_chat(user, "<span class='notice'>You need to empty [src] out first.</span>")
to_chat(user, span_notice("You need to empty [src] out first."))
return
var/obj/item/firstaid_arm_assembly/A = new /obj/item/firstaid_arm_assembly
@@ -513,7 +513,7 @@
qdel(S)
user.put_in_hands(A)
to_chat(user, "<span class='notice'>You add the robot arm to the first aid kit.</span>")
to_chat(user, span_notice("You add the robot arm to the first aid kit."))
user.drop_from_inventory(src)
qdel(src)
@@ -548,7 +548,7 @@
user.drop_item()
qdel(W)
build_step++
to_chat(user, "<span class='notice'>You add the health sensor to [src].</span>")
to_chat(user, span_notice("You add the health sensor to [src]."))
name = "First aid/robot arm/health analyzer assembly"
add_overlay("na_scanner")
@@ -556,7 +556,7 @@
if(isprox(W))
user.drop_item()
qdel(W)
to_chat(user, "<span class='notice'>You complete the Medibot! Beep boop.</span>")
to_chat(user, span_notice("You complete the Medibot! Beep boop."))
var/turf/T = get_turf(src)
var/mob/living/bot/medbot/S = new /mob/living/bot/medbot(T)
S.skin = skin
code/modules/mob/living/bot/mulebot.dm
+4 -4
View File
@@ -168,7 +168,7 @@
/mob/living/bot/mulebot/emag_act(var/remaining_charges, var/user)
locked = !locked
to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] the mulebot's controls!</span>")
to_chat(user, span_notice("You [locked ? "lock" : "unlock"] the mulebot's controls!"))
flick("mulebot-emagged", src)
playsound(src, 'sound/effects/sparks1.ogg', 100, 0)
return 1
@@ -223,14 +223,14 @@
/mob/living/bot/mulebot/Bump(var/mob/living/M)
if(!safety && istype(M))
visible_message("<span class='warning'>[src] knocks over [M]!</span>")
visible_message(span_warning("[src] knocks over [M]!"))
M.Stun(8)
M.Weaken(5)
..()
/mob/living/bot/mulebot/proc/runOver(var/mob/living/M)
if(istype(M)) // At this point, MULEBot has somehow crossed over onto your tile with you still on it. CRRRNCH.
visible_message("<span class='warning'>[src] drives over [M]!</span>")
visible_message(span_warning("[src] drives over [M]!"))
playsound(src, 'sound/effects/splat.ogg', 50, 1)
var/damage = rand(5, 7)
@@ -250,7 +250,7 @@
/mob/living/bot/mulebot/explode()
unload(pick(0, 1, 2, 4, 8))
visible_message("<span class='danger'>[src] blows apart!</span>")
visible_message(span_danger("[src] blows apart!"))
var/turf/Tsec = get_turf(src)
new /obj/item/assembly/prox_sensor(Tsec)
code/modules/mob/living/bot/secbot.dm
+6 -6
View File
@@ -168,13 +168,13 @@
. = ..()
if(!emagged)
if(user)
to_chat(user, "<span class='notice'>\The [src] buzzes and beeps.</span>")
to_chat(user, span_notice("\The [src] buzzes and beeps."))
emagged = TRUE
patrol_speed = 3
target_speed = 4
return TRUE
else
to_chat(user, "<span class='notice'>\The [src] is already corrupt.</span>")
to_chat(user, span_notice("\The [src] is already corrupt."))
/mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user)
var/curhealth = health
@@ -328,11 +328,11 @@
spawn(2)
busy = FALSE
update_icons()
visible_message("<span class='warning'>\The [H] was prodded by \the [src] with a stun baton!</span>")
visible_message(span_warning("\The [H] was prodded by \the [src] with a stun baton!"))
insult(H)
else
playsound(src, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
visible_message("<span class='warning'>\The [src] is trying to put handcuffs on \the [H]!</span>")
visible_message(span_warning("\The [src] is trying to put handcuffs on \the [H]!"))
busy = TRUE
if(do_mob(src, H, 60))
if(!H.handcuffed)
@@ -352,7 +352,7 @@
spawn(2)
busy = FALSE
update_icons()
visible_message("<span class='warning'>\The [M] was beaten by \the [src] with a stun baton!</span>")
visible_message(span_warning("\The [M] was beaten by \the [src] with a stun baton!"))
insult(L)
/mob/living/bot/secbot/slime/UnarmedAttack(var/mob/living/L, var/proximity)
@@ -363,7 +363,7 @@
S.slimebatoned(src, xeno_stun_strength)
/mob/living/bot/secbot/explode()
visible_message("<span class='warning'>[src] blows apart!</span>")
visible_message(span_warning("[src] blows apart!"))
var/turf/Tsec = get_turf(src)
var/obj/item/secbot_assembly/Sa = new /obj/item/secbot_assembly(Tsec)