Merge branch 'staging' of github.com:NebulaSS13/Nebula into devupdate

NebulaSS13 · Jan 23, 2024 · 8cf2d19 · 8cf2d19
2 parents e7ab122 + bb56fc0
commit 8cf2d19
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 1 deletion.
diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm
@@ -37,7 +37,6 @@
 	desc = "A kit for modifying a voidsuit."
 	uses = 2
 
-
 /obj/item/clothing/head/helmet/space/void/attackby(var/obj/item/O, var/mob/user)
 
 	if(istype(O,/obj/item/kit/suit))

diff --git a/icons/clothing/head/hardhat/medic.dmi b/icons/clothing/head/hardhat/medic.dmi
diff --git a/icons/clothing/rigs/helmets/helmet_null.dmi b/icons/clothing/rigs/helmets/helmet_null.dmi
diff --git a/icons/obj/light_overlays.dmi b/icons/obj/light_overlays.dmi
diff --git a/mods/content/corporate/icons/rigs/asset_protection/helmet.dmi b/mods/content/corporate/icons/rigs/asset_protection/helmet.dmi
diff --git a/mods/content/corporate/icons/rigs/engineer/helmet.dmi b/mods/content/corporate/icons/rigs/engineer/helmet.dmi
diff --git a/mods/content/corporate/icons/rigs/janitor/helmet.dmi b/mods/content/corporate/icons/rigs/janitor/helmet.dmi
diff --git a/mods/content/corporate/icons/rigs/medic/helmet.dmi b/mods/content/corporate/icons/rigs/medic/helmet.dmi
diff --git a/mods/content/corporate/icons/rigs/security/helmet.dmi b/mods/content/corporate/icons/rigs/security/helmet.dmi