łorops rikłajed (#271)

aquila/aquila.dm

@@ -13,6 +13,7 @@
 #include "code\__DEFINES\antagonists.dm"
 #include "code\__DEFINES\is_helpers.dm"
 #include "code\__HELPERS\names.dm"
+#include "code\__HELPERS\pronouns.dm"
 #include "code\_onclick\hud\alert.dm"
 #include "code\controllers\configuration\entries\game_options.dm"
 #include "code\controllers\configuration\entries\general.dm"

aquila/code/__HELPERS/pronouns.dm

@@ -0,0 +1,30 @@
+// z góry przepraszam, nie umiem into gramatyka bardziej niż na czuja -huusk
+
+/mob/proc/p_jego(capitalized, temp_gender)
+	if(!temp_gender)
+		temp_gender = gender
+	. = "jego"
+	switch(temp_gender)
+		if(FEMALE)
+			. = "jej"
+		if(MALE)
+			. = "jego"
+		if(PLURAL)
+			. = "ich"
+	if(capitalized)
+		. = capitalize(.)
+
+/mob/proc/p_je(capitalized, temp_gender)
+	if(!temp_gender)
+		temp_gender = gender
+	. = "je"
+	switch(temp_gender)
+		if(FEMALE)
+			. = "ją"
+		if(MALE)
+			. = "go"
+		if(PLURAL)
+			. = "ich"
+	if(capitalized)
+		. = capitalize(.)
+

code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm

@@ -1,4 +1,4 @@
-#define CHALLENGE_TELECRYSTALS 280
+#define CHALLENGE_TELECRYSTALS (80 + LERP(0, 200, CLAMP01((GLOB.player_list.len-20)/20))) // AQ EDIT - min of 80 + more depending on player count, like 20 per player above 20 up to 280 at 40 players
 #define CHALLENGE_TIME_LIMIT 5 MINUTES
 #define CHALLENGE_MIN_PLAYERS 50
 #define CHALLENGE_SHUTTLE_DELAY 35 MINUTES	//35 minutes, giving nukies at least 20 minutes to enact their assault.
@@ -21,28 +21,28 @@
 		return
 
 	declaring_war = TRUE
-	var/are_you_sure = tgui_alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew? [check_pop()? "" : "You will not be provided with any additional equipment given the small size of the crew. "]You have [DisplayTimeText(CHALLENGE_TIME_LIMIT - world.time + SSticker.round_start_time)] to decide", "Declare war?", list("Yes", "No"))
+	var/are_you_sure = tgui_alert(user, "Skonsultuj się ze swoją drużyną zanim zadeklarujecie wojnę na [station_name()]. [check_pop()? "" : "Ze względu na wielkość załogi nie dostaniecie dotatkowego ekwipunku. "]", "Declare war?", "Yes", "No")
 	declaring_war = FALSE
 
 	if(!check_allowed(user))
 		return
 
 	if(are_you_sure != "Yes")
-		to_chat(user, "On second thought, the element of surprise isn't so bad after all.")
+		//to_chat(user, "On second thought, the element of surprise isn't so bad after all.")
 		return
 
-	var/war_declaration = "[user.real_name] has declared [user.p_their()] intent to utterly destroy [station_name()] with a nuclear device, and dares the crew to try and stop [user.p_them()]."
+	var/war_declaration = "[user.real_name] zadeklarowa[user.gender == MALE ? "ł" : "ła"] [user.p_jego()] zamiar całkowitego zniszczenia [station_name()] przy użyciu ładunku nuklearnego, oraz rzuca wyzwanie załodze, aby spróbować [user.p_je()] powstrzymać."
 
 	declaring_war = TRUE
-	var/custom_threat = alert(user, "Do you want to customize your declaration?", "Customize?", "Yes", "No")
+	var/custom_threat = alert(user, "Czy chcesz zmienić tekst deklaracji?", "Customize?", "Yes", "No")
 	declaring_war = FALSE
 
 	if(!check_allowed(user))
 		return
 
 	if(custom_threat == "Yes")
 		declaring_war = TRUE
-		war_declaration = stripped_input(user, "Insert your custom declaration", "Declaration")
+		war_declaration = stripped_input(user, "Podaj nowy tekst deklaracji", "Declaration")
 		declaring_war = FALSE
 
 	if(!check_allowed(user) || !war_declaration)
@@ -51,7 +51,7 @@
 	declare_war(user, war_declaration)
 
 /obj/item/nuclear_challenge/proc/declare_war(mob/user, war_declaration)
-	priority_announce(war_declaration, "Declaration of War", 'sound/machines/alarm.ogg',  has_important_message = TRUE)
+	priority_announce(war_declaration, "Deklaracja Wojny", 'sound/machines/alarm.ogg',  has_important_message = TRUE)
 
 	play_soundtrack_music(/datum/soundtrack_song/bee/future_perception)
 
@@ -111,19 +111,21 @@
 
 /obj/item/nuclear_challenge/proc/check_allowed(mob/living/user)
 	if(declaring_war)
-		to_chat(user, "You are already in the process of declaring war! Make your mind up.")
+		to_chat(user, "Jesteś w trakcie deklarowania wojny! Zdecyduj się.")
 		return FALSE
-
 	if(!user.onSyndieBase())
-		to_chat(user, "You have to be at your base to use this.")
+		to_chat(user, "Musisz być w twojej bazie by tego użyć.")
 		return FALSE
+	/* AQ EDIT - at any time, any day. Well, they can't
+	// go station-side until they declare war, so...
 	if(world.time-SSticker.round_start_time > CHALLENGE_TIME_LIMIT)
 		to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.")
 		return FALSE
+	*/
 	for(var/V in GLOB.syndicate_shuttle_boards)
 		var/obj/item/circuitboard/computer/syndicate_shuttle/board = V
 		if(board.moved)
-			to_chat(user, "The shuttle has already been moved! You have forfeit the right to declare war.")
+			to_chat(user, "Infiltrator się przemieścił! Straciłeś prawo do deklaracji wojny.")
 			return FALSE
 	return TRUE
 

code/modules/shuttle/syndicate.dm

@@ -18,13 +18,19 @@
 	request_shuttle_message = "Recall Infiltrator"
 	recall_docking_port_id = "syndicate_away"
 
-/obj/machinery/computer/shuttle_flight/syndicate/ui_act(action, params)
+///obj/machinery/computer/shuttle_flight/syndicate/ui_act(action, params)
+/obj/machinery/computer/shuttle_flight/syndicate/Topic(href, href_list) // change to topic; no clue what supercruise is
 	if(!usr.canUseTopic(src))
 		return
+	// AQ EDIT START - moving the computer *requires* a war declaration
 	var/obj/item/circuitboard/computer/syndicate_shuttle/board = circuit
+	if(!board.challenge) // && CONFIG_GET(flags/)) // TODO - rework config stuff to make aq specific configs be in their own txt file
+		to_chat(usr, "<span class='warning'>Nie możesz ruszyć statku bez wcześniej deklaracji wojny.</span>")
+		return FALSE
 	if(board.challenge && world.time < SYNDICATE_CHALLENGE_TIMER)
-		to_chat(usr, "<span class='warning'>You've issued a combat challenge to the station! You've got to give them at least [DisplayTimeText(SYNDICATE_CHALLENGE_TIMER - world.time)] more to allow them to prepare.</span>")
+		to_chat(usr, "<span class='warning'>Zadeklarowałeś wojnę! Daj im przynajmniej [DisplayTimeText(SYNDICATE_CHALLENGE_TIMER - world.time)] by się przygotować.</span>")
 		return FALSE
+	// AQ EDIT END
 	board.moved = TRUE
 	. = ..()