Skip to content

Commit

Permalink
The the part 2
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreML committed Dec 4, 2023
1 parent 0b13392 commit 28968d1
Show file tree
Hide file tree
Showing 31 changed files with 69 additions and 75 deletions.
14 changes: 7 additions & 7 deletions code/game/objects/items/reagent_containers/food/snacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,10 @@
if(isanimal(M))
if(iscorgi(M))
if(bitecount == 0 || prob(50))
M.emote("nibbles away at the [src]")
M.emote("nibbles away at [src]")
bitecount++
if(bitecount >= 5)
var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where the [src] was")
var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where [src] was")
if(sattisfaction_text)
M.emote("[sattisfaction_text]")
qdel(src)
Expand Down Expand Up @@ -2801,7 +2801,7 @@
if( open && pizza )
user.put_in_hands( pizza )

to_chat(user, SPAN_DANGER("You take the [src.pizza] out of the [src]."))
to_chat(user, SPAN_DANGER("You take the [src.pizza] out of [src]."))
src.pizza = null
update_icon()
return
Expand Down Expand Up @@ -2852,11 +2852,11 @@
box.update_icon()
update_icon()

to_chat(user, SPAN_DANGER("You put the [box] ontop of the [src]!"))
to_chat(user, SPAN_DANGER("You put [box] ontop of [src]!"))
else
to_chat(user, SPAN_DANGER("The stack is too high!"))
else
to_chat(user, SPAN_DANGER("Close the [box] first!"))
to_chat(user, SPAN_DANGER("Close [box] first!"))

return

Expand All @@ -2868,9 +2868,9 @@

update_icon()

to_chat(user, SPAN_DANGER("You put the [I] in the [src]!"))
to_chat(user, SPAN_DANGER("You put [I] in [src]!"))
else
to_chat(user, SPAN_DANGER("You try to push the [I] through the lid but it doesn't work!"))
to_chat(user, SPAN_DANGER("You try to push [I] through the lid but it doesn't work!"))
return

if( istype(I, /obj/item/tool/pen/) )
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/reagent_containers/glass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
overlays += lid

/obj/item/reagent_container/glass/minitank
name = "MS-11 Smart Refill Tank"
name = "\improper MS-11 Smart Refill Tank"
desc = "A robust little tank capable of refilling autoinjectors that previously required a nanomed system to refill. Using the wonders of microchips, it automatically sorts the correct chemicals into most single reagent autoinjectors. It is unable to partially fill them however. A valve exists on the top to transfer reagents to another container or to flush it entirely."
icon = 'icons/obj/items/tank.dmi'
icon_state = "mini_reagent_tank"
Expand Down Expand Up @@ -277,7 +277,7 @@
if(istype(W, /obj/item/reagent_container/hypospray/autoinjector))
var/obj/item/reagent_container/hypospray/autoinjector/A = W
if(A.mixed_chem)
to_chat(user, SPAN_WARNING("The autoinjector doesn't fit into the [src]'s valve. It's probably not compatible."))
to_chat(user, SPAN_WARNING("The autoinjector doesn't fit into [src]'s valve. It's probably not compatible."))
return
if(reagents.has_reagent(A.chemname, A.volume))
reagents.trans_id_to(A, A.chemname, A.volume)
Expand Down Expand Up @@ -672,5 +672,5 @@
if(istype(AM) && (src in user))
user.visible_message("[user] starts to wipe down [AM] with [src]!")
if(do_after(user,30, INTERRUPT_ALL, BUSY_ICON_GENERIC))
user.visible_message("[user] finishes wiping off the [AM]!")
user.visible_message("[user] finishes wiping off [AM]!")
AM.clean_blood()
2 changes: 1 addition & 1 deletion code/game/objects/items/robot/robot_upgrades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

/obj/item/robot/upgrade/proc/action(mob/living/silicon/robot/R)
if(R.stat == DEAD)
to_chat(usr, SPAN_DANGER("The [src] will not function on a deceased robot."))
to_chat(usr, SPAN_DANGER("[src] will not function on a deceased robot."))
return 1
return 0

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/large_holster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
return FALSE

if(user.back != src)
to_chat(user, "The [src] must be equipped before you can switch types")
to_chat(user, "[src] must be equipped before you can switch types")
return

var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand()
Expand Down
29 changes: 14 additions & 15 deletions code/game/objects/items/tools/flame_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -233,33 +233,33 @@ CIGARETTE PACKETS ARE IN FANCY.DM
light(SPAN_NOTICE("[user] fiddles with [W], and manages to light their [name]."))

