Рефактор кода режимов

code/__DEFINES/DNA.dm

@@ -10,3 +10,39 @@
 #define TR_DEFAULTMSG   (1<<5)
 #define TR_KEEPSTUNS    (1<<6)
 #define TR_KEEPREAGENTS (1<<7)
+
+// What each index means:
+#define DNA_OFF_LOWERBOUND 0
+#define DNA_OFF_UPPERBOUND 1
+#define DNA_ON_LOWERBOUND  2
+#define DNA_ON_UPPERBOUND  3
+
+// Define block bounds (off-low,off-high,on-low,on-high)
+// Used in setupgame.dm
+#define DNA_DEFAULT_BOUNDS list(1,2049,2050,4095) //2050 = 8 0 2 #Z2(Added some comments)
+#define DNA_HARDER_BOUNDS  list(1,3049,3050,4095) //3050 = B E A
+#define DNA_HARD_BOUNDS    list(1,3490,3500,4095) //3500 = D A C ##Z2
+
+// UI Indices (can change to mutblock style, if desired)
+#define DNA_UI_HAIR_R      1
+#define DNA_UI_HAIR_G      2
+#define DNA_UI_HAIR_B      3
+#define DNA_UI_BEARD_R     4
+#define DNA_UI_BEARD_G     5
+#define DNA_UI_BEARD_B     6
+#define DNA_UI_SKIN_TONE   7
+#define DNA_UI_SKIN_R      8
+#define DNA_UI_SKIN_G      9
+#define DNA_UI_SKIN_B      10
+#define DNA_UI_EYES_R      11
+#define DNA_UI_EYES_G      12
+#define DNA_UI_EYES_B      13
+#define DNA_UI_GENDER      14
+#define DNA_UI_BEARD_STYLE 15
+#define DNA_UI_HAIR_STYLE  16
+#define DNA_UI_LENGTH      16 // Update this when you add something, or you WILL break shit.
+
+#define DNA_SE_LENGTH 27
+#define DNA_UNIQUE_ENZYMES_LEN 32
+// For later:
+//#define DNA_SE_LENGTH 50 // Was STRUCDNASIZE, size 27. 15 new blocks added = 42, plus room to grow.

code/__DEFINES/dcs/signals.dm

@@ -42,6 +42,16 @@
 /// from base of religion/add_membern(): (/mob, holy_role)
 #define COMSIG_REL_ADD_MEMBER "rite_on_chosen"
 
+// /datum/role signals
+/// from base of role/GetScoreboard(): ()
+#define COMSIG_ROLE_GETSCOREBOARD "role_getscoreboard"
+/// from base of role/extraPanelButtons(): ()
+#define COMSIG_ROLE_PANELBUTTONS "role_panelbuttons"
+/// from base of role/RoleTopic(): (href, href_list, datum/mind/M, admin_auth)
+#define COMSIG_ROLE_ROLETOPIC "role_roletopic"
+/// from base of role/OnPostSetup(): (laterole)
+#define COMSIG_ROLE_POSTSETUP "role_postsetup"
+
 // light related signals
 /// from base of /atom/movable/lighting_object/update(): (turf/my_turf)
 #define COMSIG_LIGHT_UPDATE_OBJECT "light_update_object"

code/__DEFINES/gamemodes.dm

