Skip to content

Commit

Permalink
The the third part
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreML committed Dec 6, 2023
1 parent 35f3406 commit 2f612e8
Show file tree
Hide file tree
Showing 31 changed files with 79 additions and 79 deletions.
6 changes: 3 additions & 3 deletions code/modules/defenses/defenses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -366,15 +366,15 @@
if(locked)
to_chat(user, SPAN_WARNING("The control panel on [src] is locked to non-engineers."))
return
user.visible_message(SPAN_NOTICE("[user] begins switching the [src] [turned_on? "off" : "on"]."), SPAN_NOTICE("You begin switching the [src] [turned_on? "off" : "on"]."))
user.visible_message(SPAN_NOTICE("[user] begins switching [src] [turned_on? "off" : "on"]."), SPAN_NOTICE("You begin switching [src] [turned_on? "off" : "on"]."))
if(!(do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, src)))
return

if(!turned_on)
if(!can_be_near_defense)
for(var/obj/structure/machinery/defenses/def in urange(defense_check_range, loc))
if(def != src && def.turned_on && !def.can_be_near_defense)
to_chat(user, SPAN_WARNING("This is too close to a [def]!"))
to_chat(user, SPAN_WARNING("This is too close to \a [def]!"))
return

power_on()
Expand Down Expand Up @@ -451,7 +451,7 @@

/obj/structure/machinery/defenses/bullet_act(obj/projectile/P)
bullet_ping(P)
visible_message(SPAN_WARNING("[src] is hit by the [P]!"))
visible_message(SPAN_WARNING("[src] is hit by [P]!"))
var/ammo_flags = P.ammo.flags_ammo_behavior | P.projectile_override_flags
if(ammo_flags & AMMO_ACIDIC) //Fix for xenomorph spit doing baby damage.
update_health(round(P.damage/3))
Expand Down
4 changes: 2 additions & 2 deletions code/modules/hydroponics/hydro_tray.dm
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
yield_mod = 0
mutation_mod = 0

to_chat(user, "You remove the dead plant from the [src].")
to_chat(user, "You remove the dead plant from [src].")
check_level_sanity()
update_icon()
return
Expand Down Expand Up @@ -593,7 +593,7 @@
else if (istype(O, /obj/item/tool/minihoe)) // The minihoe

if(weedlevel > 0)
user.visible_message(SPAN_DANGER("[user] starts uprooting the weeds."), SPAN_DANGER("You remove the weeds from the [src]."))
user.visible_message(SPAN_DANGER("[user] starts uprooting the weeds."), SPAN_DANGER("You remove the weeds from [src]."))
weedlevel = 0
update_icon()
else
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/carbon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
playsound(loc, "sparks", 25, 1)
if(shock_damage > 10)
src.visible_message(
SPAN_DANGER("[src] was shocked by the [source]!"), \
SPAN_DANGER("[src] was shocked by [source]!"), \
SPAN_DANGER("<B>You feel a powerful shock course through your body!</B>"), \
SPAN_DANGER("You hear a heavy electrical crack.") \
)
Expand All @@ -207,7 +207,7 @@

