Revert "Merge branch 'master' into eye-sprites"

This reverts commit b48f4b91e6, reversing
changes made to dc70d17a1e.
This commit is contained in:
Timothy Teakettle
2020-10-11 16:54:05 +01:00
parent b650fa1761
commit d3a042deaa
20 changed files with 93 additions and 161 deletions
+18 -24
View File
@@ -428,7 +428,7 @@
/area/awaymission/cabin)
"bm" = (
/obj/machinery/door/airlock/wood{
id_tag = "snowdorm5";
id_tag = "snowdinbutworse5";
name = "Cabin 5"
},
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
@@ -3318,7 +3318,7 @@
/area/awaymission/cabin)
"iV" = (
/obj/machinery/door/airlock/wood{
id_tag = "snowdorm1";
id_tag = "snowdinbutworse1";
name = "Cabin 1"
},
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
@@ -3326,7 +3326,7 @@
/area/awaymission/cabin)
"iW" = (
/obj/machinery/door/airlock/wood{
id_tag = "snowdorm2";
id_tag = "snowdinbutworse2";
name = "Cabin 2"
},
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
@@ -3334,7 +3334,7 @@
/area/awaymission/cabin)
"iX" = (
/obj/machinery/door/airlock/wood{
id_tag = "snowdorm3";
id_tag = "snowdinbutworse3";
name = "Cabin 3"
},
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
@@ -3342,7 +3342,7 @@
/area/awaymission/cabin)
"iY" = (
/obj/machinery/door/airlock/wood{
id_tag = "snowdorm4";
id_tag = "snowdinbutworse4";
name = "Cabin 4"
},
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
@@ -3419,37 +3419,31 @@
/area/awaymission/cabin)
"jg" = (
/obj/machinery/button/door{
id = "snowdorm2";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
specialfunctions = 4
id = "snowdinbutworse2";
name = "airlock button";
pixel_y = -27
},
/turf/open/floor/wood,
/area/awaymission/cabin)
"jh" = (
/obj/machinery/button/door{
id = "snowdorm1";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
specialfunctions = 4
id = "snowdinbutworse1";
name = "airlock button";
pixel_y = -27
},
/turf/open/floor/wood,
/area/awaymission/cabin)
"ji" = (
/obj/machinery/button/door{
id = "snowdorm3";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
specialfunctions = 4
id = "snowdinbutworse3";
name = "airlock button";
pixel_y = -27
},
/turf/open/floor/wood,
/area/awaymission/cabin)
"jj" = (
/obj/machinery/button/door{
id = "snowdorm4";
id = "snowdinbutworse4";
name = "airlock button";
pixel_y = -27
},
@@ -3457,7 +3451,7 @@
/area/awaymission/cabin)
"jk" = (
/obj/machinery/button/door{
id = "snowdorm5";
id = "snowdinbutworse5";
name = "airlock button";
pixel_y = -27
},
@@ -4030,8 +4024,8 @@
pixel_y = -2
},
/obj/item/clothing/head/christmashatg{
pixel_x = 3;
pixel_y = 12
pixel_y = 12;
pixel_x = 3
},
/turf/open/floor/plating/asteroid/snow,
/area/awaymission/cabin/caves)