else if(istype(W, /obj/item/attachable/attached_gun/flamer))
light(SPAN_NOTICE("[user] lights their [src] with the [W]."))
light(SPAN_NOTICE("[user] lights their [name] with [W]."))

else if(istype(W, /obj/item/weapon/gun/flamer))
var/obj/item/weapon/gun/flamer/F = W
if(!(F.flags_gun_features & GUN_TRIGGER_SAFETY))
light(SPAN_NOTICE("[user] lights their [src] with the pilot light of the [F]."))
light(SPAN_NOTICE("[user] lights their [name] with the pilot light of [F]."))
else
to_chat(user, SPAN_WARNING("Turn on the pilot light first!"))

else if(isgun(W))
var/obj/item/weapon/gun/G = W
for(var/slot in G.attachments)
if(istype(G.attachments[slot], /obj/item/attachable/attached_gun/flamer))
light(SPAN_NOTICE("[user] lights their [src] with [G.attachments[slot]]."))
light(SPAN_NOTICE("[user] lights their [name] with [G.attachments[slot]]."))
break

else if(istype(W, /obj/item/tool/surgery/cautery))
light(SPAN_NOTICE("[user] lights their [src] with the [W]."))
light(SPAN_NOTICE("[user] lights their [name] with [W]."))

else if(istype(W, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/C = W
if(C.item_state == icon_on)
light(SPAN_NOTICE("[user] lights their [src] with the [C] after a few attempts."))
light(SPAN_NOTICE("[user] lights their [name] with [C] after a few attempts."))

else if(istype(W, /obj/item/tool/candle))
if(W.heat_source > 200)
light(SPAN_NOTICE("[user] lights their [src] with the [W] after a few attempts."))
light(SPAN_NOTICE("[user] lights their [name] with [W] after a few attempts."))

return

Expand Down Expand Up @@ -529,12 +529,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
light(SPAN_NOTICE("[user] fiddles with [W], and manages to light their [name] with the power of science."))

else if(istype(W, /obj/item/attachable/attached_gun/flamer))
light(SPAN_NOTICE("[user] lights their [src] with the [W], bet that would have looked cooler if it was attached to something first!"))
light(SPAN_NOTICE("[user] lights their [name] with [W], bet that would have looked cooler if it was attached to something first!"))

else if(istype(W, /obj/item/weapon/gun/flamer))
var/obj/item/weapon/gun/flamer/F = W
if(!(F.flags_gun_features & GUN_TRIGGER_SAFETY))
light(SPAN_NOTICE("[user] lights their [src] with the pilot light of the [F], the glint of pyromania in their eye."))
light(SPAN_NOTICE("[user] lights their [name] with the pilot light of [F], the glint of pyromania in their eye."))
else
to_chat(user, SPAN_WARNING("Turn on the pilot light first!"))

Expand All @@ -546,16 +546,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM
break

else if(istype(W, /obj/item/tool/surgery/cautery))
light(SPAN_NOTICE("[user] lights their [src] with the [W], that can't be sterile!"))
light(SPAN_NOTICE("[user] lights their [name] with [W], that can't be sterile!"))

else if(istype(W, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/C = W
if(C.item_state == icon_on)
light(SPAN_NOTICE("[user] lights their [src] with the [C] after a few attempts."))
light(SPAN_NOTICE("[user] lights their [name] with [C] after a few attempts."))

else if(istype(W, /obj/item/tool/candle))
if(W.heat_source > 200)
light(SPAN_NOTICE("[user] lights their [src] with the [W] after a few attempts."))
light(SPAN_NOTICE("[user] lights their [name] with [W] after a few attempts."))

/////////////////
//SMOKING PIPES//
Expand Down Expand Up @@ -751,15 +751,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else
playsound(src.loc,"lighter",10, 1, 3)
if(prob(95))
user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light the [src]."))
user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light [src]."))

else
to_chat(user, SPAN_WARNING("You burn yourself while lighting the lighter."))
if (user.l_hand == src)
user.apply_damage(2,BURN,"l_hand")
else
user.apply_damage(2,BURN,"r_hand")
user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light the [src], they however burn their finger in the process."))
user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light [src], they however burn their finger in the process."))

set_light_range(2)
set_light_on(TRUE)
Expand All @@ -780,7 +780,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
bearer.visible_message("<span class='rose'>You hear a quiet click, as [bearer] shuts off [src] without even looking at what they're doing.")
playsound(src.loc,"zippo_close",10, 1, 3)
else
bearer.visible_message(SPAN_NOTICE("[bearer] quietly shuts off the [src]."))
bearer.visible_message(SPAN_NOTICE("[bearer] quietly shuts off [src]."))

set_light_on(FALSE)
STOP_PROCESSING(SSobj, src)
Expand All @@ -805,4 +805,3 @@ CIGARETTE PACKETS ARE IN FANCY.DM
cig.light(SPAN_NOTICE("[user] holds the [name] out for [M], and lights the [cig.name]."))
else
..()

2 changes: 1 addition & 1 deletion code/game/objects/items/tools/kitchen_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
var/cooldown = 0

/obj/item/tool/kitchen/tray/attack(mob/living/carbon/M, mob/living/carbon/user)
to_chat(user, SPAN_WARNING("You accidentally slam yourself with the [src]!"))
to_chat(user, SPAN_WARNING("You accidentally slam yourself with [src]!"))
user.apply_effect(1, WEAKEN)
user.take_limb_damage(2)

Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/tools/maintenance_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
if(E)
var/safety = H.get_eye_protection()
if(!safety)
to_chat(user, SPAN_DANGER("You stab [H] in the eyes with the [src]!"))
visible_message(SPAN_DANGER("[user] stabs [H] in the eyes with the [src]!"))
user.visible_message(SPAN_DANGER("[user] stabs [H] in the eyes with [src]!"),
SPAN_DANGER("You stab [H] in the eyes with [src]!"))
E.take_damage(rand(8,20))
return ..()
/obj/item/tool/screwdriver/tactical
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/tools/misc_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
qdel(I) //delete the paper item
labels_left = initial(labels_left)
else
to_chat(user, SPAN_NOTICE("The [src] is already full."))
to_chat(user, SPAN_NOTICE("[src] is already full."))

/*
Instead of updating labels_left to user every label used,
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/toys/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
if(istype(O, /obj/item/reagent_container/glass))
if(O.reagents)
if(O.reagents.total_volume < 1)
to_chat(user, "The [O] is empty.")
to_chat(user, "[O] is empty.")
else if(O.reagents.total_volume >= 1)
if(O.reagents.has_reagent("pacid", 1))
to_chat(user, "The acid chews through the balloon!")
Expand All @@ -68,7 +68,7 @@

/obj/item/toy/balloon/launch_impact(atom/hit_atom)
if(src.reagents.total_volume >= 1)
src.visible_message(SPAN_DANGER("The [src] bursts!"),"You hear a pop and a splash.")
src.visible_message(SPAN_DANGER("[src] bursts!"),"You hear a pop and a splash.")
src.reagents.reaction(get_turf(hit_atom))
for(var/atom/A in get_turf(hit_atom))
src.reagents.reaction(A)
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/weapons/stunbaton.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
bcell.update_icon()
bcell.forceMove(get_turf(src.loc))
bcell = null
to_chat(user, SPAN_NOTICE("You remove the cell from the [src]."))
to_chat(user, SPAN_NOTICE("You remove the cell from [src]."))
status = 0
update_icon()
return
Expand Down Expand Up @@ -183,10 +183,10 @@

// Logging
if(user == L)
user.attack_log += "\[[time_stamp()]\] <b>[key_name(user)]</b> stunned themselves with the [src] in [get_area(user)]"
user.attack_log += "\[[time_stamp()]\] <b>[key_name(user)]</b> stunned themselves with [src] in [get_area(user)]"
else
msg_admin_attack("[key_name(user)] stunned [key_name(L)] with the [src] in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z]).", user.loc.x, user.loc.y, user.loc.z)
var/logentry = "\[[time_stamp()]\] <b>[key_name(user)]</b> stunned <b>[key_name(L)]</b> with the [src] in [get_area(user)]"
msg_admin_attack("[key_name(user)] stunned [key_name(L)] with [src] in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z]).", user.loc.x, user.loc.y, user.loc.z)
var/logentry = "\[[time_stamp()]\] <b>[key_name(user)]</b> stunned <b>[key_name(L)]</b> with [src] in [get_area(user)]"
L.attack_log += logentry
user.attack_log += logentry

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
w_class = SIZE_MEDIUM
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
else
to_chat(user, SPAN_NOTICE("The [src] can now be concealed."))
to_chat(user, SPAN_NOTICE("[src] can now be concealed."))
force = initial(force)
edge = 0
sharp = 0
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@

/obj/structure/proc/toggle_anchored(obj/item/W, mob/user)
if(!wrenchable)
to_chat(user, SPAN_WARNING("The [src] cannot be [anchored ? "un" : ""]anchored."))
to_chat(user, SPAN_WARNING("[src] cannot be [anchored ? "un" : ""]anchored."))
return FALSE
else
// Wrenching is faster if we are better at engineering
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/barricade/metal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
to_chat(user, SPAN_NOTICE("You lack the required metal."))
return
if((usr.get_active_hand()) != metal)
to_chat(user, SPAN_WARNING("You must be holding the [metal] to upgrade \the [src]!"))
to_chat(user, SPAN_WARNING("You must be holding [metal] to upgrade [src]!"))
return

switch(choice)
Expand Down Expand Up @@ -150,7 +150,7 @@
to_chat(user, SPAN_NOTICE("You lack the required metal."))
return
if((usr.get_active_hand()) != metal)
to_chat(user, SPAN_WARNING("You must be holding the [metal] to upgrade \the [src]!"))
to_chat(user, SPAN_WARNING("You must be holding [metal] to upgrade [src]!"))
return

switch(choice)
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/structures/barricade/plasteel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
user.visible_message(SPAN_NOTICE("[user] sets up [src] for linking."),
SPAN_NOTICE("You set up [src] for linking."))
else
to_chat(user, SPAN_WARNING("The [src] has no linking points..."))
to_chat(user, SPAN_WARNING("[src] has no linking points..."))
return
linked = !linked
for(var/direction in GLOB.cardinals)
Expand Down Expand Up @@ -210,7 +210,7 @@

if(closed)
if(recentlyflipped)
to_chat(user, SPAN_NOTICE("The [src] has been flipped too recently!"))
to_chat(user, SPAN_NOTICE("[src] has been flipped too recently!"))
return
user.visible_message(SPAN_NOTICE("[user] flips [src] open."),
SPAN_NOTICE("You flip [src] open."))
Expand All @@ -222,7 +222,7 @@

else
if(recentlyflipped)
to_chat(user, SPAN_NOTICE("The [src] has been flipped too recently!"))
to_chat(user, SPAN_NOTICE("[src] has been flipped too recently!"))
return
user.visible_message(SPAN_NOTICE("[user] flips [src] closed."),
SPAN_NOTICE("You flip [src] closed."))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/closets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@

/obj/structure/closet/attack_animal(mob/living/user)
if(user.wall_smash)
visible_message(SPAN_DANGER("[user] destroys the [src]. "))
visible_message(SPAN_DANGER("[user] destroys [src]."))
for(var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
qdel(src)
Expand Down
3 changes: 1 addition & 2 deletions code/game/objects/structures/flora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE.
//this bush marks the edge of the map, you can't destroy it
to_chat(user, SPAN_DANGER("You flail away at the undergrowth, but it's too thick here."))
else
user.visible_message(SPAN_DANGER("[user] flails away at the [src] with [I]."),SPAN_DANGER("You flail away at the [src] with [I]."))
user.visible_message(SPAN_DANGER("[user] flails away at [src] with [I]."), SPAN_DANGER("You flail away at [src] with [I]."))
playsound(src.loc, 'sound/effects/vegetation_hit.ogg', 25, 1)
health -= damage
if(health < 0)
Expand Down Expand Up @@ -758,4 +758,3 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE.
desc = "Looks like some of that fruit might be edible."
icon_tag = "plant"
variations = 7

2 changes: 1 addition & 1 deletion code/game/objects/structures/grille.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
if (ST.use(1))
var/obj/structure/window/WD = new wtype(loc)
WD.set_constructed_window(dir_to_set)
to_chat(user, SPAN_NOTICE("You place the [WD] on [src]."))
to_chat(user, SPAN_NOTICE("You place [WD] on [src]."))
return
//window placing end

Expand Down
5 changes: 2 additions & 3 deletions code/game/objects/structures/props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@
var/obj/item/dogtag/dog = W
if(!tagged)
tagged = TRUE
user.visible_message(SPAN_NOTICE("[user] drapes the [W] around the [src]."))
user.visible_message(SPAN_NOTICE("[user] drapes [W] around [src]."))
dogtag_name = popleft(dog.fallen_names)
dogtag_assign = popleft(dog.fallen_assgns)
dogtag_blood = popleft(dog.fallen_blood_types)
Expand All @@ -1198,7 +1198,7 @@
else
return
else
to_chat(user, SPAN_WARNING("There's already a dog tag on the [src]!"))
to_chat(user, SPAN_WARNING("There's already a dog tag on [src]!"))
balloon_alert(user, "already a tag here!")

if(istype(W, /obj/item/clothing/head))
Expand Down Expand Up @@ -1372,4 +1372,3 @@
if(initial(emote.sound))
playsound(loc, initial(emote.sound), 50, FALSE)
return TRUE

Loading

0 comments on commit 28968d1

Please sign in to comment.