Merge remote-tracking branch 'citadel/master' into killer_queen

code/datums/brain_damage/special.dm

@@ -103,8 +103,7 @@
 	. = ..()
 	QDEL_IN(src, 300)
 
-//ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/effect/hallucination/simple/bluespace_stream/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/effect/hallucination/simple/bluespace_stream/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(user != seer || !linked_to)
 		return
 	var/slip_in_message = pick("slides sideways in an odd way, and disappears", "jumps into an unseen dimension",\

code/datums/components/rotation.dm

@@ -98,16 +98,16 @@
 
 /datum/component/simple_rotation/proc/HandRot(datum/source, mob/user, rotation = default_rotation_direction)
 	if(can_be_rotated)
-		if(!can_be_rotated.Invoke(user, default_rotation_direction))
+		if(!can_be_rotated.Invoke(user, rotation))
 			return
 	else
-		if(!default_can_be_rotated(user, default_rotation_direction))
+		if(!default_can_be_rotated(user, rotation))
 			return
 	if(can_user_rotate)
-		if(!can_user_rotate.Invoke(user, default_rotation_direction))
+		if(!can_user_rotate.Invoke(user, rotation))
 			return
 	else
-		if(!default_can_user_rotate(user, default_rotation_direction))
+		if(!default_can_user_rotate(user, rotation))
 			return
 	BaseRot(user, rotation)
 	return TRUE

code/datums/http.dm

@@ -0,0 +1,74 @@
+/datum/http_request
+	var/id
+	var/in_progress = FALSE
+
+	var/method
+	var/body
+	var/headers
+	var/url
+
+	var/_raw_response
+
+/datum/http_request/proc/prepare(method, url, body = "", list/headers)
+	if (!length(headers))
+		headers = ""
+	else
+		headers = json_encode(headers)
+
+	src.method = method
+	src.url = url
+	src.body = body
+	src.headers = headers
+
+/datum/http_request/proc/execute_blocking()
+	_raw_response = rustg_http_request_blocking(method, url, body, headers)
+
+/datum/http_request/proc/begin_async()
+	if (in_progress)
+		CRASH("Attempted to re-use a request object.")
+
+	id = rustg_http_request_async(method, url, body, headers)
+
+	if (isnull(text2num(id)))
+		stack_trace("Proc error: [id]")
+		_raw_response = "Proc error: [id]"
+	else
+		in_progress = TRUE
+
+/datum/http_request/proc/is_complete()
+	if (isnull(id))
+		return TRUE
+
+	if (!in_progress)
+		return TRUE
+
+	var/r = rustg_http_check_request(id)
+
+	if (r == RUSTG_JOB_NO_RESULTS_YET)
+		return FALSE
+	else
+		_raw_response = r
+		in_progress = FALSE
+		return TRUE
+
+/datum/http_request/proc/into_response()
+	var/datum/http_response/R = new()
+
+	try
+		var/list/L = json_decode(_raw_response)
+		R.status_code = L["status_code"]
+		R.headers = L["headers"]
+		R.body = L["body"]
+	catch
+		R.errored = TRUE
+		R.error = _raw_response
+
+	return R
+
+/datum/http_response
+	var/status_code
+	var/body
+	var/list/headers
+
+	var/errored = FALSE
+	var/error

code/datums/mood_events/generic_negative_events.dm

@@ -274,3 +274,13 @@
 	description = "<span class='warning'>I've produced better art than that from my ass.</span>\n"
 	mood_change = -2
 	timeout = 1200
+
+/datum/mood_event/tripped
+	description = "<span class='boldwarning'>I can't believe I fell for the oldest trick in the book!</span>\n"
+	mood_change = -6
+	timeout = 2 MINUTES
+
+/datum/mood_event/untied
+	description = "<span class='boldwarning'>I hate when my shoes come untied!</span>\n"
+	mood_change = -3
+	timeout = 1 MINUTES

code/datums/mutations/hulk.dm

@@ -21,7 +21,11 @@
 
 /datum/mutation/human/hulk/on_attack_hand(atom/target, proximity, act_intent, unarmed_attack_flags)
 	if(proximity && (act_intent == INTENT_HARM)) //no telekinetic hulk attack
-		return target.attack_hulk(owner)
+		if(!owner.CheckActionCooldown(CLICK_CD_MELEE))
+			return INTERRUPT_UNARMED_ATTACK | NO_AUTO_CLICKDELAY_HANDLING
+		owner.DelayNextAction()
+		target.attack_hulk(owner)
+		return INTERRUPT_UNARMED_ATTACK | NO_AUTO_CLICKDELAY_HANDLING
 
 /datum/mutation/human/hulk/on_life()
 	if(owner.health < 0)

code/datums/status_effects/debuffs.dm

@@ -144,7 +144,6 @@
 	id = "tased"
 	alert_type = null
 	var/movespeed_mod = /datum/movespeed_modifier/status_effect/tased
-	var/nextmove_modifier = 1
 	var/stamdmg_per_ds = 0		//a 20 duration would do 20 stamdmg, disablers do 24 or something
 	var/last_tick = 0			//fastprocess processing speed is a goddamn sham, don't trust it.
 
@@ -173,13 +172,9 @@
 			C.adjustStaminaLoss(max(0, stamdmg_per_ds * diff)) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing.
 	last_tick = world.time
 
-/datum/status_effect/electrode/nextmove_modifier() //why is this a proc. its no big deal since this doesnt get called often at all but literally w h y
-	return nextmove_modifier
-
 /datum/status_effect/electrode/no_combat_mode
 	id = "tased_strong"
 	movespeed_mod = /datum/movespeed_modifier/status_effect/tased/no_combat_mode
-	nextmove_modifier = 2
 	blocks_combatmode = TRUE
 	stamdmg_per_ds = 1
 

code/datums/status_effects/status_effect.dm

@@ -90,13 +90,12 @@
 		return
 	duration = world.time + original_duration
 
-//clickdelay/nextmove modifiers!
-/datum/status_effect/proc/nextmove_modifier()
+/**
+  * Multiplied to clickdelays
+  */
+/datum/status_effect/proc/action_cooldown_mod()
 	return 1
 
-/datum/status_effect/proc/nextmove_adjust()
-	return 0
-
 ////////////////
 // ALERT HOOK //
 ////////////////

code/datums/status_effects/wound_effects.dm

@@ -151,7 +151,7 @@
 
 	return 1
 
-/datum/status_effect/wound/bone/nextmove_modifier()
+/datum/status_effect/wound/bone/action_cooldown_mod()
 	var/mob/living/carbon/C = owner
 
 	if(C.get_active_hand() == linked_limb)