@@ -0,0 +1,80 @@
+////////////////////// ID /////////////////////////
+
+// Faction IDs
+#define F_ABDUCTORS          "Abductor Team"
+#define F_BLOODCULT          "Cult Of Blood"
+#define F_BLOBCONGLOMERATE   "Blob Conglomerate"
+#define F_BORER_HIVEMIND     "Borer Hivemind"
+#define F_CUSTOMSQUAD        "Custom Squad"
+#define F_DEATHSQUAD         "Nanotrasen Deathsquad"
+#define F_EMERSQUAD          "Emergency Response Team"
+#define F_HEIST              "Vox Shoal"
+#define F_HIVEMIND           "Changeling Hivemind"
+#define F_REVOLUTION         "Revolution"
+#define F_SYNDIOPS           "Syndicate Operatives"
+#define F_SYNDIESQUAD        "Syndicate Elite Strike Team"
+#define F_SHADOWLINGS        "Shadowlings"
+#define F_SPIDERCLAN         "Spider Clan"
+#define F_WIZFEDERATION      "Wizard Federation"
+#define F_XENOMORPH_HIVE     "Alien Hivemind"
+#define F_ZOMBIES            "Zobmies"
+
+// Role IDs
+#define ABDUCTOR_AGENT "Abductor Agent"
+#define ABDUCTOR_SCI "Abductor Scientist"
+#define ABDUCTED "Abducted"
+#define BORER "Cortical Borer"
+#define BLOBOVERMIND "Blob Overmind"
+#define BLOBCEREBRATE "Blob Cerebrate"
+#define CHANGELING "Changeling"
+#define CULTIST "Cultist"
+#define CULT_LEADER "Cult Leader"
+#define DEATHSQUADIE "Death Commando"
+#define HEADREV "Head Revolutionary"
+#define MALF "Malf AI"
+#define MALFBOT "Malf-Slaved Cyborg"
+#define NUKE_OP "Nuclear Operative"
+#define NUKE_OP_LEADER "Nuclear Operative Leader"
+#define NINJA "Space Ninja"
+#define REV "Revolutionary"
+#define RESPONDER "Emergency Responder"
+#define SHADOW "Shadowling"
+#define SHADOW_THRALL "Thrall"
+#define SYNDIESQUADIE "Syndicate Commando"
+#define TRAITOR "Traitor"
+#define TRAITORCHAN "TraitorChan"
+#define VOXRAIDER "Vox Raider"
+#define WIZARD "Wizard"
+#define WIZ_APPRENTICE "Wizard Apprentice"
+#define XENOMORPH "Xenomorph"
+
+////////////////////// GREETS /////////////////////////
+#define GREET_DEFAULT		"default"
+#define GREET_ROUNDSTART	"roundstart"
+#define GREET_LATEJOIN		"latejoin"
+#define GREET_CUSTOM		"custom"
+
+#define GREET_AUTOTATOR		"autotator"
+#define GREET_SYNDBEACON	"syndbeacon"
+
+///////////////// FACTION STAGES //////////////////////
+#define FS_DEFEATED    -1
+#define FS_DORMANT      0
+#define FS_ACTIVE       1
+#define FS_ENDGAME      2
+#define FS_VICTORY      3
+
+/////////////////////// OTHERS ////////////////////////
+
+// -- Objectives flags
+
+#define FROM_GHOSTS 1
+#define FROM_PLAYERS 2
+
+// -- The paper
+
+#define INTERCEPT_TIME_LOW 1 MINUTE
+#define INTERCEPT_TIME_HIGH 3 MINUTE
+
+#define ABDUCTOR_SCALING_COEFF 15 //how many players per abductor team
+#define MAX_ABDUCTOR_TEAMS 4

code/__DEFINES/genetics.dm

@@ -13,30 +13,6 @@
 #define NOCLONE			7
 #define LASEREYES		8 	// harm intent - click anywhere to shoot lasers from eyes
 
