Excelsior: small bugfix

cev_eris.dme

@@ -784,14 +784,21 @@
 #include "code\game\machinery\embedded_controller\embedded_program_base.dm"
 #include "code\game\machinery\embedded_controller\simple_docking_controller.dm"
 #include "code\game\machinery\embedded_controller\~docking_program_undef.dm"
+#include "code\game\machinery\excelsior\_excelsior_defines.dm"
 #include "code\game\machinery\excelsior\autolathe.dm"
 #include "code\game\machinery\excelsior\boombox.dm"
+#include "code\game\machinery\excelsior\centor.dm"
 #include "code\game\machinery\excelsior\diesel.dm"
+#include "code\game\machinery\excelsior\emplacement.dm"
 #include "code\game\machinery\excelsior\ex_teleporter.dm"
 #include "code\game\machinery\excelsior\ex_turret.dm"
+#include "code\game\machinery\excelsior\excelsior_debug_tools.dm"
+#include "code\game\machinery\excelsior\excelsior_researches.dm"
 #include "code\game\machinery\excelsior\field.dm"
 #include "code\game\machinery\excelsior\implantmaker.dm"
+#include "code\game\machinery\excelsior\node.dm"
 #include "code\game\machinery\excelsior\redirector.dm"
+#include "code\game\machinery\excelsior\excelsior_items\KPK.dm"
 #include "code\game\machinery\kitchen\gibber.dm"
 #include "code\game\machinery\kitchen\microwave.dm"
 #include "code\game\machinery\kitchen\smartfridge.dm"

code/__DEFINES/dcs/signals.dm

@@ -120,6 +120,9 @@
 #define COMSIG_DOOR_OPENED "door_opened"
 #define COMSIG_DOOR_CLOSED "door_closed"
 
+//excelsior
+#define COMSIG_EX_CONNECT "excelsior_connect"
+
 // /obj/item signals
 #define COMSIG_IATTACK "item_attack"									//from /mob/ClickOn(): (/atom, /src, /params) If any reply to this returns TRUE, overrides attackby and afterattack
 #define COMSIG_ATTACKBY "attack_by"										//from /mob/ClickOn():

code/__DEFINES/turfs.dm

@@ -43,6 +43,6 @@
 
 	var/vecX = A.x - B.x
 	var/vecY = A.y - B.y
-	var/vecZ = (A.y - B.y)*DECK_HEIGHT
+	var/vecZ = (A.z - B.z)*DECK_HEIGHT
 
 	return abs(sqrt((vecX*vecX) + (vecY*vecY) +(vecZ*vecZ)))

code/game/antagonist/antagonist_factions.dm

@@ -157,6 +157,23 @@
 
 	log_say("[user.name]/[user.key] (REV [name]) : [message]")
 
+/datum/faction/proc/communicate_inanimate(var/obj/user, var/message)
+	if(!message)
+		return
+
+	message = capitalize(sanitize(message))
+	var/text = "<span class='revolution'>[message]</span>"
+	for(var/i in SShumans.mob_list)
+		if(is_excelsior(i))
+			to_chat(i, text)
+
+	//ghosts
+	for(var/mob/observer/ghost/M in GLOB.dead_mob_list)	//does this include players who joined as observers as well?
+		if(!M.client)
+			continue
+		if((M.antagHUD && M.get_preference_value(/datum/client_preference/ghost_ears) == GLOB.PREF_ALL_SPEECH) || is_admin(M))
+			to_chat(M, "[text] ([ghost_follow_link(user, M)])")
+
 /datum/faction/proc/is_member(mob/user)
 	for(var/datum/antagonist/A in members)
 		if(A.owner.current == user)

code/game/antagonist/station/revolutionary/excel_faction.dm

@@ -1,20 +1,31 @@
+var/global/was_centor_spawned = FALSE
+
 /datum/faction/excelsior
 	id = FACTION_EXCELSIOR
 	name = "Excelsior"
 	antag = "infiltrator"
 	antag_plural = "infiltrators"
