fixes merge conflict

This commit is contained in:
Kyep
2020-09-15 10:49:27 -07:00
796 changed files with 24009 additions and 10669 deletions
+1
View File
@@ -7,6 +7,7 @@
icon_state = "ticketmachine"
desc = "A marvel of bureaucratic engineering encased in an efficient plastic shell. It can be refilled with a hand labeler refill roll and linked to buttons with a multitool."
density = FALSE
anchored = TRUE
maptext_height = 26
maptext_width = 32
maptext_x = 7