Merge pull request #52 from 800maximum123/Bugfix

Bugfix

maps/torch/torch_overmap.dm

@@ -10,7 +10,6 @@
 		/obj/overmap/visitable/ship/landable/aquila,
 		/obj/overmap/visitable/ship/landable/guppy,
 		/obj/overmap/visitable/ship/landable/butterfly,
-		/obj/overmap/visitable/ship/landable/bubble
 	)
 
 	initial_restricted_waypoints = list(
@@ -96,9 +95,7 @@
 	known_ships = list(
 		/obj/overmap/visitable/ship/torch,
 		/obj/overmap/visitable/ship/landable/aquila,
-		/obj/overmap/visitable/ship/landable/guppy,
-		/obj/overmap/visitable/ship/landable/butterfly,
-		/obj/overmap/visitable/ship/landable/bubble
+		/obj/overmap/visitable/ship/landable/guppy
 	)
 
 /obj/overmap/visitable/ship/landable/aquila
@@ -113,9 +110,7 @@
 	known_ships = list(
 		/obj/overmap/visitable/ship/torch,
 		/obj/overmap/visitable/ship/landable/exploration_shuttle,
-		/obj/overmap/visitable/ship/landable/guppy,
-		/obj/overmap/visitable/ship/landable/butterfly,
-		/obj/overmap/visitable/ship/landable/bubble
+		/obj/overmap/visitable/ship/landable/guppy
 	)
 
 /obj/overmap/visitable/ship/landable/guppy

maps/torch_fd/fd_torch.dm

@@ -21,7 +21,7 @@
 	#include "../torch/torch_machinery.dm"
 	#include "../torch/torch_map_templates.dm"
 	#include "../torch/torch_npcs.dm"
-	#include "../torch/torch_overmap.dm"
+	#include "torch_overmap.dm"
 	#include "../torch/torch_presets.dm"
 	#include "../torch/torch_procs.dm"
 	#include "torch_ranks.dm"
@@ -36,7 +36,7 @@
 	#include "torch_areas.dm"
 	#include "torch_cameras.dm"
 	#include "torch_decals.dm"
-	#include "torch_overmap.dm"
+
 
 	// --- INCLUDES FROM ANOTHER MAPS --- //
 	#include "../sierra/sierra_npcs.dm"

maps/torch_fd/job/torch_jobs.dm

@@ -14,6 +14,7 @@
 		/datum/species/unathi  = list(HUMAN_ONLY_JOBS, /datum/job/liaison, /datum/job/warden), //Other jobs unavailable via branch restrictions,
 		/datum/species/unathi/yeosa = list(HUMAN_ONLY_JOBS, /datum/job/liaison, /datum/job/warden),
 		/datum/species/skrell  = list(HUMAN_ONLY_JOBS),
+		/datum/species/resomi  = list(HUMAN_ONLY_JOBS, /datum/job/officer, /datum/job/liaison, /datum/job/warden, /datum/job/research_guard),
 		/datum/species/diona   = list(HUMAN_ONLY_JOBS, /datum/job/officer, /datum/job/liaison, /datum/job/warden, /datum/job/doctor, /datum/job/medical_trainee),	//Other jobs unavailable via branch restrictions,
 	)
 #undef HUMAN_ONLY_JOBS

maps/torch_fd/torch1_deck5.dmm

@@ -1127,7 +1127,7 @@
 "Ac" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4; level = 2},/turf/simulated/floor/tiled,/area/quartermaster/expedition/eva)
 "Ad" = (/obj/catwalk_plated,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/quartermaster/hangar)
 "Ae" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/tiled/white/monotile,/area/shuttle/petrov/analysis)
