ss220-space · Anorak2024 · Sep 21, 2024 · Sep 23, 2024 · Sep 23, 2024 · Sep 23, 2024
diff --git a/code/__DEFINES/affiliates.dm b/code/__DEFINES/affiliates.dm
@@ -0,0 +1,14 @@
+#define AFFIL_CYBERSUN 		"Cybersun Industries"
+#define AFFIL_GORLEX	 	"Gorlex Maraduers"
+#define AFFIL_MI13			"MI13"
+#define AFFIL_HEMATOGENIC	"Hematogenic Industries"
+#define AFFIL_SELF 			"SELF"
+#define AFFIL_TIGER 		"Tiger Cooperative"
+#define AFFIL_CHANG			"Mr. Chang"
+#define AFFIL_SHELLGUARD	"Shellguard Amunitions"
+#define AFFIL_DONK			"Donk Corporation"
+#define AFFIL_WAFFLE		"Waffle Corporation"
+#define AFFIL_BIOTECH		"BioTech Solutions"
+#define AFFIL_MIME			"World Association of Mimes"
+#define AFFIL_CLOWN			"Honk Corporation"
+#define AFFIL_SOL			"Sol"
diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm
@@ -62,8 +62,9 @@
 #define TAIPAN_HUD 23
 #define ANTAG_HUD_THIEF 24
 #define THOUGHTS_HUD 25
+#define ANTAG_HUD_AFFIL_GORLEX 26
 //species hud
-#define DATA_HUD_KIDAN_PHEROMONES 26
+#define DATA_HUD_KIDAN_PHEROMONES 27
 
 // Notification action types
 #define NOTIFY_JUMP "jump"

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -298,6 +298,8 @@
 #define isdemon(A) 			(istype((A), /mob/living/simple_animal/demon))
 #define ismorph(A)		(istype((A), /mob/living/simple_animal/hostile/morph))
 #define isborer(A)		(istype((A), /mob/living/simple_animal/borer))
+#define isrevenant(A)		(istype((A), /mob/living/simple_animal/revenant))
+#define isshadowdemon(A)		(istype((A), /mob/living/simple_animal/demon/shadow))
 
 #define issilicon(A)	(istype((A), /mob/living/silicon))
 #define isAI(A)			(istype((A), /mob/living/silicon/ai))

diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm
@@ -65,6 +65,8 @@
 //#define span_hypnophrase(str) ("<span class='hypnophrase'>" + str + "</span>")
 //#define span_icon(str) ("<span class='icon'>" + str + "</span>")
 #define span_info(str) ("<span class='info'>" + str + "</span>")
+#define tagB(str) ("<B>" + str + "</B>")
+#define tagb(str) ("<b>" + str + "</b>")
 //#define span_infoplain(str) ("<span class='infoplain'>" + str + "</span>")
 #define span_interface(str) ("<span class='interface'>" + str + "</span>")
 #define span_italics(str) ("<span class='italics'>" + str + "</span>")

diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
@@ -74,7 +74,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_FORCE_DOORS "force_doors"
 #define TRAIT_EMOTE_MUTE "emote_mute"
 #define TRAIT_IGNORESLOWDOWN "ignoreslow"
+#define TRAIT_IGNORECOLDSLOWDOWN "ignorecoldslow"
 #define TRAIT_IGNOREDAMAGESLOWDOWN "ignoredamageslowdown"
+#define TRAIT_IGNORECOLDDAMAGE "ignorecoldslow"
 #define TRAIT_STRONG_GRABBER "strong_grabber"
 #define TRAIT_PUSHIMMUNE "push_immunity"
 #define TRAIT_AI_PAUSED "TRAIT_AI_PAUSED"

diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm
@@ -33,6 +33,7 @@
 #define CULT_EYES "cult_eyes"
 #define CLOCK_HANDS "clock_hands"
 #define PULSEDEMON_TRAIT "pulse_demon"
+#define TIGER_TRAIT "tiger"
 #define CHANGELING_TRAIT "changeling"
 #define VAMPIRE_TRAIT "vampire"
 #define NINJA_TRAIT "space-ninja"
@@ -157,3 +158,5 @@
 #define BLOB_INFECTED_TRAIT "blob_infected"
 
 #define VENDOR_FLATTENING_TRAIT "vendor_flattening"
+
+#define BLUELAGOON_TRAIT "blue_lagoon"
diff --git a/code/__DEFINES/vampire_defines.dm b/code/__DEFINES/vampire_defines.dm
@@ -4,8 +4,10 @@
 #define SUBCLASS_DANTALION /datum/vampire_subclass/dantalion
 #define SUBCLASS_BESTIA /datum/vampire_subclass/bestia
 #define SUBCLASS_ANCIENT /datum/vampire_subclass/ancient