else
src.visible_message(
SPAN_DANGER("[src] was mildly shocked by the [source]."), \
SPAN_DANGER("[src] was mildly shocked by [source]."), \
SPAN_DANGER("You feel a mild shock course through your body."), \
SPAN_DANGER("You hear a light zapping.") \
)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/human_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -335,10 +335,10 @@ Contains most of the procs that are called when a mob is attacked by something
if (M.faction == faction)
M.track_friendly_fire(initial(O.name))
if (assailant)
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [O], thrown by [key_name(M)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with \a [O], thrown by [key_name(M)]</font>")
M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [key_name(src)] with a thrown [O]</font>")
if(!istype(src,/mob/living/simple_animal/mouse))
msg_admin_attack("[key_name(src)] was hit by a [O], thrown by [key_name(M)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z)
msg_admin_attack("[key_name(src)] was hit by \a [O], thrown by [key_name(M)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z)

if(last_damage_source)
last_damage_data = create_cause_data(last_damage_source, last_damage_mob)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,12 @@
if(check_blockers && istype(O, /obj/effect/build_blocker))
var/obj/effect/build_blocker/bb = O
if(!silent)
to_chat(src, SPAN_WARNING("This is too close to a [bb.linked_structure]!"))
to_chat(src, SPAN_WARNING("This is too close to \a [bb.linked_structure]!"))
return
if(check_doors)
if(istype(O, /obj/structure/machinery/door))
if(!silent)
to_chat(src, SPAN_WARNING("\The [O] is blocking the resin! There's not enough space to build that here."))
to_chat(src, SPAN_WARNING("[O] is blocking the resin! There's not enough space to build that here."))
return
if(istype(O, /obj/item/clothing/mask/facehugger))
if(!silent)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
if(!affected_atom || affected_atom.layer >= FLY_LAYER || !isturf(xeno.loc) || !xeno.check_state())
return

xeno.visible_message(SPAN_XENOWARNING("The [xeno] fires a blast of acid at [affected_atom]!"), SPAN_XENOWARNING("You fire a blast of acid at [affected_atom]!"))
xeno.visible_message(SPAN_XENOWARNING("[xeno] fires a blast of acid at [affected_atom]!"), SPAN_XENOWARNING("You fire a blast of acid at [affected_atom]!"))

var/turf/target_turf = locate(affected_atom.x, affected_atom.y, affected_atom.z)
var/obj/projectile/proj = new(xeno.loc, create_cause_data("acid shotgun", xeno))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
var/datum/behavior_delegate/ravager_base/behavior = xeno.behavior_delegate
if(behavior.empower_targets < behavior.super_empower_threshold)
return
xeno.visible_message(SPAN_XENODANGER("The [xeno] uses its shield to bash [human] as it charges at them!"), SPAN_XENODANGER("You use your shield to bash [human] as you charge at them!"))
xeno.visible_message(SPAN_XENODANGER("[xeno] uses its shield to bash [human] as it charges at them!"), SPAN_XENODANGER("You use your shield to bash [human] as you charge at them!"))
human.apply_effect(behavior.knockdown_amount, WEAKEN)
human.attack_alien(xeno, rand(xeno.melee_damage_lower, xeno.melee_damage_upper))

Expand Down Expand Up @@ -517,7 +517,7 @@
return
behavior.use_shards(shard_cost)

xeno.visible_message(SPAN_XENOWARNING("The [xeno] fires their spikes at [affected_atom]!"), SPAN_XENOWARNING("You fire your spikes at [affected_atom]!"))
xeno.visible_message(SPAN_XENOWARNING("[xeno] fires their spikes at [affected_atom]!"), SPAN_XENOWARNING("You fire your spikes at [affected_atom]!"))

var/turf/target = locate(affected_atom.x, affected_atom.y, affected_atom.z)
var/obj/projectile/projectile = new /obj/projectile(xeno.loc, create_cause_data(initial(xeno.caste_type), xeno))
Expand Down Expand Up @@ -564,7 +564,7 @@
behavior.use_shards(shard_cost)
behavior.lock_shards()

xeno.visible_message(SPAN_XENOWARNING("The [xeno] sheds their spikes, firing them in all directions!"), SPAN_XENOWARNING("You shed your spikes, firing them in all directions!!"))
xeno.visible_message(SPAN_XENOWARNING("[xeno] sheds their spikes, firing them in all directions!"), SPAN_XENOWARNING("You shed your spikes, firing them in all directions!!"))
xeno.spin_circle()
create_shrapnel(get_turf(xeno), shrapnel_amount, null, null, ammo_type, create_cause_data(initial(xeno.caste_type), owner), TRUE)
playsound(xeno, 'sound/effects/spike_spray.ogg', 25, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/attack_alien.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
knock_chance += min(round(damage * 0.25), 10) //Maximum of 15% chance.
if(prob(knock_chance))
playsound(loc, "alien_claw_metal", 25, 1)
M.visible_message(SPAN_DANGER("The [M] smashes off [src]'s [wear_mask.name]!"), \
M.visible_message(SPAN_DANGER("[M] smashes off [src]'s [wear_mask.name]!"), \
SPAN_DANGER("You smash off [src]'s [wear_mask.name]!"), null, 5)
drop_inv_item_on_ground(wear_mask)
if(isyautja(src))
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/living_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@
M.track_friendly_fire(initial(O.name))
var/client/assailant = M.client
if(assailant)
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [O], thrown by [key_name(M)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with \a [O], thrown by [key_name(M)]</font>")
M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [key_name(src)] with a thrown [O]</font>")
if(!istype(src,/mob/living/simple_animal/mouse))
if(src.loc)
msg_admin_attack("[key_name(src)] was hit by a [O], thrown by [key_name(M)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z)
msg_admin_attack("[key_name(src)] was hit by \a [O], thrown by [key_name(M)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z)
else
msg_admin_attack("[key_name(src)] was hit by a [O], thrown by [key_name(M)] in [get_area(M)] ([M.loc.x],[M.loc.y],[M.loc.z]).", M.loc.x, M.loc.y, M.loc.z)
msg_admin_attack("[key_name(src)] was hit by \a [O], thrown by [key_name(M)] in [get_area(M)] ([M.loc.x],[M.loc.y],[M.loc.z]).", M.loc.x, M.loc.y, M.loc.z)
if(last_damage_source)
last_damage_data = create_cause_data(last_damage_source, M)

Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/living_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@
//okay, so the closet is either welded or locked... resist!!!
next_move = world.time + 100
last_special = world.time + 100
to_chat(src, SPAN_DANGER("You lean on the back of \the [C] and start pushing the door open. (this will take about [breakout_time] minutes)"))
to_chat(src, SPAN_DANGER("You lean on the back of [C] and start pushing the door open. (this will take about [breakout_time] minutes)"))
for(var/mob/O in viewers(loc))
O.show_message(SPAN_DANGER("<B>The [loc] begins to shake violently!</B>"), SHOW_MESSAGE_VISIBLE)
O.show_message(SPAN_DANGER("<B>[loc] begins to shake violently!</B>"), SHOW_MESSAGE_VISIBLE)

if(!do_after(src, (breakout_time*1 MINUTES), INTERRUPT_NO_NEEDHAND^INTERRUPT_RESIST))
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/friendly/corgi.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
movement_target.attack_animal(src)
else if(ishuman(movement_target.loc) )
if(prob(20))
INVOKE_ASYNC(src, PROC_REF(emote), "stares at the [movement_target] that [movement_target.loc] has with a sad puppy-face")
INVOKE_ASYNC(src, PROC_REF(emote), "stares at [movement_target] that [movement_target.loc] has with a sad puppy-face")

if(prob(1))
INVOKE_ASYNC(src, PROC_REF(emote), pick("dances around","chases its tail"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
user.visible_message(SPAN_NOTICE("[user] milks [src] using \the [O]."))
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
to_chat(user, SPAN_DANGER("The [O] is full."))
to_chat(user, SPAN_DANGER("[O] is full."))
if(!transfered)
to_chat(user, SPAN_DANGER("The udder is dry. Wait a bit longer..."))
else
Expand Down
14 changes: 7 additions & 7 deletions code/modules/mob/living/simple_animal/parrot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
if(!parrot_perch || parrot_interest.loc != parrot_perch.loc)
held_item = parrot_interest
parrot_interest.forceMove(src)
visible_message("[src] grabs the [held_item]!", SPAN_NOTICE("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.")
visible_message("[src] grabs [held_item]!", SPAN_NOTICE("You grab [held_item]!"), "You hear the sounds of wings flapping furiously.")

parrot_interest = null
parrot_state = PARROT_SWOOP|PARROT_RETURN
Expand Down Expand Up @@ -577,7 +577,7 @@
return -1

if(held_item)
to_chat(src, SPAN_DANGER("You are already holding the [held_item]"))
to_chat(src, SPAN_DANGER("You are already holding [held_item]"))
return 1

for(var/obj/item/I in view(1,src))
Expand All @@ -590,7 +590,7 @@

held_item = I
I.forceMove(src)
visible_message("[src] grabs the [held_item]!", SPAN_NOTICE("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.")
visible_message("[src] grabs [held_item]!", SPAN_NOTICE("You grab [held_item]!"), "You hear the sounds of wings flapping furiously.")
return held_item

to_chat(src, SPAN_DANGER("There is nothing of interest to take."))
Expand All @@ -605,7 +605,7 @@
return -1

if(held_item)
to_chat(src, SPAN_DANGER("You are already holding the [held_item]"))
to_chat(src, SPAN_DANGER("You are already holding [held_item]"))
return 1

var/obj/item/stolen_item = null
Expand All @@ -620,7 +620,7 @@
if(stolen_item)
if(C.drop_inv_item_to_loc(stolen_item, src))
held_item = stolen_item
visible_message("[src] grabs the [held_item] out of [C]'s hand!", SPAN_NOTICE("You snag the [held_item] out of [C]'s hand!"), "You hear the sounds of wings flapping furiously.")
visible_message("[src] grabs [held_item] out of [C]'s hand!", SPAN_NOTICE("You snag [held_item] out of [C]'s hand!"), "You hear the sounds of wings flapping furiously.")
return held_item

to_chat(src, SPAN_DANGER("There is nothing of interest to take."))
Expand Down Expand Up @@ -655,11 +655,11 @@
var/obj/item/explosive/grenade/G = held_item
G.forceMove(src.loc)
G.prime()
to_chat(src, "You let go of the [held_item]!")
to_chat(src, "You let go of [held_item]!")
held_item = null
return 1

to_chat(src, "You drop the [held_item].")
to_chat(src, "You drop [held_item].")

held_item.forceMove(src.loc)
held_item = null
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/simple_animal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
MED.use(1)
for(var/mob/M as anything in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message(SPAN_NOTICE("[user] applies the [MED] on [src]"), SHOW_MESSAGE_VISIBLE)
M.show_message(SPAN_NOTICE("[user] applies [MED] on [src]"), SHOW_MESSAGE_VISIBLE)
return
else
to_chat(user, SPAN_NOTICE(" this [src] is dead, medical items won't bring it back to life."))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/clipboard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
W.forceMove(src)
if(istype(W, /obj/item/paper))
toppaper = W
to_chat(user, SPAN_NOTICE("You clip the [W] onto \the [src]."))
to_chat(user, SPAN_NOTICE("You clip [W] onto [src]."))
update_icon()

else if(istype(toppaper) && HAS_TRAIT(W, TRAIT_TOOL_PEN))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/folders.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
/obj/item/folder/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/paper_bundle))
if(user.drop_inv_item_to_loc(W, src))
to_chat(user, SPAN_NOTICE("You put the [W] into \the [src]."))
to_chat(user, SPAN_NOTICE("You put [W] into [src]."))
update_icon()
else if(HAS_TRAIT(W, TRAIT_TOOL_PEN))
var/n_name = strip_html(input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/paperbin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

P.forceMove(user.loc)
user.put_in_hands(P)
to_chat(user, SPAN_NOTICE("You take [P] out of the [src]."))
to_chat(user, SPAN_NOTICE("You take [P] out of [src]."))
else
to_chat(user, SPAN_NOTICE("[src] is empty!"))

Expand Down
10 changes: 5 additions & 5 deletions code/modules/power/smes_construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
if (user_protected && prob(80))
to_chat(h_user, "Small electrical arc almost burns your hand. Luckily you had your gloves on!")
else
to_chat(h_user, "Small electrical arc sparks and burns your hand as you touch the [src]!")
to_chat(h_user, "Small electrical arc sparks and burns your hand as you touch [src]!")
h_user.apply_damage(rand(5,10), BURN)
h_user.apply_effect(2, PARALYZE)
charge = 0
Expand All @@ -98,7 +98,7 @@
if (user_protected && prob(25))
to_chat(h_user, "Medium electrical arc sparks and almost burns your hand. Luckily you had your gloves on!")
else
to_chat(h_user, "Medium electrical sparks as you touch the [src], severely burning your hand!")
to_chat(h_user, "Medium electrical sparks as you touch [src], severely burning your hand!")
h_user.apply_damage(rand(10,25), BURN)
h_user.apply_effect(5, PARALYZE)
spawn(0)
Expand Down Expand Up @@ -182,7 +182,7 @@
/obj/structure/machinery/power/smes/buildable/attackby(obj/item/W as obj, mob/user as mob)
// No more disassembling of overloaded SMESs. You broke it, now enjoy the consequences.
if (failing)
to_chat(user, SPAN_WARNING("The [src]'s screen is flashing with alerts. It seems to be overloaded! Touching it now is probably not a good idea."))
to_chat(user, SPAN_WARNING("[src]'s screen is flashing with alerts. It seems to be overloaded! Touching it now is probably not a good idea."))
return
// If parent returned 1:
// - Hatch is open, so we can modify the SMES
Expand All @@ -195,7 +195,7 @@
return

if (outputting || input_attempt)
to_chat(user, SPAN_WARNING("Turn off the [src] first!"))
to_chat(user, SPAN_WARNING("Turn off [src] first!"))
return

// Probability of failure if safety circuit is disabled (in %)
Expand All @@ -212,7 +212,7 @@
return

playsound(get_turf(src), 'sound/items/Crowbar.ogg', 25, 1)
to_chat(user, SPAN_WARNING("You begin to disassemble the [src]!"))
to_chat(user, SPAN_WARNING("You begin to disassemble [src]!"))
if (do_after(usr, 100 * cur_coils * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) // More coils = takes longer to disassemble. It's complex so largest one with 5 coils will take 50s

if (failure_probability && prob(failure_probability))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammo_boxes/box_structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
if(item_box.contents.len < item_box.num_of_magazines)
user.drop_inv_item_to_loc(W, src)
item_box.contents += W
to_chat(user, SPAN_NOTICE("You put a [W] in to \the [src]"))
to_chat(user, SPAN_NOTICE("You put \a [W] into [src]"))
update_icon()
else
to_chat(user, SPAN_WARNING("\The [src] is full."))
Expand Down
7 changes: 3 additions & 4 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -350,16 +350,16 @@ Defined in conflicts.dm of the #defines folder.
if(istype(W, /obj/item/co2_cartridge))
if(!filled)
filled = TRUE
user.visible_message(SPAN_NOTICE("[user] slots a CO2 cartridge into [src]. A second later, \he apparently looks dismayed."), SPAN_WARNING("You slot a fresh CO2 cartridge into [src] and snap the slot cover into place. Only then do you realize \the [W]'s valve broke inside \the [src]. Fuck."))
user.visible_message(SPAN_NOTICE("[user] slots a CO2 cartridge into [src]. A second later, \he apparently looks dismayed."), SPAN_WARNING("You slot a fresh CO2 cartridge into [src] and snap the slot cover into place. Only then do you realize [W]'s valve broke inside [src]. Fuck."))
playsound(src, 'sound/machines/click.ogg')
qdel(W)
update_icon()
return
else
user.visible_message(SPAN_WARNING("[user] fiddles with \the [src]. \He looks frustrated."), SPAN_NOTICE("No way man! You can't seem to pry the existing container out of \the [src]... try a screwdriver?"))
user.visible_message(SPAN_WARNING("[user] fiddles with [src]. \He looks frustrated."), SPAN_NOTICE("No way man! You can't seem to pry the existing container out of [src]... try a screwdriver?"))
return
if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER) && do_after(user, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD))
user.visible_message(SPAN_WARNING("[user] screws with \the [src], using \a [W]. \He looks very frustrated."), SPAN_NOTICE("You try to pry the cartridge out of the [src], but it's stuck damn deep. Piece of junk..."))
user.visible_message(SPAN_WARNING("[user] screws with [src], using \a [W]. \He looks very frustrated."), SPAN_NOTICE("You try to pry the cartridge out of [src], but it's stuck damn deep. Piece of junk..."))
return
..()

Expand Down Expand Up @@ -3447,4 +3447,3 @@ Defined in conflicts.dm of the #defines folder.
accuracy_mod = HIT_ACCURACY_MULT_TIER_5
accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_5
damage_mod -= BULLET_DAMAGE_MULT_TIER_4

3 changes: 2 additions & 1 deletion code/modules/projectiles/guns/smartgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@
/obj/item/weapon/gun/smartgun/attackby(obj/item/attacking_object, mob/user)
if(istype(attacking_object, /obj/item/smartgun_battery))
var/obj/item/smartgun_battery/new_cell = attacking_object
visible_message("[user] swaps out the power cell in the [src].","You swap out the power cell in the [src] and drop the old one.")
visible_message(SPAN_NOTICE("[user] swaps out the power cell in [src]."),
SPAN_NOTICE("You swap out the power cell in [src] and drop the old one."))
to_chat(user, SPAN_NOTICE("The new cell contains: [new_cell.power_cell.charge] power."))
battery.update_icon()
battery.forceMove(get_turf(user))
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/souto.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
return ..()

/obj/item/weapon/gun/souto/reload(mob/user, obj/item/ammo_magazine/magazine)
to_chat(user, SPAN_WARNING("The [src] feed system cannot be reloaded manually."))
to_chat(user, SPAN_WARNING("[src]'s feed system cannot be reloaded manually."))
return

/obj/item/weapon/gun/souto/unload(mob/user, reload_override = 0, drop_override = 0, loc_override = 0)
to_chat(user, SPAN_WARNING("You cannot unload the [src]."))
to_chat(user, SPAN_WARNING("You cannot unload [src]."))
return

/obj/item/weapon/gun/souto/able_to_fire(mob/user)
Expand Down
Loading

0 comments on commit 2f612e8

Please sign in to comment.