Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Kush1Push1/mymaster
Browse files Browse the repository at this point in the history
  • Loading branch information
Kush1Push1 committed Feb 3, 2024
2 parents 145976c + 0b841c5 commit 638a099
Show file tree
Hide file tree
Showing 663 changed files with 147,006 additions and 67,269 deletions.
69 changes: 46 additions & 23 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,50 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
},
{
"type": "node-terminal",
"name": "Run Script: tgui:lint",
"request": "launch",
"command": "yarn run tgui:lint",
"cwd": "${workspaceFolder}\\tgui"
},
{
"type": "node-terminal",
"name": "Run Script: tgui:lint --fix",
"request": "launch",
"command": "yarn run tgui:lint --fix",
"cwd": "${workspaceFolder}\\tgui"
}
]
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
},
{
"type": "byond",
"request": "launch",
"name": "Launch DreamDaemon",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
},
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker (TESTING)",
"preLaunchTask": "Build All (TESTING)",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
},
{
"type": "byond",
"request": "launch",
"name": "Launch DreamDaemon (TESTING)",
"preLaunchTask": "Build All (TESTING)",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
},
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker (LOWMEMORYMODE)",
"preLaunchTask": "Build All (LOWMEMORYMODE)",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
},
{
"type": "byond",
"request": "launch",
"name": "Launch DreamDaemon (LOWMEMORYMODE)",
"preLaunchTask": "Build All (LOWMEMORYMODE)",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
}
]
}
50 changes: 50 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,56 @@
"dependsOn": "dm: reparse",
"label": "Build All"
},
{
"type": "process",
"command": "tools/build/build",
"windows": {
"command": ".\\tools\\build\\build.bat"
},
"options": {
"env": {
"DM_EXE": "${config:dreammaker.byondPath}"
}
},
"problemMatcher": [
"$dreammaker",
"$tsc",
"$eslint-stylish"
],
"group": {
"kind": "build"
},
"dependsOn": "dm: reparse",
"args": [
"-DTESTING"
],
"label": "Build All (TESTING)"
},
{
"type": "process",
"command": "tools/build/build",
"windows": {
"command": ".\\tools\\build\\build.bat"
},
"options": {
"env": {
"DM_EXE": "${config:dreammaker.byondPath}"
}
},
"problemMatcher": [
"$dreammaker",
"$tsc",
"$eslint-stylish"
],
"group": {
"kind": "build"
},
"dependsOn": "dm: reparse",
"args": [
"-DLOWMEMORYMODE"
],
"label": "Build All (LOWMEMORYMODE)"
},
{
"type": "dreammaker",
"dme": "tgstation.dme",
Expand Down
43 changes: 24 additions & 19 deletions _maps/RandomRuins/SpaceRuins/BlueMoon/forgotten_ship.dmm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/template_noop,
/turf/open/space/basic,
/area/template_noop)
"ac" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
Expand All @@ -12,7 +12,7 @@
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/template_noop,
/turf/open/space/basic,
/area/ruin/space/has_grav/inteq_forgotten_ship)
"ae" = (
/obj/machinery/camera/xray{
Expand Down Expand Up @@ -151,7 +151,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/inteq_forgotten_ship)
"aq" = (
/turf/template_noop,
/turf/open/space/basic,
/area/ruin/space/has_grav/inteq_forgotten_ship)
"ar" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
Expand Down Expand Up @@ -1741,7 +1741,7 @@
/obj/structure/shuttle/engine/huge{
dir = 8
},
/turf/template_noop,
/turf/open/space/basic,
/area/ruin/space/has_grav/inteq_forgotten_ship)
"iY" = (
/obj/machinery/vending/medical/syndicate_access/cybersun,
Expand Down Expand Up @@ -2134,8 +2134,6 @@
"ne" = (
/turf/open/floor/engine/vacuum,
/area/ruin/space/has_grav/inteq_forgotten_outpost)
"ng" = (
)
"no" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/structure/rack{
Expand Down Expand Up @@ -2260,6 +2258,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 8
},
/obj/structure/fireaxecabinet{
pixel_x = -32
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/inteq_forgotten_outpost)
"oz" = (
Expand Down Expand Up @@ -2401,6 +2402,13 @@
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/inteq_forgotten_ship)
"pD" = (
/obj/machinery/porta_turret/syndicate{
faction = list("InteQ");
pixel_y = 32
},
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"pW" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 4
Expand Down Expand Up @@ -3281,7 +3289,7 @@
name = "InteQ interior door";
req_one_access_txt = "152"
},
/obj/item/aiModule/core/full/inteq,
/obj/item/ai_module/core/full/inteq,
/obj/item/borg/upgrade/transform/syndicatejack,
/obj/item/robot_module/syndicate_medical/inteq,
/obj/item/robot_module/syndicate/inteq,
Expand Down Expand Up @@ -3489,9 +3497,6 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/fireaxecabinet{
pixel_x = -32
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/inteq_forgotten_outpost)
"Bz" = (
Expand Down Expand Up @@ -4166,7 +4171,7 @@
/area/ruin/space/has_grav/inteq_forgotten_ship)
"Ja" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/turf/open/space/basic,
/area/template_noop)
"Jj" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
Expand All @@ -4188,7 +4193,7 @@
/area/ruin/space/has_grav/inteq_forgotten_outpost)
"JA" = (
/mob/living/simple_animal/hostile/carp/megacarp,
/turf/template_noop,
/turf/open/space/basic,
/area/template_noop)
"JB" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
Expand Down Expand Up @@ -4404,13 +4409,13 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 8
},
/obj/machinery/door/airlock/grunge{
name = "Engineering";
req_one_access_txt = "152"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 8
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/inteq_forgotten_outpost)
"LR" = (
Expand Down Expand Up @@ -8473,7 +8478,7 @@ qY
VR
VR
VR
ba
cR
cR
aa
aa
Expand Down Expand Up @@ -8548,7 +8553,7 @@ Qc
Nb
VR
VR
cR
pD
cR
aa
aa
Expand Down Expand Up @@ -9073,7 +9078,7 @@ Pu
UW
VR
VR
cR
pD
aa
aa
cR
Expand Down Expand Up @@ -9304,7 +9309,7 @@ ba
bU
aa
aa
ng
aa
"}
(47,1,1) = {"
aa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8351,18 +8351,18 @@
/obj/effect/turf_decal/trimline/dark_red/filled/line{
dir = 8
},
/obj/item/aiModule/reset{
/obj/item/ai_module/reset{
pixel_x = -2;
pixel_y = -7
},
/obj/item/aiModule/reset/purge{
/obj/item/ai_module/reset/purge{
pixel_y = -4
},
/obj/item/aiModule/supplied/freeform{
/obj/item/ai_module/supplied/freeform{
pixel_x = -2;
pixel_y = 4
},
/obj/item/aiModule/core/full/syndicate{
/obj/item/ai_module/core/full/syndicate{
pixel_y = 7
},
/turf/open/floor/iron/dark,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/arcade.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
/turf/open/floor/engine,
/area/ruin/powered)
"I" = (
/obj/item/aiModule/toyAI,
/obj/item/ai_module/toyAI,
/turf/open/floor/engine,
/area/ruin/powered)
"J" = (
Expand Down
Loading

0 comments on commit 638a099

Please sign in to comment.