CitadelRP (Citadel-Station-13#4108)

* dme and dmb

* Heeeere we gooo

* fasease

* Continued.

* AAAAAAAAAAAAAAAAAAAAAAAA

* Brain going numb

* agh

* The suffering will be worth it... right?

* Going blank...

* Am I done?

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes

* Should be everything I care about right now.

.github/CONTRIBUTING.md

@@ -420,7 +420,7 @@ Just because something isn't on this list doesn't mean that it's acceptable. Use
 ## Content requiring prior approval
 Certain types of changes may require prior approval from maintainers. This currently includes:
 
-* Code adding, removing, or updating the availability of alien races/species/human mutants. This includes pull requests attempting to add or remove features from said races/species/mutants. (Requires approval from at least one maintainer)
+* Code adding, removing, or updating the availability of alien races/species/humans. This includes pull requests attempting to add or remove features from said races/species/mutants. (Requires approval from at least one maintainer)
 * Code adding, removing, or modifying the functionality of adult-oriented features (such as, but not limited to: vore, genitals, MKUltra, and more). This also includes pull requests attempting to add or remove these features outright. (Requires approval from at least half of the formal maintainer team)
 
 The above content requires approval from the specified amount of maintainers prior to PR creation. Seeking approval must be done via a @Maintainer ping in a relevant development/code or staff channel on the Discord, otherwise it will be considered insufficient. If a PR contains any of the above content, but the creator does not have sufficient approval prior to the PR's creation, then the PR may be closed by any maintainer, at any time, for any reason.

.github/workflows/ci_suite.yml

@@ -36,7 +36,7 @@ jobs:
           tools/bootstrap/python -c ''
       - name: Run Linters
         run: |
-          bash tools/ci/check_filedirs.sh vorestation.dme
+          bash tools/ci/check_filedirs.sh citadel.dme
           bash tools/ci/check_changelogs.sh
           bash tools/ci/check_grep.sh
           bash tools/ci/check_misc.sh

README.md

@@ -15,7 +15,7 @@
 
 This is the codebase for the CitadelRP flavoured fork of SpaceStation 13.
 
-Citadel Station 13 RP, also known as CitadelRP was originally a fork of VOREStation, which separated on 01/25/2019. CitadelRP nowadays can be seen as a Polaris and /tg/station hybrid!
+Citadel Station 13 RP, also known as CitadelRP was originally a fork of VOREStation, which separated on 01/25/2019.
 
 ## DOWNLOADING
 [Downloading](.github/guides/DOWNLOADING.md)

SpacemanDMM.toml

@@ -1,4 +1,4 @@
-environment = "vorestation.dme"
+environment = "citadel.dme"
 
 [langserver]
 dreamchecker = true

vorestation.dme → citadel.dme

@@ -1,4 +1,4 @@
-// DM Environment file for vorestation.dme
+// DM Environment file for citadel.dme
 // All manual changes should be made outside the BEGIN_ and END_ blocks.
  // New source code should be placed in .dm files: choose File/New --> Code File.
 // BEGIN_INTERNALS
@@ -2149,7 +2149,6 @@
 #include "code\modules\events\spacevine.dm"
 #include "code\modules\events\spider_infestation.dm"
 #include "code\modules\events\spontaneous_appendicitis.dm"
-#include "code\modules\events\spontaneous_appendicitis_vr.dm"
 #include "code\modules\events\supply_demand.dm"
 #include "code\modules\events\wallrot.dm"
 #include "code\modules\examine\examine.dm"

code/__DEFINES/machinery.dm

@@ -79,7 +79,6 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called manu
 #define NETWORK_ALARM_ATMOS "Atmosphere Alarms"
 #define NETWORK_ALARM_POWER "Power Alarms"
 #define NETWORK_ALARM_FIRE "Fire Alarms"
-///Using different from Polaris one for better name
 #define NETWORK_TCOMMS "Telecommunications"
 #define NETWORK_OUTSIDE "Outside"
 #define NETWORK_EXPLORATION "Exploration"

code/__DEFINES/maps.dm

@@ -16,7 +16,7 @@
 /// Z-levels exempt from xenoarch digsite generation.
 #define MAP_LEVEL_XENOARCH_EXEMPT 0x080
 // Misc map defines.
-///VOREStation Edit
+
 /// Automatically created submaps are forbidden from being this close to the main map's edge.
 #define SUBMAP_MAP_EDGE_PAD 8
 // TG MAP LOADING SYSTEM PENDING

code/__DEFINES/misc.dm

@@ -284,10 +284,10 @@ var/list/economy_station_departments = list(
 	DEPARTMENT_PLANET,
 	DEPARTMENT_RESEARCH,
 	DEPARTMENT_SECURITY
-) //VOREStation Edit
+)
 
 
-// vorstation off-duty time
+// Off-duty time
 #define PTO_CARGO			"Cargo"
 #define PTO_CIVILIAN		"Civilian"
 #define PTO_COMMAND			"Command"

