TauCetiStation · volas · Oct 15, 2024 · Jun 30, 2024 · Jul 1, 2024 · Jul 1, 2024
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -350,6 +350,18 @@
 #define COMSIG_LIVING_CAN_TRACK "mob_cantrack"
 	#define COMPONENT_CANT_TRACK (1<<0)
 #define COMSIG_LIVING_BUMPED "living_bumped"
+// from base of mob/living/proc/log_combat (mob/living/carbon/human/attacker)
+#define COMSIG_HUMAN_HARMED_OTHER "human_harmed_other"
+// from base of /obj/structure/stool/bed/chair/noose/user_buckle_mob()
+#define COMSIG_HUMAN_ON_SUICIDE "human_on_suicide"
+// from base of /mob/living/carbon/proc/handle_alerts()
+#define COMSIG_HUMAN_ON_ADJUST_DRUGINESS "human_on_adjust_drugines"
+// from base of /obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume()
+#define COMSIG_HUMAN_ON_CONSUME "human_on_consume"
+// from base of /turf/simulated/floor/carpet/Entered(atom/movable/O)
+#define COMSIG_HUMAN_ON_CARPET "human_on_carpet"
+// from base of /mob/living/carbon/human/say()
+#define COMSIG_HUMAN_SAY "human_say"
 
 /// from /obj/effect/proc_holder/changeling/transform/sting_action(): (mob/living/carbon/human/user)
 #define COMSIG_CHANGELING_TRANSFORM "changeling_transform"

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -29,6 +29,8 @@
 
 #define isskeleton(A) (A.get_species() in list(SKELETON, SKELETON_UNATHI, SKELETON_TAJARAN, SKELETON_SKRELL, SKELETON_VOX))
 
+#define ispluvian(A) (A.get_species() == PLUVIAN)
+
 // CARBON
 #define isxenoqueen(A) (istype(A, /mob/living/carbon/xenomorph/humanoid/queen))
 

diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
@@ -349,6 +349,7 @@
 		/turf/simulated/wall/r_wall/purple, \
 		/turf/simulated/wall/r_wall/green, \
 		/turf/simulated/wall/r_wall/beige, \
+		/turf/simulated/wall/heaven, \
 		/obj/structure/falsewall, \
 		/obj/structure/falsewall/yellow, \
 		/obj/structure/falsewall/red, \

diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm
@@ -77,6 +77,8 @@
 
 // Species Names (keep in mind, that whitelist and preferences DB depends on this names too, and if anything is renamed, update MYSQL tables or is_alien_whitelisted() proc and preferences).
 #define HUMAN          	 "Human"
+#define PLUVIAN        	 "Pluvian"
+#define PLUVIAN_SPIRIT 	 "Pluvian Spirit"
 #define UNATHI         	 "Unathi"
 #define TAJARAN        	 "Tajaran"
 #define SKRELL         	 "Skrell"

diff --git a/code/_globalvars/database.dm b/code/_globalvars/database.dm
@@ -18,4 +18,4 @@ var/global/DBConnection/dbcon = new()
 // Xeno/role whitelist database ( code/modules/admin/whitelist.dm )
 //
 var/global/list/role_whitelist   // cache of all ckeys and their roles
