Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ive randomly decided to port NTSL from yogstation. Lets see how dis goes and how many runtimes it causes #2199

Merged
merged 69 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
2269dbd
initial commit
Gboster-0 Jun 8, 2024
6c194d4
Fixes the .DME file, and updates readme.md with the pull number
Gboster-0 Jun 8, 2024
a4db863
adds poly achievement sprites
Gboster-0 Jun 8, 2024
cc2e555
adds the programming console to maps and techweb
Gboster-0 Jun 8, 2024
8cf6b1f
fixes the decals being in my walls on kilo
Gboster-0 Jun 8, 2024
6141a28
Adds basic signal techs
Gboster-0 Jun 11, 2024
8b8654b
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Jun 11, 2024
8b6f19b
fixes for jumpsuits and PDA
Gboster-0 Jun 11, 2024
3ac0011
le fix
Gboster-0 Jun 11, 2024
914f3e1
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Jun 13, 2024
5f94d81
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Jun 25, 2024
e5ca703
adds signal technician start landmarks
Gboster-0 Jun 25, 2024
abcaae8
TGUI for the NTSL is now a thing
Gboster-0 Jun 26, 2024
1961f94
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Jun 26, 2024
a0ce8f0
boop for linters
Gboster-0 Jun 26, 2024
0d3d5f8
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Jul 6, 2024
4db1154
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Jul 8, 2024
be22b65
removes skin.dmf NTSL since we use TGUI now
Gboster-0 Jul 8, 2024
f965bb7
smol fixes
Gboster-0 Jul 16, 2024
f49526c
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Jul 26, 2024
e50b7a7
Adds sig techs to ouroboros and void raptor
Gboster-0 Jul 26, 2024
6b6cdc4
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Aug 3, 2024
6807d2b
Ports yog's TGUI traffic console, erasing my work
Gboster-0 Aug 10, 2024
0670ec0
smol fix
Gboster-0 Aug 12, 2024
2692de7
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Aug 12, 2024
578ea5c
Update tgstation.dme
Gboster-0 Aug 12, 2024
3e1a10d
temp map fixes so linters love me
Gboster-0 Aug 12, 2024
11ef3a4
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Aug 13, 2024
47dfebe
boop
Gboster-0 Aug 13, 2024
9b5bb63
fixes broadcast()
Gboster-0 Aug 13, 2024
6d8af88
Update readme.md
Gboster-0 Aug 13, 2024
b66f1fc
adds filter
Gboster-0 Aug 13, 2024
15abd8e
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Aug 17, 2024
21a0c90
makes double-spaces become only single-spaces via regex
Gboster-0 Aug 22, 2024
d1fc936
forces all var.len instances into length()
Gboster-0 Aug 22, 2024
e6de24c
Update monkestation/code/modules/NTSL/code/coding_language/interprete…
Gboster-0 Aug 22, 2024
82e3d1b
Update monkestation/code/modules/NTSL/code/coding_language/interprete…
Gboster-0 Aug 22, 2024
278211b
fixes lucy
Gboster-0 Aug 22, 2024
008de72
uses a giant ass regex to spot most bad symbol placements
Gboster-0 Aug 22, 2024
060e484
Update monkestation/code/modules/NTSL/code/machinery/traffic_control.dm
Gboster-0 Aug 22, 2024
438c13c
smol fix up of + signs
Gboster-0 Aug 22, 2024
fb0bc1b
Merge branch 'NTSL' of https://github.com/Gboster-0/Monkestation2.0 i…
Gboster-0 Aug 22, 2024
1899804
drops ID on being destroyed
Gboster-0 Aug 22, 2024
c3c0f28
telecomms server destroy() cleanup
Gboster-0 Aug 22, 2024
83f9279
lucy's freq suggestion thats outdated so i cannot auto-commit it
Gboster-0 Aug 22, 2024
c894a53
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Sep 2, 2024
778d197
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Sep 5, 2024
5b771b2
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Sep 12, 2024
128c3b7
lucy's Destroy() suggestions
Gboster-0 Sep 12, 2024
dfb7aee
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Sep 15, 2024
049f122
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Oct 11, 2024
366ffed
unshittifies north star's 2 message consoles (northstar stays losing)…
Gboster-0 Oct 11, 2024
171f435
fixes rebuilding traffic consoles, changes the AI a lil bit
Gboster-0 Oct 11, 2024
1c56fe9
adds radio as a valid frequency, adds the reference buttong
Gboster-0 Oct 12, 2024
bf23ac6
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Oct 14, 2024
c390cf6
fixes achievements, fixes NTSL bans not banning you completelly from …
Gboster-0 Oct 14, 2024
312bd23
adds specified return types from Lucy's review
Gboster-0 Oct 14, 2024
d93f5a4
adds a singular comment
Gboster-0 Oct 15, 2024
718220a
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Oct 15, 2024
d5a89fb
Minor Cleanup
Gboster-0 Oct 16, 2024
4b8df64
Merge branch 'NTSL' of https://github.com/Gboster-0/Monkestation2.0 i…
Gboster-0 Oct 16, 2024
b14653b
Job Icon (#1)
Gw0sty Oct 16, 2024
41224df
adds MONKESTATION ADDITION to job icons
Gboster-0 Oct 16, 2024
0d06037
Fixes AI tracking
Gboster-0 Oct 16, 2024
71f00b1
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Oct 16, 2024
a8fac99
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Oct 22, 2024
94c6b75
adds an admin-only button to clear comms
Gboster-0 Oct 24, 2024
490a528
adds plasmamen signal tech clothing
Gboster-0 Oct 24, 2024
318a861
Merge remote-tracking branch 'upstream/master' into NTSL
Gboster-0 Oct 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
271 changes: 139 additions & 132 deletions _maps/map_files/Blueshift/Blueshift.dmm

Large diffs are not rendered by default.

543 changes: 274 additions & 269 deletions _maps/map_files/BoxStation/BoxStation.dmm

Large diffs are not rendered by default.

261 changes: 134 additions & 127 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Large diffs are not rendered by default.

870 changes: 437 additions & 433 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm

Large diffs are not rendered by default.

1,012 changes: 504 additions & 508 deletions _maps/map_files/KiloStation/KiloStation.dmm

Large diffs are not rendered by default.

1,998 changes: 1,000 additions & 998 deletions _maps/map_files/MetaStation/MetaStation.dmm

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions _maps/map_files/NorthStar/north_star.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -13102,17 +13102,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/white,
/area/station/science/lower)
"dqB" = (
/obj/item/clothing/mask/breath{
pixel_x = -4
},
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath{
pixel_x = 4
},
/obj/structure/table,
/turf/open/floor/iron/smooth,
/area/station/tcommsat/computer)
"dqJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -14972,6 +14961,10 @@
/area/station/maintenance/floor1/port)
"dRE" = (
/obj/machinery/holopad,
/obj/structure/frame/computer{
dir = 1
},
/obj/item/circuitboard/computer/comm_traffic,
/turf/open/floor/iron/smooth,
/area/station/tcommsat/computer)
"dRI" = (
Expand Down Expand Up @@ -49323,11 +49316,12 @@
/area/station/hallway/floor1/aft)
"nfn" = (
/obj/structure/chair/office{
dir = 8
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/effect/landmark/start/signal_technician,
/turf/open/floor/iron/smooth_large,
/area/station/tcommsat/computer)
"nfx" = (
Expand Down Expand Up @@ -51004,13 +50998,6 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"nzb" = (
/obj/machinery/computer/telecomms/monitor{
dir = 4;
network = "tcommsat"
},
/turf/open/floor/iron/smooth,
/area/station/tcommsat/computer)
"nze" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -51294,11 +51281,10 @@
/turf/closed/wall/r_wall,
/area/station/security/checkpoint/first)
"nCl" = (
/obj/item/book/manual/wiki/tcomms,
/obj/item/radio/off{
pixel_y = 4
/obj/machinery/computer/telecomms/monitor{
dir = 1;
network = "tcommsat"
},
/obj/structure/table,
/turf/open/floor/iron/smooth,
/area/station/tcommsat/computer)
"nCA" = (
Expand Down Expand Up @@ -52341,16 +52327,13 @@
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"nPN" = (
/obj/machinery/computer/message_monitor{
dir = 4
},
/obj/machinery/computer/message_monitor{
dir = 4
},
/obj/machinery/camera/directional/west{
name = "Telecomms - Control";
network = list("ss13","engine")
},
/obj/machinery/computer/message_monitor{
dir = 4
},
/turf/open/floor/iron/smooth,
/area/station/tcommsat/computer)
"nPQ" = (
Expand Down Expand Up @@ -54730,6 +54713,15 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"owy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/table,
/obj/item/book/manual/wiki/tcomms,
/obj/item/radio/off{
pixel_y = 4
},
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/tcommsat/computer)
"owB" = (
/turf/open/floor/catwalk_floor,
/area/station/science/xenobiology/hallway)
Expand Down Expand Up @@ -87871,6 +87863,14 @@
/area/station/commons/fitness)
"xDi" = (
/obj/machinery/newscaster/directional/north,
/obj/structure/table,
/obj/item/clothing/mask/breath{
pixel_x = -4
},
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath{
pixel_x = 4
},
/turf/open/floor/iron/smooth,
/area/station/tcommsat/computer)
"xDk" = (
Expand Down Expand Up @@ -126347,7 +126347,7 @@ jKt
fPB
xWl
nPN
nzb
jIG
mNh
xqs
pCb
Expand Down Expand Up @@ -126859,8 +126859,8 @@ mFW
kSN
jKt
xDi
uVY
dqB
owy
jIG
nCl
mNh
nSn
Expand Down
Loading
Loading