shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/security.dm
+5 -10
View File
@@ -1,5 +1,3 @@
/obj/machinery/computer/secure_data//TODO:SANITY
name = "security records console"
desc = "Used to view and edit personnel's security records"
@@ -23,6 +21,7 @@
var/sortBy = "name"
var/order = 1 // -1 = Descending - 1 = Ascending
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/weapon/card/id))
@@ -31,9 +30,9 @@
return
O.loc = src
scan = O
user << "<span class='notice'>You insert [O].</span>"
to_chat(user, "<span class='notice'>You insert [O].</span>")
else
user << "<span class='warning'>There's already an ID card in the console.</span>"
to_chat(user, "<span class='warning'>There's already an ID card in the console.</span>")
else
return ..()
@@ -42,7 +41,7 @@
if(..())
return
if(src.z > 6)
user << "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!"
to_chat(user, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
return
var/dat
@@ -442,7 +441,7 @@ What a mess.*/
sleep(30)
if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))//make sure the record still exists.
var/obj/item/weapon/photo/photo = active1.fields["photo_front"]
new /obj/item/weapon/poster/legit/wanted(src.loc, photo.img, wanted_name, info)
new /obj/item/weapon/poster/wanted(src.loc, photo.img, wanted_name, info)
printing = 0
//RECORD DELETE
@@ -703,7 +702,6 @@ What a mess.*/
if("Delete Record (Security) Execute")
investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records")
if(active2)
data_core.security -= active2
qdel(active2)
active2 = null
@@ -712,15 +710,12 @@ What a mess.*/
investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records")
for(var/datum/data/record/R in data_core.medical)
if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
data_core.medical -= R
qdel(R)
break
data_core.general -= active1
qdel(active1)
active1 = null
if(active2)
data_core.security -= active2
qdel(active2)
active2 = null
else