cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 23:23:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10433 from VOREStation/upstream-merge-8085

Browse Source 
[MIRROR] Linter Introduction + Cleanup
This commit is contained in:
Aronai Sieyes
2021-05-27 12:31:23 -04:00
committed by GitHub
parent b128dfbd81 28a6962d51
commit da4837903c
244 changed files with 2604 additions and 2699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spiders.dm
+23 -39
View File
@@ -188,50 +188,34 @@
entry_vent = null
else if(entry_vent)
if(get_dist(src, entry_vent) <= 1)
//VOREStation Edit Start
//VOREStation Edit Start
var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = get_safe_ventcrawl_target(entry_vent)
if(!exit_vent)
return
if(1) //To maintain indentation level
//VOREStation Edit End
/* //VOREStation Removal Start - prevent spiders in dorms
if(entry_vent.network && entry_vent.network.normal_members.len)
var/list/vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in entry_vent.network.normal_members)
vents.Add(temp_vent)
if(!vents.len)
entry_vent = null
return
var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents)
*/ //VOREStation Removal End
/*if(prob(50))
src.visible_message("<B>[src] scrambles into the ventillation ducts!</B>")*/
spawn(rand(20,60))
loc = exit_vent
var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
spawn(travel_time)
spawn(rand(20,60))
loc = exit_vent
var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
spawn(travel_time)
if(!exit_vent || exit_vent.welded)
loc = entry_vent
entry_vent = null
return
if(prob(50))
src.visible_message("<span class='notice'>You hear something squeezing through the ventilation ducts.</span>",2)
sleep(travel_time)
if(!exit_vent || exit_vent.welded)
loc = entry_vent
entry_vent = null
return
loc = exit_vent.loc
if(!exit_vent || exit_vent.welded)
loc = entry_vent
entry_vent = null
var/area/new_area = get_area(loc)
if(new_area)
new_area.Entered(src)
else
entry_vent = null
return
if(prob(50))
src.visible_message("<span class='notice'>You hear something squeezing through the ventilation ducts.</span>",2)
sleep(travel_time)
if(!exit_vent || exit_vent.welded)
loc = entry_vent
entry_vent = null
return
loc = exit_vent.loc
entry_vent = null
var/area/new_area = get_area(loc)
if(new_area)
new_area.Entered(src)
//VOREStation Edit End
//=================
if(isturf(loc))
code/game/objects/explosion.dm
-1
View File
@@ -2,7 +2,6 @@
proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, z_transfer = UP|DOWN, shaped)
var/multi_z_scalar = config.multi_z_explosion_scalar
src = null //so we don't abort once src is deleted
spawn(0)
var/start = world.timeofday
epicenter = get_turf(epicenter)
code/game/objects/items.dm
+1 -2
View File
@@ -312,7 +312,6 @@
// apparently called whenever an item is removed from a slot, container, or anything else.
/obj/item/proc/dropped(mob/user as mob)
..()
if(zoom)
zoom() //binoculars, scope, etc
appearance_flags &= ~NO_CLIENT_COLOR
@@ -695,7 +694,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
if((usr.stat && !zoom) || !(istype(usr,/mob/living/carbon/human)))
to_chat(usr, "You are unable to focus through the [devicename]")
cannotzoom = 1
else if(!zoom && global_hud.darkMask[1] in usr.client.screen)
else if(!zoom && (global_hud.darkMask[1] in usr.client.screen))
to_chat(usr, "Your visor gets in the way of looking through the [devicename]")
cannotzoom = 1
else if(!zoom && usr.get_active_hand() != src)
code/game/objects/items/devices/gps.dm
+8 -4
View File
@@ -193,9 +193,9 @@ var/list/GPS_list = list()
dat["curr_y"] = curr.y
dat["curr_z"] = curr.z
dat["curr_z_name"] = strip_improper(using_map.get_zlevel_name(curr.z))
dat["gps_list"] = list()
dat["z_level_detection"] = using_map.get_map_levels(curr.z, long_range)
var/list/gps_list = list()
for(var/obj/item/device/gps/G in GPS_list - src)
if(!can_track(G, dat["z_level_detection"]))
@@ -219,7 +219,9 @@ var/list/GPS_list = list()
gps_data["x"] = T.x
gps_data["y"] = T.y
dat["gps_list"][++dat["gps_list"].len] = gps_data
gps_list[++gps_list.len] = gps_data
dat["gps_list"] = gps_list
return dat
@@ -241,7 +243,8 @@ var/list/GPS_list = list()
dat += "<tr><td colspan = 4>[hide_signal ? "Tagged" : "Broadcasting"] as '[gps_tag]'.</td>"
dat += "<td><a href='?src=\ref[src];tag=1'>\[Change Tag\]</a><a href='?src=\ref[src];range=1'>\[Toggle Scan Range\]</a>[can_hide_signal ? "<a href='?src=\ref[src];hide=1'>\[Toggle Signal Visibility\]</a>":""]</td></tr>"
if(gps_data["gps_list"].len)
var/list/gps_list = gps_data["gps_list"]
if(gps_list.len)
dat += "<tr><td colspan = 6><b>Detected signals</b></td></tr>"
for(var/gps in gps_data["gps_list"])
dat += "<tr>"
@@ -482,7 +485,8 @@ var/list/GPS_list = list()
dat += "<tr><td colspan = 4>[hide_signal ? "Tagged" : "Broadcasting"] as '[gps_tag]'.</td>"
dat += "<td><a href='?src=\ref[src];tag=1'>\[Change Tag\]</a><a href='?src=\ref[src];range=1'>\[Toggle Scan Range\]</a>[can_hide_signal ? "<a href='?src=\ref[src];hide=1'>\[Toggle Signal Visibility\]</a>":""]</td></tr>"
if(gps_data["gps_list"].len)
var/list/gps_list = gps_data["gps_list"]
if(gps_list.len)
dat += "<tr><td colspan = 6><b>Detected signals</b></td></tr>"
for(var/gps in gps_data["gps_list"])
dat += "<tr>"
code/game/objects/items/devices/radio/intercom.dm
+2 -2
View File
@@ -16,12 +16,12 @@
. = ..()
var/area/A = get_area(src)
if(A)
GLOB.apc_event.register(A, src, /obj/update_icon)
GLOB.apc_event.register(A, src, /atom/proc/update_icon)
/obj/item/device/radio/intercom/Destroy()
var/area/A = get_area(src)
if(A)
GLOB.apc_event.unregister(A, src, /obj/update_icon)
GLOB.apc_event.unregister(A, src, /atom/proc/update_icon)
return ..()
/obj/item/device/radio/intercom/custom
code/game/objects/items/devices/radio/radio.dm
+1 -1
View File
@@ -532,7 +532,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
R.receive_signal(signal)
if(signal.data["done"] && pos_z in signal.data["level"])
if(signal.data["done"] && (pos_z in signal.data["level"]))
if(adhoc_fallback)
to_chat(loc, "<span class='notice'>\The [src] pings as it reestablishes subspace communications.</span>")
subspace_transmission = TRUE
code/game/objects/items/devices/scanners_vr.dm
+2 -2
View File
@@ -171,7 +171,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
//The actual options
if(href_list["mindscan"])
if(!target.mind || target.mind.name in prevent_respawns)
if(!target.mind || (target.mind.name in prevent_respawns))
to_chat(usr,"<span class='warning'>Target seems totally braindead.</span>")
return
@@ -208,7 +208,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
return
if(href_list["mindsteal"])
if(!target.mind || target.mind.name in prevent_respawns)
if(!target.mind || (target.mind.name in prevent_respawns))
to_chat(usr,"<span class='warning'>Target seems totally braindead.</span>")
return
code/game/objects/items/devices/suit_cooling.dm
+2 -1
View File
@@ -80,7 +80,8 @@
var/obj/mecha/M = H.loc
return M.return_temperature()
else if(istype(H.loc, /obj/machinery/atmospherics/unary/cryo_cell))
return H.loc:air_contents.temperature
var/obj/machinery/atmospherics/unary/cryo_cell/cc = H.loc
return cc.air_contents.temperature
var/turf/T = get_turf(src)
if(istype(T, /turf/space))
code/game/objects/items/devices/transfer_valve.dm
+2 -2
View File
@@ -62,9 +62,9 @@
/obj/item/device/transfer_valve/Moved(old_loc, direction, forced)
. = ..()
if(isturf(old_loc))
unsense_proximity(callback = .HasProximity, center = old_loc)
unsense_proximity(callback = /atom/proc/HasProximity, center = old_loc)
if(isturf(loc))
sense_proximity(callback = .HasProximity)
sense_proximity(callback = /atom/proc/HasProximity)
/obj/item/device/transfer_valve/attack_self(mob/user)
tgui_interact(user)
code/game/objects/items/devices/translocator_vr.dm
+1 -1
View File
@@ -506,7 +506,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac
var/phase_power = 75
var/recharging = 0
/obj/item/device/perfect_tele/frontier/unload_ammo(var/mob/user)
/obj/item/device/perfect_tele/frontier/unload_ammo(mob/user, var/ignore_inactive_hand_check = 0)
if(recharging)
return
recharging = 1
code/game/objects/items/stacks/stack.dm
-1
View File
@@ -248,7 +248,6 @@
var/datum/matter_synth/S = synths[i]
S.use_charge(charge_costs[i] * used) // Doesn't need to be deleted
return 1
return 0
/obj/item/stack/proc/add(var/extra)
if(!uses_charge)
code/game/objects/items/uav.dm
+1 -1
View File
@@ -207,7 +207,7 @@
return FALSE
/obj/item/device/uav/proc/toggle_packed()
if(UAV_ON)
if(state == UAV_ON)
power_down()
switch(state)
if(UAV_OFF) //Packing
code/game/objects/items/weapons/autopsy.dm
+1 -11
View File
@@ -46,17 +46,7 @@
var/datum/autopsy_data/W = O.autopsy_data[V]
if(!W.pretend_weapon)
/*
// the more hits, the more likely it is that we get the right weapon type
if(prob(50 + W.hits * 10 + W.damage))
*/
// Buffing this stuff up for now!
if(1)
W.pretend_weapon = W.weapon
else
W.pretend_weapon = pick("mechanical toolbox", "wirecutters", "revolver", "crowbar", "fire extinguisher", "tomato soup", "oxygen tank", "emergency oxygen tank", "laser", "bullet")
W.pretend_weapon = W.weapon
var/datum/autopsy_data_scanner/D = wdata[V]
if(!D)
code/game/objects/items/weapons/chewables.dm
+1 -1
View File
@@ -259,4 +259,4 @@ obj/item/clothing/mask/chewable/Destroy()
/obj/item/clothing/mask/chewable/candy/pocky/Initialize()
. = ..()
reagents.add_reagent("chocolate" = 10)
reagents.add_reagent("chocolate", 10)
code/game/objects/items/weapons/material/misc.dm
+3 -3
View File
@@ -142,11 +142,11 @@
if(user.a_intent)
switch(user.a_intent)
if(I_HURT)
if(prob(10) && istype(target, /mob/living/carbon/human) && user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND))
if(prob(10) && istype(target, /mob/living/carbon/human) && (user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)))
to_chat(target, "<span class='warning'>\The [src] rips at your hands!</span>")
ranged_disarm(target)
if(I_DISARM)
if(prob(min(90, force * 3)) && istype(target, /mob/living/carbon/human) && user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND))
if(prob(min(90, force * 3)) && istype(target, /mob/living/carbon/human) && (user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)))
ranged_disarm(target)
else
target.visible_message("<span class='danger'>\The [src] sends \the [target] stumbling away.</span>")
@@ -175,7 +175,7 @@
visible_message("<span class='danger'>[H]'s [W] goes off due to \the [src]!</span>")
return W.afterattack(target,H)
if(!(H.species.flags & NO_SLIP) && prob(10) && user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT))
if(!(H.species.flags & NO_SLIP) && prob(10) && (user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)))
var/armor_check = H.run_armor_check(user.zone_sel, "melee")
H.apply_effect(3, WEAKEN, armor_check)
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
code/game/objects/items/weapons/melee/misc.dm
-1
View File
@@ -45,7 +45,6 @@
var/mob/living/carbon/human/H = src.loc
H.update_inv_l_hand(0)
H.update_inv_r_hand()
..()
// Randomizes color
/obj/item/weapon/melee/umbrella/random/New()
code/game/objects/items/weapons/storage/belt.dm
+1 -1
View File
@@ -26,7 +26,7 @@
update_icon()
//Some belts have sprites to show icons
/obj/item/weapon/storage/belt/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0)
/obj/item/weapon/storage/belt/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask = null)
var/image/standing = ..()
if(!inhands && contents.len)
for(var/obj/item/i in contents)
code/game/objects/items/weapons/storage/wallets.dm
+1 -1
View File
@@ -66,7 +66,7 @@
overlays.Cut()
if(front_id)
var/tiny_state = "id-generic"
if("id-"+front_id.icon_state in cached_icon_states(icon))
if("id-[front_id.icon_state]" in cached_icon_states(icon))
tiny_state = "id-"+front_id.icon_state
var/image/tiny_image = new/image(icon, icon_state = tiny_state)
tiny_image.appearance_flags = RESET_COLOR
code/game/objects/items/weapons/tanks/tanks.dm
+2 -2
View File
@@ -668,6 +668,6 @@ var/list/global/tank_gauge_cache = list()
/obj/item/device/tankassemblyproxy/Moved(old_loc, direction, forced)
if(isturf(old_loc))
unsense_proximity(callback = .HasProximity, center = old_loc)
unsense_proximity(callback = /atom/proc/HasProximity, center = old_loc)
if(isturf(loc))
sense_proximity(callback = .HasProximity)
sense_proximity(callback = /atom/proc/HasProximity)
code/game/objects/items/weapons/teleportation.dm
+1 -1
View File
@@ -132,7 +132,7 @@ Frequency:
/obj/item/weapon/hand_tele/attack_self(mob/user as mob)
var/turf/current_location = get_turf(user)//What turf is the user on?
if(!current_location || current_location.z in using_map.admin_levels || current_location.block_tele)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
if(!current_location || (current_location.z in using_map.admin_levels) || current_location.block_tele)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
return
var/list/L = list( )
code/game/objects/structures/cliff.dm
+1 -1
View File
@@ -130,7 +130,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
var/subtraction_icon_state = "[icon_state]-subtract"
var/cache_string = "[icon_state]_[T.icon]_[T.icon_state]"
if(T && subtraction_icon_state in cached_icon_states(icon))
if(T && (subtraction_icon_state in cached_icon_states(icon)))
cut_overlays()
// If we've made the same icon before, just recycle it.
if(cache_string in GLOB.cliff_icon_cache)
code/game/objects/structures/crates_lockers/__closets.dm
+9 -9
View File
@@ -434,17 +434,17 @@
breakout = 0
return
playsound(src, breakout_sound, 100, 1)
animate_shake()
add_fingerprint(escapee)
//Well then break it!
breakout = 0
to_chat(escapee, "<span class='warning'>You successfully break out!</span>")
visible_message("<span class='danger'>\The [escapee] successfully broke out of \the [src]!</span>")
playsound(src, breakout_sound, 100, 1)
break_open()
animate_shake()
add_fingerprint(escapee)
//Well then break it!
breakout = 0
to_chat(escapee, "<span class='warning'>You successfully break out!</span>")
visible_message("<span class='danger'>\The [escapee] successfully broke out of \the [src]!</span>")
playsound(src, breakout_sound, 100, 1)
break_open()
animate_shake()
/obj/structure/closet/proc/break_open()
sealed = 0
code/game/objects/structures/flora/flora.dm
-2
View File
@@ -254,8 +254,6 @@
to_chat(user, "<span class='notice'>You refrain from putting things into the plant pot.</span>")
return
..()
/obj/structure/flora/pottedplant/attack_hand(mob/user)
if(!stored_item)
to_chat(user, "<span class='filter_notice'><b>You see nothing of interest in [src]...</b></span>")
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+2 -2
View File
@@ -68,7 +68,7 @@
user.pulledby = null
to_chat(user, "<span class='warning'>You lost your grip!</span>")
return
if(has_buckled_mobs() && pulling && user in buckled_mobs)
if(has_buckled_mobs() && pulling && (user in buckled_mobs))
if(pulling.stat || pulling.stunned || pulling.weakened || pulling.paralysis || pulling.lying || pulling.restrained())
pulling.pulledby = null
pulling = null
@@ -161,7 +161,7 @@
/obj/structure/bed/chair/wheelchair/CtrlClick(var/mob/user)
if(in_range(src, user))
if(!ishuman(user)) return
if(has_buckled_mobs() && user in buckled_mobs)
if(has_buckled_mobs() && (user in buckled_mobs))
to_chat(user, "<span class='warning'>You realize you are unable to push the wheelchair you sit in.</span>")
return
if(!pulling)
code/game/objects/structures/transit_tubes.dm
+3 -3
View File
@@ -119,7 +119,7 @@ obj/structure/ex_act(severity)
if(pod.contents.len)
to_chat(AM, "<span class='notice'>The pod is already occupied.</span>")
return
else if(!pod.moving && pod.dir in directions())
else if(!pod.moving && (pod.dir in directions()))
AM.loc = pod
return
@@ -127,7 +127,7 @@ obj/structure/ex_act(severity)
/obj/structure/transit_tube/station/attack_hand(mob/user as mob)
if(!pod_moving)
for(var/obj/structure/transit_tube_pod/pod in loc)
if(!pod.moving && pod.dir in directions())
if(!pod.moving && (pod.dir in directions()))
if(icon_state == "closed")
open_animation()
@@ -156,7 +156,7 @@ obj/structure/ex_act(severity)
/obj/structure/transit_tube/station/proc/launch_pod()
for(var/obj/structure/transit_tube_pod/pod in loc)
if(!pod.moving && pod.dir in directions())
if(!pod.moving && (pod.dir in directions()))
spawn(5)
pod_moving = 1
close_animation()