Merge branch 'release' of https://github.com/VOREStation/VOREStation …

…into voreupdate

_build_dependencies.sh

@@ -2,7 +2,7 @@
 # For dreamchecker
 export SPACEMAN_DMM_VERSION=suite-1.8
 # For NanoUI + TGUI
-export NODE_VERSION=16
+export NODE_VERSION=20
 # Byond Major
 export BYOND_MAJOR=515
 # Byond Minor

code/__defines/_planes+layers.dm

@@ -162,6 +162,7 @@ What is the naming convention for planes or layers?
 #define PLANE_CH_STATUS_OOC		24 //OOC status hud for spooks
 
 #define PLANE_MESONS			30 //Stuff seen with mesons, like open ceilings. This is 30 for downstreams.
+#define PLANE_JANHUD			31 //Stuff seen with janiHUD. Mostly highlight of dirt.
 
 #define PLANE_ADMIN2			33 //Purely for shenanigans (above lighting)
 

code/__defines/admin.dm

@@ -3,9 +3,10 @@
 // Therefore there needs to be a gap between the flags for the automute flags.
 #define MUTE_IC        0x1
 #define MUTE_OOC       0x2
-#define MUTE_PRAY      0x4
-#define MUTE_ADMINHELP 0x8
-#define MUTE_DEADCHAT  0x10
+#define MUTE_LOOC      0x4
+#define MUTE_PRAY      0x8
+#define MUTE_ADMINHELP 0x10
+#define MUTE_DEADCHAT  0x20
 #define MUTE_ALL       0xFFFF
 
 // Number of identical messages required to get the spam-prevention auto-mute thing to trigger warnings and automutes.

code/__defines/belly_modes_vr.dm

@@ -21,6 +21,7 @@
 #define DM_FLAG_AFFECTWORN		0x10
 #define DM_FLAG_JAMSENSORS		0x20
 #define DM_FLAG_FORCEPSAY		0x40
+#define DM_FLAG_SPARELIMB		0x80
 
 //Item related modes
 #define IM_HOLD									"Hold"

code/__defines/gamemode.dm

@@ -44,6 +44,7 @@
 #define BE_CORGI		0x80000
 #define BE_CURSEDSWORD	0x100000
 #define BE_SURVIVOR		0x200000
