Merges #4679 , #4670 , and #4677

2018-01-07 15:29:15 -05:00
parent a2b4ffccdf
commit 3e937fcecf
11 changed files with 131 additions and 124 deletions
@@ -26,7 +26,7 @@

 /obj/item/drone_shell/proc/build_seasonal_hats()
 	possible_seasonal_hats = list()
-	if(!SSevents.holidays.len)
+	if(!length(SSevents.holidays))
 		return //no holidays, no hats; we'll keep the empty list so we never call this proc again
 	for(var/V in SSevents.holidays)
 		var/datum/holiday/holiday = SSevents.holidays[V]
@@ -59,4 +59,4 @@
 		D.equip_to_slot_or_del(new_hat, slot_head)
 	D.admin_spawned = admin_spawned
 	D.key = user.key
-	qdel(src)
+	qdel(src)