cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes /obj/machinery/microwave (#14718)

Browse Source
This commit is contained in:
AffectedArc07
2020-10-24 21:27:33 -04:00
committed by GitHub
parent 3b9158a7f8
commit 3f75b836b0
20 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
+9 -9
View File
@@ -1829,7 +1829,7 @@
/area/security/permabrig)
"adC" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -7485,7 +7485,7 @@
/area/security/main)
"amU" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -8750,7 +8750,7 @@
/area/security/warden)
"apq" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -16798,7 +16798,7 @@
})
"aDz" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -45830,7 +45830,7 @@
},
/area/engine/break_room)
"bAs" = (
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_y = 4
},
/obj/machinery/camera{
@@ -50995,7 +50995,7 @@
name = "\improper Command Hallway"
})
"bJl" = (
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_y = 4
},
/obj/structure/table/wood,
@@ -71117,7 +71117,7 @@
},
/area/medical/reception)
"crX" = (
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -82047,7 +82047,7 @@
},
/area/medical/medbreak)
"cKk" = (
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -85941,7 +85941,7 @@
pixel_x = 29
},
/obj/structure/table/glass,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+1 -1
View File
@@ -182,7 +182,7 @@
/area/ruin/powered/beach)
"aI" = (
/obj/structure/table,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/wood,
/area/ruin/powered/beach)
"aJ" = (
_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
+1 -1
View File
@@ -337,7 +337,7 @@
/area/ruin/powered/snow_biodome)
"JZ" = (
/obj/structure/table,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/pod/dark,
/area/ruin/powered/snow_biodome)
"KS" = (
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+1 -1
View File
@@ -5766,7 +5766,7 @@
/area/ruin/unpowered/syndicate_lava_base/bar)
"mx" = (
/obj/structure/table/wood,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/wood,
/area/ruin/unpowered/syndicate_lava_base/bar)
"my" = (
_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
+1 -1
View File
@@ -622,7 +622,7 @@
/area/ruin/unpowered)
"br" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/obj/structure/cable{
d1 = 4;
d2 = 8;
_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+1 -1
View File
@@ -648,7 +648,7 @@
/area/ruin/unpowered)
"bA" = (
/obj/structure/table,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/plasteel{
tag = "icon-bar";
icon_state = "bar"
_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
+1 -1
View File
@@ -189,7 +189,7 @@
"aG" = (
/obj/machinery/light/small,
/obj/structure/table,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/wood,
/area/ruin/powered{
name = "Space Bar"
_maps/map_files/RandomZLevels/academy.dmm
+1 -1
View File
@@ -1850,7 +1850,7 @@
/area/awaymission/academy/classrooms)
"fl" = (
/obj/structure/table,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
_maps/map_files/RandomZLevels/blackmarketpackers.dmm
+1 -1
View File
@@ -962,7 +962,7 @@
/area/awaymission/BMPship/Midship)
"cQ" = (
/obj/structure/table,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/plasteel{
tag = "icon-barber";
icon_state = "barber"
_maps/map_files/RandomZLevels/centcomAway.dmm
+2 -2
View File
@@ -299,7 +299,7 @@
/area/awaymission/centcomAway/cafe)
"aO" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -1785,7 +1785,7 @@
/area/awaymission/centcomAway/hangar)
"ey" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
_maps/map_files/RandomZLevels/moonoutpost19.dmm
+3 -3
View File
@@ -916,7 +916,7 @@
})
"bo" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -6360,7 +6360,7 @@
})
"iW" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -6371,7 +6371,7 @@
})
"iX" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
_maps/map_files/RandomZLevels/spacebattle.dmm
+1 -1
View File
@@ -920,7 +920,7 @@
/area/awaymission/spacebattle/cruiser)
"cF" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria";
dir = 2
_maps/map_files/RandomZLevels/spacehotel.dmm
+1 -1
View File
@@ -3298,7 +3298,7 @@
/area/awaymission/spacehotel/kitchen)
"hh" = (
/obj/structure/table,
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/unsimulated/floor{
icon_state = "cafeteria"
},
_maps/map_files/RandomZLevels/stationCollision.dmm
+1 -1
View File
@@ -3199,7 +3199,7 @@
},
/area/awaymission/arrivalblock)
"ie" = (
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -2;
pixel_y = 7
},
_maps/map_files/RandomZLevels/terrorspiders.dmm
+2 -2
View File
@@ -2556,7 +2556,7 @@
/area/awaymission/UO71/centralhall)
"gl" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -2829,7 +2829,7 @@
network = list("UO71")
},
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
+2 -2
View File
@@ -4095,7 +4095,7 @@
})
"gQ" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
@@ -4457,7 +4457,7 @@
network = list("UO45")
},
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_x = -3;
pixel_y = 6
},
_maps/map_files/RandomZLevels/wildwest.dmm
+2 -2
View File
@@ -564,7 +564,7 @@
},
/area/awaymission/wwmines)
"bR" = (
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/plasteel{
tag = "icon-cafeteria (NORTHEAST)";
icon_state = "cafeteria";
@@ -955,7 +955,7 @@
},
/area/awaymission/wwgov)
"cQ" = (
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/obj/machinery/light/small{
tag = "icon-bulb1 (NORTH)";
icon_state = "bulb1";
_maps/map_files/generic/Lavaland.dmm
+1 -1
View File
@@ -2495,7 +2495,7 @@
/area/mine/living_quarters)
"fD" = (
/obj/structure/table,
/obj/machinery/microwave{
/obj/machinery/kitchen_machine/microwave{
pixel_y = 6
},
/obj/effect/turf_decal/tile/bar{
_maps/map_files/templates/shelter_2.dmm
+1 -1
View File
@@ -60,7 +60,7 @@
/obj/structure/window/reinforced/survival_pod{
dir = 1
},
/obj/machinery/microwave,
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/carpet/black,
/area/survivalpod)
"l" = (
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
-12
View File
@@ -42,15 +42,3 @@
for(var/obj/item/stock_parts/micro_laser/M in component_parts)
E += M.rating
efficiency = E
// The following code is present as temporary assurance for compatibility and to avoid merge conflicts for the TG mining port
// Please delete this portion once all maps are updated to use the new object path: /obj/machinery/kitchen_machine/microwave
/obj/machinery/microwave
name = "Microwave spawner"
icon = 'icons/obj/kitchen.dmi'
icon_state = "mw"
/obj/machinery/microwave/New()
new /obj/machinery/kitchen_machine/microwave(get_turf(src))
qdel(src)