Rebellion. "Бунт". Развитие понятия "РП-революция" в отдельный режим.

code/__DEFINES/atom_hud.dm

@@ -77,8 +77,10 @@
 #define ANTAG_HUD_ZOMB          "antag_hud_zomb"
 #define ANTAG_HUD_GANGSTER      "antag_hud_gangster"
 #define ANTAG_HUD_SPACECOP      "antag_hud_cop"
+#define ANTAG_HUD_LOYAL         "antag_hud_loyal"
 #define ANTAG_HUD_REPLICATOR    "antag_hud_replicator"
 
 
+
 /// cooldown for being shown the images for any particular data hud
 #define ADD_HUD_TO_COOLDOWN 20

code/__DEFINES/gamemodes.dm

@@ -12,8 +12,9 @@
 #define F_FAMILIES           "Families"
 #define F_HEIST              "Vox Shoal"
 #define F_HIVEMIND           "Changeling Hivemind"
-#define F_PROPS              "Props"
+#define F_LOYALISTS          "Loyalists"
 #define F_REVOLUTION         "Revolution"
+#define F_PROPS              "Props"
 #define F_SYNDIOPS           "Syndicate Operatives"
 #define F_SYNDIOPS_CROSSFIRE "Syndicate Operatives (CrossFire)"
 #define F_SYNDIESQUAD        "Syndicate Elite Strike Team"
@@ -41,6 +42,7 @@
 #define GANGSTER_LEADER "Gangster Leader"
 #define GANGSTER_DEALER "Gangster Dealer"
 #define HEADREV "Head Revolutionary"
+#define LOYALIST "Loyalist"
 #define MALF "Malf AI"
 #define MALFBOT "Malf-Slaved Cyborg"
 #define NUKE_OP "Nuclear Operative"

code/__DEFINES/role_preferences.dm

@@ -9,6 +9,7 @@
 #define ROLE_WIZARD            "Wizard"
 #define ROLE_MALF              "Malf AI"
 #define ROLE_REV               "Revolutionary"
+#define ROLE_LOYALIST          "Loyalist"
 #define ROLE_ALIEN             "Xenomorph"
 #define ROLE_CULTIST           "Cultist"
 #define ROLE_BLOB              "Blob"
