mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 23:17:02 +01:00
linters do your magic (#19263)
This commit is contained in:
@@ -127,7 +127,7 @@
|
||||
var/turf/pull = get_turf(M)
|
||||
var/range_power = clamp(round(volume/5, 1), 1, 5)
|
||||
for(var/atom/movable/X in range(range_power,pull))
|
||||
if(istype(X, /obj/effect))
|
||||
if(iseffect(X))
|
||||
continue
|
||||
if(X.move_resist <= MOVE_FORCE_DEFAULT && !X.anchored)
|
||||
var/distance = get_dist(X, pull)
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
taste_description = "metal"
|
||||
|
||||
/datum/reagent/lithium/on_mob_life(mob/living/M)
|
||||
if(isturf(M.loc) && !istype(M.loc, /turf/space))
|
||||
if(isturf(M.loc) && !isspaceturf(M.loc))
|
||||
if((M.mobility_flags & MOBILITY_MOVE) && !M.restrained())
|
||||
step(M, pick(GLOB.cardinal))
|
||||
if(prob(5))
|
||||
@@ -50,7 +50,7 @@
|
||||
/datum/reagent/space_drugs/on_mob_life(mob/living/M)
|
||||
var/update_flags = STATUS_UPDATE_NONE
|
||||
M.Druggy(30 SECONDS)
|
||||
if(isturf(M.loc) && !istype(M.loc, /turf/space))
|
||||
if(isturf(M.loc) && !isspaceturf(M.loc))
|
||||
if((M.mobility_flags & MOBILITY_MOVE) && !M.restrained())
|
||||
step(M, pick(GLOB.cardinal))
|
||||
if(prob(7))
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
taste_description = "floor cleaner"
|
||||
|
||||
/datum/reagent/space_cleaner/reaction_obj(obj/O, volume)
|
||||
if(istype(O, /obj/effect))
|
||||
if(iseffect(O))
|
||||
var/obj/effect/E = O
|
||||
if(E.is_cleanable())
|
||||
var/obj/effect/decal/cleanable/blood/B = E
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
var/moved_count = 0
|
||||
// The ternary below isnt exactly needed, but it makes code more readable because `pull` is a bool
|
||||
for(var/atom/movable/X in view(2 + (pull ? 1 : 0) + (volume > 30 ? 1 : 0), T))
|
||||
if(istype(X, /obj/effect))
|
||||
if(iseffect(X))
|
||||
continue //stop pulling smoke and hotspots please
|
||||
if(X && !X.anchored && X.move_resist <= MOVE_FORCE_DEFAULT)
|
||||
if(pull)
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
reagents.clear_reagents()
|
||||
|
||||
/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
|
||||
if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))
|
||||
if(is_pen(I) || istype(I, /obj/item/flashlight/pen))
|
||||
var/t = rename_interactive(user, I)
|
||||
if(!isnull(t))
|
||||
label_text = t
|
||||
|
||||
@@ -149,7 +149,7 @@
|
||||
. += "inject"
|
||||
|
||||
/obj/item/reagent_containers/iv_bag/attackby(obj/item/I, mob/user, params)
|
||||
if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))
|
||||
if(is_pen(I) || istype(I, /obj/item/flashlight/pen))
|
||||
rename_interactive(user, I)
|
||||
|
||||
// PRE-FILLED IV BAGS BELOW
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
possible_transfer_amounts = null
|
||||
|
||||
/obj/item/reagent_containers/spray/afterattack(atom/A, mob/user)
|
||||
if(istype(A, /obj/item/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack) || istype(A, /obj/structure/closet) \
|
||||
if(isstorage(A) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack) || istype(A, /obj/structure/closet) \
|
||||
|| istype(A, /obj/item/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart) || istype(A, /obj/machinery/hydroponics))
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user