Merge branch 'main' of https://github.com/chosencharacters/Tankmas2024

chosencharacters · Dec 28, 2024 · 3bee64d · 3bee64d
2 parents 904758e + 352fd9b
commit 3bee64d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/Project.xml b/Project.xml
@@ -4,7 +4,7 @@
 
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="28.0.0" company="Glenside Helper Elf Society" />
+	<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="28.1.0" company="Glenside Helper Elf Society" />
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
 		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->

diff --git a/assets/data/entries/costume-sheets.json b/assets/data/entries/costume-sheets.json
@@ -434,7 +434,7 @@
                     "angle": 10
                 },
                 {
-                    "name": null,
+                    "name": "juby",
                     "angle": 10
                 },
                 {

diff --git a/assets/images/ui/sticker-menu/pets-tab.png b/assets/images/ui/sticker-menu/pets-tab.png
diff --git a/source/entities/Present.hx b/source/entities/Present.hx
@@ -66,7 +66,7 @@ class Present extends Interactable
 
 		comic = def.comicProperties != null ? true : false;
 
-		if (["dragonmiracles", "guri"].contains(username))
+		if (["dragonmiracles", "guri", "marbardan82"].contains(username))
 			comic = true;
 
 		openable = true;