Merge branch 'VoiceInYourHead:campaign' into human-ai(test)

code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm

@@ -40,7 +40,8 @@
 		SYNTH_GEN_TWO,
 		SYNTH_GEN_THREE,
 		SYNTH_WORKING_JOE,
-		SYNTH_INFILTRATOR
+		SYNTH_INFILTRATOR,
+		"Thin Human"
 		)
 
 	// Whether or not the accessory can be affected by coloration

colonialmarines.dme

@@ -2583,9 +2583,12 @@
 #include "void-marines\code\admin_tools.dm"
 #include "void-marines\code\chair_shifting.dm"
 #include "void-marines\code\factory_areas.dm"
+#include "void-marines\code\human_hair.dm"
+#include "void-marines\code\layer_shifting.dm"
 #include "void-marines\code\light_change.dm"
 #include "void-marines\code\loadouts.dm"
 #include "void-marines\code\marine_roles.dm"
+#include "void-marines\code\pixel_shifting.dm"
 #include "void-marines\code\portable_detector.dm"
 #include "void-marines\code\rasputin.dm"
 #include "void-marines\code\smg.dm"
@@ -2602,4 +2605,12 @@
 #include "void-marines\code\playable_factions\lancer.dm"
 #include "void-marines\code\playable_factions\shuttles.dm"
 #include "void-marines\code\playable_factions\faction_paygrades\freelancer.dm"
+#include "void-marines\code\xcom\floater.dm"
+#include "void-marines\code\xcom\muton.dm"
+#include "void-marines\code\xcom\random_names.dm"
+#include "void-marines\code\xcom\sectoid.dm"
+#include "void-marines\code\xcom\sectoid_commander.dm"
+#include "void-marines\code\xcom\thinman.dm"
+#include "void-marines\code\xcom\weapons.dm"
+#include "void-marines\code\xcom\~emote_override.dm"
 // END_INCLUDE

map_config/shipmaps.txt

@@ -13,7 +13,6 @@ Format:
 endmap
 
 map almayer
-	disabled
 endmap
 
 map golden_arrow

maps/templates/xeno_infestation_pod_center.dmm

