mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-04 14:33:10 +00:00
Fixes a bunch of broken verbs (#16581)
* b # Conflicts: # html/changelogs/mattatlas-scopefix.yml * bbb * fix debug log --------- Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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>")
|
||||
@@ -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
|
||||
@@ -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>", \
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user