cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
This commit is contained in:
Neerti
2015-08-23 01:30:46 -04:00
parent b61b6001a5 222049dd3c
commit 00fa623c9d
792 changed files with 19715 additions and 17049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/machinery/doors/airlock.dm
View File

@@ -48,6 +48,11 @@
return
..()
/obj/machinery/door/airlock/get_material()
if(mineral)
return get_material_by_name(mineral)
return get_material_by_name(DEFAULT_WALL_MATERIAL)
/obj/machinery/door/airlock/command
name = "Airlock"
icon = 'icons/obj/doors/Doorcom.dmi'
@@ -684,7 +689,7 @@ About the new airlock wires panel:
return ..()
/obj/machinery/door/airlock/Topic(href, href_list, var/nowindow = 0)
/obj/machinery/door/airlock/Topic(href, href_list)
if(..())
return 1
@@ -1032,6 +1037,9 @@ About the new airlock wires panel:
name = "[istext(assembly.glass) ? "[assembly.glass] airlock" : assembly.base_name]"
//wires
var/turf/T = get_turf(newloc)
if(T && (T.z in config.admin_levels))
secured_wires = 1
if (secured_wires)
wires = new/datum/wires/airlock/secure(src)
else