Merge remote-tracking branch 'upstream/master' into PortsPsionics

Author: cowbot92

_maps/RandomRuins/SpaceRuins/oldstation.dmm

@@ -6392,7 +6392,7 @@
 	dir = 4
 	},
 /obj/item/clothing/suit/space/nasavoid/old{
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 90, "fire" = 40, "acid" = 70);
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 70);
 	name = "Radiation Response Voidsuit";
 	desc = "A modified version of a CentCom engineering voidsuit used to respond to radiological emergencies."
 	},

code/_onclick/hud/fullscreen.dm

@@ -14,7 +14,7 @@
 	if (client && screen.should_show_to(src))
 		screen.update_for_view(client.view)
 		client.screen += screen
-	
+
 	if(screen.needs_offsetting)
 		SET_PLANE_EXPLICIT(screen, PLANE_TO_TRUE(screen.plane), src)
 
@@ -241,3 +241,9 @@
 	icon_state = "blue_eye"
 	plane = FULLSCREEN_PLANE
 	layer = CURSE_LAYER
+
+/// Blindspot quirk - has 4 directions
+/atom/movable/screen/fullscreen/blindspot
+	icon_state = "blindspot"
+	plane = FULLSCREEN_PLANE
+	layer = BLIND_LAYER

code/datums/traits/negative.dm

@@ -678,7 +678,7 @@
 	gain_text = span_danger("You remember your allergic reaction to a common medicine.")
 	lose_text = span_notice("You no longer are allergic to medicine.")
 