@@ -42,6 +43,7 @@ var/global/list/special_roles_ignore_question = list(
 	ROLE_WIZARD     = null,
 	ROLE_MALF       = null,
 	ROLE_REV        = null,
+	ROLE_LOYALIST   = null,
 	ROLE_ALIEN      = list(IGNORE_LARVA),
 	ROLE_CULTIST    = list(IGNORE_NARSIE_SLAVE, IGNORE_EMINENCE),
 	ROLE_BLOB       = list(IGNORE_EVENT_BLOB),

code/_globalvars/lists/misc.dm

@@ -22,6 +22,7 @@ var/global/list/roles_ingame_minute_unlock = list(
 	ROLE_WIZARD = 2880,
 	ROLE_ERT = 1440,
 	ROLE_REV = 1440,
+	ROLE_LOYALIST = 2400,
 	ROLE_DRONE = 1440,
 	ROLE_CULTIST = 3600,
 	ROLE_BLOB = 2880,

code/controllers/subsystem/jobs.dm

@@ -178,6 +178,22 @@ SUBSYSTEM_DEF(job)
 //it locates a head or runs out of levels to check
 //This is basically to ensure that there's atleast a few heads in the round
 /datum/controller/subsystem/job/proc/FillHeadPosition()
+	//Fill loyal jobs first
+	if(istype(SSticker.mode, /datum/game_mode/rebellion))
+		var/one_loyalist_selected = FALSE
+		for(var/job_name in loyal_command_position)
+			var/datum/job/loyal_job = SSjob.GetJob(job_name)
+			for(var/level in JP_LEVELS)
+				var/list/candidates = FindOccupationCandidates(loyal_job, level, ROLE_LOYALIST)
+				if(!candidates.len)
+					continue
+				var/mob/dead/new_player/candidate = pick(candidates)
+				if(AssignRole(candidate, loyal_job.title))
+					one_loyalist_selected = TRUE
+					break
+			if(one_loyalist_selected)
+				break
+
 	for(var/level in JP_LEVELS)
 		for(var/command_position in command_positions)
 			var/datum/job/job = GetJob(command_position)

code/datums/atom_huds/atom_hud.dm

@@ -29,6 +29,7 @@ var/global/list/huds = list(
 	ANTAG_HUD_ZOMB = new/datum/atom_hud/antag,
 	ANTAG_HUD_GANGSTER = new/datum/atom_hud/antag/hidden,
 	ANTAG_HUD_SPACECOP = new/datum/atom_hud/antag,
+	ANTAG_HUD_LOYAL = new/datum/atom_hud/antag/hidden,
 	ANTAG_HUD_REPLICATOR = new/datum/atom_hud/antag/hidden,
 )
 

code/game/gamemodes/modes_declares/rebellion.dm

@@ -0,0 +1,14 @@
+/datum/game_mode/rebellion
+	name = "Rebellion"
+	config_name = "rebellion"
+	probability = 80
+
+	factions_allowed = list(/datum/faction/loyalists)
+
+	//TODO 4:20
+	minimum_player_count = 1
+	minimum_players_bundles = 1
+
+/datum/game_mode/rebellion/announce()
+	to_chat(world, "<B>The current game mode is - Rebellion!</B>")
+	to_chat(world, "<B>Loyal heads are attempting to start a tyrany!</B>")

code/game/gamemodes/objectives/stay_loyal.dm

@@ -0,0 +1,8 @@
+/datum/objective/stay_loyal
+	explanation_text = "Stay loyal"
+
+/datum/objective/stay_loyal/check_completion()
+	var/datum/faction/loyalists/L = faction
+	if(istype(L) && L.check_loyality_members())
+		return OBJECTIVE_WIN
+	return OBJECTIVE_LOSS

code/game/gamemodes/roles/loyalist.dm

@@ -0,0 +1,18 @@
+/datum/role/loyalist
+	name = LOYALIST
+	id = LOYALIST
+	required_pref = ROLE_LOYALIST
+	logo_state = "loyal-logo"
+
+	antag_hud_type = ANTAG_HUD_LOYAL
+	antag_hud_name = "hudloyalist"
+
+/datum/role/loyalist/Greet(greeting, custom)
+	. = ..()
+	to_chat(antag.current, "<span class='warning'><FONT size = 3>Now you are Loyalist! All crew members with a loyalty implant are your comrades. Follow orders from NanoTrasen!</FONT></span>")
+
+/datum/role/loyalist/forgeObjectives()
+	if(..())
+		var/datum/objective/survive/S = AppendObjective(/datum/objective/survive)
+		S.explanation_text = "Stay alive until the end. You are important part of the Chain of Command!"
+		return TRUE

code/game/jobs/jobs.dm

@@ -72,6 +72,11 @@ var/global/list/command_positions = list(
 	"Blueshield Officer"
 )
 
+var/global/list/loyal_command_position = list(
+	"Captain",
+	"Head of Security"
+)
+
 var/global/list/security_positions = list(
 	"Head of Security",
 	"Warden",

code/modules/admin/topic.dm

@@ -80,6 +80,11 @@
 				var/success = makeAntag(null, /datum/faction/heist, count, FROM_GHOSTS, stealth)
 				message_admins("[success] number of voxs made.")
 				to_chat(usr, "<span class='notice'>[success] number of voxs made.</span>")
+			if("9")
+				message_admins("[key_name(usr)] has attempted to spawn [count] loyalists.")
+				var/success = makeAntag(null, /datum/faction/loyalists, count, FROM_PLAYERS, stealth)
+				message_admins("[success] number of loyalists made.")
+				to_chat(usr, "<span class='notice'>[success] number of loyalists made.</span>")
 
 	else if(href_list["dbsearchckey"] || href_list["dbsearchadmin"] || href_list["dbsearchip"] || href_list["dbsearchcid"] || href_list["dbsearchbantype"])
 		var/adminckey = href_list["dbsearchadmin"]

code/modules/admin/verbs/one_click_antag.dm

@@ -18,6 +18,7 @@
 		<a href='?src=\ref[src];makeAntag=6'>Make Wizard (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=7'>Make Aliens (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=8'>Make Vox Raiders (Requires Ghosts)</a><br>
+		<a href='?src=\ref[src];makeAntag=9'>Make Rebellion</a><br>
 		"}
 	var/datum/browser/popup = new(usr, "oneclickantag", "One-click Antagonist", 400, 400)
 	popup.set_content(dat)

code/modules/cargo/packs.dm

@@ -1917,11 +1917,9 @@ var/global/list/all_supply_groups = list("Operations","Security","Hospitality","
 	crate_name = "Xeno arsonist crate"
 	group = "xeno"
 	hidden = TRUE
-
 //----------------------------------------------
 //-------------SMARTLIGHT PROGRAMMS-------------
 //----------------------------------------------
-
 /datum/supply_pack/smartlight_standart
 	name = "Smartlight programms set: Standart"
 	contains = list(
@@ -1961,3 +1959,48 @@ var/global/list/all_supply_groups = list("Operations","Security","Hospitality","
 	)
 	additional_costs = 10000
 	group = "Operations"
+
+//----------------------------------------------
+//-----------------REBELLION--------------------
+//----------------------------------------------
+/datum/supply_pack/mining_centcom_supply
+	name = "Cent Com Shaft Miner Gear"
+	contains = list(/obj/item/clothing/head/helmet/space/globose/mining,
+					/obj/item/clothing/suit/space/globose/mining,
+					/obj/item/device/radio/headset/headset_cargo,
+					/obj/item/clothing/glasses/hud/mining,
+					/obj/item/weapon/pickaxe,
+					/obj/item/clothing/gloves/black,
+					/obj/item/weapon/storage/bag/ore,
+					/obj/item/device/flashlight/lantern,
+					/obj/item/clothing/under/rank/miner)
+	cost = 2000
+	crate_type = /obj/structure/closet/crate
+	crate_name = "Cent Com Crate"
+	group = "CentCom"
+
+/datum/supply_pack/mulligan_centcom_supply
+	name = "Cent Com Secure Crate"
+	contains = list(/obj/item/weapon/reagent_containers/syringe/mulligan/hidden,
+					/obj/item/weapon/reagent_containers/syringe/mulligan/hidden,
+					/obj/item/weapon/reagent_containers/syringe/mulligan/hidden,
+					/obj/item/weapon/reagent_containers/syringe/mulligan/hidden,
+					/obj/item/weapon/reagent_containers/syringe/mulligan/hidden)
+	cost = 5000
+	crate_type = /obj/structure/closet/crate/secure/gear
+	crate_name = "Cent Com Crate"
+	access = access_heads
+	group = "CentCom"
+
+/datum/supply_pack/mutagen_centcom_supply
+	name = "Cent Com Head Stuff Crate"
+	contains = list(/obj/item/weapon/reagent_containers/syringe/mutagen/hidden,
+					/obj/item/weapon/reagent_containers/syringe/mutagen/hidden,
+					/obj/item/weapon/reagent_containers/syringe/mutagen/hidden,
+					/obj/item/weapon/reagent_containers/syringe/mutagen/hidden,
+					/obj/item/weapon/reagent_containers/syringe/mutagen/hidden)
+	cost = 5000
+	crate_type = /obj/structure/closet/crate/secure/gear
+	crate_name = "Cent Com Crate"
+	access = access_heads
+	group = "CentCom"

code/modules/reagents/reagent_containers/syringes.dm

@@ -463,10 +463,29 @@
 	mode = SYRINGE_INJECT
 	update_icon()
 
+/obj/item/weapon/reagent_containers/syringe/mulligan/hidden
+	name = "syringe"
+	desc = "A syringe."
+
 /obj/item/weapon/reagent_containers/syringe/nutriment
 
 /obj/item/weapon/reagent_containers/syringe/nutriment/atom_init()
 	. = ..()
 	reagents.add_reagent("nutriment", 15)
 	mode = SYRINGE_INJECT
 	update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/mutagen
+	name = "unstable mutagen syringe"
+	desc = "A syringe of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact"
+	amount_per_transfer_from_this = 15
+
+/obj/item/weapon/reagent_containers/syringe/mutagen/atom_init()
+	. = ..()
+	reagents.add_reagent("mutagen", 15)
+	mode = SYRINGE_INJECT
+	update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/mutagen/hidden
+	name = "syringe"
+	desc = "A syringe."

taucetistation.dme

@@ -520,6 +520,7 @@
 #include "code\game\gamemodes\factions\families.dm"
 #include "code\game\gamemodes\factions\heist.dm"
 #include "code\game\gamemodes\factions\infestation.dm"
+#include "code\game\gamemodes\factions\loyalists.dm"
 #include "code\game\gamemodes\factions\malf_silicons.dm"
 #include "code\game\gamemodes\factions\ninja.dm"
 #include "code\game\gamemodes\factions\props.dm"
@@ -541,6 +542,7 @@
 #include "code\game\gamemodes\modes_declares\infestation.dm"
 #include "code\game\gamemodes\modes_declares\malfunction.dm"
 #include "code\game\gamemodes\modes_declares\nuclear.dm"
+#include "code\game\gamemodes\modes_declares\rebellion.dm"
 #include "code\game\gamemodes\modes_declares\replicators.dm"
 #include "code\game\gamemodes\modes_declares\revolution.dm"
 #include "code\game\gamemodes\modes_declares\shadowlings.dm"
@@ -671,6 +673,7 @@
 #include "code\game\gamemodes\objectives\prop_points.dm"
 #include "code\game\gamemodes\objectives\reproduct.dm"
 #include "code\game\gamemodes\objectives\silence.dm"
+#include "code\game\gamemodes\objectives\stay_loyal.dm"
 #include "code\game\gamemodes\objectives\steal.dm"
 #include "code\game\gamemodes\objectives\survive.dm"
 #include "code\game\gamemodes\objectives\turn_into_zombie.dm"
@@ -717,6 +720,7 @@
 #include "code\game\gamemodes\roles\custom.dm"
 #include "code\game\gamemodes\roles\families.dm"
 #include "code\game\gamemodes\roles\heist.dm"
+#include "code\game\gamemodes\roles\loyalist.dm"
 #include "code\game\gamemodes\roles\malf_unit.dm"
 #include "code\game\gamemodes\roles\ninja.dm"
 #include "code\game\gamemodes\roles\prop.dm"