Merge pull request #5 from JerryWester/modular_fixes

Modularizes (#2)

modular_bubbers/modules/remove_vet_status/code/remove_vet_status.dm

@@ -0,0 +1,17 @@
+/datum/job/blueshield
+	veteran_only = FALSE
+
+/datum/job/nanotrasen_consultant
+	veteran_only = FALSE
+
+/datum/job/clown
+	veteran_only = FALSE
+
+/datum/job/mime
+	veteran_only = FALSE
+
+/datum/species/hemophage
+	veteran_only = FALSE
+
+/datum/species/snail
+	veteran_only = FALSE

modular_bubbers/modules/remove_vet_status/readme.md

@@ -0,0 +1,30 @@
+https://github.com/ReturnToZender/Bubberstation/pull/5
+
+## Title: Remove Veteran Status
+
+Module ID: REMOVE_VET_STATUS
+
+### Description:
+
+Removes the veteran status requirement on certain jobs and races
+
+### TG Proc/File Changes:
+
+- N/A
+
+### Modular Overrides:
+
+- N/A
+
+### Defines:
+
+- N/A
+
+### Included files that are not contained in this module:
+
+- N/A
+
+### Credits:
+
+- Kilmented - Original fix
+- JerryWester - Modularization

modular_skyrat/modules/blueshield/code/blueshield.dm

@@ -40,7 +40,7 @@
 		/obj/projectile/bullet/b460 = 1
 	)
 
-	veteran_only = FALSE
+	veteran_only = TRUE
 	job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS
 
 /datum/outfit/job/blueshield

modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

@@ -86,7 +86,7 @@
 	/// The current status of our tumor. If PULSATING_TUMOR_MISSING, all tumor-corrupted organs will start to decay rapidly. If PULSATING_TUMOR_INACTIVE, no enhanced regeneration.
 	var/tumor_status = PULSATING_TUMOR_MISSING
 
-	veteran_only = FALSE
+	veteran_only = TRUE
 
 
 /datum/species/hemophage/check_roundstart_eligible()

modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm

@@ -37,7 +37,7 @@
 		/obj/item/reagent_containers/cup/glass/bottle/champagne = 10
 	)
 
-	veteran_only = FALSE
+	veteran_only = TRUE
 	job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS
 
 /datum/outfit/job/nanotrasen_consultant

modular_skyrat/modules/veteran_only/code/job_types.dm

@@ -1,5 +1,5 @@
 /datum/job/clown
-	veteran_only = FALSE
+	veteran_only = TRUE
 
 /datum/job/mime
-	veteran_only = FALSE
+	veteran_only = TRUE

modular_skyrat/modules/veteran_only/code/species_types.dm

@@ -1,2 +1,2 @@
 /datum/species/snail
-	veteran_only = FALSE
+	veteran_only = TRUE

tgstation.dme

@@ -6536,4 +6536,5 @@
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\sentinel.dm"
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm"
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm"
+#include "modular_bubbers\modules\remove_vet_status\code\remove_vet_status.dm"
 // END_INCLUDE