Merge remote-tracking branch 'origin/master' into luciee

code/game/gamemodes/traitor/double_agents.dm

@@ -18,6 +18,7 @@
 	traitors_possible = 10 //hard limit on traitors if scaling is turned off
 	num_modifier = 4 // Four additional traitors
 	antag_datum = /datum/antagonist/traitor/internal_affairs
+	restricted_jobs = list("AI", "Cyborg")//Yogs -- Silicons can no longer be IAA
 
 	announce_text = "There are Nanotrasen Internal Affairs Agents trying to kill each other!\n\
 	<span class='danger'>IAA</span>: Eliminate your targets and protect yourself!\n\

code/game/objects/effects/spawners/food_drink.dm

@@ -0,0 +1,19 @@
+/obj/effect/randomfood /// Spawns a random food item, then deletes
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "random_food"
+
+/obj/effect/randomfood/Initialize(mapload, mob/living/source_mob, list/datum/disease/diseases)
+	. = ..()
+	var/obj/spawned = get_random_food()
+	new spawned(loc)
+	return INITIALIZE_HINT_QDEL
+
+/obj/effect/randomdrink /// Spawns a random drink item, then deletes
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "random_drink"
+
+/obj/effect/randomdrink/Initialize(mapload, mob/living/source_mob, list/datum/disease/diseases)
+	. = ..()
+	var/obj/spawned = get_random_drink()
+	new spawned(loc)
+	return INITIALIZE_HINT_QDEL

code/modules/client/preferences.dm

@@ -333,7 +333,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<a href='?_src_=prefs;preference=ethcolor;task=input'>Change</a> <a href ='?_src_=prefs;preference=ethcolor;task=lock'>[random_locks["ethcolor"] ? "Unlock" : "Lock"]</a><BR>"
 
 
-			if((EYECOLOR in pref_species.species_traits) && !(NOEYESPRITES in pref_species.species_traits))
+			if((EYECOLOR in pref_species.species_traits) || !(NOEYESPRITES in pref_species.species_traits))
 
 				if(!use_skintones && !mutant_colors)
 					dat += APPEARANCE_CATEGORY_COLUMN

code/modules/clothing/spacesuits/plasmamen.dm

@@ -47,6 +47,7 @@
 	var/brightness_on = 4 //luminosity when the light is on
 	var/on = FALSE
 	actions_types = list(/datum/action/item_action/toggle_helmet_light)
+	flash_protect = 0
 
 /obj/item/clothing/head/helmet/space/plasmaman/attack_self(mob/user)
 	toggle_helmet_light(user)

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

@@ -2174,7 +2174,7 @@
 //ETHEREAL FACE MARKINGS
 /datum/sprite_accessory/ethereal_mark
 	icon = 'icons/mob/mutant_bodyparts.dmi'
-	//color_src = MUTCOLORS
+	color_src = EYECOLOR
 
 /datum/sprite_accessory/ethereal_mark/eyes
 	name = "Eyes"

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

@@ -20,7 +20,7 @@
 	payday_modifier = 0.7 //Neutrally useful to NT
 	attack_type = BURN //burn bish
 	damage_overlay_type = "" //We are too cool for regular damage overlays
-	species_traits = list(NOEYESPRITES,DYNCOLORS, AGENDER, NO_UNDERWEAR, HAIR, FACEHAIR, HAS_FLESH, HAS_BONE) // i mean i guess they have blood so they can have wounds too
+	species_traits = list(NOEYESPRITES, EYECOLOR, DYNCOLORS, AGENDER, NO_UNDERWEAR, HAIR, FACEHAIR, HAS_FLESH, HAS_BONE) // i mean i guess they have blood so they can have wounds too
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
 	inherent_traits = list(TRAIT_NOHUNGER)
 	mutant_bodyparts = list("ethereal_mark")

html/changelog.html

@@ -58,6 +58,37 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">20 July 2022</h2>
+			<h3 class="author">N3D6 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">hop, cap and the bridge now have gun rechargers on gax</li>
+			</ul>
+			<h3 class="author">VaelophisNyx updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">disposals on Gaxstation work properly</li>
+				<li class="bugfix">removes random layered straight disposal pipe from security, and xenobiology</li>
+				<li class="rscadd">adds a disposal outlet to virology, toxins, toxins launch chamber, and xenobiology</li>
+				<li class="tweak">Central Primary Hallway pipes on Gaxstation now form a proper loop</li>
+				<li class="rscadd">adds surgical holosigns to Gaxstation Surgery</li>
+				<li class="rscadd">adds a grinder and two sheets of plasma to Gaxstation virology</li>
+				<li class="tweak">cargo disposals outlet removed, cargo bay deliveries are pathed instead to the chute over by the desk</li>
+			</ul>
+			<h3 class="author">ynot01 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed AI from IAA</li>
+			</ul>
+
+			<h2 class="date">19 July 2022</h2>
+			<h3 class="author">Chubbygummibear updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You can choose the color of your Ethereal face mark with eye color</li>
+				<li class="tweak">Ethereals have the eye color tag now.</li>
+			</ul>
+			<h3 class="author">Mqiib updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Chaplains now hate jokes, but only magic ones.</li>
+			</ul>
+
 			<h2 class="date">18 July 2022</h2>
 			<h3 class="author">N3D6 updated:</h3>
 			<ul class="changes bgimages16">