@@ -0,0 +1,35 @@
+"a" = (/obj/effect/xenomorph/boiler_bombard,/turf/template_noop,/area/template_noop)
+"b" = (/obj/effect/alien/resin/king_cocoon{pixel_y = -47},/turf/open/ice{color = "#797979"},/area/template_noop)
+"f" = (/obj/effect/alien/resin/acid_pillar,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"j" = (/obj/effect/xenomorph/boiler_bombard,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"l" = (/turf/closed/wall/mineral/bone_resin,/area/template_noop)
+"p" = (/turf/open/ice{color = "#797979"},/area/template_noop)
+"t" = (/turf/template_noop,/area/template_noop)
+"y" = (/obj/effect/alien/weeds/node,/obj/effect/xenomorph/boiler_bombard,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"z" = (/obj/effect/alien/egg,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"D" = (/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"F" = (/obj/effect/alien/resin/acid_pillar,/turf/open/ice{color = "#797979"},/area/template_noop)
+"M" = (/obj/effect/alien/egg,/turf/open/ice{color = "#797979"},/area/template_noop)
+"P" = (/obj/effect/alien/resin/acid_pillar,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"Q" = (/obj/effect/alien/weeds/node,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"V" = (/obj/effect/alien/weeds/node,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"W" = (/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"Y" = (/obj/effect/alien/weeds/node,/turf/open/ice{color = "#797979"},/area/template_noop)
+
+(1,1,1) = {"
+tlllltaattatttt
+lltlltaaaatttlt
+alttllllallatll
+ttatallPjllaatl
+ttaalllypllaall
+aaQWllMppllllll
+aaWWlWppzplllat
+aaljWYppYDlllaa
+tallFMpbppMQlat
+lalllMMppfWjaaa
+ltallpVMlllaatt
+ltllljllllllatt
+llllQWllttllata
+lllltalltttlltt
+allttaalttttltt
+"}

maps/templates/xeno_infestation_pod_east.dmm

@@ -0,0 +1,37 @@
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/obj/effect/alien/weeds/node,/turf/open/ice{color = "#797979"},/area/template_noop)
+"c" = (/obj/effect/alien/egg,/obj/effect/alien/resin/sticky/thin,/turf/open/ice{color = "#797979"},/area/template_noop)
+"e" = (/obj/effect/xenomorph/boiler_bombard,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"f" = (/obj/effect/alien/resin/sticky/thin,/turf/open/ice{color = "#797979"},/area/template_noop)
+"i" = (/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"m" = (/turf/closed/wall/mineral/bone_resin,/area/template_noop)
+"t" = (/obj/effect/alien/resin/acid_pillar/strong,/turf/open/ice{color = "#797979"},/area/template_noop)
+"u" = (/obj/effect/alien/resin/sticky/thin,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"y" = (/turf/open/ice{color = "#797979"},/area/template_noop)
+"A" = (/obj/effect/alien/resin/sticky/thin,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"F" = (/obj/effect/xenomorph/boiler_bombard,/turf/template_noop,/area/template_noop)
+"H" = (/obj/effect/alien/weeds/node,/obj/effect/alien/resin/sticky/thin,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"O" = (/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"Q" = (/obj/effect/alien/resin/king_cocoon{pixel_y = -47},/turf/open/ice{color = "#797979"},/area/template_noop)
+"T" = (/obj/effect/alien/egg,/turf/open/ice{color = "#797979"},/area/template_noop)
+"U" = (/obj/effect/alien/resin/acid_pillar/strong,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"W" = (/obj/effect/alien/resin/shield_pillar,/turf/open/ice{color = "#797979"},/area/template_noop)
+"X" = (/obj/effect/alien/weeds/node,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+
+(1,1,1) = {"
+aaaaaaaammmmaaaaaFmmaa
+aaammmmaammmmmaaaFmmma
+aammmmaaaamTTmmmFmmmaF
+ammaaaaaammTyyymmmmiFa
+ammaaaammmybtybyOiAXFa
+ammmammmmTyfyTmyyfOiFF
+aammmmTyyycffymmmfbmma
+aammmmmyQyTcfbWmmOfmmm
+aaaaammybyTmcyffuyAmmm
+aaaaaammTcyyTffyfHeUmm
+aaaaaaammmmmfbOftyieim
+aaaaaammmmmmmTymiemiXF
+ammaammmammmmmmmmmmmFa
+ammmmmmaaaammmmmmmmmma
+aammmmaaaaaaammmmmaFmm
+"}

maps/templates/xeno_infestation_pod_north.dmm

@@ -0,0 +1,41 @@
+"a" = (/turf/template_noop,/area/template_noop)
+"f" = (/obj/effect/alien/resin/sticky/thin,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"p" = (/obj/effect/alien/weeds/node,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"q" = (/obj/effect/alien/weeds/node,/turf/open/ice{color = "#797979"},/area/template_noop)
+"r" = (/turf/open/ice{color = "#797979"},/area/template_noop)
+"s" = (/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"B" = (/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"H" = (/turf/closed/wall/mineral/bone_resin,/area/template_noop)
+"I" = (/obj/effect/alien/resin/king_cocoon{pixel_y = -47},/turf/open/ice{color = "#797979"},/area/template_noop)
+"J" = (/obj/effect/alien/resin/acid_pillar/strong,/turf/open/ice{color = "#797979"},/area/template_noop)
+"L" = (/obj/effect/alien/weeds/node,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"R" = (/obj/effect/alien/resin/sticky/thin,/turf/open/ice{color = "#797979"},/area/template_noop)
+"S" = (/obj/effect/alien/egg,/turf/open/ice{color = "#797979"},/area/template_noop)
+"T" = (/obj/effect/xenomorph/boiler_bombard,/turf/template_noop,/area/template_noop)
+"U" = (/obj/effect/alien/resin/shield_pillar,/turf/open/ice{color = "#797979"},/area/template_noop)
+"Y" = (/obj/effect/alien/resin/sticky/thin,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+
+(1,1,1) = {"
+aaaaaaaaaaaHHaa
+aaaaaHHHHaHHHHa
+aaHHHHHHHHHHHHH
+aHHHrrRqrSHHaHH
+HHRUSHSrHrHHaaH
+HHSqRHHrrrHHaaa
+HHSRRrHrIrrHHaa
+aHHHHRSrrqrHHaa
+aaaHHrRrHSRrHaa
+HHaaHRqHHHHRHaa
+HaaaHSrJHHHrHaa
+HHaHHHSRrUrSHaa
+HHHHHrSrRqrHHaa
+aHHHrrRRRrrHaaa
+aHsrRLrRsHHHHHa
+HHrHrJrYSHHHHHH
+HHrRYrrrrRYHHHH
+HHrrrRsYqrRBHHH
+HfqfHrBfRsBfBHT
+TBBBHBBfJrHBpBT
+TTBHHHHBfHHHBTa
+aTTHHHHpHHHHHTa
+"}

maps/templates/xeno_infestation_pod_south.dmm

@@ -0,0 +1,42 @@
+"a" = (/turf/template_noop,/area/template_noop)
+"k" = (/obj/effect/alien/resin/sticky/thin,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"n" = (/turf/closed/wall/mineral/bone_resin,/area/template_noop)
+"o" = (/obj/effect/alien/weeds/node,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"p" = (/obj/effect/alien/egg,/obj/effect/alien/resin/sticky/thin,/turf/open/ice{color = "#797979"},/area/template_noop)
+"s" = (/turf/open/ice{color = "#797979"},/area/template_noop)
+"z" = (/obj/effect/alien/egg,/turf/open/ice{color = "#797979"},/area/template_noop)
+"A" = (/obj/effect/alien/resin/shield_pillar,/turf/open/ice{color = "#797979"},/area/template_noop)
+"B" = (/obj/effect/xenomorph/boiler_bombard,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"C" = (/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"D" = (/obj/effect/alien/resin/sticky/thin,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"E" = (/obj/effect/alien/resin/acid_pillar/strong,/turf/open/ice{color = "#797979"},/area/template_noop)
+"O" = (/obj/effect/alien/weeds/node,/turf/open/ice{color = "#797979"},/area/template_noop)
+"P" = (/obj/effect/alien/resin/king_cocoon{pixel_y = -47},/turf/open/ice{color = "#797979"},/area/template_noop)
+"S" = (/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"V" = (/obj/effect/xenomorph/boiler_bombard,/turf/template_noop,/area/template_noop)
+"Y" = (/obj/effect/alien/resin/sticky/thin,/turf/open/ice{color = "#797979"},/area/template_noop)
+
+(1,1,1) = {"
+VVnCCnnnVnnVVVV
+VCoCCnnnnnnoCVa
+anCDsCnnnnDCnnn
+nnnSOksYnDBCnnn
+nnnssskYSYCnnnn
+nnsSnEsYkOSnnaa
+annsnsSAssnnnaa
+nnnssYOYYEnnnna
+nnnnsssYssnnnna
+annnnzYYOznnnaa
+aannnzYzYnnnaaa
+aannnnzYYznnaaa
+aaaaannOsYznnna
+anaannnzzzsssna
+nnaannnnpzOPsna
+naannnnnnnsssna
+naannnnannnnnna
+nnnnnnaaannnnna
+nnnnnaaannnaaaa
+annnnaaannnaaaa
+annnaaaaannaaaa
+aaaaaaaaaannaaa
+"}

maps/templates/xeno_infestation_pod_west.dmm

@@ -0,0 +1,35 @@
+"a" = (/turf/closed/wall/mineral/bone_resin,/area/template_noop)
+"e" = (/turf/open/ice{color = "#797979"},/area/template_noop)
+"h" = (/obj/effect/alien/resin/sticky/thin,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"i" = (/obj/effect/alien/weeds/node,/turf/open/ice{color = "#797979"},/area/template_noop)
+"m" = (/obj/effect/alien/resin/sticky/thin,/obj/effect/alien/resin/shield_pillar,/turf/open/ice{color = "#797979"},/area/template_noop)
+"p" = (/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"r" = (/obj/effect/alien/resin/acid_pillar/strong,/turf/open/ice{color = "#797979"},/area/template_noop)
+"u" = (/obj/effect/alien/resin/sticky/thin,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"v" = (/obj/effect/alien/resin/king_cocoon{pixel_y = -47},/turf/open/ice{color = "#797979"},/area/template_noop)
+"D" = (/obj/effect/alien/egg,/turf/open/ice{color = "#797979"},/area/template_noop)
+"G" = (/turf/template_noop,/area/template_noop)
+"H" = (/obj/effect/xenomorph/boiler_bombard,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"K" = (/obj/effect/alien/resin/sticky/thin,/turf/open/ice{color = "#797979"},/area/template_noop)
+"R" = (/obj/effect/xenomorph/boiler_bombard,/turf/template_noop,/area/template_noop)
+"S" = (/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+"V" = (/obj/effect/alien/weeds/node,/obj/effect/xenomorph/boiler_bombard,/turf/open/ice{color = "#797979"},/area/template_noop)
+"W" = (/obj/effect/alien/resin/sticky/thin,/obj/effect/xenomorph/boiler_bombard,/mob/living/carbon/xenomorph/drone,/turf/open/ice{color = "#797979"},/area/template_noop)
+
+(1,1,1) = {"
+aapRRaaaaaGGGGGGGGGGGG
+aapVpaaraaaGGGGGGGaaGG
+aaaauHKKKaaaGGGGGaaaaa
+RRaaaaiheaaaaGGGaaaaGG
+GRGaaaSKKiDaaaGGaaaGGG
+aaRGaeKhmeeeaaGGaaaGGG
+uaaaaSeKKeDKDaaaaaaGGG
+uWpuSiDeeKDDKDiaaaaGGG
+VupSaaaDDeieeDaaaGGGGG
+aapSaaaaDeeveaaGGGGGGG
+GaraaGGaaaDeeaaGGGGGGG
+GaaaGGGaaaaaaaaaGGGGGG
+aaaaGGGGaaGGGGGaaaGGGG
+aaaaGGGaaGGGGGaaaGGGGG
+aaGGGGaaaGGGaaaaaGGGGG
+"}

void-marines/code/human_hair.dm

@@ -0,0 +1,22 @@
+/datum/sprite_accessory/hair/voidmarines
+	icon = 'void-marines/icons/human_hair.dmi'
+
+/datum/sprite_accessory/hair/voidmarines/diagonalbangs
+	name = "Diagonal Bangs"
+	icon_state = "hair_diagonal_bangs"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/voidmarines/bobcutovereye
+	name = "Bobcut Overeye"
+	icon_state = "hair_bobcut_overeye"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/voidmarines/shorthime
+	name = "Hime Cut Short"
+	icon_state = "hair_short_hime"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/voidmarines/emofringe
+	name = "Emo Fringe"
+	icon_state = "hair_emo_fringe"
+	gender = FEMALE

void-marines/code/layer_shifting.dm

@@ -0,0 +1,78 @@
+#define MOB_LAYER_SHIFT_INCREMENT 1
+/// The amount by which layers are multiplied before being modified.
+/// Helps avoiding floating point errors.
+#define MOB_LAYER_MULTIPLIER 10
+#define MOB_LAYER_SHIFT_MIN 2
+//#define MOB_LAYER 4   // This is a byond standard define
+#define MOB_LAYER_SHIFT_MAX 5
+
+/mob/living/verb/shift_layer_up()
+	set name = "Shift Layer Upwards"
+	set category = "IC"
+
+	if(KnockDown())
+		to_chat(src, SPAN_INFO("You can't do that right now!"))
+		return FALSE
+
+	if(layer >= MOB_LAYER_SHIFT_MAX)
+		to_chat(src, SPAN_INFO("You cannot increase your layer priority any further."))
+		return FALSE
+
+	layer = min(((layer * MOB_LAYER_MULTIPLIER) + MOB_LAYER_SHIFT_INCREMENT) / MOB_LAYER_MULTIPLIER, MOB_LAYER_SHIFT_MAX)
+	var/layer_priority = round(layer * MOB_LAYER_MULTIPLIER - MOB_LAYER * MOB_LAYER_MULTIPLIER, MOB_LAYER_SHIFT_INCREMENT) // Just for text feedback
+	to_chat(src, SPAN_INFO("Your layer priority is now [layer_priority]."))
+
+	return TRUE
+
+
+/mob/living/verb/shift_layer_down()
+	set name = "Shift Layer Downwards"
+	set category = "IC"
+
+	if(KnockDown())
+		to_chat(src, SPAN_INFO("You can't do that right now!"))
+		return FALSE
+
+	if(layer <= MOB_LAYER_SHIFT_MIN)
+		to_chat(src, SPAN_INFO("You cannot decrease your layer priority any further."))
+		return FALSE
+
+	layer = max(((layer * MOB_LAYER_MULTIPLIER) - MOB_LAYER_SHIFT_INCREMENT) / MOB_LAYER_MULTIPLIER, MOB_LAYER_SHIFT_MIN)
+	var/layer_priority = round(layer * MOB_LAYER_MULTIPLIER - MOB_LAYER * MOB_LAYER_MULTIPLIER, MOB_LAYER_SHIFT_INCREMENT) // Just for text feedback
+	to_chat(src, SPAN_INFO("Your layer priority is now [layer_priority]."))
+
+	return TRUE
+
+
+/datum/emote/living/shift_layer_up
+	key = "shiftlayerup"
+	key_third_person = "shiftlayerup"
+	message = null
+	mob_type_blacklist_typecache = list(/mob/living/brain)
+	cooldown = 0.25 SECONDS
+
+/datum/emote/living/shift_layer_up/run_emote(mob/user, params, type_override, intentional)
+	if(!can_run_emote(user))
+		to_chat(user, SPAN_INFO("You can't change layer at this time."))
+		return FALSE
+
+	var/mob/living/layer_shifter = user
+
+	return layer_shifter.shift_layer_up()
+
+
+/datum/emote/living/shift_layer_down
+	key = "shiftlayerdown"
+	key_third_person = "shiftlayerdown"
+	message = null
+	mob_type_blacklist_typecache = list(/mob/living/brain)
+	cooldown = 0.25 SECONDS
+
+/datum/emote/living/shift_layer_down/run_emote(mob/user, params, type_override, intentional)
+	if(!can_run_emote(user))
+		to_chat(user, SPAN_INFO("You can't change layer at this time."))
+		return FALSE
+
+	var/mob/living/layer_shifter = user
+
+	return layer_shifter.shift_layer_down()

void-marines/code/loadout_presets/rednecks.dm

@@ -4,7 +4,7 @@
 	assignment = JOB_COLONIST
 	rank = JOB_COLONIST
 	faction = FACTION_COLONIST
-	languages = list()
+	languages = list(LANGUAGE_ENGLISH)
 	access = list(ACCESS_CIVILIAN_PUBLIC)
 	skills = /datum/skills/clf
 	idtype = /obj/item/card/id/lanyard