OpenDream linting (#16468)

* I wanna set the universe on fire

* dfsaaf

* setup

* dir issue?

* dsf

* Perhaps the script

* saf

* cry

* pain

* sdfas

* Try reintroduction of tag-matcher

* Failed

* Tries to suppress dotnet compile warnings

* Like this maybe?

* woopsie

* Damn pathings

* Hate

* Pragmas

* unlint?

* Maybe?

* GDI

* Redundant ifdef removed and changelog

* Did I forgot the tag matcher, or it was still broken?

* Yea no that script is still broken

* Removed tag-matcher as requested

* *sigh*

* test

* bro what?

* hope

* just fixing the input

* Let's see if we catch it...
This commit is contained in:
Fluffy
2023-06-26 17:05:38 +02:00
committed by GitHub
parent 6947b31c12
commit 5e1332d60f
138 changed files with 395 additions and 541 deletions
+1 -1
View File
@@ -23,7 +23,7 @@
return TRUE
if(WT.use(0,user))
user.visible_message("<b>[user]</b> starts slicing \the [src] apart.", SPAN_NOTICE("You start slicing \the [src] apart."))
playsound(src, 'sound/items/welder.ogg', 100, 1)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
var/slice_time = reinf_material ? 100 : 30
if(WT.use_tool(src, user, slice_time, volume = 50))
user.visible_message("<b>[user]</b> slices \the [src] apart.", SPAN_NOTICE("You slice \the [src] apart."))
@@ -128,7 +128,7 @@
/obj/structure/sign/poster/attackby(obj/item/W as obj, mob/user as mob)
if(W.iswirecutter())
playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
if(ruined)
to_chat(user, "<span class='notice'>You remove the remnants of the poster.</span>")
qdel(src)
+1 -1
View File
@@ -27,7 +27,7 @@
var/obj/item/weldingtool/WT = W
if(WT.use(0, user))
damage = 15
playsound(loc, 'sound/items/welder.ogg', 100, 1)
playsound(loc, 'sound/items/Welder.ogg', 100, 1)
return TRUE
else
user.do_attack_animation(src)
+2 -2
View File
@@ -163,7 +163,7 @@
if (prob(5))
qdel(src)
return
else
return
/obj/item/verb/move_to_top(obj/item/I in range(1))
@@ -330,7 +330,7 @@
else if(hitsound)
playsound(hit_atom, hitsound, volume, TRUE, -1)
else
playsound(hit_atom, 'sound/weapons/genhit.ogg', volume, TRUE, -1)
playsound(hit_atom, 'sound/weapons/Genhit.ogg', volume, TRUE, -1)
else
playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1)
else
+1 -1
View File
@@ -451,7 +451,7 @@
"<span class='warning'>[user] begins cutting cable restrains on zipper of [src].</span>",
"<span class='notice'>You begin cutting cable restrains on zipper of [src].</span>"
)
playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
if (!do_after(user, 3 SECONDS, act_target = src, extra_checks = CALLBACK(src, PROC_REF(is_closed))))
return TRUE
zipped = !zipped
+9 -9
View File
@@ -268,14 +268,14 @@
if (!isturf(NT) || (NT in found) || (NT in pending))
continue
switch(check_tile_is_border(NT,dir))
if(BORDER_NONE)
pending+=NT
if(BORDER_BETWEEN)
//do nothing, may be later i'll add 'rejected' list as optimization
if(BORDER_2NDTILE)
found+=NT //tile included to new area, but we dont seek more
if(BORDER_SPACE)
return ROOM_ERR_SPACE
var/tile_is_border = check_tile_is_border(NT,dir)
if(tile_is_border != BORDER_BETWEEN)
switch(tile_is_border)
if(BORDER_NONE)
pending+=NT
if(BORDER_2NDTILE)
found+=NT //tile included to new area, but we dont seek more
if(BORDER_SPACE)
return ROOM_ERR_SPACE
found+=T
return found
+1 -1
View File
@@ -90,7 +90,7 @@
return TRUE
else if(W.iswirecutter())
to_chat(user, "You cut the tag off the bodybag.")
playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
src.name = "body bag"
LAZYREMOVE(overlays, image(icon, "bodybag_label"))
return TRUE
@@ -251,7 +251,7 @@
if(usr.incapacitated())
return
var/new_colour = input(usr, "Choose a colour.", "paintgun", paint_colour) as color|anything in preset_colors
var/new_colour = input(usr, "Choose a colour.", "paintgun", paint_colour) as null|anything in preset_colors
if(new_colour && new_colour != paint_colour)
paint_colour = preset_colors[new_colour]
to_chat(usr, "<span class='notice'>You set \the [src] to paint with <font color='[paint_colour]'>a new colour</font>.</span>")
+1 -1
View File
@@ -32,7 +32,7 @@
/obj/item/device/multitool/hacktool/attackby(var/obj/item/W, var/mob/user)
if(W.isscrewdriver())
in_hack_mode = !in_hack_mode
playsound(src.loc, 'sound/items/screwdriver.ogg', 50, TRUE)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, TRUE)
return TRUE
else
return ..()
@@ -145,7 +145,7 @@
addtimer(CALLBACK(GLOBAL_PROC, /proc/playsound, loc, "sound/effects/sparks[rand(1,4)].ogg", 30, 1), 3, TIMER_CLIENT_TIME)
else
user.visible_message("<span class='danger'>[user] hits [src] with [I] but fails to damage it.</span>", "<span class='warning'>You hit [src] with [I], [I.force >= 10 ? "and it almost makes a dent!" : "but it appears to have no visible effect."]</span>")
playsound(loc, "sound/weapons/genhit.ogg", I.force*2.5, 1)
playsound(loc, "sound/weapons/Genhit.ogg", I.force*2.5, 1)
return TRUE
if(invincible)
@@ -167,7 +167,7 @@
var/obj/item/weldingtool/WT = I
if (WT.use(2, user))
user.visible_message(SPAN_NOTICE("[user] starts welding the metal shell of [src]."), SPAN_NOTICE("You start [hacked ? "repairing" : "welding open"] the metal covering of [src]."))
playsound(loc, 'sound/items/welder.ogg', 50, 1)
playsound(loc, 'sound/items/Welder.ogg', 50, 1)
add_overlay("overlay_welding")
if(WT.use_tool(src, user, 25, volume = 50))
to_chat(user, SPAN_NOTICE("You are able to [hacked ? "repair" : "weld through"] the metal shell of [src]."))
@@ -222,7 +222,7 @@
if (3)
if (I.iswirecutter())
to_chat(user, SPAN_NOTICE("You cut the wires connecting the [src]'s magnets to their internal powersupply, [target ? "making the device fall off [target] and rendering it unusable." : "rendering the device unusable."]"))
playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
setconstructionstate(4)
return TRUE
+2 -2
View File
@@ -49,7 +49,7 @@
to_chat(user, SPAN_WARNING("\The [O] must be safely placed on the ground for modification."))
return
playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message(
SPAN_NOTICE("\The [user] opens \the [src] and modifies \the [O]."),
@@ -310,4 +310,4 @@
/obj/item/storage/box/dominianvoid
name = "dominian voidsman's modkit box"
desc = "Contains modkits to convert Dominian voidsuits into a voidsman's variant."
starts_with = list(/obj/item/voidsuit_modkit/dominianvoid = 4)
starts_with = list(/obj/item/voidsuit_modkit/dominianvoid = 4)
+1 -1
View File
@@ -13,7 +13,7 @@
/obj/item/device/kit/use(var/amt, var/mob/user)
uses -= amt
playsound(get_turf(user), 'sound/items/screwdriver.ogg', 50, 1)
playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1)
if(uses<1)
user.drop_from_inventory(src,get_turf(src))
qdel(src)
@@ -138,7 +138,7 @@
else if(O.iswirecutter())
user.drop_from_inventory(O,get_turf(src))
to_chat(user, "<span class='notice'>You detach the wire from the [name].</span>")
playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
new /obj/item/stack/cable_coil(user.loc, 5)
new /obj/item/stack/material/glass(user.loc)
use(1)
+1 -1
View File
@@ -221,7 +221,7 @@
update_icon(user)
else if(can_be_cut && I.iswirecutter())
user.visible_message("[user] cuts the [src].", SPAN_NOTICE("You cut the [src]."))
playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
new/obj/item/stack/cable_coil(get_turf(src), 15, color)
qdel(src)
update_icon(user)
+3 -3
View File
@@ -74,7 +74,7 @@
/obj/item/shield/riot/handle_shield(mob/user)
. = ..()
if(.) playsound(user.loc, 'sound/weapons/genhit.ogg', 50, 1)
if(.) playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
/obj/item/shield/riot/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
if(istype(damage_source, /obj/item/projectile))
@@ -113,7 +113,7 @@
/obj/item/shield/buckler/handle_shield(mob/user)
. = ..()
if(.) playsound(user.loc, 'sound/weapons/genhit.ogg', 50, 1)
if(.) playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
/obj/item/shield/buckler/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
if(istype(damage_source, /obj/item/projectile))
@@ -323,7 +323,7 @@
. = ..()
if(.)
if(.) playsound(user.loc, 'sound/weapons/genhit.ogg', 50, 1)
if(.) playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
/obj/item/shield/riot/tact/attack_self(mob/living/user)
active = !active
+3 -3
View File
@@ -62,7 +62,7 @@
w_class = ITEMSIZE_TINY
matter = list(DEFAULT_WALL_MATERIAL = 75)
attack_verb = list("stabbed")
usesound = 'sound/items/screwdriver.ogg'
usesound = 'sound/items/Screwdriver.ogg'
drop_sound = 'sound/items/drop/screwdriver.ogg'
pickup_sound = 'sound/items/pickup/screwdriver.ogg'
lock_picking_level = 5
@@ -137,7 +137,7 @@
attack_verb = list("pinched", "nipped")
sharp = TRUE
edge = TRUE
usesound = 'sound/items/wirecutter.ogg'
usesound = 'sound/items/Wirecutter.ogg'
drop_sound = 'sound/items/drop/wirecutter.ogg'
pickup_sound = 'sound/items/pickup/wirecutter.ogg'
var/bomb_defusal_chance = 30 // 30% chance to safely defuse a bomb
@@ -219,7 +219,7 @@
slot_flags = SLOT_BELT
drop_sound = 'sound/items/drop/weldingtool.ogg'
pickup_sound = 'sound/items/pickup/weldingtool.ogg'
usesound = 'sound/items/welder.ogg'
usesound = 'sound/items/Welder.ogg'
attack_verb = list("hit", "bludgeoned", "whacked")
@@ -54,7 +54,7 @@
switch(dir)
if(SOUTH)
layer = ABOVE_MOB_LAYER
else if(NORTH)
if(NORTH)
layer = initial(layer) - 0.01
else
layer = initial(layer)
+1 -2
View File
@@ -15,7 +15,6 @@ var/global/list/total_active_bonfires = list()
var/max_fuel = 2000
var/on_fire = FALSE
var/safe = FALSE
var/obj/machinery/appliance/bonfire/cook_machine
var/list/burnable_materials = list(MATERIAL_WOOD = 200, MATERIAL_WOOD_LOG = 400, MATERIAL_WOOD_BRANCH = 40, MATERIAL_COTTON = 20, MATERIAL_CLOTH = 50, MATERIAL_CARPET = 20, MATERIAL_CARDBOARD = 35)
var/list/burnable_other = list(/obj/item/ore/coal = 750, /obj/item/torch = 20) //For items without material/default material
var/heat_range = 5 //Range in which it will heat other people
@@ -385,4 +384,4 @@ var/global/list/total_active_bonfires = list()
return !density
return TRUE
#undef MAX_ACTIVE_BONFIRE_LIMIT
#undef MAX_ACTIVE_BONFIRE_LIMIT
@@ -414,7 +414,7 @@
screwed = FALSE
else if(!screwed && wrenched)
to_chat(user, SPAN_NOTICE("You start to screw the \the [src] to the floor..."))
playsound(src, 'sound/items/welder.ogg', 80, 1)
playsound(src, 'sound/items/Welder.ogg', 80, 1)
if (do_after(user, 15/W.toolspeed SECONDS, act_target = src))
to_chat(user, SPAN_NOTICE("You screw \the [src]!"))
playsound(loc, W.usesound, 50, 1)
+1 -1
View File
@@ -114,7 +114,7 @@
return
else
health -= rand(40,80)
else
if(health <= 0)
harvest()
return
@@ -258,7 +258,7 @@
to_chat(user, SPAN_WARNING("\The [src]'s wires cannot be reached, take out the electronics first."))
return
playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
user.visible_message("<b>[user]</b> starts cutting the wires from the airlock assembly.", SPAN_NOTICE("You start cutting the wires from airlock assembly."))
if(W.use_tool(src, user, 40, volume = 50))
@@ -277,7 +277,7 @@
return
var/obj/item/airlock_electronics/EL = W
if(!EL.is_installed)
playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("<b>[user]</b> starts installing \the [EL] into the airlock assembly.", SPAN_NOTICE("You start installing \the [EL] into the airlock assembly."))
EL.is_installed = TRUE
if(W.use_tool(src, user, 40, volume = 50) && state == STATE_WIRED)
@@ -115,7 +115,7 @@
if(!WT.isOn())
to_chat(user, SPAN_NOTICE("\The [WT] isn't turned on."))
return
playsound(src, 'sound/items/welder.ogg', 50, TRUE)
playsound(src, 'sound/items/Welder.ogg', 50, TRUE)
user.visible_message(
SPAN_WARNING("\The [user] starts welding \the [src] apart!"),
SPAN_NOTICE("You start welding \the [src] apart..."),
-1
View File
@@ -301,7 +301,6 @@
return
else
health -= rand(40,80)
else
if(health <= 0)
dismantle()
+2 -2
View File
@@ -99,7 +99,7 @@
/obj/structure/grille/attackby(obj/item/W, mob/user)
if(W.iswirecutter())
if(!shock(user, 100))
playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
new /obj/item/stack/rods(get_turf(src), destroyed ? 1 : 2)
qdel(src)
else if(istype(W, /obj/item/gun/energy/plasmacutter))
@@ -112,7 +112,7 @@
qdel(src)
else if((W.isscrewdriver()) && (istype(loc, /turf/simulated) || anchored))
if(!shock(user, 90))
playsound(loc, 'sound/items/screwdriver.ogg', 100, 1)
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
anchored = !anchored
user.visible_message("<span class='notice'>[user] [anchored ? "fastens" : "unfastens"] the grille.</span>", \
"<span class='notice'>You have [anchored ? "fastened the grille to" : "unfastened the grill from"] the floor.</span>")
+2 -2
View File
@@ -69,7 +69,7 @@
var/obj/item/stack/rods/R = C
if (R.use(2))
to_chat(user, "<span class='notice'>Constructing catwalk ...</span>")
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
new /obj/structure/lattice/catwalk(src.loc)
qdel(src)
return
@@ -164,7 +164,7 @@
var/obj/item/weldingtool/WT = C
if(C.use_tool(src, user, 5, volume = 50) && WT.use(1, user))
to_chat(user, SPAN_NOTICE("You slice apart the [src] leaving nothing useful behind."))
playsound(src, 'sound/items/welder.ogg', 50, 1)
playsound(src, 'sound/items/Welder.ogg', 50, 1)
qdel(src)
else
..()
+2 -2
View File
@@ -275,9 +275,9 @@
desperation = rand(1,5)
switch(desperation) //This is messy. A better solution would probably be to make more sounds, but...
if(1)
playsound(src.loc, 'sound/weapons/genhit.ogg', 45, 1)
playsound(src.loc, 'sound/weapons/Genhit.ogg', 45, 1)
shake_animation(2)
playsound(src.loc, 'sound/weapons/genhit.ogg', 45, 1)
playsound(src.loc, 'sound/weapons/Genhit.ogg', 45, 1)
if(2)
playsound(src.loc, 'sound/effects/grillehit.ogg', 45, 1)
shake_animation(3)
@@ -188,7 +188,7 @@
to_chat(user, "\The [src] has no padding to remove.")
return
to_chat(user, "You remove the padding from \the [src].")
playsound(src, 'sound/items/wirecutter.ogg', 100, 1)
playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
painted_colour = null
remove_padding()
@@ -199,7 +199,7 @@
else
anchored = TRUE
to_chat(user, "You fasten \the [src] to the floor.")
playsound(src, 'sound/items/screwdriver.ogg', 100, 1)
playsound(src, 'sound/items/Screwdriver.ogg', 100, 1)
else if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
@@ -150,7 +150,7 @@
//Removing wire from the assembly. Step 5 undone.
if(W.iswirecutter() && !src.electronics)
playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
if(W.use_tool(src, user, 40, volume = 50))
@@ -168,7 +168,7 @@
else if(istype(W, /obj/item/airlock_electronics) && W:icon_state != "door_electronics_smoked")
var/obj/item/airlock_electronics/EL = W
if(!EL.is_installed)
playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
EL.is_installed = 1
if(do_after(user, 40))