code/__DEFINES/sound/ambience.dm

@@ -56,8 +56,6 @@
 	'sound/ambience/generic/generic3.ogg'\
 	)
 
-// 'sound/ambience/generic/generic4.ogg'\ // VOREStation Edit: Comment out entry 4 as this doesn't fit on Virgo, and we have our own weather system.
-
 // Sounds of PA announcements, presumably involving shuttles?
 #define AMBIENCE_ARRIVALS list(\
 	'sound/ambience/arrivals/arrivals1.ogg',\

code/__DEFINES/sound/channels.dm

@@ -1,20 +1,20 @@
-//max channel is 1024. Only go lower from here, because byond tends to pick the first availiable channel to play sounds on
+// Max channel is 1024. Only go lower from here, because byond tends to pick the first availiable channel to play sounds on
 #define CHANNEL_LOBBYMUSIC 1024
 #define CHANNEL_ADMIN 1023
 #define CHANNEL_VOX 1022
 #define CHANNEL_JUKEBOX 1021
-///sound channel for heartbeats
+/// Sound channel for heartbeats
 #define CHANNEL_HEARTBEAT 1020
 #define CHANNEL_AMBIENCE_FORCED 1019
 #define CHANNEL_AMBIENCE 1018
 #define CHANNEL_BUZZ 1017
 #define CHANNEL_BICYCLE 1016
-///VORESTATION ADD - Fancy Sound Loop channel
+/// Fancy Sound Loop channel
 #define CHANNEL_PREYLOOP 1015
 
 //THIS SHOULD ALWAYS BE THE LOWEST ONE!
 //KEEP IT UPDATED
 
-#define CHANNEL_HIGHEST_AVAILABLE 1014	//VORESTATION EDIT - Fancy Sound Loop channel from 1015
+#define CHANNEL_HIGHEST_AVAILABLE 1014 // Fancy Sound Loop channel from 1015
 
 #define MAX_INSTRUMENT_CHANNELS (128 * 6)

code/__HELPERS/type2type_vr.dm

@@ -1,9 +1,8 @@
-/*
-// Contains VOREStation type2type functions
-// list2text - takes delimiter and returns text
-// text2list - takes delimiter, and creates list
-//
-*/
+/**
+ * Contains VOREStation type2type functions
+ * list2text - takes delimiter and returns text
+ * text2list - takes delimiter, and creates list
+ */
 
 // Concatenates a list of strings into a single string.  A seperator may optionally be provided.
 /proc/list2text(list/ls, sep)

code/__HELPERS/unsorted.dm

@@ -1584,7 +1584,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 	. += new /atom/movable/screen/plane_master/main{plane = MOB_PLANE}
 	// . += new /atom/movable/screen/plane_master/cloaked								//Cloaked atoms!
 
-	//VOREStation Add - Random other plane masters
+	// Random other plane masters from Virgo
 	. += new /atom/movable/screen/plane_master{plane = PLANE_AUGMENTED}				//Augmented reality