-"Af" = (/obj/floor_decal/industrial/outline/yellow,/obj/machinery/recharger/wallcharger{pixel_x = -8; pixel_y = 21},/obj/machinery/recharger/wallcharger{pixel_x = 7; pixel_y = 21},/obj/structure/table/rack,/turf/simulated/floor/tiled/techfloor/grid,/area/quartermaster/storage)
+"Af" = (/obj/structure/table/rack,/obj/item/device/scanner/xenobio,/obj/item/device/scanner/xenobio,/obj/item/device/scanner/xenobio,/obj/item/device/scanner/xenobio,/obj/item/storage/plants,/obj/item/storage/plants,/obj/item/storage/plants,/obj/item/device/scanner/plant,/obj/item/device/scanner/plant,/obj/item/device/scanner/plant,/obj/item/device/scanner/plant,/obj/floor_decal/industrial/outline/yellow,/obj/machinery/recharger/wallcharger{pixel_x = -8; pixel_y = 21},/obj/machinery/recharger/wallcharger{pixel_x = 7; pixel_y = 21},/obj/item/storage/box/ammo/flashshells,/obj/item/gun/projectile/flare,/turf/simulated/floor/tiled/techfloor/grid,/area/quartermaster/storage)
 "Ag" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/floor_decal/industrial/outline/yellow,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/shuttle/petrov/maint)
 "Aj" = (/obj/paint/silver,/turf/simulated/wall/ocp_wall,/area/shuttle/petrov/toxins)
 "Ao" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{dir = 1; id_tag = "petrov_shuttle_dock_pump"},/obj/floor_decal/techfloor,/turf/simulated/floor/tiled/techfloor/grid,/area/hallway/primary/fifthdeck/aft)

maps/torch_fd/torch3_deck3.dmm

@@ -1272,7 +1272,7 @@
 "Au" = (/obj/machinery/tele_beacon,/obj/floor_decal/techfloor{dir = 1},/obj/floor_decal/industrial/warning{dir = 1; icon_state = "warning"},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled/dark,/area/teleporter/thirddeck)
 "Aw" = (/obj/structure/table/standard,/obj/floor_decal/borderfloor,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/flashlight/lamp/lava/purple{pixel_x = -5; pixel_y = 3},/turf/simulated/floor/tiled/dark,/area/crew_quarters/mess)
 "Az" = (/obj/structure/sign/ecplaque{pixel_y = -30},/obj/structure/holoplant,/obj/floor_decal/corner/black{dir = 1},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/sleep/cryo)
-"AA" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/floor_decal/corner/blue/border{dir = 4},/obj/floor_decal/corner/blue/bordercorner{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess)
+"AA" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/floor_decal/corner/blue/border{dir = 4},/obj/floor_decal/corner/blue/bordercorner{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess)
 "AB" = (/obj/structure/catwalk,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/maintenance/thirddeck/foreport)
 "AC" = (/obj/structure/bed/sofa/m/black,/obj/floor_decal/corner/blue/border{dir = 1},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess)
 "AD" = (/obj/structure/bed/sofa/l/black{dir = 4},/obj/floor_decal/corner/blue/border{dir = 8},/obj/floor_decal/corner/blue/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess)

maps/torch_fd/torch_overmap.dm

