Fixed aliens spitting corrosive acid on objects that make no sense (singularities, shield walls, etc). Their corrosive acid should be reworked in the future, along with aliens in general.

Fixed the Syndie hull door computer so they cannot use it if the shuttle is not near SS13. Should still be operable by PDA regardless. Probably a good idea to change that computer entirely in the future.
Ripley files left unchecked since they don't compile.
Fixed an improper overlay pipe on the map, near Xenobiology.
Some WIP icon updates.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@682 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2010-12-21 07:18:32 +00:00
parent 8ae972e798
commit 31ef5c57f0
4 changed files with 10 additions and 3 deletions

View File

@@ -402,6 +402,7 @@ Pod/Blast Doors computer
if (!( src.connected )) if (!( src.connected ))
viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!" viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!"
return return
for(var/obj/machinery/door/poddoor/M in machines) for(var/obj/machinery/door/poddoor/M in machines)
if (M.id == src.id) if (M.id == src.id)
spawn( 0 ) spawn( 0 )
@@ -562,6 +563,10 @@ Pod/Blast Doors computer
src.time = min(max(round(src.time), 0), 120) src.time = min(max(round(src.time), 0), 120)
else else
if (href_list["door"]) 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) for(var/obj/machinery/door/poddoor/M in machines)
if (M.id == src.id) if (M.id == src.id)
if (M.density) if (M.density)

View File

@@ -294,9 +294,8 @@ Also perhaps only queens can do that?
set category = "Alien" set category = "Alien"
if(src.stat) if(src.stat)
src << "You must be concious to do this" src << "You must be concious to do this."
return return
if(!istype(O, /obj)) if(!istype(O, /obj))
return return
/*if(range(O, src) > 1) /*if(range(O, src) > 1)
@@ -304,6 +303,9 @@ Also perhaps only queens can do that?
return*/ return*/
if(src.toxloss < 200) if(src.toxloss < 200)
src << "You don't have enough plasma." 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 else
src.toxloss -= 200 src.toxloss -= 200
var/obj/alien/acid/A = new(O.loc) var/obj/alien/acid/A = new(O.loc)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 58 KiB

View File

@@ -3327,7 +3327,7 @@
"blY" = (/obj/disposalpipe/junction,/turf/simulated/wall/r_wall,/area/quartermaster/qm) "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) "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) "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) "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) "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) "bme" = (/obj/securearea,/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/turf/simulated/wall/r_wall,/area/toxins/xenobiology)