Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

2021-11-12 08:50:23 +08:00
parent 4ec1f216ff 007d347d82
commit 8b16653744
100 changed files with 814 additions and 709 deletions
@@ -58,6 +58,7 @@
 	desc = "A wondrous decorated Christmas tree."
 	icon_state = "pine_c"
 	icon_states = null
+	resistance_flags = INDESTRUCTIBLE  //Sorry grinch, not this time

 /obj/structure/flora/tree/pine/xmas/presents
 	icon_state = "pinepresents"