Skip to content

Commit

Permalink
initial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Gboster-0 committed Jun 8, 2024
1 parent d1886e6 commit 2269dbd
Show file tree
Hide file tree
Showing 37 changed files with 4,500 additions and 10 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/achievements.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
#define MEDAL_ARCHMAGE "Archmage"
#define MEDAL_THEORETICAL_LIMITS "All Within Theoretical Limits"
#define MEDAL_JARED_LETO "Jared Leto" // Monkestation addition
#define MEDAL_GOOD_BIRD "Embrace The Bird" // MONKESTATION ADDITION: NTSL
#define MEDAL_BAD_BIRD "Silence Bird" // MONKESTATION ADDITION: NTSL

//Skill medal hub IDs
#define MEDAL_LEGENDARY_MINER "Legendary Miner"
Expand Down
4 changes: 3 additions & 1 deletion code/__DEFINES/logging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
#define LOG_SPEECH_INDICATORS (1 << 21)
#define LOG_CLONING (1 << 22)
#define LOG_MECHCOMP (1 << 23)
#define LOG_BLACKMARKET (1 << 24)
#define LOG_NTSL (1 << 24) // MONKESTATION ADDITION: NTSL
#define LOG_BLACKMARKET (1 << 25)

//Individual logging panel pages
#define INDIVIDUAL_GAME_LOG (LOG_GAME)
Expand Down Expand Up @@ -113,6 +114,7 @@
#define LOG_CATEGORY_TOOL "tool"
#define LOG_CATEGORY_VIRUS "virus"
#define LOG_CATEGORY_MECHCOMP "mechcomp"
#define LOG_CATEGORY_NTSL "ntsl" // MONKESTATION ADDITION: NTSL
#define LOG_CATEGORY_CLONING "cloning"
#define LOG_CATEGORY_MUSIC "music"
#define LOG_CATEGORY_META "currency"
Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/~monkestation/NTSL.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#define SERVER_LOG_STORAGE_MAX 400 // Number of chat logs the telecomms servers will store before they start deleting the older ones.
#define TELECOMMS_SCAN_RANGE 25 // The range at which the telecomms computers can scan for telecomm servers.

///If something is an 'object' to scripting.
#define IS_OBJECT(thing) (istype(thing, /datum) || istype(thing, /list) || istype(thing, /savefile) || istype(thing, /client) || (thing==world))
5 changes: 5 additions & 0 deletions code/datums/chatmessage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,11 @@
// Ensure the list we are using, if present, is a copy so we don't modify the list provided to us
spans = spans ? spans.Copy() : list()

// MONKESTATION ADDITION START -- NTSL -- doesn't pass a speaker when you do broadcast() since technically nothing is actually speaking.
if(!speaker)
return
// MONKESTATION ADDITION END

// Check for virtual speakers (aka hearing a message through a radio)
var/atom/movable/originalSpeaker = speaker
if (istype(speaker, /atom/movable/virtualspeaker))
Expand Down
7 changes: 7 additions & 0 deletions code/game/machinery/telecomms/machines/server.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
if (log_entries.len >= 400)
log_entries.Cut(1, 2)

signal.data["server"] = src; // MONKESTATION ADDITION -- NTSL

// Don't create a log if the frequency is banned from being logged
if(!(signal.frequency in banned_frequencies))
var/datum/comm_log_entry/log = new
Expand All @@ -51,6 +53,11 @@
log.name = "data packet ([md5(identifier)])"
log_entries.Add(log)

// MONKESTATION ADDITION START -- NTSL -- Run the damn NTSL code
if(Compiler && autoruncode)
Compiler.Run(signal)
// MONKESTATION ADDITION END

var/can_send = relay_information(signal, /obj/machinery/telecomms/hub)
if(!can_send)
relay_information(signal, /obj/machinery/telecomms/broadcaster)
Expand Down
5 changes: 5 additions & 0 deletions code/game/machinery/telecomms/telecomunications.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ GLOBAL_LIST_EMPTY(telecomms_list)
if(!on)
return

// MONKESTATION ADDITION START -- NTSL -- Make sure the NTSL actually has a path
if(filter && !ispath(filter))
CRASH("relay_information() was given a path filter that wasn't actually a path!")
// MONKESTATION ADDITION END

if(!filter || !ispath(filter, /obj/machinery/telecomms))
CRASH("null or non /obj/machinery/telecomms typepath given as the filter argument! given typepath: [filter]")

