cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

span fixes

Browse Source
This commit is contained in:
kingofkosmos
2015-04-24 20:52:01 +03:00
parent e371dd9f35
commit 3304ffa45f
19 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/ritual.dm
+2 -2
View File
@@ -42,7 +42,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
return
if(ishuman(usr) || ismonkey(usr)) //Damage only applies to humans and monkeys, to allow constructs to communicate
usr.visible_message("<span class='warning'>[usr.name] starts clawing at his arms like a mad man!")
usr.visible_message("<span class='warning'>[usr.name] starts clawing at his arms like a mad man!</span>", "<span class='warning'>You start clawing at his arms like a mad man!</span>")
apply_damage(25,BRUTE, "l_arm")
apply_damage(25,BRUTE, "r_arm")
sleep(50)
@@ -55,7 +55,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
apply_damage(15,BRUTE, "r_arm")
if(usr.incapacitated())
return
usr.visible_message("<span class='warning'>[usr.name] paints strange symbols with their own blood")
usr.visible_message("<span class='warning'>[usr.name] paints strange symbols with their own blood.</span>", "<span class='warning'>You paint strange symbols with your own blood.</span>")
sleep(20)
usr.say("O bidai nabora se[pick("'","`")]sma!")
code/game/machinery/bots/bots.dm
+2 -2
View File
@@ -142,9 +142,9 @@
..()
if (health < maxhealth)
if (health > maxhealth/3)
user << "<span class='danger'>[src]'s parts look loose.</span>"
user << "[src]'s parts look loose."
else
user << "<span class='danger'>[src]'s parts look very loose.</span>"
user << "[src]'s parts look very loose!"
else
user << "[src] is in pristine condition."
code/game/machinery/bots/secbot.dm
+2 -2
View File
@@ -395,10 +395,10 @@ Auto Patrol: []"},
return
if(!helmetCam) //I am so sorry for this. I could not think of a less terrible (and lazy) way.
user << "[src] needs to have a camera attached first."
user << "<span class='warning'>[src] needs to have a camera attached first!</span>"
return
if(F) //Has a flashlight. Player must remove it, else it will be lost forever.
user << "The mounted flashlight is in the way, remove it first."
user << "<span class='warning'>The mounted flashlight is in the way, remove it first!</span>"
return
if(S.secured)
code/game/machinery/iv_drip.dm
+1 -1
View File
@@ -64,7 +64,7 @@
if(Adjacent(target) && usr.Adjacent(target))
if(beaker)
visible_message("<span class='warning'>[usr] attaches \the [src] to \the [target].</span>")
usr.visible_message("<span class='warning'>[usr] attaches \the [src] to \the [target].</span>", "<span class='notice'>You attach \the [src] to \the [target].</span>")
attached = target
SSmachine.processing.Add(src)
update_icon()
code/game/objects/items/devices/pizza_bomb.dm
+1 -1
View File
@@ -67,7 +67,7 @@
user.visible_message("<span class='warning'>[user] cuts the [chosen_wire] wire!</span>", "<span class='danger'>You cut the [chosen_wire] wire!</span>")
sleep(5)
if(chosen_wire == correct_wire)
src.audible_message("<span class='warning'>\icon[src] \The [src] suddenly stops beeping and seems lifeless.</span>")
src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.")
user << "<span class='notice'>You did it!</span>"
icon_state = "pizzabox_bomb_[correct_wire]"
name = "pizza bomb"
code/game/objects/items/stacks/rods.dm
+1 -1
View File
@@ -44,7 +44,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
if(WT.remove_fuel(0,user))
var/obj/item/stack/sheet/metal/new_item = new(usr.loc)
new_item.add_to_stacks(usr)
user.visible_message("<span class='warning'>[user.name] shaped [src] into metal with the welding tool.</span>", \
user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \
"<span class='notice'>You shape [src] into metal with the welding tool.</span>", \
"<span class='warning'>You hear welding.</span>")
var/obj/item/stack/rods/R = src
code/game/objects/items/stacks/tiles/tile_types.dm
+5 -5
View File
@@ -33,7 +33,7 @@
if(mineralType == "plasma")
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 5)
user.visible_message("<span class='warning'>[user.name] set the plasma tiles on fire!</span>", \
user.visible_message("<span class='warning'>[user.name] sets the plasma tiles on fire!</span>", \
"<span class='warning'>You set the plasma tiles on fire!</span>")
qdel(src)
return
@@ -41,9 +41,9 @@
if (mineralType == "metal")
var/obj/item/stack/sheet/metal/new_item = new(user.loc)
new_item.add_to_stacks(user)
user.visible_message("<span class='warning'>[user.name] shaped [src] into metal with the weldingtool.</span>", \
user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \
"<span class='notice'>You shaped [src] into metal with the weldingtool.</span>", \
"<span class='warning'>You hear welding.</span>")
"You hear welding.")
var/obj/item/stack/rods/R = src
src = null
var/replace = (user.get_inactive_hand()==R)
@@ -55,9 +55,9 @@
var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc)
new_item.add_to_stacks(user)
user.visible_message("<span class='warning'>[user.name] shaped [src] into a sheet with the weldingtool.</span>", \
user.visible_message("[user.name] shaped [src] into a sheet with the weldingtool.", \
"<span class='notice'>You shaped [src] into a sheet with the weldingtool.</span>", \
"<span class='warning'>You hear welding.</span>")
"You hear welding.")
var/obj/item/stack/rods/R = src
src = null
var/replace = (user.get_inactive_hand()==R)
code/game/objects/items/weapons/cigs_lighters.dm
+6 -7
View File
@@ -479,16 +479,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
force = 5
damtype = "fire"
hitsound = 'sound/items/welder.ogg'
attack_verb = list("burnt", "singed")
attack_verb = list("burnt", "signed")
if(istype(src, /obj/item/weapon/lighter/zippo) )
user.visible_message("<span class='rose'>Without even breaking stride, [user] flips open and lights [src] in one smooth movement.</span>")
user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.", "<span class='notice'>Without even breaking stride, you flip open and lights [src] in one smooth movement.</span>")
else
if(prob(75))
user.visible_message("<span class='notice'>After a few attempts, [user] manages to light [src].</span>")
user.visible_message("After a few attempts, [user] manages to light [src].", "<span class='notice'>After a few attempts, you manage to light [src].</span>")
else
user << "<span class='warning'>You burn yourself while lighting the lighter.</span>"
user.adjustFireLoss(5)
user.visible_message("<span class='notice'>After a few attempts, [user] manages to light [src], they however burn their finger in the process.</span>")
user.visible_message("<span class='warning'>After a few attempts, [user] manages to light [src] - they however burn their finger in the process.</span>", "<span class='warning'>You burn yourself while lighting the lighter!</span>")
user.AddLuminosity(1)
SSobj.processing |= src
@@ -499,9 +498,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
force = 0
attack_verb = null //human_defense.dm takes care of it
if(istype(src, /obj/item/weapon/lighter/zippo) )
user.visible_message("<span class='rose'>You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.")
user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.", "<span class='notice'>You quietly shut off [src] without even looking at what you're doing. Wow.</span>")
else
user.visible_message("<span class='notice'>[user] quietly shuts off [src].")
user.visible_message("[user] quietly shuts off [src].", "<span class='notice'>You quietly shut off [src].")
user.AddLuminosity(-1)
SSobj.processing.Remove(src)
code/game/objects/items/weapons/clown_items.dm
+3 -3
View File
@@ -48,15 +48,15 @@
if(user.client && (target in user.client.screen))
user << "<span class='warning'>You need to take that [target.name] off before cleaning it!</span>"
else if(istype(target,/obj/effect/decal/cleanable))
user.visible_message("<span class='warning'>[user] begins to scrub \the [target.name] out with [src].</span>")
user.visible_message("[user] begins to scrub \the [target.name] out with [src].", "<span class='warning'>You begin to scrub \the [target.name] out with [src]...</span>")
if(do_after(user, src.cleanspeed))
user << "<span class='notice'>You scrub \the [target.name] out.</span>"
qdel(target)
else if(ishuman(target) && user.zone_sel && user.zone_sel.selecting == "mouth")
user.visible_message("<span class='warning'>\the [user] washes \the [target]'s mouth out with [src.name]!</span>") //washes mouth out with soap sounds better than 'the soap' here
user.visible_message("<span class='warning'>\the [user] washes \the [target]'s mouth out with [src.name]!</span>", "<span class='notice'>You wash \the [target]'s mouth out with [src.name]!</span>") //washes mouth out with soap sounds better than 'the soap' here
return
else
user.visible_message("<span class='warning'>[user] begins to clean \the [target.name] with [src]...</span>")
user.visible_message("[user] begins to clean \the [target.name] with [src]...", "<span class='notice'>You begin to clean \the [target.name] with [src]...</span>")
if(do_after(user, src.cleanspeed))
user << "<span class='notice'>You clean \the [target.name].</span>"
var/obj/effect/decal/cleanable/C = locate() in target
code/game/objects/items/weapons/cosmetics.dm
+12 -12
View File
@@ -64,15 +64,15 @@
H.update_body()
else
user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
"<span class='notice'>You begin to apply \the [src]...</span>")
"<span class='notice'>You begin to apply \the [src] on [H]'s lips...</span>")
if(do_after(user, 20) && do_after(H, 20, 5, 0)) //user needs to keep their active hand, H does not.
user.visible_message("<span class='notice'>[user] does [H]'s lips with \the [src].</span>", \
"<span class='notice'>You apply \the [src].</span>")
user.visible_message("[user] does [H]'s lips with \the [src].", \
"<span class='notice'>You apply \the [src] on [H]'s lips.</span>")
H.lip_style = "lipstick"
H.lip_color = colour
H.update_body()
else
user << "<span class='notice'>Where are the lips on that?</span>"
user << "<span class='warning'>Where are the lips on that?</span>"
//you can wipe off lipstick with paper!
/obj/item/weapon/paper/attack(mob/M, mob/user)
@@ -90,7 +90,7 @@
user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
"<span class='notice'>You begin to wipe off [H]'s lipstick...</span>")
if(do_after(user, 10) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not.
user.visible_message("<span class='notice'>[user] wipes [H]'s lipstick off with \the [src].</span>", \
user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \
"<span class='notice'>You wipe off [H]'s lipstick.</span>")
H.lip_style = null
H.update_body()
@@ -124,17 +124,17 @@
var/location = user.zone_sel.selecting
if(location == "mouth")
if(!get_location_accessible(H, location))
user << "<span class='notice'>The mask is in the way.</span>"
user << "<span class='warning'>The mask is in the way!</span>"
return
if(H.facial_hair_style == "Shaved")
user << "<span class='notice'>Already clean-shaven.</span>"
user << "<span class='warning'>Already clean-shaven!</span>"
return
if(H == user) //shaving yourself
user.visible_message("<span class='notice'>[user] starts to shave their facial hair with [src].</span>", \
user.visible_message("[user] starts to shave their facial hair with [src].", \
"<span class='notice'>You take a moment to shave your facial hair with [src]...</span>")
if(do_after(user, 50))
user.visible_message("<span class='notice'>[user] shaves his facial hair clean with [src].</span>", \
user.visible_message("[user] shaves his facial hair clean with [src].", \
"<span class='notice'>You finish shaving with [src]. Fast and clean!</span>")
shave(H, location)
else
@@ -149,17 +149,17 @@
else if(location == "head")
if(!get_location_accessible(H, location))
user << "<span class='notice'>The headgear is in the way.</span>"
user << "<span class='warning'>The headgear is in the way!</span>"
return
if(H.hair_style == "Bald" || H.hair_style == "Balding Hair" || H.hair_style == "Skinhead")
user << "<span class='warning'>There is not enough hair left to shave!</span>"
return
if(H == user) //shaving yourself
user.visible_message("<span class='notice'>[user] starts to shave their head with [src].</span>", \
user.visible_message("[user] starts to shave their head with [src].", \
"<span class='notice'>You start to shave your head with [src]...</span>")
if(do_after(user, 50))
user.visible_message("<span class='notice'>[user] shaves his head with [src].</span>", \
user.visible_message("[user] shaves his head with [src].", \
"<span class='notice'>You finish shaving with [src].</span>")
shave(H, location)
else
code/game/objects/items/weapons/dice.dm
+2 -2
View File
@@ -72,9 +72,9 @@
if(initial(icon_state) == "d00")
result = (result - 1)*10
if(user != null) //Dice was rolled in someone's hand
user.visible_message("<span class='notice'>[user] has thrown [src]. It lands on [result]. [comment]</span>", \
user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
"<span class='notice'>You throw [src]. It lands on [result]. [comment]</span>", \
"<span class='notice'>You hear [src] landing on [result]. [comment]</span>")
"<span class='italics'>You hear [src] rolling.</span>")
else if(src.throwing == 0) //Dice was thrown and is coming to rest
visible_message("<span class='notice'>[src] rolls to a stop, landing on [result]. [comment]</span>")
code/modules/mob/living/carbon/human/human.dm
+4 -4
View File
@@ -678,7 +678,7 @@
if(health >= 0)
if(src == M)
visible_message( \
"<span class='notice'>[src] examines \himself.", \
"[src] examines \himself.", \
"<span class='notice'>You check yourself for injuries.</span>")
for(var/obj/item/organ/limb/org in organs)
@@ -734,10 +734,10 @@
src << "<span class='warning'>[C.name] is dead!</span>"
return
if(is_mouth_covered())
src << "<span class='notice'>Remove your mask!</span>"
src << "<span class='warning'>Remove your mask first!</span>"
return 0
if(C.is_mouth_covered())
src << "<span class='notice'>Remove their mask!</span>"
src << "<span class='warning'>Remove their mask first!</span>"
return 0
if(C.cpr_time < world.time + 30)
@@ -753,7 +753,7 @@
var/suff = min(C.getOxyLoss(), 7)
C.adjustOxyLoss(-suff)
C.updatehealth()
visible_message("<span class='notice'>[src] performs CPR on [C.name]!</span>")
src.visible_message("[src] performs CPR on [C.name]!", "<span class='notice'>You perform CPR on [C.name].</span>")
C << "<span class='unconscious'>You feel a breath of fresh air enter your lungs... It feels good...</span>"
code/modules/mob/living/silicon/robot/robot.dm
+2 -1
View File
@@ -454,7 +454,7 @@
if (wiresexposed)
wires.Interact(user)
else
user << "<span class='warning'>You can't reach the wiring.</span>"
user << "<span class='warning'>You can't reach the wiring!</span>"
else if(istype(W, /obj/item/weapon/screwdriver) && opened && !cell) // haxing
wiresexposed = !wiresexposed
@@ -475,6 +475,7 @@
return
else
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
user << "<span class='notice'>You start to unfasten [src]'s securing bolts...</span>"
if(do_after(user, 50) && !cell)
user.visible_message("<span class='danger'>[user] deconstructs [src]!</span>", "<span class='notice'>You unfasten the securing bolts, and [src] falls to pieces!</span>")
deconstruct()
code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+8 -8
View File
@@ -32,14 +32,14 @@
D << "<span class='warning'>You can't seem to find the [pick(faux_gadgets)]! Without it, [src] [pick(faux_problems)].</span>"
return
D.visible_message("<span class='notice'>[D] begins to reactivate [src].</span>")
D.visible_message("[D] begins to reactivate [src].", "<span class='notice'>You begin to reactivate [src]...</span>")
if(do_after(user,30,needhand = 1))
health = health_repair_max
stat = CONSCIOUS
icon_state = icon_living
dead_mob_list -= src
living_mob_list += src
D.visible_message("<span class='notice'>[D] reactivates [src]!</span>")
D.visible_message("[D] reactivates [src]!", "<span class='notice'>You reactivate [src].</span>")
alert_drones(DRONE_NET_CONNECT)
if(G)
G << "<span class='boldnotice'>DRONE NETWORK: </span><span class='ghostalert'>You were reactivated by [D]!</span>"
@@ -48,9 +48,9 @@
if("Cannibalize")
if(D.health < D.maxHealth)
D.visible_message("<span class='notice'>[D] begins to cannibalize parts from [src].</span>")
D.visible_message("[D] begins to cannibalize parts from [src].", "<span class='notice'>You begin to cannibalize parts from [src]...</span>")
if(do_after(D, 60,5,0))
D.visible_message("<span class='notice'>[D] repairs itself using [src]'s remains!</span>")
D.visible_message("[D] repairs itself using [src]'s remains!", "<span class='notice'>You repair yourself using [src]'s remains.</span>")
D.adjustBruteLoss(-src.maxHealth)
new /obj/effect/decal/cleanable/oil/streak(get_turf(src))
qdel(src)
@@ -69,9 +69,9 @@
..()
return
if(user.get_active_hand())
user << "<span class='notice'>Your hands are full.</span>"
user << "<span class='warning'>Your hands are full!</span>"
return
src << "<span class='warning'>[user] is trying to pick you up!</span>"
src << "<span class='danger'>[user] is trying to pick you up!</span>"
if(buckled)
user << "<span class='warning'>[src] is buckled to the [buckled.name] and cannot be picked up!</span>"
return
@@ -96,11 +96,11 @@
if(do_after(user,80))
var/repair = health_repair_max - health
adjustBruteLoss(-repair)
visible_message("<span class='notice'>[user] tightens [src == user ? "their" : "[src]'s"] loose screws!</span>")
visible_message("[user] tightens [src == user ? "their" : "[src]'s"] loose screws!", "<span class='notice'>You tighten [src == user ? "their" : "[src]'s"] loose screws.</span>")
else
user << "<span class='warning'>You need to remain still to tighten [src]'s screws!</span>"
else
user << "<span class='notice'>[src]'s screws can't get any tighter!</span>"
user << "<span class='warning'>[src]'s screws can't get any tighter!</span>"
else
..()
code/modules/paperwork/photocopier.dm
+4 -4
View File
@@ -302,18 +302,18 @@
return
src.add_fingerprint(user)
if(target == user)
visible_message("<span class='warning'>[user] starts climbing onto the photocopier!</span>")
user.visible_message("[user] starts climbing onto the photocopier!", "<span class='notice'>You start climbing onto the photocopier...</span>")
else
visible_message("<span class='warning'>[user] starts putting [target] onto the photocopier!</span>")
user.visible_message("<span class='warning'>[user] starts putting [target] onto the photocopier!</span>", "<span class='notice'>You start putting [target] onto the photocopier...</span>")
if(do_after(user, 20))
if(!target || target.gc_destroyed || gc_destroyed || !Adjacent(target)) //check if the photocopier/target still exists.
return
if(target == user)
visible_message("<span class='warning'>[user] climbs onto the photocopier!</span>")
user.visible_message("[user] climbs onto the photocopier!", "<span class='notice'>You climb onto the photocopier.</span>")
else
visible_message("<span class='warning'>[user] puts [target] onto the photocopier!</span>")
user.visible_message("<span class='warning'>[user] puts [target] onto the photocopier!</span>", "<span class='notice'>You put [target] onto the photocopier.</span>")
target.loc = get_turf(src)
ass = target
code/modules/power/apc.dm
+10 -10
View File
@@ -386,13 +386,13 @@
has_electronics = 0
if ((stat & BROKEN) || malfhack)
user.visible_message(\
"<span class='warning'>[user.name] has broken the power control board inside [src.name]!</span>",\
"[user.name] has broken the power control board inside [src.name]!",\
"<span class='notice'>You break the charred power control board and remove the remains.</span>",
"You hear a crack!")
//ticker.mode:apcs-- //XSI said no and I agreed. -rastaf0
else
user.visible_message(\
"<span class='warning'>[user.name] has removed the power control board from [src.name]!</span>",\
"[user.name] has removed the power control board from [src.name]!",\
"<span class='notice'>You remove the power control board.</span>")
new /obj/item/weapon/module/power_control(loc)
else if (opened!=2) //cover isn't removed
@@ -472,7 +472,7 @@
if(C.get_amount() < 10)
user << "<span class='warning'>You need ten lengths of cable for APC!</span>"
return
user.visible_message("<span class='warning'>[user.name] adds cables to the APC frame.</span>", \
user.visible_message("[user.name] adds cables to the APC frame.", \
"<span class='notice'>You start adding cables to the APC frame...</span>")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20))
@@ -492,7 +492,7 @@
terminal.dismantle(user)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
user.visible_message("<span class='warning'>[user.name] inserts the power control board into [src].</span>", \
user.visible_message("[user.name] inserts the power control board into [src].", \
"<span class='notice'>You start to insert the power control board into the frame...</span>")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 10))
@@ -508,7 +508,7 @@
if (WT.get_fuel() < 3)
user << "<span class='warning'>You need more welding fuel to complete this task!</span>"
return
user.visible_message("<span class='warning'>[user.name] welds [src].</span>", \
user.visible_message("[user.name] welds [src].", \
"<span class='notice'>You start welding the APC frame...</span>", \
"You hear welding.")
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
@@ -517,12 +517,12 @@
if (emagged || malfhack || (stat & BROKEN) || opened==2)
new /obj/item/stack/sheet/metal(loc)
user.visible_message(\
"<span class='warning'>[user.name] has cut [src] apart with [W].</span>",\
"[user.name] has cut [src] apart with [W].",\
"<span class='notice'>You disassembled the broken APC frame.</span>")
else
new /obj/item/apc_frame(loc)
user.visible_message(\
"<span class='warning'>[user.name] has cut [src] from the wall with [W].</span>",\
"[user.name] has cut [src] from the wall with [W].",\
"<span class='notice'>You cut the APC frame from the wall.</span>")
qdel(src)
return
@@ -531,7 +531,7 @@
if (opened==2)
opened = 1
user.visible_message(\
"<span class='warning'>[user.name] has replaced the damaged APC frontal panel with a new one.</span>",\
"[user.name] has replaced the damaged APC frontal panel with a new one.",\
"<span class='notice'>You replace the damaged APC frontal panel with a new one.</span>")
qdel(W)
update_icon()
@@ -539,7 +539,7 @@
if (has_electronics)
user << "<span class='warning'>You cannot repair this APC until you remove the electronics still inside!</span>"
return
user.visible_message("<span class='warning'>[user.name] replaces the damaged APC frame with a new one.</span>",\
user.visible_message("[user.name] replaces the damaged APC frame with a new one.",\
"<span class='notice'>You begin to replace the damaged APC frame...</span>")
if(do_after(user, 50))
user << "<span class='notice'>You replace the damaged APC frame with a new one.</span>"
@@ -604,7 +604,7 @@
cell.updateicon()
src.cell = null
user.visible_message("<span class='warning'>[user.name] removes the power cell from [src.name]!</span>",\
user.visible_message("[user.name] removes the power cell from [src.name]!",\
"<span class='notice'>You remove the power cell.</span>")
//user << "You remove the power cell."
charging = 0
code/modules/power/cable.dm
+2 -2
View File
@@ -135,7 +135,7 @@ By design, d1 is the smallest direction and d2 is the highest
if(istype(W, /obj/item/weapon/wirecutters))
if (shock(user, 50))
return
visible_message("<span class='warning'>[user] cuts the cable.</span>")
user.visible_message("[user] cuts the cable.", "<span class='notice'>You cut the cable.</span>")
stored.add_fingerprint(user)
investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires")
Deconstruct()
@@ -144,7 +144,7 @@ By design, d1 is the smallest direction and d2 is the highest
else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = W
if (coil.get_amount() < 1)
user << "Not enough cable"
user << "<span class='warning'>Not enough cable!</span>"
return
coil.cable_join(src, user)
code/modules/projectiles/guns/projectile/revolver.dm
+2 -2
View File
@@ -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='warning'>You spin the revolver's chamber.</span>")
user.visible_message("<span class='warning'>[user] spins the chamber of the revolver.</span>", "<span class='notice'>You spin the revolver's chamber.</span>")
Spin()
else
var/num_unloaded = 0
@@ -185,7 +185,7 @@
return
if(target != user)
if(ismob(target))
user << "<span class='warning'>A mechanism prevents you from shooting anyone but yourself.</span>"
user << "<span class='warning'>A mechanism prevents you from shooting anyone but yourself!</span>"
return
if(ishuman(user))
code/modules/reagents/reagent_containers/pill.dm
+1 -1
View File
@@ -63,7 +63,7 @@
return
user << "<span class='notice'>You dissolve [src] in [target].</span>"
for(var/mob/O in viewers(2, user)) //viewers is necessary here because of the small radius
O << "<span class='warning'>[user] slips something into [target].</span>"
O << "<span class='warning'>[user] slips something into [target]!</span>"
reagents.trans_to(target, reagents.total_volume)
spawn(5)
qdel(src)