[MIRROR] [MODULAR] Tarkon Tweaks set 1

_maps/RandomRuins/SpaceRuins/nova/port_tarkon/cargo_warehouse.dmm

@@ -255,7 +255,7 @@ S
 E
 N
 E
-E
+w
 E
 "}
 (9,1,1) = {"
@@ -273,7 +273,7 @@ B
 E
 R
 E
-w
+E
 E
 "}
 (11,1,1) = {"
@@ -283,7 +283,7 @@ E
 E
 w
 i
-E
+w
 "}
 (12,1,1) = {"
 T

_maps/shuttles/nova/ruin_tarkon_driver.dmm

@@ -9,6 +9,7 @@
 /obj/machinery/light/directional/east,
 /obj/structure/table/reinforced,
 /obj/effect/spawner/random/food_or_drink/snack,
+/obj/item/crowbar/red,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "cP" = (
@@ -31,6 +32,11 @@
 "ef" = (
 /turf/open/floor/iron/recharge_floor,
 /area/shuttle/tarkon_driver)
+"eP" = (
+/obj/machinery/power/smes/tarkon_driver,
+/obj/structure/cable,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/tarkon_driver)
 "fg" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -59,6 +65,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/closed/wall/mineral/titanium/spaceship,
 /area/shuttle/tarkon_driver)
+"hT" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/machinery/camera/tarkon/directional/south,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/tarkon_driver)
 "hW" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
@@ -94,6 +107,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/camera/tarkon/directional/south,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "ni" = (
@@ -122,6 +136,12 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
+/obj/machinery/camera/tarkon/directional/south,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/tarkon_driver)
+"pi" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/camera/tarkon/directional/south,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "rr" = (
@@ -194,16 +214,17 @@
 /obj/item/flashlight/flare,
 /obj/item/flashlight/flare,
 /obj/item/flashlight/flare,
-/obj/machinery/door/window/right/directional/west,
+/obj/machinery/door/window/brigdoor/tarkon/right/directional/west,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "Cn" = (
 /obj/structure/rack/shelf,
 /obj/item/tank/internals/emergency_oxygen,
 /obj/item/tank/internals/emergency_oxygen,
 /obj/item/tank/internals/emergency_oxygen,
-/obj/machinery/door/window/right/directional/west,
+/obj/machinery/door/window/brigdoor/tarkon/right/directional/west,
 /obj/machinery/light/directional/south,
+/obj/machinery/camera/tarkon/directional/south,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "Cv" = (
@@ -227,8 +248,7 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "Fp" = (
-/obj/structure/table/reinforced,
-/obj/item/crowbar/red,
+/obj/machinery/computer/camera_advanced/tarkon_cam,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "GN" = (
@@ -258,8 +278,9 @@
 /obj/item/clothing/suit/space/eva,
 /obj/item/clothing/head/helmet/space/eva,
 /obj/item/clothing/mask/breath,
-/obj/machinery/door/window/right/directional/east,
+/obj/machinery/door/window/brigdoor/tarkon/right/directional/east,
 /obj/machinery/light/directional/south,
+/obj/machinery/camera/tarkon/directional/south,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "Jo" = (
@@ -318,8 +339,10 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "Pn" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/cable,
+/obj/machinery/power/smes/engineering{
+	input_level = 5000
+	},
+/obj/machinery/power/smes/tarkon_driver,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "Qe" = (
@@ -352,15 +375,15 @@
 /obj/item/clothing/suit/space/eva,
 /obj/item/clothing/head/helmet/space/eva,
 /obj/item/clothing/mask/breath,
-/obj/machinery/door/window/right/directional/east,
+/obj/machinery/door/window/brigdoor/tarkon/right/directional/east,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "Tp" = (
 /obj/structure/rack/shelf,
 /obj/item/oxygen_candle,
 /obj/item/oxygen_candle,
 /obj/item/oxygen_candle,
-/obj/machinery/door/window/right/directional/west,
+/obj/machinery/door/window/brigdoor/tarkon/right/directional/west,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "TS" = (
@@ -373,6 +396,7 @@
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
 /obj/machinery/light_switch/directional/east,
+/obj/machinery/camera/tarkon/directional/east,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/tarkon_driver)
 "Ut" = (
@@ -490,7 +514,7 @@ IP
 LG
 Vp
 Xb
-XN
+pi
 hH
 zL
 "}
@@ -608,7 +632,7 @@ Em
 uk
 Kv
 gu
-Xb
+hT
 JF
 Tp
 Cf
@@ -632,7 +656,7 @@ fy
 fy
 tV
 LG
-Pn
+eP
 Vt
 Pn
 GN

modular_nova/modules/mapping/code/areas/space.dm

@@ -231,7 +231,7 @@
 	icon_state = "dorms"
 
 /area/solars/tarkon
-	name = "\improper P-T Solar Array"
+	name = "P-T Solar Array"
 	icon_state = "space_near"
 	has_gravity = STANDARD_GRAVITY
 	outdoors = TRUE

modular_nova/modules/tarkon/code/misc_fluff/atmos_control.dm → modular_nova/modules/tarkon/code/machines/atmos_control.dm

@@ -1,4 +1,4 @@
-// Port Tarkon Atmos Control
+/////////////////// Port Tarkon Atmost Control ///////////////////
 
 /obj/machinery/computer/atmos_control/tarkon
 	circuit = /obj/item/circuitboard/computer/atmos_control/tarkon

modular_nova/modules/tarkon/code/machines/camera_systems.dm

@@ -0,0 +1,32 @@
+/////////////////// Xenobio Cam + control ///////////////////
+
+/obj/machinery/computer/camera_advanced/xenobio/tarkon
+	name = "Tarkon Slime management console"
+	desc = "A computer used for remotely handling slimes. Safety First."
+	networks = list("tarkon_xenob")
+	circuit = /obj/item/circuitboard/computer/xenobiology/tarkon
+
+/obj/item/circuitboard/computer/xenobiology/tarkon
+	name = "Tarkon Xenobiology Console"
+	greyscale_colors = CIRCUIT_COLOR_SCIENCE
+	build_path = /obj/machinery/computer/camera_advanced/xenobio/tarkon
+
+/obj/machinery/camera/tarkon_xenob
+	network = list("tarkon_xenob", "tarkon")
+	dir = 4
+
+/////////////////// Security Cam + control ///////////////////
+
+/obj/machinery/computer/camera_advanced/tarkon_cam
+	name = "Tarkon Camera Control Console"
+	networks = list("tarkon")
+	circuit = /obj/item/circuitboard/computer/tarkon_cam
+
+/obj/item/circuitboard/computer/tarkon_cam
+	name = "Tarkon Camera Control Console"
+	build_path = /obj/machinery/computer/camera_advanced/tarkon_cam
+
+/obj/machinery/camera/tarkon
+	network = list("tarkon")
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/tarkon, 0)

modular_nova/modules/tarkon/code/machines/smes.dm

@@ -0,0 +1,11 @@
+/////////////////// Smes for roundstart Tarkon + Ship ///////////////////
+
+/obj/machinery/power/smes/tarkon_backup
+	charge = 2e6
+	output_level = 0
+	input_level = 0
+
+/obj/machinery/power/smes/tarkon_driver
+	charge = 3e6 // Wouldn't use much power in dock
+	input_level = 10000
+	output_level = 5000

modular_nova/modules/tarkon/code/machines/windoors.dm

@@ -0,0 +1,14 @@
+/////////////////// Tarkon Access Windoors ///////////////////
+/////////////////// Yes i know these aren't machines ///////////////////
+
+/obj/machinery/door/window/brigdoor/tarkon
+	name = "reinforced glass door"
+	desc = "For keeping a secure view."
+	req_access = list(ACCESS_TARKON)
+
+/obj/machinery/door/window/brigdoor/tarkon/right
+	icon_state = "rightsecure"
+	base_state = "rightsecure"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/brigdoor/tarkon/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/brigdoor/tarkon/right, 0)

modular_nova/modules/tarkon/code/misc_fluff/fluff.dm

@@ -8,10 +8,10 @@
 		1 = "<span class='game say'><span class='name'>The universal recorder</span> <span class='message'>says, \"<span class='tape_recorder '>Recording started.</span>\"</span></span>",
 		2 = "<span class='game say'><span class='name'>Officer ???</span> <span class='message'>says, \"<span class=' '>... Yeesh... Its good we got here when we did...</span>\"</span></span>",
 		3 = "<span class='game say'><span class='name'>Janitor ???</span> <span class='message'>sighs, \"<span class=' '>Could have done sooner... Bloke got at me while i went to repaint the stripe on the floor</span>\"</span></span>",
-		4 = "<span class='game say'><span class='name'>Officer ???</span> <span class='message'>sighs, \"<span class=' '>I still need to talk to the Site Director about getting the safe moved... Its better than the cell, And the shutters are nice...</span>\"</span></span>",
+		4 = "<span class='game say'><span class='name'>Officer ???</span> <span class='message'>sighs, \"<span class=' '>I still need to talk to the Defense Director about marking the safe code... Its better than in the cell, And the shutters are nice...</span>\"</span></span>",
 		5 = "<span class='game say'><span class='name'>Janitor ???</span> <span class='message'>scoffs, \"<span class=' '>Yeah, Another set of shutter tracks i'll have to clean out so they dont jam up...</span>\"</span></span>",
 		6 = "<span class='game say'><span class='name'>Officer ???</span> <span class='message'>grumbles, \"<span class=' '>If you dont like bucket work, You could go with the mining crew</span>\"</span></span>",
-		7 = "<span class='game say'><span class='name'>Janitor ???</span> <span class='message'>groans, \"<span class=' '>... Atleast it wouldn't be one of the directors cleansing squads. Those bugs... They've been active recently, can hear them under the halls.</span>\"</span></span>",
+		7 = "<span class='game say'><span class='name'>Janitor ???</span> <span class='message'>groans, \"<span class=' '>... Atleast it wouldn't be one of the directors cleansing squads. One of the ensigns who got slammed to it started some maddened babbling about \"returning\" something.</span>\"</span></span>",
 		8 = "<span class='game say'><span class='name'>The universal recorder</span> <span class='message'>says, \"<span class='tape_recorder '>Recording stopped.</span>\"</span></span>"
 	)
 	timestamp = list(
@@ -25,7 +25,7 @@
 		8 = 380
 	)
 
-/obj/item/tape/ruins/tarkon/safe	//A tape recorded by the foreman.
+/obj/item/tape/ruins/tarkon/safe	//Two talk about weird things in the tunnels - shouldn't be in the game yet
 	icon_state = "tape_greyscale"
 	desc = "An old tape with a label, \"Exchange with the Science Leader\"... Should definitely be flipped if not being read when played."
 
@@ -35,9 +35,9 @@
 		2 = "<span class='game say'><span class='name'>Foreman ???</span> <span class='message'>sighs, \"<span class=' '>Right... Research near finish? Need to stash this back between the solar batteries before I sleep..</span>\"</span></span>",
 		3 = "<span class='game say'><span class='name'>Science Lead ???</span> <span class='message'>says, \"<span class=' '>We're getting the atmospheric scans done... Its definitely an odd find.</span>\"</span></span>",
 		4 = "<span class='game say'><span class='name'>Foreman ???</span> <span class='message'>grumbles, \"<span class=' '>We've been finding some weird stuff in those tunnels.. Its a shame the machines framing was broken.</span>\"</span></span>",
-		5 = "<span class='game say'><span class='name'>Science Lead ???</span> <span class='message'>pauses then sighs out, \"<span class=' '>Yeah... Best we could figure from the wreckage was some sort of focusing device for a crystal..?</span>\"</span></span>",
-		6 = "<span class='game say'><span class='name'>Foreman ???</span> <span class='message'>scoffs, \"<span class=' '>... A crystal?</span>\"</span></span>",
-		7 = "<span class='game say'><span class='name'>Foreman ???</span> <span class='message'>quips, \"<span class=' '>Yes... We have some possible- Ah... The scan finished.. I'm sure you'd rather get to rest than listen to my ramble, so just go.</span>\"</span></span>",
+		5 = "<span class='game say'><span class='name'>Science Lead ???</span> <span class='message'>pauses then sighs out, \"<span class=' '>Yeah... Best we could figure from the wreckage was some sort of AI system.. its wiring looked almost organic though-</span>\"</span></span>",
+		6 = "<span class='game say'><span class='name'>Foreman ???</span> <span class='message'>scoffs, \"<span class=' '>... An- AI?</span>\"</span></span>",
+		7 = "<span class='game say'><span class='name'>Science Lead ???</span> <span class='message'>quips, \"<span class=' '>Yes... We have some possible leads to what it- Ah... The scan finished.. I'll forward the notes about that AI to the Defense Director, Right now I need to compile these readings...</span>\"</span></span>",
 		8 = "<span class='game say'><span class='name'>The universal recorder</span> <span class='message'>says, \"<span class='tape_recorder '>Recording stopped.</span>\"</span></span>"
 	)
 	timestamp = list(

modular_nova/modules/tarkon/code/misc_fluff/spawner.dm

@@ -92,9 +92,12 @@
 	id = /obj/item/card/id/advanced/tarkon/engi
 	id_trim = /datum/id_trim/away/tarkon/eng
 	neck = /obj/item/clothing/neck/security_cape/tarkon
-	l_hand = /obj/item/inducer
 	l_pocket = /obj/item/tank/internals/emergency_oxygen/engi
 	r_pocket = /obj/item/stack/cable_coil
+	backpack_contents = list(
+		/obj/item/crowbar = 1,
+		/obj/item/inducer = 1
+		)
 
 /obj/effect/mob_spawn/ghost_role/human/tarkon/sec
 	prompt_name = "a port security member"
@@ -118,7 +121,7 @@
 	icon_state = "sleeper-o"
 	you_are_text = "You were tasked by Tarkon Industries to Port Tarkon as a low-level command member. Your superior is the site director."
 	flavour_text = "Second in command, you are usually tasked with outward missions with other Tarkon members while the site director stays at the port. (OOC note: This ghost role was not designed with Plasmamen or Vox in mind. While there are some accommodations so that they can survive, it should be noted that they were not the focal point whilst designing Port Tarkon. The closet in the middle of the room above contains the 'accommodations' for those species.)"
-	important_text = "You are not to abandon Port Tarkon without reason. You are allowed to travel within available Z-levels and to the station, and are allowed to hold exploration parties."
+	important_text = "This is Not a job ment for Non-Tarkon specific Characters. You are not to abandon Port Tarkon without reason. You are allowed to travel within available Z-levels and to the station, and are allowed to hold exploration parties."
 	outfit = /datum/outfit/tarkon/ensign
 	spawner_job_path = /datum/job/tarkon
 
@@ -137,7 +140,7 @@
 	icon_state = "sleeper"
 	you_are_text = "You are a newly assigned Site Director for Port Tarkon. Your superiors are none except the will of yourself and Tarkon Industries."
 	flavour_text = "On the recently reclaimed Port Tarkon, You are tasked with overlooking your crew and keeping the port up and running. (OOC note: This ghost role was not designed with Plasmamen or Vox in mind. While there are some accommodations so that they can survive, it should be noted that they were not the focal point whilst designing Port Tarkon. The closet in the middle of the room above contains the 'accommodations' for those species.)"
-	important_text = "You are not to abandon Port Tarkon. Check other sleepers for alternative jobs."
+	important_text = "This is Not a job ment for Non-Tarkon specific Characters. You are not to abandon Port Tarkon. Check other sleepers for alternative jobs."
 	outfit = /datum/outfit/tarkon/director
 	spawner_job_path = /datum/job/tarkon
 	loadout_enabled = TRUE
@@ -178,21 +181,23 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/tarkon, 32)
 	icon_state = "corpseminer"
 	outfit = /datum/outfit/tarkon/loot
 
+#define ROLE_TARKALIEN "Xenomorph Hive T-35"
+
 /obj/structure/spawner/tarkon_xenos
 	name = "infested warren"
 	desc = "A deep tunnel that goes deeper than any light can reach. A distant roaring could be heard within..."
 	icon_state = "hole"
 	icon = 'icons/mob/simple/lavaland/nest.dmi'
 	max_integrity = 500
-	max_mobs = 7
-	spawn_time = 20 SECONDS
+	max_mobs = 4
+	spawn_time = 30 SECONDS
 	mob_types = list(
 		/mob/living/simple_animal/hostile/alien,
 		/mob/living/simple_animal/hostile/alien/drone,
 		/mob/living/simple_animal/hostile/alien/sentinel
 	)
 	spawn_text = "crawls out of"
-	faction = list(ROLE_ALIEN)
+	faction = list(ROLE_TARKALIEN)
 	var/boss_mob = /mob/living/simple_animal/hostile/alien/queen/large
 	var/loot_drop = /obj/effect/mob_spawn/corpse/human/tarkon
 
@@ -235,8 +240,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/tarkon, 32)
 	icon_state = "hole"
 	icon = 'icons/mob/simple/lavaland/nest.dmi'
 	max_integrity = 300
-	max_mobs = 4
-	spawn_time = 30 SECONDS
+	max_mobs = 2
+	spawn_time = 40 SECONDS
 	boss_mob = /mob/living/simple_animal/hostile/alien/queen
 	loot_drop = /obj/effect/spawner/random/astrum/sci_loot/tarkon
 
@@ -246,8 +251,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/tarkon, 32)
 	icon_state = "hole"
 	icon = 'icons/mob/simple/lavaland/nest.dmi'
 	max_integrity = 150
-	max_mobs = 2
-	spawn_time = 30 SECONDS
+	max_mobs = 1
+	spawn_time = 40 SECONDS
 	mob_types = list(
 		/mob/living/simple_animal/hostile/alien,
 		/mob/living/simple_animal/hostile/alien/drone

tgstation.dme

@@ -8044,7 +8044,10 @@
 #include "modular_nova\modules\tarkon\code\clothing\uniform.dm"
 #include "modular_nova\modules\tarkon\code\guns\m6pdw.dm"
 #include "modular_nova\modules\tarkon\code\guns\resonance_disruptor.dm"
-#include "modular_nova\modules\tarkon\code\misc_fluff\atmos_control.dm"
+#include "modular_nova\modules\tarkon\code\machines\atmos_control.dm"
+#include "modular_nova\modules\tarkon\code\machines\camera_systems.dm"
+#include "modular_nova\modules\tarkon\code\machines\smes.dm"
+#include "modular_nova\modules\tarkon\code\machines\windoors.dm"
 #include "modular_nova\modules\tarkon\code\misc_fluff\card.dm"
 #include "modular_nova\modules\tarkon\code\misc_fluff\fluff.dm"
 #include "modular_nova\modules\tarkon\code\misc_fluff\radio.dm"