Dullahan fixes

_maps/_basemap.dm

@@ -19,6 +19,9 @@
 		//Von Neumann
 		#include "map_files\vonneumann\VNmk3.dmm"
 
+		//Dullahan
+		#include "map_files\Dullahan\dullahan.dmm"
+
 		//Gladius
 		#include "map_files\Gladius\Gladius1.dmm"
 		#include "map_files\Gladius\Gladius2.dmm"

_maps/dullahan.dm

@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/dullahan.json"

_maps/dullahan.json

@@ -0,0 +1,35 @@
+{
+	"map_name": "SGV Dullahan",
+	"map_link": "dullahan",
+    "map_path": "map_files/Dullahan",
+    "map_file": ["dullahan2.dmm", "dullahan1.dmm"],
+	"traits": [{"Up": 1, "Linkage": "Self"}, {"Down": -1, "Linkage": "Self"}],
+	"space_ruin_levels": -1,
+	"space_empty_levels": 0,
+	"shuttles": {
+		"cargo": "cargo_hammerhead"},
+    "mine_disable": 1,
+	"ship_type": "/obj/structure/overmap/nanotrasen/solgov/dullahan/starter",
+	"faction": "solgov",
+	"starmap_path": "config/starmap/starmap.json",
+
+    "map_description": "The SGV Dullahan is the first ship of the eponymous variant of the original Chase-class light frigate design. Like its predecessor, the Dullahan is designed for rapid and sudden combat operations and is adapted for extended missions without resupply. The main difference from earlier models is a controversial complete redesign of the ship’s bow and the replacement of experimental energy weapons with more suitable ballistic alternatives. The Dullahan differs from other similar ships in service in its high level of automation and the fault tolerance of its combat systems, which is a hallmark of many vessels built by Positronic Shipyards.",
+    "manufacturer": "Positronic Shipyards",
+	"mapper": "chichmuch",
+    "commission_date": "August 15, 2266",
+    "strengths": ["Highly maneuverable", "Highly automated", "Compact"],
+    "weaknesses": ["Mouse infestation", "Cramped", "No energy shields"],
+	"equipment": [
+		"2 M4-15 'Hood' deck turrets",
+		"12 M14 VLS loaders",
+		"2 NT-BSG gauss turrets",
+		"1 M4-B torpedo tube",
+		"7 light fighters",
+		"2 Peregrine class attack fighter",
+		"2 Su-410 Scimitar attack fighter",
+		"2 Su-818 Rapier fighter",
+		"2 Su-437 Sabre cargo shuttles",
+		"2 Su-437 Sabre dropships",
+		"1 modified class IV nuclear storm drive"
+	]
+}

_maps/map_files/Dullahan/job_changes.dm

@@ -0,0 +1,136 @@
+
+/datum/job/atmospheric_technician/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 2
+	spawn_positions = 2
+
+/datum/job/station_engineer/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 2
+	spawn_positions = 2
+
+/datum/job/medical_doctor/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 3
+	spawn_positions = 3
+
+/datum/job/scientist/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 3
+	spawn_positions = 3
+
+/datum/job/shaft_miner/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 3
+	spawn_positions = 3
+
+/datum/job/pilot/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 6
+	spawn_positions = 6
+
+/datum/job/munitions_tech/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 5
+	spawn_positions = 5
+
+/datum/job/botanist/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 1
+	spawn_positions = 1
+
+
+MAP_REMOVE_JOB(ai)
+MAP_REMOVE_JOB(bartender)
+MAP_REMOVE_JOB(chaplain)
+MAP_REMOVE_JOB(clown)
+MAP_REMOVE_JOB(detective)
+MAP_REMOVE_JOB(exploration)
+MAP_REMOVE_JOB(lawyer)
+MAP_REMOVE_JOB(curator)
+MAP_REMOVE_JOB(mime)
+MAP_REMOVE_JOB(deputy)
+MAP_REMOVE_JOB(brig_phys)
+MAP_REMOVE_JOB(virologist)
+
+/datum/job/ai/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/bartender/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/chaplain/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/clown/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/detective/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/exploration/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/lawyer/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/curator/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/mime/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/deputy/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/brig_phys/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+/datum/job/virologist/New()
+	..()
+	MAP_JOB_CHECK
+	total_positions = 0
+	spawn_positions = 0
+
+#undef JOB_MODIFICATION_MAP_NAME