-var/global/list/whitelisted_roles = list("unathi", "tajaran", "skrell", "diona", "machine", "vox", "ian") // Case important, everything must be in lowercase.
+var/global/list/whitelisted_roles = list("unathi", "tajaran", "skrell", "diona", "machine", "vox", "ian", "pluvian") // Case important, everything must be in lowercase.
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
@@ -47,6 +47,7 @@ var/global/list/ignore_vision_inside = list(
 var/global/datum/religion/chaplain/chaplain_religion
 // Cultists religion. You/I can change it?
 var/global/datum/religion/cult/cult_religion
+var/global/datum/religion/pluvia_religion
 var/global/list/datum/religion/all_religions = list()
 
 //Used for global activation of pylons

diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
@@ -169,3 +169,7 @@
 #define HUD_COPY_ICON	1
 #define HUD_COPY_COLOR	2
 #define HUD_COPY_ALPHA	4
+
+//Parallax
+#define PARALLAX_CLASSIC "parallax_classic"
+#define PARALLAX_HEAVEN "parallax_heaven"
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
@@ -353,6 +353,20 @@
 			или стрелять из пистолета, чтобы передвигаться в соответствии с 3-м законом Ньютона."
 	icon_state = "weightless"
 
+/atom/movable/screen/alert/pluvia_ring
+	name = "Входящий вызов"
+	desc = "Кто-то с того света желает говорить с вами."
+	icon_state = "ring"
+
+/atom/movable/screen/alert/pluvia_ring/Click()
+	if(!mob_viewer)
+		return
+	to_chat(mob_viewer, "Вы сбросили звонок!")
+	for(var/obj/effect/proc_holder/spell/no_target/ancestor_call/S in mob_viewer.spell_list)
+		S.target_loc = null
+		S.my_gong = null
+	mob_viewer.clear_alert("Звонок")
+
 //ALIENS
 
 /atom/movable/screen/alert/alien_tox

diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
@@ -176,7 +176,7 @@ var/global/list/available_ui_styles = list(
 
 	mymob.update_action_buttons()
 	reorganize_alerts()
-	create_parallax() // todo: why we recreate parallax every time we change mob or press f12
+	set_parallax(mymob.current_parallax) // todo: why we recreate parallax every time we change mob or press f12
 	hidden_inventory_update()
 	persistant_inventory_update()
 

diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
@@ -11,18 +11,25 @@
 	var/parallax_layers_max = 3
 	var/parallax_animate_timer
 
-/datum/hud/proc/create_parallax()
+/mob
+	var/current_parallax = PARALLAX_CLASSIC
+
+/datum/hud/proc/create_parallax(parallax_type)
 	var/client/C = mymob.client
 	if (!apply_parallax_pref())
 		return
 
-	if(!length(C.parallax_layers_cached))
+	var/icon/parralax_icon
+	switch(parallax_type)
+		if(PARALLAX_CLASSIC)
+			parralax_icon = 'icons/effects/parallax.dmi'
+		if(PARALLAX_HEAVEN)
+			parralax_icon = 'icons/effects/pluvia_water.dmi'
+	if(!length(C.parallax_layers_cached) || parallax_type != mymob.current_parallax)
 		C.parallax_layers_cached = list()
-		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_1(null, C.view, 'icons/effects/parallax.dmi')
-		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_2(null, C.view, 'icons/effects/parallax.dmi')
-		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_3(null, C.view, 'icons/effects/parallax.dmi')
-		//C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet(null, C.view, 'icons/effects/parallax.dmi') awaiting for new planet image in replace for lavaland
-
+		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_1(null, C.view, parralax_icon)
+		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_2(null, C.view, parralax_icon)
+		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_3(null, C.view, parralax_icon)
 	C.parallax_layers = C.parallax_layers_cached.Copy()
 
 	if (length(C.parallax_layers) > C.parallax_layers_max)
@@ -36,7 +43,7 @@
 	var/client/C = mymob.client
 	C.screen -= (C.parallax_layers_cached)
 	C.parallax_layers = null
-
+	mymob.current_parallax = null
 	C.update_plane_masters(/atom/movable/screen/plane_master/parallax_white)
 
 /datum/hud/proc/apply_parallax_pref()
@@ -68,9 +75,14 @@
 			C.parallax_layers_max = 3
 			return TRUE
 
-/datum/hud/proc/update_parallax_pref()
+/datum/hud/proc/set_parallax(new_parallax)
 	remove_parallax()
-	create_parallax()
+	create_parallax(new_parallax)
+	mymob.current_parallax = new_parallax
+
+/datum/hud/proc/update_parallax_pref()
+	set_parallax(mymob.current_parallax)
+
 
 // This sets which way the current shuttle is moving (returns true if the shuttle has stopped moving so the caller can append their animation)
 /datum/hud/proc/set_parallax_movedir(new_parallax_movedir)

diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
@@ -87,6 +87,7 @@
 					user.SetNextMove(CLICK_CD_ACTION)
 					user.visible_message("<span class='danger'>[user] slit [M]'s throat open with \the [name]!</span>")
 					M.log_combat(user, "knifed with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
+					SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
 					return
 
 	if (isbrain(M))
@@ -105,6 +106,8 @@
 		M.equip_to_slot_if_possible(src, SLOT_HEAD, disable_warning = TRUE)
 		user.visible_message("<span class='danger'>[user] slams [name] on the [M]'s head!</span>")
 		M.log_combat(user, "slammed with [name] on the head (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(BRUTE)])")
+		if(force > 0)
+			SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
 		var/list/data = user.get_unarmed_attack()
 		// if item has no force just assume attacker smashed his fist (no scratches or any modifiers) against victim's head.
 		if(user.a_intent in list(INTENT_PUSH, INTENT_GRAB))
@@ -113,6 +116,8 @@
 		return TRUE
 
 	M.log_combat(user, "attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
+	if(force > 0)
+		SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
 
 	var/power = force
 	if(ishuman(user) && damtype == BRUTE)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -189,7 +189,6 @@ SUBSYSTEM_DEF(ticker)
 
 /datum/controller/subsystem/ticker/proc/setup()
 	to_chat(world, "<span class='boldannounce'>Игра начинается...</span>")
-
 	// Discuss your stuff after the round ends.
 	if(config.ooc_round_autotoggle)
 		to_chat(world, "<span class='warning bold'>OOC-канал отключен для всех на время раунда!</span>")
@@ -270,6 +269,7 @@ SUBSYSTEM_DEF(ticker)
 		query_round_game_mode.Execute()
 
 	create_religion(/datum/religion/chaplain)
+	create_religion(/datum/religion/pluvia)
 	setup_hud_objects()
 
 	create_characters() //Create player characters and transfer them

diff --git a/code/datums/components/clickplace.dm b/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,8 @@
 		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]")
+		SEND_SIGNAL(assailant, COMSIG_HUMAN_HARMED_OTHER, victim)
 	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>")

diff --git a/code/datums/mind.dm b/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,13 @@
 	..()
 	if(!mind.assigned_role)
 		mind.assigned_role = "default"	//default
+	 //Pluvia social credit system
+	if(mind.assigned_job.title in list("Captain","Head of Security","Warden","Security Officer","Security Cadet","Blueshield Officer","Internal Affairs Agent"))
+		mind.social_credit = 0
+	else
+		mind.social_credit = species.start_social_credit
+	if(ispluvian(src))
+		global.pluvia_religion.add_member(src, HOLY_ROLE_PRIEST)
 
 //slime
 /mob/living/carbon/slime/mind_initialize()

diff --git a/code/datums/outfits/jobs/centcom.dm b/code/datums/outfits/jobs/centcom.dm
@@ -40,3 +40,4 @@
 
 	implants = list(
 		/obj/item/weapon/implant/mind_protect/loyalty, /obj/item/weapon/implant/blueshield)
+
diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm
@@ -135,4 +135,3 @@
 		uniform = /obj/item/clothing/under/syndicate/tacticool
 		uniform_f = /obj/item/clothing/under/syndicate/tacticool
 		l_ear = /obj/item/device/radio/headset/headset_sec/nt_pmc
-
diff --git a/code/game/gamemodes/modes_gameplays/changeling/powers/swallow.dm b/code/game/gamemodes/modes_gameplays/changeling/powers/swallow.dm
@@ -52,6 +52,8 @@
 	user.visible_message("<span class='danger'>[user] devours [target]!</span>",
 	                     "<span class='notice'>We have devour [target]!</span>")
 	to_chat(target, "<span class='danger'>You have been devoured by the changeling!</span>")
+	var/mob/living/carbon/human/changeling = user
+	changeling.mind.social_credit += target.mind.social_credit
 	for(var/obj/item/I in target)
 		target.drop_from_inventory(I)
 	target.spawn_gibs()

diff --git a/code/game/gamemodes/modes_gameplays/wizard/soulstone.dm b/code/game/gamemodes/modes_gameplays/wizard/soulstone.dm
@@ -41,6 +41,9 @@
 	if(HAS_TRAIT(H, TRAIT_NO_SOUL) || HAS_TRAIT(H, TRAIT_SOULSTONE_IMMUNE) || H.species.flags[IS_SYNTHETIC])
 		to_chat(user, "<span class='warning'>У этого существа нет души.</span>")
 		return ..()
+	if(istype(H.my_religion, /datum/religion/pluvia) || H.mind.blessed)
+		to_chat(user, "<span class='warning'>Душа этого существа под защитой.</span>")
+		return ..()
 
 	H.log_combat(user, "soul-captured via [name]")
 

diff --git a/code/game/jobs/job/centcom.dm b/code/game/jobs/job/centcom.dm
@@ -15,7 +15,7 @@
 	minimal_player_age = 14
 	minimal_player_ingame_minutes = 2400
 	outfit = /datum/outfit/job/blueshield
-	restricted_species = list(SKRELL, UNATHI, TAJARAN, DIONA, VOX, IPC)
+	restricted_species = list(SKRELL, UNATHI, TAJARAN, DIONA, VOX, IPC, PLUVIAN)
 	skillsets = list("Blueshield Officer" = /datum/skillset/blueshield)
 	/*
 		HEY YOU!
@@ -46,5 +46,5 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(SKRELL, UNATHI, TAJARAN, DIONA, VOX, IPC)
+	restricted_species = list(SKRELL, UNATHI, TAJARAN, DIONA, VOX, IPC, PLUVIAN)
 	flags = JOB_FLAG_CENTCOMREPRESENTATIVE|JOB_FLAG_BLUESHIELD_PROTEC
diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm
@@ -16,6 +16,7 @@
 	outfit = /datum/outfit/job/chaplain
 	skillsets = list("Chaplain" = /datum/skillset/chaplain)
 	flags = JOB_FLAG_CIVIL
+	restricted_species = list(PLUVIAN)
 
 /datum/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(!visualsOnly && H.mind)

diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
@@ -27,7 +27,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(SKRELL, UNATHI, TAJARAN, DIONA, VOX, IPC)
+	restricted_species = list(SKRELL, UNATHI, TAJARAN, DIONA, VOX, IPC , PLUVIAN)
 	flags = JOB_FLAG_SECURITY|JOB_FLAG_COMMAND|JOB_FLAG_HEAD_OF_STAFF|JOB_FLAG_BLUESHIELD_PROTEC
 
 /datum/job/warden
@@ -52,7 +52,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(TAJARAN, DIONA, VOX, IPC)
+	restricted_species = list(TAJARAN, DIONA, VOX, IPC, PLUVIAN)
 	flags = JOB_FLAG_SECURITY
 
 /datum/job/warden/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -81,7 +81,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(DIONA, IPC)
+	restricted_species = list(DIONA, IPC, PLUVIAN)
 	flags = JOB_FLAG_SECURITY
 
 /datum/job/officer
@@ -106,7 +106,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(DIONA, TAJARAN, VOX, IPC)
+	restricted_species = list(DIONA, TAJARAN, VOX, IPC, PLUVIAN)
 	flags = JOB_FLAG_SECURITY
 
 /datum/job/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -136,7 +136,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(UNATHI, DIONA)
+	restricted_species = list(UNATHI, DIONA, PLUVIAN)
 	flags = JOB_FLAG_SECURITY
 
 /datum/job/cadet
@@ -161,5 +161,5 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(DIONA, TAJARAN, VOX, IPC)
+	restricted_species = list(DIONA, TAJARAN, VOX, IPC, PLUVIAN)
 	flags = JOB_FLAG_SECURITY
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
@@ -207,7 +207,7 @@
 
 /obj/machinery/gibber/proc/gib_mob(mob/user)
 	occupant.log_combat(user, "gibbed via [name]")
-
+	SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, occupant)
 	occupant.ghostize(bancheck = TRUE)
 
 	occupant.harvest()

diff --git a/code/game/machinery/vending/eat.dm b/code/game/machinery/vending/eat.dm
@@ -152,6 +152,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/chinese/sweetsourchickenball = 6,
 		/obj/item/weapon/reagent_containers/food/snacks/chinese/newdles = 6,
 		/obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 6,
+		/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice = 12,
 		/obj/item/weapon/kitchen/utensil/fork/sticks = 18,
 	)
 	prices = list(
@@ -160,6 +161,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/chinese/sweetsourchickenball = 25,
 		/obj/item/weapon/reagent_containers/food/snacks/chinese/newdles = 25,
 		/obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 25,
+		/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice = 50,
 		/obj/item/weapon/kitchen/utensil/fork/sticks = 1,
 	)
 	refill_canister = /obj/item/weapon/vending_refill/chinese

diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
@@ -80,6 +80,7 @@
 			chassis.visible_message("<span class='warning'>[chassis] squeezes [target].</span>")
 
 			M.log_combat(chassis.occupant, "attacked via [chassis]'s [name]")
+			SEND_SIGNAL(chassis.occupant, COMSIG_HUMAN_HARMED_OTHER, M)
 		else
 			step_away(M,chassis)
 			occupant_message("You push [target] out of the way.")
@@ -145,6 +146,7 @@
 				if(isliving(target))
 					var/mob/living/M = target
 					M.log_combat(chassis.occupant, "attacked via [chassis]'s [name]")
+					SEND_SIGNAL(chassis.occupant, COMSIG_HUMAN_HARMED_OTHER, M)
 
 				log_message("Drilled through [target]")
 				target.ex_act(EXPLODE_HEAVY)
@@ -212,6 +214,8 @@
 				if(isliving(target))
 					var/mob/living/M = target
 					M.log_combat(chassis.occupant, "attacked via [chassis]'s [name]")
+					SEND_SIGNAL(chassis.occupant, COMSIG_HUMAN_HARMED_OTHER, M)
+
 				log_message("Drilled through [target]")
 				target.ex_act(EXPLODE_HEAVY)
 	return 1