Merge branch 'master' into voteingchanges

code/__DEFINES/perks.dm

@@ -33,16 +33,19 @@
 #define PERK_SHELL_SHOCK /datum/perk/oddity/shell_shock
 #define PERK_FAILING_MIND /datum/perk/oddity/failing_mind
 #define PERK_SHARP_MIND /datum/perk/oddity/sharp_mind
-#define PERK_BLACKBOX_INSIGHT /datum/perk/oddity/blackbox_insight
+#define PERK_BLACKBOX_INSIGHT /datum/perk/guild/blackbox_insight
 #define PERK_STRANGTH /datum/perk/oddity/strangth
 #define PERK_MIND_OF_MATTER /datum/perk/oddity/mind_of_matter
 #define PERK_IRON_WILL /datum/perk/oddity/iron_will
 #define PERK_SURVIVOR /datum/perk/oddity/survivor
 #define PERK_INSPIRING /datum/perk/oddity/inspiring
+#define PERK_HOLY_LIGHT /datum/perk/nt_oddity/holy_light
 
 //roundstart perks (job / backgrounds)
 #define PERK_NOBLE /datum/perk/noble
 #define PERK_UNFINISHED_DELIVERY /datum/perk/unfinished_delivery
+#define PERK_SANITYBOOST /datum/perk/sanityboost
+#define PERK_CHANNELING /datum/perk/channeling
 #define PERK_IDEALIST /datum/perk/idealist
 #define PERK_LUNGS_OF_IRON /datum/perk/lungs_of_iron
 #define PERK_BLOOD_OF_LEAD /datum/perk/blood_of_lead
@@ -57,7 +60,6 @@
 #define PERK_JUNKBORN /datum/perk/junkborn
 #define PERK_ASS_OF_CONCRETE /datum/perk/ass_of_concrete
 #define PERK_SURE_STEP /datum/perk/sure_step
-#define PERK_REZ_SICKNESS /datum/perk/rezsickness
 #define PERK_HANDYMAN /datum/perk/handyman
 #define PERK_STALKER /datum/perk/stalker
 #define PERK_MARKET_PROF /datum/perk/market_prof
@@ -83,7 +85,22 @@
 #define PERK_LINGUIST /datum/perk/linguist
 #define PERK_SOMELLIER /datum/perk/sommelier
 #define PERK_SOLBORN /datum/perk/solborn
+#define PERK_NEAT /datum/perk/neat
+#define PERK_CHEM_CONTRABAND /datum/perk/chem_contraband
+#define PERK_CHEMIST /datum/perk/chemist
+#define PERK_KLUTZ /datum/perk/klutz
+#define PERK_CODESPEAK /datum/perk/codespeak
+#define PERK_INSPIRATION /datum/perk/inspiration
+#define PERK_ACTIVE_INSPIRATION /datum/perk/active_inspiration
+#define PERK_TIMEISMONEY /datum/perk/timeismoney
+#define PERK_PROSPECTOR_CONDITIONING /datum/perk/job/prospector_conditioning
+#define PERK_BLACKSHIELD_CONDITIONING /datum/perk/job/blackshield_conditioning
+#define PERK_BARTENDER /datum/perk/bartender
+
 
+#define PERK_REZ_SICKNESS /datum/perk/rezsickness
+#define PERK_REZ_SICKNESS_SEVERE /datum/perk/rezsickness/severe
+#define PERK_REZ_SICKNESS_FATAL /datum/perk/rezsickness/severe/fatal
 //////////////
 //Race Perks//
 //////////////
@@ -115,13 +132,20 @@
 //Opifex
 #define PERK_OPIFEX_TURRET /datum/perk/opifex_turret
 #define PERK_OPIFEX_PATCHKIT /datum/perk/opifex_patchkit
+#define PERK_OPIFEX_BACKUP /datum/perk/opifex_backup
+#define PERK_OPIFEX_MEDICAL /datum/perk/opifex_backup_medical
+#define PERK_OPIFEX_COMBAT /datum/perk/opifex_backup_combat
 //Cindarite
 #define PERK_SECOND_SKIN /datum/perk/second_skin
 #define PERK_PURGETOXINS /datum/perk/purgeinfections
 #define PERK_PURGEINFECTIONS /datum/perk/purgetoxins
 //Ch'mant
 #define PERK_SPIDER_FRIEND /datum/perk/spiderfriend
 #define PERK_SCUTTLEBUG /datum/perk/scuttlebug
+#define PERK_REPAIR_GOO /datum/perk/repair_goo
+#define PERK_ICHOR /datum/perk/ichor
+#define PERK_CHITINARMOR /datum/perk/chitinarmor
+#define PERK_WEBMAKER /datum/perk/webmaker
 //Mycus
 #define PERK_DARK_HEAL /datum/perk/dark_heal
 //Folken

code/controllers/subsystems/ticker.dm

@@ -405,7 +405,7 @@ SUBSYSTEM_DEF(ticker)
 			SSticker.minds |= player.mind
 
 /datum/controller/subsystem/ticker/proc/generate_contracts(count)
