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

_maps/hilbertshotel.dmm

@@ -71,10 +71,6 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/hilbertshotel)
-"n" = (
-/obj/effect/landmark/xmastree,
-/turf/open/indestructible/hotelwood,
-/area/hilbertshotel)
 "o" = (
 /obj/structure/chair/comfy/brown{
 	dir = 1
@@ -446,7 +442,7 @@ a
 b
 i
 d
-n
+d
 d
 J
 b

_maps/map_files/Mining/Lavaland_Lower.dmm

@@ -87,7 +87,9 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/gen)
 "at" = (
-/obj/machinery/vending/autodrobe,
+/obj/machinery/vending/autodrobe{
+	req_access = null
+	},
 /obj/machinery/light{
 	dir = 1
 	},
@@ -2810,6 +2812,10 @@
 	dir = 8;
 	network = list("ss13","rd","mine")
 	},
+/obj/structure/sink/kitchen{
+	dir = 8;
+	pixel_x = 11
+	},
 /turf/open/floor/plasteel/cafeteria,
 /area/xenoarch/gen)
 "gT" = (
@@ -3376,7 +3382,7 @@
 /turf/open/floor/plasteel/checker,
 /area/xenoarch/gen)
 "is" = (
-/obj/structure/table/wood/bar,
+/obj/structure/table/wood,
 /turf/open/floor/plasteel/checker,
 /area/xenoarch/gen)
 "it" = (
@@ -3638,11 +3644,11 @@
 /turf/open/floor/plasteel/checker,
 /area/xenoarch/gen)
 "jb" = (
-/obj/structure/table/wood/bar,
 /obj/machinery/light,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/table/wood,
 /turf/open/floor/plasteel/checker,
 /area/xenoarch/gen)
 "jc" = (
@@ -3699,10 +3705,10 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/xenoarch/gen)
 "ji" = (
-/obj/structure/table/wood/bar,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/table/wood,
 /turf/open/floor/plasteel/checker,
 /area/xenoarch/gen)
 "jj" = (
@@ -5008,7 +5014,7 @@
 /area/xenoarch/gen)
 "lW" = (
 /obj/structure/table,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /turf/open/floor/plasteel/white,
 /area/xenoarch/gen)
 "lX" = (
@@ -5238,7 +5244,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/structure/table/wood/bar,
+/obj/structure/table/wood,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
 	dir = 8
 	},
@@ -5264,20 +5270,27 @@
 /turf/open/floor/carpet,
 /area/xenoarch/gen)
 "mO" = (
-/obj/machinery/vending/boozeomat,
+/obj/machinery/vending/boozeomat{
+	req_access = null
+	},
 /turf/open/floor/wood,
 /area/xenoarch/gen)
 "mP" = (
 /obj/structure/table/wood,
-/obj/item/circuitboard/machine/chem_dispenser/drinks,
-/obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
+/obj/item/circuitboard/machine/chem_dispenser/drinks{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/obj/item/circuitboard/machine/chem_dispenser/drinks/beer{
+	pixel_x = -2
+	},
 /turf/open/floor/wood,
 /area/xenoarch/gen)
 "mQ" = (
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/structure/table/wood/bar,
+/obj/structure/table/wood,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
 	dir = 8
 	},
@@ -5448,25 +5461,25 @@
 /turf/open/floor/carpet,
 /area/xenoarch/gen)
 "nq" = (
-/obj/structure/table/wood/bar,
+/obj/structure/table/wood,
 /obj/item/storage/pill_bottle/dice,
 /turf/open/floor/carpet/royalblue,
 /area/xenoarch/gen)
 "nr" = (
-/obj/structure/table/wood/bar,
+/obj/structure/table/wood,
 /obj/item/trash/plate,
 /turf/open/floor/plasteel/checker,
 /area/xenoarch/gen)
 "ns" = (
-/obj/structure/table/wood/bar,
+/obj/structure/table/wood,
 /obj/item/book/lorebooks/welcome_to_kinaris,
 /turf/open/floor/carpet/royalblue,
 /area/xenoarch/gen)
 "nt" = (
-/obj/structure/table/wood/bar,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/table/wood,
 /obj/item/paper_bin,
 /turf/open/floor/carpet/royalblue,
 /area/xenoarch/gen)
