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

Formatting fix second go, squashed two commits together

Browse Source
This commit is contained in:
Ansari
2017-10-29 08:59:48 +08:00
parent 1176587bce
commit 73127ad74e
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paperplane.dm
+18 -18
View File
@@ -11,25 +11,25 @@
burn_state = FLAMMABLE
burntime = 5
var/obj/item/weapon/paper/internal_Paper
var/obj/item/weapon/paper/internal_paper
/obj/item/weapon/paperplane/New(loc, obj/item/weapon/paper/new_Paper)
/obj/item/weapon/paperplane/New(loc, obj/item/weapon/paper/new_paper)
. = ..()
pixel_y = rand(-8, 8)
pixel_x = rand(-9, 9)
if(new_Paper)
internal_Paper = new_Paper
flags = new_Paper.flags
color = new_Paper.color
new_Paper.forceMove(src)
if(new_paper)
internal_paper = new_paper
flags = new_paper.flags
color = new_paper.color
new_paper.forceMove(src)
else
internal_Paper = new /obj/item/weapon/paper(src)
internal_paper = new /obj/item/weapon/paper(src)
update_icon()
/obj/item/weapon/paperplane/Destroy()
if(internal_Paper)
qdel(internal_Paper)
internal_Paper = null
if(internal_paper)
qdel(internal_paper)
internal_paper = null
return ..()
/obj/item/weapon/paperplane/suicide_act(mob/living/user)
@@ -44,20 +44,20 @@
/obj/item/weapon/paperplane/update_icon()
overlays.Cut()
var/list/stamped = internal_Paper.stamped
var/list/stamped = internal_paper.stamped
if(!stamped)
stamped = new
else if(stamped)
for(var/S in stamped)
var/obj/item/weapon/stamp/ = S
var/obj/item/weapon/stamp = S
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi', "paperplane_[initial(stamp.icon_state)]")
overlays += stampoverlay
/obj/item/weapon/paperplane/attack_self(mob/user)
to_chat(user, "<span class='notice'>You unfold [src].</span>")
var/atom/movable/internal_paper_tmp = internal_Paper
var/atom/movable/internal_paper_tmp = internal_paper
internal_paper_tmp.forceMove(loc)
internal_Paper = null
internal_paper = null
qdel(src)
user.put_in_hands(internal_paper_tmp)
@@ -69,7 +69,7 @@
return
else if(istype(P, /obj/item/weapon/stamp)) //we don't randomize stamps on a paperplane
internal_Paper.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))
@@ -114,7 +114,7 @@
H.emote("scream")
/obj/item/weapon/paper/AltClick(mob/living/carbon/user, obj/item/I)
if (istype(user))
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>")
@@ -122,4 +122,4 @@
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 [src]. </span>")