+#define SUBCLASS_ADVANCED /datum/vampire_subclass/advanced
 
 #define BESTIA_SUCK_RATE	3 SECONDS
+#define ADVANCED_SUCK_RATE	3 SECONDS
 
 #define BLOOD_DRAIN_LIMIT 200 // the amount of blood a vampire can drain from a person.
 #define FULLPOWER_DRAINED_REQUIREMENT 8 // the number of people you need to suck to become full powered.

diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
@@ -70,6 +70,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_HEALS_FROM_HOLY_PYLONS" = TRAIT_HEALS_FROM_HOLY_PYLONS,
 		"TRAIT_HULK" = TRAIT_HULK,
 		"TRAIT_HUSK" = TRAIT_HUSK,
+		"TRAIT_IGNORECOLDDAMAGE" = TRAIT_IGNORECOLDDAMAGE,
+		"TRAIT_IGNORECOLDSLOWDOWN" = TRAIT_IGNORECOLDSLOWDOWN,
 		"TRAIT_IGNOREDAMAGESLOWDOWN" = TRAIT_IGNOREDAMAGESLOWDOWN,
 		"TRAIT_IGNORESLOWDOWN" = TRAIT_IGNORESLOWDOWN,
 		"TRAIT_IGNORING_GRAVITY" = TRAIT_IGNORING_GRAVITY,

diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
@@ -75,6 +75,7 @@
 		ShiftClickOn(A)
 		return
 	if(modifiers["alt"]) // alt and alt-gr (rightalt)
+		SEND_SIGNAL(A, COMSIG_CLICK_ALT, src)
 		AltClickOn(A)
 		return
 	if(modifiers["ctrl"])

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
@@ -95,6 +95,7 @@
 		ShiftClickOn(A)
 		return
 	if(modifiers["alt"]) // alt and alt-gr (rightalt)
+		SEND_SIGNAL(A, COMSIG_CLICK_ALT, src)
 		AltClickOn(A)
 		return
 	if(modifiers["ctrl"])

diff --git a/code/_onclick/cogscarab.dm b/code/_onclick/cogscarab.dm
@@ -36,6 +36,7 @@
 		ShiftClickOn(A)
 		return
 	if(modifiers["alt"]) // alt and alt-gr (rightalt)
+		SEND_SIGNAL(A, COMSIG_CLICK_ALT, src)
 		AltClickOn(A)
 		return
 	if(modifiers["ctrl"])

diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
@@ -37,6 +37,7 @@
 		ShiftClickOn(A)
 		return
 	if(modifiers["alt"]) // alt and alt-gr (rightalt)
+		SEND_SIGNAL(A, COMSIG_CLICK_ALT, src)
 		AltClickOn(A)
 		return
 	if(modifiers["ctrl"])

diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
@@ -139,8 +139,10 @@
 	for(var/datum/action/action as anything in user.actions)
 		var/atom/movable/screen/movable/action_button/our_button = action.button
 		our_button.moved = FALSE
+
 	if(moved)
 		moved = FALSE
+
 	user.update_action_buttons(reload_screen = TRUE)
 	to_chat(user, span_notice("Action button positions have been reset."))
 

diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
@@ -299,17 +299,19 @@
 	return set_selected_zone(choice)
 
 /atom/movable/screen/zone_sel/AltClick(mob/user, choice)
-
 	if(user.next_click > world.time || user.next_move > world.time)
 		return FALSE
+
 	user.changeNext_click(1)
 
 	var/obj/item/holding_item = user.get_active_hand()
 	var/old_selecting = selecting
 	if(!istype(holding_item))
 		return FALSE
+
 	if(!set_selected_zone(choice, FALSE))
 		return FALSE
+
 	holding_item.melee_attack_chain(user, user)
 	set_selected_zone(old_selecting, FALSE)
 

diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
@@ -48,6 +48,7 @@
 		ShiftClickOn(A)
 		return
 	if(modifiers["alt"])
+		SEND_SIGNAL(A, COMSIG_CLICK_ALT, src)
 		AltClickOn(A)
 		return
 	// You are responsible for checking CONFIG_GET(flag/ghost_interaction) when you override this function

diff --git a/code/_onclick/overmind.dm b/code/_onclick/overmind.dm
@@ -10,6 +10,7 @@
 		ShiftClickOn(A)
 		return
 	if(modifiers["alt"])
+		SEND_SIGNAL(A, COMSIG_CLICK_ALT, src)
 		AltClickOn(A)
 		return
 	if(modifiers["ctrl"])