@@ -5809,7 +5822,9 @@
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "og" = (
-/obj/machinery/vending/autodrobe,
+/obj/machinery/vending/autodrobe{
+	req_access = null
+	},
 /obj/effect/turf_decal/loading_area{
 	dir = 4;
 	icon_state = "drain";

_maps/templates/hilbertshotel.dmm

@@ -71,10 +71,6 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/hilbertshotel)
-"n" = (
-/obj/effect/landmark/xmastree,
-/turf/open/indestructible/hotelwood,
-/area/hilbertshotel)
 "o" = (
 /obj/structure/chair/comfy/brown{
 	dir = 1
@@ -446,7 +442,7 @@ a
 b
 i
 d
-n
+d
 d
 J
 b

code/__DEFINES/admin.dm

@@ -73,6 +73,7 @@
 #define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod"
 #define ADMIN_PUNISHMENT_MAZING "Puzzle"
 #define ADMIN_PUNISHMENT_PIE "Cream Pie"
+#define ADMIN_PUNISHMENT_TABLETIDESTATIONWIDE "Tabletide Stationwide"
 
 #define AHELP_ACTIVE 1
 #define AHELP_CLOSED 2

code/game/objects/structures/ghost_role_spawners.dm

@@ -46,9 +46,9 @@
 	anchored = FALSE
 	move_resist = MOVE_FORCE_NORMAL
 	density = FALSE
-	flavour_text = "<span class='big bold'>You are an ash walker.</span><b> Your tribe worships <span class='danger'>the Necropolis</span>. The wastes are sacred ground, its monsters a blessed bounty. \
-	You have seen lights in the distance... they foreshadow the arrival of outsiders that seek to tear apart the Necropolis and its domain. Fresh sacrifices for your nest. \
-	For what lies beyond the lights, you get the impression that going towards it is forbidden, rumors say <span class='danger'>the Necropolis</span> does not favor those who leave the sacred ground. </b>"
+	flavour_text = "The wastes are sacred ground, its monsters a blessed bounty. You would never willingly leave your homeland behind. \
+	You have seen lights in the distance... they foreshadow the arrival of outsiders to your domain. However, their intentions have yet to be judged.\
+	Ensure your nest remains protected at all costs."
 	assignedrole = "Ash Walker"
 
 /obj/effect/mob_spawn/human/ash_walker/special(mob/living/new_spawn)

code/modules/admin/verbs/randomverbs.dm

@@ -1249,7 +1249,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
 		return
 
-	var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_CLUWNE, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_ROD)
+	var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_CLUWNE, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_TABLETIDESTATIONWIDE)
 
 	var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list
 
@@ -1307,6 +1307,16 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 		if(ADMIN_PUNISHMENT_PIE)
 			var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/creamy = new(get_turf(target))
 			creamy.splat(target)
+		if(ADMIN_PUNISHMENT_TABLETIDESTATIONWIDE)
+			var/list/areas = list()
+			for(var/area/A in world)
+				if(A.z == SSmapping.station_start)
+					areas += A
+			SEND_SOUND(target, sound('hyperstation/sound/misc/hoopisundunkable.ogg',volume=50))
+			for(var/area/A in areas)
+				for(var/obj/structure/table/T in A)
+					T.tablepush(target, target)
+					sleep(1)
 
 	var/msg = "[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment]."
 	message_admins(msg)

code/modules/events/aurora_aquilae.dm

@@ -0,0 +1,98 @@
+/datum/round_event_control/aurora_aquilae
+	name = "Aurora Aquilae"
+	typepath = /datum/round_event/aurora_aquilae
+	max_occurrences = 1
+	weight = 4
+	earliest_start = 900 MINUTES
+
+/datum/round_event_control/aurora_aquilae/canSpawnEvent(players, gamemode)
+	if(!CONFIG_GET(flag/starlight))
+		return FALSE
+	return ..()
+
+/datum/round_event/aurora_aquilae
+	announceWhen = 30
+	startWhen = 1
+	endWhen = 115
+	var/list/aurora_colors = list("#ffc8bc", "#ed927f", "#d5745f", "#bf3a1d", "#c71414", "#FF3131", "#ee0808", "#ff0000")
+	var/aurora_progress = 0 //this cycles from 1 to 8, slowly grading towards a bright red
+	var/list/areasToFlicker = list(/area/hallway,
+									/area/security,
+									/area/science)
+
+/datum/round_event/aurora_aquilae/start()
+	for(var/area in GLOB.sortedAreas)
+		var/area/A = area
+		if(initial(A.dynamic_lighting) == DYNAMIC_LIGHTING_IFSTARLIGHT)
+			for(var/turf/open/space/S in A)
+				S.set_light(S.light_range * 8, S.light_power * 1)
+	for(var/mob/M in GLOB.player_list)
+		SEND_SOUND(M, sound('sound/ambience/aurora_aquilae.ogg', volume=10)) //ogg is "In the presence of a King" by Heaven Pierce Her, used in the videogame ULTRAKILL. All respects and credits to the equivalent artists who worked on it.
+
+/datum/round_event/aurora_aquilae/proc/flicker_lights()
+	for(var/area/A in world)
+		for(var/typecheck in areasToFlicker)
+			if(istype(A, typecheck))
+				for(var/obj/machinery/light/L in A)
+					L.flicker(10)
+
+/datum/round_event/aurora_aquilae/proc/break_lights()
+	for(var/area/A in world)
+		for(var/typecheck in areasToFlicker)
+			if(istype(A, typecheck))
+				for(var/obj/machinery/power/apc/temp in A)
+					temp.overload_lighting()
+
+/datum/round_event/aurora_aquilae/proc/battleflashbacksthree()
+	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+		new /datum/hallucination/stray_pistol_bullet(H)
+
+/datum/round_event/aurora_aquilae/proc/battleflashbacksone()
+	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+		new /datum/hallucination/fire(H)
+		new /datum/hallucination/battle(H)
+
+/datum/round_event/aurora_aquilae/proc/battleflashbackstwo()
+	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+		new /datum/hallucination/battle(H)
+		var/delay = 0
+		for(var/i in 1 to 50)
+			delay += 3
+			addtimer(CALLBACK(src, .proc/battleflashbacksthree), delay)
+
+/datum/round_event/aurora_aquilae/announce()
+	priority_announce("[station_name()]: A ·#HARMLESS#· cloud of ·|$% GLORY AND GUTS¬€#· ions is approaching your ·|%$ station, and will exhaust their energy battering the hull. Kinaris Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but %%%BRUTAL·$ª, shifting between %$$%!ªTHE COMPLETE AND UTTER DESTRUCTION OF THE SENSES$ and %%THE ASHES OF THE GREAT AL-SHAIN%. Any staff who would like to view the %%PRESENCE OF A KING%$ for themselves may proceed to the nearest area with viewing ports to open space.",
+	sound = 'sound/misc/interference.ogg',
+	sender_override = "Kin]·|Aari$s Meteo%&rology DivD··isio#n")
+	addtimer(CALLBACK(src, .proc/flicker_lights), 5 SECONDS)
+	addtimer(CALLBACK(src, .proc/battleflashbacksone), 5 SECONDS)
+	addtimer(CALLBACK(src, .proc/break_lights), 90 SECONDS)
+	addtimer(CALLBACK(src, .proc/battleflashbackstwo), 140 SECONDS)
+
+/datum/round_event/aurora_aquilae/tick()
+	if(activeFor % 5 == 0)
+		aurora_progress++
+		var/aurora_color = aurora_colors[aurora_progress]
+		for(var/area in GLOB.sortedAreas)
+			var/area/A = area
+			if(initial(A.dynamic_lighting) == DYNAMIC_LIGHTING_IFSTARLIGHT)
+				for(var/turf/open/space/S in A)
+					S.set_light(l_color = aurora_color)
+
+/datum/round_event/aurora_aquilae/end()
+	for(var/area in GLOB.sortedAreas)
+		var/area/A = area
+		if(initial(A.dynamic_lighting) == DYNAMIC_LIGHTING_IFSTARLIGHT)
+			for(var/turf/open/space/S in A)
+				fade_to_black(S)
+	priority_announce("Have a pleasant shift, [station_name()], and thank you for watching us.",
+	sound = 'sound/misc/notice2.ogg',
+	sender_override = "???")
+
+/datum/round_event/aurora_aquilae/proc/fade_to_black(turf/open/space/S)
+	set waitfor = FALSE
+	var/new_light = initial(S.light_range)
+	while(S.light_range > new_light)
+		S.set_light(S.light_range - 0.2)
+		sleep(30)
+	S.set_light(new_light, initial(S.light_power), initial(S.light_color))

code/modules/events/aurora_caelus.dm

@@ -14,24 +14,24 @@
 	announceWhen = 1
 	startWhen = 9
 	endWhen = 50
-	var/list/aurora_colors = list("#ffd980", "#eaff80", "#eaff80", "#ffd980", "#eaff80", "#A2FFC7", "#A2FFDE", "#ffd980")
+	var/list/aurora_colors = list("#ffd980", "#eaff80", "#eaff80", "#ffd980", "#eaff80", "#A2FFC7", "#9400D3", "#FFC0CB")
 	var/aurora_progress = 0 //this cycles from 1 to 8, slowly changing colors from gentle green to gentle blue
 
 /datum/round_event/aurora_caelus/announce()
-	priority_announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. Kinaris Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. We hope you enjoy the lights.",
+	priority_announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. Kinaris Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. We will also play quiet music for you to enjoy and relax. Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. We hope you enjoy the lights.",
 	sound = 'sound/misc/notice2.ogg',
 	sender_override = "Kinaris Meteorology Division")
 	for(var/V in GLOB.player_list)
 		var/mob/M = V
 		if((M.client.prefs.toggles & SOUND_MIDI) && is_station_level(M.z))
