diff --git a/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm b/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm index 3646fad165a..26a291b2f88 100644 --- a/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm +++ b/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm @@ -41,6 +41,7 @@ /area/poi_d/Mountain) "hZ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/poi_d/Mountain) "is" = ( @@ -89,6 +90,7 @@ id_tag = "bunkerD_internal"; locked = 1 }, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/poi_d/Mountain) "pq" = ( @@ -155,11 +157,14 @@ /turf/simulated/floor/tiled, /area/poi_d/Mountain) "zZ" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ +/obj/machinery/access_button{ frequency = 804; - id_tag = "bunkerD" + master_tag = "bunkerD"; + pixel_y = 25 + }, +/turf/simulated/wall{ + can_open = 1 }, -/turf/simulated/wall, /area/poi_d/Mountain) "Ac" = ( /obj/machinery/door/airlock/freezer, @@ -206,12 +211,6 @@ pixel_x = 24; pixel_y = -2 }, -/obj/machinery/airlock_sensor{ - frequency = 804; - id_tag = "bunkerD_sensor"; - pixel_x = 24; - pixel_y = 6 - }, /mob/living/simple_mob/mechanical/viscerator/mercenary, /turf/simulated/floor/tiled, /area/poi_d/Mountain) @@ -321,6 +320,14 @@ }, /turf/simulated/floor/tiled, /area/poi_d/Mountain) +"TG" = ( +/obj/machinery/access_button{ + frequency = 804; + master_tag = "bunkerD"; + pixel_y = 25 + }, +/turf/simulated/floor/tiled, +/area/poi_d/Mountain) "TI" = ( /obj/structure/table/reinforced, /obj/item/gun/projectile/automatic/tommygun, @@ -346,6 +353,14 @@ frequency = 1379; id_tag = "rnd_s_airlock_pump" }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/airlock_sensor{ + frequency = 804; + id_tag = "bunkerD_sensor"; + pixel_x = 24; + pixel_y = 6 + }, /turf/simulated/floor/tiled, /area/poi_d/Mountain) "Wd" = ( @@ -385,6 +400,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/poi_d/Mountain) "Ys" = ( @@ -404,6 +420,7 @@ id_tag = "bunkerD_external"; locked = 1 }, +/obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled, /area/poi_d/Mountain) @@ -789,8 +806,8 @@ DS mn da da +KB zZ -PI HS HS Nd @@ -821,7 +838,7 @@ KB Zm Zm Nd -uD +TG uD is uD diff --git a/code/game/turfs/unsimulated/planetary.dm b/code/game/turfs/unsimulated/planetary.dm index 6db00c50fbc..88e4399532e 100644 --- a/code/game/turfs/unsimulated/planetary.dm +++ b/code/game/turfs/unsimulated/planetary.dm @@ -71,4 +71,4 @@ name = "facility wall" desc = "An eight-meter tall carbyne wall. For when the wildlife on your planet is mostly militant megacorps." alpha = 0xFF - TRIUMPH_SET_ATMOS \ No newline at end of file + TRIUMPH_SET_ATMOS diff --git a/code/modules/maps/misc_maps/planets/weather/class_d_weather_holder.dm b/code/modules/maps/misc_maps/planets/weather/class_d_weather_holder.dm index 26b500f344d..53bc68dd24f 100644 --- a/code/modules/maps/misc_maps/planets/weather/class_d_weather_holder.dm +++ b/code/modules/maps/misc_maps/planets/weather/class_d_weather_holder.dm @@ -1,4 +1,4 @@ -///Currently has to be in /map/tether as tether_class_d_weather_holder. Annoyingly has to be there to be loaded properly, will see if I can find a better way of doing this later +///Currently a copy is in /map/tether as tether_class_d_weather_holder. Annoyingly has to be there to be loaded properly, will see if I can find a better way of doing this later /*var/datum/planet/class_d/planet_class_d = null @@ -178,4 +178,4 @@ if(T.outdoors) SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) -*/ \ No newline at end of file +*/ diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm index 50b724fe0e7..8eb441949af 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm @@ -168,4 +168,4 @@ desc = "A blood-red hardsuit featuring some fairly illegal technology. Seems to be worn down and damaged but moving with surprising speed!" movement_cooldown = 2 //You can try running base_attack_cooldown = 3 //You will just die tired - melee_miss_chance = 25 //Not very coordinated though \ No newline at end of file + melee_miss_chance = 25 //Not very coordinated though diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/ripley.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/ripley.dm index 9292d58e154..1fa8f0c5b59 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/ripley.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/ripley.dm @@ -111,4 +111,5 @@ maxHealth = 170 //Less Health has_repair_droid = TRUE //But has repair drone pilot_type = /mob/living/simple_mob/humanoid/possessed/merc/feral //Possessed rig suit piloting a mech. Tremble in fear - movement_shake_radius = 5 //Actually tremble \ No newline at end of file + movement_shake_radius = 5 //Actually tremble + diff --git a/maps/tether/tether_class_d_weather_holder.dm b/maps/tether/tether_class_d_weather_holder.dm index 374f3eb659b..04c2c4951b3 100644 --- a/maps/tether/tether_class_d_weather_holder.dm +++ b/maps/tether/tether_class_d_weather_holder.dm @@ -178,4 +178,4 @@ var/datum/planet/class_d/planet_class_d = null if(!istype(T)) return if(T.outdoors) - SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) \ No newline at end of file + SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high))