Акуталка

code/__DEFINES/language.dm

@@ -2,6 +2,7 @@
 #define LANGUAGE_JAPANESE "Japanese"
 #define LANGUAGE_CHINESE "Chinese"
 #define LANGUAGE_RUSSIAN "Russian"
+#define LANGUAGE_RUSPATOIS "Russian Patois"
 #define LANGUAGE_GERMAN "German"
 #define LANGUAGE_SPANISH "Spanish"
 #define LANGUAGE_TSL "Tactical Sign Language"
@@ -16,7 +17,7 @@
 
 #define LANGUAGE_TELEPATH "Telepath Implant"
 
-#define ALL_HUMAN_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH)
+#define ALL_HUMAN_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_RUSPATOIS)
 
 #define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
 

code/__DEFINES/paygrade_defs/army.dm

@@ -0,0 +1,96 @@
+// Paygrade shorthand defines, to allow clearer designation.
+
+// US Army
+
+/// AE1, Private
+#define PAY_SHORT_AE1 "AE1"
+
+/// AE2, Private
+#define PAY_SHORT_AE2 "AE2"
+
+/// AE3, Private First Class
+#define PAY_SHORT_AE3 "AE3"
+
+/// AE4, Corporal
+#define PAY_SHORT_AE4 "AE4"
+
+/// AE4E, Specialist
+#define PAY_SHORT_AE4E "AE4E"
+
+/// AE5, Sergeant
+#define PAY_SHORT_AE5 "AE5"
+
+/// AE6, Staff Sergeant
+#define PAY_SHORT_AE6 "AE6"
+
+/// AE7, Sergeant First Class
+#define PAY_SHORT_AE7 "AE7"
+
+/// AE8, Master Sergeant
+#define PAY_SHORT_AE8 "AE8"
+
+/// AE8E, First Sergeant
+#define PAY_SHORT_AE8E "AE8E"
+
+/// AE9, Sergeant Major
+#define PAY_SHORT_AE9 "AE9"
+
+/// AE9E, Command Sergeant Major
+#define PAY_SHORT_AE9E "AE9E"
+
+/// AE9C, Sergeant Major of the Army
+#define PAY_SHORT_AE9C "AE9C"
+
+/// AW1, Warrant Officer 1
+#define PAY_SHORT_AW1 "AW1"
+
+/// AW1, Chief Warrant Officer 2
+#define PAY_SHORT_AW2 "ACW2"
+
+/// AW1, Chief Warrant Officer 3
+#define PAY_SHORT_AW3 "ACW3"
+
+/// AW1, Chief Warrant Officer 4
+#define PAY_SHORT_AW4 "ACW4"
+
+/// AW1, Chief Warrant Officer 5
+#define PAY_SHORT_AW5 "ACW5"
+
+/// AO1, Second Lieutenant
+#define PAY_SHORT_AO1 "AO1"
+
+/// AO2, First Lieutenant
+#define PAY_SHORT_AO2 "AO2"
+
+/// AO3, Captain
+#define PAY_SHORT_AO3 "AO3"
+
+/// AO4, Major
+#define PAY_SHORT_AO4 "AO4"
+
+/// AO5, Lieutenant Colonel
+#define PAY_SHORT_AO5 "AO5"
+
+/// AO6, Colonel
+#define PAY_SHORT_AO6 "AO6"
+
+/// AO6E, Senior Colonel
+#define PAY_SHORT_AO6E "AO6E"
+
+/// AO6C, Division Colonel
+#define PAY_SHORT_AO6C "AO6C"
+
+/// AO7, Brigadier General
+#define PAY_SHORT_AO7 "AO7"
+
+/// AO8, Major General
+#define PAY_SHORT_AO8 "AO8"
+
+/// AO9, Lieutenant General
+#define PAY_SHORT_AO9 "AO9"
+
+/// AO10, General
+#define PAY_SHORT_AO10 "AO10"
+
+/// AO10C, General of the Army
+#define PAY_SHORT_AO10C "AO10C"

code/__DEFINES/paygrade_defs/navy.dm

@@ -1,10 +1,11 @@
 // Paygrade shorthand defines, to allow clearer designation.
 
-// USCM NAVY
+// USASF, the evolution of the USN & USAF, still considered Naval for the branch prefix
+
 /// NE1, Seaman Recruit
 #define PAY_SHORT_NE1 "NE1"
 
-/// NE2M, Seaman Apprentice
+/// NE2, Seaman Apprentice
 #define PAY_SHORT_NE2 "NE2"
 
 /// NE3, Seaman
@@ -17,7 +18,7 @@
 #define PAY_SHORT_NE5 "NE5"
 
 /// NE6, Petty Officer 1st Class
