Merge remote-tracking branch 'upstream/master'

code/game/machinery/computer/communications.dm

@@ -84,6 +84,7 @@
 		authorize_access = get_all_accesses()
 	to_chat(user, "<span class='danger'>You scramble the communication routing circuits!</span>")
 	playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
+	SSshuttle.shuttle_purchase_requirements_met["emagged"] = TRUE
 	return
 
 /obj/machinery/computer/communications/ui_act(action, list/params)

code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm

@@ -238,3 +238,9 @@
 /proc/__nan()
 	var/list/L = json_decode("{\"value\":NaN}")
 	return L["value"]
+
+/**
+ * Wrapper to return a copy of contents, as SDQL2 can't tell an internal list from a normal list.
+ */
+/atom/proc/_contents()
+	return contents.Copy()

code/modules/antagonists/_common/antag_datum.dm

@@ -111,7 +111,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 			var/datum/skill_modifier/job/M = GLOB.skill_modifiers[GET_SKILL_MOD_ID(A, type)]
 			if(istype(M))
 				M.name = "[name] Training"
-	owner.AddComponent(/datum/component/activity)
+	owner.current.AddComponent(/datum/component/activity)
 	SEND_SIGNAL(owner.current, COMSIG_MOB_ANTAG_ON_GAIN, src)
 
 /datum/antagonist/proc/is_banned(mob/M)

code/modules/antagonists/eldritch_cult/eldritch_items.dm

@@ -229,8 +229,8 @@
 	flags_inv = NONE
 	flags_cover = NONE
 	desc = "Black like tar, doesn't reflect any light. Runic symbols line the outside, with each flash you lose comprehension of what you are seeing."
-	item_flags = EXAMINE_SKIP
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	obj_flags = NONE | EXAMINE_SKIP
 
 /obj/item/clothing/suit/hooded/cultrobes/void
 	name = "void cloak"
@@ -253,9 +253,10 @@
 		//We need to account for the hood shenanigans, and that way we can make sure items always fit, even if one of the slots is used by the fucking hood.
 		if(suittoggled)
 			to_chat(carbon_user,"<span class='notice'>The light shifts around you making the cloak invisible!</span>")
-		else
+			obj_flags |= EXAMINE_SKIP
+		else if(obj_flags & EXAMINE_SKIP) // ensures that it won't toggle visibility if raising the hood failed
 			to_chat(carbon_user,"<span class='notice'>The kaleidoscope of colours collapses around you, as the cloak shifts to visibility!</span>")
-		item_flags = suittoggled ? EXAMINE_SKIP : ~EXAMINE_SKIP
+			obj_flags ^= EXAMINE_SKIP
 	else
 		to_chat(carbon_user,"<span class='danger'>You can't force the hood onto your head!</span>")
 

code/modules/mob/living/carbon/human/examine.dm

@@ -41,10 +41,10 @@
 
 		. += "[t_He] [t_is] wearing [w_uniform.get_examine_string(user)][accessory_msg]."
 	//head
-	if(head && !(head.item_flags & EXAMINE_SKIP))
+	if(head && !(head.obj_flags & EXAMINE_SKIP))
 		. += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head."
 	//suit/armor
-	if(wear_suit && !(wear_suit.item_flags & EXAMINE_SKIP))
+	if(wear_suit && !(wear_suit.obj_flags & EXAMINE_SKIP))
 		. += "[t_He] [t_is] wearing [wear_suit.get_examine_string(user)]."
 		//suit/armor storage
 		if(s_store && !(SLOT_S_STORE in obscured))

code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm

@@ -134,7 +134,7 @@ Difficulty: Hard
 /mob/living/simple_animal/hostile/megafauna/bubblegum/grant_achievement(medaltype,scoretype)
 	. = ..()
 	if(.)
-		SSshuttle.shuttle_purchase_requirements_met |= "bubblegum"
+		SSshuttle.shuttle_purchase_requirements_met["bubblegum"] = TRUE
 
 /mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
 	if(!charging)

