Merge branch 'master' into updates_the_nbt

# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm
This commit is contained in:
alberyk
2022-02-19 10:26:35 -03:00
149 changed files with 2287 additions and 581 deletions

View File

@@ -446,7 +446,7 @@
anchored = TRUE
/obj/item/stack/flag/red/planted/Initialize()
..()
. = ..()
base_state = "redflag"
set_light(2)