Skip to content

Commit

Permalink
Adds the Quebec flag (#6133)
Browse files Browse the repository at this point in the history
# About the pull request

Adds the Quebec flag to the game, similar to the Scotland one.
This one actually is apparently fuckall nowhere so I had to find the
original source of the flags, download it, and make it myself -
https://github.com/gosquared/flags
And even then, it didn't turn out perfect, the fleur de lis' weren't all
showing up. I had to sorta blow them up for them to appear nice in OOC.

# Explain why it's good for the game

Basically the same reason as
#640
I do not consider myself to be a Canadian and would rather be able to
use my own country flag. This makes the game playable (for me)!

# Testing Photographs and Procedure

<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/53777086/7fcb386b-070a-4a50-a933-2a14ffe31dcb)

</details>


# Changelog

:cl:
imageadd: Added the Quebec flag to OOC for all Quebecois.
/:cl:
  • Loading branch information
JohnFulpWillard authored Apr 13, 2024
1 parent 4215415 commit 97a12de
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions code/modules/client/country_flags.dm
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
Binary file not shown.

0 comments on commit 97a12de

Please sign in to comment.