-	//VOREStation Add End
 	. += new /atom/movable/screen/plane_master/parallax{plane = PARALLAX_PLANE}

code/_onclick/adjacent.dm

@@ -31,7 +31,8 @@
 		return 1
 	if(get_dist(src,T0) > 1)
 		return 0
-	if(T0.z != z) return 0 //VOREStation Add
+	if(T0.z != z)
+		return 0
 	if(T0.x == x || T0.y == y)
 		// Check for border blockages
 		return T0.ClickCross(get_dir(T0,src), border_only = 1) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target)

code/_onclick/click.dm

@@ -128,7 +128,7 @@
 		trigger_aiming(TARGET_CAN_CLICK)
 		return 1
 
-	// VOREStation Addition Start: inbelly item interaction
+	// Inbelly item interaction
 	if(isbelly(loc) && (loc == A.loc))
 		if(W)
 			var/resolved = W.resolve_attackby(A, src, params)
@@ -139,7 +139,6 @@
 				setClickCooldown(get_attack_speed())
 			UnarmedAttack(A, 1)
 		return
-	// VOREStation Addition End
 
 	if(!isturf(loc)) // This is going to stop you from telekinesing from inside a closet, but I don't shed many tears for that
 		return

code/_onclick/hud/ability_screen_objects.dm

@@ -182,7 +182,7 @@
 
 /mob/Initialize(mapload)
 	. = ..()
-	if(!ability_master)	//VOREStation Edit: S H A D E K I N
+	if(!ability_master)
 		ability_master = new /atom/movable/screen/movable/ability_master(src)
 
 ///////////ACTUAL ABILITIES////////////

code/_onclick/hud/human.dm

@@ -309,7 +309,6 @@
 		mymob.hydration_icon.screen_loc = ui_nutrition_small
 		hud_elements |= mymob.hydration_icon
 
-	//VOREStation Addition begin
 	mymob.shadekin_dark_display = new /atom/movable/screen/shadekin/darkness()
 	mymob.shadekin_dark_display.screen_loc = ui_shadekin_dark_display
 	mymob.shadekin_dark_display.icon_state = "dark"
@@ -324,7 +323,6 @@
 	mymob.xenochimera_danger_display.screen_loc = ui_xenochimera_danger_display
 	mymob.xenochimera_danger_display.icon_state = "danger00"
 	hud_elements |= mymob.xenochimera_danger_display
-	//VOREStation Addition end
 
 	mymob.ling_chem_display = new /atom/movable/screen/ling/chems()
 	mymob.ling_chem_display.screen_loc = ui_ling_chemical_display

code/_onclick/hud/screen_objects.dm

@@ -463,7 +463,7 @@
 				var/mob/living/silicon/ai/AI = usr
 				AI.view_images()
 		else
-			return attempt_vr(src,"Click_vr",list(location,control,params)) //VOREStation Add - Additional things.
+			return attempt_vr(src,"Click_vr",list(location,control,params))
 	return 1
 
 /atom/movable/screen/inventory/Click()

code/_onclick/item_attack.dm

@@ -51,7 +51,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
 		else
 			return 0
 	if(attempt_vr(src,"vore_attackby",args))
-		return //VOREStation Add - The vore, of course.
+		return
 	return I.attack(src, user, user.zone_sel.selecting, attack_modifier)
 
 // Used to get how fast a mob should attack, and influences click delay.

code/controllers/subsystem/bellies_vr.dm

@@ -2,7 +2,7 @@
 #define SSBELLIES_IGNORED 2
 
 //
-// Bellies subsystem - Process vore bellies
+// Bellies subsystem - Process bellies
 //
 
 SUBSYSTEM_DEF(bellies)

code/controllers/subsystem/inactivity.dm

