Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -4,6 +4,7 @@
 	duration = 5
 	randomdir = FALSE
 	layer = BELOW_MOB_LAYER
+	color = BLOOD_COLOR_HUMAN // set it to red by default because the actual icons are white
 	var/splatter_type = "splatter"
 
 /obj/effect/temp_visual/dir_setting/bloodsplatter/Initialize(mapload, set_dir, new_color)

code/game/objects/items.dm

@@ -1091,6 +1091,19 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	. = ..()
 	if(var_name == NAMEOF(src, slowdown))
 		set_slowdown(var_value)			//don't care if it's a duplicate edit as slowdown'll be set, do it anyways to force normal behavior.
+
+/obj/item/proc/canStrip(mob/stripper, mob/owner)
+	SHOULD_BE_PURE(TRUE)
+	return !HAS_TRAIT(src, TRAIT_NODROP) && !(item_flags & ABSTRACT)
+
+/obj/item/proc/doStrip(mob/stripper, mob/owner)
+	if(owner.dropItemToGround(src))
+		if(stripper.can_hold_items())
+			stripper.put_in_hands(src)
+		return TRUE
+	else
+		return FALSE
+
 /**
  * Does the current embedding var meet the criteria for being harmless? Namely, does it explicitly define the pain multiplier and jostle pain mult to be 0? If so, return true.
  *

code/game/objects/items/charter.dm

@@ -14,6 +14,7 @@
 	var/response_timer_id = null
 	var/approval_time = 600
 	var/allow_unicode = FALSE
+	var/admin_approved = FALSE
 
 	var/static/regex/standard_station_regex
 
@@ -62,8 +63,32 @@
 
 	to_chat(user, "Your name has been sent to your employers for approval.")
 	// Autoapproves after a certain time
-	response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE)
-	to_chat(GLOB.admins, "<span class='adminnotice'><b><font color=orange>CUSTOM STATION RENAME:</font></b>[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [html_encode(new_name)] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (<A HREF='?_src_=holder;[HrefToken(TRUE)];reject_custom_name=[REF(src)]'>REJECT</A>) [ADMIN_CENTCOM_REPLY(user)]</span>")
+	var/requires_approval = CONFIG_GET(flag/station_name_needs_approval)
+	response_timer_id = addtimer(CALLBACK(src, .proc/check_state, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE)
+	to_chat(GLOB.admins, "<span class='adminnotice'><b><font color=orange>CUSTOM STATION RENAME:</font></b>[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [html_encode(new_name)] ([requires_approval ? "REQUIRES ADMIN APPROVAL and will autodeny" : "will autoapprove"] in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (<A HREF='?_src_=holder;[HrefToken(TRUE)];reject_custom_name=[REF(src)]'>REJECT</A>)[requires_approval ? " (<A HREF='?_src_=holder;[HrefToken(TRUE)];approve_custom_name=[REF(src)]'>APPROVE</A>)" : ""] [ADMIN_CENTCOM_REPLY(user)]</span>")
+
+/obj/item/station_charter/proc/check_state(designation, uname, ureal_name, ukey)
+	var/requires_approval = CONFIG_GET(flag/station_name_needs_approval)
+	if(requires_approval && !admin_approved)
+		var/turf/T = get_turf(src)
+		T.visible_message("<span class='warning'>A note appears on [src], stating this sector requires central command approval for its station names, which was not performed in time for this request. Looks like the change has been auto-rejected.</span>")
+		var/m = "Station rename has been autorejected due to config requiring admin approval."
+		message_admins(m)
+		log_admin(m)
+	else
+		rename_station(designation, uname, ureal_name, ukey)
+	response_timer_id = null
+	admin_approved = FALSE
+
+/obj/item/station_charter/proc/allow_pass(user)
+	if(!user)
+		return
+	if(!response_timer_id)
+		return
+	admin_approved = TRUE
+	var/m = "[key_name(user)] has approved the proposed station name. It can still be denied prior to the timer expiring."
+	message_admins(m)
+	log_admin(m)
 
 /obj/item/station_charter/proc/reject_proposed(user)
 	if(!user)
@@ -80,6 +105,7 @@
 
 	deltimer(response_timer_id)
 	response_timer_id = null
+	admin_approved = FALSE
 
 /obj/item/station_charter/proc/rename_station(designation, uname, ureal_name, ukey)
 	set_station_name(designation)

code/game/objects/items/melee/energy.dm

@@ -193,7 +193,7 @@
 
 /obj/item/melee/transforming/energy/sword/saber
 	possible_colors = list("red" = LIGHT_COLOR_RED, "blue" = LIGHT_COLOR_LIGHT_CYAN, "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER)
-	unique_reskin = list("Sword" = "sword0", "saber" = "esaber0")
+	unique_reskin = list("Sword" = "sword0", "Saber" = "esaber0")
 	var/hacked = FALSE
 	var/saber = FALSE
 

code/game/objects/items/tanks/tanks.dm

@@ -291,8 +291,8 @@
 			message_admins("Explosive tank rupture! Last key to touch the tank was [src.fingerprintslast].")
 			log_game("Explosive tank rupture! Last key to touch the tank was [src.fingerprintslast].")
 		//Give the gas a chance to build up more pressure through reacting
-		air_contents.react(src)
-		air_contents.react(src)
+		for(var/i in 1 to TANK_POST_FRAGMENT_REACTIONS)
+			air_contents.react(src)
 
 		pressure = air_contents.return_pressure()
 		var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE

code/game/objects/structures/displaycase.dm

@@ -397,7 +397,7 @@
 		data["owner_name"] = payments_acc.account_holder
 	if(showpiece)
 		data["product_name"] = capitalize(showpiece.name)
-		var/base64 = icon2base64(icon(showpiece.icon, showpiece.icon_state))
+		var/base64 = icon2base64(icon(showpiece.icon, showpiece.icon_state, SOUTH, 1))
 		data["product_icon"] = base64
 	data["registered"] = register
 	data["product_cost"] = sale_price