Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

2022-08-07 17:59:28 -07:00
parent cdaefe18f6 9a1a86b267
commit b2d816b825
382 changed files with 5255 additions and 2567 deletions
@@ -102,7 +102,7 @@
 		factory.spores += src
 	. = ..()

-/mob/living/simple_animal/hostile/blob/blobspore/BiologicalLife(seconds, times_fired)
+/mob/living/simple_animal/hostile/blob/blobspore/BiologicalLife(delta_time, times_fired)
 	if(!(. = ..()))
 		return
 	if(!is_zombie && isturf(src.loc))
@@ -233,7 +233,7 @@
 		return FALSE
 	return ..()

-/mob/living/simple_animal/hostile/blob/blobbernaut/BiologicalLife(seconds, times_fired)
+/mob/living/simple_animal/hostile/blob/blobbernaut/BiologicalLife(delta_time, times_fired)
 	if(!(. = ..()))
 		return
 	var/list/blobs_in_area = range(2, src)
@@ -2,7 +2,7 @@
 //	* MEZMERIZE
 //		LOVE:		Target falls in love with you. Being harmed directly causes them harm if they see it?
 //		STAY:		Target will do everything they can to stand in the same place.
-//		FOLLOW:		Target follows you, spouting random phrases from their history (or maybe Poly's or NPC's vocab?)
+//		FOLLOW:		Target follows you, spouting random phrases from their history (or maybe Polly's or NPC's vocab?)
 //		ATTACK:		Target finds a nearby non-Bloodsucker victim to attack.

 /datum/action/bloodsucker/targeted/mesmerize
@@ -16,7 +16,7 @@
 	var/req_stat = CONSCIOUS // CONSCIOUS, UNCONSCIOUS or DEAD
 	var/always_keep = 0 // important for abilities like revive that screw you if you lose them.
 	var/ignores_fakedeath = FALSE // usable with the FAKEDEATH flag
-	var/loudness = 0 //Determines how much having this ability will affect changeling blood tests. At 4, the blood will react violently and turn to ash, creating a unique message in the process. At 10, the blood will explode when heated.
+	var/loudness = 0.5 //Determines how much having this ability will affect changeling blood tests. This is averaged with other purchased abilities. Above 1, the blood will react violently and turn to ash, creating a unique message in the process. Above 2, the blood will explode when heated.


 /obj/effect/proc_holder/changeling/proc/on_purchase(mob/user, is_respec)
@@ -43,7 +43,7 @@
 /mob/living/simple_animal/hostile/clockwork/examine(mob/user)
 	var/t_He = p_they(TRUE)
 	var/t_s = p_s()
-	var/msg = "<span class='brass'>*---------*\nThis is [icon2html(src, user)] \a <b>[src]</b>!\n"
+	var/msg = "<span class='brass'>This is [icon2html(src, user)] \a <b>[src]</b>!\n"
 	msg += "[desc]\n"
 	if(health < maxHealth)
 		msg += "<span class='warning'>"
@@ -55,7 +55,7 @@
 	var/addendum = examine_info()
 	if(addendum)
 		msg += "[addendum]\n"
-	msg += "*---------*</span>"
+	msg += "</span>"

 	return list(msg)

@@ -38,7 +38,7 @@
 	. = ..()
 	true_name = pick(possible_true_names)

-/mob/living/simple_animal/hostile/clockwork/guardian/BiologicalLife(seconds, times_fired)
+/mob/living/simple_animal/hostile/clockwork/guardian/BiologicalLife(delta_time, times_fired)
 	..()
 	if(is_in_host())
 		if(!is_servant_of_ratvar(host))
@@ -39,7 +39,7 @@
 	if(!shield_health)
 		return "<span class='warning'>Its shield has been destroyed!</span>"

-/mob/living/simple_animal/hostile/clockwork/marauder/BiologicalLife(seconds, times_fired)
+/mob/living/simple_animal/hostile/clockwork/marauder/BiologicalLife(delta_time, times_fired)
 	if(!(. = ..()))
 		return
 	var/turf/T = get_turf(src)
@@ -48,7 +48,7 @@
 	..()
 	boost = world.time + 30

-/mob/living/simple_animal/imp/BiologicalLife(seconds, times_fired)
+/mob/living/simple_animal/imp/BiologicalLife(delta_time, times_fired)
 	if(!(. = ..()))
 		return
 	if(boost<world.time)
@@ -63,7 +63,7 @@


 /mob/living/carbon/true_devil/examine(mob/user)
-	. = list("<span class='info'>*---------*\nThis is [icon2html(src, user)] <b>[src]</b>!")
+	. = list("<span class='info'>This is [icon2html(src, user)] <b>[src]</b>!")

 	//Left hand items
 	for(var/obj/item/I in held_items)
@@ -81,7 +81,7 @@
 		. += "<span class='warning'>You can see hellfire inside its gaping wounds.</span>"
 	else if(health < (maxHealth/2))
 		. += "<span class='warning'>You can see hellfire inside its wounds.</span>"
-	. += "*---------*</span>"
+	. += "</span>"

 /mob/living/carbon/true_devil/IsAdvancedToolUser()
 	return 1
@@ -67,6 +67,11 @@
 		if(handler) // if we have a handler, the handler should track this gang
 			handler.gangs += my_gang
 			my_gang.current_theme = handler.current_theme
+		else if(GLOB.families_override_theme)
+			my_gang.current_theme = new GLOB.families_override_theme
+		else
+			var/theme_to_use = pick(subtypesof(/datum/gang_theme))
+			my_gang.current_theme = new theme_to_use
 		my_gang.name = gang_name
 		my_gang.gang_id = gang_id
 		my_gang.acceptable_clothes = acceptable_clothes.Copy()
@@ -66,9 +66,21 @@
 	icon_state = "nuclearbomb_base"
 	anchored = TRUE //stops it being moved

+/obj/machinery/nuclearbomb/selfdestruct/Initialize(mapload)
+	. = ..()
+	if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH] && prob(10))
+		name = "station-wide gender-reveal terminal"
+		desc = "For when the whole sector deserves to know a gender. But of whom? Don't ask."
+
 /obj/machinery/nuclearbomb/syndicate
 	//ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb

+/obj/machinery/nuclearbomb/syndicate/Initialize(mapload)
+	. = ..()
+	if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH] && prob(50))
+		name = "tactical gender-reveal device"
+		desc = "\"But whose gender is it revealing?\" you ponder. Don't worry. That comes later."
+
 /obj/machinery/nuclearbomb/syndicate/get_cinematic_type(off_station)
 	var/datum/game_mode/nuclear/NM = SSticker.mode
 	switch(off_station)
@@ -20,6 +20,7 @@
 		if(!SSpersistence.IsValidDebrisLocation(C.loc, allowed_turf_typecache, allowed_z_cache, C.type, FALSE))
 			continue
 		weight += 0.03
+		CHECK_TICK
 	return ..()

 /datum/round_event/ghost_role/slaughter