cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFSoft disks change, minor fix and refactor

Browse Source
This commit is contained in:
Isaac Erwin
2018-02-02 03:45:40 -05:00
parent f5511dc458
commit a92fb455d8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/nifsoft/nifsoft.dm
View File

@@ -176,7 +176,6 @@
item_state = "card-id" item_state = "card-id"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
var/datum/nifsoft/stored = null var/datum/nifsoft/stored = null
var/laws = ""
/obj/item/weapon/disk/nifsoft/afterattack(var/A, mob/user, flag, params) /obj/item/weapon/disk/nifsoft/afterattack(var/A, mob/user, flag, params)
if(!in_range(user, A)) if(!in_range(user, A))
@@ -192,9 +191,13 @@
to_chat(user,"<span class='warning'>Either they don't have a NIF, or the disk can't connect.</span>") to_chat(user,"<span class='warning'>Either they don't have a NIF, or the disk can't connect.</span>")
return return
Ht.visible_message("<span class='warning'>[Hu] begins uploading new NIFSoft into [Ht]!</span>","<span class='danger'>[Hu] is uploading new NIFSoft into you!</span>") var/extra = extra_params()
if(do_after(Hu,10 SECONDS,Ht)) if(A == user)
var/extra = extra_params() to_chat(user,"<span class='notice'>You upload [src] into your NIF.</span>")
else
Ht.visible_message("<span class='warning'>[Hu] begins uploading [src] into [Ht]!</span>","<span class='danger'>[Hu] is uploading [src] into you!</span>")
if(A == user || do_after(Hu,10 SECONDS,Ht))
new stored(Ht.nif,extra) new stored(Ht.nif,extra)
qdel(src) qdel(src)
@@ -208,8 +211,11 @@
name = "NIFSoft Disk (Compliance)" name = "NIFSoft Disk (Compliance)"
desc = "Wow, adding laws to people? That seems illegal. It probably is. Okay, it really is." desc = "Wow, adding laws to people? That seems illegal. It probably is. Okay, it really is."
stored = /datum/nifsoft/compliance stored = /datum/nifsoft/compliance
var/laws
/obj/item/weapon/disk/nifsoft/compliance/afterattack(var/A, mob/user, flag, params) /obj/item/weapon/disk/nifsoft/compliance/afterattack(var/A, mob/user, flag, params)
if(!ishuman(A))
return
if(!laws) if(!laws)
to_chat(user,"<span class='warning'>You haven't set any laws yet. Use the disk in-hand first.</span>") to_chat(user,"<span class='warning'>You haven't set any laws yet. Use the disk in-hand first.</span>")
return return