Merge branch 'master' into upstream-merge-13267

This commit is contained in:
Razgriz
2022-07-03 17:22:19 -07:00
committed by GitHub
110 changed files with 977 additions and 288 deletions
+2 -2
View File
@@ -46,7 +46,7 @@
/obj/item/weapon/light/bulb/large
brightness_range = 6
brightness_power = 1
nightshift_range = 6
nightshift_power = 0.45
@@ -208,4 +208,4 @@
icon_state = "big_flamp-construct-stage2"
if(3)
icon_state = "big_flamp-empty"
*/
*/