Merge pull request #81 from Bubberstation/master

Re-merges master into ID-Fix-Branch

code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm

@@ -75,6 +75,15 @@
 		JOB_AI,
 		JOB_CYBORG,
 	)
+	enemy_roles = list(
+		JOB_AI,
+		JOB_CAPTAIN,
+		JOB_DETECTIVE,
+		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_OFFICER,
+		JOB_WARDEN,
+	)
+	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
 	required_candidates = 1
 	weight = 7
 	cost = 5
@@ -110,7 +119,6 @@
 	)
 	enemy_roles = list(
 		JOB_AI,
-		JOB_CYBORG,
 		JOB_CAPTAIN,
 		JOB_DETECTIVE,
 		JOB_HEAD_OF_SECURITY,
@@ -202,6 +210,15 @@
 		JOB_AI,
 		JOB_CYBORG,
 	)
+	enemy_roles = list(
+		JOB_AI,
+		JOB_CAPTAIN,
+		JOB_DETECTIVE,
+		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_OFFICER,
+		JOB_WARDEN,
+	)
+	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
 	required_candidates = 1
 	weight = 4
 	cost = 6

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -240,6 +240,15 @@
 		JOB_CYBORG,
 		ROLE_POSITRONIC_BRAIN,
 	)
+	enemy_roles = list(
+		JOB_AI,
+		JOB_CAPTAIN,
+		JOB_DETECTIVE,
+		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_OFFICER,
+		JOB_WARDEN,
+	)
+	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
 	required_candidates = 1
 	weight = 35
 	cost = 3
@@ -376,7 +385,6 @@
 	antag_datum = /datum/antagonist/nukeop
 	enemy_roles = list(
 		JOB_AI,
-		JOB_CYBORG,
 		JOB_CAPTAIN,
 		JOB_DETECTIVE,
 		JOB_HEAD_OF_SECURITY,
@@ -552,6 +560,14 @@
 	antag_datum = /datum/antagonist/nightmare
 	antag_flag = ROLE_NIGHTMARE
 	antag_flag_override = ROLE_ALIEN
+	enemy_roles = list(
+		JOB_AI,
+		JOB_CAPTAIN,
+		JOB_DETECTIVE,
+		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_OFFICER,
+		JOB_WARDEN,
+	)
 	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
 	required_candidates = 1
 	weight = 3
@@ -803,6 +819,14 @@
 	midround_ruleset_style = MIDROUND_RULESET_STYLE_HEAVY
 	antag_flag = "Space Pirates"
 	required_type = /mob/dead/observer
+	enemy_roles = list(
+		JOB_AI,
+		JOB_CAPTAIN,
+		JOB_DETECTIVE,
+		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_OFFICER,
+		JOB_WARDEN,
+	)
 	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
 	required_candidates = 0
 	weight = 4
@@ -830,6 +854,14 @@
 		JOB_CYBORG,
 		ROLE_POSITRONIC_BRAIN,
 	)
+	enemy_roles = list(
+		JOB_AI,
+		JOB_CAPTAIN,
+		JOB_DETECTIVE,
+		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_OFFICER,
+		JOB_WARDEN,
+	)
 	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
 	required_candidates = 1
 	weight = 4

code/modules/research/designs/mechfabricator_designs.dm

@@ -1205,7 +1205,6 @@
 		RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL
 	)
 
-/* //SKYRAT REMOVAL START
 /datum/design/borg_upgrade_pinpointer
 	name = "Crew Pinpointer"
 	id = "borg_upgrade_pinpointer"
@@ -1216,7 +1215,6 @@
 	category = list(
 		RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL
 	)
-*/ //SKYRAT REMOVAL END
 
 /datum/design/borg_upgrade_broomer
 	name = "Experimental Push Broom"

code/modules/research/techweb/all_nodes.dm

@@ -1015,7 +1015,7 @@
 		"borg_upgrade_defibrillator",
 		"borg_upgrade_expandedsynthesiser",
 		"borg_upgrade_piercinghypospray",
-		//"borg_upgrade_pinpointer", // SKYRAT EDIT REMOVAL
+		"borg_upgrade_pinpointer",
 		"borg_upgrade_surgicalprocessor",
 
 		//SKYRAT EDIT START - RESEARCH DESIGNS

html/changelogs/AutoChangeLog-pr-63.yml

@@ -0,0 +1,4 @@
+author: "yourdoom9898"
+delete-after: True
+changes:
+  - rscadd: "Medical cyborg crew pinpointer uncommented"

html/changelogs/AutoChangeLog-pr-68.yml

@@ -0,0 +1,4 @@
+author: "ShamanSliph"
+delete-after: True
+changes:
+  - bugfix: "fixed Hemophage preview."

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

@@ -290,6 +290,7 @@
 	human.skin_tone = "albino"
 	human.hair_color = "#1d1d1d"
 	human.hairstyle = "Pompadour (Big)"
+	human.dna.features["mcolor"] = "#fff4e6" //Bubber Edit
 	human.update_mutant_bodyparts(TRUE)
 	human.update_body(TRUE)