Merge branch 'combat_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into combat_rework

2020-05-30 23:46:34 -07:00
parent 5b6e797c4f 502873cb7c
commit faf65ae2b5
2 changed files with 0 additions and 132 deletions
@@ -1,44 +0,0 @@
-/mob/living/key_down(_key, client/user)
-	switch(_key)
-		if("B")
-			resist()
-			return
-		if("1")
-			if(possible_a_intents)
-				a_intent_change(INTENT_HELP)
-				return
-		if("2")
-			if(possible_a_intents)
-				a_intent_change(INTENT_DISARM)
-				return
-		if("3")
-			if(possible_a_intents)
-				a_intent_change(INTENT_GRAB)
-				return
-		if("4")
-			if(possible_a_intents)
-				a_intent_change(INTENT_HARM)
-				return
-		if ("V")
-			lay_down()
-			return
-		if("Insert")
-			if(client.keys_held["Ctrl"])
-				keybind_toggle_active_blocking()
-				return
-			else
-				keybind_parry()
-				return
-		if("G")
-			keybind_parry()
-			return
-		if("F")
-			keybind_start_active_blocking()
-	return ..()
-
-/mob/living/key_up(_key, client/user)
-	switch(_key)
-		if("F")
-			keybind_stop_active_blocking()
-			return
-	return ..()
@@ -1,88 +0,0 @@
-// Technically the client argument is unncessary here since that SHOULD be src.client but let's not assume things
-// All it takes is one badmin setting their focus to someone else's client to mess things up
-// Or we can have NPC's send actual keypresses and detect that by seeing no client
-
-/mob/key_down(_key, client/user)
-	switch(_key)
-		if("Delete", "H")
-			if(!pulling)
-				to_chat(src, "<span class='notice'>You are not pulling anything.</span>")
-			else
-				stop_pulling()
-			return
-		if("X", "Northeast") // Northeast is Page-up
-			swap_hand()
-			return
-		if("Y", "Z", "Southeast")	// Southeast is Page-down
-			mode()					// attack_self(). No idea who came up with "mode()"
-			return
-		if("Q", "Northwest") // Northwest is Home
-			var/obj/item/I = get_active_held_item()
-			if(!I)
-				to_chat(src, "<span class='warning'>You have nothing to drop in your hand!</span>")
-			else
-				dropItemToGround(I)
-			return
-		if("E")
-			quick_equip()
-			return
-		if("Alt")
-			toggle_move_intent()
-			return
-		//Bodypart selections
-		if("Numpad8")
-			user.body_toggle_head()
-			return
-		if("Numpad4")
-			user.body_r_arm()
-			return
-		if("Numpad5")
-			user.body_chest()
-			return
-		if("Numpad6")
-			user.body_l_arm()
-			return
-		if("Numpad1")
-			user.body_r_leg()
-			return
-		if("Numpad2")
-			user.body_groin()
-			return
-		if("Numpad3")
-			user.body_l_leg()
-			return
-
-	if(client.keys_held["Ctrl"])
-		switch(SSinput.movement_keys[_key])
-			if(NORTH)
-				if(client.keys_held["Shift"])
-					northshift()
-				else
-					northface()
-				return
-			if(SOUTH)
-				if(client.keys_held["Shift"])
-					southshift()
-				else
-					southface()
-				return
-			if(WEST)
-				if(client.keys_held["Shift"])
-					westshift()
-				else
-					westface()
-				return
-			if(EAST)
-				if(client.keys_held["Shift"])
-					eastshift()
-				else
-					eastface()
-				return
-	return ..()
-
-/mob/key_up(_key, client/user)
-	switch(_key)
-		if("Alt")
-			toggle_move_intent()
-			return
-	return ..()