-			M.playsound_local(M, 'sound/ambience/aurora_caelus.ogg', 20, FALSE, pressure_affected = FALSE)
+			M.playsound_local(M, 'sound/ambience/aurora_caelus_new.ogg', 40, FALSE, pressure_affected = FALSE) //ogg is "The Fire is Gone" by Heaven Pierce Her, used in the videogame ULTRAKILL. All respects and credits to the equivalent artists who worked on it.
 
 /datum/round_event/aurora_caelus/start()
 	for(var/area in GLOB.sortedAreas)
 		var/area/A = area
 		if(initial(A.dynamic_lighting) == DYNAMIC_LIGHTING_IFSTARLIGHT)
 			for(var/turf/open/space/S in A)
-				S.set_light(S.light_range * 3, S.light_power * 0.5)
+				S.set_light(S.light_range * 6, S.light_power * 1)
 
 /datum/round_event/aurora_caelus/tick()
 	if(activeFor % 5 == 0)

code/modules/flufftext/Hallucination.dm

@@ -1289,4 +1289,25 @@ GLOBAL_LIST_INIT(hallucination_list, list(
 	H.hal_target = target
 	H.preparePixelProjectile(target, start)
 	H.fire()
-	qdel(src)
+	qdel(src)
+
+/datum/hallucination/stray_pistol_bullet //specifically for aurora_aquilae.dm event
+
+/datum/hallucination/stray_pistol_bullet/New(mob/living/carbon/C, forced = TRUE)
+	set waitfor = FALSE
+	..()
+	var/list/turf/startlocs = list()
+	for(var/turf/open/T in view(world.view+1,target)-view(world.view,target))
+		startlocs += T
+	if(!startlocs.len)
+		qdel(src)
+		return
+	var/turf/start = pick(startlocs)
+	var/proj_type = /obj/item/projectile/hallucination/bullet
+	feedback_details += "Type: [proj_type]"
+	var/obj/item/projectile/hallucination/H = new proj_type(start)
+	target.playsound_local(start, H.hal_fire_sound, 60, 1)
+	H.hal_target = target
+	H.preparePixelProjectile(target, start)
+	H.fire()
+	qdel(src)

config/game_options.txt

@@ -579,4 +579,4 @@ BOX_RANDOM_ENGINE Box SM 3x,1
 BOX_RANDOM_ENGINE Box TEG,2
 BOX_RANDOM_ENGINE Box Empty,0
 BOX_RANDOM_ENGINE Box Antimatter,0
-BOX_RANDOM_ENGINE Box P.A.C.M.A.N,0
+BOX_RANDOM_ENGINE Box P.A.C.M.A.N,0

hyperstation/code/obj/rewards.dm

@@ -25,6 +25,17 @@
 	alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi'
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
+/obj/item/clothing/suit/luwethtrench
+	name = "Syndicate Commander's Coat"
+	desc = "A sinister looking black and red jacket. The gold collar and shoulders denote that this belongs to a high ranking syndicate officer. A rather strange brooch is pinned to the coat, displaying a unique range of lustrous brass cracks through the deep blacks of it’s hammered finish."
+	icon = 'hyperstation/icons/obj/clothing/rewards.dmi'
+	alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi'
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+	icon_state = "luwethtrench"
+	item_state = "luwethtrench"
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	roomy = TRUE
+
 /obj/item/clothing/gloves/ring/luweth
 	name = "Luweth’s Wedding Band"
 	icon = 'hyperstation/icons/obj/clothing/rewards.dmi'
@@ -36,4 +47,4 @@
 	desc = "Clearly the dice hate you."
 	icon_state = "d20_blue"
 	sides = 20
-	unique = TRUE
+	unique = TRUE

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -63,6 +63,12 @@
 	path = /obj/item/clothing/suit/shackles
 	ckeywhitelist = list("heliocintrini")
 
+/datum/gear/hshack
+	name = "Syndicate Commander's Coat"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/clothing/suit/luwethtrench
+	ckeywhitelist = list("luweth")
+
 /datum/gear/luwethring
 	name = "Wedding Band"
 	category = SLOT_IN_BACKPACK
@@ -73,4 +79,4 @@
 	name = "Blue D20"
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/dice/d20/blue
-	ckeywhitelist = list("jackattack41498")
+	ckeywhitelist = list("jackattack41498")

tgstation.dme

@@ -1678,6 +1678,7 @@
 #include "code\modules\events\anomaly_grav.dm"
 #include "code\modules\events\anomaly_pyro.dm"
 #include "code\modules\events\anomaly_vortex.dm"
+#include "code\modules\events\aurora_aquilae.dm"
 #include "code\modules\events\aurora_caelus.dm"
 #include "code\modules\events\blob.dm"
 #include "code\modules\events\brand_intelligence.dm"