Warfare Module 2: Enemies and Parallax

code/_onclick/hud/parallax/parallax.dm

@@ -13,6 +13,7 @@
 
 	if(!length(C.parallax_layers_cached))
 		C.parallax_layers_cached = list()
+		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet/unbidden(null, src) // NON-MODULE CHANGE
 		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_1(null, src)
 		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_2(null, src)
 		C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet(null, src)
@@ -22,7 +23,7 @@
 
 	C.parallax_layers = C.parallax_layers_cached.Copy()
 
-	if (length(C.parallax_layers) > C.parallax_layers_max)
+	if (length(C.parallax_layers) > C.parallax_layers_max + 1) // NON-MODULE CHANGE
 		C.parallax_layers.len = C.parallax_layers_max
 
 	C.screen |= (C.parallax_layers)

code/modules/admin/admin_verbs.dm

@@ -133,6 +133,7 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
 	/client/proc/summon_ert,
 	/client/proc/toggle_nuke,
 	/client/proc/toggle_random_events,
+	/client/proc/warfareEvent, // NON-MODULE CHANGE
 	))
 GLOBAL_PROTECT(admin_verbs_fun)
 GLOBAL_LIST_INIT(admin_verbs_spawn, list(/datum/admins/proc/spawn_atom, /datum/admins/proc/podspawn_atom, /datum/admins/proc/spawn_cargo, /datum/admins/proc/spawn_objasmob, /client/proc/respawn_character, /datum/admins/proc/beaker_panel))

code/modules/meteors/meteor_types.dm

@@ -35,12 +35,20 @@
 	///Used by Stray Meteor event to indicate meteor type (the type of sensor that "detected" it) in announcement
 	var/signature = "motion"
 
+	//Used to determine if the meteor should be spinning.
+	var/spins = TRUE // NON-MODULE CHANGE
+
+	//Used to determine if a player should be awarded an achievement for examining the meteor.
+	var/achievementworthy = TRUE // NON-MODULE CHANGE
+
 /obj/effect/meteor/Initialize(mapload, turf/target)
 	. = ..()
 	z_original = z
 	GLOB.meteor_list += src
 	SSaugury.register_doom(src, threat)
-	SpinAnimation()
+	if(spins) // NON-MODULE CHANGE
+		SpinAnimation()
+	dest = target // NON-MODULE CHANGE
 	chase_target(target)
 
 /obj/effect/meteor/Destroy()
@@ -114,7 +122,8 @@
 /obj/effect/meteor/examine(mob/user)
 	. = ..()
 
-	check_examine_award(user)
+	if(achievementworthy) // NON-MODULE CHANGE
+		check_examine_award(user)
 
 /obj/effect/meteor/attackby(obj/item/I, mob/user, params)
 	if(I.tool_behaviour == TOOL_MINING)

maplestation.dme

@@ -6093,6 +6093,7 @@
 #include "maplestation_modules\code\__DEFINES\keybinding.dm"
 #include "maplestation_modules\code\__DEFINES\living.dm"
 #include "maplestation_modules\code\__DEFINES\mecha.dm"
+#include "maplestation_modules\code\__DEFINES\mobfactions.dm"
 #include "maplestation_modules\code\__DEFINES\paperwork_defines.dm"
 #include "maplestation_modules\code\__DEFINES\signals.dm"
 #include "maplestation_modules\code\__DEFINES\spans.dm"
@@ -6219,6 +6220,7 @@
 #include "maplestation_modules\code\modules\admin\admin_vv.dm"
 #include "maplestation_modules\code\modules\admin\smites\pain_smite.dm"
 #include "maplestation_modules\code\modules\admin\smites\tabletide.dm"
+#include "maplestation_modules\code\modules\admin\verbs\warfare_events.dm"
 #include "maplestation_modules\code\modules\antagonists\_common\advanced_antag.dm"
 #include "maplestation_modules\code\modules\antagonists\_common\advanced_objective.dm"
 #include "maplestation_modules\code\modules\antagonists\_common\advanced_traitor_panel.dm"
@@ -6546,6 +6548,26 @@
 #include "maplestation_modules\story_content\captain_equipment\code\captainclothing.dm"
 #include "maplestation_modules\story_content\casual_clothing\code\casualclothing.dm"
 #include "maplestation_modules\story_content\chaplain_equipment\code\chaplainclothing.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\artillery_shells.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\coilguns.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\curios.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\dreadactions.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\dreaditems.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\droneai.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\drones.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\kajari_beam.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\redcinematics.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\reddread.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\redeffects.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\redmaterials.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\redparts.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\redprojectiles.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\redreagents.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\redsetpieces.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\redturf.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\ship_parallax.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\shockattack.dm"
+#include "maplestation_modules\story_content\deepred_warfare\code\singulo_warhead.dm"
 #include "maplestation_modules\story_content\grey_equipment\code\greyclothing.dm"
 #include "maplestation_modules\story_content\jessie_equipment\code\jessie_clothing.dm"
 #include "maplestation_modules\story_content\kimono\code\kimonoclothing.dm"

maplestation_modules/code/__DEFINES/mobfactions.dm

@@ -0,0 +1,2 @@
+/// All DEEP RED event machines.
+#define FACTION_DEEPRED "deepred"

maplestation_modules/code/modules/admin/verbs/warfare_events.dm

