Merge branch 'master' into pr/22301

Author: cowbot92

code/__DEFINES/colors.dm

@@ -108,6 +108,7 @@
 #define COLOR_VIOLET "#B900F7"
 #define COLOR_STRONG_VIOLET "#6927C5"
 #define COLOR_DARK_PURPLE "#551A8B"
+#define COLOR_TAR_PURPLE "#553F8A"
 
 #define COLOR_ORANGE "#FF9900"
 #define COLOR_IRISH_ORANGE "#FF883E"

code/__DEFINES/flags.dm

@@ -250,5 +250,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define IGNORE_INCAPACITATED (1<<3)
 /// Used to prevent important slowdowns from being abused by drugs like kronkaine
 #define IGNORE_SLOWDOWNS (1<<4)
+/// Used to keep the skill indicator icon without using the built-in delay modifier
+#define IGNORE_SKILL_DELAY (1<<5)
 
 #define IGNORE_ALL (IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM|IGNORE_INCAPACITATED|IGNORE_SLOWDOWNS)

code/__DEFINES/hud.dm

@@ -106,6 +106,7 @@
 #define ui_borg_radio "EAST-1:28,SOUTH+1:7"
 #define ui_borg_intents "EAST-2:26,SOUTH:5"
 #define ui_language_menu "EAST-5:20,SOUTH:21"
+#define ui_skill_menu "EAST-5:20,SOUTH:5"
 #define ui_move_up "EAST-4:22, SOUTH:21"
 #define ui_move_down "EAST-4:22, SOUTH:5"
 

code/__DEFINES/maths.dm

@@ -5,6 +5,7 @@
 #define NUM_E 2.71828183
 
 #define PI 3.1416
+#define SQRT_2 1.414214
 #define INFINITY 1e31 //closer then enough
 
 #define SHORT_REAL_LIMIT 16777216

code/__DEFINES/say.dm

@@ -79,6 +79,7 @@
 #define SPAN_CULTLARGE "cultlarge"
 #define SPAN_HELIUM "small"
 #define SPAN_PROGENITOR "progenitor"
+#define SPAN_COLOSSUS "colossus"
 
 //bitflag #defines for return value of the radio() proc.
 #define ITALICS			(1<<0)

code/__DEFINES/skills.dm

@@ -0,0 +1,27 @@
+
+/// Medicine and surgery.
+#define SKILL_PHYSIOLOGY "physiology"
+/// Construction and repair of structures and machinery.
+#define SKILL_MECHANICAL "mechanics"
+/// Hacking, piloting, and robotic maintenance.
+#define SKILL_TECHNICAL "technical"
+/// Chemistry, botany, physics, and other sciences.
+#define SKILL_SCIENCE "science"
+/// Strength, endurance, accuracy.
+#define SKILL_FITNESS "fitness"
+
+/// No experience whatsoever.
+#define EXP_NONE 0
+/// Some experience, but not much.
+#define EXP_LOW 1
+/// Enough experience to do a decent job.
+#define EXP_MID 2
+/// Above average skill level.
+#define EXP_HIGH 3
+/// Exceptionally skilled.
+#define EXP_MASTER 4
+/// Uniquely gifted. Not obtainable through normal means.
+#define EXP_GENIUS 5
+
+/// Experience required to increase your skills by one level. Increases exponentially the higher your level already is.
+#define EXPERIENCE_PER_LEVEL 500

code/__DEFINES/tools.dm

@@ -3,6 +3,7 @@
 #define TOOL_MULTITOOL 		"multitool"
 #define TOOL_SCREWDRIVER 	"screwdriver"
 #define TOOL_WIRECUTTER 	"wirecutter"
+#define TOOL_WIRING			"wiring"
 #define TOOL_WRENCH 		"wrench"
 #define TOOL_WELDER 		"welder"
 #define TOOL_ANALYZER		"analyzer"

code/__DEFINES/traits/declarations.dm

@@ -109,6 +109,8 @@
 #define TRAIT_IGNOREDAMAGESLOWDOWN "ignoredamageslowdown"
 /// Makes the screen go black and white while illuminating all mobs based on their body temperature
 #define TRAIT_INFRARED_VISION	"infrared_vision"
+/// Punches don't stun. Use this instead of setting punchstunchance to zero.
+#define TRAIT_NO_PUNCH_STUN "no-punch-stun"
 
 ////////////////////////////////////////////////////////////////////////////////////
 //-------------------------Species Specific defines-------------------------------//
@@ -441,6 +443,10 @@
 #define TRAIT_PRESENT_VISION "present-vision"
 #define TRAIT_DISK_VERIFIER "disk-verifier"
 #define TRAIT_NOMOBSWAP "no-mob-swap"
+/// Can allocate 5 points into one skill instead of the usual 4
+#define TRAIT_EXCEPTIONAL_SKILL "exceptional-skill"
+/// Acts as an additional skill point for piloting mechs, up to EXP_MASTER.
+#define TRAIT_SKILLED_PILOT "skilled-pilot"
 /// Can examine IDs to see if they are roundstart.
 #define TRAIT_ID_APPRAISER "id_appraiser"
 /// Gives us turf, mob and object vision through walls

code/__HELPERS/mobs.dm

@@ -319,7 +319,7 @@ GLOBAL_LIST_EMPTY(species_list)
  * given `delay`. Returns `TRUE` on success or `FALSE` on failure.
  * Interaction_key is the assoc key under which the do_after is capped, with max_interact_count being the cap. Interaction key will default to target if not set.
  */
-/proc/do_after(mob/user, delay, atom/target, timed_action_flags = NONE, progress = TRUE, datum/callback/extra_checks, interaction_key, max_interact_count = 1)
+/proc/do_after(mob/user, delay, atom/target, timed_action_flags = NONE, progress = TRUE, datum/callback/extra_checks, interaction_key, max_interact_count = 1, skill_check = null)
 	if(!user)
 		return FALSE
 	if(!isnum(delay))
@@ -335,10 +335,13 @@ GLOBAL_LIST_EMPTY(species_list)
 
 	if(!(timed_action_flags & IGNORE_SLOWDOWNS))
 		delay *= user.action_speed_modifier * user.do_after_coefficent() //yogs: darkspawn
+	
+	if(skill_check && user.mind && !(timed_action_flags & IGNORE_SKILL_DELAY))
+		delay *= (12 - user.get_skill(skill_check)) / 10
 
 	var/datum/progressbar/progbar
 	if(progress)
-		progbar = new(user, delay, target || user, timed_action_flags, extra_checks)
+		progbar = new(user, delay, target || user, timed_action_flags, extra_checks, skill_check)
 
 	SEND_SIGNAL(user, COMSIG_DO_AFTER_BEGAN)
 

code/_onclick/click.dm

@@ -120,7 +120,7 @@
 		UnarmedAttack(A, FALSE, modifiers)
 		return
 
-	if(grab_mode && pulled(A))
+	if(grab_mode && pulled(A) && !in_throw_mode)
 		return
 
 	if(in_throw_mode)