Merge pull request #48 from 800maximum123/Bugfix-Upstream

[FD-Assets] Pure evil and Bugfixes | MAIN

code/modules/mob/new_player/new_player.dm

@@ -235,11 +235,10 @@
 		to_chat(usr, SPAN_WARNING("The round is either not ready, or has already finished..."))
 		return 0
 //	[FD-EDIT]
-	if(!check_rights(R_ADMIN))
-		if(!usr.client.enter_lock_bypass)
-			if(!config.enter_allowed)
-				to_chat(usr, SPAN_NOTICE("There is an administrative lock on entering the game!"))
-				return 0
+	if(!config.enter_allowed)
+		if(!check_rights(, show_msg = FALSE) && !usr.client.enter_lock_bypass)
+			to_chat(usr, SPAN_NOTICE("There is an administrative lock on entering the game!"))
+			return 0
 /*
 	if(!config.enter_allowed)
 		to_chat(usr, SPAN_NOTICE("There is an administrative lock on entering the game!"))

maps/torch_fd/fd_torch.dm

@@ -27,7 +27,7 @@
 	#include "torch_ranks.dm"
 	#include "../torch/torch_security_state.dm"
 	#include "../torch/torch_setup.dm"
-	#include "../torch/torch_shuttles.dm"
+	#include "torch_shuttles.dm"
 	#include "../torch/torch_submaps.dm"
 	#include "../torch/torch_turfs.dm"
 	#include "../torch/torch_unit_testing.dm"

maps/torch_fd/job/addition/research_jobs.dm

@@ -1,5 +1,5 @@
 /// Access
-var/const/access_research_security = "ACCESS_RESEARCH_SECURITY" //97
+var/global/const/access_research_security = "ACCESS_RESEARCH_SECURITY" //97
 /datum/access/rnd_guard
 	id = access_research_security
 	desc = "Research Checkpoint"

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/torch2_deck4.dmm

@@ -120,7 +120,7 @@
 "ct" = (/obj/floor_decal/industrial/warning{dir = 1; icon_state = "warning"},/obj/machinery/door/blast/regular/escape_pod,/turf/simulated/floor/reinforced,/area/maintenance/fourthdeck/aft)
 "cu" = (/turf/simulated/wall/r_wall/prepainted,/area/maintenance/fourthdeck/aft)
 "cv" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/fourthdeck/aft)
-"cw" = (/obj/shuttle_landmark/merchant/out,/turf/space,/area/space)
+"cw" = (/turf/space,/area/space)
 "cx" = (/obj/structure/railing/mapped,/turf/simulated/floor/reinforced{map_airless = 1; name = "vacuum reinforced floor"},/area/space)
 "cy" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/canister/air/airlock,/turf/simulated/floor/tiled/monotile,/area/maintenance/fourthdeck/forestarboard)
 "cz" = (/obj/catwalk_plated,/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fourthdeck/forestarboard)
@@ -783,7 +783,7 @@
 "ph" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{id_tag = "eva_airlock_pump"},/obj/machinery/light{dir = 1},/obj/machinery/oxygen_pump{pixel_y = 32},/obj/floor_decal/techfloor{dir = 1},/turf/simulated/floor/tiled/techfloor/grid,/area/eva)
 "pi" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{id_tag = "eva_airlock_pump"},/obj/floor_decal/techfloor{dir = 1},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1380; id_tag = "eva_airlock"; pixel_y = 20; tag_airpump = "eva_airlock_pump"; tag_chamber_sensor = "eva_airlock_sensor"; tag_exterior_door = "eva_airlock_outer"; tag_interior_door = "eva_airlock_inner"},/turf/simulated/floor/tiled/techfloor/grid,/area/eva)
 "pj" = (/obj/machinery/light{dir = 1},/obj/machinery/oxygen_pump{pixel_y = 32},/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{id_tag = "eva_airlock_pump"},/obj/floor_decal/techfloor{dir = 1},/turf/simulated/floor/tiled/techfloor/grid,/area/eva)
-"pk" = (/obj/structure/table/rack{dir = 8},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/machinery/camera/network/fourth_deck{c_tag = "EVA - Center"; dir = 4},/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 6},/obj/floor_decal/corner/blue/half{dir = 8},/turf/simulated/floor/tiled/monotile,/area/eva)
+"pk" = (/obj/structure/table/rack{dir = 8},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 6},/obj/floor_decal/corner/blue/half{dir = 8},/turf/simulated/floor/tiled/monotile,/area/eva)
 "pl" = (/turf/simulated/floor/tiled,/area/eva)
 "pm" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/floor_decal/corner/blue/half{dir = 4},/turf/simulated/floor/tiled/monotile,/area/eva)
 "pn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/newscaster{pixel_x = 32},/obj/floor_decal/industrial/warning/corner{dir = 4; icon_state = "warningcorner"},/turf/simulated/floor/tiled,/area/hallway/primary/fourthdeck/fore)
@@ -907,7 +907,7 @@
 "rB" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{dir = 1; id_tag = "eva_airlock_pump"},/obj/floor_decal/techfloor,/turf/simulated/floor/tiled/techfloor/grid,/area/eva)
 "rC" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{dir = 1; id_tag = "eva_airlock_pump"},/obj/floor_decal/techfloor,/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "eva_airlock_sensor"; pixel_y = -25},/turf/simulated/floor/tiled/techfloor/grid,/area/eva)
 "rD" = (/obj/item/device/radio/intercom{dir = 1; pixel_y = -28},/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{dir = 1; id_tag = "eva_airlock_pump"},/obj/floor_decal/techfloor,/turf/simulated/floor/tiled/techfloor/grid,/area/eva)
-"rE" = (/obj/structure/table/rack{dir = 8},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/storage/briefcase/inflatable{pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = -3},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/floor_decal/corner/blue/half{dir = 8},/turf/simulated/floor/tiled/monotile,/area/eva)
+"rE" = (/obj/structure/table/rack{dir = 8},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/storage/briefcase/inflatable{pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = -3},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/floor_decal/corner/blue/half{dir = 8},/obj/machinery/camera/network/fourth_deck{c_tag = "EVA - Center"; dir = 4},/turf/simulated/floor/tiled/monotile,/area/eva)
 "rF" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/eva)
 "rG" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/eva)
 "rH" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/eva)

maps/torch_fd/torch3_deck3.dmm

@@ -630,7 +630,7 @@
 "mk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/hatch/maintenance,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/steel_ridged,/area/hallway/primary/thirddeck/fore)
 "ml" = (/obj/structure/flora/ausbushes/fernybush,/turf/simulated/floor/grass,/area/crew_quarters/observation)
 "mm" = (/obj/floor_decal/spline/fancy/wood,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/lino,/area/crew_quarters/galley)
-"mn" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_coffee/full{dir = 8; layer = 2.23; pixel_y = 27},/obj/machinery/fabricator/micro/bartender{pixel_x = -3},/obj/item/sticky_pad/random{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/carpet/blue,/area/crew_quarters/galley)
+"mn" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_coffee/full{dir = 8; layer = 2.23; pixel_y = 27},/obj/item/sticky_pad/random{pixel_x = 7; pixel_y = 10},/obj/machinery/fabricator/micro/bartender{show_category = "All"; pixel_x = -3},/turf/simulated/floor/carpet/blue,/area/crew_quarters/galley)
 "mo" = (/obj/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/lino,/area/crew_quarters/galley)
 "mp" = (/obj/floor_decal/corner/blue/border{dir = 8},/obj/floor_decal/corner/blue/border{dir = 4},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess)
 "mq" = (/obj/structure/bed/sofa/r/black{dir = 8},/obj/floor_decal/corner/blue/border{dir = 8},/obj/floor_decal/corner/blue/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess)
@@ -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_cameras.dm

@@ -1,8 +1,8 @@
-var/const/NETWORK_EXPLO		= "Exploration"
-var/const/NETWORK_PETROV	= "Petrov"
-var/const/NETWORK_GUPS		= "General Utility Pods" // 2 for the price of 1! :p
-var/const/NETWORK_SUPPLY	= "Supply"
-var/const/NETWORK_YACHT		= "Private Catamaran"
+var/global/const/NETWORK_EXPLO		= "Exploration"
+var/global/const/NETWORK_PETROV	= "Petrov"
+var/global/const/NETWORK_GUPS		= "General Utility Pods" // 2 for the price of 1! :p
+var/global/const/NETWORK_SUPPLY	= "Supply"
+var/global/const/NETWORK_YACHT		= "Private Catamaran"
 
 /datum/map/torch/get_network_access(network)
 	switch(network)

maps/torch_fd/torch_ranks.dm

@@ -47,6 +47,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)
 	)
 
@@ -100,6 +101,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