diff --git a/baystation12.dme b/baystation12.dme index 86afe73e4db..d11073692a8 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1404,7 +1404,6 @@ #include "code\WorkInProgress\Aryn\Lighting\Engine.dm" #include "code\WorkInProgress\Aryn\Lighting\Light.dm" #include "code\WorkInProgress\Aryn\Lighting\Lightpoint.dm" -#include "code\WorkInProgress\Aryn\Lighting\Verbs.dm" #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\falsewall.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle.dm" diff --git a/code/WorkInProgress/Aryn/Lighting/Controller.dm b/code/WorkInProgress/Aryn/Lighting/Controller.dm index 912fde417c5..6220ebe3609 100644 --- a/code/WorkInProgress/Aryn/Lighting/Controller.dm +++ b/code/WorkInProgress/Aryn/Lighting/Controller.dm @@ -95,6 +95,5 @@ var/list/lit_z_levels = list(1,5) world << "Updated [turfs_updated] turfs." /datum/controller/lighting/proc/GetLightIcon(a,b,c,d) - if(a <= 1) return LIGHT_ICON_1 - else if(a <= 3) return LIGHT_ICON_2 - else return LIGHT_ICON_3 \ No newline at end of file + if(a <= 2) return LIGHT_ICON_1 + else return LIGHT_ICON_2 \ No newline at end of file diff --git a/code/WorkInProgress/Aryn/Lighting/_Defs.dm b/code/WorkInProgress/Aryn/Lighting/_Defs.dm index 5aa1fdb3962..72069a1afa8 100644 --- a/code/WorkInProgress/Aryn/Lighting/_Defs.dm +++ b/code/WorkInProgress/Aryn/Lighting/_Defs.dm @@ -1,7 +1,6 @@ -#define LIGHT_ICON_1 'icons/effects/lights/lighting1.dmi' -#define LIGHT_ICON_2 'icons/effects/lights/lighting2.dmi' -#define LIGHT_ICON_3 'icons/effects/lights/lighting3.dmi' -#define LIGHT_STATES 5 +#define LIGHT_ICON_1 'icons/effects/lights/lighting5-1.dmi' +#define LIGHT_ICON_2 'icons/effects/lights/lighting5-2.dmi' +#define LIGHT_STATES 4 #define SQ(X) ((X)*(X)) #define DISTSQ3(A,B,C) (SQ(A)+SQ(B)+SQ(C)) diff --git a/icons/effects/lights/lighting5-1.dmi b/icons/effects/lights/lighting5-1.dmi new file mode 100644 index 00000000000..3e8057a3d9c Binary files /dev/null and b/icons/effects/lights/lighting5-1.dmi differ diff --git a/icons/effects/lights/lighting5-2.dmi b/icons/effects/lights/lighting5-2.dmi new file mode 100644 index 00000000000..0f843d0d024 Binary files /dev/null and b/icons/effects/lights/lighting5-2.dmi differ