@@ -0,0 +1,131 @@
+/client/proc/warfareEvent()
+	set name = "Warfare Module"
+	set desc = "Allows you to perform various actions related to warfare"
+	set category = "Admin.Events"
+
+	var/datum/warfare_event/tgui = new(usr)
+	tgui.ui_interact(usr)
+
+/datum/warfare_event
+	var/client/holder //client of whoever is using this datum
+	var/list/selectedShells = list() //list of selected shells to fire (obj)
+	var/list/selectedNames = list() //list of selected shells to fire (but the name)
+	var/fireDirection = NORTH //default direction to fire shells (fires from top down)
+
+/datum/warfare_event/New(user)//user can either be a client or a mob due to byondcode(tm)
+	if (istype(user, /client))
+		var/client/user_client = user
+		holder = user_client //if its a client, assign it to holder
+	else
+		var/mob/user_mob = user
+		holder = user_mob.client //if its a mob, assign the mob's client to holder
+
+/datum/warfare_event/ui_state(mob/user)
+	return GLOB.admin_state
+
+/datum/warfare_event/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "WarfareEvent")
+		ui.open()
+
+/datum/warfare_event/ui_data(mob/user)
+	var/list/data = list()
+	data["selectedNames"] = selectedNames
+	return data
+
+/datum/warfare_event/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("addShell")
+			var/selected = params["selected"]
+			switch(selected)
+				if("460mm Rocket Assisted AP")
+					selectedShells += /obj/effect/meteor/shell/big_ap
+					selectedNames += "460mm Rocket Assisted AP"
+					. = TRUE
+				if("160mm Rocket Assisted AP")
+					selectedShells += /obj/effect/meteor/shell/small_ap
+					selectedNames += "160mm Rocket Assisted AP"
+					. = TRUE
+				if("160mm HE")
+					selectedShells += /obj/effect/meteor/shell/small_wmd_he
+					selectedNames += "160mm HE"
+					. = TRUE
+				if("160mm Flak")
+					selectedShells += /obj/effect/meteor/shell/small_wmd_flak
+					selectedNames += "160mm Flak"
+					. = TRUE
+				if("160mm Cluster AP")
+					selectedShells += /obj/effect/meteor/shell/small_cluster_ap
+					selectedNames += "160mm Cluster AP"
+					. = TRUE
+				if("460mm Cluster HE")
+					selectedShells += /obj/effect/meteor/shell/big_cluster_wmd_he
+					selectedNames += "460mm Cluster HE"
+					. = TRUE
+				if("460mm Cluster Flak")
+					selectedShells += /obj/effect/meteor/shell/big_cluster_wmd_flak
+					selectedNames += "460mm Cluster Flak"
+					. = TRUE
+				if("WMD KAJARI")
+					selectedShells += /obj/effect/meteor/shell/kajari
+					selectedNames += "WMD KAJARI"
+					. = TRUE
+		if("removeShell")
+			var/selected = params["selected"]
+			switch(selected)
+				if("460mm Rocket Assisted AP")
+					selectedShells -= /obj/effect/meteor/shell/big_ap
+					selectedNames -= "460mm Rocket Assisted AP"
+					. = TRUE
+				if("160mm Rocket Assisted AP")
+					selectedShells -= /obj/effect/meteor/shell/small_ap
+					selectedNames -= "160mm Rocket Assisted AP"
+					. = TRUE
+				if("160mm HE")
+					selectedShells -= /obj/effect/meteor/shell/small_wmd_he
+					selectedNames -= "160mm HE"
+					. = TRUE
+				if("160mm Flak")
+					selectedShells -= /obj/effect/meteor/shell/small_wmd_flak
+					selectedNames -= "160mm Flak"
+					. = TRUE
+				if("160mm Cluster AP")
+					selectedShells -= /obj/effect/meteor/shell/small_cluster_ap
+					selectedNames -= "160mm Cluster AP"
+					. = TRUE
+				if("460mm Cluster HE")
+					selectedShells -= /obj/effect/meteor/shell/big_cluster_wmd_he
+					selectedNames -= "460mm Cluster HE"
+					. = TRUE
+				if("460mm Cluster Flak")
+					selectedShells -= /obj/effect/meteor/shell/big_cluster_wmd_flak
+					selectedNames -= "460mm Cluster Flak"
+					. = TRUE
+				if("WMD KAJARI")
+					selectedShells -= /obj/effect/meteor/shell/kajari
+					selectedNames -= "WMD KAJARI"
+					. = TRUE
+		if("changeDirection")
+			var/direction = params["direction"]
+			switch(direction)
+				if("North")
+					fireDirection = 1
+				if("South")
+					fireDirection = 2
+				if("East")
+					fireDirection = 4
+				if("West")
+					fireDirection = 8
+			. = TRUE
+		if("fireShells")
+			for(var/shell in selectedShells)
+				var/list/chosenList = list()
+				chosenList[shell] = 1
+				spawn_meteor(chosenList, fireDirection, null)
+				selectedShells -= shell
+			for(var/name in selectedNames)
+				selectedNames -= name
+			. = TRUE

maplestation_modules/story_content/README.md

@@ -8,3 +8,7 @@ All individual pieces of story-only content are to be stored in their own folder
 
 - FILE - PROC/TYPE - RELATED STORY
 - code\game\objects\effects\contraband.dm - proc/randomise(base_type) - Modular posters in general
+- code\modules\admin\admin_verbs.dm - admin_verbs_fun - Adds the Warfare GUI to the admin panel
+- code\modules\meteors\meteor_types.dm - obj/effect/meteor - Changes meteor spinning and achievement
+- code\modules\meteors\meteor_types.dm - obj/effect/meteor/Initialize(mapload, turf/target) - Changes meteor spinning and fixes the destination code
+- code\modules\meteors\meteor_types.dm - obj/effect/meteor/examine(mob/user) - Changes meteor achievement