Fix formatting without actually breaking the file.

This commit is contained in:
Ansari
2017-10-28 08:13:42 +08:00
parent 40f8214361
commit 1176587bce
+32 -25
View File
@@ -11,30 +11,30 @@
burn_state = FLAMMABLE
burntime = 5
var/obj/item/weapon/paper/internalPaper
var/obj/item/weapon/paper/internal_Paper
/obj/item/weapon/paperplane/New(loc, obj/item/weapon/paper/newPaper)
/obj/item/weapon/paperplane/New(loc, obj/item/weapon/paper/new_Paper)
. = ..()
pixel_y = rand(-8, 8)
pixel_x = rand(-9, 9)
if(newPaper)
internalPaper = newPaper
flags = newPaper.flags
color = newPaper.color
newPaper.forceMove(src)
if(new_Paper)
internal_Paper = new_Paper
flags = new_Paper.flags
color = new_Paper.color
new_Paper.forceMove(src)
else
internalPaper = new /obj/item/weapon/paper(src)
internal_Paper = new /obj/item/weapon/paper(src)
update_icon()
/obj/item/weapon/paperplane/Destroy()
if(internalPaper)
qdel(internalPaper)
internalPaper = null
if(internal_Paper)
qdel(internal_Paper)
internal_Paper = null
return ..()
/obj/item/weapon/paperplane/suicide_act(mob/living/user)
user.Stun(10)
user.visible_message("<span class='suicide'>[user] jams the [src] in \his nose. It looks like \he's trying to commit suicide!</span>")
user.visible_message("<span class='suicide'>[user] jams [src] in \his nose. It looks like \he's trying to commit suicide!</span>")
user.EyeBlurry(6)
var/obj/item/organ/internal/eyes/E = user.get_int_organ(/obj/item/organ/internal/eyes)
if(E)
@@ -44,7 +44,7 @@
/obj/item/weapon/paperplane/update_icon()
overlays.Cut()
var/list/stamped = internalPaper.stamped
var/list/stamped = internal_Paper.stamped
if(!stamped)
stamped = new
else if(stamped)
@@ -55,32 +55,33 @@
/obj/item/weapon/paperplane/attack_self(mob/user)
to_chat(user, "<span class='notice'>You unfold [src].</span>")
var/atom/movable/internal_paper_tmp = internalPaper
var/atom/movable/internal_paper_tmp = internal_Paper
internal_paper_tmp.forceMove(loc)
internalPaper = null
internal_Paper = null
qdel(src)
user.put_in_hands(internal_paper_tmp)
/obj/item/weapon/paperplane/attackby(obj/item/P, mob/living/carbon/human/user, params)
..()
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
to_chat(user, "<span class='notice'>You should unfold [src] before changing it.</span>")
return
else if(istype(P, /obj/item/weapon/stamp)) //we don't randomize stamps on a paperplane
internalPaper.attackby(P, user) //spoofed attack to update internal paper.
internal_Paper.attackby(P, user) //spoofed attack to update internal paper.
update_icon()
else if(is_hot(P))
if(user.disabilities & CLUMSY && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
"<span class='userdanger'>You miss the [src] and accidentally light yourself on fire!</span>")
"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
user.unEquip(P)
user.adjust_fire_stacks(1)
user.IgniteMob()
return
if(!(in_range(user, src))) //to prevent issues as a result of telepathically lighting a paper
if(!in_range(user, src)) //to prevent issues as a result of telepathically lighting a paper
return
user.unEquip(src)
user.visible_message("<span class='danger'>[user] lights [src] ablaze with [P]!</span>", "<span class='danger'>You light [src] on fire!</span>")
@@ -89,17 +90,23 @@
add_fingerprint(user)
/obj/item/weapon/paperplane/throw_at(atom/target, range, speed, mob/thrower, spin=FALSE, diagonals_first = FALSE, datum/callback/callback)
/obj/item/weapon/paperplane/throw_at(atom/target, range, speed, mob/thrower, spin = FALSE, diagonals_first = FALSE, datum/callback/callback)
. = ..(target, range, speed, thrower, FALSE, diagonals_first, callback)
/obj/item/weapon/paperplane/throw_impact(atom/hit_atom)
if(..() || !ishuman(hit_atom))//if the plane is caught or it hits a nonhuman
if(..())
return
if(!ishuman(hit_atom))
return
var/mob/living/carbon/human/H = hit_atom
if(prob(2))
if((H.head && H.head.flags_cover & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES) || (H.glasses && H.glasses.flags_cover & GLASSESCOVERSEYES))
if(H.head && H.head.flags_cover & HEADCOVERSEYES)
return
visible_message("<span class='danger'>\The [src] hits [H] in the eye!</span>")
if(H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES)
return
if(H.glasses && H.glasses.flags_cover & GLASSESCOVERSEYES)
return
visible_message("<span class='danger'>[src] hits [H] in the eye!</span>")
H.EyeBlurry(6)
var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
if(E)
@@ -107,12 +114,12 @@
H.emote("scream")
/obj/item/weapon/paper/AltClick(mob/living/carbon/user, obj/item/I)
if ( istype(user) )
if( (!in_range(src, user)) || user.stat || user.restrained() )
if (istype(user))
if((!in_range(src, user)) || user.stat || user.restrained())
return
to_chat(user, "<span class='notice'>You fold [src] into the shape of a plane!</span>")
user.unEquip(src)
I = new /obj/item/weapon/paperplane(user, src)
user.put_in_hands(I)
else
to_chat(user, "<span class='notice'> You lack the dexterity to fold \the [src]. </span>")
to_chat(user, "<span class='notice'>You lack the dexterity to fold the [src]. </span>")