-	// Extra powers:
-//#define SHADOW			11 	// shadow teleportation (create in/out portals anywhere) (25%)
-//#define SCREAM			12 	// supersonic screaming (25%)
-//#define EXPLOSIVE		13 	// exploding on-demand (15%)
-//#define REGENERATION	14 	// superhuman regeneration (30%)
-//#define REPROCESSOR		15 	// eat anything (50%)
-//#define SHAPESHIFTING	16 	// take on the appearance of anything (40%)
-//#define PHASING			17 	// ability to phase through walls (40%)
-//#define SHIELD			18 	// shielding from all projectile attacks (30%)
-//#define SHOCKWAVE		19 	// attack a nearby tile and cause a massive shockwave, knocking most people on their asses (25%)
-//#define ELECTRICITY		20 	// ability to shoot electric attacks (15%)
-//bitflags for mutations
-	// Extra powers:
-#define SHADOW			(1<<10)	// shadow teleportation (create in/out portals anywhere) (25%)
-#define SCREAM			(1<<11)	// supersonic screaming (25%)
-#define EXPLOSIVE		(1<<12)	// exploding on-demand (15%)
-#define REGENERATION	(1<<13)	// superhuman regeneration (30%)
-#define REPROCESSOR		(1<<14)	// eat anything (50%)
-#define SHAPESHIFTING	(1<<15)	// take on the appearance of anything (40%)
-#define PHASING			(1<<16)	// ability to phase through walls (40%)
-#define SHIELD			(1<<17)	// shielding from all projectile attacks (30%)
-#define SHOCKWAVE		(1<<18)	// attack a nearby tile and cause a massive shockwave, knocking most people on their asses (25%)
-#define ELECTRICITY		(1<<19)	// ability to shoot electric attacks (15%)
-
 // Other Mutations:
 #define NO_BREATH		100 	// no need to breathe
 #define REMOTE_VIEW		101 	// remote viewing

code/__DEFINES/is_helpers.dm

@@ -126,6 +126,54 @@
 
 #define isitem(A) (istype(A, /obj/item))
 
+// ROLES / ANTAG
+
+#define isfaction(A) (istype(A, /datum/faction))
+
+#define isrole(type, H) (H?.mind ? H.mind.GetRole(type) : FALSE)
+
+#define isanyantag(H) (H?.mind && H.mind.antag_roles.len)
+
+#define isabductorsci(H) (H?.mind ? H.mind.GetRole(ABDUCTOR_SCI) : FALSE)
+
+#define isabductoragent(H) (H?.mind ? H.mind.GetRole(ABDUCTOR_AGENT) : FALSE)
+
+#define isshadowling(H) (H?.mind ? H.mind.GetRole(SHADOW) : FALSE)
+
+#define isshadowthrall(H) (H?.mind ? H.mind.GetRole(SHADOW_THRALL) : FALSE)
+
+#define iscultist(mob) (mob && global.cult_religion?.is_member(mob))
+
+#define isvoxraider(H) (H?.mind ? H.mind.GetRole(VOXRAIDER) : FALSE)
+
+#define ischangeling(H) (H?.mind ? H.mind.GetRoleByType(/datum/role/changeling) : FALSE)
+
+#define isanyrev(H) (isrevnothead(H) || isrevhead(H))
+
+#define isrev(H) (H?.mind ? H.mind.GetRole(REV) : FALSE)
+
+#define isrevhead(H) (H?.mind ? H.mind.GetRole(HEADREV) : FALSE)
+
+#define istraitor(H) (H?.mind ? H.mind.GetRole(TRAITOR) : FALSE)
+
+#define iselitesyndie(H) (H?.mind ? H.mind.GetRole(SYNDIESQUADIE) : FALSE)
+
+#define ismalf(H) (H?.mind ? H.mind.GetRole(MALF) : FALSE)
+
+#define isnukeop(H) (H?.mind ? H.mind.GetRole(NUKE_OP) : FALSE)
+
+#define iswizard(H) (H?.mind ? H.mind.GetRole(WIZARD) : FALSE)
+
+#define isdeathsquad(H) (H?.mind ? H.mind.GetRole(DEATHSQUADIE) : FALSE)
+
+#define isninja(H) (H?.mind ? H.mind.GetRole(NINJA) : FALSE)
+
+#define isERT(H) (H?.mind ? H.mind.GetRole(RESPONDER) : FALSE)
+
+#define isrolezombie(H) (H?.mind ? H.mind.GetRole(ZOMBIE) : FALSE)
+
+#define isalien(H) (H?.mind ? H.mind.GetRole(XENOMORPH) : FALSE)
+
 // BLOB
 
 #define isblob(A) istype(A, /obj/effect/blob)

