Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

2021-11-21 10:34:14 +08:00
parent fa6946fae4 f6ff310849
commit 8dcfea5817
213 changed files with 86534 additions and 1331 deletions
@@ -45,7 +45,7 @@
 	GLOB.poi_list -= src
 	return ..()

-/obj/structure/blob/core/ex_act(severity, target)
+/obj/structure/blob/core/ex_act(severity, target, origin)
 	var/damage = 50 - 10 * severity //remember, the core takes half brute damage, so this is 20/15/10 damage based on severity
 	take_damage(damage, BRUTE, "bomb", 0)

@@ -8,7 +8,7 @@
 		linked.examine(user)
 	return ..()

-/obj/effect/clockwork/overlay/ex_act()
+/obj/effect/clockwork/overlay/ex_act(severity, target, origin)
 	return FALSE

 /obj/effect/clockwork/overlay/singularity_act()
@@ -36,7 +36,7 @@
 		return TRUE
 	. = ..()

-/obj/effect/clockwork/sigil/ex_act(severity)
+/obj/effect/clockwork/sigil/ex_act(severity, target, origin)
 	visible_message("<span class='warning'>[src] scatters into thousands of particles.</span>")
 	qdel(src)

@@ -204,7 +204,7 @@
 	. = ..()
 	update_icon()

-/obj/effect/clockwork/sigil/transmission/ex_act(severity)
+/obj/effect/clockwork/sigil/transmission/ex_act(severity, target, origin)
 	if(severity == 3)
 		adjust_clockwork_power(500) //Light explosions charge the network!
 		visible_message("<span class='warning'>[src] flares a brilliant orange!</span>")
@@ -38,7 +38,7 @@
 /obj/effect/clockwork/servant_blocker/singularity_pull()
 	return

-/obj/effect/clockwork/servant_blocker/ex_act(severity, target)
+/obj/effect/clockwork/servant_blocker/ex_act(severity, target, origin)
 	return

 /obj/effect/clockwork/servant_blocker/safe_throw_at()
@@ -102,7 +102,7 @@
 		return TRUE
 	return ..()

-/obj/effect/clockwork/spatial_gateway/ex_act(severity)
+/obj/effect/clockwork/spatial_gateway/ex_act(severity, target, origin)
 	if(severity == 1 && uses)
 		uses = 0
 		visible_message("<span class='warning'>[src] is disrupted!</span>")
@@ -251,7 +251,7 @@
 	name = "stable gateway"
 	is_stable = TRUE

-/obj/effect/clockwork/spatial_gateway/stable/ex_act(severity)
+/obj/effect/clockwork/spatial_gateway/stable/ex_act(severity, target, origin)
 	if(severity == 1)
 		start_shutdown() //Yes, you can chain devastation-level explosions to delay a gateway shutdown, if you somehow manage to do it without breaking the obelisk. Is it worth it? Probably not.
 		return TRUE
@@ -214,5 +214,5 @@
 	sleep(3) //so the animation completes properly
 	qdel(src)

-/obj/effect/clockwork/judicial_marker/ex_act(severity)
+/obj/effect/clockwork/judicial_marker/ex_act(severity, target, origin)
 	return
@@ -231,3 +231,31 @@
 		to_chat(invoker, "<span class='nezbere'>\"Only one of my weapons may exist in this temporal stream!\"</span>")
 		return FALSE
 	return ..()
+
+/datum/clockwork_scripture/create_object/construct/cogscarab
+	descname = "Building Construct"
+	name = "Cogscarab"
+	desc = "Creates a shell for a cogscarab, a drone that helps build your base!"
+	invocations = list("Arise, drone!", "Create defenses for the true light!")
+	channel_time = 80
+	power_cost = 8000
+	creator_message = "<span class='brass'>Your slab disgorges several chunks of replicant alloy that form into a spiderlike shell.</span>"
+	usage_tip = "These machines will help you get a base built up while you go out to look for more followers."
+	tier = SCRIPTURE_APPLICATION
+	one_per_tile = TRUE
+	primary_component = BELLIGERENT_EYE
+	sort_priority = 9
+	quickbind = TRUE
+	quickbind_desc = "Creates a cogscarab, good for the backline."
+	object_path = /obj/item/clockwork/construct_chassis/cogscarab/
+	construct_type = /mob/living/simple_animal/drone/cogscarab
+	combat_construct = FALSE
+
+/datum/clockwork_scripture/create_object/construct/cogscarab/update_construct_limit()
+	var/human_servants = 0
+	for(var/V in SSticker.mode.servants_of_ratvar)
+		var/datum/mind/M = V
+		var/mob/living/L = M.current
+		if(ishuman(L) && L.stat != DEAD)
+			human_servants++
+	construct_limit = round(clamp((human_servants / 4), 1, 3))	//1 per 4 human servants, maximum of 3
@@ -197,7 +197,7 @@
 		glow = new /obj/effect/clockwork/overlay/gateway_glow(get_turf(src))
 		glow.linked = src

-/obj/structure/destructible/clockwork/massive/celestial_gateway/ex_act(severity)
+/obj/structure/destructible/clockwork/massive/celestial_gateway/ex_act(severity, target, origin)
 	var/damage = max((obj_integrity * 0.7) / severity, 100) //requires multiple bombs to take down
 	take_damage(damage, BRUTE, "bomb", 0)

@@ -241,3 +241,18 @@
 		parts += printplayerlist(members - eminence)

 	return "<div class='panel clockborder'>[parts.Join("<br>")]</div>"
+
+//I have no idea where to put this so I'm leaving it here. Loads reebe. Only one reebe can exist, so it's checked via a global var.
+/proc/load_reebe()
+	if(GLOB.reebe_loaded)
+		return TRUE
+	var/list/errorList = list()
+	var/list/reebes = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE)
+	if(errorList.len)	// reebe failed to load
+		message_admins("Reebe failed to load!")
+		log_game("Reebe failed to load!")
+		return FALSE
+	for(var/datum/parsed_map/PM in reebes)
+		PM.initTemplateBounds()
+	GLOB.reebe_loaded = TRUE
+	return TRUE
@@ -179,7 +179,7 @@
 /mob/living/carbon/true_devil/is_literate()
 	return 1

-/mob/living/carbon/true_devil/ex_act(severity, ex_target)
+/mob/living/carbon/true_devil/ex_act(severity, target, origin)
 	if(!ascended)
 		var/b_loss
 		switch (severity)
@@ -174,7 +174,7 @@

 //Immunities

-/mob/living/simple_animal/revenant/ex_act(severity, target)
+/mob/living/simple_animal/revenant/ex_act(severity, target, origin)
 	return 1 //Immune to the effects of explosions.

 /mob/living/simple_animal/revenant/wave_ex_act(power, datum/wave_explosion/explosion, dir)
@@ -249,7 +249,7 @@
 	released and fully healed, because in the end it's just a jape, \
 	sibling!</B>"

-/mob/living/simple_animal/slaughter/laughter/ex_act(severity)
+/mob/living/simple_animal/slaughter/laughter/ex_act(severity, target, origin)
 	switch(severity)
 		if(1)
 			death()