cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace cleanup part 2. (#19891)

Browse Source
This commit is contained in:
warriorstar-orion
2022-12-24 12:38:43 -05:00
committed by GitHub
parent 19d759b257
commit a7d09cf033
134 changed files with 652 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/magazines.dm
+1 -1
View File
@@ -180,7 +180,7 @@
max_ammo = 5
/obj/item/ammo_box/magazine/internal/shot/toy/tommygun
max_ammo = 10
max_ammo = 10
///////////EXTERNAL MAGAZINES////////////////
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+9 -9
View File
@@ -572,17 +572,17 @@
var/chassis_name = "super-kinetic accelerator"
/obj/item/borg/upgrade/modkit/chassis_mod/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user)
. = ..()
if(.)
KA.current_skin = chassis_icon
KA.name = chassis_name
KA.update_icon()
. = ..()
if(.)
KA.current_skin = chassis_icon
KA.name = chassis_name
KA.update_icon()
/obj/item/borg/upgrade/modkit/chassis_mod/uninstall(obj/item/gun/energy/kinetic_accelerator/KA)
KA.current_skin = initial(KA.current_skin)
KA.name = initial(KA.name)
KA.update_icon()
..()
KA.current_skin = initial(KA.current_skin)
KA.name = initial(KA.name)
KA.update_icon()
..()
/obj/item/borg/upgrade/modkit/chassis_mod/orange
name = "hyper chassis"
code/modules/projectiles/guns/energy/stun.dm
+4 -4
View File
@@ -59,11 +59,11 @@
can_holster = TRUE
/obj/item/gun/energy/disabler/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread)
var/obj/item/gun/energy/disabler/offhand_disabler = user.get_inactive_hand()
if(istype(offhand_disabler) && offhand_disabler.semicd && (user.a_intent != INTENT_HARM))
return
var/obj/item/gun/energy/disabler/offhand_disabler = user.get_inactive_hand()
if(istype(offhand_disabler) && offhand_disabler.semicd && (user.a_intent != INTENT_HARM))
return
return ..()
return ..()
/obj/item/gun/energy/disabler/cyborg
name = "cyborg disabler"
code/modules/projectiles/guns/projectile/revolver.dm
+2 -2
View File
@@ -317,8 +317,8 @@
return ..()
/obj/item/gun/projectile/revolver/doublebarrel/sawoff(mob/user)
. = ..()
weapon_weight = WEAPON_MEDIUM
. = ..()
weapon_weight = WEAPON_MEDIUM
/obj/item/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user)
var/num_unloaded = 0
code/modules/projectiles/projectile/bullets.dm
+13 -13
View File
@@ -86,12 +86,12 @@
armour_penetration_flat = -10
/obj/item/projectile/bullet/pellet/rubber/on_hit(atom/target, blocked = 0)
. = ..()
if(!ishuman(target))
return
var/mob/living/carbon/human/H = target
if(H.getStaminaLoss() >= 60)
H.KnockDown(8 SECONDS)
. = ..()
if(!ishuman(target))
return
var/mob/living/carbon/human/H = target
if(H.getStaminaLoss() >= 60)
H.KnockDown(8 SECONDS)
/obj/item/projectile/bullet/pellet/weak
tile_dropoff = 0.55 //Come on it does 6 damage don't be like that.
@@ -102,8 +102,8 @@
..()
/obj/item/projectile/bullet/pellet/weak/on_range()
do_sparks(1, 1, src)
..()
do_sparks(1, 1, src)
..()
/obj/item/projectile/bullet/pellet/overload
damage = 3
@@ -122,13 +122,13 @@
M.AdjustSilence(4 SECONDS) // HELP MIME KILLING ME IN MAINT
/obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = 0)
..()
explosion(target, 0, 0, 2)
..()
explosion(target, 0, 0, 2)
/obj/item/projectile/bullet/pellet/overload/on_range()
explosion(src, 0, 0, 2)
do_sparks(3, 3, src)
..()
explosion(src, 0, 0, 2)
do_sparks(3, 3, src)
..()
/obj/item/projectile/bullet/midbullet
damage = 20