Merge remote-tracking branch 'upstream/master'

_maps/map_files/triumph/triumph-03-deck3.dmm

@@ -1892,6 +1892,7 @@
 /obj/structure/noticeboard{
 	pixel_y = 32
 	},
+/obj/structure/closet/bombcloset,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
 "bGD" = (

code/modules/admin/admin.dm

@@ -5,7 +5,7 @@ var/global/floorIsLava = 0
 
 ////////////////////////////////
 /proc/message_admins(var/msg)
-	msg = "<span class='admin log_message'><span class='prefix'>ADMIN LOG:</span> <span class='message'>[msg]</span></span>"
+	msg = "<span class='log_message'><span class='prefix'>ADMIN LOG:</span> <span class='message'>[msg]</span></span>"
 	//log_adminwarn(msg) //log_and_message_admins is for this
 
 	for(var/client/C in admins)
@@ -13,7 +13,7 @@ var/global/floorIsLava = 0
 			to_chat(C, msg)
 
 /proc/msg_admin_attack(var/text) //Toggleable Attack Messages
-	var/rendered = "<span class='admin log_message><span class='prefix'>ATTACK:</span> <span class='message'>[text]</span></span>"
+	var/rendered = "<span class='log_message><span class='prefix'>ATTACK:</span> <span class='message'>[text]</span></span>"
 	for(var/client/C in admins)
 		if((R_ADMIN|R_MOD) & C.holder.rights)
 			if(C.is_preference_enabled(/datum/client_preference/mod/show_attack_logs))

code/modules/clothing/clothing.dm

@@ -321,19 +321,22 @@
 	return 1
 
 /obj/item/clothing/gloves/dropped()
-	..()
+	. = ..()
 
 	if(!wearer)
 		return
 
-	var/mob/living/carbon/human/H = wearer
-	if(ring && istype(H))
-		if(!H.equip_to_slot_if_possible(ring, slot_gloves))
-			ring.forceMove(get_turf(src))
-		src.ring = null
+	if(ishuman(wearer))
+		restore_over_objects(wearer)
 	punch_force = initial(punch_force)
 	wearer = null
 
+/obj/item/clothing/gloves/proc/restore_over_objects(mob/living/carbon/human/wearer)
+	if(ring)
+		if(!wearer.equip_to_slot_if_possible(ring, slot_gloves))
+			ring.forceMove(get_turf(src))
+		ring = null
+
 /obj/item/clothing/gloves
 	var/datum/unarmed_attack/special_attack = null //do the gloves have a special unarmed attack?
 	var/special_attack_type = null

code/modules/clothing/gloves/gauntlets.dm

@@ -39,13 +39,16 @@
 	wearer = H
 	return 1
 
-/obj/item/clothing/gloves/gauntlets/dropped()
-	. = ..()
-	var/mob/living/carbon/human/H = wearer
-	if(gloves)
-		if(!H.equip_to_slot_if_possible(gloves, slot_gloves))
-			gloves.forceMove(get_turf(src))
-		if(ring)
+/obj/item/clothing/gloves/gauntlets/restore_over_objects(mob/living/carbon/human/wearer)
+	if(ring)
+		if(gloves && !gloves.ring)
 			gloves.ring = ring
-		src.gloves = null
-	wearer = null
+			ring.forceMove(gloves)
+		else
+			ring.forceMove(get_turf(src))
+		ring = null
+	. = ..()
+	if(gloves)
+		if(!wearer.equip_to_slot_if_possible(gloves, slot_gloves))
+			gloves.forceMove(get_turf(src))
+		gloves = null

code/modules/events/solar_storm.dm

@@ -9,7 +9,7 @@
 	endWhen = startWhen + rand(30,90) + rand(30,90) //2-6 minute duration
 
 /datum/event/solar_storm/announce()
-	command_announcement.Announce("A nearby pulsar's emission will soon hit \the [station_name()]. Please halt all EVA activites immediately and return to the interior of the station.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
+	command_announcement.Announce("A nearby star's emission will soon hit \the [station_name()]. Please halt all EVA activites immediately and return to the interior of the station.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
 	adjust_solar_output(1.5)
 
 /datum/event/solar_storm/proc/adjust_solar_output(var/mult = 1)

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

@@ -393,6 +393,11 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list(
 		H.visible_message( \
 			"<span class='notice'>[H] shakes [target]'s hand.</span>", \
 			"<span class='notice'>You shake [target]'s hand.</span>", )
+	//Ports nose booping
+	else if(H.zone_sel.selecting == "mouth")
+		H.visible_message( \
+			"<span class='notice'>[H] boops [target]'s nose.</span>", \
+			"<span class='notice'>You boop [target] on the nose.</span>", )
 	else H.visible_message("<span class='notice'>[H] hugs [target] to make [t_him] feel better!</span>", \
 					"<span class='notice'>You hug [target] to make [t_him] feel better!</span>") //End VOREStation Edit
 

code/modules/mob/new_player/new_player.dm

@@ -115,6 +115,8 @@
 	return age_gate_result
 
 /mob/new_player/proc/verifyage()
+	if(client.holder)		// they're an admin
+		return TRUE
 	if(!client.is_preference_enabled(/datum/client_preference/debug/age_verified)) //make sure they are verified
 		if(!client.prefs)
 			message_admins("Blocked [src] from new player panel because age gate could not access client preferences.")

code/modules/nifsoft/software/13_soulcatcher.dm

@@ -469,7 +469,9 @@
 		dummy.add_overlay(alpha_mask)
 		COMPILE_OVERLAYS(dummy)
 		dummy.alpha = 192
-
+		
+		// remove hudlist
+		dummy.overlays -= dummy.hud_list
 		// appearance clone immediately
 		appearance = dummy.appearance
 		qdel(dummy)

html/changelog.html

@@ -53,6 +53,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">03 May 2021</h2>
+			<h3 class="author">CrystalClearCC updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">changed pulsar emissions away from world-detroying pulsar emissions.</li>
+			</ul>
+
 			<h2 class="date">30 April 2021</h2>
 			<h3 class="author">FreeStylaLT updated:</h3>
 			<ul class="changes bgimages16">
@@ -373,19 +379,6 @@
 				<li class="bugfix">Fixed the invisible sprite on the toe-less/digitigrade jackboot variants.</li>
 				<li class="imageadd">Adjusted the sprite on the knee-length and thigh-length jackboots (normal and toe-less/digitigrade versions) to make them more visually distinct from the regular jackboot sprites. Now they should align with the location they're supposed to reach to.</li>
 			</ul>
-
-			<h2 class="date">01 March 2021</h2>
-			<h3 class="author">nik707 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed missing mapmerge</li>
-			</ul>
-
-			<h2 class="date">28 February 2021</h2>
-			<h3 class="author">nik707 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixes ar hud glasses to be simultaneously prescription glasses</li>
-				<li class="bugfix">fixed missing mapmerge</li>
-			</ul>
 		</div>
 
 <br><b>Baystation 12 Credit List</b>

html/changelogs/.all_changelog.yml

@@ -5308,3 +5308,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Safety features around the pool
   nik707:
   - rscdel: 'Constable Alt Titles tweak: Gaoler > Jailer'
+2021-05-03:
+  CrystalClearCC:
+  - bugfix: changed pulsar emissions away from world-detroying pulsar emissions.