Merge branch 'master' of https://github.com/TauCetiStation/TauCetiCla…

…ssic into Pluvia

code/datums/components/clickplace.dm

@@ -198,7 +198,7 @@
 	victim.apply_damage(8, def_zone = BP_HEAD)
 	victim.visible_message("<span class='danger'>[assailant] slams [victim]'s face against \the [A]!</span>")
 	playsound(parent, 'sound/weapons/tablehit1.ogg', VOL_EFFECTS_MASTER)
-
+	SEND_SIGNAL(assailant, COMSIG_HUMAN_HARMED_OTHER,victim )
 	victim.log_combat(assailant, "face-slammed against \the [parent]")
 	return FALSE
 
@@ -227,8 +227,7 @@
 		INVOKE_ASYNC(victim, TYPE_PROC_REF(/atom/movable, do_simple_move_animation), A.loc, old_loc)
 		victim.Stun(2)
 		victim.Weaken(5)
-
-		victim.log_combat(assailant, "laid on [A]")
+		victim.process_aggresive_action(assailant, "laid on [A]")
 	else if(assailant.a_intent != INTENT_HARM)
 		/// Let's pretend a face-slam doesn't exist.
 		to_chat(assailant, "<span class='warning'>You need a better grip to do that!</span>")

code/datums/mind.dm

@@ -63,6 +63,11 @@
 	var/creation_time = 0 //World time when this datum was New'd. Useful to tell how long since a character spawned
 	var/creation_roundtime
 
+	// Pluvia sochial credit system
+	var/social_credit = 0
+	var/haram_point = 0
+	var/blessed = 0
+
 	var/willpower_amount = 1
 	var/possible_willpower_effects = list(/datum/willpower_effect/painkiller, /datum/willpower_effect/skills, /datum/willpower_effect/nutrition, /datum/willpower_effect/fat)
 	var/willpower_effects = list()
@@ -782,6 +787,9 @@
 	..()
 	if(!mind.assigned_role)
 		mind.assigned_role = "default"	//default
+	mind.social_credit = species.start_social_credit //Pluvia social credit system
+	if(ispluvian(src))
+		global.pluvia_religion.add_member(src, HOLY_ROLE_PRIEST)
 
 //slime
 /mob/living/carbon/slime/mind_initialize()