From 2552190fbff6132e458b02ec7d4a7fd866a5c4a5 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Tue, 31 Jul 2018 01:24:06 -0700 Subject: [PATCH] Fix some weird syntax --- code/__HELPERS/game.dm | 2 +- code/datums/brain_damage/imaginary_friend.dm | 2 +- code/game/machinery/newscaster.dm | 6 +++--- code/game/mecha/mecha.dm | 2 +- code/game/mecha/mecha_actions.dm | 2 +- .../objects/effects/spawners/xeno_egg_delivery.dm | 2 +- code/game/objects/items/pinpointer.dm | 6 ------ code/modules/awaymissions/capture_the_flag.dm | 2 +- code/modules/events/holiday/vday.dm | 2 +- code/modules/mob/living/carbon/alien/larva/powers.dm | 2 +- code/modules/mob/living/carbon/human/species.dm | 6 +++--- code/modules/mob/living/simple_animal/bot/honkbot.dm | 2 +- .../modules/mob/living/simple_animal/hostile/bees.dm | 12 ++++++------ code/modules/research/experimentor.dm | 2 +- 14 files changed, 22 insertions(+), 28 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 13f415823c0..c590c844eb9 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -350,7 +350,7 @@ /proc/flick_overlay(image/I, list/show_to, duration) for(var/client/C in show_to) C.images += I - addtimer(CALLBACK(GLOBAL_PROC, /.proc/remove_images_from_clients, I, show_to), duration, TIMER_CLIENT_TIME) + addtimer(CALLBACK(GLOBAL_PROC, /proc/remove_images_from_clients, I, show_to), duration, TIMER_CLIENT_TIME) /proc/flick_overlay_view(image/I, atom/target, duration) //wrapper for the above, flicks to everyone who can see the target atom var/list/viewing = list() diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 8af71a714bf..d738645c22a 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -158,7 +158,7 @@ if(owner.client) var/mutable_appearance/MA = mutable_appearance('icons/mob/talk.dmi', src, "default[say_test(message)]", FLY_LAYER) MA.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA - INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, MA, list(owner.client), 30) + INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, MA, list(owner.client), 30) for(var/mob/M in GLOB.dead_mob_list) var/link = FOLLOW_LINK(M, owner) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 887eba80478..dd844428e66 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -298,7 +298,7 @@ GLOBAL_LIST_EMPTY(allCasters) if(CHANNEL.is_admin_channel) dat+="[CHANNEL.channel_name]
" else - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ""]
" dat+="
Refresh" dat+="
Back" if(2) @@ -403,7 +403,7 @@ GLOBAL_LIST_EMPTY(allCasters) dat+="No feed channels found active...
" else for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ""]
" dat+="
Cancel" if(11) dat+="Nanotrasen D-Notice Handler
" @@ -414,7 +414,7 @@ GLOBAL_LIST_EMPTY(allCasters) dat+="No feed channels found active...
" else for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ""]
" dat+="
Back" if(12) dat+="[viewing_channel.channel_name]: \[ created by: [viewing_channel.returnAuthor(-1)] \]
" diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 844cc876ce4..1b03efc62e4 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -410,7 +410,7 @@ for(var/mob/M in get_hearers_in_view(7,src)) if(M.client) speech_bubble_recipients.Add(M.client) - INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, image('icons/mob/talk.dmi', src, "machine[say_test(raw_message)]",MOB_LAYER+1), speech_bubble_recipients, 30) + INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, image('icons/mob/talk.dmi', src, "machine[say_test(raw_message)]",MOB_LAYER+1), speech_bubble_recipients, 30) //////////////////////////// ///// Action processing //// diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm index eee71818c5d..6d42c302e1b 100644 --- a/code/game/mecha/mecha_actions.dm +++ b/code/game/mecha/mecha_actions.dm @@ -265,7 +265,7 @@ if("fire") new_damtype = "tox" chassis.occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.") - chassis.damtype = new_damtype. + chassis.damtype = new_damtype button_icon_state = "mech_damtype_[new_damtype]" playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1) UpdateButtonIcon() diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm index a41f4b4c9b5..9be52dab529 100644 --- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm +++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm @@ -15,5 +15,5 @@ message_admins("An alien egg has been delivered to [ADMIN_VERBOSEJMP(T)].") log_game("An alien egg has been delivered to [AREACOORD(T)]") var/message = "Attention [station_name()], we have entrusted you with a research specimen in [get_area_name(T, TRUE)]. Remember to follow all safety precautions when dealing with the specimen." - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /proc/print_command_report, message), announcement_time)) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index d6262c10a56..c4ad324a2c5 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -143,9 +143,3 @@ target = null if(!target) //target can be set to null from above code, or elsewhere active = FALSE - -/obj/item/pinpointer/process() - if(!active) - return PROCESS_KILL - scan_for_target() - update_icon() diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 1c390ddc351..c1d3403c08b 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -555,7 +555,7 @@ anchored = TRUE alpha = 255 -/obj/structure/trap/examine(mob/user) +/obj/structure/trap/ctf/examine(mob/user) return /obj/structure/trap/ctf/trap_effect(mob/living/L) diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index eb8c8340df4..172748f023b 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -160,7 +160,7 @@ "A heart-shaped candy that reads: ERP", "A heart-shaped candy that reads: LEWD", "A heart-shaped candy that reads: LUSTY", - "A heart-shaped candy that reads: SPESS LOVE" + "A heart-shaped candy that reads: SPESS LOVE", "A heart-shaped candy that reads: AYY LMAO", "A heart-shaped candy that reads: TABLE ME", "A heart-shaped candy that reads: HAND CUFFS", diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 906ba71c963..9d5617b3e73 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -15,7 +15,7 @@ "You are now hiding.") else user.layer = MOB_LAYER - user.visible_message("[user.] slowly peeks up from the ground...", \ + user.visible_message("[user] slowly peeks up from the ground...", \ "You stop hiding.") return 1 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 8269edc7d6f..603522ab311 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -601,15 +601,15 @@ GLOBAL_LIST_EMPTY(roundstart_races) if("tail_lizard") S = GLOB.tails_list_lizard[H.dna.features["tail_lizard"]] if("waggingtail_lizard") - S.= GLOB.animated_tails_list_lizard[H.dna.features["tail_lizard"]] + S = GLOB.animated_tails_list_lizard[H.dna.features["tail_lizard"]] if("tail_human") S = GLOB.tails_list_human[H.dna.features["tail_human"]] if("waggingtail_human") - S.= GLOB.animated_tails_list_human[H.dna.features["tail_human"]] + S = GLOB.animated_tails_list_human[H.dna.features["tail_human"]] if("spines") S = GLOB.spines_list[H.dna.features["spines"]] if("waggingspines") - S.= GLOB.animated_spines_list[H.dna.features["spines"]] + S = GLOB.animated_spines_list[H.dna.features["spines"]] if("snout") S = GLOB.snouts_list[H.dna.features["snout"]] if("frills") diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 65b78bf8447..26c7f40dc56 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -123,7 +123,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, /mob/living/simple_animal/bot/honkbot/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/weldingtool) && user.a_intent != INTENT_HARM). + if(istype(W, /obj/item/weldingtool) && user.a_intent != INTENT_HARM) return if(!istype(W, /obj/item/screwdriver) && (W.force) && (!target) && (W.damtype != STAMINA) ) // Check for welding tool to fix #2432. retaliate(user) diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 748a8e9c5d5..c7b46e6aed0 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -209,14 +209,14 @@ var/datum/reagent/R = pick(typesof(/datum/reagent/toxin)) assign_reagent(GLOB.chemical_reagents_list[initial(R.id)]) - /mob/living/simple_animal/hostile/poison/bees/queen - name = "queen bee" - desc = "She's the queen of bees, BZZ BZZ!" - icon_base = "queen" - isqueen = TRUE +/mob/living/simple_animal/hostile/poison/bees/queen + name = "queen bee" + desc = "She's the queen of bees, BZZ BZZ!" + icon_base = "queen" + isqueen = TRUE - //the Queen doesn't leave the box on her own, and she CERTAINLY doesn't pollinate by herself +//the Queen doesn't leave the box on her own, and she CERTAINLY doesn't pollinate by herself /mob/living/simple_animal/hostile/poison/bees/queen/Found(atom/A) return FALSE diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index ccd9872b464..ebd386513ed 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -583,7 +583,7 @@ /obj/item/relic/proc/corgicannon(mob/user) playsound(src, "sparks", rand(25,50), 1) var/mob/living/simple_animal/pet/dog/corgi/C = new/mob/living/simple_animal/pet/dog/corgi(get_turf(user)) - C.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, .throwSmoke, C)) + C.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, .proc/throwSmoke, C)) warn_admins(user, "Corgi Cannon", 0) /obj/item/relic/proc/clean(mob/user)