Trophy case hotfixes

2017-05-02 14:37:11 -05:00
parent a57190b9c5
commit ce302f4fe7
2 changed files with 21 additions and 0 deletions
@@ -0,0 +1,11 @@
+diff a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm	(rejected hunks)
+@@ -114,6 +114,9 @@ SUBSYSTEM_DEF(persistence)
+ 	var/saved_json
+ 	trophy_sav >> saved_json
+ 
+	if(!saved_json)
+		return
+
+ 	var/decoded_json = json_decode(saved_json)
+ 
+ 	if(!islist(decoded_json))
@@ -0,0 +1,10 @@
+diff a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm	(rejected hunks)
+@@ -316,7 +316,7 @@
+ 				to_chat(user, "You are too far to set the plaque's text.")
+ 
+ 		SSpersistence.SaveTrophy(src)
+-		return 1
+		return TRUE
+ 
+ 	else
+ 		to_chat(user, "<span class='warning'>\The [W] is stuck to your hand, you can't put it in the [src.name]!</span>")