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

Admin interaction update

Browse Source
This commit is contained in:
Markolie
2017-02-08 23:27:08 +01:00
parent 9127d07b4e
commit 4a155bfb50
20 changed files with 701 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/faxmachine.dm
+4 -1
View File
@@ -37,9 +37,12 @@ var/list/alldepartments = list()
fax_network = "Central Command Quantum Entanglement Network"
long_range_enabled = 1
/obj/machinery/photocopier/faxmachine/attack_hand(mob/user as mob)
/obj/machinery/photocopier/faxmachine/attack_hand(mob/user)
ui_interact(user)
/obj/machinery/photocopier/faxmachine/attack_ghost(mob/user)
ui_interact(user)
/obj/machinery/photocopier/faxmachine/attackby(obj/item/weapon/item, mob/user, params)
if(istype(item,/obj/item/weapon/card/id) && !scan)
scan(item)
code/modules/paperwork/photocopier.dm
+8 -2
View File
@@ -19,10 +19,13 @@
var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
var/mob/living/ass = null
/obj/machinery/photocopier/attack_ai(mob/user as mob)
/obj/machinery/photocopier/attack_ai(mob/user)
return attack_hand(user)
/obj/machinery/photocopier/attack_ghost(mob/user)
return attack_hand(user)
/obj/machinery/photocopier/attack_hand(mob/user as mob)
/obj/machinery/photocopier/attack_hand(mob/user)
user.set_machine(src)
var/dat = "Photocopier<BR><BR>"
@@ -47,6 +50,9 @@
return
/obj/machinery/photocopier/Topic(href, href_list)
if(..())
return 1
if(href_list["copy"])
if(stat & (BROKEN|NOPOWER))
return