Skip to content

Commit

Permalink
Fixes a bunch of broken verbs (#16581)
Browse files Browse the repository at this point in the history
* b

# Conflicts:
#	html/changelogs/mattatlas-scopefix.yml

* bbb

* fix debug log

---------

Co-authored-by: Matt Atlas <[email protected]>
  • Loading branch information
NonQueueingMatt and Matt Atlas committed Jun 28, 2023
1 parent de87fc4 commit d4e676a
Show file tree
Hide file tree
Showing 22 changed files with 76 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/_helpers/logging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
if(!C.prefs) //This is to avoid null.toggles runtime error while still initialyzing players preferences
return
if(C.prefs.toggles & CHAT_DEBUGLOGS)
to_chat(C, "DEBUG: [text]")
to_chat(C, "<span class='debug'>DEBUG: [text]</span>")
send_gelf_log(short_message = text, long_message = "[time_stamp()]: [text]", level = level, category = "DEBUG")

/proc/log_game(text, level = SEVERITY_NOTICE, ckey = "", admin_key = "", ckey_target = "")
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/devices/scanners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ BREATH ANALYZER
/obj/item/device/healthanalyzer/verb/toggle_mode()
set name = "Switch Verbosity"
set category = "Object"
set src in usr

mode = !mode

Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/devices/taperecorder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
/obj/item/device/taperecorder/verb/stop()
set name = "Stop Recording"
set category = "Object"
set src in usr

if(use_check_and_message(usr))
return
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/ears/antennae.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
set name = "Lock Antenna(e)"
set desc = "Lock your antenna(e) in place."
set category = "Object"
set src in usr

if(!ishuman(usr))
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/gloves/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
return

/obj/item/clothing/gloves/ballistic/verb/unload_shells()
set name = "Unload Ballistic Gauntlet "
set name = "Unload Ballistic Gauntlet"
set desc = "Unload the shells from the gauntlet's mounted gun."
set category = "Object"
set src in usr
Expand Down
1 change: 1 addition & 0 deletions code/modules/games/cards.dm
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@
set category = "Object"
set name = "Discard"
set desc = "Place a card from your hand in front of you."
set src in usr

draw_card(usr)

Expand Down
1 change: 1 addition & 0 deletions code/modules/integrated_electronics/core/assemblies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
set name = "Rename Circuit"
set category = "Object"
set desc = "Rename your circuit, useful to stay organized."
set src in usr

var/mob/M = usr
if(!check_interactivity(M))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/martial_arts/martial.dm
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@

/datum/martial_art/proc/teach(var/mob/living/carbon/human/H)
if(help_verb)
add_verb(H, help_verb)
add_verb(H, help_verb)
to_chat(H, SPAN_NOTICE("You can review the combos by recalling the teachings of this art in your abilities tab."))
LAZYADD(H.known_martial_arts, src)
if(!H.primary_martial_art)
Expand Down
1 change: 1 addition & 0 deletions code/modules/paperwork/pen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@
/obj/item/pen/chameleon/verb/set_colour()
set name = "Change Pen Colour"
set category = "Object"
set src in usr

var/list/possible_colours = list ("Yellow", "Green", "Pink", "Blue", "Orange", "Cyan", "Red", "Invisible", "Black")
var/selected_type = input("Pick new colour.", "Pen Colour", null, null) as null|anything in possible_colours
Expand Down
2 changes: 2 additions & 0 deletions code/modules/paperwork/photography.dm
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ var/global/photo_count = 0
/obj/item/device/camera/verb/change_size()
set name = "Set Photo Focus"
set category = "Object"
set src in usr

var/nsize = input("Photo Size","Pick a size of resulting photo.") as null|anything in list(1,3,5,7)
if(nsize)
size = nsize
Expand Down
3 changes: 3 additions & 0 deletions code/modules/power/cable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/item/stack/cable_coil/verb/make_restraint()
set name = "Make Cable Restraints"
set category = "Object"
set src in usr

if(ishuman(usr) && !usr.restrained() && !usr.stat && !usr.paralysis && ! usr.stunned)
if(!isturf(usr.loc))
Expand Down Expand Up @@ -697,6 +698,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/item/stack/cable_coil/cyborg/verb/set_colour()
set name = "Change Colour"
set category = "Object"
set src in usr

choose_cable_color(usr)

Expand Down Expand Up @@ -994,6 +996,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/item/stack/cable_coil/verb/make_noose()
set name = "Make Noose"
set category = "Object"
set src in usr

if(use_check_and_message(usr, USE_DISALLOW_SILICONS))
return
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/guns/energy/modular.dm
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@
set name = "Name Prototype"
set category = "Object"
set desc = "Name your invention so that its glory might be eternal"
set src in usr

var/mob/M = usr
if(!M.mind)
Expand All @@ -312,6 +313,7 @@
set name = "Describe Prototype"
set category = "Object"
set desc = "Describe your invention so that its glory might be eternal"
set src in usr

var/mob/M = usr
if(!M.mind)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/energy/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@

/obj/item/gun/energy/rifle/laser/tachyon/verb/scope()
set category = "Object"
set name = "Use Rifle Scope"
set popup_menu = 1
set name = "Use Scope"
set src in usr

if(wielded)
toggle_scope(2.0, usr)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/guns/projectile/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
set name = "Name Gun"
set category = "Object"
set desc = "Rename your gun. If you're the detective."
set src in usr

var/mob/M = usr
if(!M.mind) return 0
Expand Down Expand Up @@ -328,6 +329,7 @@
set name = "Name Gun"
set category = "Object"
set desc = "Rename your gun."
set src in usr

var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN)

Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/guns/projectile/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
set name = "Spin cylinder"
set desc = "Fun when you're bored out of your skull."
set category = "Object"
set src in usr

