diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 0219718996b..1505a7aaac7 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -123,13 +123,13 @@
       enum.HolidayVisuals.Holiday:
         base:
           festive:
-            sprite: Objects/Misc/Lights/lamp.rsi
             state: christmaslamp
         light:
           festive:
-            sprite: Objects/Misc/Lights/lamp.rsi
             state: christmaslamp-on
-  - type: Rotatable # Corvax-Resprite
+  - type: Rotatable # Corvax-Resprite-start
+  - type: PointLight
+    color: "#F0FFA0FF" # Corvax-Resprite-end
 
 - type: entity
   name: interrogator lamp
@@ -184,6 +184,7 @@
         enum.FlashVisuals.LightLayer:
           True: {visible: true}
           False: {visible: false}
+  - type: Rotatable # Corvax-Resprite
 
 - type: entity
   name: floodlight
diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp-on.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp-on.png
index df2434f83de..a33f5d0e9cd 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp-on.png and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp-on.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp.png
index c461a429fda..da880c76cf0 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp.png and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
index 2f26fd28799..2ce16355403 100644
--- a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046, christmaslamp by Alekshhh (Github)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional and christmas sprites by SonicHDC",
   "size": {
     "x": 32,
     "y": 32
@@ -12,10 +12,12 @@
 		"directions": 4
     },
     {
-      "name": "christmaslamp"
+      "name": "christmaslamp",
+      "directions": 4
     },
     {
-      "name": "christmaslamp-on"
+      "name": "christmaslamp-on",
+      "directions": 4
     },
     {
         "name": "lamp-on",
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp-on.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp-on.png
new file mode 100644
index 00000000000..a8c4afcab1e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp-on.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp.png
new file mode 100644
index 00000000000..3e88f566a1d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
index 9ddddd542cc..460dfe311b6 100644
--- a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional and christmas sprites by SonicHDC",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
         "name": "lampgreen",
 		"directions": 4
+    },
+	{
+      "name": "christmaslamp",
+      "directions": 4
+    },
+    {
+      "name": "christmaslamp-on",
+      "directions": 4
     },
     {
         "name": "lampgreen-on",
diff --git a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/burnt.png b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/burnt.png
index 8814243e0f0..2da23ef1c56 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/burnt.png and b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/burnt.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/flashing.png b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/flashing.png
index 8a81d1a2806..36c8b14ad6e 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/flashing.png and b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/flashing.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int-on.png b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int-on.png
index 6182bc21373..980d0c280b1 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int-on.png and b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int-on.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int.png b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int.png
index c7be36ac95f..59a435608b8 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int.png and b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/meta.json
index 664d3467bf0..08330c09728 100644
--- a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/meta.json
@@ -1,30 +1,49 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "copyright": "Created by SonicHDC from lamp tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "lamp-int"
+      "name": "lamp-int",
+      "directions": 4
     },
     {
-      "name": "lamp-int-on"
+      "name": "lamp-int-on",
+      "directions": 4
     },
     {
       "name": "flashing",
+      "directions": 4,
       "delays": [
         [
           0.1,
+          0.2,
+          0.2
+        ],
+        [
+          0.1,
+          0.2,
+          0.2
+        ],
+        [
+          0.1,
+          0.2,
+          0.2
+        ],
+        [
           0.1,
-          0.3
+          0.2,
+          0.2
         ]
       ]
     },
     {
-      "name": "burnt"
+      "name": "burnt",
+      "directions": 4
     },
     {
       "name": "off-inhand-left",