code/__DEFINES/role_preferences.dm

@@ -23,6 +23,21 @@
 #define ROLE_ERT               "Emergency Response Team"
 #define ROLE_DRONE             "Maintenance Drone"
 
+var/global/list/antag_roles = list(
+	ROLE_TRAITOR,
+	ROLE_OPERATIVE,
+	ROLE_CHANGELING,
+	ROLE_WIZARD,
+	ROLE_MALF,
+	ROLE_REV,
+	ROLE_ALIEN,
+	ROLE_CULTIST,
+	ROLE_BLOB,
+	ROLE_NINJA,
+	ROLE_RAIDER,
+	ROLE_SHADOWLING,
+	ROLE_ABDUCTOR,
+)
 
 var/global/list/special_roles = list(
 	ROLE_TRAITOR,

code/__HELPERS/_lists.dm

@@ -136,7 +136,7 @@
 
 	total = rand(1, total)
 	for (item in L)
-		total -=L [item]
+		total -= L[item]
 		if (total <= 0)
 			return item
 

code/__HELPERS/game.dm

@@ -652,7 +652,7 @@
 
 // first answer "Yes" > transfer
 /mob/proc/try_request_n_transfer(mob/M, Question = "Would you like to be a special role?", be_special_type, Ignore_Role, show_warnings = FALSE)
-	if(key || mind || stat != CONSCIOUS)
+	if(key || mind || stat != CONSCIOUS || !M.client)
 		return
 
 	if(Ignore_Role && M.client.prefs.ignore_question.Find(IGNORE_BORER))

code/__HELPERS/logging.dm

@@ -2,7 +2,7 @@
 // will get logs that are one big line if the system is Linux and they are using notepad.  This solves it by adding CR to every line ending
 // in the logs.  ascii character 13 = CR
 
-/var/global/log_end= world.system_type == UNIX ? ascii2text(13) : ""
+/var/global/log_end = world.system_type == UNIX ? ascii2text(13) : ""
 
 //print an error message to world.log
 #define ERROR(MSG) error("[MSG] in [__FILE__] at line [__LINE__] src: [src] usr: [usr].")
@@ -23,7 +23,7 @@
 
 /proc/round_log(msg)
 	world.log << "\[[time_stamp()]][global.round_id ? "Round #[global.round_id]:" : ""] [msg][log_end]"
-	game_log << "\[[time_stamp()]][global.round_id ? "Round #[global.round_id]:" : ""] [msg][log_end]"
+	global.game_log << "\[[time_stamp()]][global.round_id ? "Round #[global.round_id]:" : ""] [msg][log_end]"
 
 /proc/log_href(text, say_type)
 	if (config && config.log_hrefs)
@@ -69,6 +69,10 @@
 	if (config.log_game)
 		global.game_log << "\[[time_stamp()]]GAME: [text][log_end]"
 
+/proc/log_mode(text)
+	if (config.log_game)
+		global.game_log << "\[[time_stamp()]]MODE: [text][log_end]"
+
 /proc/log_vote(text)
 	if (config.log_vote)
 		global.game_log << "\[[time_stamp()]]VOTE: [text][log_end]"
@@ -224,12 +228,14 @@
 		temprole = Mind.special_role
 		objectives = ""
 		if(temprole)							//if they are an antagonist of some sort.
-			if(Mind.objectives.len)
-				for(var/datum/objective/O in Mind.objectives)
-					if(length(objectives))
-						objectives += " | "
-					objectives += "[O.explanation_text]"
-				objectives = " \[[objectives]\]"
+			for(var/role in Mind.antag_roles)
+				var/datum/role/R = Mind.antag_roles[role]
+				if(R.objectives.objectives.len)
+					for(var/datum/objective/O in R.objectives.GetObjectives())
+						if(length(objectives))
+							objectives += " | "
+						objectives += "[O.explanation_text]"
+					objectives = " \[[objectives]\]"
 
 			if(temprole in total_antagonists)	//If the role exists already, add the name to it
 				total_antagonists[temprole] += "\n, [Mind.name]([Mind.key])[objectives]"
@@ -254,11 +260,11 @@
 	stats["end_time"] = time2text(world.realtime, "hh:mm:ss")
 	stats["duration"] = roundduration2text()
 	stats["mode"] = SSticker.mode
-	stats["mode_result"] = SSticker.mode.mode_result
+	stats["mode_result"] = SSticker.mode.get_mode_result()
 	stats["map"] = SSmapping.config.map_name
 
-	stats["completion_html"] = SSticker.mode.completion_text
-	stats["completion_antagonists"] = antagonists_completion//todo: icon2base64 icons?
+	stats["completion_html"] = SSticker.mode.completition_text
+	stats["completion_antagonists"] = antagonists_completion
 
 	stats["score"] = score
 	stats["achievements"] = achievements

code/__HELPERS/names.dm

@@ -153,24 +153,6 @@ var/syndicate_name = null
 	syndicate_name = name
 	return name
 
-var/gang_name_pool = list("Clandestine", "Prima", "Zero-G", "Max", "Blasto", "Waffle", "North", "Omni", "Newton", "Cyber", "Donk", "Gene", "Gib", "Tunnel", "Diablo", "Psyke", "Osiron")
-var/gang_A_name = null
-var/gang_B_name = null
-/proc/gang_name(gang)
-	if(!gang_A_name || !gang_B_name)
-		gang_A_name = pick(gang_name_pool)
-		gang_name_pool -= gang_A_name
-		gang_B_name = pick(gang_name_pool)
-		gang_name_pool -= gang_B_name
-
-	if(gang == "A")
-		if(gang_A_name)
-			return gang_A_name
-	if(gang == "B")
-		if(gang_B_name)
-			return gang_B_name
-
-
 //Traitors and traitor silicons will get these. Revs will not.
 var/global/list/syndicate_code_phrase = list() //Code phrase for traitors.
 var/global/list/syndicate_code_response = list() //Code response for traitors.
@@ -247,10 +229,22 @@ var/global/regex/code_response_highlight_rule
 	return
 
 /proc/highlight_traitor_codewords(message, datum/mind/traitor_mind)
-	if(!traitor_mind || !traitor_mind.syndicate_awareness)
+	if(!traitor_mind)
+		return message
+
+	var/awareness = 0
+	for(var/role in traitor_mind.antag_roles)
+		var/datum/role/R = traitor_mind.antag_roles[role]
+		var/datum/component/gamemode/syndicate/S = R.GetComponent(/datum/component/gamemode/syndicate)
+		if(!S)
+			continue
+		if(S.syndicate_awareness > awareness)
+			awareness = S.syndicate_awareness
+
+	if(!awareness)
 		return message
 
-	switch(traitor_mind.syndicate_awareness)
+	switch(awareness)
 		if(SYNDICATE_AWARE)
 			message = highlight_codewords(message, global.code_phrase_highlight_rule) // Same can be done with code_response or any other list of words, using regex created by generate_code_regex(). You can also add the name of CSS class as argument to change highlight style.
 			message = highlight_codewords(message, global.code_response_highlight_rule, "deptradio")

code/_globalvars/game_modes.dm

@@ -1,6 +1,5 @@
-var/master_mode = "extended"//"extended"
-var/secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode
+var/master_mode = "extended" //"extended"
+var/secret_force_mode = "Secret" // if this is anything but "Secret", the secret rotation will forceably choose this mode
 
 var/wavesecret = 0
-var/datum/station_state/start_state = null
 var/master_last_mode = null // this variable contain the last played mode from previous round