@@ -7,7 +7,7 @@ SUBSYSTEM_DEF(inactivity)
 	if(config_legacy.kick_inactive)
 		for(var/i in GLOB.clients)
 			var/client/C = i
-			if(C.is_afk(config_legacy.kick_inactive MINUTES) && !C.holder) // VOREStation Edit - Allow admins to idle
+			if(C.is_afk(config_legacy.kick_inactive MINUTES) && !C.holder) // Allow admins to idle
 				to_chat(C,"<span class='warning'>You have been inactive for more than [config_legacy.kick_inactive] minute\s and have been disconnected.</span>")
 				var/information
 

code/controllers/subsystem/job/job_controller.dm

@@ -56,10 +56,8 @@ var/global/datum/controller/occupations/job_master
 				return 0
 			if(!job.player_old_enough(player.client))
 				return 0
-			//VOREStation Add
 			if(!is_job_whitelisted(player, rank))
 				return 0
-			//VOREStation Add End
 
 			var/position_limit = job.total_positions
 			if(!latejoin)
@@ -94,11 +92,9 @@ var/global/datum/controller/occupations/job_master
 			if(job.minimum_character_age && (player.client.prefs.age < job.minimum_character_age))
 				Debug("FOC character not old enough, Player: [player]")
 				continue
-			//VOREStation Code Start
 			if(!is_job_whitelisted(player, job.title))
 				Debug("FOC is_job_whitelisted failed, Player: [player]")
 				continue
-			//VOREStation Code End
 			if(flag && !(player.client.prefs.be_special & flag))
 				Debug("FOC flag failed, Player: [player], Flag: [flag], ")
 				continue
@@ -116,7 +112,7 @@ var/global/datum/controller/occupations/job_master
 			if(job.minimum_character_age && (player.client.prefs.age < job.minimum_character_age))
 				continue
 
-			if(istype(job, GetJob(USELESS_JOB))) // We don't want to give him assistant, that's boring! //VOREStation Edit - Visitor not Assistant
+			if(istype(job, GetJob(USELESS_JOB))) // We don't want to give him visitor, that's boring!
 				continue
 
 			if(SSjob.is_job_in_department(job.title, DEPARTMENT_COMMAND)) //If you want a command position, select it!
@@ -130,11 +126,9 @@ var/global/datum/controller/occupations/job_master
 				Debug("GRJ player not old enough, Player: [player]")
 				continue
 
-			//VOREStation Code Start
 			if(!is_job_whitelisted(player, job.title))
 				Debug("GRJ player not whitelisted for this job, Player: [player], Job: [job.title]")
 				continue
-			//VOREStation Code End
 
 			if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
 				Debug("GRJ Random job given, Player: [player], Job: [job]")
@@ -241,7 +235,7 @@ var/global/datum/controller/occupations/job_master
 		Debug("AC1, Candidates: [assistant_candidates.len]")
 		for(var/mob/new_player/player in assistant_candidates)
 			Debug("AC1 pass, Player: [player]")
-			AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant
+			AssignRole(player, USELESS_JOB)
 			assistant_candidates -= player
 		Debug("DO, AC1 end")
 
@@ -322,7 +316,7 @@ var/global/datum/controller/occupations/job_master
 		for(var/mob/new_player/player in unassigned)
 			if(player.client.prefs.alternate_option == BE_ASSISTANT)
 				Debug("AC2 Assistant located, Player: [player]")
-				AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant
+				AssignRole(player, USELESS_JOB)
 
 		//For ones returning to lobby
 		for(var/mob/new_player/player in unassigned)
@@ -443,7 +437,7 @@ var/global/datum/controller/occupations/job_master
 
 		H.job = rank
 		log_game("JOINED [key_name(H)] as \"[rank]\"")
-		log_game("SPECIES [key_name(H)] is a: \"[H.species.name]\"") //VOREStation Add
+		log_game("SPECIES [key_name(H)] is a: \"[H.species.name]\"")
 
 		// If they're head, give them the account info for their department
 		if(H.mind && job.department_accounts)

