mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 12:37:26 +01:00
Merge pull request #404 from Uristqwerty/master
Three fixes for the Runtime Errors topic.
This commit is contained in:
@@ -217,7 +217,7 @@ datum
|
|||||||
base.processing = 0 //singletons at startup are technically unconnected anyway
|
base.processing = 0 //singletons at startup are technically unconnected anyway
|
||||||
base.parent = null
|
base.parent = null
|
||||||
|
|
||||||
if(base.air.check_tile_graphic())
|
if(base.air && base.air.check_tile_graphic())
|
||||||
base.update_visuals(base.air)
|
base.update_visuals(base.air)
|
||||||
|
|
||||||
return null
|
return null
|
||||||
|
|||||||
@@ -214,11 +214,11 @@
|
|||||||
camera_sort(L)
|
camera_sort(L)
|
||||||
|
|
||||||
var/list/D = list()
|
var/list/D = list()
|
||||||
D["Cancel"] = "Cancel"
|
|
||||||
for (var/obj/machinery/camera/C in L)
|
for (var/obj/machinery/camera/C in L)
|
||||||
if ( C.network in src.networks )
|
if ( C.network in src.networks )
|
||||||
D[text("[]: [][]", C.network, C.c_tag, (C.status ? null : " (Deactivated)"))] = C
|
D[text("[]: [][]", C.network, C.c_tag, (C.status ? null : " (Deactivated)"))] = C
|
||||||
D = camera_network_sort(D)
|
D = camera_network_sort(D)
|
||||||
|
D["Cancel"] = "Cancel"
|
||||||
|
|
||||||
var/t = input(user, "Which camera should you change to?") as null|anything in D
|
var/t = input(user, "Which camera should you change to?") as null|anything in D
|
||||||
|
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ MASS SPECTROMETER
|
|||||||
src.amount--
|
src.amount--
|
||||||
var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user.loc )
|
var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user.loc )
|
||||||
F.amount = 1
|
F.amount = 1
|
||||||
F.fingerprints = md5(M.dna.uni_identity)
|
F.fingerprints += md5(M.dna.uni_identity)
|
||||||
F.icon_state = "fingerprint1"
|
F.icon_state = "fingerprint1"
|
||||||
F.name = text("FPrintC- '[M.name]'")
|
F.name = text("FPrintC- '[M.name]'")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user