diff --git a/code/_onclick/pai.dm b/code/_onclick/pai.dm
@@ -32,6 +32,7 @@
 		ShiftClickOn(A)
 		return
 	if(modifiers["alt"]) // alt and alt-gr (rightalt)
+		SEND_SIGNAL(A, COMSIG_CLICK_ALT, src)
 		AltClickOn(A)
 		return
 	if(modifiers["ctrl"])

diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm
@@ -834,3 +834,6 @@
 	protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
 
 /datum/config_entry/str_list/lobby_music
+
+/datum/config_entry/flag/enable_syndicate_affiliates
+	default = FALSE
diff --git a/code/datums/components/spy_bug.dm b/code/datums/components/spy_bug.dm
@@ -0,0 +1,44 @@
+/datum/component/spy_bug
+	var/obj/item/spy_bug/bug
+
+/datum/component/spy_bug/RegisterWithParent()
+	var/atom/par = parent
+	for (var/obj/item/spy_bug/spy_bug in par.contents)
+		bug = spy_bug
+
+	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+	RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_altclick))
+	RegisterSignal(parent, COMSIG_PREQDELETED, PROC_REF(deleted_handler))
+
+/datum/component/spy_bug/UnregisterFromParent()
+	UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
+	UnregisterSignal(parent, COMSIG_CLICK_ALT)
+	UnregisterSignal(parent, COMSIG_PREQDELETED)
+
+/datum/component/spy_bug/proc/on_examine(datum/source, mob/living/carbon/human/user, list/examine_list)
+	SIGNAL_HANDLER
+
+	if(!istype(user))
+		return
+
+	examine_list += span_warning("Вы видите небольшое устройство с микрофоном и камерой.")
+
+/datum/component/spy_bug/proc/on_altclick(datum/source, mob/living/carbon/human/user)
+	SIGNAL_HANDLER
+
+	if(!istype(user))
+		return
+
+	if(!user.Adjacent(parent))
+		return
+
+	if(user.stat)
+		return
+
+	if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+		return
+
+	bug.unhook(user)
+
+/datum/component/spy_bug/proc/deleted_handler()
+	bug.unhook()
diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm
@@ -412,8 +412,8 @@
 				return
 
 			var/item = strippable_item.get_item(owner)
+			var/obj/item/held_item = user.get_active_hand()
 			if(isnull(item))
-				var/obj/item/held_item = user.get_active_hand()
 				if(isnull(held_item))
 					return
 
@@ -448,7 +448,8 @@
 
 				// Update just before the delay starts
 				SStgui.update_uis(src)
-				var/should_unequip = strippable_item.start_unequip(owner, user)
+
+				var/should_unequip = !held_item.strip_action(user, owner, item) && strippable_item.start_unequip(owner, user)
 
 				LAZYREMOVEASSOC(interactions, user, key)
 

diff --git a/code/datums/hud.dm b/code/datums/hud.dm
@@ -28,6 +28,7 @@ GLOBAL_LIST_INIT(huds, list( \
 	TAIPAN_HUD = new/datum/atom_hud/antag(),\
 	ANTAG_HUD_THIEF = new/datum/atom_hud/antag/hidden(),\
 	THOUGHTS_HUD = new/datum/atom_hud/thoughts(),\
+	ANTAG_HUD_AFFIL_GORLEX = new/datum/atom_hud/antag(),\
 	DATA_HUD_KIDAN_PHEROMONES = new/datum/atom_hud/kidan_pheromones()\
 ))
 

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
@@ -553,11 +553,11 @@
 	. = _memory_edit_header("traitor", list("traitorchan", "traitorvamp", "traitorthief"))
 	var/datum/antagonist/traitor/traitor_datum = has_antag_datum(/datum/antagonist/traitor)
 	if(traitor_datum)
-		. += "<b><font color='red'>TRAITOR</font></b>|<a href='byond://?src=[UID()];traitor=clear'>no</a>"
+		. += "<b><font color='red'>TRAITOR" + (!traitor_datum.affiliate ? " without affiliate" : " from [traitor_datum.affiliate.name]") + "</font></b>|<a href='byond://?src=[UID()];traitor=clear'>no</a>"
 		if(!length(traitor_datum.objectives))
 			. += "<br>Objectives are empty! <a href='byond://?src=[UID()];traitor=autoobjectives'>Randomize!</a>"
 	else
