Skip to content

Commit

Permalink
Merge pull request #5859 from sojourn-13/revert-5020-junkfieldstuff
Browse files Browse the repository at this point in the history
Revert "junk field nerf, sorry ya'll."
  • Loading branch information
Trilbyspaceclone authored Nov 25, 2024
2 parents 8105624 + 1c23044 commit 6d8d1df
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions code/modules/dungeons/junk_tractor_beam.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
var/asteroid_belt_status // if it has an asteroid belt
var/affinity // affinity of the junk field
var/list/affinities = list(
"Neutral" = 3,
"Greyson" = 4,
"Military" = 2,
"Void Wolf" = 4,
"Neutral" = 10,
"Greyson" = 3,
"Military" = 3,
"Void Wolf" = 3,
//"SpaceWrecks" = 0 caused runtimes and ci failures
) // available affinities

Expand Down Expand Up @@ -735,10 +735,7 @@
field_cancel()

if(href_list["release"])
// field_release()
playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
audible_message(SPAN_WARNING("The junk tractor beam console beeps: \'WARNING: Malfunction of the release system. \
The nearest maintenance vessel has been noticed. Estimated time until arrival: 2 years.\'"))
field_release()

if(href_list["pick"])
var/list/possible_fields = get_possible_fields()
Expand Down

0 comments on commit 6d8d1df

Please sign in to comment.