+#define BE_EVENT		0x400000
 //VOREStation Add End
 
 var/list/be_special_flags = list(
@@ -114,6 +115,7 @@ var/list/be_special_flags = list(
 #define MODE_THUG "thug"
 #define MODE_STOWAWAY "stowaway"
 #define MODE_SURVIVOR "Shipwreck Survivor"
+#define MODE_EVENT "Event Character"
 
 #define DEFAULT_TELECRYSTAL_AMOUNT 120
 

code/__defines/mobs.dm

@@ -28,6 +28,7 @@
 #define BORGXRAY  0x4
 #define BORGMATERIAL  0x8
 #define BORGANOMALOUS  0x10
+#define BORGJAN  0x20
 
 #define STANCE_ATTACK    11 // Backwards compatability
 #define STANCE_ATTACKING 12 // Ditto
@@ -401,18 +402,19 @@
 #define VIS_ADMIN3			20
 
 #define VIS_MESONS			21
+#define VIS_JANHUD			22
 
-#define VIS_TURFS			22
-#define VIS_OBJS			23
-#define VIS_MOBS		    24
+#define VIS_TURFS			23
+#define VIS_OBJS			24
+#define VIS_MOBS		    25
 
-#define VIS_BUILDMODE		25
+#define VIS_BUILDMODE		26
 
-#define VIS_CLOAKED			26
+#define VIS_CLOAKED			27
 
-#define VIS_STATUS			27
+#define VIS_STATUS			28
 
-#define VIS_COUNT			27 //Must be highest number from above.
+#define VIS_COUNT			28 //Must be highest number from above.
 
 //Some mob icon layering defines
 #define BODY_LAYER		-100

code/_helpers/global_lists_vr.dm

@@ -209,6 +209,7 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
 				/obj/item/trash,
 				/obj/item/weapon/digestion_remains,
 				/obj/item/weapon/bananapeel,
+				/obj/item/weapon/book,
 				/obj/item/weapon/bone,
 				/obj/item/weapon/broken_bottle,
 				/obj/item/weapon/card/emag_broken,

code/_onclick/hud/robot.dm

@@ -289,11 +289,11 @@ var/obj/screen/robot_inventory
 		if(r.emagged || r.emag_items)
 			for(var/obj/O in r.module.emag)
 				if(!(O in r.module.modules))
-					r.module.modules.Add(r.module.emag)
+					r.module.modules.Add(O)
 		else
 			for(var/obj/O in r.module.emag)
 				if(O in r.module.modules)
-					r.module.modules.Remove(r.module.emag)
+					r.module.modules.Remove(O)
 
 		for(var/atom/movable/A in r.module.modules)
 			if(r.client && (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )

code/controllers/subsystems/media_tracks.dm

@@ -174,6 +174,28 @@ SUBSYSTEM_DEF(media_tracks)
 
 	to_chat(C, "<span class='warning>Couldn't find a track matching the specified parameters.</span>")
 
+/datum/controller/subsystem/media_tracks/proc/add_track(var/mob/user, var/new_url, var/new_title, var/new_duration, var/new_artist, var/new_genre, var/new_secret, var/new_lobby)
+	if(!check_rights(R_DEBUG|R_FUN))
+		return
+	var/datum/track/T = new(new_url, new_title, new_duration, new_artist, new_genre, new_secret, new_lobby)
+	all_tracks += T
+	report_progress("Media track added by [user]: [T.title]")
+	sort_tracks()
+	return
+
+/datum/controller/subsystem/media_tracks/proc/remove_track(var/mob/user, var/datum/track/T)
+	if(!check_rights(R_DEBUG|R_FUN))
+		return
+
+	if(!T)
+		return
+
+	report_progress("Media track removed by [user]: [T.title]")
+	all_tracks -= T
+	qdel(T)
+	sort_tracks()
+	return
+
 /datum/controller/subsystem/media_tracks/vv_get_dropdown()
 	. = ..()
 	VV_DROPDOWN_OPTION("", "---")

code/datums/supplypacks/supply.dm

@@ -57,6 +57,7 @@
 			/obj/item/weapon/reagent_containers/spray/cleaner,
 			/obj/item/weapon/reagent_containers/glass/rag,
 			/obj/item/weapon/grenade/chem_grenade/cleaner = 3,
+			/obj/item/clothing/glasses/hud/janitor,
 			/obj/structure/mopbucket
 			)
 	cost = 10

code/defines/obj.dm

@@ -20,6 +20,23 @@
 	anchored = TRUE
 	density = TRUE
 
+/obj/structure/signevent //Designed for scene events for people to put their OOC notes on BEFORE going into a room with them.
+	name = "sign"
+	desc = "It's a sign that tells you things!"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "sign_event_green"
+	anchored = TRUE
+	density = FALSE
+
+/obj/structure/signevent/blue
+	icon_state = "sign_event_blue"
+
+/obj/structure/signevent/red
+	icon_state = "sign_event_red"
+
+/obj/structure/signevent/yellow
+	icon_state = "sign_event_yellow"
+
 /obj/effect/mark
 		var/mark = ""
 		icon = 'icons/misc/mark.dmi'

code/game/antagonist/station/event.dm

@@ -0,0 +1,15 @@
+var/datum/antagonist/event/event
+
+// Inherits most of its vars from the base datum.
+/datum/antagonist/event
+	id = MODE_EVENT
+	role_type = BE_EVENT
+	role_text = "Event Character"
+	role_text_plural = "Event Characters"
+	can_hear_aooc = TRUE		// If FALSE, the antag can neither speak nor hear AOOC. If TRUE, they can at least hear it.
+	can_speak_aooc = TRUE		// If TRUE, the antag can freely spean in AOOC.
+
+	welcome_text = "You are an event character."
+	antag_text = "You are have been selected as an event character, this gives you \
+		access to the AOOC chat channel to organise with other event characters. <b>Please remember all \
+		rules aside from those with explicit exceptions apply to event characters.</b>"

code/game/jobs/access_datum.dm

@@ -262,8 +262,18 @@
 	desc = "Station Network"
 	region = ACCESS_REGION_RESEARCH
 
-// /var/const/free_access_id = 43 // taken in VR
-// /var/const/free_access_id = 44 // taken in VR
+var/const/access_explorer = 43
+/datum/access/explorer
+	id = access_explorer
+	desc = "Away Team"
+	region = ACCESS_REGION_GENERAL
+/*
+/var/const/access_pathfinder = 44
+/datum/access/pathfinder
+	id = access_pathfinder
+	desc = "Pathfinder"
+	region = ACCESS_REGION_GENERAL
+*/
 
 /var/const/access_surgery = 45
 /datum/access/surgery
@@ -384,6 +394,24 @@
 	desc = "Medical Equipment"
 	region = ACCESS_REGION_MEDBAY
 
+var/const/access_pilot = 67
+/datum/access/pilot
+	id = access_pilot
+	desc = "Pilot"
+	region = ACCESS_REGION_GENERAL
+
+/var/const/access_entertainment = 72
+/datum/access/entertainment
+	id = access_entertainment
+	desc = "Entertainment Backstage"
+	region = ACCESS_REGION_GENERAL
+
+/var/const/access_xenobotany = 77
+/datum/access/xenobotany
+	id = access_xenobotany
+	desc = "Xenobotany Garden"
+	region = ACCESS_REGION_RESEARCH
+
 /******************
 * Central Command *
 ******************/
@@ -441,6 +469,24 @@
 	desc = "Central Command Administration"
 	access_type = ACCESS_TYPE_CENTCOM
 
+/var/const/access_clown = 136
+/datum/access/clown
+	id = access_clown
+	desc = "Clown Office"
+	region = ACCESS_REGION_GENERAL
+
+/var/const/access_tomfoolery = 137
+/datum/access/tomfoolery
+	id = access_tomfoolery
+	desc = "Tomfoolery Closet"
+	region = ACCESS_REGION_GENERAL
+
+/var/const/access_mime = 138
+/datum/access/mime
+	id = access_mime
+	desc = "Mime Office"
+	region = ACCESS_REGION_GENERAL
+
 /***************
 * Antag access *
 ***************/
@@ -472,4 +518,16 @@
 /datum/access/alien
 	id = access_alien
 	desc = "#%_^&*@!"
-	access_type = ACCESS_TYPE_PRIVATE
+	access_type = ACCESS_TYPE_PRIVATE
+
+/var/const/access_talon = 301
+/datum/access/talon
+	id = access_talon
+	desc = "Talon"
+	access_type = ACCESS_TYPE_PRIVATE
+
+/var/const/access_lost = 511 // For outsider borgs
+/datum/access/lost
+	id = access_lost
+	desc = "Lost"
+	access_type = ACCESS_TYPE_NONE

code/game/machinery/computer/cloning.dm

@@ -125,7 +125,7 @@
 
 /obj/machinery/computer/cloning/resleeving/ui_assets(mob/user)
 	return list(
-		get_asset_datum(/datum/asset/cloning)
+		get_asset_datum(/datum/asset/simple/cloning)
 	)
 
 /obj/machinery/computer/cloning/tgui_interact(mob/user, datum/tgui/ui = null)
@@ -493,4 +493,4 @@
 		SStgui.update_uis(src)
 
 #undef MENU_MAIN
-#undef MENU_RECORDS
+#undef MENU_RECORDS

code/game/machinery/jukebox.dm

@@ -195,6 +195,7 @@
 	for(var/datum/track/T in getTracksList())
 		tgui_tracks.Add(list(T.toTguiList()))
 	data["tracks"] = tgui_tracks
+	data["admin"] = is_admin(user)
 
 	return data
 
@@ -243,6 +244,13 @@
 			else
 				StartPlaying()
 			return TRUE
+		if("add_new_track")
+			SSmedia_tracks.add_track(usr, params["url"], params["title"], text2num(params["duration"]) * 10, params["artist"], params["genre"], text2num(params["secret"]), text2num(params["lobby"]))
+		if("remove_new_track")
+			var/datum/track/track_to_remove = locate(params["ref"]) in getTracksList()
+			if(track_to_remove == current_track && playing)
+				StopPlaying()
+			SSmedia_tracks.remove_track(usr, track_to_remove)
 
 /obj/machinery/media/jukebox/attack_ai(mob/user as mob)
 	return src.attack_hand(user)

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -193,6 +193,7 @@ var/global/list/image/splatter_cache=list()
 
 	icon = blood
 	cut_overlays()
+	add_overlay(janhud)
 	add_overlay(giblets)
 
 /obj/effect/decal/cleanable/blood/gibs/up

code/game/objects/effects/decals/Cleanable/tracks.dm

@@ -130,6 +130,7 @@ var/global/list/image/fluidtrack_cache=list()
 
 /obj/effect/decal/cleanable/blood/tracks/update_icon()
 	cut_overlays()
+	add_overlay(janhud)
 	color = "#FFFFFF"
 	var/truedir=0