-	var/list/candidates = (subtypesof(/datum/antag_contract) - typesof(/datum/antag_contract/excel)- typesof(/datum/antag_contract/blackshield))
+	var/list/candidates = (subtypesof(/datum/antag_contract) - typesof(/datum/antag_contract/excel) - typesof(/datum/antag_contract/blackshield))
 	while(count--)
 		while(candidates.len)
 			var/contract_type = pick(candidates)
@@ -435,6 +435,7 @@ SUBSYSTEM_DEF(ticker)
 			break
 
 ///datum/controller/subsystem/ticker/proc/blackshield_check()
+
 //	addtimer(CALLBACK(src, .proc/blackshield_check), 3 MINUTES)
 
 /datum/controller/subsystem/ticker/proc/generate_excel_contracts(count)

code/controllers/subsystems/voting/poll.dm

@@ -1,6 +1,6 @@
 /datum/poll
 	var/name = "Voting"
-	var/question = "Voting, voting, candidates!"
+	var/question = "Voting, voting, candidates are communists!"
 	var/description = ""
 	var/time = 60	//in seconds
 	var/list/choice_types = list(/datum/vote_choice)	//Choices will be initialized from this list

code/controllers/subsystems/xenoarch.dm

@@ -6,8 +6,8 @@ SUBSYSTEM_DEF(xenoarch)
 	var/const/xenoarch_spawn_chance = 0.5
 	var/const/digsite_size_lower = 4
 	var/const/digsite_size_upper = 12
-	var/const/artifact_spawnnum_lower = 6
-	var/const/artifact_spawnnum_upper = 12
+	var/artifact_spawnnum_lower = 1
+	var/artifact_spawnnum_upper = 2
 
 	var/list/artifact_spawning_turfs = list()
 	var/list/digsite_spawning_turfs = list()
@@ -76,9 +76,12 @@ SUBSYSTEM_DEF(xenoarch)
 			//have a chance for an artifact to spawn here, but not in animal or plant digsites
 			if(isnull(M.artifact_find) && digsite != 1 && digsite != 2)
 				artifact_spawning_turfs.Add(archeo_turf)
+				artifact_spawnnum_upper += 1
 
 	//create artifact machinery
-	var/num_artifacts_spawn = rand(artifact_spawnnum_lower, artifact_spawnnum_upper)
+	artifact_spawnnum_lower = artifact_spawnnum_upper / 2
+	var/num_artifacts_spawn = rand(artifact_spawnnum_lower * 0.1, artifact_spawnnum_upper * 0.1) // 0.1 makes it 10% potentially might have to be lowered more.
+	//log_and_message_admins("Xenoarch artifact spawn count is [num_artifacts_spawn].") //Used to test how many spawned at round start.
 	while(artifact_spawning_turfs.len > num_artifacts_spawn)
 		pick_n_take(artifact_spawning_turfs)
 

code/datums/autolathe/biomatter.dm

@@ -169,10 +169,6 @@
 	name = "Vector Garment"
 	build_path = /obj/item/clothing/under/rank/acolyte
 
-/datum/design/bioprinter/nt_clothes/sports_uniform
-	name = "Sport Clothes"
-	build_path = /obj/item/clothing/under/rank/church/sport
-
 /datum/design/bioprinter/nt_clothes/church_uniform
 	name = "Church Garment"
 	build_path = /obj/item/clothing/under/rank/church

code/datums/autolathe/gun_frames.dm

@@ -45,6 +45,16 @@ This is mostly used for Marshal gun crafting to make it so they can make guns bu
 	name = "20mm operator - frame"
 	build_path = /obj/item/part/gun/frame/opshot
 
+/datum/design/autolathe/gun_frame/takeshi
+	name = "6.5mm takeshi - frame"
+	build_path = /obj/item/part/gun/frame/tk
+
+//Blackshield guns.
+
+/datum/design/autolathe/gun_frame/omni
+	name = "8.6mm omni - frame"
+	build_path = /obj/item/part/gun/frame/omni
+
 // Retail section - low-end guns for LSS to order gun-frame disks for. Allows more guns per-disk at a cheaper overall price, realistically.
 /datum/design/autolathe/gun_frame/colt
 	name = "Colt M1911 - frame"

code/datums/contract.dm

@@ -538,7 +538,6 @@ GLOBAL_LIST_INIT(blackshield_item_targets,list(
 /datum/antag_contract/excel/propaganda/can_place()
 	return ..() && targets.len
 
-
 // Blackshield contracts
 
 /datum/antag_contract/blackshield

code/datums/craft/crafting_items.dm

@@ -129,7 +129,7 @@
 		to_chat(user, SPAN_WARNING("[src] is not yet complete."))
 	else
 		view_only = round(total_items * (1 - user.stats.getMult(req_sat, 100))/2) +1 // 1 choice per 10 stat + 1
-		if(user.stats.getPerk(/datum/perk/gunsmith))
+		if(user.stats.getPerk(PERK_GUNSMITH))
 			view_only += 3
 		ui_interact(user)
 		SSnano.update_uis(src)