-		. += "<a href='byond://?src=[UID()];traitor=traitor'>traitor</a>|<b>NO</b>"
+		. += "<a href='byond://?src=[UID()];traitor=traitor'>normal traitor</a>|<a href='byond://?src=[UID()];traitor=traitor_choose_affil'>traitor with affiliate</a>|<a href='byond://?src=[UID()];traitor=traitor_affil'>traitor with specific affiliate</a>|<b>NO</b>"
 
 	. += _memory_edit_role_enabled(ROLE_TRAITOR)
 	// Contractor
@@ -846,7 +846,7 @@
 /datum/mind/Topic(href, href_list)
 	//проверяем на амбиции, после чего прерываем выполнение, иначе он залезет в админский антаг-панель
 	var/ambition_func = ambition_topic(href, href_list)
-	if (ambition_func)
+	if(ambition_func)
 		return
 
 	if(!check_rights(R_ADMIN))
@@ -1546,7 +1546,7 @@
 					log_admin("[key_name(usr)] has automatically forged wizard objectives for [key_name(current)]")
 					message_admins("[key_name_admin(usr)] has automatically forged wizard objectives for [key_name_admin(current)]")
 				else if(src in SSticker.mode.apprentices)
-					if (SSticker.mode.wizards.len)
+					if(SSticker.mode.wizards.len)
 						var/datum/mind/wizard = pick(SSticker.mode.wizards)
 						SSticker.mode.forge_wizard_apprentice_objectives(wizard, src)
 					else
@@ -1963,10 +1963,35 @@
 					var/datum/antagonist/traitor/traitor_datum = new()
 					traitor_datum.give_objectives = FALSE
 					traitor_datum.give_uplink = FALSE
+					traitor_datum.gen_affiliate = FALSE
 					add_antag_datum(traitor_datum)
 					log_admin("[key_name(usr)] has traitored [key_name(current)]")
 					message_admins("[key_name_admin(usr)] has traitored [key_name_admin(current)]")
 
+			if("traitor_choose_affil")
+				if(!(has_antag_datum(/datum/antagonist/traitor)))
+					var/datum/antagonist/traitor/traitor_datum = new()
+					traitor_datum.give_objectives = FALSE
+					traitor_datum.give_uplink = FALSE
+					traitor_datum.force_affiliate = TRUE
+					add_antag_datum(traitor_datum)
+					log_admin("[key_name(usr)] has traitored [key_name(current)]")
+					message_admins("[key_name_admin(usr)] has traitored [key_name_admin(current)]")
+
+			if("traitor_affil")
+				if(!(has_antag_datum(/datum/antagonist/traitor)))
+					var/type = input(usr, "Выберите подрядчика", "Выбор подрядчика") as null|anything in subtypesof(/datum/affiliate)
+
+					if(type)
+						var/datum/antagonist/traitor/traitor_datum = new()
+						traitor_datum.give_objectives = FALSE
+						traitor_datum.give_uplink = FALSE
+						traitor_datum.gen_affiliate = FALSE
+						add_antag_datum(traitor_datum)
+						log_admin("[key_name(usr)] has traitored [key_name(current)]")
+						message_admins("[key_name_admin(usr)] has traitored [key_name_admin(current)]")
+						traitor_datum.give_affiliate(src, type)
+
 			if("autoobjectives")
 				var/datum/antagonist/traitor/traitor_datum = has_antag_datum(/datum/antagonist/traitor)
 				if(!traitor_datum)

diff --git a/code/datums/spell.dm b/code/datums/spell.dm
@@ -193,7 +193,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
 	var/static/list/spell_handlers = list()
 	/// Handles a given spells cooldowns. Tracks the time until its off cooldown.
 	var/datum/spell_cooldown/cooldown_handler
-
+	/// If true, it will break remoteview when you'll try to cust it.
+	var/break_remoteview = TRUE
 
 /**
  * Checks if the user can cast the spell
@@ -209,7 +210,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
 
 	user.changeNext_click(CLICK_CD_CLICK_ABILITY)
 
-	if(ishuman(user))
+	if(ishuman(user) && break_remoteview)
 		var/mob/living/carbon/human/caster = user
 		if(caster.remoteview_target)
 			caster.remoteview_target = null

diff --git a/code/datums/spells/bloodcrawl.dm b/code/datums/spells/bloodcrawl.dm
@@ -295,7 +295,7 @@
 
 /obj/effect/proc_holder/spell/bloodcrawl/shadow_crawl/post_phase_in(mob/living/user, obj/effect/dummy/slaughter/holder)
 	..()
-	if(!istype(user, /mob/living/simple_animal/demon/shadow))
+	if(!isshadowdemon(user))
 		return
 	var/mob/living/simple_animal/demon/shadow/demon = user
 	demon.RegisterSignal(holder, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/mob/living/simple_animal/demon/shadow, check_darkness))