code/modules/jobs/map_changes/map_changes.dm

@@ -21,4 +21,7 @@
 #define JOB_MODIFICATION_MAP_NAME "NSV Galactica"
 #include "..\..\..\..\_maps\map_files\Galactica\job_changes.dm"
 
+#define JOB_MODIFICATION_MAP_NAME "SGV Dullahan"
+#include "..\..\..\..\_maps\map_files\Dullahan\job_changes.dm"
+
 #undef JOB_MODIFICATION_MAP_NAME

config/maps.txt

@@ -19,6 +19,10 @@ map tycoon
 	votable
 endmap
 
+map dullahan
+	votable
+endmap
+
 map atlas
 	votable
 endmap

nsv13/code/modules/overmap/types/solgov.dm

@@ -201,3 +201,25 @@
 
 /obj/structure/overmap/nanotrasen/solgov/ai/apply_weapons()
 	apply_medium_ai_weapons()
+
+
+/obj/structure/overmap/nanotrasen/solgov/dullahan
+	name = "Dullahan class frigate"
+	desc = "A long-range SolGov gunboat, usually used for long-term missions."
+	icon = 'nsv13/icons/overmap/new/solgov/dullahan.dmi'
+	icon_state = "frigate"
+	mass = MASS_MEDIUM_SMALL
+	sprite_size = 48
+	// damage_states = TRUE
+	bound_width = 96
+	bound_height = 96
+	obj_integrity = 500
+	max_integrity = 500
+	armor = list("overmap_light" = 90, "overmap_medium" = 30, "overmap_heavy" = 10)
+
+/obj/structure/overmap/nanotrasen/solgov/dullahan/starter
+	role = MAIN_OVERMAP
+	obj_integrity = 800
+	max_integrity = 800
+	starting_system = "Staging"
+	armor = list("overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 40)

nsv13/code/modules/power/stormdrive.dm

@@ -182,6 +182,42 @@ Control Rods
 	icon = 'nsv13/goonstation/icons/reactor_solgov.dmi'
 	theoretical_maximum_power = 20000000
 
+/obj/machinery/atmospherics/components/binary/stormdrive_reactor/stable/handle_reactor_stability()
+	if(reactor_stability > 100)
+		reactor_stability = 100
+	if(reactor_stability < 0)
+		reactor_stability = 0
+
+	if(reactor_stability < 75)
+		if(prob((100 - reactor_stability) / 4)) //Destabilize the balance a little
+			if(prob(50))
+				heat += reaction_rate * rand(5,8)
+			else
+				reaction_rate += reaction_rate / rand(3,5)
+
+	if(reactor_stability < 15)
+		if(prob(1))
+			var/anom = rand(1,10)
+			switch(anom)
+				if(1 to 4)
+					new /obj/effect/anomaly/stormdrive/surge(src, rand(2000, 5000))
+				if(5 to 8)
+					new /obj/effect/anomaly/stormdrive/sheer(src, rand(2000, 5000))
+				if(9 to 10)
+					new /obj/effect/anomaly/stormdrive/squall(src, rand(2000, 5000))
+			reactor_stability += 15 //Spike that stab back up
+			playsound(loc, 'sound/effects/empulse.ogg', 100)
+
+	switch(reactor_stability) //Entropy nudge
+		if(0 to 1)
+			heat += 1
+		if(1 to 15)
+			heat += 0.5
+		if(15 to 30)
+			heat += 0.1
+		if(30 to 75)
+			heat += 0.01
+
 //////// REACTOR INTERACTIONS /////////
 
 /obj/machinery/atmospherics/components/binary/stormdrive_reactor/attackby(obj/item/I, mob/living/carbon/user, params)