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.

Sign up for GitHub

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

Jump to bottom

Sentry Laptops In vendors #295

Merged
merged 17 commits into from
Jul 22, 2024
Merged

Sentry Laptops In vendors #295

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
de6c369
fuck that shit
Jun 2, 2024
2b6c465
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 2, 2024
8ea6f23
emails
Jun 2, 2024
1e582ef
should hopefully accidently unfuck this
Jun 2, 2024
38aee5f
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Jun 3, 2024
b69183d
FUCK.
Jun 6, 2024
d5078fe
unfucks that.
Jun 6, 2024
edf2ede
try to fix the problem
Jun 6, 2024
a361ab2
i dont know why hpefully fixed????
Jun 6, 2024
0f713b9
hopefully fixed wait no this needs to mathc
Jun 6, 2024
478de71
should be working
KoishiVibe Jun 13, 2024
93accd7
fixes that
KoishiVibe Jun 13, 2024
15879d7
Merge remote-tracking branch 'upstream/master' into sentry-integration
KoishiVibe Jun 13, 2024
b3ef2d2
what where have i been pushing to
Jun 20, 2024
1bee892
undoes the nice soul changes >:(
KoishiVibe Jun 22, 2024
c3c0cd7
unfucks this too
Jun 22, 2024
ca7642c
Merge branch 'master' into sentry-integration
KoishiVibe Jun 22, 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
1 change: 0 additions & 1 deletion code/datums/fluff_emails.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
var/title //email title
var/entry_text //email content


KoishiVibe marked this conversation as resolved.
Show resolved Hide resolved
//emails for the Almayer computers
/datum/fluff_email/almayer

Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@
list("Roller Bed", round(scale * 2), /obj/item/roller, VENDOR_ITEM_REGULAR),
list("Machete Scabbard (Full)", round(scale * 5), /obj/item/storage/large_holster/machete/full, VENDOR_ITEM_REGULAR),
list("Binoculars", round(scale * 1), /obj/item/device/binoculars, VENDOR_ITEM_REGULAR),
list("AN/PSQ-55 Sentry Console", round(scale * 1), /obj/item/device/sentry_computer, VENDOR_ITEM_REGULAR),
list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit, VENDOR_ITEM_REGULAR),
list("Rail Flashlight", round(scale * 5), /obj/item/attachable/flashlight, VENDOR_ITEM_REGULAR),
)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/devices/radio/encryptionkey.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@
/obj/item/device/encryptionkey/mcom
name = "\improper Marine Command Radio Encryption Key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_SENTRY = TRUE)

/obj/item/device/encryptionkey/mcom/alt
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_SENTRY = TRUE)

// MARINE ENGINEERING

Expand Down
8 changes: 4 additions & 4 deletions code/modules/defenses/sentry_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
var/displayname = sentrygun.name
if(length(sentrygun.nickname))
displayname = sentrygun.nickname
var/message = "[displayname]:[get_area(sentrygun)] Engaged"
var/message = "[displayname]:[get_area(sentrygun)] ENGAGED"
KoishiVibe marked this conversation as resolved.
Show resolved Hide resolved
if(can_identify_target)
message += " [sentrygun.target]"
INVOKE_ASYNC(src, PROC_REF(send_message), message)
Expand All @@ -148,7 +148,7 @@
if(length(sentrygun.nickname))
displayname = sentrygun.nickname
var/areaname = get_area(sentrygun)
var/message = "[displayname]:[areaname] Low ammo [sentrygun.ammo.current_rounds]/[sentrygun.ammo.max_rounds]."
var/message = "[displayname]:[areaname] RNDS CRITICAL [sentrygun.ammo.current_rounds]/[sentrygun.ammo.max_rounds]."
KoishiVibe marked this conversation as resolved.
Show resolved Hide resolved
INVOKE_ASYNC(src, PROC_REF(send_message), message)

/**
Expand All @@ -160,7 +160,7 @@
if(length(sentrygun.nickname))
displayname = sentrygun.nickname
var/areaname = get_area(sentrygun)
var/message = "[displayname]:[areaname] out of ammo."
var/message = "[displayname]:[areaname] EMPTY."
KoishiVibe marked this conversation as resolved.
Show resolved Hide resolved
INVOKE_ASYNC(src, PROC_REF(send_message), message)

/**
Expand Down Expand Up @@ -289,7 +289,7 @@
if(length(sentry.nickname))
displayname = sentry.nickname
var/areaname = get_area(sentry)
var/message = "[displayname]:[areaname] lost contact."
var/message = "[displayname]:[areaname] NO SIGNAL."
KoishiVibe marked this conversation as resolved.
Show resolved Hide resolved
INVOKE_ASYNC(src, PROC_REF(send_message), message)
playsound(src, 'sound/machines/buzz-two.ogg', 25, FALSE)

Expand Down
Loading