-	welcome_text = "You are Excelsior, Ever Upward. You have infiltrated this vessel to further the Revolution.\n\
-	The People's strength lies in securing our position, gathering the oppressed, spreading propaganda and producing arms and armor for the final revolution. A slow and methodical approach is recommended. \n\n\
-	Our first phase is to retrieve the cache of manufacturing materials and circuit boards. Without a means of production our revolution is in peril.\n\n\
-	Our second phase is to establish a fortified position in secret. The People will send additional resources through the teleporter once it is established. This and our autolathe can be protected further with turrets and shield generators, in addition to loyal comrades. <b>To prevent technology theft, your machinery, but not handheld weapons, implanters, and armor, is designed to work only on target vessel, CEV \"Eris\".</b>\n\n\
-	Our third phase is expansion. Complete mandates for power. Aquire implants, prosthetics or robotic parts and convert them into new implants. These can be injected into the oppressed to formally induct them to the Revolution. Use their labor to produce the weapons of their liberation.\n\n\
-	When the People are ready, break the chains of the oppressor and seize control of the ship by building the redirector and installing it on the primary control bridge."
+	// WARNING!!! CONSIDER REWRITING, CANNOT ASSURE QUALITY/LACK OF CRINGE/ETC.
+	// BTW CHECK AS REGULAR, WITHOUT DEBUG
+	welcome_text = "\n <b>THE SHACKLES</b> of forced labor for those, who don't value you, <b>HAVE BEEN FINALLY DROPPED</b>.\n\
+	You no longer are required to listen to them. You don't need money to survive. \n\n\
+	<b>We welcome you to our ranks, fighter.</b>\n\
+	You now may carve your own destiny despite the attempts of the old greedy world to drag you back in.\n\
+	Excelsior fights for both your and our right to live without suppression of true human virtue - to create.\n\
+	We invite you to do the same - emancipate those uncapable to resist the world order's rules\n\n\
+	<b>Our goal:</b> Seize control of the ship by building a redirector on the primary control bridge.\n\n\
+	<b>To reach that goal:</b> We have to call our Centor Core in unvisited location and protect it, then retrieve the cache of disks and buildings, liberate the oppressed, spread our word of freedom, make arms and armor for our buddies.\n\n\
+	<b>Preparation:</b> \n\n\
+	<b>After insertion:</b> Establish a fortified position. The People will send additional resources through the teleporter once we get the energy. Use turrets and shield generators, and of course - loyal comrades. \n\n\
+	<b>And the final part - expansion.</b> Spread nodes and ensure their connection to Centor for teleportation power. Acquire implants, prosthetics or robotic parts and rebuild them into our own implants. These can be injected into the oppressed to introduce them into our cause.\n\n\
+	<b>Beware - To prevent important technology theft, your machinery is designed to work only on target vessel: CEV \"Eris\".</b>\n\n\
+	<h1>Our dreams shan't be ignored! Ever Upward!</h1>"
 
 	hud_indicator = "excelsior"
 
 	possible_antags = list(ROLE_EXCELSIOR_REV)
 	faction_datum_verbs = list(/datum/faction/excelsior/proc/communicate_verb,
-				/datum/faction/excelsior/proc/summon_stash)
+				/datum/faction/excelsior/proc/summon_centor)
 
 	var/stash_holder = null
 
@@ -63,6 +74,19 @@
 
 	F.communicate(usr)
 
+
+/datum/faction/excelsior/proc/summon_centor()
+
+	set name = "Summon Centor"
+	set category = "Cybernetics"
+
+	if(!was_centor_spawned)
+		new /obj/machinery/centor(usr.loc)
+		was_centor_spawned = TRUE
+	else
+		to_chat(usr, SPAN_EXCEL_NOTIF("You've already used the Centor assigned to you..."))
+
+/*
 /datum/faction/excelsior/proc/summon_stash()
 
 	set name = "Summon stash"
@@ -92,3 +116,5 @@
 
 	H.put_in_hands(stash)
 	F.stash_holder = H.real_name
+*/
+

code/game/antagonist/station/revolutionary/excelsior.dm

@@ -38,6 +38,7 @@
 /datum/antagonist/excelsior/create_antagonist(datum/mind/target, datum/faction/new_faction, doequip = TRUE, announce = TRUE, update = TRUE, check = TRUE)
 	. = ..()
 	BITSET(owner.current.hud_updateflag, EXCELSIOR_HUD)
+	was_centor_spawned = FALSE		//[excel_faction.dm]
 
 /datum/antagonist/excelsior/remove_antagonist()
 	. = ..()

code/game/machinery/excelsior/_excelsior_defines.dm

@@ -0,0 +1,29 @@
+// # Node+Centor related [centor.dm]
+//	- KPK
+//	- Node
+#define EX_NODE_DISTANCE 7
+//	- Centor
+#define EX_NODE_SPAWN_COOLDOWN 3 MINUTES
+
+
+
+
+var/global/excelsior_energy
+var/list/global/excelsior_nodes = list()
+var/list/global/excelsior_junctions = list()
+
+var/list/global/excelsior_turf_whitelist = list(	//  <<< see more at [node.dm]
+	/turf/floor,
+	/turf/wall/low
+)
+
+
+
+//-------------------------------------------------------------------------
+
+//  Old, still used code
+var/global/excelsior_max_energy //Maximum combined energy of all teleporters
+var/global/excelsior_conscripts = 0
+var/global/excelsior_last_draft = 0
+var/list/global/excelsior_teleporters = list()
+