-#define PAY_SHORT_NE6 "N36"
+#define PAY_SHORT_NE6 "NE6"
 
 /// NE7, Chief Petty Officer
 #define PAY_SHORT_NE7 "NE7"
@@ -34,6 +35,21 @@
 /// NE9C, Command Master Chief Petty Officer
 #define PAY_SHORT_NE9C "NE9C"
 
+/// NW1, Warrant Officer 1
+#define PAY_SHORT_NW1 "NW1"
+
+/// NW1, Chief Warrant Officer 2
+#define PAY_SHORT_NW2 "NCW2"
+
+/// NW1, Chief Warrant Officer 3
+#define PAY_SHORT_NW3 "NCW3"
+
+/// NW1, Chief Warrant Officer 4
+#define PAY_SHORT_NW4 "NCW4"
+
+/// NW1, Chief Warrant Officer 5
+#define PAY_SHORT_NW5 "NCW5"
+
 /// NO1, Ensign
 #define PAY_SHORT_NO1 "NO1"
 

code/controllers/subsystem/minimap.dm

@@ -539,7 +539,9 @@ SUBSYSTEM_DEF(minimaps)
 		qdel(svg_store_overlay)
 		debug_log("SVG coordinates for [faction] are not implemented!")
 
-#define can_draw(faction, user) ((faction == FACTION_MARINE && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT)) || (faction == XENO_HIVE_NORMAL && isqueen(user)))
+/datum/tacmap/drawing/proc/can_draw(faction, mob/user)
+	var/datum/squad/main_squad_path = MAIN_SHIP_PLATOON
+	return ((faction == main_squad_path::faction && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT)) || (faction == XENO_HIVE_NORMAL && isqueen(user)))
 
 /datum/controller/subsystem/minimaps/proc/fetch_tacmap_datum(zlevel, flags)
 	var/hash = "[zlevel]-[flags]"
@@ -1071,4 +1073,3 @@ SUBSYSTEM_DEF(minimaps)
 
 #undef CANVAS_COOLDOWN_TIME
 #undef FLATTEN_MAP_COOLDOWN_TIME
-#undef can_draw

code/datums/ammo/bullet/special_ammo.dm

@@ -77,6 +77,16 @@
 	damage = 35
 	penetration = ARMOR_PENETRATION_TIER_1
 
+/datum/ammo/bullet/smartgun/aa	//The base smartgun-bullet is kinda a woeful stand-in for AA cannon rounds, this should beef it up a bit more without being too OTT
+	name = "anti-aircraft bullet"
+	icon_state = "redbullet"
+	flags_ammo_behavior = AMMO_BALLISTIC
+
+	max_range = 18
+	accuracy = HIT_ACCURACY_TIER_5
+	damage = 35
+	penetration = ARMOR_PENETRATION_TIER_6
+
 /datum/ammo/bullet/turret
 	name = "autocannon bullet"
 	icon_state = "redbullet" //Red bullets to indicate friendly fire restriction

code/datums/ammo/rocket.dm

@@ -125,10 +125,12 @@
 
 /datum/ammo/rocket/ap/anti_tank
 	name = "anti-tank rocket"
-	damage = 100
+	damage = 1000
+	damage_var_high = 100
 	var/vehicle_slowdown_time = 5 SECONDS
 	shrapnel_chance = 5
 	shrapnel_type = /obj/item/large_shrapnel/at_rocket_dud
+	max_range = 22
 
 /datum/ammo/rocket/ap/anti_tank/on_hit_obj(obj/object, obj/projectile/projectile)
 	if(istype(object, /obj/vehicle/multitile))
@@ -147,6 +149,12 @@
 /datum/ammo/rocket/ap/tank_towlauncher
 	max_range = 8
 
+/datum/ammo/rocket/ap/tank_towlauncher/aa
+	name = "anti-air missile"
+	damage = 200
+	max_range = 16
+	shell_speed = AMMO_SPEED_TIER_5
+
 /datum/ammo/rocket/ltb
 	name = "cannon round"
 	icon_state = "ltb"

code/datums/medal_awards.dm

@@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL))
 		return
 
 	if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.platco_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades)))
-		to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!"))
+		to_chat(user, SPAN_WARNING("Only an Officer can award medals!"))
 		return
 
 	if(!card.registered_ref)
@@ -599,8 +599,8 @@ GLOBAL_DATUM_INIT(ic_medals_panel, /datum/ic_medal_panel, new)
 		to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals."))
 		return
 
-	if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades)))
-		to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!"))
+	if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.platco_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades)))
+		to_chat(user, SPAN_WARNING("Only an Officer can award medals!"))
 		return
 
 	if(!card.registered_ref)