cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 03:59:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Makes Mass Drivers Great Again (#936)

Browse Source 
* Makes Mass Drivers Great Again (#53730)

green name wanted the old non tgui mass driver buttons replaced with the shiny new ones in pubby, so i added them to the rest of the maps
Third edit: there are no issues in Ba Sing Se

* Makes Mass Drivers Great Again

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
This commit is contained in:
SkyratBot
2020-09-23 13:55:36 +01:00
committed by GitHub
co-authored by Kylerace
parent 09aa6e6dec
commit 45056310a4
5 changed files with 73 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Deltastation/DeltaStation2.dmm
+9 -10
View File
@@ -6677,12 +6677,6 @@
pixel_y = 4;
req_access_txt = "12"
},
/obj/machinery/button/massdriver{
id = "trash";
name = "Trash Ejector Control";
pixel_x = -26;
pixel_y = -6
},
/obj/structure/chair/stool,
/obj/machinery/light/small{
dir = 8
@@ -6692,6 +6686,11 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "trash";
pixel_x = -24;
pixel_y = -7
},
/turf/open/floor/plasteel,
/area/maintenance/disposal)
"aqG" = (
@@ -97712,11 +97711,11 @@
req_access_txt = "8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/button/massdriver{
id = "toxinsdriver";
pixel_x = 24
},
/obj/effect/turf_decal/loading_area,
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "toxinsdriver";
pixel_x = 28
},
/turf/open/floor/plasteel,
/area/science/misc_lab)
"dKD" = (
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+8 -12
View File
@@ -14091,12 +14091,8 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"aFA" = (
/obj/machinery/computer/pod/old{
density = 0;
icon = 'icons/obj/airlock_machines.dmi';
icon_state = "airlock_control_standby";
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "chapelgun";
name = "Mass Driver Controller";
pixel_x = 24
},
/turf/open/floor/plasteel/dark,
@@ -26975,12 +26971,12 @@
pixel_y = 4;
req_access_txt = "12"
},
/obj/machinery/button/massdriver{
/obj/structure/chair/stool,
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "trash";
pixel_x = -26;
pixel_x = -24;
pixel_y = -6
},
/obj/structure/chair/stool,
/turf/open/floor/plating,
/area/maintenance/disposal)
"bkC" = (
@@ -36822,6 +36818,10 @@
req_access_txt = "8"
},
/obj/effect/turf_decal/loading_area,
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "toxinsdriver";
pixel_x = -24
},
/turf/open/floor/plasteel,
/area/science/mixing)
"bKi" = (
@@ -47856,10 +47856,6 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"cBA" = (
/obj/machinery/button/massdriver{
id = "toxinsdriver";
pixel_y = 24
},
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/stripes/corner{
dir = 4
_maps/map_files/MetaStation/MetaStation.dmm
+37 -38
View File
@@ -3714,7 +3714,7 @@
/area/maintenance/disposal)
"aik" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/disposal)
"ail" = (
@@ -4079,22 +4079,14 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"ajd" = (
/obj/machinery/button/door{
id = "Disposal Exit";
name = "Disposal Vent Control";
pixel_x = -25;
pixel_y = 4;
req_access_txt = "12"
},
/obj/machinery/button/massdriver{
id = "trash";
pixel_x = -26;
pixel_y = -6
},
/obj/structure/chair/stool,
/obj/machinery/light/small{
dir = 8
},
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "trash";
pixel_x = -24
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aje" = (
@@ -4657,6 +4649,13 @@
dir = 6
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/button/door{
id = "Disposal Exit";
name = "Disposal Vent Control";
pixel_x = -25;
pixel_y = 4;
req_access_txt = "12"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aki" = (
@@ -27076,10 +27075,6 @@
},
/turf/open/floor/plasteel,
/area/engine/break_room)
"blt" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/maintenance/disposal)
"blu" = (
/obj/structure/lattice,
/obj/structure/transit_tube/curved/flipped{
@@ -53367,22 +53362,18 @@
/area/science/mixing)
"cBK" = (
/obj/machinery/light/small,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "toxinsdriver";
pixel_x = 0;
pixel_y = -24
},
/turf/open/floor/plasteel,
/area/science/mixing)
"cBL" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/button/massdriver{
id = "toxinsdriver";
pixel_x = 24;
pixel_y = -24
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the test chamber.";
dir = 8;
@@ -58805,6 +58796,10 @@
/obj/effect/turf_decal/bot{
dir = 1
},
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
},
/turf/open/floor/plasteel{
dir = 1
},
@@ -59358,12 +59353,6 @@
/obj/item/reagent_containers/food/snacks/grown/harebell,
/obj/item/reagent_containers/food/snacks/grown/harebell,
/obj/item/reagent_containers/food/snacks/grown/harebell,
/obj/machinery/button/massdriver{
id = "chapelgun";
name = "Chapel Mass Driver";
pixel_x = -4;
pixel_y = -26
},
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -63373,10 +63362,6 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/obj/machinery/camera{
c_tag = "Chapel - Funeral Parlour";
dir = 8
@@ -63384,6 +63369,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "chapelgun";
pixel_x = 24
},
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"djm" = (
@@ -74105,6 +74094,16 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"qns" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 6
},
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
},
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"qoc" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -97130,7 +97129,7 @@ aaa
ahq
ahq
ahp
blt
ahp
ahp
amP
anV
@@ -100584,7 +100583,7 @@ cLa
cMI
cQa
cOP
cRj
qns
cRG
cMI
aaa
_maps/map_files/PubbyStation/PubbyStation.dmm
+12 -14
View File
@@ -31986,17 +31986,16 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"bFu" = (
/obj/machinery/button/massdriver{
dir = 4;
id = "toxinsdriver";
pixel_x = 28
},
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple{
dir = 4
},
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "toxinsdriver";
pixel_x = 24
},
/turf/open/floor/plasteel,
/area/science/mixing)
"bFx" = (
@@ -46026,9 +46025,9 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/button/massdriver{
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "chapelgun";
pixel_x = 28
pixel_x = 24
},
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
@@ -48123,15 +48122,9 @@
id = "Disposal Exit";
name = "Disposal Vent Control";
pixel_x = -25;
pixel_y = 4;
pixel_y = 6;
req_access_txt = "12"
},
/obj/machinery/button/massdriver{
id = "trash";
name = "Trash Ejector Control";
pixel_x = -26;
pixel_y = -6
},
/obj/structure/chair/stool,
/obj/machinery/light/small{
dir = 8
@@ -48141,6 +48134,11 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
/obj/machinery/computer/pod/old/mass_driver_controller{
id = "trash";
pixel_x = -24;
pixel_y = -5
},
/turf/open/floor/plasteel,
/area/maintenance/disposal)
"eUU" = (
code/game/machinery/computer/pod.dm
+7
View File
@@ -135,6 +135,13 @@
icon_screen = "library"
icon_keyboard = "no_keyboard"
/obj/machinery/computer/pod/old/mass_driver_controller
name = "\improper Mass Driver Controller"
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_control_standby"
icon_keyboard = "no_keyboard"
density = FALSE
/obj/machinery/computer/pod/old/syndicate
name = "\improper ProComp Executive IIc"
desc = "The Syndicate operate on a tight budget. Operates external airlocks."