Merge pull request #189 from BadClownSS13/master

Balancing dynamic rooms and one previous commit.

baystation12.dme

@@ -265,6 +265,7 @@
 #include "code\game\supplyshuttle.dm"
 #include "code\game\area\ai_monitored.dm"
 #include "code\game\area\areas.dm"
+#include "code\game\area\Dynamic areas.dm"
 #include "code\game\area\Space Station 13 areas.dm"
 #include "code\game\dna\dna2.dm"
 #include "code\game\dna\dna2_domutcheck.dm"

code/game/area/Dynamic areas.dm

@@ -0,0 +1,37 @@
+/area/dynamic // Do not use.
+	name = "dynamic area"
+	icon_state = "purple"
+	var/match_tag = "none"
+	var/width = -1
+	var/height = -1
+
+/area/dynamic/destination // Do not use.
+	name = "dynamic area destination"
+
+/area/dynamic/destination/lobby
+	name = "Arrivals Lobby"
+	match_tag = "arrivals"
+	width = 5
+	height = 4
+
+/area/dynamic/source // Do not use.
+	name = "dynamic area source"
+	var/lights_initially_on = 0
+
+/area/dynamic/source/lobby_bar
+	name = "\improper Bar"
+	match_tag = "arrivals"
+	width = 5
+	height = 4
+
+/area/dynamic/source/lobby_russian
+	name = "\improper Russian Lounge"
+	match_tag = "arrivals"
+	width = 5
+	height = 4
+
+/area/dynamic/source/lobby_disco
+	name = "\improper Disco Lounge"
+	match_tag = "arrivals"
+	width = 5
+	height = 4

code/game/area/Space Station 13 areas.dm

@@ -1039,38 +1039,6 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Clothing Shop"
 	icon_state = "Theatre"
 
-
-// Dynamic rooms
-
-/area/dynamic // Do not use.
-	name = "dynamic area"
-	icon_state = "purple"
-
-/area/dynamic/destination // Do not use.
-	name = "dynamic area destination"
-
-/area/dynamic/destination/a
-	name = "dynamic area destination a"
-
-/area/dynamic/source // Do not use.
-	name = "dynamic area source"
-
-/area/dynamic/source/ai
-	name = "\improper AI Core"
-
-/area/dynamic/source/bar
-	name = "\improper Bar"
-
-/area/dynamic/source/russian
-	name = "\improper Russian Lounge"
-
-/area/dynamic/source/kitchen
-	name = "\improper Kitchen"
-
-/area/dynamic/source/chemistry
-	name = "\improper Chemistry"
-
-
 /area/holodeck
 	name = "\improper Holodeck"
 	icon_state = "Holodeck"

code/modules/research/xenoarchaeology/tools/suspension_generator.dm

@@ -126,15 +126,18 @@
 	if(href_list["select_field"])
 		field_type = href_list["select_field"]
 	else if(href_list["insertcard"])
-		var/obj/item/I = usr.get_active_hand()
-		if (istype(I, /obj/item/weapon/card))
-			usr.drop_item()
-			I.loc = src
-			auth_card = I
-			if(attempt_unlock(I))
-				usr << "<span class='info'>You insert [I], the console flashes \'<i>Access granted.</a>\'</span>"
-			else
-				usr << "<span class='warning'>You insert [I], the console flashes \'<i>Access denied.</a>\'</span>"
+		if (istype(usr, /mob/living/silicon))
+			locked = 0
+		else
+			var/obj/item/I = usr.get_active_hand()
+			if (istype(I, /obj/item/weapon/card))
+				usr.drop_item()
+				I.loc = src
+				auth_card = I
+				if(attempt_unlock(I))
+					usr << "<span class='info'>You insert [I], the console flashes \'<i>Access granted.</a>\'</span>"
+				else
+					usr << "<span class='warning'>You insert [I], the console flashes \'<i>Access denied.</a>\'</span>"
 	else if(href_list["ejectcard"])
 		if(auth_card)
 			if(ishuman(usr))