Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds the Quebec flag #6133

Merged
merged 1 commit into from
Apr 13, 2024
Merged

Adds the Quebec flag #6133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions code/modules/client/country_flags.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,13 @@
var/page_content = http_response["CONTENT"]
if(page_content)
var/list/geodata = json_decode(html_decode(file2text(page_content)))
if(geodata["countryCode"] == "GB")
if((geodata["regionName"] == "Scotland") || (geodata["regionName"] == "Wales"))
origin?.country = geodata["regionName"]
return geodata["regionName"]
else
origin?.country = geodata["countryCode"]
return geodata["countryCode"]
if(geodata["countryCode"] == "GB" && ((geodata["regionName"] == "Scotland") || (geodata["regionName"] == "Wales")))
origin?.country = geodata["regionName"]
else if(geodata["countryCode"] == "CA" && (geodata["regionName"] == "Quebec"))
origin?.country = geodata["regionName"]
else
origin?.country = geodata["countryCode"]
return geodata["countryCode"]
return geodata["countryCode"]
else //null response, ratelimited most likely. Try again in 60s
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ip2country), ipaddr, origin), 60 SECONDS)

Expand Down
Binary file modified icons/flags.dmi
View file
Open in desktop
Binary file not shown.
Loading