diff --git a/code/defines/obj/clothing/costume.dm b/code/defines/obj/clothing/costume.dm index 76c50714ed5..6667a7b5cbd 100644 --- a/code/defines/obj/clothing/costume.dm +++ b/code/defines/obj/clothing/costume.dm @@ -48,8 +48,8 @@ new /obj/item/clothing/gloves/white(src.loc) new /obj/item/clothing/shoes/white(src.loc) new /obj/item/clothing/under/scratch(src.loc) - if (prob(30)) - new /obj/item/clothing/head/helmet/cueball(src.loc) +// if (prob(30)) +// new /obj/item/clothing/head/helmet/cueball(src.loc) del(src) /obj/effect/landmark/costume/highlander/New() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index d7243176648..889e529e540 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -35,8 +35,6 @@ var/obj/item/weapon/disk/data/diskette = null //Mostly so the geneticist can steal everything. var/wantsscan = 1 var/wantspod = 1 - var/poddir = 8 //Which dir relative to the computer it is in. - var/scandir = 8 //The return of data disks?? Just for transferring between genetics machine/cloning machine. //TO-DO: Make the genetics machine accept them. @@ -105,7 +103,7 @@ //..() //world << "SEARCHING FOR SCANNER" var/obj/machinery/dna_scannernew/scannerf = null - for(dir in list(NORTH,EAST,SOUTH,WEST)) + for(dir in list(1,2,4,8,5,6,9,10)) //world << "SEARCHING IN [dir]" scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir)) if (!isnull(scannerf)) @@ -119,7 +117,7 @@ //..() //world << "SEARCHING FOR POD" var/obj/machinery/clonepod/podf = null - for(dir in list(NORTH,EAST,SOUTH,WEST)) + for(dir in list(1,2,4,8,5,6,9,10)) //world << "SEARCHING IN [dir]" podf = locate(/obj/machinery/clonepod, get_step(src, dir)) if (!isnull(podf)) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 1d7e047663b..7d487ed92a3 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