Skip to content

Commit

Permalink
Revert "Very Normal PR Please Speedmerge Nothing Bad Will Happen" (Go…
Browse files Browse the repository at this point in the history
…ob-Station#1571)

Revert "Very Normal PR Please Speedmerge Nothing Bad Will Happen (Goob-Station#1566)"

This reverts commit 5838eb5.
  • Loading branch information
Piras314 authored Jan 31, 2025
1 parent 00a7381 commit 12069f9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_Goobstation/headset/headsets.ftl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
chat-radio-future = Future
chat-radio-future = Future
6 changes: 0 additions & 6 deletions Resources/Locale/en-US/_Goobstation/tide.ftl/tidemind.ftl

This file was deleted.

15 changes: 2 additions & 13 deletions Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
- type: job # goob edit
id: Passenger
name: job-name-tider
description: job-description-tider
name: job-name-passenger
description: job-description-passenger
playTimeTracker: JobPassenger
startingGear: PassengerGear
icon: "JobIconPassenger"
supervisors: job-supervisors-everyone
access:
- Maintenance
# goob tider hivemind
special:
- !type:AddComponentSpecial
components:
- type: IntrinsicRadioReceiver
- type: IntrinsicRadioTransmitter
channels:
- TideHivemind
- type: ActiveRadio
channels:
- TideHivemind

- type: startingGear
id: PassengerGear
Expand Down
8 changes: 0 additions & 8 deletions Resources/Prototypes/_Goobstation/radio_channels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,3 @@
frequency: 9999
color: "#91E8E5"
longRange: true

- type: radioChannel
id: TideHivemind
name: chat-radio-tider
keycode: 'p' # if i use i again it will break my fork of this smh
frequency: 8008 # definitely random number
color: "#8C8C8C"
longRange: true

0 comments on commit 12069f9

Please sign in to comment.