cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed some more spans from visible messages.

Browse Source
This commit is contained in:
kingofkosmos
2015-04-24 21:06:59 +03:00
parent a7bd5f93e1
commit de280c72b5
57 changed files with 216 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/item_attack.dm
+3 -3
View File
@@ -44,12 +44,12 @@
/mob/living/simple_animal/attacked_by(var/obj/item/I, var/mob/living/user)
if(!I.force)
user.visible_message("<span class='warning'>[user] gently taps [src] with [I].</span>",\
"<span class='warning'>This weapon is ineffective, it does no damage.</span>")
"<span class='warning'>This weapon is ineffective, it does no damage!</span>")
else if(I.force >= force_threshold && I.damtype != STAMINA)
..()
else
visible_message("<span class='danger'>[I] bounces harmlessly off of [src].</span>",\
"<span class='userdanger'>[I] bounces harmlessly off of [src].</span>")
visible_message("<span class='warning'>[I] bounces harmlessly off of [src].</span>",\
"<span class='warning'>[I] bounces harmlessly off of [src]!</span>")
code/game/dna.dm
+1 -1
View File
@@ -411,7 +411,7 @@
return
locked = 0
visible_message("<span class='danger'>[user] successfully broke out of [src]!</span>")
visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>")
user << "<span class='notice'>You successfully break out of [src]!</span>"
open_machine()
code/game/gamemodes/abduction/abduction_surgery.dm
+5 -5
View File
@@ -17,16 +17,16 @@
if(I.type in organ_types)
IC = I
break
user.visible_message("<span class='notice'>[user] starts to remove [target]'s organs.</span>")
user.visible_message("[user] starts to remove [target]'s organs.", "<span class='notice'>You start to remove [target]'s organs...</span>")
/datum/surgery_step/extract_organ/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(IC)
user.visible_message("<span class='notice'>[user] pulls [IC] out of [target]'s [target_zone]!</span>")
user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "<span class='notice'>You pull [IC] out of [target]'s [target_zone].</span>")
user.put_in_hands(IC)
target.internal_organs -= IC
return 1
else
user.visible_message("<span class='notice'>[user] doesn't find anything in [target]'s [target_zone].</span>")
user << "<span class='warning'>You don't find anything in [target]'s [target_zone]!</span>"
return 0
/datum/surgery_step/gland_insert
@@ -34,10 +34,10 @@
time = 32
/datum/surgery_step/gland_insert/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class ='notice'>[user] starts to insert [tool] into [target].</span>")
user.visible_message("[user] starts to insert [tool] into [target].", "<span class ='notice'>You start to insert [tool] into [target]...</span>")
/datum/surgery_step/gland_insert/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class ='notice'>[user] inserts [tool] into [target].</span>")
user.visible_message("[user] inserts [tool] into [target].", "<span class ='notice'>You insert [tool] into [target].</span>")
user.drop_item()
var/obj/item/gland/gland = tool
gland.Inject(target)
code/game/machinery/computer/buildandrepair.dm
+4 -4
View File
@@ -315,7 +315,7 @@
user << "<span class='warning'>The welding tool must be on to complete this task!</span>"
return
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
user << "<span class='notice'>You start deconstructing the frame.</span>"
user << "<span class='notice'>You start deconstructing the frame...</span>"
if(do_after(user, 20))
if(!src || !WT.isOn()) return
user << "<span class='notice'>You deconstruct the frame.</span>"
@@ -325,7 +325,7 @@
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "<span class='notice'>You start to unfasten the frame.</span>"
user << "<span class='notice'>You start to unfasten the frame...</span>"
if(do_after(user, 20))
user << "<span class='notice'>You unfasten the frame.</span>"
anchored = 0
@@ -365,11 +365,11 @@
var/obj/item/stack/cable_coil/C = P
if(C.get_amount() >= 5)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
user << "<span class='notice'>You start adding cables to the frame.</span>"
user << "<span class='notice'>You start adding cables to the frame...</span>"
if(do_after(user, 20))
if(C.get_amount() >= 5 && state == 2)
C.use(5)
user << "<span class='notice'>You add cables to the frame...</span>"
user << "<span class='notice'>You add cables to the frame.</span>"
state = 3
icon_state = "3"
else
code/game/machinery/deployable.dm
+6 -6
View File
@@ -67,11 +67,11 @@ for reference:
user.changeNext_move(CLICK_CD_MELEE)
if (istype(W, /obj/item/stack/sheet/mineral/wood))
if (src.health < src.maxhealth)
visible_message("<span class='danger'>[user] begins to repair \the [src]!</span>")
visible_message("[user] begins to repair \the [src]!", "<span class='notice'>You begin to repair \the [src]...</span>")
if(do_after(user,20))
src.health = src.maxhealth
W:use(1)
visible_message("<span class='danger'>[user] repairs \the [src]!</span>")
visible_message("[user] repairs \the [src]!", "<span class='notice'>You repair \the [src].</span>")
return
else
return
@@ -84,7 +84,7 @@ for reference:
src.health -= W.force * 0.75
else
if (src.health <= 0)
visible_message("<span class='danger'>The barricade is smashed apart!</span>")
visible_message("<span class='warning'>The barricade is smashed apart!</span>")
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
@@ -94,13 +94,13 @@ for reference:
/obj/structure/barricade/wooden/ex_act(severity, target)
switch(severity)
if(1.0)
visible_message("<span class='danger'>The barricade is blown apart!</span>")
visible_message("<span class='warning'>The barricade is blown apart!</span>")
qdel(src)
return
if(2.0)
src.health -= 25
if (src.health <= 0)
visible_message("<span class='danger'>The barricade is blown apart!</span>")
visible_message("<span class='warning'>The barricade is blown apart!</span>")
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
@@ -110,7 +110,7 @@ for reference:
/obj/structure/barricade/wooden/blob_act()
src.health -= 25
if (src.health <= 0)
visible_message("<span class='danger'>The blob eats through the barricade!</span>")
visible_message("<span class='warning'>The blob eats through the barricade!</span>")
qdel(src)
return
code/game/machinery/portable_turret.dm
+2
View File
@@ -707,6 +707,7 @@
return
playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
user << "<span class='notice'>You start to remove the turret's interior metal armor...</span>"
if(do_after(user, 20))
if(!src || !WT.remove_fuel(5, user)) return
build_step = 1
@@ -782,6 +783,7 @@
user << "<span class='warning'>You need more fuel to complete this task!</span>"
playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
user << "<span class='notice'>You begin to weld the turret's armor down...</span>"
if(do_after(user, 30))
if(!src || !WT.remove_fuel(5, user))
return
code/game/machinery/suit_storage_unit.dm
+1 -1
View File
@@ -455,7 +455,7 @@
else
isopen = 1
islocked = 0
visible_message("<span class='danger'>[user] successfully broke out of [src]!</span>")
visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>")
else
return
code/game/mecha/equipment/tools/tools.dm
+2 -2
View File
@@ -93,8 +93,8 @@
return
set_ready_state(0)
chassis.use_power(energy_drain)
target.visible_message("<span class='danger'>[chassis] starts to drill [target]</span>", \
"<span class='userdanger'>[chassis] starts to drill [target]</span>", \
target.visible_message("<span class='warning'>[chassis] starts to drill [target].</span>", \
"<span class='userdanger'>[chassis] starts to drill [target]...</span>", \
"<span class='italics'>You hear drilling.</span>")
var/T = chassis.loc
var/C = target.loc //why are these backwards? we may never know -Pete
code/game/mecha/mecha.dm
+2 -2
View File
@@ -1527,7 +1527,7 @@ var/year_integer = text2num(year) // = 2013???
src.dna = null
if(href_list["repair_int_control_lost"])
if(usr != src.occupant) return
src.occupant_message("Recalibrating coordination system.")
src.occupant_message("Recalibrating coordination system...")
src.log_message("Recalibration of coordination system started.")
var/T = src.loc
if(do_after(100))
@@ -1536,7 +1536,7 @@ var/year_integer = text2num(year) // = 2013???
src.occupant_message("<span class='notice'>Recalibration successful.</span>")
src.log_message("Recalibration of coordination system finished with 0 errors.")
else
src.occupant_message("<span class='danger'>Recalibration failed.</span>")
src.occupant_message("<span class='warning'>Recalibration failed!</span>")
src.log_message("Recalibration of coordination system failed with 1 error.",1)
//debug
code/game/objects/effects/spiders.dm
+2 -2
View File
@@ -233,7 +233,7 @@
var/breakout_time = 2
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
user << "<span class='notice'>You struggle against the tight bonds! (This will take about [breakout_time] minutes.)</span>"
user << "<span class='notice'>You struggle against the tight bonds... (This will take about [breakout_time] minutes.)</span>"
visible_message("You see something struggling and writhing in \the [src]!")
if(do_after(user,(breakout_time*60*10)))
if(!user || user.stat != CONSCIOUS || user.loc != src)
@@ -243,7 +243,7 @@
/obj/effect/spider/cocoon/Destroy()
src.visible_message("<span class='danger'>\The [src] splits open.</span>")
src.visible_message("<span class='warning'>\The [src] splits open.</span>")
for(var/atom/movable/A in contents)
A.loc = src.loc
..()
code/game/objects/items/stacks/stack.dm
+1 -1
View File
@@ -122,7 +122,7 @@
if(!building_checks(R, multiplier))
return
if (R.time)
usr << "<span class='notice'>You start building [R.title]...</span>"
usr.visible_message("<span class='notice'>[usr] starts building [R.title].</span>", "<span class='notice'>You start building [R.title]...</span>")
if (!do_after(usr, R.time))
return
if(!building_checks(R, multiplier))
code/game/objects/items/weapons/RCD.dm
+11 -11
View File
@@ -110,7 +110,7 @@ RCD
if(istype(W, /obj/item/weapon/rcd_ammo))
var/obj/item/weapon/rcd_ammo/R = W
if((matter + R.ammoamt) > max_matter)
user << "<span class='notice'>The RCD cant hold any more matter-units.</span>"
user << "<span class='warning'>The RCD can't hold any more matter-units!</span>"
return
user.drop_item()
qdel(W)
@@ -127,19 +127,19 @@ RCD
switch(mode)
if(1)
mode = 2
user << "<span class='notice'>Changed mode to 'Airlock'</span>"
user << "<span class='notice'>You change RCD's mode to 'Airlock'.</span>"
if(prob(20))
src.spark_system.start()
return
if(2)
mode = 3
user << "<span class='notice'>Changed mode to 'Deconstruct'</span>"
user << "<span class='notice'>You change RCD's mode to 'Deconstruct'.</span>"
if(prob(20))
src.spark_system.start()
return
if(3)
mode = 1
user << "<span class='notice'>Changed mode to 'Floor & Walls'</span>"
user << "<span class='notice'>You change RCD's mode to 'Floor & Walls'.</span>"
if(prob(20))
src.spark_system.start()
return
@@ -161,7 +161,7 @@ RCD
if(1)
if(istype(A, /turf/space))
if(useResource(1, user))
user << "Building Floor..."
user << "<span class='notice'>You start building floor...</span>"
activate()
A:ChangeTurf(/turf/simulated/floor/plating)
return 1
@@ -169,7 +169,7 @@ RCD
if(istype(A, /turf/simulated/floor))
if(checkResource(3, user))
user << "Building Wall ..."
user << "<span class='notice'>You start building wall...</span>"
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20))
if(!useResource(3, user)) return 0
@@ -188,7 +188,7 @@ RCD
break
if(door_check)
user << "Building Airlock..."
user << "<span class='notice'>You start building airlock...</span>"
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 50))
if(!useResource(10, user)) return 0
@@ -202,7 +202,7 @@ RCD
return 1
return 0
else
user << "There is another door here!"
user << "<span class='warning'>There is another door here!</span>"
return 0
return 0
@@ -211,7 +211,7 @@ RCD
if(istype(A, /turf/simulated/wall/r_wall) && !canRwall)
return 0
if(checkResource(5, user))
user << "Deconstructing Wall..."
user << "<span class='notice'>You start deconstructing wall...</span>"
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 40))
if(!useResource(5, user)) return 0
@@ -222,7 +222,7 @@ RCD
if(istype(A, /turf/simulated/floor))
if(checkResource(5, user))
user << "Deconstructing Floor..."
user << "<span class='notice'>You start deconstructing floor...</span>"
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 50))
if(!useResource(5, user)) return 0
@@ -233,7 +233,7 @@ RCD
if(istype(A, /obj/machinery/door/airlock))
if(checkResource(20, user))
user << "Deconstructing Airlock..."
user << "<span class='notice'>You start deconstructing airlock...</span>"
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 50))
if(!useResource(20, user)) return 0
code/game/objects/items/weapons/RPD.dm
+4 -4
View File
@@ -536,7 +536,7 @@ var/global/list/RPD_recipes=list(
if(EATING_MODE) // Eating pipes
// Must click on an actual pipe or meter.
if(istype(A,/obj/item/pipe) || istype(A,/obj/item/pipe_meter) || istype(A,/obj/structure/disposalconstruct))
user << "<span class='info'>Destroying Pipe...</span>"
user << "<span class='notice'>You start destroying pipe...</span>"
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 5))
activate()
@@ -551,7 +551,7 @@ var/global/list/RPD_recipes=list(
if(!(istype(A, /turf)))
user << "<span class='warning'>The [src]'s error light flickers!</span>"
return 0
user << "<span class='info'>Building Pipes...</span>"
user << "<span class='notice'>You start building pipes...</span>"
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20))
activate()
@@ -566,7 +566,7 @@ var/global/list/RPD_recipes=list(
if(!(istype(A, /turf)))
user << "<span class='warning'>The [src]'s error light flickers!</span>"
return 0
user << "<span class='info'>Building Meter...</span>"
user << "<span class='notice'>You start building meter...</span>"
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20))
activate()
@@ -578,7 +578,7 @@ var/global/list/RPD_recipes=list(
if(!(istype(A, /turf)))
user << "<span class='warning'>The [src]'s error light flickers!</span>"
return 0
user << "<span class='info'>Building Pipes...</span>"
user << "<span class='notice'>You start building pipes...</span>"
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20))
var/obj/structure/disposalconstruct/C = new (A, queued_p_type ,queued_p_dir)
code/game/objects/items/weapons/defib.dm
+3 -3
View File
@@ -375,7 +375,7 @@
for(var/obj/item/carried_item in H.contents)
if(istype(carried_item, /obj/item/clothing/suit/space))
if(!defib.combat)
user.visible_message("<span class='notice'>[defib] buzzes: Patient's chest is obscured. Operation aborted.</span>")
user.visible_message("<span class='warning'>[defib] buzzes: Patient's chest is obscured. Operation aborted.</span>")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = 0
update_icon()
@@ -429,10 +429,10 @@
cooldown = 1
defib.cooldowncheck(user)
else
user.visible_message("<span class='notice'>[defib] buzzes: Patient is not in a valid state. Operation aborted.</span>")
user.visible_message("<span class='warning'>[defib] buzzes: Patient is not in a valid state. Operation aborted.</span>")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = 0
update_icon()
else
user << "<span class='warning'>You need to target your patient's chest with [src].</span>"
user << "<span class='warning'>You need to target your patient's chest with [src]!</span>"
return
code/game/objects/items/weapons/explosives.dm
+3 -3
View File
@@ -66,7 +66,7 @@
if(loc == target)
return
user << "Planting explosives..."
user << "<span class='notice'>You start planting the bomb...</span>"
if(do_after(user, 50) && in_range(user, target))
user.drop_item()
@@ -75,7 +75,7 @@
if (ismob(target))
add_logs(user, target, "planted [name] on")
user.visible_message("<span class='danger'>[user.name] finished planting an explosive on [target.name]!</span>")
user.visible_message("<span class='warning'>[user.name] finished planting an explosive on [target.name].</span>", "<span class='notice'>You finish planting an explosive on [target.name].</span>")
message_admins("[key_name(user, user.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) planted [src.name] on [key_name(target)](<A HREF='?_src_=holder;adminmoreinfo=\ref[target]'>?</A>) with [timer] second fuse",0,1)
log_game("[key_name(user)] planted [src.name] on [key_name(target)] with [timer] second fuse")
@@ -84,7 +84,7 @@
log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse")
target.overlays += image_overlay
user << "Bomb has been planted. Timer counting down from [timer]."
user << "<span class='notice'>You plant the bomb. Timer counting down from [timer].</span>"
spawn(timer*10)
if(target && !target.gc_destroyed)
explode(get_turf(target))
code/game/objects/items/weapons/implants/implanter.dm
+2 -2
View File
@@ -25,9 +25,9 @@
var/turf/T = get_turf(M)
if(T && (M == user || do_after(user, 50)))
if(user && M && (get_turf(M) == T) && src && imp)
M.visible_message("<span class='warning'>[user] has implanted [M].</span>")
M.visible_message("[user] has implanted [M].", "<span class='notice'>[user] implants you with the implant.</span>")
add_logs(user, M, "implanted", object="[name]")
user << "<span class='notice'>You implanted the implant into [M].</span>"
user << "<span class='notice'>You implant the implant into [M].</span>"
if(imp.implanted(M))
imp.loc = M
imp.imp_in = M
code/game/objects/items/weapons/mop.dm
+3 -3
View File
@@ -36,7 +36,7 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A)
if(!proximity) return
if(reagents.total_volume < 1)
user << "<span class='notice'>Your mop is dry!</span>"
user << "<span class='warning'>Your mop is dry!</span>"
return
var/turf/simulated/turf = A
@@ -45,11 +45,11 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A)
A = null
if(istype(turf))
user.visible_message("<span class='warning'>[user] begins to clean \the [turf] with [src].</span>")
user.visible_message("[user] begins to clean \the [turf] with [src].", "<span class='notice'>You begin to clean \the [turf] with [src]...</span>")
if(do_after(user, mopspeed))
clean(turf)
user << "<span class='notice'>You have finished mopping!</span>"
user << "<span class='notice'>You finish mopping./span>"
/obj/effect/attackby(obj/item/I, mob/user, params)
code/game/objects/structures/crates_lockers/closets.dm
+2 -3
View File
@@ -233,7 +233,7 @@
welded = !welded
user << "<span class='notice'>You [welded ? "weld [src] shut":"unweld [src]"].</span>"
update_icon()
user.visible_message("<span class='warning'>[user.name] has [welded ? "welded [src] shut":"unwelded [src]"].</span>")
user.visible_message("[user.name] has [welded ? "welded [src] shut":"unwelded [src]"].", "<span class='warning'>You [welded ? "weld [src] shut":"unweld [src]"].</span>")
return
if(secure && broken)
user << "<span class='notice'>The locker appears to be broken.</span>"
@@ -337,8 +337,7 @@
welded = 0 //applies to all lockers lockers
locked = 0 //applies to critter crates and secure lockers only
broken = 1 //applies to secure lockers only
visible_message("<span class='danger'>[user] successfully broke out of [src]!</span>")
user << "<span class='notice'>You successfully break out of [src]!</span>"
user.visible_message("<span class='danger'>[user] successfully broke out of [src]!</span>", "<span class='notice'>You successfully break out of [src]!</span>")
if(istype( src.loc, /obj/structure/bigDelivery))
var/obj/structure/bigDelivery/D = src.loc
qdel(D)
code/game/objects/structures/janicart.dm
+1 -1
View File
@@ -78,7 +78,7 @@
else if(mybag)
mybag.attackby(I, user)
else if(istype(I, /obj/item/weapon/crowbar))
user.visible_message("<span class='warning'>[user] begins to empty the contents of [src].</span>")
user.visible_message("[user] begins to empty the contents of [src].", "<span class='notice'>You begin to empty the contents of [src]...</span>")
if(do_after(user, 30))
usr << "<span class='notice'>You empty the contents of [src]'s bucket onto the floor.</span>"
reagents.reaction(src.loc)
code/game/objects/structures/ladders.dm
+8 -8
View File
@@ -40,27 +40,27 @@
if(up && down)
switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") )
if("Up")
user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
"<span class='notice'>You climb up \the [src]!</span>")
user.visible_message("[user] climbs up \the [src].", \
"<span class='notice'>You climb up \the [src].</span>")
user.loc = get_turf(up)
up.add_fingerprint(user)
if("Down")
user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
"<span class='notice'>You climb down \the [src]!</span>")
user.visible_message("[user] climbs down \the [src].", \
"<span class='notice'>You climb down \the [src].</span>")
user.loc = get_turf(down)
down.add_fingerprint(user)
if("Cancel")
return
else if(up)
user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
"<span class='notice'>You climb up \the [src]!</span>")
user.visible_message("[user] climbs up \the [src].", \
"<span class='notice'>You climb up \the [src].</span>")
user.loc = get_turf(up)
up.add_fingerprint(user)
else if(down)
user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
"<span class='notice'>You climb down \the [src]!</span>")
user.visible_message("[user] climbs down \the [src].", \
"<span class='notice'>You climb down \the [src].</span>")
user.loc = get_turf(down)
down.add_fingerprint(user)
code/game/objects/structures/lamarr_cage.dm
+2 -2
View File
@@ -75,8 +75,8 @@
if (src.destroyed)
return
else
user.visible_message("<span class='danger'>[user] kicks the lab cage.</span>", \
"<span class='notice'>You kick the lab cage.</span>")
user.visible_message("<span class='warning'>[user] kicks the lab cage.</span>", \
"<span class='danger'>You kick the lab cage.</span>")
src.health -= 2
healthcheck()
return
code/game/objects/structures/mirror.dm
+1 -1
View File
@@ -65,7 +65,7 @@
return
if(prob(I.force * 2))
visible_message("<span class='warning'>[user] smashes [src] with [I]!</span>")
visible_message("<span class='warning'>[user] smashes [src] with [I].</span>")
shatter()
else
visible_message("<span class='warning'>[user] hits [src] with [I]!</span>")
code/game/objects/structures/morgue.dm
+2 -2
View File
@@ -243,7 +243,7 @@ Crematorium Switch
connected.close()
add_fingerprint(user)
else
user << "That's not connected to anything."
user << "<span class='warning'>That's not connected to anything!</span>"
/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
if(!istype(O, /atom/movable) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user)
@@ -259,7 +259,7 @@ Crematorium Switch
return
O.loc = src.loc
if (user != O)
visible_message("<span class='warning'>[user] stuffs [O] into [src]!</span>")
visible_message("<span class='warning'>[user] stuffs [O] into [src].</span>")
return
/*
code/game/objects/structures/statues.dm
+16 -16
View File
@@ -22,60 +22,60 @@
if(istype(W, /obj/item/weapon/wrench))
if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
user.visible_message("<span class='notice'>[user] is loosening the [name]'s bolts...</span>", \
user.visible_message("[user] is loosening the [name]'s bolts.", \
"<span class='notice'>You are loosening the [name]'s bolts...</span>")
if(do_after(user,40))
if(!src.loc || !anchored)
return
user.visible_message("<span class='notice'>[user] loosened the [name]'s bolts!</span>", \
"<span class='notice'>You loosened the [name]'s bolts!</span>")
user.visible_message("[user] loosened the [name]'s bolts!", \
"<span class='notice'>You loosen the [name]'s bolts!</span>")
anchored = 0
else
if (!istype(src.loc, /turf/simulated/floor))
user.visible_message("<span class='danger'>A floor must be present to secure the [name]!</span>")
user.visible_message("<span class='warning'>A floor must be present to secure the [name]!</span>")
return
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
user.visible_message("<span class='notice'>[user] is securing the [name]'s bolts...</span>", \
user.visible_message("[user] is securing the [name]'s bolts...", \
"<span class='notice'>You are securing the [name]'s bolts...</span>")
if(do_after(user, 40))
if(!src.loc || anchored)
return
user.visible_message("<span class='notice'>[user] has secured the [name]'s bolts!</span>", \
"<span class='notice'>You have secured the [name]'s bolts!</span>")
user.visible_message("[user] has secured the [name]'s bolts.", \
"<span class='notice'>You have secured the [name]'s bolts.</span>")
anchored = 1
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
user.visible_message("<span class='notice'>[user] is slicing apart the [name]...</span>", \
user.visible_message("[user] is slicing apart the [name]...", \
"<span class='notice'>You are slicing apart the [name]...</span>")
if(do_after(user,30))
if(!src.loc)
return
user.visible_message("<span class='notice'>[user] slices apart the [name]!</span>", \
"<span class='notice'>You slice apart the [name]!</span>")
user.visible_message("[user] slices apart the [name].", \
"<span class='notice'>You slice apart the [name].</span>")
Dismantle(1)
else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
if(!D.bcell.use(D.drillcost))
user << "<span class='notice'>Your [D.name] doesn't have enough power to break through the [name].</span>"
user << "<span class='warning!'>Your [D.name] doesn't have enough power to break through the [name]!</span>"
return
D.update_icon()
if(!src.loc)
return
user.visible_message("<span class='notice'>[user] destroys the [name]!</span>", \
"<span class='notice'>You destroy the [name]!</span>")
user.visible_message("[user] destroys the [name]!", \
"<span class='notice'>You destroy the [name].</span>")
D.playDigSound()
qdel(src)
else if(istype(W, /obj/item/weapon/weldingtool) && !anchored)
playsound(loc, 'sound/items/Welder.ogg', 40, 1)
user.visible_message("<span class='notice'>[user] is slicing apart the [name]...</span>", \
user.visible_message("[user] is slicing apart the [name].", \
"<span class='notice'>You are slicing apart the [name]...</span>")
if(do_after(user, 40))
if(!src.loc)
return
playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] slices apart the [name]!</span>", \
user.visible_message("[user] slices apart the [name].", \
"<span class='notice'>You slice apart the [name]!</span>")
Dismantle(1)
@@ -87,7 +87,7 @@
/obj/structure/statue/attack_hand(mob/living/user as mob)
user.changeNext_move(CLICK_CD_MELEE)
add_fingerprint(user)
user.visible_message("<span class='notice'>[user] rubs some dust off from the [name]'s surface.</span>", \
user.visible_message("[user] rubs some dust off from the [name]'s surface.", \
"<span class='notice'>You rub some dust off from the [name]'s surface.</span>")
/obj/structure/statue/CanAtmosPass()
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+4 -4
View File
@@ -92,7 +92,7 @@
return
if(buckled_mob)
return 0
visible_message("<span class='notice'>[usr] collapses \the [src.name].</span>")
usr.visible_message("[usr] collapses \the [src.name].", "<span class='notice'>You collapse \the [src.name].</span>")
new/obj/item/roller(get_turf(src))
qdel(src)
return
@@ -114,7 +114,7 @@
if(loaded)
var/obj/structure/stool/bed/roller/R = loaded
R.loc = user.loc
user.visible_message("<span class='notice'>[user] deploys [loaded].</span>")
user.visible_message("[user] deploys [loaded].", "<span class='notice'>You deploy [loaded].</span>")
loaded = null
else
user << "<span class='warning'>The dock is empty!</span>"
@@ -124,7 +124,7 @@
if(!proximity)
return
if(loaded)
user << "<span class='notice'>You already have a roller bed docked!</span>"
user << "<span class='warning'>You already have a roller bed docked!</span>"
return
var/obj/structure/stool/bed/roller/R = target
@@ -133,6 +133,6 @@
loaded = target
target.loc = src
user.visible_message("<span class='notice'>[user] collects [loaded].</span>")
user.visible_message("[user] collects [loaded].", "<span class='notice'>You collect [loaded].</span>")
..()
code/game/objects/structures/tables_racks.dm
+5 -5
View File
@@ -307,7 +307,7 @@
for(var/obj/item/C in oldContents)
C.loc = src.loc
user.visible_message("<span class='notice'>[user] empties [I] on [src].</span>")
user.visible_message("[user] empties [I] on [src].")
return
// If the tray IS empty, continue on (tray will be placed on the table like other items)
@@ -568,20 +568,20 @@
user.do_attack_animation(src)
playsound(loc, 'sound/items/dodgeball.ogg', 80, 1)
user.visible_message("<span class='warning'>[user] kicks [src].</span>", \
"<span class='warning'>You kick [src].</span>")
"<span class='danger'>You kick [src].</span>")
health -= rand(1,2)
healthcheck()
/obj/structure/rack/attack_alien(mob/living/user)
user.do_attack_animation(src)
visible_message("<span class='danger'>[user] slices [src] apart!</span>")
visible_message("<span class='warning'>[user] slices [src] apart.</span>")
rack_destroy()
/obj/structure/rack/attack_animal(mob/living/simple_animal/user)
if(user.environment_smash)
user.do_attack_animation(src)
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
visible_message("<span class='warning'>[user] smashes [src] apart.</span>")
rack_destroy()
/obj/structure/rack/attack_tk() // no telehulk sorry
return
@@ -615,7 +615,7 @@
return
/obj/item/weapon/rack_parts/attack_self(mob/user as mob)
user << "<span class='notice'>Constructing rack...</span>"
user << "<span class='notice'>You start constructing rack...</span>"
if (do_after(user, 50))
var/obj/structure/rack/R = new /obj/structure/rack( user.loc )
R.add_fingerprint(user)
code/game/objects/structures/transit_tubes/station.dm
+4 -4
View File
@@ -54,7 +54,7 @@
T.add_fingerprint(user)
T.loc = src.loc
T.dir = turn(src.dir, -90)
user.visible_message("<span class='notice'>[user] inserts the [R].</span>", "<span class='notice'>You insert the [R].</span>")
user.visible_message("[user] inserts the [R].", "<span class='notice'>You insert the [R].</span>")
qdel(R)
@@ -67,7 +67,7 @@
else if(icon_state == "open")
if(pod.contents.len && user.loc != pod)
user.visible_message("<span class='warning'>[user] starts emptying [pod]'s contents onto the floor!</span>")
user.visible_message("[user] starts emptying [pod]'s contents onto the floor.", "<span class='notice'>You start emptying [pod]'s contents onto the floor...</span>")
if(do_after(user, 10)) //So it doesn't default to close_animation() on fail
if(pod.loc == loc)
for(var/atom/movable/AM in pod)
@@ -96,9 +96,9 @@
if(istype(W, /obj/item/weapon/crowbar))
for(var/obj/structure/transit_tube_pod/pod in loc)
if(pod.contents)
user << "<span class='notice'>Empty the pod first.</span>"
user << "<span class='warning'>Empty the pod first!</span>"
return
user.visible_message("<span class='notice'>[user] removes the [pod].</span>", "<span class='notice'>You remove the [pod].</span>")
user.visible_message("[user] removes the [pod].", "<span class='notice'>You remove the [pod].</span>")
var/obj/structure/c_transit_tube_pod/R = new/obj/structure/c_transit_tube_pod(src.loc)
pod.transfer_fingerprints_to(R)
R.add_fingerprint(user)
code/game/objects/structures/transit_tubes/transit_tube.dm
+1 -1
View File
@@ -44,7 +44,7 @@ obj/structure/transit_tube/ex_act(severity, target)
for(var/obj/structure/transit_tube_pod/pod in src.loc)
user << "<span class='warning'>Remove the pod first!</span>"
return
user.visible_message("<span class='warning'>[user] starts to deattach \the [src]!</span>", "<span class='notice'>You start deattaching the [name]...</span>")
user.visible_message("[user] starts to deattach \the [src].", "<span class='notice'>You start to deattach the [name]...</span>")
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 35))
user << "<span class='notice'>You deattach the [name].</span>"
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+1 -1
View File
@@ -31,7 +31,7 @@
for(var/obj/structure/transit_tube/station/T in loc)
return
if(src.contents.len)
user.visible_message("<span class='notice'>[user] empties \the [src].</span>", "<span class='notice'>You empty \the [src].</span>")
user.visible_message("[user] empties \the [src].", "<span class='notice'>You empty \the [src].</span>")
src.empty()
return
else
code/game/objects/structures/watercloset.dm
+5 -5
View File
@@ -51,7 +51,7 @@
user << "<span class='notice'>You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...</span>"
playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
if(do_after(user, 30))
user.visible_message("<span class='notice'>[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!</span>", "<span class='notice'>You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!</span>", "<span class='italics'>You hear grinding porcelain.</span>")
user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "<span class='notice'>You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!</span>", "<span class='italics'>You hear grinding porcelain.</span>")
cistern = !cistern
update_icon()
return
@@ -65,7 +65,7 @@
var/mob/living/GM = G.affecting
if(G.state >= GRAB_AGGRESSIVE)
if(GM.loc != get_turf(src))
user << "<span class='notice'>[GM] needs to be on [src].</span>"
user << "<span class='warning'>[GM] needs to be on [src]!</span>"
return
if(!swirlie)
if(open)
@@ -372,12 +372,12 @@
if(!Adjacent(user)) return //Person has moved away from the sink
user.clean_blood()
user.visible_message("<span class='notice'>[user] washes their hands in [src].</span>")
user.visible_message("[user] washes their hands in [src].", "<span class='notice'>You wash your hands in [src].</span>")
/obj/structure/sink/attackby(obj/item/O, mob/user, params)
if(busy)
user << "<span class='notice'>Someone's already washing here.</span>"
user << "<span class='warning'>Someone's already washing here!</span>"
return
if(istype(O, /obj/item/weapon/reagent_containers))
@@ -422,7 +422,7 @@
O.clean_blood()
user.visible_message( \
"<span class='notice'>[user] washes [I] using [src].</span>", \
"[user] washes [I] using [src].", \
"<span class='notice'>You wash [I] using [src].</span>")
code/game/objects/structures/windoor_assembly.dm
+8 -8
View File
@@ -76,7 +76,7 @@ obj/structure/windoor_assembly/Destroy()
if(istype(W, /obj/item/weapon/weldingtool) && !anchored )
var/obj/item/weapon/weldingtool/WT = W
if (WT.remove_fuel(0,user))
user.visible_message("<span class='warning'>[user] dissassembles the windoor assembly.</span>", "<span class='notice'>You start to disassemble the windoor assembly...</span>")
user.visible_message("[user] disassembles the windoor assembly.", "<span class='notice'>You start to disassemble the windoor assembly...</span>")
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
if(do_after(user, 40))
@@ -98,7 +98,7 @@ obj/structure/windoor_assembly/Destroy()
user << "<span class='warning'>There is already a windoor in that location!</span>"
return
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
user.visible_message("<span class='warning'>[user] secures the windoor assembly to the floor.</span>", "<span class='notice'>You start to secure the windoor assembly to the floor...</span>")
user.visible_message("[user] secures the windoor assembly to the floor.", "<span class='notice'>You start to secure the windoor assembly to the floor...</span>")
if(do_after(user, 40))
if(!src || src.anchored)
@@ -117,7 +117,7 @@ obj/structure/windoor_assembly/Destroy()
//Unwrenching an unsecure assembly un-anchors it. Step 4 undone
else if(istype(W, /obj/item/weapon/wrench) && anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
user.visible_message("<span class='warning'>[user] unsecures the windoor assembly to the floor.</span>", "<span class='notice'>You start to unsecure the windoor assembly to the floor...</span>")
user.visible_message("[user] unsecures the windoor assembly to the floor.", "<span class='notice'>You start to unsecure the windoor assembly to the floor...</span>")
if(do_after(user, 40))
if(!src || !src.anchored)
@@ -151,7 +151,7 @@ obj/structure/windoor_assembly/Destroy()
//Adding cable to the assembly. Step 5 complete.
else if(istype(W, /obj/item/stack/cable_coil) && anchored)
user.visible_message("<span class='warning'>[user] wires the windoor assembly.</span>", "<span class='notice'>You start to wire the windoor assembly...</span>")
user.visible_message("[user] wires the windoor assembly.", "<span class='notice'>You start to wire the windoor assembly...</span>")
if(do_after(user, 40))
if(!src || !src.anchored || src.state != "01")
@@ -172,7 +172,7 @@ obj/structure/windoor_assembly/Destroy()
//Removing wire from the assembly. Step 5 undone.
if(istype(W, /obj/item/weapon/wirecutters))
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
user.visible_message("<span class='warning'>[user] cuts the wires from the airlock assembly.</span>", "<span class='notice'>You start to cut the wires from airlock assembly...</span>")
user.visible_message("[user] cuts the wires from the airlock assembly.", "<span class='notice'>You start to cut the wires from airlock assembly...</span>")
if(do_after(user, 40))
if(!src || src.state != "02")
@@ -189,7 +189,7 @@ obj/structure/windoor_assembly/Destroy()
//Adding airlock electronics for access. Step 6 complete.
else if(istype(W, /obj/item/weapon/airlock_electronics))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("<span class='warning'>[user] installs the electronics into the airlock assembly.</span>", "<span class='notice'>You start to install electronics into the airlock assembly...</span>")
user.visible_message("[user] installs the electronics into the airlock assembly.", "<span class='notice'>You start to install electronics into the airlock assembly...</span>")
user.drop_item()
W.loc = src
@@ -209,7 +209,7 @@ obj/structure/windoor_assembly/Destroy()
return
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("<span class='warning'>[user] removes the electronics from the airlock assembly.</span>", "<span class='notice'>You start to uninstall electronics from the airlock assembly...</span>")
user.visible_message("[user] removes the electronics from the airlock assembly.", "<span class='notice'>You start to uninstall electronics from the airlock assembly...</span>")
if(do_after(user, 40))
if(!src || !electronics)
@@ -239,7 +239,7 @@ obj/structure/windoor_assembly/Destroy()
return
usr << browse(null, "window=windoor_access")
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("<span class='warning'>[user] pries the windoor into the frame.</span>", "<span class='notice'>You start prying the windoor into the frame...</span>")
user.visible_message("[user] pries the windoor into the frame.", "<span class='notice'>You start prying the windoor into the frame...</span>")
if(do_after(user, 40))
code/game/objects/structures/window.dm
+1 -1
View File
@@ -136,7 +136,7 @@
if(!can_be_reached(user))
return
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message("<span class='notice'>[user] knocks on [src].</span>")
user.visible_message("[user] knocks on [src].")
add_fingerprint(user)
playsound(loc, 'sound/effects/Glassknock.ogg', 50, 1)
code/modules/clothing/head/helmet.dm
+2 -2
View File
@@ -235,14 +235,14 @@ obj/item/clothing/head/helmet/bluetaghelm
helmetCam.c_tag = "Helmet-Mounted Camera (No User)([rand(1,999)])"
helmetCam.network = list("SS13")
update_icon()
user.visible_message("<span class='notice'>[user] attaches [A] to [src]</span>","<span class='notice'>You attach [A] to [src]</span>")
user.visible_message("[user] attaches [A] to [src].","<span class='notice'>You attach [A] to [src].</span>")
return
if(istype(A, /obj/item/weapon/crowbar))
if(!helmetCam)
..()
return
user.visible_message("<span class='notice'>[user] removes [helmetCam] from [src]</span>","<span class='notice'>You remove [helmetCam] from [src]</span>")
user.visible_message("[user] removes [helmetCam] from [src].","<span class='notice'>You remove [helmetCam] from [src].</span>")
helmetCam.assembly.loc = get_turf(src)
helmetCam.assembly = null
qdel(helmetCam)
code/modules/clothing/under/ties.dm
+2 -2
View File
@@ -100,10 +100,10 @@
if(user == M)
user << "<span class='notice'>You attach [src] to [U].</span>"
else
user.visible_message("<span class='notice'>[user] pins \the [src] on [M]'s chest.</span>", \
user.visible_message("[user] pins \the [src] on [M]'s chest.", \
"<span class='notice'>You pin \the [src] on [M]'s chest.</span>")
else user << "<span class='warning'>Medals can only be pinned on jumpsuits.</span>"
else user << "<span class='warning'>Medals can only be pinned on jumpsuits!</span>"
else ..()
/obj/item/clothing/tie/medal/conduct
code/modules/food&drinks/drinks/drinks.dm
+1 -1
View File
@@ -224,7 +224,7 @@
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user)
if(M == user && !src.reagents.total_volume && user.a_intent == "harm" && user.zone_sel.selecting == "head")
user.visible_message("<span class='notice'>[user] crushes the can of [src] on \his forehead!</span>", "<span class='notice'>You crush the can of [src] on your forehead!</span>")
user.visible_message("<span class='warning'>[user] crushes the can of [src] on \his forehead!</span>", "<span class='notice'>You crush the can of [src] on your forehead.</span>")
playsound(user.loc,'sound/weapons/pierce.ogg', rand(10,50), 1)
var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
crushed_can.icon_state = icon_state
code/modules/food&drinks/food/snacks.dm
+5 -5
View File
@@ -86,8 +86,8 @@
M.visible_message("<span class='danger'>[user] attempts to feed [M] [src].</span>", \
"<span class='userdanger'>[user] attempts to feed [M] [src].</span>")
else
M.visible_message("<span class='danger'>[user] cannot force anymore of [src] down [M]'s throat!</span>", \
"<span class='userdanger'>[user] cannot force anymore of [src] down [M]'s throat!</span>")
M.visible_message("<span class='warning'>[user] cannot force anymore of [src] down [M]'s throat!</span>", \
"<span class='warning'>[user] cannot force anymore of [src] down [M]'s throat!</span>")
return 0
if(!do_mob(user, M))
@@ -97,7 +97,7 @@
"<span class='userdanger'>[user] feeds [M] to eat [src].</span>")
else
user << "<span class='notice'>[M] doesn't seem to have a mouth!</span>"
user << "<span class='warning'>[M] doesn't seem to have a mouth!</span>"
return
if(reagents) //Handle ingestion of the reagent.
@@ -181,12 +181,12 @@
var/slices_lost = 0
if (accuracy > 1)
user.visible_message( \
"<span class='notice'>[user] slices [src].</span>", \
"[user] slices [src].", \
"<span class='notice'>You slice [src].</span>" \
)
else
user.visible_message( \
"<span class='notice'>[user] inaccurately slices [src] with [W]!</span>", \
"[user] inaccurately slices [src] with [W]!", \
"<span class='notice'>You inaccurately slice [src] with your [W]!</span>" \
)
slices_lost = rand(1,min(1,round(slices_num/2)))
code/modules/food&drinks/food/snacks_egg.dm
+3 -3
View File
@@ -100,12 +100,12 @@
/obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
if(W.icon_state == "forkloaded")
user << "<span class='notice'>You already have omelette on your fork.</span>"
user << "<span class='warning'>You already have omelette on your fork!</span>"
return
W.icon_state = "forkloaded"
user.visible_message( \
"<span class='notice'>[user] takes a piece of omelette with their fork!</span>", \
"<span class='notice'>You take a piece of omelette with your fork!</span>" \
"[user] takes a piece of omelette with their fork!", \
"<span class='notice'>You take a piece of omelette with your fork.</span>" \
)
reagents.remove_reagent("nutriment", 1)
if(reagents.total_volume <= 0)
code/modules/food&drinks/kitchen machinery/microwave.dm
+9 -9
View File
@@ -59,23 +59,23 @@
if(src.broken > 0)
if(src.broken == 2 && istype(O, /obj/item/weapon/wirecutters)) // If it's broken and they're using a screwdriver
user.visible_message( \
"<span class='notice'>[user] starts to fix part of the microwave.</span>", \
"[user] starts to fix part of the microwave.", \
"<span class='notice'>You start to fix part of the microwave...</span>" \
)
if (do_after(user,20))
user.visible_message( \
"<span class='notice'>[user] fixes part of the microwave.</span>", \
"[user] fixes part of the microwave.", \
"<span class='notice'>You fix part of the microwave.</span>" \
)
src.broken = 1 // Fix it a bit
else if(src.broken == 1 && istype(O, /obj/item/weapon/weldingtool)) // If it's broken and they're doing the wrench
user.visible_message( \
"<span class='notice'>[user] starts to fix part of the microwave.</span>", \
"[user] starts to fix part of the microwave.", \
"<span class='notice'>You start to fix part of the microwave...</span>" \
)
if (do_after(user,20))
user.visible_message( \
"<span class='notice'>[user] fixes the microwave.</span>", \
"[user] fixes the microwave.", \
"<span class='notice'>You fix the microwave.</span>" \
)
src.icon_state = "mw"
@@ -84,7 +84,7 @@
src.flags = OPENCONTAINER
return 0 //to use some fuel
else
user << "<span class='danger'>It's broken!</span>"
user << "<span class='warning'>It's broken!</span>"
return 1
else if(istype(O, /obj/item/weapon/reagent_containers/spray/))
var/obj/item/weapon/reagent_containers/spray/clean_spray = O
@@ -92,7 +92,7 @@
clean_spray.reagents.remove_reagent("cleaner",clean_spray.amount_per_transfer_from_this,1)
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
user.visible_message( \
"<span class='notice'>[user] has cleaned the microwave.</span>", \
"[user] has cleaned the microwave.", \
"<span class='notice'>You clean the microwave.</span>" \
)
src.dirty = 0 // It's clean!
@@ -108,12 +108,12 @@
else if(istype(O, /obj/item/weapon/soap/)) // If they're trying to clean it then let them
var/obj/item/weapon/soap/P = O
user.visible_message( \
"<span class='notice'>[user] starts to clean the microwave.</span>", \
"[user] starts to clean the microwave.S", \
"<span class='notice'>You start to clean the microwave...</span>" \
)
if (do_after(user, P.cleanspeed))
user.visible_message( \
"<span class='notice'>[user] has cleaned the microwave.</span>", \
"[user] has cleaned the microwave.", \
"<span class='notice'>You clean the microwave.</span>" \
)
src.dirty = 0 // It's clean!
@@ -150,7 +150,7 @@
return 0
O.loc = src
user.visible_message( \
"<span class='notice'>[user] has added \the [O] to \the [src].</span>", \
"[user] has added \the [O] to \the [src].", \
"<span class='notice'>You add \the [O] to \the [src].</span>")
else
code/modules/food&drinks/kitchen machinery/smartfridge.dm
+7 -7
View File
@@ -42,12 +42,12 @@
return 0
if(contents.len >= max_n_of_items)
user << "<span class='notice'>\The [src] is full.</span>"
user << "<span class='warning'>\The [src] is full!</span>"
return 0
if(accept_check(O))
load(O)
user.visible_message("<span class='notice'>[user] has added \the [O] to \the [src].", "<span class='notice'>You add \the [O] to \the [src].")
user.visible_message("[user] has added \the [O] to \the [src].", "<span class='notice'>You add \the [O] to \the [src].</span>")
updateUsrDialog()
return 1
@@ -62,7 +62,7 @@
load(G)
loaded++
else
user << "<span class='notice'>\The [src] smartly refuses [O].</span>"
user << "<span class='warning'>\The [src] smartly refuses [O].</span>"
updateUsrDialog()
return 0
@@ -70,15 +70,15 @@
// this code follows storage items and trays only.
if(loaded)
if(contents.len >= max_n_of_items)
user.visible_message("<span class='notice'>[user] loads \the [src] with \the [O].</span>", \
user.visible_message("[user] loads \the [src] with \the [O].", \
"<span class='notice'>You fill \the [src] with \the [O].</span>")
else
user.visible_message("<span class='notice'>[user] loads \the [src] with \the [O].</span>", \
user.visible_message("[user] loads \the [src] with \the [O].", \
"<span class='notice'>You load \the [src] with \the [O].</span>")
if(O.contents.len > 0)
user << "<span class='notice'>Some items are refused.</span>"
user << "<span class='warning'>Some items are refused.</span>"
else
user << "There is nothing in [O] to put in [src]."
user << "<span class='warning'>There is nothing in [O] to put in [src]!</span>"
return 0
updateUsrDialog()
code/modules/hydroponics/hydroponics.dm
+7 -7
View File
@@ -692,11 +692,11 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
else if(istype(O, /obj/item/weapon/minihoe))
if(weedlevel > 0)
user.visible_message("<span class='notice'>[user] uproots the weeds.</span>", "<span class='notice'>You remove the weeds from [src].</span>")
user.visible_message("[user] uproots the weeds.", "<span class='notice'>You remove the weeds from [src].</span>")
weedlevel = 0
update_icon()
else
user << "<span class='notice'>This plot is completely devoid of weeds. It doesn't need uprooting.</span>"
user << "<span class='warning'>This plot is completely devoid of weeds! It doesn't need uprooting.</span>"
else if(istype(O, /obj/item/weapon/storage/bag/plants))
attack_hand(user)
@@ -708,28 +708,28 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
else if(istype(O, /obj/item/weapon/wrench) && unwrenchable)
if(anchored == 2)
user << "Unscrew the hoses first!"
user << "<span class='warning'>Unscrew the hoses first!</span>"
return
if(!anchored && !isinspace())
user.visible_message("<span class='notice'>[user] begins to wrench [src] into place.</span>", \
user.visible_message("[user] begins to wrench [src] into place.", \
"<span class='notice'>You begin to wrench [src] in place...</span>")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if (do_after(user, 20))
if(anchored)
return
anchored = 1
user.visible_message("<span class='notice'>[user] wrenches [src] into place.</span>", \
user.visible_message("[user] wrenches [src] into place.", \
"<span class='notice'>You wrench [src] in place.</span>")
else if(anchored)
user.visible_message("<span class='notice'>[user] begins to unwrench [src].</span>", \
user.visible_message("[user] begins to unwrench [src].", \
"<span class='notice'>You begin to unwrench [src]...</span>")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if (do_after(user, 20))
if(!anchored)
return
anchored = 0
user.visible_message("<span class='notice'>[user] unwrenches [src].</span>", \
user.visible_message("[user] unwrenches [src].", \
"<span class='notice'>You unwrench [src].</span>")
else if(istype(O, /obj/item/weapon/screwdriver) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY
code/modules/projectiles/guns/projectile/revolver.dm
+4 -4
View File
@@ -147,9 +147,9 @@
/obj/item/weapon/gun/projectile/revolver/russian/attackby(var/obj/item/A as obj, mob/user as mob, params)
var/num_loaded = ..()
if(num_loaded)
user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "<span class='warning'>You load a single bullet into the chamber and spin it.</span>")
user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "<span class='notice'>You load a single bullet into the chamber and spin it.</span>")
else
user.visible_message("[user] spins the chamber of the revolver.", "<span class='warning'>You spin the revolver's chamber.</span>")
user.visible_message("[user] spins the chamber of the revolver.", "<span class='notice'>You spin the revolver's chamber.</span>")
if(get_ammo() > 0)
Spin()
update_icon()
@@ -158,7 +158,7 @@
/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob)
if(!spun && can_shoot())
user.visible_message("<span class='warning'>[user] spins the chamber of the revolver.</span>", "<span class='notice'>You spin the revolver's chamber.</span>")
user.visible_message("[user] spins the chamber of the revolver.", "<span class='notice'>You spin the revolver's chamber.</span>")
Spin()
else
var/num_unloaded = 0
@@ -170,7 +170,7 @@
CB.update_icon()
num_unloaded++
if (num_unloaded)
user << "<span class = 'notice'>You unload [num_unloaded] shell\s from [src]!</span>"
user << "<span class = 'notice'>You unload [num_unloaded] shell\s from [src].</span>"
else
user << "<span class='notice'>[src] is empty.</span>"
code/modules/reagents/reagent_containers/syringes.dm
+1 -1
View File
@@ -106,7 +106,7 @@
src.reagents.update_total()
src.on_reagent_change()
src.reagents.handle_reactions()
user.visible_message("<span class='notice'>[user] takes a blood sample from [target].</span>")
user.visible_message("[user] takes a blood sample from [target].")
else //if not mob
if(!target.reagents.total_volume)
code/modules/reagents/reagent_dispenser.dm
+2 -2
View File
@@ -149,11 +149,11 @@
if((!istype(user)) || (user.stat))
return
if(cups <= 0)
user << "<span class='danger'>What? No cups?"
user << "<span class='warning'>No cups left!</span>"
return
cups--
user.put_in_hands(new /obj/item/weapon/reagent_containers/food/drinks/sillycup)
user.visible_message("<span class='notice'>[user] gets a cup from [src].","<span class='notice'>You get a cup from [src].")
user.visible_message("[user] gets a cup from [src].","<span class='notice'>You get a cup from [src].</span>")
/obj/structure/reagent_dispensers/water_cooler/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/weapon/paper))
code/modules/recycling/disposal.dm
+1 -1
View File
@@ -134,7 +134,7 @@
user.drop_item()
I.loc = src
user.visible_message("<span class='notice'>[user.name] places \the [I] into \the [src].</span>", \
user.visible_message("[user.name] places \the [I] into \the [src].", \
"<span class='notice'>You place \the [I] into \the [src].</span>")
update()
code/modules/recycling/sortingmachinery.dm
+8 -8
View File
@@ -38,15 +38,15 @@
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
user << "<span class='notice'>Invalid text.</span>"
user << "<span class='warning'>Invalid text!</span>"
return
user.visible_message("<span class='notice'>[user] labels [src] as [str].</span>")
user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
else if(istype(W, /obj/item/stack/wrapping_paper) && !giftwrapped)
var/obj/item/stack/wrapping_paper/WP = W
if(WP.use(3))
user.visible_message("<span class='notice'>[user] wraps the package in festive paper!</span>")
user.visible_message("[user] wraps the package in festive paper!")
giftwrapped = 1
if(istype(wrapped, /obj/structure/closet/crate))
icon_state = "giftcrate"
@@ -92,9 +92,9 @@
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
user << "<span class='notice'>Invalid text.</span>"
user << "<span class='warning'>Invalid text!</span>"
return
user.visible_message("<span class='notice'>[user] labels [src] as [str].</span>")
user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
else if(istype(W, /obj/item/stack/wrapping_paper) && !giftwrapped)
@@ -102,7 +102,7 @@
if(WP.use(1))
icon_state = "giftcrate[wrapped.w_class]"
giftwrapped = 1
user.visible_message("<span class='notice'>[user] wraps the package in festive paper!</span>")
user.visible_message("[user] wraps the package in festive paper!")
if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/weapon/c_tube( get_turf(user) )
else
@@ -176,10 +176,10 @@
user << "<span class='warning'>You need more paper!</span>"
return
else
user << "<span class='notice'>The object you are trying to wrap is unsuitable for the sorting machinery.</span>"
user << "<span class='warning'>The object you are trying to wrap is unsuitable for the sorting machinery!</span>"
return
user.visible_message("<span class='notice'>[user] wraps [target].</span>")
user.visible_message("[user] wraps [target].")
user.attack_log += text("\[[time_stamp()]\] <font color='blue'>Has used [name] on [target]</font>")
if(amount <= 0 && !src.loc) //if we used our last wrapping paper, drop a cardboard tube
code/modules/surgery/appendectomy.dm
+4 -4
View File
@@ -15,17 +15,17 @@
/datum/surgery_step/extract_appendix/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
A = locate() in target.internal_organs
if(A)
user.visible_message("<span class='notice'>[user] begins to extract [target]'s appendix.</span>")
user.visible_message("[user] begins to extract [target]'s appendix.", "<span class='notice'>You begin to extract [target]'s appendix...</span>")
else
user.visible_message("<span class='notice'>[user] looks for an appendix in [target].</span>")
user.visible_message("[user] looks for an appendix in [target].", "<span class='notice'>You look for an appendix in [target]...</span>")
/datum/surgery_step/extract_appendix/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(A)
user.visible_message("<span class='notice'>[user] successfully removes [target]'s appendix!</span>")
user.visible_message("[user] successfully removes [target]'s appendix!", "<span class='notice'>You successfully removes [target]'s appendix.</span>")
A.loc = get_turf(target)
target.internal_organs -= A
for(var/datum/disease/appendicitis in target.viruses)
appendicitis.cure()
else
user.visible_message("<span class='notice'>[user] can't find an appendix in [target]!</span>")
user << "<span class='warning'>You can't find an appendix in [target]!</span>"
return 1
code/modules/surgery/brain_removal.dm
+4 -4
View File
@@ -14,13 +14,13 @@
/datum/surgery_step/extract_brain/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
B = target.getorgan(/obj/item/organ/brain)
if(B)
user.visible_message("<span class='notice'>[user] begins to extract [target]'s brain.</span>")
user.visible_message("[user] begins to extract [target]'s brain.", "<span class='notice'>You begin to extract [target]'s brain...</span>")
else
user.visible_message("<span class='notice'>[user] looks for a brain in [target].</span>")
user.visible_message("[user] looks for a brain in [target].", "<span class='notice'>You look for a brain in [target]...</span>")
/datum/surgery_step/extract_brain/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(B)
user.visible_message("<span class='notice'>[user] successfully removes [target]'s brain!</span>")
user.visible_message("[user] successfully removes [target]'s brain!", "<span class='notice'>You successfully remove [target]'s brain.</span>")
B.loc = get_turf(target)
B.transfer_identity(target)
target.internal_organs -= B
@@ -30,7 +30,7 @@
H.apply_damage(25,"brute","head")
add_logs(user, target, "debrained", addition="INTENT: [uppertext(user.a_intent)]")
else
user.visible_message("<span class='notice'>[user] can't find a brain in [target]!</span>")
user << "<span class='warning'>You can't find a brain in [target]!</span>"
return 1
code/modules/surgery/cavity_implant.dm
+6 -6
View File
@@ -19,27 +19,27 @@
IC = I
break
if(tool)
user.visible_message("<span class='notice'>[user] begins to insert [tool] into [target]'s [target_zone].</span>")
user.visible_message("[user] begins to insert [tool] into [target]'s [target_zone].", "<span class='notice'>You begin to insert [tool] into [target]'s [target_zone]...</span>")
else
user.visible_message("<span class='notice'>[user] checks for items in [target]'s [target_zone].</span>")
user.visible_message("[user] checks for items in [target]'s [target_zone].", "<span class='notice'>You check for items in [target]'s [target_zone]...</span>")
/datum/surgery_step/handle_cavity/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(tool)
if(IC || tool.w_class > 3 || NODROP in tool.flags || tool.GetTypeInAllContents(/obj/item/weapon/disk/nuclear) || istype(tool, /obj/item/weapon/disk/nuclear) || istype(tool, /obj/item/organ))
user.visible_message("<span class='notice'>[user] can't seem to fit [tool] in [target]'s [target_zone].</span>")
user << "<span class='warning'>You can't seem to fit [tool] in [target]'s [target_zone]!</span>"
return 0
else
user.visible_message("<span class='notice'>[user] stuffs [tool] into [target]'s [target_zone]!</span>")
user.visible_message("[user] stuffs [tool] into [target]'s [target_zone]!", "<span class='notice'>You stuff [tool] into [target]'s [target_zone].</span>")
user.drop_item()
target.internal_organs += tool
tool.loc = target
return 1
else
if(IC)
user.visible_message("<span class='notice'>[user] pulls [IC] out of [target]'s [target_zone]!</span>")
user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "<span class='notice'>You pull [IC] out of [target]'s [target_zone].</span>")
user.put_in_hands(IC)
target.internal_organs -= IC
return 1
else
user.visible_message("<span class='notice'>[user] doesn't find anything in [target]'s [target_zone].</span>")
user << "<span class='warning'>You don't find anything in [target]'s [target_zone].</span>"
return 0
code/modules/surgery/core_removal.dm
+3 -4
View File
@@ -11,14 +11,13 @@
time = 16
/datum/surgery_step/extract_core/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to extract a core from [target].</span>")
user.visible_message("[user] begins to extract a core from [target].", "<span class='notice'>You begin to extract a core from [target]...</span>")
/datum/surgery_step/extract_core/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/mob/living/simple_animal/slime/slime = target
if(slime.cores > 0)
slime.cores--
user.visible_message("<span class='notice'>[user] successfully extracts a core from [target]!</span>")
user << "<span class='notice'>[slime.cores] core\s remaining.</span>"
user.visible_message("[user] successfully extracts a core from [target]!", "<span class='notice'>You successfully extract a core from [target]. [slime.cores] core\s remaining.</span>")
new slime.coretype(slime.loc)
@@ -28,5 +27,5 @@
else
return 0
else
user.visible_message("<span class='notice'>There aren't any cores left in [target].</span>")
user << "<span class='warning'>There aren't any cores left in [target]!</span>"
return 1
code/modules/surgery/cybernetic_implants.dm
+3 -3
View File
@@ -2,7 +2,7 @@
#define MAX_CHEST_IMPLANT 3
/datum/surgery_step/cybernetic_implant/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/cybernetic_implant/implant, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to implant [target] with [implant].</span>")
user.visible_message("[user] begins to implant [target] with [implant].", "<span class='notice'>You begin to implant [target] with [implant]...</span>")
//[[[[EYES]]]]
/datum/surgery/eye_cybernetic_implant/eyes
@@ -68,9 +68,9 @@
/datum/surgery_step/cybernetic_implant/proc/insert(mob/user, mob/living/carbon/target, obj/item/cybernetic_implant/implant,target_zone,full)
if(full)
user.visible_message("<span class='notice'>[user] can't seem to implant anything else into the [target]'s [target_zone].</span>")
user << "<span class='warning'>You can't seem to implant anything else into the [target]'s [target_zone]!</span>"
else
user.visible_message("<span class='notice'>[user] inserts [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone]!</span>")
user.visible_message("[user] inserts [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone]!", "<span class='notice'>You insert [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone].</span>")
implant.owner = target
implant.function()
user.drop_item()
code/modules/surgery/generic_steps.dm
+5 -5
View File
@@ -5,7 +5,7 @@
time = 24
/datum/surgery_step/incise/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to make an incision in [target]'s [parse_zone(target_zone)].</span>")
user.visible_message("[user] begins to make an incision in [target]'s [parse_zone(target_zone)].", "<span class='notice'>You begin to make an incision in [target]'s [parse_zone(target_zone)]...</span>")
@@ -15,7 +15,7 @@
time = 48
/datum/surgery_step/clamp_bleeders/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].</span>")
user.visible_message("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].", "<span class='notice'>You begin to clamp bleeders in [target]'s [parse_zone(target_zone)]...</span>")
//retract skin
@@ -24,7 +24,7 @@
time = 32
/datum/surgery_step/retract_skin/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].</span>")
user.visible_message("[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].", "<span class='notice'>You begin to retract the skin in [target]'s [parse_zone(target_zone)]...</span>")
@@ -34,7 +34,7 @@
time = 32
/datum/surgery_step/close/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].</span>")
user.visible_message("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].", "<span class='notice'>You begin to mend the incision in [target]'s [parse_zone(target_zone)]...</span>")
/datum/surgery_step/close/tool_check(mob/user, obj/item/tool)
@@ -62,7 +62,7 @@
time = 64
/datum/surgery_step/saw/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].</span>")
user.visible_message("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].", "<span class='notice'>You begin to saw through the bone in [target]'s [parse_zone(target_zone)]...</span>")
code/modules/surgery/helpers.dm
+1 -1
View File
@@ -45,7 +45,7 @@
if(procedure.location == "anywhere") // if location == "anywhere" change location to the surgeon's target, otherwise leave location as is.
procedure.location = user.zone_sel.selecting
M.surgeries += procedure
user.visible_message("<span class='notice'>[user] drapes [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].</span>")
user.visible_message("[user] drapes [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].", "<span class='notice'>You drape [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].</span>")
add_logs(user, M, "operated", addition="Operation type: [procedure.name]")
return 1
code/modules/surgery/implant_removal.dm
+5 -5
View File
@@ -19,19 +19,19 @@
I = W
break
if(I)
user.visible_message("<span class='notice'>[user] begins to extract [I] from [target]'s [target_zone].</span>")
user.visible_message("[user] begins to extract [I] from [target]'s [target_zone].", "<span class='notice'>You begin to extract [I] from [target]'s [target_zone]...</span>")
else
user.visible_message("<span class='notice'>[user] looks for an implant in [target]'s [target_zone].</span>")
user.visible_message("[user] looks for an implant in [target]'s [target_zone].", "<span class='notice'>You look for an implant in [target]'s [target_zone]...</span>")
/datum/surgery_step/extract_implant/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(I)
user.visible_message("<span class='notice'>[user] successfully removes [I] from [target]'s [target_zone]!</span>")
user.visible_message("[user] successfully removes [I] from [target]'s [target_zone]!", "<span class='notice'>You successfully remove [I] from [target]'s [target_zone].</span>")
if(istype(I, /obj/item/weapon/implant/loyalty))
target << "<span class='notice'>You feel a sense of liberation as Nanotrasen's grip on your mind fades away.</span>"
target << "<span class='notice'><b>You feel a sense of liberation as Nanotrasen's grip on your mind fades away.</b></span>"
qdel(I)
if(istype(target, /mob/living/carbon/human))
var/mob/living/carbon/human/H = target
H.sec_hud_set_implants()
else
user.visible_message("<span class='notice'>[user] can't find anything in [target]'s [target_zone].</span>")
user << "<span class='warning'>You can't find anything in [target]'s [target_zone]!</span>"
return 1
code/modules/surgery/limb augmentation.dm
+5 -5
View File
@@ -10,7 +10,7 @@
/datum/surgery_step/replace/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class ='notice'>[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_sel.selecting)]!</span>")
user.visible_message("[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_sel.selecting)].", "<span class ='notice'>You begin to sever the muscles on [target]'s [parse_zone(user.zone_sel.selecting)]...</span>")
/datum/surgery_step/add_limb
@@ -24,9 +24,9 @@
/datum/surgery_step/add_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
L = new_organ
if(L)
user.visible_message("<span class ='notice'>[user] begins to augment [target]'s [parse_zone(user.zone_sel.selecting)].</span>")
user.visible_message("[user] begins to augment [target]'s [parse_zone(user.zone_sel.selecting)].", "<span class ='notice'>You begin to augment [target]'s [parse_zone(user.zone_sel.selecting)]...</span>")
else
user.visible_message("<span class ='notice'>[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].</span>")
user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].", "<span class ='notice'>You look for [target]'s [parse_zone(user.zone_sel.selecting)]...</span>")
@@ -46,7 +46,7 @@
if(L)
if(ishuman(target))
var/mob/living/carbon/human/H = target
user.visible_message("<span class='notice'>[user] successfully augments [target]'s [parse_zone(target_zone)]!</span>")
user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!", "<span class='notice'>You successfully augment [target]'s [parse_zone(target_zone)].</span>")
L.loc = get_turf(target)
H.organs -= L
switch(target_zone)
@@ -72,5 +72,5 @@
H.update_augments() //Gives them the Cyber limb overlay
add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
else
user.visible_message("<span class='notice'>[user] [target] has no organic [parse_zone(target_zone)] there!</span>")
user << "<span class='warning'>[target] has no organic [parse_zone(target_zone)] there!</span>"
return 1
code/modules/surgery/lipoplasty.dm
+4 -4
View File
@@ -13,10 +13,10 @@
time = 64
/datum/surgery_step/cut_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to cut away [target]'s excess fat!</span>")
user.visible_message("[user] begins to cut away [target]'s excess fat.", "<span class='notice'>You begin to cut away [target]'s excess fat...</span>")
/datum/surgery_step/cut_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] cuts [target]'s excess fat loose!</span>")
user.visible_message("[user] cuts [target]'s excess fat loose!", "<span class='notice'>You cut [target]'s excess fat loose.</span>")
return 1
//remove fat
@@ -25,10 +25,10 @@
time = 32
/datum/surgery_step/remove_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to extract [target]'s loose fat!</span>")
user.visible_message("[user] begins to extract [target]'s loose fat!", "<span class='notice'>You begin to extract [target]'s loose fat...</span>")
/datum/surgery_step/remove_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] extracts [target]'s fat!</span>")
user.visible_message("[user] extracts [target]'s fat!", "<span class='notice'>You extract [target]'s fat.</span>")
target.overeatduration = 0 //patient is unfatted
var/removednutriment = target.nutrition
target.nutrition = NUTRITION_LEVEL_WELL_FED
code/modules/surgery/plastic_surgery.dm
+3 -3
View File
@@ -10,15 +10,15 @@
time = 64
/datum/surgery_step/reshape_face/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("<span class='notice'>[user] begins to alter [target]'s appearance.</span>")
user.visible_message("[user] begins to alter [target]'s appearance.", "<span class='notice'>You begin to alter [target]'s appearance...</span>")
/datum/surgery_step/reshape_face/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(target.status_flags & DISFIGURED)
target.status_flags &= ~DISFIGURED
user.visible_message("<span class='notice'>[user] successfully restores [target]'s appearance!</span>")
user.visible_message("[user] successfully restores [target]'s appearance!", "<span class='notice'>You successfully restore [target]'s appearance.</span>")
else
var/oldname = target.real_name
target.real_name = random_name(target.gender)
var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name
user.visible_message("<span class='notice'>[user] alters [oldname]'s appearance completely, they are now [newname]!</span>")
user.visible_message("[user] alters [oldname]'s appearance completely, they are now [newname]!", "<span class='notice'>You alter [oldname]'s appearance completely, they are now [newname].</span>")
return 1
code/modules/surgery/remove_embedded_object.dm
+5 -5
View File
@@ -18,9 +18,9 @@
/datum/surgery_step/remove_object/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
L = new_organ
if(L)
user.visible_message("<span class='notice'>[user] looks for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)].</span>")
user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)].", "<span class='notice'>You look for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)]...</span>")
else
user.visible_message("<span class='notice'>[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].</span>")
user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].", "<span class='notice'>You look for [target]'s [parse_zone(user.zone_sel.selecting)]...</span>")
/datum/surgery_step/remove_object/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -34,11 +34,11 @@
L.embedded_objects -= I
if(objects > 0)
user.visible_message("<span class='notice'>[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!</span>")
user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!", "<span class='notice'>You sucessfully remove [objects] objects from [H]'s [L.getDisplayName()].</span>")
else
user.visible_message("<span class='notice'>[user] finds no objects embedded in [H]'s [L.getDisplayName()].</span>")
user << "<span class='warning'>You find no objects embedded in [H]'s [L.getDisplayName()]!</span>"
else
user.visible_message("<span class='notice'>[user] can't find [target]'s [parse_zone(user.zone_sel.selecting)], let alone any objects embedded in it!</span>")
user << "<span class='warning'>You can't find [target]'s [parse_zone(user.zone_sel.selecting)], let alone any objects embedded in it!</span>"
return 1