code/controllers/subsystem/mapping/_mapping.dm

@@ -304,7 +304,7 @@ SUBSYSTEM_DEF(mapping)
 
 //
 // Mapping subsystem handles initialization of random map elements at server start
-// On VOREStation that means loading our random roundstart engine!
+// For us that means loading our random roundstart engine!
 //
 /datum/controller/subsystem/mapping
 	var/list/map_templates = list()

code/controllers/subsystem/mobs.dm

@@ -2,8 +2,7 @@
 // Mobs Subsystem - Process mob.Life()
 //
 
-//VOREStation Edits - Contains temporary debugging code to diagnose extreme tick consumption.
-//Revert file to Polaris version when done.
+// Contains temporary debugging code to diagnose extreme tick consumption.
 
 SUBSYSTEM_DEF(mobs)
 	name = "Mobs"

code/controllers/subsystem/radiation.dm

@@ -116,7 +116,7 @@ SUBSYSTEM_DEF(radiation)
 	add_source(S)
 
 // Sets the radiation in a range to a constant value.
-/datum/controller/subsystem/radiation/proc/flat_radiate(source, power, range, var/respect_maint = TRUE)	//VOREStation edit; Respect shielded areas by default please.
+/datum/controller/subsystem/radiation/proc/flat_radiate(source, power, range, respect_maint = TRUE) // Respect shielded areas by default please.
 	if(!(source && power && range))
 		return
 	var/datum/radiation_source/S = new()
@@ -128,7 +128,7 @@ SUBSYSTEM_DEF(radiation)
 	add_source(S)
 
 // Irradiates a full Z-level. Hacky way of doing it, but not too expensive.
-/datum/controller/subsystem/radiation/proc/z_radiate(var/atom/source, power, var/respect_maint = TRUE)	//VOREStation edit; Respect shielded areas by default please.
+/datum/controller/subsystem/radiation/proc/z_radiate(atom/source, power, respect_maint = TRUE) // Respect shielded areas by default please.
 	if(!(power && source))
 		return
 	var/turf/epicentre = locate(round(world.maxx / 2), round(world.maxy / 2), source.z)

code/controllers/subsystem/ticker.dm

@@ -30,8 +30,6 @@ SUBSYSTEM_DEF(ticker)
 	var/event_time = null
 	var/event = 0
 
-	// var/login_music			// music played in pregame lobby // VOREStation Edit - We do music differently
-
 	var/list/datum/mind/minds = list()//The people in the game. Used for objective tracking.
 
 	var/Bible_icon_state	// icon_state the chaplain has chosen for his bible
@@ -226,7 +224,6 @@ SUBSYSTEM_DEF(ticker)
 	create_characters() //Create player characters and transfer them.
 	collect_minds()
 	equip_characters()
-	//data_core.manifest()	//VOREStation Removal
 
 	callHook("roundstart")
 
@@ -395,13 +392,11 @@ SUBSYSTEM_DEF(ticker)
 			else if(!player.mind.assigned_role)
 				continue
 			else
-				//VOREStation Edit Start
 				var/mob/living/carbon/human/new_char = player.create_character()
 				if(new_char)
 					qdel(player)
 				if(istype(new_char) && !(new_char.mind.assigned_role=="Cyborg"))
 					data_core.manifest_inject(new_char)
-				//VOREStation Edit End
 
 
 /datum/controller/subsystem/ticker/proc/collect_minds()
@@ -419,8 +414,6 @@ SUBSYSTEM_DEF(ticker)
 			if(!player_is_antag(player.mind, only_offstation_roles = 1))
 				job_master.EquipRank(player, player.mind.assigned_role, 0)
 				UpdateFactionList(player)
-				//equip_custom_items(player)	//VOREStation Removal
-				//player.apply_traits() //VOREStation Removal
 	if(captainless)
 		for(var/mob/M in player_list)
 			if(!istype(M,/mob/new_player))