shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes some 1s and 0s to TRUE and FALSE (#1967)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-10 18:13:16 -05:00
committed by kevinz000
parent 1b70c06474
commit ff6bbbedf5
522 changed files with 1924 additions and 1917 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/beams.dm
+4 -4
View File
@@ -22,7 +22,7 @@
icon_state = "heavylaser"
damage = 40
/obj/item/projectile/beam/laser/on_hit(atom/target, blocked = 0)
/obj/item/projectile/beam/laser/on_hit(atom/target, blocked = FALSE)
. = ..()
if(iscarbon(target))
var/mob/living/carbon/M = target
@@ -72,7 +72,7 @@
impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
light_color = LIGHT_COLOR_BLUE
/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = 0)
/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = FALSE)
. = ..()
if(isturf(target) || istype(target,/obj/structure/))
target.ex_act(2)
@@ -85,7 +85,7 @@
icon_state = "pulse1_bl"
var/life = 20
/obj/item/projectile/beam/pulse/heavy/on_hit(atom/target, blocked = 0)
/obj/item/projectile/beam/pulse/heavy/on_hit(atom/target, blocked = FALSE)
life -= 10
if(life > 0)
. = -1
@@ -114,7 +114,7 @@
impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
light_color = LIGHT_COLOR_BLUE
/obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0)
/obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = FALSE)
. = ..()
if(ishuman(target))
var/mob/living/carbon/human/M = target
code/modules/projectiles/projectile/bullets.dm
+14 -14
View File
@@ -59,7 +59,7 @@
range = rand(1, 10)
..()
/obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = FALSE)
..()
explosion(target, 0, 0, 2)
@@ -87,7 +87,7 @@
damage = 27
armour_penetration = 40
/obj/item/projectile/bullet/midbullet3/fire/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/midbullet3/fire/on_hit(atom/target, blocked = FALSE)
if(..(target, blocked))
var/mob/living/M = target
M.adjust_fire_stacks(1)
@@ -110,7 +110,7 @@
icon_state = "spark"
color = "#FFFF00"
/obj/item/projectile/bullet/incendiary/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/incendiary/on_hit(atom/target, blocked = FALSE)
. = ..()
if(iscarbon(target))
var/mob/living/carbon/M = target
@@ -160,7 +160,7 @@
..()
SpinAnimation()
/obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = FALSE)
. = ..()
if(ismovableatom(target))
var/atom/movable/M = target
@@ -175,7 +175,7 @@
/obj/item/projectile/bullet/mime
damage = 20
/obj/item/projectile/bullet/mime/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/mime/on_hit(atom/target, blocked = FALSE)
. = ..()
if(iscarbon(target))
var/mob/living/carbon/M = target
@@ -193,7 +193,7 @@
create_reagents(50)
reagents.set_reacting(FALSE)
/obj/item/projectile/bullet/dart/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/dart/on_hit(atom/target, blocked = FALSE)
if(iscarbon(target))
var/mob/living/carbon/M = target
if(blocked != 100) // not completely blocked
@@ -230,7 +230,7 @@
damage_type = TOX
knockdown = 100
/obj/item/projectile/bullet/neurotoxin/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/neurotoxin/on_hit(atom/target, blocked = FALSE)
if(isalien(target))
knockdown = 0
nodamage = 1
@@ -243,7 +243,7 @@
damage = 5
hitsound_wall = "shatter"
/obj/item/projectile/bullet/dnainjector/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/dnainjector/on_hit(atom/target, blocked = FALSE)
if(iscarbon(target))
var/mob/living/carbon/M = target
if(blocked != 100)
@@ -271,7 +271,7 @@
armour_penetration = 50
var/breakthings = TRUE
/obj/item/projectile/bullet/sniper/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/sniper/on_hit(atom/target, blocked = FALSE)
if((blocked != 100) && (!ismob(target) && breakthings))
target.ex_act(rand(1,2))
return ..()
@@ -288,7 +288,7 @@
dismemberment = 0
breakthings = FALSE
/obj/item/projectile/bullet/sniper/gang/sleeper/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/sniper/gang/sleeper/on_hit(atom/target, blocked = FALSE)
if((blocked != 100) && isliving(target))
var/mob/living/L = target
L.blur_eyes(8)
@@ -305,7 +305,7 @@
knockdown = 0
breakthings = FALSE
/obj/item/projectile/bullet/sniper/soporific/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/sniper/soporific/on_hit(atom/target, blocked = FALSE)
if((blocked != 100) && isliving(target))
var/mob/living/L = target
L.Sleeping(400)
@@ -319,7 +319,7 @@
knockdown = 0
breakthings = FALSE
/obj/item/projectile/bullet/sniper/haemorrhage/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/sniper/haemorrhage/on_hit(atom/target, blocked = FALSE)
if((blocked != 100) && iscarbon(target))
var/mob/living/carbon/C = target
C.bleed(100)
@@ -348,7 +348,7 @@
damage = 20
armour_penetration = 0
/obj/item/projectile/bullet/saw/bleeding/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/saw/bleeding/on_hit(atom/target, blocked = FALSE)
. = ..()
if((blocked != 100) && iscarbon(target))
var/mob/living/carbon/C = target
@@ -373,7 +373,7 @@
new /obj/effect/hotspot(location)
location.hotspot_expose(700, 50, 1)
/obj/item/projectile/bullet/saw/incen/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/saw/incen/on_hit(atom/target, blocked = FALSE)
. = ..()
if(iscarbon(target))
var/mob/living/carbon/M = target
code/modules/projectiles/projectile/energy.dm
+5 -5
View File
@@ -20,7 +20,7 @@
hitsound = 'sound/weapons/taserhit.ogg'
range = 7
/obj/item/projectile/energy/electrode/on_hit(atom/target, blocked = 0)
/obj/item/projectile/energy/electrode/on_hit(atom/target, blocked = FALSE)
. = ..()
if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - burst into sparks!
do_sparks(1, TRUE, src)
@@ -47,7 +47,7 @@
. = ..()
SpinAnimation()
/obj/item/projectile/energy/net/on_hit(atom/target, blocked = 0)
/obj/item/projectile/energy/net/on_hit(atom/target, blocked = FALSE)
if(isliving(target))
var/turf/Tloc = get_turf(target)
if(!locate(/obj/effect/nettingportal) in Tloc)
@@ -64,7 +64,7 @@
icon = 'icons/effects/effects.dmi'
icon_state = "dragnetfield"
light_range = 3
anchored = 1
anchored = TRUE
/obj/effect/nettingportal/Initialize()
. = ..()
@@ -95,7 +95,7 @@
hitsound = 'sound/weapons/taserhit.ogg'
range = 4
/obj/item/projectile/energy/trap/on_hit(atom/target, blocked = 0)
/obj/item/projectile/energy/trap/on_hit(atom/target, blocked = FALSE)
if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - drop a trap
new/obj/item/weapon/restraints/legcuffs/beartrap/energy(get_turf(loc))
else if(iscarbon(target))
@@ -115,7 +115,7 @@
hitsound = 'sound/weapons/taserhit.ogg'
range = 10
/obj/item/projectile/energy/trap/cyborg/on_hit(atom/target, blocked = 0)
/obj/item/projectile/energy/trap/cyborg/on_hit(atom/target, blocked = FALSE)
if(!ismob(target) || blocked >= 100)
do_sparks(1, TRUE, src)
qdel(src)
code/modules/projectiles/projectile/magic.dm
+2 -2
View File
@@ -91,7 +91,7 @@
/obj/item/projectile/magic/door/proc/OpenDoor(var/obj/machinery/door/D)
if(istype(D,/obj/machinery/door/airlock))
var/obj/machinery/door/airlock/A = D
A.locked = 0
A.locked = FALSE
D.open()
/obj/item/projectile/magic/change
@@ -289,7 +289,7 @@
damage_type = BURN
nodamage = 1
/obj/item/projectile/magic/animate/on_hit(atom/target, blocked = 0)
/obj/item/projectile/magic/animate/on_hit(atom/target, blocked = FALSE)
target.animate_atom_living(firer)
..()
code/modules/projectiles/projectile/reusable.dm
+1 -1
View File
@@ -5,7 +5,7 @@
var/dropped = 0
impact_effect_type = null
/obj/item/projectile/bullet/reusable/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/reusable/on_hit(atom/target, blocked = FALSE)
. = ..()
handle_drop()
code/modules/projectiles/projectile/special.dm
+9 -9
View File
@@ -8,7 +8,7 @@
impact_effect_type = /obj/effect/temp_visual/impact_effect/ion
/obj/item/projectile/ion/on_hit(atom/target, blocked = 0)
/obj/item/projectile/ion/on_hit(atom/target, blocked = FALSE)
..()
empulse(target, 1, 1)
return 1
@@ -16,7 +16,7 @@
/obj/item/projectile/ion/weak
/obj/item/projectile/ion/weak/on_hit(atom/target, blocked = 0)
/obj/item/projectile/ion/weak/on_hit(atom/target, blocked = FALSE)
..()
empulse(target, 0, 0)
return 1
@@ -27,7 +27,7 @@
icon_state= "bolter"
damage = 50
/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = FALSE)
..()
explosion(target, -1, 0, 2)
return 1
@@ -38,7 +38,7 @@
icon_state= "bolter"
damage = 60
/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = FALSE)
..()
explosion(target, -1, 0, 2, 1, 0, flame_range = 3)
return 1
@@ -52,7 +52,7 @@
armour_penetration = 100
dismemberment = 100
/obj/item/projectile/bullet/a84mm/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/a84mm/on_hit(atom/target, blocked = FALSE)
..()
explosion(target, -1, 1, 3, 1, 0, flame_range = 4)
@@ -88,7 +88,7 @@
var/temperature = 100
/obj/item/projectile/temp/on_hit(atom/target, blocked = 0)//These two could likely check temp protection on the mob
/obj/item/projectile/temp/on_hit(atom/target, blocked = FALSE)//These two could likely check temp protection on the mob
..()
if(isliving(target))
var/mob/M = target
@@ -129,7 +129,7 @@
nodamage = 1
flag = "energy"
/obj/item/projectile/energy/floramut/on_hit(atom/target, blocked = 0)
/obj/item/projectile/energy/floramut/on_hit(atom/target, blocked = FALSE)
. = ..()
if(iscarbon(target))
var/mob/living/carbon/C = target
@@ -150,7 +150,7 @@
/obj/item/projectile/beam/mindflayer
name = "flayer ray"
/obj/item/projectile/beam/mindflayer/on_hit(atom/target, blocked = 0)
/obj/item/projectile/beam/mindflayer/on_hit(atom/target, blocked = FALSE)
. = ..()
if(ishuman(target))
var/mob/living/carbon/human/M = target
@@ -190,7 +190,7 @@
damage = 25
knockdown = 50
/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = 0)
/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = FALSE)
..()
explosion(target, -1, 0, 1)
return 1