Christmas in July (#10811)

* Christmas in Summer Time

* Bar Christmas Tree

* Mapmerge Fix?

* What is going on with the Surface file

* Merge fix?

* present tweaks

* Final tweaks

* updated cl

Co-authored-by: Ferner <nikferni@gmail.com>
This commit is contained in:
Joshie
2020-12-17 16:25:15 +01:00
committed by GitHub
co-authored by Ferner
parent 4ab95c5f3d
commit 716b98c074
13 changed files with 101179 additions and 91804 deletions
@@ -197,6 +197,6 @@
new /obj/item/xmasgift/large(get_turf(src))
else
new /obj/item/xmasgift/small(get_turf(src))
new /obj/item/xmasgift(get_turf(src))
qdel(src)