chamber_offset = 0
usr.visible_message("<span class='warning'>\The [usr] spins the cylinder of \the [src]!</span>", "<span class='warning'>You spin the cylinder of \the [src]!</span>", "<span class='notice'>You hear something metallic spin and click.</span>")
Expand Down Expand Up @@ -105,6 +106,7 @@
set name = "Name Gun"
set category = "Object"
set desc = "Click to rename your gun. If you're the detective."
set src in usr

var/mob/M = usr
if(!M.mind) return 0
Expand Down Expand Up @@ -226,6 +228,7 @@
set name = "Spin cylinder"
set desc = "Fun when you're bored out of your skull."
set category = "Object"
set src in usr

chamber_offset = 0
visible_message("<span class='warning'>\The [usr] spins the cylinder of \the [src]!</span>", \
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/targeting/targeting_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
set name = "Toggle Gun Mode"
set desc = "Begin or stop aiming."
set category = "IC"

if(isliving(src))
var/mob/living/M = src
if(!M.aiming)
Expand Down
42 changes: 42 additions & 0 deletions html/changelogs/mattatlas-antennae.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################

# Your name.
author: MattAtlas

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixes a bunch of broken verbs, like locking IPC antennae."
- bugfix: "Fixes the debug log filter."
1 change: 1 addition & 0 deletions tgui/packages/tgui-panel/chat/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ export const MESSAGE_TYPES = [
type: MESSAGE_TYPE_DEBUG,
name: 'Debug Log',
description: 'DEBUG: SSPlanets subsystem Recover().',
selector: '.debug',
admin: true,
},
];
3 changes: 3 additions & 0 deletions tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,9 @@ em {
color: #1b521f;
font-weight: bold;
}
.debug {
color: #306b34;
}

/* Radio: Misc */
.deadsay {
Expand Down
3 changes: 3 additions & 0 deletions tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,9 @@ em {
color: #1b521f;
font-weight: bold;
}
.debug {
color: #306b34;
}

/* Radio: Misc */
.deadsay {
Expand Down
4 changes: 2 additions & 2 deletions tgui/public/tgui-panel.bundle.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tgui/public/tgui-panel.bundle.js

Large diffs are not rendered by default.

0 comments on commit d4e676a

Please sign in to comment.