@@ -1,3 +1,162 @@
+// --- ORIGINAL TORCH INFO -- \\
+
+/obj/overmap/visitable/ship/torch
+	name = "SEV Torch"
+	desc = "A frankensteined HNS Mako-class corvette, broadcasting SCGEC codes and the designation \"SEV Torch, HSC-4-13-X\"."
+	fore_dir = WEST
+	vessel_mass = 100000
+	burn_delay = 2 SECONDS
+	sector_flags = OVERMAP_SECTOR_KNOWN|OVERMAP_SECTOR_IN_SPACE|OVERMAP_SECTOR_BASE
+	known_ships = list(
+		/obj/overmap/visitable/ship/landable/exploration_shuttle,
+		/obj/overmap/visitable/ship/landable/aquila,
+		/obj/overmap/visitable/ship/landable/guppy,
+		/obj/overmap/visitable/ship/landable/butterfly,
+		/obj/overmap/visitable/ship/landable/bubble
+	)
+
+	initial_restricted_waypoints = list(
+		"Charon" = list("nav_hangar_charon"), 	//can't have random shuttles popping inside the ship
+		"Guppy" = list("nav_hangar_guppy"),
+		"Aquila" = list("nav_hangar_aquila"),
+		"Bubble" = list("nav_hangar_bubble"),
+		"Butterfly" = list ("nav_hangar_butterfly"),
+
+		"Skrellian Scout" = list("nav_skrellscout_dock"), //restricts Skrell Scoutship specific docking waypoint on deck 4 portside
+		"Skrellian Shuttle" = list("nav_skrellscoutsh_altdock"),
+		"Rescue" = list("nav_ert_dock"), //restricts ERT Shuttle specific docking waypoint on deck 4 portside
+		"ITV The Reclaimer" = list("nav_hangar_gantry_torch"), //gantry shuttles
+		"ITV Vulcan" = list("nav_hangar_gantry_torch_two"),
+		"ITV Spiritus" = list("nav_hangar_gantry_torch_three"),
+		"SRV Venerable Catfish" = list("nav_verne_5"), //docking location for verne shuttle
+		"Cyclopes" = list("nav_merc_dock"),
+		"ICGNV Hound" = list("nav_hound_dock"),
+		"SFV Arbiter" = list("nav_sfv_arbiter_dock")
+	)
+
+	initial_generic_waypoints = list(
+		//start Bridge Deck
+		"nav_merc_deck5",
+		"nav_ninja_deck5",
+		"nav_skipjack_deck5",
+		"nav_ert_deck5",
+		"nav_bridge_charon",
+		"nav_bridge_guppy",
+		"nav_bridge_aquila",
+
+		//start First Deck
+		"nav_merc_deck1",
+		"nav_ninja_deck1",
+		"nav_skipjack_deck1",
+		"nav_ert_deck4",
+		"nav_deck4_charon",
+		"nav_deck4_guppy",
+		"nav_deck4_aquila",
+
+		//start Second Deck
+		"nav_merc_deck2",
+		"nav_ninja_deck2",
+		"nav_skipjack_deck2",
+		"nav_ert_deck3",
+		"nav_deck3_charon",
+		"nav_deck3_guppy",
+		"nav_deck3_aquila",
+
+		//start Third Deck
+		"nav_merc_deck3",
+		"nav_ninja_deck3",
+		"nav_skipjack_deck3",
+		"nav_ert_deck2",
+		"nav_deck2_charon",
+		"nav_deck2_guppy",
+		"nav_deck2_aquila",
+
+		//start Forth Deck
+		"nav_merc_deck4",
+		"nav_ninja_deck4",
+		"nav_skipjack_deck4",
+		"nav_ert_deck1",
+		"nav_deck1_charon",
+		"nav_deck1_guppy",
+		"nav_deck1_aquila",
+		"nav_vox_raider_dock",
+
+		//start Hanger Deck
+		"nav_merc_hanger",
+		"nav_ninja_hanger",
+		"nav_skipjack_hanger",
+		"nav_ert_hanger",
+	)
+
+/obj/overmap/visitable/ship/landable/exploration_shuttle
+	name = "Charon"
+	desc = "An SSE-U11 long range shuttle, broadcasting SCGEC codes and the callsign \"Torch-2 Charon\"."
+	shuttle = "Charon"
+	max_speed = 1/(2 SECONDS)
+	burn_delay = 1 SECONDS
+	vessel_mass = 3000
+	fore_dir = NORTH
+	skill_needed = SKILL_BASIC
+	vessel_size = SHIP_SIZE_SMALL
+	known_ships = list(
+		/obj/overmap/visitable/ship/torch,
+		/obj/overmap/visitable/ship/landable/aquila,
+		/obj/overmap/visitable/ship/landable/guppy,
+		/obj/overmap/visitable/ship/landable/butterfly,
+		/obj/overmap/visitable/ship/landable/bubble
+	)
+
+/obj/overmap/visitable/ship/landable/aquila
+	name = "Aquila"
+	desc = "A PM-24 modular transport, broadcasting SCGEC codes and the callsign \"Torch-1 Aquila\"."
+	shuttle = "Aquila"
+	vessel_mass = 10000
+	max_speed = 1/(1 SECONDS)
+	burn_delay = 0.5 SECONDS //spammable, but expensive
+	fore_dir = NORTH
+	vessel_size = SHIP_SIZE_SMALL
+	known_ships = list(
+		/obj/overmap/visitable/ship/torch,
+		/obj/overmap/visitable/ship/landable/exploration_shuttle,
+		/obj/overmap/visitable/ship/landable/guppy,
+		/obj/overmap/visitable/ship/landable/butterfly,
+		/obj/overmap/visitable/ship/landable/bubble
+	)
+
+/obj/overmap/visitable/ship/landable/guppy
+	name = "Guppy"
+	desc = "An SSE-U3 utility pod, broadcasting SCGEC codes and the callsign \"Torch-3 Guppy\"."
+	shuttle = "Guppy"
+	max_speed = 1/(3 SECONDS)
+	burn_delay = 2 SECONDS
+	vessel_mass = 1800
+	fore_dir = SOUTH
+	skill_needed = SKILL_BASIC
+	vessel_size = SHIP_SIZE_TINY
+	known_ships = list(
+		/obj/overmap/visitable/ship/torch,
+		/obj/overmap/visitable/ship/landable/exploration_shuttle,
+		/obj/overmap/visitable/ship/landable/aquila,
+		/obj/overmap/visitable/ship/landable/butterfly,
+		/obj/overmap/visitable/ship/landable/bubble
+	)
+
+/obj/machinery/computer/shuttle_control/explore/aquila
+	name = "aquila control console"
+	shuttle_tag = "Aquila"
+	req_access = list(access_aquila_helm)
+
+/obj/machinery/computer/shuttle_control/explore/exploration_shuttle
+	name = "shuttle control console"
+	shuttle_tag = "Charon"
+	req_access = list(access_expedition_shuttle_helm)
+
+/obj/machinery/computer/shuttle_control/explore/guppy
+	name = "guppy control console"
+	shuttle_tag = "Guppy"
+	req_access = list(access_guppy_helm)
+
+// --- FD CHANGES -- \\
 
 // --- BUBBLE --- //
 