@@ -2528,50 +2559,6 @@
 				<li class="tweak">eatin ethereal meat makes ya glow</li>
 				<li class="bugfix">Slips no longer stop tails wagging</li>
 			</ul>
-
-			<h2 class="date">20 April 2022</h2>
-			<h3 class="author">nmajask updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed alien crowbars being invisible</li>
-			</ul>
-
-			<h2 class="date">19 April 2022</h2>
-			<h3 class="author"> SomeAngryMiner, ImSynthex, Ebb-Real, KathyRyals updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added Chief Medical Officer belt, which the CMO starts equipped with and uses soulless codersprites</li>
-				<li class="imageadd">added new soulless sprites for the utility belt, CE's belt, and medical belt</li>
-				<li class="imageadd">added belt overlays for abductor tools and surgical tools</li>
-				<li class="bugfix">CMO now starts with a skirt if their player chooses to start with one</li>
-			</ul>
-			<h3 class="author">Alagoinha updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">patches a missing floor</li>
-			</ul>
-			<h3 class="author">JamieD1 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Time requirement for malf AI now 10 hours.</li>
-			</ul>
-			<h3 class="author">Mqiib updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixes the AP on two of the flying fang martial art attacks</li>
-			</ul>
-			<h3 class="author">Readystorm546 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscdel">Removed duplicate camera on Yogbox</li>
-				<li class="rscdel">Removed tinted windows on one side and moved them to the other on Yogbox.</li>
-			</ul>
-			<h3 class="author">SomeguyManperson updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">digging with bombs is now rewarded with a *2 mineral bonus rather than a +2 one</li>
-			</ul>
-			<h3 class="author">ToasterBiome updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">big red button toy now has a variable that controls the sound</li>
-			</ul>
-			<h3 class="author">maxion12345 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">pipebomb dmi tweak</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -32822,3 +32822,24 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: wires the meta medbay treatment center,
   - tweak: adds some firelocks to meta medbay
   - tweak: fixed the cooler in meta medbay
+2022-07-19:
+  Chubbygummibear:
+  - rscadd: You can choose the color of your Ethereal face mark with eye color
+  - tweak: Ethereals have the eye color tag now.
+  Mqiib:
+  - tweak: Chaplains now hate jokes, but only magic ones.
+2022-07-20:
+  N3D6:
+  - tweak: hop, cap and the bridge now have gun rechargers on gax
+  VaelophisNyx:
+  - bugfix: disposals on Gaxstation work properly
+  - bugfix: removes random layered straight disposal pipe from security, and xenobiology
+  - rscadd: adds a disposal outlet to virology, toxins, toxins launch chamber, and
+      xenobiology
+  - tweak: Central Primary Hallway pipes on Gaxstation now form a proper loop
+  - rscadd: adds surgical holosigns to Gaxstation Surgery
+  - rscadd: adds a grinder and two sheets of plasma to Gaxstation virology
+  - tweak: cargo disposals outlet removed, cargo bay deliveries are pathed instead
+      to the chute over by the desk
+  ynot01:
+  - rscdel: Removed AI from IAA

html/changelogs/AutoChangelog-pr-14921.yml

@@ -0,0 +1,4 @@
+author: "adamsong"
+delete-after: true 
+changes: 
+  - bugfix: "fixed envirosuit helmets having flash protected"

html/changelogs/AutoChangelog-pr-14931.yml

@@ -0,0 +1,4 @@
+author: "ToasterBiome"
+delete-after: true 
+changes: 
+  - bugfix: "ai whale on gax will spawn more consistently (at all this time)"

yogstation.dme

@@ -936,6 +936,7 @@
 #include "code\game\objects\effects\effect_system\effects_water.dm"
 #include "code\game\objects\effects\spawners\bombspawner.dm"
 #include "code\game\objects\effects\spawners\bundle.dm"
+#include "code\game\objects\effects\spawners\food_drink.dm"
 #include "code\game\objects\effects\spawners\gibspawner.dm"
 #include "code\game\objects\effects\spawners\lootdrop.dm"
 #include "code\game\objects\effects\spawners\minor_variation.dm"

yogstation/code/modules/spells/cluwnecurse.dm

@@ -27,6 +27,9 @@
 	if(!(target in oview(range)))
 		to_chat(user, span_notice("They are too far away!"))
 		return
+	if(target.anti_magic_check())
+		to_chat(user, span_notice("They didn't laugh!"))
+		return
 	var/mob/living/carbon/human/H = target
 	H.cluwneify()