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

TGUI recompile, fixes map conflicts

Browse Source
This commit is contained in:
deathride58
2018-01-11 00:05:34 -05:00
parent 1f88c0c660
commit 9a33ac7177
4 changed files with 439 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+388 -390
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/PubbyStation/PubbyStation.dmm
+30 -32
View File
@@ -15381,13 +15381,13 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
/obj/structure/cable,
/obj/machinery/power/apc{
areastring = "/area/quartermaster/warehouse";
dir = 4;
name = "Cargo Warehouse APC";
areastring = "/area/quartermaster/warehouse";
pixel_x = 26
pixel_x = 24
},
/obj/structure/cable,
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
"aMw" = (
@@ -51386,7 +51386,6 @@
/turf/open/floor/plasteel/dark,
/area/library)
"cCX" = (
<<<<<<< HEAD
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
@@ -51400,7 +51399,7 @@
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/department/engine)
=======
"cDa" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -51409,7 +51408,7 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"cCY" = (
"cDb" = (
/obj/structure/disposalpipe/segment{
dir = 10
},
@@ -51418,7 +51417,7 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"cCZ" = (
"cDc" = (
/obj/structure/cable{
icon_state = "1-2"
},
@@ -51428,15 +51427,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"cDa" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDb" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDc" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDd" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
@@ -51470,7 +51460,15 @@
"cDn" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
>>>>>>> fcc3dae... Merge pull request #33436 from MrDoomBringer/DropItLikeItsHottest
"cDo" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDp" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDq" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
(1,1,1) = {"
aaa
@@ -90894,12 +90892,12 @@ aEd
aIj
aJm
aKg
cDa
aMo
cDd
cDf
aMo
cDg
cDh
cDi
cDj
cDk
aLg
aTj
aUu
@@ -91927,8 +91925,8 @@ aMs
aNO
aPb
aQe
cDi
cDj
cDl
cDm
aTn
aUx
aVA
@@ -92185,7 +92183,7 @@ aNP
aPb
aNO
aNP
cDk
cDn
aTo
aSk
aTm
@@ -92442,7 +92440,7 @@ aNO
aPc
aQf
aRq
cDl
cDo
aTp
aSk
aTm
@@ -92699,7 +92697,7 @@ aNQ
aNO
aQg
aNP
cDm
cDp
aTq
aSk
aVB
@@ -92949,14 +92947,14 @@ aEd
aEd
aEd
aEd
cCX
cDb
cDc
cDa
cDe
cDf
cDh
coL
coL
coL
cDn
cDq
aTr
aUy
aPd
@@ -93206,7 +93204,7 @@ aGI
aHr
aEd
aJp
cCY
cDb
aLi
aMw
aEj
@@ -93463,7 +93461,7 @@ aGJ
aGJ
aDl
aEk
cCZ
cDc
aLj
aMx
aEj
tgui/assets/tgui.js
+18 -18
View File
File diff suppressed because one or more lines are too long
tgui/package-lock.json
Generated
+3 -135
View File
@@ -2658,10 +2658,7 @@
"expand-tilde": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
"requires": {
"homedir-polyfill": "1.0.1"
}
"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI="
},
"extend": {
"version": "3.0.1",
@@ -2983,7 +2980,6 @@
"fragment-cache": "0.2.1",
"kind-of": "6.0.2",
"nanomatch": "1.2.7",
"object.pick": "1.3.0",
"regex-not": "1.0.0",
"snapdragon": "0.8.1",
"to-regex": "3.0.1"
@@ -2991,18 +2987,6 @@
}
}
},
"fined": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz",
"integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
"requires": {
"expand-tilde": "2.0.2",
"is-plain-object": "2.0.4",
"object.defaults": "1.1.0",
"object.pick": "1.3.0",
"parse-filepath": "1.0.2"
}
},
"first-chunk-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
@@ -3074,10 +3058,7 @@
"fragment-cache": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
"requires": {
"map-cache": "0.2.2"
}
"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk="
},
"function-bind": {
"version": "1.1.0",
@@ -3214,10 +3195,8 @@
"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
"requires": {
"expand-tilde": "2.0.2",
"homedir-polyfill": "1.0.1",
"ini": "1.3.5",
"is-windows": "1.0.1",
"which": "1.3.0"
"is-windows": "1.0.1"
}
},
"globals": {
@@ -3646,14 +3625,6 @@
"user-home": "1.1.1"
}
},
"homedir-polyfill": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
"integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
"requires": {
"parse-passwd": "1.0.0"
}
},
"hosted-git-info": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
@@ -3772,15 +3743,6 @@
"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
},
"is-absolute": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
"requires": {
"is-relative": "1.0.0",
"is-windows": "1.0.1"
}
},
"is-absolute-url": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
@@ -3962,14 +3924,6 @@
"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
},
"is-relative": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
"requires": {
"is-unc-path": "1.0.0"
}
},
"is-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -3983,14 +3937,6 @@
"html-comment-regex": "1.1.1"
}
},
"is-unc-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
"requires": {
"unc-path-regex": "0.1.2"
}
},
"is-utf8": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -4011,11 +3957,6 @@
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
},
"isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
"isobject": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
@@ -4173,11 +4114,9 @@
"requires": {
"extend": "3.0.1",
"findup-sync": "2.0.0",
"fined": "1.1.0",
"flagged-respawn": "1.0.0",
"is-plain-object": "2.0.4",
"object.map": "1.0.1",
"rechoir": "0.6.2",
"resolve": "1.4.0"
}
},
@@ -4410,11 +4349,6 @@
"kind-of": "3.2.2"
}
},
"map-cache": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
},
"map-obj": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
@@ -4691,7 +4625,6 @@
"fragment-cache": "0.2.1",
"is-odd": "1.0.0",
"kind-of": "5.1.0",
"object.pick": "1.3.0",
"regex-not": "1.0.0",
"snapdragon": "0.8.1",
"to-regex": "3.0.1"
@@ -4909,21 +4842,6 @@
"is-extendable": "0.1.1"
}
},
"object.pick": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
"requires": {
"isobject": "3.0.1"
},
"dependencies": {
"isobject": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
}
}
},
"object.reduce": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
@@ -5021,16 +4939,6 @@
"pbkdf2": "3.0.13"
}
},
"parse-filepath": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
"integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
"requires": {
"is-absolute": "1.0.0",
"map-cache": "0.2.2",
"path-root": "0.1.1"
}
},
"parse-glob": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
@@ -5050,11 +4958,6 @@
"error-ex": "1.3.1"
}
},
"parse-passwd": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
},
"pascalcase": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -5090,19 +4993,6 @@
"resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
"integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I="
},
"path-root": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
"requires": {
"path-root-regex": "0.1.2"
}
},
"path-root-regex": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0="
},
"path-type": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
@@ -5730,14 +5620,6 @@
}
}
},
"rechoir": {
"version": "0.6.2",
"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
"requires": {
"resolve": "1.4.0"
}
},
"redent": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
@@ -6083,7 +5965,6 @@
"debug": "2.6.8",
"define-property": "0.2.5",
"extend-shallow": "2.0.1",
"map-cache": "0.2.2",
"source-map": "0.5.7",
"source-map-resolve": "0.5.1",
"use": "2.0.2"
@@ -7010,11 +6891,6 @@
"resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz",
"integrity": "sha1-iuVW4RAR9jwllnCKiDclnwGz1g4="
},
"unc-path-regex": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo="
},
"undertaker": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.0.tgz",
@@ -7460,14 +7336,6 @@
"resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
"integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE="
},
"which": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
"integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
"requires": {
"isexe": "2.0.0"
}
},
"window-size": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",