cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings and stuff (#27004)

Browse Source 
* added return type to PriorityQueue/List

* fixed /atom/movable/lighting_overlay/forceMove

* fixed /obj/item/weapon/gun/hookshot/whip/windup_box/Fire

* fixed /obj/item/weapon/gun/projectile/hecate/hunting/proc/scoping()

* removed useless stuff from get_blood (src is always null for global procs unless manually set)

* did the thing
This commit is contained in:
DamianX
2020-07-06 12:53:43 +02:00
committed by GitHub
parent 9d30191dbe
commit 6dc7f3b798
5 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/defines/procs/AStar.dm
View File

@@ -84,6 +84,7 @@ length to avoid portals or something i guess?? Not that they're counted right no
//returns a copy of the elements list
/PriorityQueue/proc/List()
RETURN_TYPE(/list)
var/list/ret = L.Copy()
return ret

2
code/modules/lighting/lighting_overlay.dm
View File

@@ -101,7 +101,7 @@
return
// Override here to prevent things accidentally moving around overlays.
/atom/movable/lighting_overlay/forceMove(atom/destination, var/no_tp=FALSE, var/harderforce = FALSE)
/atom/movable/lighting_overlay/forceMove(atom/destination, var/no_tp=FALSE, var/harderforce = FALSE, glide_size_override = 0)
if(harderforce)
. = ..()

10
code/modules/organs/blood.dm
View File

@@ -346,14 +346,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
..()
//Gets human's own blood.
proc/get_blood(datum/reagents/container)
var/datum/reagent/blood/res = locate() in container.reagent_list //Grab some blood
if(res) // Make sure there's some blood at all
if(res.data["donor"] != src) //If it's not theirs, then we look for theirs
for(var/datum/reagent/blood/D in container.reagent_list)
if(D.data["donor"] == src)
return D
return res
/proc/get_blood(datum/reagents/container)
return locate(/datum/reagent/blood) in container.reagent_list
proc/blood_incompatible(donor,receiver)
if(!donor || !receiver)

4
code/modules/projectiles/guns/hookshot.dm
View File

@@ -539,14 +539,14 @@
state = !state
update_icon()
/obj/item/weapon/gun/hookshot/whip/windup_box/Fire(atom/target, mob/living/user, params, reflex =0, struggle =0) //4 winds minimum
/obj/item/weapon/gun/hookshot/whip/windup_box/Fire(atom/target, mob/living/user, params, reflex =0, struggle = 0, use_shooter_turf = FALSE) //4 winds minimum
maxlength = lengthDecider
if(windUp < minWindUp)
playsound(src,'sound/items/metal_impact.ogg', 25,1)
to_chat(user, "<span class='notice'>the spring isn't tight enough to fire</span>")
return
playsound(src, fireSound, fireVolume,1)
return..()
return ..()
/obj/item/weapon/gun/hookshot/whip/windup_box/bootbox
name = "boot-in-a-box"

18
code/modules/projectiles/guns/projectile/sniper.dm
View File

@@ -136,18 +136,14 @@
return 1
/obj/item/weapon/gun/projectile/hecate/hunting/proc/scoping()
if(is_holder_of(usr, src))
if(wielded && scoped)
if(scope_toggled)
scope_toggled = 0
else
scope_toggled = 1
update_wield(usr)
else
if(scoped)
to_chat(usr, "<span class='warning'>You must dual-wield \the [src] before you can use scope on it!</span>")
if(!is_holder_of(usr, src))
return
if(wielded && scoped)
scope_toggled = !scope_toggled
update_wield(usr)
else
return ..()
if(scoped)
to_chat(usr, "<span class='warning'>You must dual-wield \the [src] before you can use scope on it!</span>")
/obj/item/weapon/gun/projectile/hecate/hunting/AltClick()
scoping()