cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

BRUTAL Part 1 - No proc var/ in procs

Browse Source
This commit is contained in:
AffectedArc07
2021-02-01 14:10:08 +00:00
parent 1d89138436
commit f5f97882cf
533 changed files with 1558 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/energy.dm
+1 -1
View File
@@ -194,7 +194,7 @@
select_name = "blue"
harmful = FALSE
/obj/item/ammo_casing/energy/wormhole/New(var/obj/item/gun/energy/wormhole_projector/wh)
/obj/item/ammo_casing/energy/wormhole/New(obj/item/gun/energy/wormhole_projector/wh)
. = ..()
gun = wh
code/modules/projectiles/firing.dm
+1 -1
View File
@@ -65,7 +65,7 @@
var/dy = abs(target.y - current.y)
return locate(target.x + round(gaussian(0, distro) * (dy+2)/8, 1), target.y + round(gaussian(0, distro) * (dx+2)/8, 1), target.z)
/obj/item/projectile/proc/preparePixelProjectile(atom/target, var/turf/targloc, mob/living/user, params, spread)
/obj/item/projectile/proc/preparePixelProjectile(atom/target, turf/targloc, mob/living/user, params, spread)
var/turf/curloc = get_turf(user)
loc = get_turf(user)
starting = get_turf(user)
code/modules/projectiles/guns/dartgun.dm
+1 -1
View File
@@ -232,7 +232,7 @@
user << browse(dat, "window=dartgun")
onclose(user, "dartgun", src)
/obj/item/gun/dartgun/proc/check_beaker_mixing(var/obj/item/B)
/obj/item/gun/dartgun/proc/check_beaker_mixing(obj/item/B)
if(!mixing || !beakers)
return 0
for(var/obj/item/M in mixing)
code/modules/projectiles/guns/medbeam.dm
+3 -3
View File
@@ -99,10 +99,10 @@
qdel(dummy)
return 1
/obj/item/gun/medbeam/proc/on_beam_hit(var/mob/living/target)
/obj/item/gun/medbeam/proc/on_beam_hit(mob/living/target)
return
/obj/item/gun/medbeam/proc/on_beam_tick(var/mob/living/target)
/obj/item/gun/medbeam/proc/on_beam_tick(mob/living/target)
target.adjustBruteLoss(-4)
target.adjustFireLoss(-4)
if(ishuman(target))
@@ -111,7 +111,7 @@
if(prob(10))
E.mend_fracture()
/obj/item/gun/medbeam/proc/on_beam_release(var/mob/living/target)
/obj/item/gun/medbeam/proc/on_beam_release(mob/living/target)
return
/obj/effect/ebeam/medical
code/modules/projectiles/guns/projectile.dm
+1 -1
View File
@@ -67,7 +67,7 @@
update_icon()
return
/obj/item/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob, params)
/obj/item/gun/projectile/attackby(obj/item/A as obj, mob/user as mob, params)
if(istype(A, /obj/item/ammo_box/magazine))
var/obj/item/ammo_box/magazine/AM = A
if(istype(AM, mag_type))
code/modules/projectiles/guns/projectile/automatic.dm
+4 -4
View File
@@ -20,7 +20,7 @@
if(bayonet && can_bayonet)
overlays += knife_overlay
/obj/item/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob, params)
/obj/item/gun/projectile/automatic/attackby(obj/item/A as obj, mob/user as mob, params)
. = ..()
if(.)
if(alarmed) // Did the empty clip alarm go off already?
@@ -165,14 +165,14 @@
underbarrel = new /obj/item/gun/projectile/revolver/grenadelauncher(src)
update_icon()
/obj/item/gun/projectile/automatic/m90/afterattack(var/atom/target, var/mob/living/user, flag, params)
/obj/item/gun/projectile/automatic/m90/afterattack(atom/target, mob/living/user, flag, params)
if(select == 2)
underbarrel.afterattack(target, user, flag, params)
else
..()
return
/obj/item/gun/projectile/automatic/m90/attackby(var/obj/item/A, mob/user, params)
/obj/item/gun/projectile/automatic/m90/attackby(obj/item/A, mob/user, params)
if(istype(A, /obj/item/ammo_casing))
if(istype(A, underbarrel.magazine.ammo_type))
underbarrel.attack_self()
@@ -285,7 +285,7 @@
update_magazine()
icon_state = "bulldog[chambered ? "" : "-e"]"
/obj/item/gun/projectile/automatic/shotgun/bulldog/attackby(var/obj/item/A as obj, mob/user as mob, params)
/obj/item/gun/projectile/automatic/shotgun/bulldog/attackby(obj/item/A as obj, mob/user as mob, params)
if(istype(A, /obj/item/ammo_box/magazine/m12g/XtrLrg))
if(istype(loc, /obj/item/storage)) // To prevent inventory exploits
var/obj/item/storage/Strg = loc
code/modules/projectiles/guns/projectile/launchers.dm
+1 -1
View File
@@ -10,7 +10,7 @@
fire_sound = 'sound/weapons/grenadelaunch.ogg'
w_class = WEIGHT_CLASS_NORMAL
/obj/item/gun/projectile/revolver/grenadelauncher/attackby(var/obj/item/A, mob/user, params)
/obj/item/gun/projectile/revolver/grenadelauncher/attackby(obj/item/A, mob/user, params)
..()
if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
chamber_round()
code/modules/projectiles/guns/projectile/revolver.dm
+1 -1
View File
@@ -11,7 +11,7 @@
if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
verbs -= /obj/item/gun/projectile/revolver/verb/spin
/obj/item/gun/projectile/revolver/chamber_round(var/spin = 1)
/obj/item/gun/projectile/revolver/chamber_round(spin = 1)
if(spin)
chambered = magazine.get_round(1)
else
code/modules/projectiles/projectile.dm
+4 -4
View File
@@ -162,7 +162,7 @@
add_attack_logs(firer, L, "Shot with a [type][additional_log_text]")
return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
/obj/item/projectile/proc/get_splatter_blockage(var/turf/step_over, var/atom/target, var/splatter_dir, var/target_loca) //Check whether the place we want to splatter blood is blocked (i.e. by windows).
/obj/item/projectile/proc/get_splatter_blockage(turf/step_over, atom/target, splatter_dir, target_loca) //Check whether the place we want to splatter blood is blocked (i.e. by windows).
var/turf/step_cardinal = !(splatter_dir in list(NORTH, SOUTH, EAST, WEST)) ? get_step(target_loca, get_cardinal_dir(target_loca, step_over)) : null
if(step_over.density && !step_over.CanPass(target, step_over, 1)) //Preliminary simple check.
@@ -226,10 +226,10 @@
picked_mob.bullet_act(src, def_zone)
qdel(src)
/obj/item/projectile/Process_Spacemove(var/movement_dir = 0)
/obj/item/projectile/Process_Spacemove(movement_dir = 0)
return 1 //Bullets don't drift in space
/obj/item/projectile/proc/fire(var/setAngle)
/obj/item/projectile/proc/fire(setAngle)
set waitfor = FALSE
if(setAngle)
Angle = setAngle
@@ -314,7 +314,7 @@
ammo_casing = null
return ..()
/obj/item/projectile/proc/dumbfire(var/dir)
/obj/item/projectile/proc/dumbfire(dir)
current = get_ranged_target_turf(src, dir, world.maxx) //world.maxx is the range. Not sure how to handle this better.
fire()
code/modules/projectiles/projectile/beams.dm
+2 -2
View File
@@ -62,7 +62,7 @@
impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
light_color = LIGHT_COLOR_DARKBLUE
/obj/item/projectile/beam/pulse/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = 0)
if(istype(target,/turf/)||istype(target,/obj/structure/))
target.ex_act(2)
..()
@@ -140,7 +140,7 @@
damage = 8
icon_state = "scatterlaser"
/obj/item/projectile/beam/immolator/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/beam/immolator/on_hit(atom/target, blocked = 0)
. = ..()
if(istype(target, /mob/living/carbon))
var/mob/living/carbon/M = target
code/modules/projectiles/projectile/bullets.dm
+5 -5
View File
@@ -66,7 +66,7 @@
/obj/item/projectile/bullet/incendiary
/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/bullet/incendiary/on_hit(atom/target, blocked = 0)
. = ..()
if(iscarbon(target))
var/mob/living/carbon/M = target
@@ -196,7 +196,7 @@
stun = 8
hitsound = 'sound/effects/meteorimpact.ogg'
/obj/item/projectile/bullet/meteorshot/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = 0)
..()
if(istype(target, /atom/movable))
var/atom/movable/M = target
@@ -219,7 +219,7 @@
slur = 20
stutter = 20
/obj/item/projectile/bullet/mime/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/bullet/mime/on_hit(atom/target, blocked = 0)
..(target, blocked)
if(iscarbon(target))
var/mob/living/carbon/M = target
@@ -242,7 +242,7 @@
create_reagents(50)
reagents.set_reacting(FALSE)
/obj/item/projectile/bullet/dart/on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
/obj/item/projectile/bullet/dart/on_hit(atom/target, blocked = 0, hit_zone)
if(iscarbon(target))
var/mob/living/carbon/M = target
if(blocked != 100)
@@ -286,7 +286,7 @@
damage_type = TOX
weaken = 5
/obj/item/projectile/bullet/neurotoxin/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/bullet/neurotoxin/on_hit(atom/target, blocked = 0)
if(isalien(target))
weaken = 0
nodamage = 1
code/modules/projectiles/projectile/energy.dm
+1 -1
View File
@@ -19,7 +19,7 @@
range = 7
//Damage will be handled on the MOB side, to prevent window shattering.
/obj/item/projectile/energy/electrode/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/energy/electrode/on_hit(atom/target, blocked = 0)
. = ..()
if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - burst into sparks!
do_sparks(1, 1, src)
code/modules/projectiles/projectile/force.dm
+1 -1
View File
@@ -8,7 +8,7 @@
/obj/item/projectile/forcebolt/strong
name = "force bolt"
/obj/item/projectile/forcebolt/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/forcebolt/on_hit(atom/target, blocked = 0)
. = ..()
if(blocked < 100)
var/obj/T = target
code/modules/projectiles/projectile/magic.dm
+9 -9
View File
@@ -53,7 +53,7 @@
return
..()
/obj/item/projectile/magic/fireball/on_hit(var/target)
/obj/item/projectile/magic/fireball/on_hit(target)
. = ..()
var/turf/T = get_turf(target)
explosion(T, exp_devastate, exp_heavy, exp_light, exp_flash, 0, flame_range = exp_fire)
@@ -73,7 +73,7 @@
name = "bolt of resurrection"
icon_state = "ion"
/obj/item/projectile/magic/resurrection/on_hit(var/mob/living/carbon/target)
/obj/item/projectile/magic/resurrection/on_hit(mob/living/carbon/target)
. = ..()
if(ismob(target))
var/old_stat = target.stat
@@ -95,7 +95,7 @@
var/inner_tele_radius = 0
var/outer_tele_radius = 6
/obj/item/projectile/magic/teleport/on_hit(var/mob/target)
/obj/item/projectile/magic/teleport/on_hit(mob/target)
. = ..()
var/teleammount = 0
var/teleloc = target
@@ -116,7 +116,7 @@
/obj/structure/mineral_door/gold,/obj/structure/mineral_door/uranium,/obj/structure/mineral_door/sandstone,/obj/structure/mineral_door/transparent/plasma,\
/obj/structure/mineral_door/transparent/diamond)
/obj/item/projectile/magic/door/on_hit(var/atom/target)
/obj/item/projectile/magic/door/on_hit(atom/target)
. = ..()
var/atom/T = target.loc
if(isturf(target) && target.density)
@@ -134,13 +134,13 @@
T.ChangeTurf(/turf/simulated/floor/plasteel)
D.Open()
/obj/item/projectile/magic/door/proc/OpenDoor(var/obj/machinery/door/D)
/obj/item/projectile/magic/door/proc/OpenDoor(obj/machinery/door/D)
if(istype(D,/obj/machinery/door/airlock))
var/obj/machinery/door/airlock/A = D
A.locked = FALSE
D.open()
/obj/item/projectile/magic/door/proc/OpenCloset(var/obj/structure/closet/C)
/obj/item/projectile/magic/door/proc/OpenCloset(obj/structure/closet/C)
if(istype(C, /obj/structure/closet/secure_closet))
var/obj/structure/closet/secure_closet/SC = C
SC.locked = FALSE
@@ -151,7 +151,7 @@
icon_state = "ice_1"
damage_type = BURN
/obj/item/projectile/magic/change/on_hit(var/atom/change)
/obj/item/projectile/magic/change/on_hit(atom/change)
. = ..()
wabbajack(change)
@@ -282,7 +282,7 @@
icon_state = "red_1"
damage_type = BURN
/obj/item/projectile/magic/animate/Bump(var/atom/change)
/obj/item/projectile/magic/animate/Bump(atom/change)
..()
if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, GLOB.protected_objects))
if(istype(change, /obj/structure/closet/statue))
@@ -331,7 +331,7 @@
..()
SpinAnimation()
/obj/item/projectile/magic/slipping/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/magic/slipping/on_hit(atom/target, blocked = 0)
if(ishuman(target))
var/mob/living/carbon/human/H = target
H.slip(src, slip_stun, slip_weaken, 0, FALSE, TRUE) //Slips even with noslips/magboots on. NO ESCAPE!
code/modules/projectiles/projectile/special.dm
+8 -8
View File
@@ -8,7 +8,7 @@
impact_effect_type = /obj/effect/temp_visual/impact_effect/ion
flag = "energy"
/obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/ion/on_hit(atom/target, blocked = 0)
..()
empulse(target, 1, 1, 1, cause = "[type] fired by [key_name(firer)]")
return 1
@@ -27,7 +27,7 @@
alwayslog = TRUE
flag = "bullet"
/obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
..()
explosion(target, -1, 0, 2, cause = "[type] fired by [key_name(firer)]")
return 1
@@ -92,7 +92,7 @@
icon_state = "temp_4"
/obj/item/projectile/temp/on_hit(var/atom/target, var/blocked = 0)//These two could likely check temp protection on the mob
/obj/item/projectile/temp/on_hit(atom/target, blocked = 0)//These two could likely check temp protection on the mob
..()
if(isliving(target))
var/mob/living/M = target
@@ -133,7 +133,7 @@
impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
flag = "energy"
/obj/item/projectile/energy/floramut/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/energy/floramut/on_hit(atom/target, blocked = 0)
..()
var/mob/living/M = target
if(ishuman(target))
@@ -165,7 +165,7 @@
nodamage = 1
flag = "energy"
/obj/item/projectile/energy/florayield/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/energy/florayield/on_hit(atom/target, blocked = 0)
..()
var/mob/M = target
if(ishuman(target)) //These rays make plantmen fat.
@@ -181,7 +181,7 @@
/obj/item/projectile/beam/mindflayer
name = "flayer ray"
/obj/item/projectile/beam/mindflayer/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/beam/mindflayer/on_hit(atom/target, blocked = 0)
. = ..()
if(ishuman(target))
var/mob/living/carbon/human/M = target
@@ -213,7 +213,7 @@
name = "orange bluespace beam"
color = "#FF6600"
/obj/item/projectile/beam/wormhole/New(var/obj/item/ammo_casing/energy/wormhole/casing)
/obj/item/projectile/beam/wormhole/New(obj/item/ammo_casing/energy/wormhole/casing)
. = ..()
if(casing)
gun = casing.gun
@@ -279,7 +279,7 @@
if(tele_target)
teleport_target = tele_target
/obj/item/projectile/energy/teleport/on_hit(var/atom/target, var/blocked = 0)
/obj/item/projectile/energy/teleport/on_hit(atom/target, blocked = 0)
if(isliving(target))
if(teleport_target)
do_teleport(target, teleport_target, 0)//teleport what's in the tile to the beacon