Merge pull request #3 from GammaStation/master

Обновление коммита
GammaStation · Dec 3, 2018 · 0672899 · 0672899
2 parents 55ef736 + 6236e11
commit 0672899
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
@@ -128,7 +128,7 @@ var/list/airlock_overlays = list()
 	return ((!secondsMainPowerLost || !secondsBackupPowerLost) && !(stat & NOPOWER))
 
 /obj/machinery/door/airlock/requiresID()
-	return  !(isWireCut(AIRLOCK_WIRE_IDSCAN) || aiDisabledIdScanner) || !req_access.len
+	return !check_access(null) && !(isWireCut(AIRLOCK_WIRE_IDSCAN) || aiDisabledIdScanner)
 
 /obj/machinery/door/airlock/proc/isAllPowerCut()
 	if(isWireCut(AIRLOCK_WIRE_MAIN_POWER1) || isWireCut(AIRLOCK_WIRE_MAIN_POWER2))

diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
@@ -157,7 +157,7 @@
 		else
 			close()
 		return
-	else if(density)
+	else if(density && Adjacent(user))
 		do_animate("deny")
 
 
@@ -356,7 +356,7 @@
 
 
 /obj/machinery/door/proc/requiresID()
-	return FALSE
+	return !check_access(null)
 
 /obj/machinery/door/update_nearby_tiles(need_rebuild)
 	. = ..()

diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
@@ -114,7 +114,6 @@
 	var/mob/M = AM
 	if(!M.restrained())
 		bumpopen(M)
-	return
 
 /obj/machinery/door/window/bumpopen(mob/user)
 	if( operating || !src.density )
@@ -127,7 +126,7 @@
 
 	if(allowed(user))
 		open_and_close()
-	else
+	else if(Adjacent(user)) // Telekinesis be a bitch.
 		do_animate("deny")
 
 /obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)

diff --git a/code/modules/thunderfield2562/thunderfield_gamepod.dm b/code/modules/thunderfield2562/thunderfield_gamepod.dm
@@ -23,7 +23,6 @@
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
-	component_parts += new /obj/item/stack/cable_coil/random(null, 1)
 	RefreshParts()
 
 //Code for attackby

diff --git a/html/changelog.html b/html/changelog.html
@@ -56,6 +56,18 @@ <h4 class="author">Miracler112:</h4>
         <li class="bugfix">Теперь шлюзы, шкафы и всё остальное работает корректно.</li>
        </ul>
       </div>
+      <div data-author="Luduk">
+       <h4 class="author">Luduk:</h4>
+       <ul class="changelog">
+        <li class="bugfix">Стеклянные двери работают корректно.</li>
+       </ul>
+      </div>
+      <div data-author="SanecMan">
+       <h4 class="author">SanecMan:</h4>
+       <ul class="changelog">
+        <li class="balance">Удалён спавн лишнего провода при разборке VR pod.</li>
+       </ul>
+      </div>
      </div>
     </div>
     <div class="row" data-date="02.12.2018">