maps/torch_fd/torch_ranks.dm

@@ -48,6 +48,7 @@
 		/datum/species/unathi       = list(/datum/mil_branch/civilian, /datum/mil_branch/expeditionary_corps),
 		/datum/species/unathi/yeosa = list(/datum/mil_branch/civilian, /datum/mil_branch/expeditionary_corps),
 		/datum/species/adherent     = list(/datum/mil_branch/civilian),
+		/datum/species/resomi       = list(/datum/mil_branch/civilian, /datum/mil_branch/expeditionary_corps),
 		/datum/species/vox          = list(/datum/mil_branch/alien)
 	)
 
@@ -101,6 +102,12 @@
 				/datum/mil_rank/ec/e5
 			)
 		),
+		/datum/species/resomi = list(
+			/datum/mil_branch/expeditionary_corps = list(
+				/datum/mil_rank/ec/e3,
+				/datum/mil_rank/ec/e5
+			)
+		),
 		/datum/species/vox = list(
 			/datum/mil_branch/alien = list(
 				/datum/mil_rank/alien

mods/_fd/fd_guns/code/guns/k342.dm

@@ -129,9 +129,9 @@
 	projectile_type = /obj/item/projectile/plasma/stun
 	battery_changable = TRUE
 	firemodes = list(
-		list(mode_name="stun charge", projectile_type=/obj/item/projectile/plasma/stun, charge_cost=20, fire_delay=4, projectile_color=COLOR_YELLOW),
-		list(mode_name="plasma charge", projectile_type=/obj/item/projectile/plasma, charge_cost=20, fire_delay=4, projectile_color=COLOR_BLUE_LIGHT),
-		list(mode_name="heavy plasma charge", projectile_type=/obj/item/projectile/plasma/heavy, charge_cost=50, fire_delay=8, projectile_color=COLOR_RED)
+		list(mode_name="stun charge", projectile_type=/obj/item/projectile/plasma/stun, charge_cost=20, fire_delay=4),
+		list(mode_name="plasma charge", projectile_type=/obj/item/projectile/plasma, charge_cost=20, fire_delay=4),
+		list(mode_name="heavy plasma charge", projectile_type=/obj/item/projectile/plasma/heavy, charge_cost=50, fire_delay=8)
 	)
 
 /obj/item/gun/energy/k342/prereg

mods/_fd/resomi_fd/_resomi.dme

@@ -2,7 +2,10 @@
 #define MODPACK_RESOMI
 
 #include "_resomi.dm"
+
 #include "code/unit_tests.dm"
+
+#include "code/emotes.dm"
 #include "code/body/abilities.dm"
 #include "code/body/emotes.dm"
 #include "code/body/holding.dm"

mods/_fd/resomi_fd/code/emotes.dm

@@ -0,0 +1,58 @@
+/datum/species/resomi
+	default_emotes = list(
+		/singleton/emote/audible/sneeze/resomi,
+		/singleton/emote/audible/cough/resomi,
+		/singleton/emote/audible/laugh/resomi,
+		/singleton/emote/audible/scream/resomi,
+		/singleton/emote/audible/peep/resomi,
+		/singleton/emote/audible/rustle/resomi,
+		/singleton/emote/audible/trill/resomi,
+		/singleton/emote/audible/warble/resomi,
+		/singleton/emote/audible/wurble/resomi
+		)
+
+/singleton/emote/audible/scream/resomi
+	emote_sound = 'mods/_fd/resomi_fd/sound/resomiscream.ogg'
+	sounded_species = list(SPECIES_RESOMI)
+
+/singleton/emote/audible/peep/resomi
+	key = "peep"
+	emote_message_3p = "USER пищит"
+	emote_sound = 'mods/_fd/resomi_fd/sound/peep.ogg'
+	sounded_species = list(SPECIES_RESOMI)
+
+/singleton/emote/audible/rustle/resomi
+	key = "rustle"
+	emote_message_3p = "USER шелестит крыльями"
+	emote_sound = 'mods/_fd/resomi_fd/sound/rustle.ogg'
+	sounded_species = list(SPECIES_RESOMI)
+
+/singleton/emote/audible/trill/resomi
+	key = "trill"
+	emote_message_3p = "USER издаёт трель"
+	emote_sound = 'mods/_fd/resomi_fd/sound/trill.ogg'
+	sounded_species = list(SPECIES_RESOMI)
+
+/singleton/emote/audible/warble/resomi
+	key = "warble"
+	emote_message_3p = "USER издаёт трель"
+	emote_sound = 'mods/_fd/resomi_fd/sound/warble.ogg'
+	sounded_species = list(SPECIES_RESOMI)
+
+/singleton/emote/audible/wurble/resomi
+	key = "wurble"
+	emote_message_3p = "USER урчит"
+	emote_sound = 'mods/_fd/resomi_fd/sound/wurble.ogg'
+	sounded_species = list(SPECIES_RESOMI)
+
+/singleton/emote/audible/laugh/resomi
+	emote_sound = 'mods/_fd/resomi_fd/sound/resomilaugh.ogg'
+	sounded_species = list(SPECIES_RESOMI)
+
+/singleton/emote/audible/cough/resomi
+	emote_sound = 'mods/_fd/resomi_fd/sound/resomicough.ogg'
+	sounded_species = list(SPECIES_RESOMI)
+
+/singleton/emote/audible/sneeze/resomi
+	emote_sound = 'mods/_fd/resomi_fd/sound/resomisneeze.ogg'
+	sounded_species = list(SPECIES_RESOMI)