Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	maps/cyberiad.dmm

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -53,13 +53,13 @@
 /mob/living/carbon/alien/humanoid/movement_delay()
 	var/tally = 0
 	if (istype(src, /mob/living/carbon/alien/humanoid/queen))
-		tally += 4
+		tally += 5
 	if (istype(src, /mob/living/carbon/alien/humanoid/drone))
-		tally += 0
+		tally += 1
 	if (istype(src, /mob/living/carbon/alien/humanoid/sentinel))
-		tally += 0
+		tally += 1
 	if (istype(src, /mob/living/carbon/alien/humanoid/hunter))
-		tally = -2 // hunters go supersuperfast
+		tally = -1 // hunters go supersuperfast
 	return (tally + move_delay_add + config.alien_delay)
 
 /mob/living/carbon/alien/humanoid/Process_Spacemove(var/check_drift = 0)

code/modules/mob/living/carbon/human/human_movement.dm

@@ -14,13 +14,14 @@
 	if((M_RUN in mutations)) return -1
 
 	var/health_deficiency = (100 - health + staminaloss)
-
-	if(health_deficiency >= 40) tally += (health_deficiency / 25)
+	if(health_deficiency >= 40)
+		tally += (health_deficiency / 25)
 
 	if(halloss >= 10) tally += (halloss / 10)
 
 	var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80
-	if (hungry >= 70) tally += hungry/50
+	if (hungry >= 70)
+		tally += hungry/50
 
 	if(wear_suit)
 		tally += wear_suit.slowdown

code/modules/mob/living/silicon/pai/death.dm

@@ -1,13 +1,15 @@
 /mob/living/silicon/pai/death(gibbed)
 	if(stat == DEAD)	return
-	var/turf/T = get_turf_or_move(loc)
-	for (var/mob/M in viewers(T))
-		M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
-	var/obj/effect/decal/cleanable/deadpai = new /obj/effect/decal/cleanable/robot_debris(loc)
 	if(canmove || resting)
-		deadpai.icon = 'icons/mob/pai.dmi'
-		deadpai.icon_state = "[chassis]_dead"
-	del(src)
+		var/turf/T = get_turf_or_move(loc)
+		for (var/mob/M in viewers(T))
+			M.show_message("\red [src] emits a dull beep before it loses power and collapses.", 3, "\red You hear a dull beep followed by the sound of glass crunching.", 2)
+		name = "pAI debris"
+		desc = "The unfortunate remains of some poor personal AI device."
+		icon_state = "[chassis]_dead"
+	else
+		card.overlays.Cut()
+		card.overlays += "pai-off"
 	stat = DEAD
 	canmove = 0
 	if(blind)	blind.layer = 0
@@ -23,3 +25,5 @@
 	if(mind)	del(mind)
 	living_mob_list -= src
 	ghostize()
+	if(icon_state != "[chassis]_dead")
+		del(src)

code/modules/mob/living/silicon/pai/pai.dm

@@ -24,6 +24,7 @@
 		"Cat" = "cat",
 		"Mouse" = "mouse",
 		"Monkey" = "monkey",
+		"Corgi" = "corgi",
 		"Fox" = "fox"
 		)
 
@@ -80,7 +81,6 @@
 		if(!card.radio)
 			card.radio = new /obj/item/device/radio(src.card)
 		radio = card.radio
-
 	//Verbs for pAI mobile form, chassis and Say flavor text
 	verbs += /mob/living/silicon/pai/proc/choose_chassis
 	verbs += /mob/living/silicon/pai/proc/choose_verbs
@@ -174,16 +174,16 @@
 
 	switch(severity)
 		if(1.0)
-			if (src.stat != 2)
-				adjustBruteLoss(100)
-				adjustFireLoss(100)
+			if (src.stat != 2) //Let's not have two of these instantly kill you.
+				adjustBruteLoss(45)
+				adjustFireLoss(45)
 		if(2.0)
 			if (src.stat != 2)
-				adjustBruteLoss(60)
-				adjustFireLoss(60)
+				adjustBruteLoss(30)
+				adjustFireLoss(30)
 		if(3.0)
 			if (src.stat != 2)
-				adjustBruteLoss(30)
+				adjustBruteLoss(20)
 
 	src.updatehealth()
 
@@ -200,8 +200,6 @@
 		src.updatehealth()
 	return
 
-//mob/living/silicon/pai/bullet_act(var/obj/item/projectile/Proj)
-
 /mob/living/silicon/pai/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
 	if (!ticker)
 		M << "You cannot attack people before the game has started."
@@ -236,8 +234,6 @@
 						O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
 	return
 
-///mob/living/silicon/pai/attack_hand(mob/living/carbon/M as mob)
-
 /mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C)
 	usr:cameraFollow = null
 	if (!C)
@@ -412,19 +408,22 @@
 		src.updatehealth()
 	else
 		visible_message("<span class='warning'>[user.name] bonks [src] harmlessly with [W].</span>")
-	if(stat != 2) close_up()
+	spawn(1)
+		if(stat != 2)
+			close_up()
 	return
 
 /mob/living/silicon/pai/attack_hand(mob/user as mob)
 	if(stat == 2) return
 	visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
-	close_up()
+	spawn(1)
+		close_up()
 
 //I'm not sure how much of this is necessary, but I would rather avoid issues.
 /mob/living/silicon/pai/proc/close_up()
 
 	last_special = world.time + 200
-
+	resting = 0
 	if(src.loc == card)
 		return
 
@@ -443,10 +442,18 @@
 	canmove = 0
 	icon_state = "[chassis]"
 
-/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
+/mob/living/silicon/pai/Bump(atom/movable/AM as mob|obj, yes)
+	return
 
+/mob/living/silicon/pai/Bumped(AM as mob|obj)
+	return
+
+/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
+	if(stat || sleeping || paralysis || weakened)
+		return
 	if(istype(AM,/obj/item))
 		src << "<span class='warning'>You are far too small to pull anything!</span>"
+	return
 
 /mob/living/silicon/pai/examine()
 
@@ -479,6 +486,7 @@
 	..(Proj)
 	updatehealth()
 	if (stat != 2)
-		close_up()
+		spawn(1)
+			close_up()
 	return 2
 

code/modules/mob/mob_movement.dm

@@ -245,14 +245,14 @@
 			if("run")
 				if(mob.drowsyness > 0)
 					move_delay += 6
-				move_delay += 1+config.run_speed
+				move_delay += config.run_speed
 			if("walk")
-				move_delay += 7+config.walk_speed
+				move_delay += config.walk_speed
 		move_delay += mob.movement_delay()
 
 		if(config.Tickcomp)
 			move_delay -= 1.3
-			var/tickcomp = ((1/(world.tick_lag))*1.3)
+			var/tickcomp = (1 / (world.tick_lag)) * 1.3
 			move_delay = move_delay + tickcomp
 
 		if(istype(mob.buckled, /obj/vehicle) || istype(mob.buckled, /obj/structure/stool/bed/chair/cart))