Expand Down
112 changes: 103 additions & 9 deletions interface/skin.dmf
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ macro "default"


menu "menu"
elem
elem
name = "&File"
command = ""
saved-params = "is-checked"
elem
elem
name = "&Quick screenshot\tF2"
command = ".screenshot auto"
category = "&File"
saved-params = "is-checked"
elem
elem
name = "&Save screenshot as...\tShift+F2"
command = ".screenshot"
category = "&File"
saved-params = "is-checked"
elem
elem
name = ""
command = ""
category = "&File"
Expand All @@ -34,7 +34,7 @@ menu "menu"
command = ".reconnect"
category = "&File"
saved-params = "is-checked"
elem
elem
name = "&Quit\tAlt-F4"
command = ".quit"
category = "&File"
Expand All @@ -43,22 +43,22 @@ menu "menu"
name = "&Help"
command = ""
saved-params = "is-checked"
elem
elem
name = "&Admin Help\tF1"
command = "adminhelp"
category = "&Help"
saved-params = "is-checked"
elem
elem
name = "&Hotkeys"
command = "Hotkeys-Help"
category = "&Help"
saved-params = "is-checked"
elem
elem
name = "Refresh TGUI"
command = "refresh-tgui"
category = "&Help"
saved-params = "is-checked"
elem
elem
name = "Fix Chat"
command = "fix-chat"
category = "&Help"
Expand Down Expand Up @@ -369,3 +369,97 @@ window "tgui_say"
anchor2 = 0,0
saved-params = ""

window "Telecomms IDE"
elem "Telecomms IDE"
type = MAIN
pos = 281,0
size = 569x582
anchor1 = none
anchor2 = none
text-color = #eeeeee
background-color = #222222
is-visible = false
saved-params = "pos;size;is-minimized;is-maximized"
title = "TCS IDE"
statusbar = false
on-close = "exittcs"
elem "button5"
type = BUTTON
pos = 209,464
size = 70x20
anchor1 = 37,80
anchor2 = 49,83
text-color = #eeeeee
background-color = #555555
saved-params = "is-checked"
text = "Clear Memory"
command = "tcsclearmem"
elem "button4"
type = BUTTON
pos = 157,464
size = 52x20
anchor1 = 28,80
anchor2 = 37,83
text-color = #eeeeee
background-color = #555555
saved-params = "is-checked"
text = "Revert"
command = "tcsrevert"
elem "button3"
type = BUTTON
pos = 105,464
size = 52x20
anchor1 = 18,80
anchor2 = 28,83
text-color = #eeeeee
background-color = #555555
saved-params = "is-checked"
text = "Execute"
command = "tcsrun"
elem "tcserror"
type = OUTPUT
pos = 0,488
size = 566x94
anchor1 = 0,84
anchor2 = 99,100
font-family = "sans-serif"
font-size = 9
text-color = #eeeeee
background-color = #333334
saved-params = "max-lines"
elem "button2"
type = BUTTON
pos = 53,464
size = 52x20
anchor1 = 9,80
anchor2 = 18,83
text-color = #eeeeee
background-color = #555555
saved-params = "is-checked"
text = "Compile"
command = "tcscompile"
elem "button1"
type = BUTTON
pos = 0,464
size = 53x20
anchor1 = 0,80
anchor2 = 9,83
text-color = #eeeeee
background-color = #555555
saved-params = "is-checked"
text = "Save"
command = "tcssave"
elem "tcscode"
type = INPUT
pos = 0,0
size = 569x464
anchor1 = 0,0
anchor2 = 100,80
font-family = "Courier"
font-size = 10
text-color = #eeeeee
background-color = #333334
saved-params = ""
command = "cancel"
multi-line = true
no-command = true
9 changes: 9 additions & 0 deletions monkestation/code/modules/NTSL/code/achievements.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/datum/award/achievement/jobs/Poly_silent
name = "Silence Bird!"
desc = "As a signal technician create a script that mutes poly"
database_id = MEDAL_BAD_BIRD

/datum/award/achievement/jobs/Poly_loud
name = "Embrace The Bird!"
desc = "As a signal technician create a script that makes poly LOUD"
database_id = MEDAL_GOOD_BIRD
Loading

0 comments on commit 2269dbd

Please sign in to comment.