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

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

Browse Source
This commit is contained in:
Markolie
2015-02-22 22:12:11 +01:00
parent aee4626ed9
commit 672305e034
456 changed files with 714 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/clipboard.dm
+2 -2
View File
@@ -42,7 +42,7 @@
overlays += "clipboard_over"
return
/obj/item/weapon/clipboard/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/weapon/clipboard/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo))
user.drop_item()
@@ -53,7 +53,7 @@
update_icon()
else if(istype(toppaper) && istype(W, /obj/item/weapon/pen))
toppaper.attackby(W, usr)
toppaper.attackby(W, usr, params)
update_icon()
return
code/modules/paperwork/faxmachine.dm
+1 -1
View File
@@ -32,7 +32,7 @@ var/list/alldepartments = list()
/obj/machinery/photocopier/faxmachine/attack_hand(mob/user as mob)
ui_interact(user)
/obj/machinery/photocopier/faxmachine/attackby(obj/item/weapon/item, mob/user)
/obj/machinery/photocopier/faxmachine/attackby(obj/item/weapon/item, mob/user, params)
if(istype(item,/obj/item/weapon/card/id) && !scan)
scan(item)
else if(istype(item, /obj/item/weapon/paper) || istype(item, /obj/item/weapon/photo) || istype(item, /obj/item/weapon/paper_bundle))
code/modules/paperwork/filingcabinet.dm
+1 -1
View File
@@ -33,7 +33,7 @@
I.loc = src
/obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob)
/obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob, params)
if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/weapon/paper_bundle) || istype(P, /obj/item/documents))
user << "<span class='notice'>You put [P] in [src].</span>"
user.drop_item()
code/modules/paperwork/folders.dm
+1 -1
View File
@@ -30,7 +30,7 @@
overlays += "folder_paper"
return
/obj/item/weapon/folder/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/weapon/folder/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/weapon/paper_bundle) || istype(W, /obj/item/documents))
user.drop_item()
W.loc = src
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -348,7 +348,7 @@
update_icon()
/obj/item/weapon/paper/attackby(obj/item/weapon/P as obj, mob/user as mob)
/obj/item/weapon/paper/attackby(obj/item/weapon/P as obj, mob/user as mob, params)
..()
var/clown = 0
if(user.mind && (user.mind.assigned_role == "Clown"))
code/modules/paperwork/paper_bundle.dm
+2 -2
View File
@@ -16,7 +16,7 @@
var/screen = 0
/obj/item/weapon/paper_bundle/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/weapon/paper_bundle/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
var/obj/item/weapon/paper/P
if(istype(W, /obj/item/weapon/paper))
@@ -60,7 +60,7 @@
if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/toy/crayon))
usr << browse("", "window=[name]") //Closes the dialog
P = src[page]
P.attackby(W, user)
P.attackby(W, user, params)
update_icon()
code/modules/paperwork/paperbin.dm
+1 -1
View File
@@ -75,7 +75,7 @@
return
/obj/item/weapon/paper_bin/attackby(obj/item/weapon/paper/i as obj, mob/user as mob)
/obj/item/weapon/paper_bin/attackby(obj/item/weapon/paper/i as obj, mob/user as mob, params)
if(!istype(i))
return
code/modules/paperwork/photocopier.dm
+1 -1
View File
@@ -102,7 +102,7 @@
sleep(15)
updateUsrDialog()
/obj/machinery/photocopier/attackby(obj/item/O as obj, mob/user as mob)
/obj/machinery/photocopier/attackby(obj/item/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/weapon/paper) || istype(O, /obj/item/weapon/photo) || istype(O, /obj/item/weapon/paper_bundle))
if(!copyitem)
user.drop_item()
code/modules/paperwork/photography.dm
+2 -2
View File
@@ -35,7 +35,7 @@
/obj/item/weapon/photo/attack_self(mob/user as mob)
src.examine(user)
/obj/item/weapon/photo/attackby(obj/item/weapon/P as obj, mob/user as mob)
/obj/item/weapon/photo/attackby(obj/item/weapon/P as obj, mob/user as mob, params)
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
var/txt = sanitize(input(user, "What would you like to write on the back?", "Photo Writing", null) as text)
txt = copytext(txt, 1, 128)
@@ -171,7 +171,7 @@
user << "You switch the camera [on ? "on" : "off"]."
return
/obj/item/device/camera/attackby(obj/item/I as obj, mob/user as mob)
/obj/item/device/camera/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/device/camera_film))
if(pictures_left)
user << "<span class='notice'>[src] still has some film in it!</span>"