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

Merge pull request #24497 from bgobandit/thisrevivestacticalchairs

Browse Source 
Upgrades the chairs on the syndie shuttle: now with 100% fewer merge conflicts
This commit is contained in:
oranges
2017-03-01 09:08:53 +13:00
committed by GitHub
parent d062a5f71f 662049338b
commit 301cc91669
3 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Deltastation/DeltaStation2.dmm
+15 -7
View File
@@ -2034,7 +2034,8 @@
/area/shuttle/syndicate)
"adU" = (
/obj/structure/chair/office/dark{
dir = 8
dir = 8;
name = "tactical swivel chair"
},
/turf/open/floor/plasteel/black,
/area/shuttle/syndicate)
@@ -2043,7 +2044,8 @@
/area/shuttle/syndicate)
"adW" = (
/obj/structure/chair/office/dark{
dir = 1
dir = 1;
name = "tactical swivel chair"
},
/obj/machinery/button/door{
id = "syndieshutters";
@@ -2056,7 +2058,8 @@
/area/shuttle/syndicate)
"adX" = (
/obj/structure/chair/office/dark{
dir = 4
dir = 4;
name = "tactical swivel chair"
},
/turf/open/floor/plasteel/black,
/area/shuttle/syndicate)
@@ -2535,7 +2538,8 @@
/area/mining_construction)
"aeT" = (
/obj/structure/chair{
dir = 4
dir = 4;
name = "tactical chair"
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -2543,7 +2547,8 @@
/area/shuttle/syndicate)
"aeU" = (
/obj/structure/chair{
dir = 8
dir = 8;
name = "tactical chair"
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -3058,7 +3063,9 @@
/turf/open/floor/plasteel/podhatch,
/area/shuttle/syndicate)
"agf" = (
/obj/structure/chair,
/obj/structure/chair{
name = "tactical chair"
},
/turf/open/floor/plasteel/podhatch{
tag = "icon-podhatch (SOUTHEAST)";
icon_state = "podhatch";
@@ -3706,7 +3713,8 @@
/area/shuttle/syndicate)
"ahq" = (
/obj/structure/chair{
dir = 1
dir = 1;
name = "tactical chair"
},
/turf/open/floor/plasteel/vault{
dir = 8
_maps/map_files/MetaStation/MetaStation.dmm
+14 -3
View File
@@ -54967,8 +54967,10 @@
})
"bPB" = (
/obj/structure/chair/comfy/beige{
desc = "It looks comfy and extra tactical.\n<span class='notice'>Alt-click to rotate it clockwise.</span>";
dir = 1;
icon_state = "comfychair"
icon_state = "comfychair";
name = "tactical armchair"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate)
@@ -89151,7 +89153,8 @@
/area/crew_quarters/bar)
"cTS" = (
/obj/structure/chair{
dir = 8
dir = 8;
name = "tactical chair"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate)
@@ -95787,6 +95790,14 @@
},
/turf/open/space,
/area/space)
"dhm" = (
/obj/structure/chair/stool{
desc = "Apply butt, tactically.";
name = "tactical stool";
pixel_y = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate)
(1,1,1) = {"
aaa
@@ -101490,7 +101501,7 @@ aaa
aaa
aae
bRb
cSH
dhm
bRb
bRb
bRb
_maps/map_files/TgStation/tgstation.2.1.3.dmm
+14 -3
View File
@@ -7518,8 +7518,10 @@
/area/security/processing)
"apT" = (
/obj/structure/chair/comfy/beige{
desc = "It looks comfy and extra tactical.\n<span class='notice'>Alt-click to rotate it clockwise.</span>";
dir = 1;
icon_state = "comfychair"
icon_state = "comfychair";
name = "tactical armchair"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate)
@@ -53551,7 +53553,8 @@
/area/security/warden)
"cmm" = (
/obj/structure/chair{
dir = 8
dir = 8;
name = "tactical chair"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate)
@@ -63342,6 +63345,14 @@
"cHB" = (
/turf/closed/wall/r_wall,
/area/space)
"cHC" = (
/obj/structure/chair/stool{
desc = "Apply butt, tactically.";
name = "tactical stool";
pixel_y = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate)
(1,1,1) = {"
aaa
@@ -73419,7 +73430,7 @@ aaa
aaa
aac
aTp
cnh
cHC
aTp
aTp
aTp