Merge branch 'master' into Arokha/lights2

This commit is contained in:
Aronai Sieyes
2021-06-17 09:27:04 -04:00
committed by GitHub
47 changed files with 178184 additions and 29 deletions
@@ -25,4 +25,14 @@
/obj/effect/map_effect/perma_light/concentrated/incandescent
name = "permanent light (concentrated incandescent)"
light_color = LIGHT_COLOR_INCANDESCENT_TUBE
light_color = LIGHT_COLOR_INCANDESCENT_TUBE
// VOREStation Addition Start
/obj/effect/map_effect/perma_light/gateway
name = "permanent light (gateway)"
icon_state = "permalight"
light_range = 10
light_power = 5
light_color = "#b6cdff"
// VOREStation Addition End
File diff suppressed because it is too large Load Diff