mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 21:57:53 +01:00
Merge pull request #2270 from CHOMPStationBot/upstream-merge-10719
[MIRROR] [MIRROR] Linter diagnostics + bans non-var relative pathing
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
datum/preferences
|
||||
/datum/preferences
|
||||
var/biological_gender = MALE
|
||||
var/identifying_gender = MALE
|
||||
|
||||
datum/preferences/proc/set_biological_gender(var/gender)
|
||||
/datum/preferences/proc/set_biological_gender(var/gender)
|
||||
biological_gender = gender
|
||||
identifying_gender = gender
|
||||
|
||||
@@ -140,7 +140,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
|
||||
return TOPIC_REFRESH
|
||||
|
||||
else if(href_list["metadata"])
|
||||
var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, MAX_RECORD_LENGTH, extra = 0) //VOREStation Edit
|
||||
var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message|null, extra = 0) //VOREStation Edit
|
||||
if(new_metadata && CanUseTopic(user))
|
||||
pref.metadata = new_metadata
|
||||
return TOPIC_REFRESH
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
display_name = "trenchcoat, grey"
|
||||
path = /obj/item/clothing/suit/storage/trench/grey
|
||||
|
||||
datum/gear/suit/duster
|
||||
/datum/gear/suit/duster
|
||||
display_name = "cowboy duster"
|
||||
path = /obj/item/clothing/suit/storage/duster
|
||||
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
//used for pref.alternate_option
|
||||
#define GET_RANDOM_JOB 0
|
||||
#define BE_ASSISTANT 1
|
||||
#define RETURN_TO_LOBBY 2
|
||||
|
||||
/datum/category_item/player_setup_item/occupation
|
||||
name = "Occupation"
|
||||
sort_order = 1
|
||||
|
||||
Reference in New Issue
Block a user