shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes APC cell_type actually pick a cell (#2747)

Browse Source 
* Ports TG#30327

* Update apc.dm

* maybe delta can be fully copies over, yes?
This commit is contained in:
Poojawa
2017-09-13 19:57:21 -05:00
committed by GitHub
parent e1d2d3d36d
commit 8406baebbe
17 changed files with 161 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+5 -5
View File
@@ -67,7 +67,7 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"ao" = (
/obj/machinery/power/apc{
cell_type = 0;
start_charge = 0;
dir = 4;
name = "Cargo Bay APC";
pixel_x = 24
@@ -749,7 +749,7 @@
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"ca" = (
/obj/machinery/power/apc{
cell_type = 0;
start_charge = 0;
dir = 4;
name = "Power Storage APC";
pixel_x = 23;
@@ -845,7 +845,7 @@
/area/ruin/space/has_grav/derelictoutpost)
"ck" = (
/obj/machinery/power/apc{
cell_type = 0;
start_charge = 0;
dir = 2;
name = "Tradepost APC";
pixel_y = -24
@@ -2006,7 +2006,7 @@
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"el" = (
/obj/machinery/power/apc{
cell_type = 0;
start_charge = 0;
dir = 4;
name = "Cargo Storage APC";
pixel_x = 24
@@ -3907,4 +3907,4 @@ aa
aa
aa
aa
"}
"}
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+5 -9
View File
@@ -1096,8 +1096,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Hydroponics APC";
pixel_x = 24
@@ -1466,8 +1465,7 @@
/area/ruin/space/has_grav/deepstorage)
"cQ" = (
/obj/structure/cable/yellow,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Storage APC";
pixel_x = 24
@@ -2260,8 +2258,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Armory APC";
pixel_x = 24
@@ -3085,8 +3082,7 @@
"fE" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Dormory APC";
pixel_x = 24
@@ -6625,4 +6621,4 @@ aa
aa
aa
aa
"}
"}
_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
-1
View File
@@ -174,7 +174,6 @@
dir = 1
},
/obj/machinery/power/apc{
cell_type = 2500;
dir = 1;
name = "Worn-out APC";
pixel_x = 1;
_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
-1
View File
@@ -44,7 +44,6 @@
/area/tcommsat/chamber)
"ak" = (
/obj/machinery/power/apc{
cell_type = 2500;
dir = 1;
name = "Worn-out APC";
pixel_x = 1;
_maps/RandomRuins/SpaceRuins/onehalf.dmm
-2
View File
@@ -350,7 +350,6 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = 2500;
dir = 1;
name = "Mining Drone Bay APC";
pixel_y = 24
@@ -848,7 +847,6 @@
d2 = 4
},
/obj/machinery/power/apc{
cell_type = 2500;
dir = 1;
name = "Bridge APC";
pixel_y = 24
_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+14 -28
View File
@@ -655,8 +655,7 @@
name = "Hotel Guest Room 3"
})
"bN" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Guest Room APC";
pixel_y = -24
@@ -719,8 +718,7 @@
name = "Hotel Guest Room 4"
})
"bT" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Guest Room APC";
pixel_y = -24
@@ -783,8 +781,7 @@
name = "Hotel Guest Room 5"
})
"bZ" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Guest Room APC";
pixel_y = -24
@@ -847,8 +844,7 @@
name = "Hotel Guest Room 6"
})
"cf" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Guest Room APC";
pixel_y = -24
@@ -1379,8 +1375,7 @@
name = "Hotel Guest Room 2"
})
"dn" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Guest Room APC";
pixel_y = 25
@@ -1461,8 +1456,7 @@
name = "Hotel Guest Room 1"
})
"dv" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Guest Room APC";
pixel_y = 25
@@ -1874,8 +1868,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/hotel/workroom)
"eA" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Laundry APC";
pixel_y = -24
@@ -2080,8 +2073,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel)
"fh" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Kitchen APC";
pixel_y = -24
@@ -2874,8 +2866,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"hA" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Staff Room APC";
pixel_y = -24
@@ -3261,8 +3252,7 @@
},
/area/ruin/space/has_grav/hotel/power)
"iw" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Power Storage APC";
pixel_y = 25
@@ -3427,8 +3417,7 @@
},
/area/ruin/space/has_grav/hotel/power)
"iU" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Security APC";
pixel_y = -24
@@ -3500,8 +3489,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel/pool)
"iZ" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Pool APC";
pixel_y = -24
@@ -3559,8 +3547,7 @@
/obj/machinery/light{
dir = 8
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Dock APC";
pixel_y = -24
@@ -4824,8 +4811,7 @@
/turf/open/floor/plasteel/neutral,
/area/ruin/space/has_grav/hotel/custodial)
"mJ" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Custodial APC";
pixel_y = -24
_maps/RandomZLevels/moonoutpost19.dmm
+3 -6
View File
@@ -1973,8 +1973,7 @@
})
"cK" = (
/obj/structure/cable,
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 2;
locked = 1;
name = "Worn-out APC";
@@ -4917,8 +4916,7 @@
})
"gG" = (
/obj/structure/cable,
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 4;
locked = 0;
name = "Worn-out APC";
@@ -6969,8 +6967,7 @@
icon_state = "0-2";
d2 = 2
},
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 1;
locked = 0;
name = "Worn-out APC";
_maps/RandomZLevels/research.dmm
+7 -14
View File
@@ -371,9 +371,8 @@
icon_state = "0-2";
d2 = 2
},
/obj/machinery/power/apc{
/obj/machinery/power/apc/highcap/ten_k{
auto_name = 1;
cell_type = 9000;
dir = 4;
name = "Engineering APC";
pixel_x = 27;
@@ -660,8 +659,7 @@
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"cb" = (
/obj/machinery/power/apc{
cell_type = 12000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 4;
name = "Gateway APC";
pixel_x = 24
@@ -988,8 +986,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Genetics APC";
pixel_x = 24
@@ -1718,8 +1715,7 @@
/turf/open/floor/plasteel/whitepurple,
/area/awaymission/research/interior)
"fa" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Cryostatis APC";
pixel_x = 24
@@ -1889,8 +1885,7 @@
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/secure)
"fy" = (
/obj/machinery/power/apc{
cell_type = 12000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 4;
name = "Vault APC";
pixel_x = 24
@@ -3057,8 +3052,7 @@
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"iw" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Genetics APC";
pixel_x = 24
@@ -3655,8 +3649,7 @@
},
/area/awaymission/research/interior/medbay)
"kp" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Dorms APC";
pixel_x = 24
_maps/RandomZLevels/undergroundoutpost45.dmm
+6 -12
View File
@@ -3159,8 +3159,7 @@
dir = 1;
network = list("UO45")
},
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 2;
locked = 0;
name = "Hydroponics APC";
@@ -6240,8 +6239,7 @@
icon_state = "0-4";
d2 = 4
},
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 1;
locked = 0;
name = "UO45 Bar APC";
@@ -7619,8 +7617,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 2;
locked = 0;
name = "UO45 Research Division APC";
@@ -8313,8 +8310,7 @@
})
"mE" = (
/obj/structure/cable,
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 2;
locked = 0;
name = "UO45 Gateway APC";
@@ -11932,8 +11928,7 @@
icon_state = "0-4";
d2 = 4
},
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 8;
locked = 1;
name = "UO45 Engineering APC";
@@ -12695,8 +12690,7 @@
})
"sj" = (
/obj/structure/cable,
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 2;
locked = 0;
name = "UO45 Mining APC";
_maps/map_files/BoxStation/BoxStation.dmm
+10 -21
View File
@@ -851,8 +851,7 @@
/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
"acm" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
areastring = "/area/ai_monitored/security/armory";
name = "Armory APC";
@@ -20943,8 +20942,7 @@
},
/area/bridge)
"aWW" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Bridge APC";
areastring = "/area/bridge";
@@ -22745,7 +22743,6 @@
/area/quartermaster/storage)
"bbu" = (
/obj/machinery/power/apc{
cell_type = 2500;
dir = 1;
name = "Captain's Office APC";
areastring = "/area/crew_quarters/heads/captain";
@@ -23802,8 +23799,7 @@
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/ai_upload)
"bed" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Upload APC";
areastring = "/area/ai_monitored/turret_protected/ai_upload";
@@ -42341,8 +42337,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bSX" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Virology APC";
areastring = "/area/medical/virology";
@@ -43924,8 +43919,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Telecomms Server APC";
areastring = "/area/tcommsat/server";
@@ -46081,8 +46075,7 @@
/obj/structure/closet/secure_closet/engineering_chief{
req_access_txt = "0"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "CE Office APC";
areastring = "/area/crew_quarters/heads/chief";
@@ -49118,8 +49111,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cib" = (
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 1;
name = "Engineering APC";
areastring = "/area/engine/engineering";
@@ -49156,8 +49148,7 @@
dir = 1
},
/obj/structure/reagent_dispensers/watertank,
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 1;
name = "Engineering APC";
areastring = "/area/engine/engineering";
@@ -55811,8 +55802,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "AI Chamber APC";
areastring = "/area/ai_monitored/turret_protected/ai";
@@ -62503,7 +62493,6 @@
/area/quartermaster/sorting)
"cNL" = (
/obj/machinery/power/apc{
cell_type = 2500;
dir = 1;
name = "Central Maintenance APC";
areastring = "/area/maintenance/central";
@@ -129465,4 +129454,4 @@ aaa
aaa
aaa
aaa
"}
"}
_maps/map_files/Deltastation/DeltaStation2.dmm
+21 -41
View File
@@ -863,8 +863,7 @@
/area/maintenance/solars/starboard/fore)
"abM" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 2;
name = "Starboard Bow Solar APC";
areastring = "/area/maintenance/solars/starboard/fore";
@@ -15589,8 +15588,7 @@
/area/maintenance/solars/port/fore)
"aGh" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 2;
name = "Port Bow Solar APC";
areastring = "/area/maintenance/solars/port/fore";
@@ -24570,8 +24568,7 @@
/area/security/prison)
"aXv" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Prison Wing APC";
areastring = "/area/security/prison";
@@ -27406,8 +27403,7 @@
},
/area/engine/atmos)
"bdr" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Atmospherics APC";
areastring = "/area/engine/atmos";
@@ -37815,8 +37811,7 @@
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bwL" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Gravity Generator APC";
areastring = "/area/engine/gravity_generator";
@@ -38945,8 +38940,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Engineering Foyer APC";
areastring = "/area/engine/break_room";
@@ -43406,8 +43400,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Council Chambers APC";
areastring = "/area/bridge/meeting_room/council";
@@ -43982,8 +43975,7 @@
/turf/closed/wall,
/area/engine/transit_tube)
"bHy" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Transit Tube Access APC";
areastring = "/area/engine/transit_tube";
@@ -44496,8 +44488,7 @@
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
"bIq" = (
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Telecomms Monitoring APC";
areastring = "/area/tcommsat/computer";
@@ -44659,8 +44650,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Auxiliary Tool Storage APC";
areastring = "/area/storage/tools";
@@ -46594,8 +46584,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bMI" = (
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 2;
name = "Captain's Office APC";
areastring = "/area/crew_quarters/heads/captain";
@@ -54595,8 +54584,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Brig APC";
areastring = "/area/security/brig";
@@ -55181,8 +55169,7 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 2;
name = "Captain's Quarters APC";
areastring = "/area/crew_quarters/heads/captain/private";
@@ -58237,8 +58224,7 @@
"cig" = (
/obj/structure/table,
/obj/item/hand_tele,
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Teleporter APC";
areastring = "/area/teleporter";
@@ -63428,8 +63414,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Gateway APC";
areastring = "/area/gateway";
@@ -84197,8 +84182,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Mech Bay APC";
areastring = "/area/science/robotics/mechbay";
@@ -84331,8 +84315,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Cloning Lab APC";
areastring = "/area/medical/genetics/cloning";
@@ -92088,8 +92071,7 @@
/area/maintenance/starboard/aft)
"dxk" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 2;
name = "Starboard Quarter Solar APC";
areastring = "/area/maintenance/solars/starboard/aft";
@@ -104595,8 +104577,7 @@
/area/maintenance/solars/port/aft)
"dWj" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 2;
name = "Port Quarter Solar APC";
areastring = "/area/maintenance/solars/port/aft";
@@ -108844,8 +108825,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"egC" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Departure Lounge APC";
areastring = "/area/hallway/secondary/exit/departure_lounge";
@@ -178697,4 +178677,4 @@ aaa
aaa
aaa
aaa
"}
"}
_maps/map_files/MetaStation/MetaStation.dmm
+29 -66
View File
@@ -1461,7 +1461,6 @@
/area/security/execution/education)
"acZ" = (
/obj/machinery/power/apc{
cell_type = 2500;
dir = 1;
name = "Prisoner Education Chamber APC";
areastring = "/area/security/execution/education";
@@ -2554,8 +2553,7 @@
},
/area/security/prison)
"aeX" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Prison Wing APC";
areastring = "/area/security/prison";
@@ -3934,8 +3932,7 @@
},
/area/ai_monitored/security/armory)
"ahF" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Armory APC";
areastring = "/area/ai_monitored/security/armory";
@@ -6333,8 +6330,7 @@
d2 = 4;
icon_state = "1-4"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 8;
name = "Brig Control APC";
areastring = "/area/security/warden";
@@ -6499,7 +6495,6 @@
req_access_txt = "1"
},
/obj/machinery/power/apc{
cell_type = 2500;
dir = 4;
name = "Shooting Range APC";
areastring = "/area/security/range";
@@ -7000,8 +6995,7 @@
/turf/open/floor/plasteel,
/area/security/main)
"anC" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Security Office APC";
areastring = "/area/security/main";
@@ -12217,8 +12211,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 2;
name = "Brig APC";
areastring = "/area/security/brig";
@@ -17037,8 +17030,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Fore Primary Hallway APC";
areastring = "/area/hallway/primary/fore";
@@ -21223,8 +21215,7 @@
},
/area/hydroponics/garden)
"aOO" = (
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 8;
name = "Engine Room APC";
areastring = "/area/engine/engineering";
@@ -22133,8 +22124,7 @@
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/ai_upload)
"aQA" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Upload APC";
areastring = "/area/ai_monitored/turret_protected/ai_upload";
@@ -24313,7 +24303,6 @@
/area/security/courtroom)
"aUG" = (
/obj/machinery/power/apc{
cell_type = 2500;
dir = 2;
name = "Courtroom APC";
areastring = "/area/security/courtroom";
@@ -30962,7 +30951,6 @@
"bhf" = (
/obj/effect/landmark/blobstart,
/obj/machinery/power/apc{
cell_type = 2500;
dir = 4;
name = "Central Maintenance APC";
areastring = "/area/maintenance/central";
@@ -32675,7 +32663,6 @@
},
/obj/item/hand_labeler,
/obj/machinery/power/apc{
cell_type = 2500;
dir = 4;
name = "Delivery Office APC";
areastring = "/area/quartermaster/sorting";
@@ -34503,7 +34490,6 @@
"bnE" = (
/obj/machinery/power/apc{
aidisabled = 0;
cell_type = 2500;
dir = 4;
name = "MiniSat Antechamber APC";
areastring = "/area/ai_monitored/turret_protected/aisat_interior";
@@ -34914,8 +34900,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"bop" = (
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 8;
name = "Bridge APC";
areastring = "/area/bridge";
@@ -36423,7 +36408,6 @@
"brd" = (
/obj/structure/table,
/obj/machinery/power/apc{
cell_type = 2500;
dir = 8;
name = "Art Storage APC";
areastring = "/area/storage/art";
@@ -37019,9 +37003,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/power/apc{
/obj/machinery/power/apc/highcap/five_k{
aidisabled = 0;
cell_type = 5000;
dir = 2;
name = "MiniSat Foyer APC";
areastring = "/area/ai_monitored/turret_protected/aisat/foyer";
@@ -39570,8 +39553,7 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"bwR" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Bar APC";
areastring = "/area/crew_quarters/bar";
@@ -40107,8 +40089,7 @@
/area/crew_quarters/toilet/auxiliary)
"bxS" = (
/obj/item/cigbutt,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Port Maintenance APC";
areastring = "/area/maintenance/port";
@@ -40670,8 +40651,7 @@
},
/area/engine/atmos)
"byX" = (
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Atmospherics APC";
areastring = "/area/engine/atmos";
@@ -40909,8 +40889,7 @@
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
"bzt" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Telecomms Control Room APC";
areastring = "/area/tcommsat/computer";
@@ -42538,8 +42517,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Auxiliary Restrooms APC";
areastring = "/area/crew_quarters/toilet/auxiliary";
@@ -42794,8 +42772,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Command Hallway APC";
areastring = "/area/hallway/secondary/command";
@@ -45460,8 +45437,7 @@
},
/obj/item/storage/toolbox/emergency,
/obj/item/device/flashlight,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Gateway APC";
areastring = "/area/gateway";
@@ -47415,8 +47391,7 @@
/turf/open/floor/plasteel/black/telecomms/mainframe,
/area/tcommsat/server)
"bMs" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Telecomms Server Room APC";
areastring = "/area/tcommsat/server";
@@ -48631,8 +48606,7 @@
/turf/open/floor/wood,
/area/bridge/showroom/corporate)
"bOF" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Nanotrasen Corporate Showroom APC";
areastring = "/area/bridge/showroom/corporate";
@@ -50924,7 +50898,6 @@
/area/maintenance/starboard)
"bTc" = (
/obj/machinery/power/apc{
cell_type = 2500;
dir = 1;
name = "Starboard Maintenance APC";
areastring = "/area/maintenance/starboard";
@@ -51374,8 +51347,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Central Primary Hallway APC";
areastring = "/area/hallway/primary/central";
@@ -59120,8 +59092,7 @@
/turf/open/floor/plasteel/white,
/area/science/research)
"ciJ" = (
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Research Division APC";
areastring = "/area/science/research";
@@ -63763,8 +63734,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"crH" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Aft Hallway APC";
areastring = "/area/hallway/primary/aft";
@@ -64655,8 +64625,7 @@
/area/science/storage)
"cti" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Toxins Storage APC";
areastring = "/area/science/storage";
@@ -70046,8 +70015,7 @@
pixel_y = 2
},
/obj/item/storage/box/syringes,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Virology APC";
areastring = "/area/medical/virology";
@@ -73954,8 +73922,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cKy" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Departure Lounge APC";
areastring = "/area/hallway/secondary/exit/departure_lounge";
@@ -74944,8 +74911,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cMk" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Aft Maintenance APC";
areastring = "/area/maintenance/aft";
@@ -82764,8 +82730,7 @@
pixel_y = 3
},
/obj/item/reagent_containers/dropper,
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Xenobiology APC";
areastring = "/area/science/xenobiology";
@@ -87024,7 +86989,6 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = 2500;
dir = 4;
name = "Port Bow Maintenance APC";
areastring = "/area/maintenance/port/fore";
@@ -89548,8 +89512,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"dAd" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Starboard Quarter Maintenance APC";
areastring = "/area/maintenance/starboard/aft";
@@ -156338,4 +156301,4 @@ aaa
aaa
aaa
aaa
"}
"}
_maps/map_files/OmegaStation/OmegaStation.dmm
+12 -23
View File
@@ -2783,8 +2783,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Head of Personnel Quarter's APC";
areastring = "/area/crew_quarters/heads/hop";
@@ -2968,8 +2967,7 @@
/turf/open/floor/wood,
/area/security/detectives_office)
"afh" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Detective's Office APC";
areastring = "/area/security/detectives_office";
@@ -15182,8 +15180,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Central Starboard Maintenance APC";
areastring = "/area/maintenance/starboard/central";
@@ -16893,8 +16890,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Theatre Backstage APC";
areastring = "/area/crew_quarters/theatre";
@@ -19560,8 +19556,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Central Port Maintenance APC";
areastring = "/area/maintenance/port/central";
@@ -21269,8 +21264,7 @@
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aJl" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Gravity Generator APC";
areastring = "/area/engine/gravity_generator";
@@ -21563,8 +21557,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/bag/trash,
/obj/item/key/janitor,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Custodial Closet APC";
areastring = "/area/janitor";
@@ -26410,8 +26403,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Chemistry Lab APC";
areastring = "/area/medical/chemistry";
@@ -30345,8 +30337,7 @@
locked = 0;
pixel_x = -23
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Mech Bay APC";
areastring = "/area/science/robotics/mechbay";
@@ -33800,8 +33791,7 @@
/obj/structure/chair/wood/normal{
dir = 8
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Chapel APC";
areastring = "/area/chapel/main";
@@ -34639,8 +34629,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Arrivals APC";
areastring = "/area/hallway/secondary/entry";
@@ -106004,4 +105993,4 @@ aaa
aaa
aaa
aaa
"}
"}
_maps/map_files/PubbyStation/PubbyStation.dmm
+37 -57
View File
@@ -3325,8 +3325,7 @@
},
/area/security/prison)
"ahJ" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Prison Wing APC";
pixel_x = 1;
@@ -3804,8 +3803,7 @@
/obj/item/storage/box/firingpins,
/obj/item/storage/box/firingpins,
/obj/item/key/security,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Armory APC";
pixel_x = 24
@@ -5369,8 +5367,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 4;
name = "Brig APC";
pixel_x = 24
@@ -10810,7 +10807,6 @@
/area/crew_quarters/heads/captain)
"axS" = (
/obj/machinery/power/apc{
cell_type = 2500;
dir = 1;
name = "Captain's Office APC";
pixel_y = 24
@@ -11495,8 +11491,7 @@
/area/bridge)
"azo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 4;
name = "Bridge APC";
areastring = "/area/bridge";
@@ -12401,8 +12396,7 @@
},
/area/ai_monitored/turret_protected/ai_upload)
"aBx" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Upload APC";
areastring = "/area/ai_monitored/turret_protected/ai_upload";
@@ -12508,8 +12502,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"aBH" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 8;
name = "Central Hall APC";
pixel_x = -25
@@ -17679,8 +17672,7 @@
},
/area/hallway/secondary/exit/departure_lounge)
"aMO" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Departure Lounge APC";
areastring = "/area/hallway/secondary/exit/departure_lounge";
@@ -17841,8 +17833,7 @@
/area/crew_quarters/toilet/auxiliary)
"aNe" = (
/obj/structure/cable,
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 2;
name = "Auxiliary Restrooms APC";
pixel_y = -24
@@ -20209,7 +20200,6 @@
/area/quartermaster/storage)
"aSl" = (
/obj/machinery/power/apc{
cell_type = 2500;
dir = 4;
name = "Cargo Maintenance APC";
pixel_x = 24
@@ -33661,8 +33651,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Research Lobby APC";
pixel_y = 25
@@ -33769,8 +33758,7 @@
/turf/closed/wall,
/area/science/research)
"bvL" = (
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 1;
name = "Research Division APC";
pixel_y = 25
@@ -34020,8 +34008,7 @@
icon_state = "0-4";
d2 = 4
},
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 8;
name = "Xenobiology APC";
pixel_x = -25
@@ -39331,8 +39318,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bGU" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
name = "Virology APC";
pixel_y = 24
@@ -46639,8 +46625,7 @@
amount = 50
},
/obj/item/stack/cable_coil,
/obj/machinery/power/apc{
cell_type = 10000;
/obj/machinery/power/apc/highcap/ten_k{
dir = 8;
name = "Engine Room APC";
areastring = "/area/engine/engine_smes";
@@ -47190,8 +47175,7 @@
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bYG" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 8;
name = "Engineering Maintenance APC";
pixel_x = -25;
@@ -47588,8 +47572,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"bZc" = (
/obj/machinery/power/apc{
cell_type = 15000;
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 4;
name = "Engineering APC";
pixel_x = 28
@@ -53310,8 +53293,7 @@
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"cmI" = (
/obj/machinery/power/apc{
cell_type = 5000;
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
layer = 4;
name = "Telecomms Server APC";
@@ -72144,11 +72126,11 @@ aaa
aaa
aaa
aaa
bVq
cBF
bVq
cBG
bVq
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
@@ -72401,11 +72383,11 @@ cBT
cBU
aFS
aKs
cBC
aOc
aPj
aOc
cBH
aFS
aKs
aFS
aFS
aFS
aaa
aaa
aaa
@@ -72658,11 +72640,11 @@ aNZ
aNZ
aNZ
aMI
cBD
aOd
aPk
aQq
cBI
aNZ
aMI
aNZ
aVJ
aWD
aaa
aaa
aaa
@@ -72915,11 +72897,11 @@ aIx
aIx
aIx
aIx
cBE
aOc
aPl
aOc
cBJ
aIx
aIx
aIx
aVJ
aWD
aaa
aaa
aaa
@@ -97033,8 +97015,6 @@ aaa
aaa
aiS
aiS
aiS
aiT
aiT
aiT
aiS
@@ -123951,4 +123931,4 @@ aaa
aaa
aaa
aaa
"}
"}
code/modules/power/apc.dm
+11 -3
View File
@@ -55,7 +55,7 @@
var/areastring = null
var/obj/item/stock_parts/cell/cell
var/start_charge = 90 // initial cell charge %
var/cell_type = 2500 // 0=no cell, 1=regular, 2=high-cap (x5) <- old, now it's just 0=no cell, otherwise dictate cellcapacity by changing this value. 1 used to be 1000, 2 was 2500
var/cell_type = /obj/item/stock_parts/cell/upgraded //Base cell has 2500 capacity. Enter the path of a different cell you want to use. cell determines charge rates, max capacity, ect. These can also be changed with other APC vars, but isn't recommended to minimize the risk of accidental usage of dirty editted APCs
var/opened = 0 //0=closed, 1=opened, 2=cover removed
var/shorted = 0
var/lighting = 3
@@ -92,6 +92,15 @@
var/update_overlay = -1
var/icon_update_needed = FALSE
/obj/machinery/power/apc/highcap/five_k
cell_type = /obj/item/stock_parts/cell/upgraded/plus
/obj/machinery/power/apc/highcap/ten_k
cell_type = /obj/item/stock_parts/cell/high
/obj/machinery/power/apc/highcap/fifteen_k
cell_type = /obj/item/stock_parts/cell/high/plus
/obj/machinery/power/apc/get_cell()
return cell
@@ -177,8 +186,7 @@
has_electronics = 2 //installed and secured
// is starting with a power cell installed, create it and set its charge level
if(cell_type)
src.cell = new/obj/item/stock_parts/cell(src)
cell.maxcharge = cell_type // cell_type is maximum charge (old default was 1000 or 2500 (values one and two respectively)
cell = new cell_type
cell.charge = start_charge * cell.maxcharge / 100 // (convert percentage to actual value)
var/area/A = src.loc.loc
code/modules/power/apc.dm.rej
-13
View File
@@ -1,13 +0,0 @@
diff a/code/modules/power/apc.dm b/code/modules/power/apc.dm (rejected hunks)
@@ -867,9 +867,9 @@
occupier.loc = src.loc
occupier.death()
occupier.gib()
- for(var/obj/item/weapon/pinpointer/P in GLOB.pinpointer_list)
+ for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
P.switch_mode_to(TRACK_NUKE_DISK) //Pinpointers go back to tracking the nuke disk
- P.nuke_warning = FALSE
+ P.alert = FALSE
/obj/machinery/power/apc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
if(card.AI)
code/modules/power/cell.dm
+1 -1
View File
@@ -348,4 +348,4 @@
return
/obj/item/stock_parts/cell/beam_rifle/emp_act(severity)
charge = Clamp((charge-(10000/severity)),0,maxcharge)
charge = Clamp((charge-(10000/severity)),0,maxcharge)