cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Solar SMES no longer start with power.

Browse Source 
Forgot to tell the containment fields to watch for the generator.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1996 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-08-09 07:39:31 +00:00
parent 6980602e24
commit 70dcb24e97
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/field_generator.dm
+1 -1
View File
@@ -286,7 +286,7 @@ field_generator power level display
if(ismob(A))
continue
if(!istype(A,/obj/machinery/field_generator))
if(istype(A,/obj/machinery/door)&&(A.density))
if((istype(A,/obj/machinery/door)||istype(A,/obj/machinery/the_singularitygen))&&(A.density))
return 0
steps += 1
G = locate(/obj/machinery/field_generator) in T
maps/tgstation.2.0.8.dmm
+5 -5
View File
@@ -1279,7 +1279,7 @@
"ayE" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
"ayF" = (/obj/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "Port Auxiliary Solar APC"; pixel_x = -25; pixel_y = 3},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
"ayG" = (/obj/cable{icon_state = "0-4"; d2 = 4},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
"ayH" = (/obj/machinery/camera{c_tag = "Port Auxiliary Solars"; dir = 1},/obj/machinery/power/smes,/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
"ayH" = (/obj/machinery/camera{c_tag = "Port Auxiliary Solars"; dir = 1},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes{charge = 0},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
"ayI" = (/turf/simulated/wall/r_wall,/area/storage/primary)
"ayJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/device/multitool,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/storage/tech)
"ayK" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/secure_data{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/security{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plating,/area/storage/tech)
@@ -1449,7 +1449,7 @@
"aBS" = (/obj/grille,/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 4},/obj/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"aBT" = (/obj/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "Starboard Auxiliary Solar APC"; pixel_x = -25; pixel_y = 3},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
"aBU" = (/obj/cable{icon_state = "0-4"; d2 = 4},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
"aBV" = (/obj/machinery/camera{c_tag = "Starboard Auxiliary Solars"; dir = 1},/obj/machinery/power/smes,/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
"aBV" = (/obj/machinery/camera{c_tag = "Starboard Auxiliary Solars"; dir = 1},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes{charge = 0},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
"aBW" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/machinery/light/small{dir = 8},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"aBX" = (/turf/simulated/wall,/area/chapel/office)
"aBY" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/chapel/office)
@@ -3879,7 +3879,7 @@
"bwE" = (/obj/table,/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
"bwF" = (/obj/machinery/vending/snack{pixel_x = 4},/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor{icon_state = "dark"},/area/medical/surgery)
"bwG" = (/obj/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/wall/r_wall,/area/maintenance/starboardsolar)
"bwH" = (/obj/machinery/power/smes,/obj/cable,/turf/simulated/floor/plating,/area/maintenance/starboardsolar)
"bwH" = (/obj/cable,/obj/machinery/power/smes{charge = 0},/turf/simulated/floor/plating,/area/maintenance/starboardsolar)
"bwI" = (/obj/machinery/power/terminal{dir = 8},/obj/cable,/turf/simulated/floor/plating,/area/maintenance/starboardsolar)
"bwJ" = (/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating/airless,/area/solar/starboard)
"bwK" = (/obj/machinery/atmospherics/pipe/simple{dir = 5},/obj/machinery/conveyor{dir = 1; id = "miningToQM"},/turf/simulated/floor/plating,/area/maintenance/apmaint)
@@ -5238,7 +5238,7 @@
"bWL" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/maintenance/portsolar)
"bWM" = (/turf/simulated/floor/plating,/area/maintenance/portsolar)
"bWN" = (/obj/machinery/power/terminal{dir = 4},/obj/cable{icon_state = "0-2"; d2 = 2},/obj/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 32},/turf/simulated/floor/plating,/area/maintenance/portsolar)
"bWO" = (/obj/machinery/power/smes,/obj/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/maintenance/portsolar)
"bWO" = (/obj/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/smes{charge = 0},/turf/simulated/floor/plating,/area/maintenance/portsolar)
"bWP" = (/obj/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/wall/r_wall,/area/maintenance/portsolar)
"bWQ" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/camera{c_tag = "Aft Lower Maintenance"; dir = 2},/turf/simulated/floor/plating,/area/maintenance/aft)
"bWR" = (/obj/machinery/atmospherics/pipe/simple,/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/aft)
@@ -6889,7 +6889,7 @@
"cCy" = (/turf/unsimulated/floor{dir = 1; icon_state = "chapel"},/area/wizard_station)
"cCz" = (/turf/unsimulated/floor{dir = 4; icon_state = "chapel"},/area/wizard_station)
"cCA" = (/obj/item/weapon/spacecash,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cCB" = (/mob/living/carbon/metroid{desc = "A tamed other thing. Very smart looking."; icon = 'icons/obj/otherthing.dmi'; icon_state = "otherthing"; name = "Tamed Otherthing"; toxloss = 0; voice_message = "gurgles"; voice_name = "otherthing"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
"cCB" = (/mob/living/carbon/metroid{desc = "A tamed other thing. Very smart looking."; icon = 'otherthing.dmi'; icon_state = "otherthing"; name = "Tamed Otherthing"; toxloss = 0; voice_message = "gurgles"; voice_name = "otherthing"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
"cCC" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/unsimulated/floor,/area/wizard_station)
"cCD" = (/obj/stool,/turf/unsimulated/floor{dir = 2; icon_state = "carpetside"},/area/wizard_station)
"cCE" = (/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station)