html/changelog.html

@@ -50,6 +50,23 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">21 May 2021</h2>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed activity being attached to minds instead of mobs on antag attach.</li>
+			</ul>
+
+			<h2 class="date">20 May 2021</h2>
+			<h3 class="author">qweq12yt updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed void cloak voiding itself into oblivion.</li>
+				<li class="bugfix">You can now order emag shuttles again.</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">ports rp's marking system</li>
+			</ul>
+
 			<h2 class="date">19 May 2021</h2>
 			<h3 class="author">WanderingFox95 updated:</h3>
 			<ul class="changes bgimages16">
@@ -719,48 +736,6 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Bluespace beaker filling icons for that narrow band between 90 and 80% full now actually exist.</li>
 			</ul>
-
-			<h2 class="date">19 March 2021</h2>
-			<h3 class="author">DeltaFire15 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscdel">Bluespace jars can no longer be printed / acquired from lathes / techwebs. tweak: The travelling animal trader now gives you your reward in a one-use bluespace jar.</li>
-			</ul>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">"Antag" role that can be toggled to disable all antags</li>
-			</ul>
-			<h3 class="author">SandPoot updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Tactitool Skirtleneck.</li>
-				<li class="rscadd">Adds the tactitool skirtleneck to the loadout.</li>
-			</ul>
-			<h3 class="author">kiwedespars updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">New heretic path - Path of Void- it specializes in being extremely stealthy. tweak : Removed curse of blindness replaced with mask of madness. hey it even rhymes.</li>
-				<li class="bugfix">fixes heretic mass deletion during transmutation bug.</li>
-				<li class="bugfix">Fixes heretic brews being permanent.</li>
-				<li class="bugfix">Fixes void storm breaking after resurrecting. tweak: Heretic has received a minor textual facelift. tweak: Heretics who finish the Void Path and become an Aristocrat of the Void can now survive in the Void (space).</li>
-				<li class="bugfix">Heretics who research Aristocrats Way on the Void Path will no longer suffocate in their own storm when they ascend (no longer breathes).</li>
-				<li class="bugfix">Mark of Void and Seeking Blade are once again exclusive only to Void.</li>
-				<li class="balance">Carving knife now deals more damage on throw and can embed in your enemies. tweak: Grasp of Rust only rusts floors and machines on harm intent. tweak: when u choose a sac target as heretic it ll also tell the job of the sac</li>
-				<li class="rscadd">2 new void spells, one a placeholder.</li>
-				<li class="rscadd">flesh mansus grasp buffed, now gives you 5u eldritch fluid when hitting someone.</li>
-			</ul>
-			<h3 class="author">zeroisthebiggay updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixes spriteless heretic book</li>
-			</ul>
-
-			<h2 class="date">18 March 2021</h2>
-			<h3 class="author">Arturlang updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Combat mode right click and right click verb give's are now actualyl targeted</li>
-			</ul>
-			<h3 class="author">Hatterhat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Hypospray vials are now printable from the medical techshift start.</li>
-				<li class="rscadd">Empty hypospray kits are now printable behind biological technology. tweak: Quantum electromag (T4 lasers) are now behind Advanced Bluespace like the rest of T4.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -29323,3 +29323,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: New Alcohol Amaretto and various cocktails
   - rscadd: more drink mixture flavortext
   - soundadd: you're going to Baystation
+2021-05-20:
+  qweq12yt:
+  - bugfix: Fixed void cloak voiding itself into oblivion.
+  - bugfix: You can now order emag shuttles again.
+  timothyteakettle:
+  - rscadd: ports rp's marking system
+2021-05-21:
+  Putnam3145:
+  - bugfix: Fixed activity being attached to minds instead of mobs on antag attach.

html/changelogs/AutoChangeLog-pr-14653.yml

@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - rscadd: "ports rp's marking system"