-	var/allergy_chem_list = list(	
+	var/allergy_chem_list = list(
 		/datum/reagent/medicine/inacusiate,
 		/datum/reagent/medicine/silver_sulfadiazine,
 		/datum/reagent/medicine/styptic_powder,
@@ -707,7 +707,7 @@
 	var/reagent_id
 	COOLDOWN_DECLARE(allergies)
 	/// how long allergies last after getting rid of the allergen
-	var/cooldown_duration = 10 SECONDS 
+	var/cooldown_duration = 10 SECONDS
 	/// Wether the person is experiencing anaphylatic shock or not
 	COOLDOWN_DECLARE(anaphylaxis)
 	/// How long anaphylactic shock lasts
@@ -751,7 +751,7 @@
 
 	else if(!COOLDOWN_FINISHED(src, allergies)) //if the cooldown is going
 		//external indicator that it's happening
-		if(prob(50)) 
+		if(prob(50))
 			switch(rand(0, 2))
 				if(0)
 					H.emote("cough")
@@ -1035,3 +1035,65 @@
 	if(species_type == /datum/species/ipc) // IPCs cant use psionics normally
 		return "You have no brain!"
 	return FALSE
+
+/datum/quirk/blindspot
+	name = "Blindspot"
+	desc = "You lack the sixth sense and cannot see behind yourself."
+	icon = "arrows-to-eye"
+	gain_text = span_danger("You can't see behind yourself anymore.")
+	lose_text = span_notice("You can see behind yourself again.")
+	value = -2
+	medical_record_text = "Patient has trouble with spatial awareness."
+
+#define BLINDSPOT_NORTH "blindspotN"
+#define BLINDSPOT_SOUTH "blindspotS"
+#define BLINDSPOT_EAST "blindspotE"
+#define BLINDSPOT_WEST "blindspotW"
+
+/datum/quirk/blindspot/add()
+	quirk_holder.blindspot_overlay = new/list(10)
+	var/atom/movable/screen/fullscreen/blindspot/north_blindspot = quirk_holder.overlay_fullscreen(BLINDSPOT_NORTH, /atom/movable/screen/fullscreen/blindspot)
+	var/atom/movable/screen/fullscreen/blindspot/south_blindspot = quirk_holder.overlay_fullscreen(BLINDSPOT_SOUTH, /atom/movable/screen/fullscreen/blindspot)
+	var/atom/movable/screen/fullscreen/blindspot/east_blindspot = quirk_holder.overlay_fullscreen(BLINDSPOT_EAST, /atom/movable/screen/fullscreen/blindspot)
+	var/atom/movable/screen/fullscreen/blindspot/west_blindspot = quirk_holder.overlay_fullscreen(BLINDSPOT_WEST, /atom/movable/screen/fullscreen/blindspot)
+	quirk_holder.blindspot_overlay[NORTH] = WEAKREF(north_blindspot)
+	quirk_holder.blindspot_overlay[SOUTH] = WEAKREF(south_blindspot)
+	quirk_holder.blindspot_overlay[EAST] = WEAKREF(east_blindspot)
+	quirk_holder.blindspot_overlay[WEST] = WEAKREF(west_blindspot)
+	north_blindspot.dir = NORTH
+	south_blindspot.dir = SOUTH
+	east_blindspot.dir = EAST
+	west_blindspot.dir = WEST
+	north_blindspot.alpha = (quirk_holder.dir == NORTH) * 255
+	south_blindspot.alpha = (quirk_holder.dir == SOUTH) * 255
+	east_blindspot.alpha = (quirk_holder.dir == EAST) * 255
+	west_blindspot.alpha = (quirk_holder.dir == WEST) * 255
+	RegisterSignal(quirk_holder, COMSIG_ATOM_DIR_CHANGE, PROC_REF(change_dir))
+
+/datum/quirk/blindspot/remove()
+	quirk_holder.clear_fullscreen(BLINDSPOT_NORTH)
+	quirk_holder.clear_fullscreen(BLINDSPOT_SOUTH)
+	quirk_holder.clear_fullscreen(BLINDSPOT_EAST)
+	quirk_holder.clear_fullscreen(BLINDSPOT_WEST)
+	quirk_holder.blindspot_overlay = null
+	UnregisterSignal(quirk_holder, COMSIG_ATOM_DIR_CHANGE)
+
+/datum/quirk/blindspot/proc/change_dir(atom/movable/source, olddir, newdir)
+	SIGNAL_HANDLER
+	if(olddir == 0 || newdir == 0)
+		return
+	if(olddir == newdir)
+		return
+	if(!quirk_holder.blindspot_overlay)
+		return
+	var/atom/movable/screen/fullscreen/blindspot/old_spot = quirk_holder.blindspot_overlay[olddir]?.resolve()
+	var/atom/movable/screen/fullscreen/blindspot/new_spot = quirk_holder.blindspot_overlay[newdir]?.resolve()
+	if(!istype(old_spot) || !istype(new_spot))
+		return
+	animate(old_spot, 0.5 SECONDS, easing = CIRCULAR_EASING|EASE_IN, alpha = 0)
+	animate(new_spot, 0.5 SECONDS, easing = CIRCULAR_EASING|EASE_OUT, alpha = 255)
+
+#undef BLINDSPOT_NORTH
+#undef BLINDSPOT_SOUTH
+#undef BLINDSPOT_EAST
+#undef BLINDSPOT_WEST

code/game/atom/_atom.dm

@@ -424,7 +424,7 @@
 	if(uses_integrity)
 		playsound(src, P.hitsound, 50, 1)
 		visible_message(span_danger("[src] is hit by \a [P]!"), null, null, COMBAT_MESSAGE_RANGE)
-		if(!QDELETED(src)) //Bullet on_hit effect might have already destroyed this object
+		if(!QDELETED(src) && !P.nodamage) //Bullet on_hit effect might have already destroyed this object
 			take_damage(P.damage * P.demolition_mod, P.damage_type, P.armor_flag, 0, turn(P.dir, 180), P.armour_penetration)
 
 ///Return true if we're inside the passed in atom

code/modules/jobs/job_types/clown.dm

@@ -12,8 +12,7 @@
 
 	alt_titles = list("Entertainer", "Comedian", "Jester", "Improv Artist")
 
-	added_access = list(ACCESS_MAINT_TUNNELS)
-	base_access = list(ACCESS_SERVICE, ACCESS_THEATRE)
+	base_access = list(ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
 
 	paycheck = PAYCHECK_MINIMAL
 	paycheck_department = ACCOUNT_SRV

code/modules/jobs/job_types/mime.dm

@@ -12,8 +12,7 @@
 
 	alt_titles = list("Mute Entertainer", "Silent Jokester", "Pantomimist")
 
-	added_access = list(ACCESS_MAINT_TUNNELS)
-	base_access = list(ACCESS_SERVICE, ACCESS_THEATRE)
+	base_access = list(ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
 	paycheck = PAYCHECK_MINIMAL
 	paycheck_department = ACCOUNT_SRV
 

code/modules/mob/dead/new_player/login.dm

@@ -23,7 +23,7 @@
 	sight |= SEE_TURFS
 
 	new_player_panel()
-	client?.playtitlemusic()
+	
 
 	if(GLOB.admin_event)
 		GLOB.admin_event.show_info(src)
@@ -36,3 +36,5 @@
 		else
 			postfix = "soon"
 		to_chat(src, "Please set up your character and select \"Ready\". The game will start [postfix].")
+
+	spawn(3 SECONDS) client?.playtitlemusic()

code/modules/mob/living/carbon/human/species_types/shadowpeople.dm

@@ -206,7 +206,7 @@
 
 /datum/species/shadow/darkspawn/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
-	C.fully_replace_character_name("[C.real_name]", darkspawn_name())
+	C.fully_replace_character_name(null, darkspawn_name())
 
 /datum/species/shadow/darkspawn/spec_updatehealth(mob/living/carbon/human/H)
 	var/datum/antagonist/darkspawn/antag = isdarkspawn(H)

code/modules/mob/mob_defines.dm

@@ -249,6 +249,9 @@
 	///Contains the fullscreen overlays the mob can see (from 'code/_onclick/hud/fullscreen.dm')
 	var/list/screens = list()
 
+	/// Contains the blindspot overlays, if they are in use
+	var/list/datum/weakref/blindspot_overlay
+
 	///The HUD type the mob will gain on Initialize. (from 'code/_onclick/hud/hud.dm')
 	var/hud_type = /datum/hud
 

html/changelog.html

@@ -57,6 +57,21 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">02 January 2025</h2>
+			<h3 class="author">cowbot92 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Adjusts clown/mime access</li>
+				<li class="tweak">Tweaked charlie station rad armor values</li>
+			</ul>
+			<h3 class="author">warface1234455 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fix no damage projectiles from damaging stuffs with integrity</li>
+			</ul>
+			<h3 class="author">ynot01 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a new quirk - Blindspot.</li>
+			</ul>
+
 			<h2 class="date">31 December 2024</h2>
 			<h3 class="author">Oblisk234 updated:</h3>
 			<ul class="changes bgimages16">
@@ -65,6 +80,10 @@ <h3 class="author">Oblisk234 updated:</h3>
 				<li class="bugfix">Mentor-maintainers/issue hunters' OOC tag will no longer evaporate into [] after readminning, deadminning, and rementoring.</li>
 				<li class="bugfix">Discord mentor messages are now recorded in mhelp database and mentor tickets.</li>
 			</ul>
+			<h3 class="author">ynot01 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed xenos & monkeys being unable to strip</li>
+			</ul>
 
 			<h2 class="date">30 December 2024</h2>
 			<h3 class="author">SapphicOverload, UselessTheremin updated:</h3>
@@ -678,65 +697,6 @@ <h3 class="author">ToasterBiome updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Adds .38 Special and .38 Rubber ammo boxes and adds them to autolathe</li>
 			</ul>
-
-			<h2 class="date">02 October 2024</h2>
-			<h3 class="author">AMyriad updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Staircases are now always shaded properly (see: IceMeta)</li>
-				<li class="mapping">Touched up on a lot of maps using ramp shadows, replaced all old stair sprites with new ones</li>
-				<li class="mapping">Some tiles outside the underground alien lab on icemoon will no longer protect from snow storm</li>
-			</ul>
-			<h3 class="author">Moltijoe updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Now mentions divulging in the darkspawn antag info panel</li>
-				<li class="rscadd">Lets you see through jungleland trees if you're behind them</li>
-				<li class="tweak">shifts around some jungleland biome flora spawns to make it feel better to traverse</li>
-			</ul>
-			<h3 class="author">Mqiib updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Caltrops now only slow if the damage is below 5</li>
-				<li class="tweak">Digitigrade legs are slightly more resistant to caltrops (75%)</li>
-			</ul>
-			<h3 class="author">N3D6, @ChesterTheCheesy updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">icy chest sprites</li>
-				<li class="rscadd">you can now cause icemoon caves to cave in, dropping an icy necropolis chest</li>
-			</ul>
-			<h3 class="author">N3D6, Baiomu made the glacite ore sprite updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">code for hardened ice generation</li>
-				<li class="rscadd">Plasma glacite, the icemoon equivalent of plasma magmite</li>
-				<li class="rscadd">The moon anvil, a new subtype of the world anvil that appears on the underground level of icemoon</li>
-				<li class="rscadd">Glacite mega crusher</li>
-				<li class="tweak">makes icemoon mineral walls use the normal snow sprite instead of a special one</li>
-				<li class="mapping">moon anvil ruin</li>
-				<li class="imageadd">sprites for glacite</li>
-				<li class="imageadd">glacite crusher sprites</li>
-			</ul>
-			<h3 class="author">Oblisk234 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Split personalities and imaginary friends can now understand their hosts' languages.</li>
-			</ul>
-			<h3 class="author">SapphicOverload updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Makes grabbing a keybind that can be changed to something other than ctrl.</li>
-				<li class="rscadd">Grabbing can now be toggled on and off with a separate keybind.</li>
-				<li class="bugfix">Fixed ctrl-click not grabbing stuff</li>
-			</ul>
-			<h3 class="author">Scrambledeggs00 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added hand scooping, multiscooping, and scooping failure</li>
-				<li class="tweak">Tweaked info_tab, scoop flavortypes, and made vat upgradable</li>
-				<li class="imageadd">Added sprites for cone box and service hatch for vat</li>
-			</ul>
-			<h3 class="author">missatessatessy because people should look at the wiki page they did updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">readds the TEG back to engine rotation</li>
-			</ul>
-			<h3 class="author">tattax updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed lizard prison jumpsuit sprite + offset</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>