diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 01fdc2ebd03..593581903f9 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -402,6 +402,7 @@ Pod/Blast Doors computer if (!( src.connected )) viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!" return + for(var/obj/machinery/door/poddoor/M in machines) if (M.id == src.id) spawn( 0 ) @@ -562,6 +563,10 @@ Pod/Blast Doors computer src.time = min(max(round(src.time), 0), 120) else if (href_list["door"]) + if(istype(src, /obj/machinery/computer/pod/old/syndicate))//Added here so Nuke ops don't go running naked into space before moving the shuttle. + if(syndicate_station_at_station == 0) + usr << "\red You need to launch the Syndicate Shuttle via the computer terminal at the head of the ship before departing." + return for(var/obj/machinery/door/poddoor/M in machines) if (M.id == src.id) if (M.density) diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index c4746bd9361..710ba852cf2 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -294,9 +294,8 @@ Also perhaps only queens can do that? set category = "Alien" if(src.stat) - src << "You must be concious to do this" + src << "You must be concious to do this." return - if(!istype(O, /obj)) return /*if(range(O, src) > 1) @@ -304,6 +303,9 @@ Also perhaps only queens can do that? return*/ if(src.toxloss < 200) src << "You don't have enough plasma." + return + if(istype(O, /obj/hud)||istype(O, /obj/machinery/shield)||istype(O, /obj/machinery/shieldwall)||istype(O, /obj/machinery/the_singularity)||istype(O, /obj/portal)||istype(O, /obj/rune)||istype(O, /obj/marker)||istype(O, /obj/bhole)||istype(O, /obj/livestock)||istype(O, /obj/creature)||istype(O, /obj/alien)||istype(O, /obj/machinery/containment_field)) + src << "Can't destroy that object." //So you're not destroying black holes while you sizzle acid, dawg /N else src.toxloss -= 200 var/obj/alien/acid/A = new(O.loc) diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 97b33e60b0c..f4843fa86ee 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/maps/tgstation.2.0.0.dmm b/maps/tgstation.2.0.0.dmm index cfb7aa1ab6d..db47533e433 100644 --- a/maps/tgstation.2.0.0.dmm +++ b/maps/tgstation.2.0.0.dmm @@ -3327,7 +3327,7 @@ "blY" = (/obj/disposalpipe/junction,/turf/simulated/wall/r_wall,/area/quartermaster/qm) "blZ" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8},/turf/simulated/wall/r_wall,/area/quartermaster/qm) "bma" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/turf/simulated/wall,/area/maintenance/apmaint) -"bmb" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/turf/simulated/floor/plating,/area/maintenance/apmaint) +"bmb" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/apmaint) "bmc" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/turf/simulated/wall/r_wall,/area/toxins/xenobiology) "bmd" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/door/airlock/medical{frequency = 1450; icon_state = "door_locked"; id_tag = "xeno_access_exterior"; locked = 1; name = "Xenobiology Access"; req_access_txt = "7"},/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "bme" = (/obj/securearea,/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/turf/simulated/wall/r_wall,/area/toxins/xenobiology)