Runtime and bug fixes

This commit is contained in:
Markolie
2015-08-12 18:20:53 +02:00
parent 92fdc4bfa4
commit 362a817d79
14 changed files with 45 additions and 12 deletions
+1 -1
View File
@@ -342,7 +342,7 @@
if(istype(src, /obj/item/clothing/under) || istype(src, /obj/item/clothing/suit))
if(FAT in H.mutations)
testing("[M] TOO FAT TO WEAR [src]!")
//testing("[M] TOO FAT TO WEAR [src]!")
if(!(flags & ONESIZEFITSALL))
if(!disable_warning)
H << "\red You're too fat to wear the [name]."
+11 -3
View File
@@ -210,10 +210,18 @@
/obj/item/weapon/card/id/syndicate
name = "agent card"
access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
var/list/initial_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
origin_tech = "syndicate=3"
var/registered_user = null
/obj/item/weapon/card/id/syndicate/New()
access = initial_access.Copy()
..()
/obj/item/weapon/card/id/syndicate/vox
name = "agent card"
initial_access = list(access_maint_tunnels, access_vox, access_external_airlocks)
/obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity)
if(!proximity)
return
@@ -408,7 +416,7 @@
blood_type = initial(blood_type)
dna_hash = initial(dna_hash)
fingerprint_hash = initial(fingerprint_hash)
access = initial(access)
access = initial_access.Copy() // Initial() doesn't work on lists
registered_user = null
user << "<span class='notice'>All information has been deleted from \the [src].</span>"
+1
View File
@@ -47,6 +47,7 @@
/obj/Destroy()
machines -= src
processing_objects -= src
nanomanager.close_uis(src)
return ..()
/obj/item/proc/is_used_on(obj/O, mob/user)