July 5th TG sync (#1883)

July 5th TG sync

code/game/objects/items/weapons/charter.dm

@@ -16,22 +16,16 @@
 
 	var/static/regex/standard_station_regex
 
-/obj/item/weapon/station_charter/New()
+/obj/item/weapon/station_charter/Initialize()
 	. = ..()
 	if(!standard_station_regex)
 		var/prefixes = jointext(GLOB.station_prefixes, "|")
 		var/names = jointext(GLOB.station_names, "|")
 		var/suffixes = jointext(GLOB.station_suffixes, "|")
 		var/numerals = jointext(GLOB.station_numerals, "|")
-		var/regexstr = "(([prefixes]) )?(([names]) ?)([suffixes]) ([numerals])"
+		var/regexstr = "^(([prefixes]) )?(([names]) ?)([suffixes]) ([numerals])$"
 		standard_station_regex = new(regexstr)
 
-/obj/item/weapon/station_charter/Destroy()
-	if(response_timer_id)
-		deltimer(response_timer_id)
-	response_timer_id = null
-	. = ..()
-
 /obj/item/weapon/station_charter/attack_self(mob/living/user)
 	if(used)
 		to_chat(user, "The [name_type] has already been named.")
@@ -48,6 +42,10 @@
 		rejected by your employers, while names using the standard format, \
 		will automatically be accepted.", max_length=MAX_CHARTER_LEN)
 
+	if(response_timer_id)
+		to_chat(user, "You're still waiting for approval from your employers about your proposed name change, it'd be best to wait for now.")
+		return
+		
 	if(!new_name)
 		return
 	log_game("[key_name(user)] has proposed to name the station as \