Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-04 16:01:25 -07:00
parent 611fd7ea89 66638a39b7
commit 6a8a606f97
1118 changed files with 49543 additions and 11522 deletions
@@ -23,8 +23,8 @@
 // Returns special prefixes for the station name on certain days. You wind up with names like "Christmas Object Epsilon". See new_station_name()
 /datum/holiday/proc/getStationPrefix()
 	//get the first word of the Holiday and use that
-	var/i = findtext(name," ",1,0)
-	return copytext(name,1,i)
+	var/i = findtext(name," ")
+	return copytext(name, 1, i)

 // Return 1 if this holidy should be celebrated today
 /datum/holiday/proc/shouldCelebrate(dd, mm, yy, ww, ddd)