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

[Port] Makes gravity event based, QOL additions as well as bugfixes regarding gravity #11406

Merged
merged 30 commits into from
Dec 7, 2024
Merged

[Port] Makes gravity event based, QOL additions as well as bugfixes regarding gravity #11406

merged 30 commits into from
Dec 7, 2024

Conversation

XeonMations
Copy link
Contributor

@XeonMations XeonMations commented Aug 31, 2024 •
edited
Loading

About The Pull Request

Ports:

Why It's Good For The Game

Bugfixes are good, as well as fixing there being constant checks for people's gravity.

Testing Photographs and Procedure

Screenshots&Videos
2024-09-14.07-14-27.mp4
2024-09-14.07-15-48.mp4
2024-09-14.07-17-55.mp4

Changelog

🆑 Ghommie, LemonInTheDark, Kylerace, vinylspiders, MrMelbert, Fikou, AnturK, ShizCalev, OrionTheFox, XeonMations
fix: Gravity generator now shows repair instructions on examine
add: Proper functionality for upside down gravity, and high gravity situations
refactor: Gravity is now event based, meaning you should have less downtime from moving into a weightless area and your gravity status changing.
/:cl:

@XeonMations XeonMations changed the title [Port] Makes gravity event based, QOL additions as well as bugfixes regarding lack of gravity [Port] Makes gravity event based, QOL additions as well as bugfixes regarding gravity Sep 1, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

1 similar comment
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@XeonMations XeonMations marked this pull request as ready for review September 14, 2024 04:20
@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 2, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 3, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

PowerfulBacon
PowerfulBacon reviewed Dec 6, 2024
View reviewed changes
code/datums/proximity_monitor/fields/gravity.dm Outdated
@@ -9,7 +9,7 @@

/datum/proximity_monitor/advanced/gravity/setup_field_turf(turf/T)
. = ..()
T.AddElement(/datum/element/forced_gravity, gravity_value)
T.AddElement(/datum/element/forced_gravity, gravity_value,, can_override = TRUE)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this meant to have 2 commas?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops.

PowerfulBacon
PowerfulBacon approved these changes Dec 7, 2024
View reviewed changes
Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do some testing on local and merge if this seems okay

PowerfulBacon
PowerfulBacon approved these changes Dec 7, 2024
View reviewed changes
Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems okay on local testing

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Dec 7, 2024
Merged via the queue into BeeStation:master with commit fce35d1 Dec 7, 2024
21 checks passed
ss13-beebot added a commit that referenced this pull request Dec 7, 2024
@ss13-beebot
Automatic changelog generation for PR #11406 [ci skip]
a26d006
@XeonMations XeonMations deleted the fixing-space branch December 8, 2024 10:47
PowerfulBacon added a commit to PowerfulBacon/BeeStation-Hornet-Bacons-Fork that referenced this pull request Dec 16, 2024
@PowerfulBacon
Squashed commit of the following:
0df6b44 
commit e58527b
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Dec 15 21:45:43 2024 +0100

    fixes the missing icon

commit 2c58283
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 15 18:43:44 2024 +0000

    Fixes ghosting during spellcasts

commit 851f3c6
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 15 18:27:15 2024 +0000

    Fixes antimagic issues on wizards

commit 57cb0ec
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Dec 15 17:00:55 2024 +0100

    separates mutation verbs

    still no fix on teleport+wiz battlesuit interaction

commit b30e446
Merge: 5e69537 44a5067
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 15 15:26:17 2024 +0000

    Merge branch 'Future' of https://github.com/Szyszkrzyneczka/BeeStation-Hornet into pr/11527

commit 5e69537
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 15 15:26:12 2024 +0000

    Fixes augry item action

commit 44a5067
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Dec 15 16:19:54 2024 +0100

    minor things

commit 079a82f
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 15 15:04:56 2024 +0000

    Fixes the stat panel

commit 9ca7ce2
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 15 14:46:46 2024 +0000

    Fixes the positioning of blood magic

commit 940ac09
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 15 14:30:00 2024 +0000

    Updates the debug verb to only grant action mutations

commit 73ddde4
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Dec 15 15:21:30 2024 +0100

    updates anti-magic component properly this time

commit c5097ee
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 18:12:53 2024 +0000

    Fixes strained muscles and augmented eyesight

commit bfb9fb4
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 17:55:34 2024 +0000

    Fixes strained muscles and cooldown text styling

commit dc24c90
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 16:55:35 2024 +0000

    Fixes spells

commit e4b8e0c
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 13:29:41 2024 +0000

    Adds a give all mutations button for mutation testing

commit 4d414e9
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 13:27:27 2024 +0000

    Fixes compilation errors

commit f97db17
Merge: ec6ec4d 3803a30
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 13:27:14 2024 +0000

    Merge branch 'Future' of https://github.com/Szyszkrzyneczka/BeeStation-Hornet into pr/11527

commit ec6ec4d
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 13:25:48 2024 +0000

    Fixes various issues related to incorrect targets being selected

commit 3803a30
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 13:25:48 2024 +0000

    Fixes various issues related to incorrect targets being selected

commit 7e827c6
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 12:24:58 2024 +0000

    Fixes compile errors

commit 038b8b7
Author: Szyszkrzyneczka <[email protected]>
Date:   Sat Dec 14 11:56:28 2024 +0100

    Update debug.dm

commit 1dffcd9
Merge: 271d9cf b049cf0
Author: Szyszkrzyn <[email protected]>
Date:   Sat Dec 14 11:33:20 2024 +0100

    Merge pull request #1 from PowerfulBacon/cooldown-action-refactor

    Cooldown action refactor

commit b049cf0
Merge: 0fe7be1 271d9cf
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 10:28:22 2024 +0000

    Merge branch 'Future' into cooldown-action-refactor

commit 0fe7be1
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 14 10:23:03 2024 +0000

    Final refactors

commit a1a10cc
Author: PowerfulBacon <[email protected]>
Date:   Fri Dec 13 23:18:32 2024 +0000

    Some more refactor work

commit 271d9cf
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Dec 13 17:06:43 2024 +0100

    Fixes various things I found (mainly smoke!!!)

commit 1a23587
Author: PowerfulBacon <[email protected]>
Date:   Mon Dec 9 22:25:31 2024 +0000

    Removes action/cooldown

commit 93e8e83
Merge: 0483e61 a280b60
Author: Szyszkrzyneczka <[email protected]>
Date:   Mon Dec 9 21:47:47 2024 +0100

    Merge remote-tracking branch 'upstream/master' into Future

commit a280b60
Author: ss13-beebot <[email protected]>
Date:   Mon Dec 9 18:04:44 2024 +0000

    Automatic changelog compile [ci skip]

commit a8b171b
Author: ss13-beebot <[email protected]>
Date:   Mon Dec 9 11:13:50 2024 -0600

    Automatic changelog generation for PR BeeStation#11887 [ci skip]

commit 515e8b5
Author: Therealdoooc213 <[email protected]>
Date:   Tue Dec 10 01:04:44 2024 +0800

    Nar'sie now plays music (BeeStation#11887)

    * yuhh

    * frick yeah

    * CC-BY 3.0 ATTRIBUTION

    * aaagh

commit e69b3f1
Author: ss13-beebot <[email protected]>
Date:   Mon Dec 9 12:06:05 2024 +0000

    Automatic changelog compile [ci skip]

commit cdfcc8f
Author: ss13-beebot <[email protected]>
Date:   Mon Dec 9 05:36:51 2024 -0600

    Automatic changelog generation for PR BeeStation#11912 [ci skip]

commit 3031d5f
Author: Dejaku51 <[email protected]>
Date:   Mon Dec 9 12:27:35 2024 +0100

    QUICKSTART define (BeeStation#11912)

    * lets start it quickly

    * lets not start with it tho

    * debug job

    * modularizes ig?

    * we can move the warning to a new file

    * lets move the quickstart outside the borders of the world

    * override folder to naturally get it to include contents of quickstart last

    * touching the end of all

    * remove empty lines

commit add1c10
Author: ss13-beebot <[email protected]>
Date:   Mon Dec 9 10:04:43 2024 +0000

    Automatic changelog compile [ci skip]

commit 6c4f418
Author: ss13-beebot <[email protected]>
Date:   Mon Dec 9 03:09:46 2024 -0600

    Automatic changelog generation for PR BeeStation#11976 [ci skip]

commit ca1c8fc
Author: PowerfulBacon <[email protected]>
Date:   Mon Dec 9 09:09:18 2024 +0000

    Fixes guns slowing down while worn on a belt (BeeStation#11976)

    * no worn slowdown

    * Update code/modules/mob/living/carbon/human/inventory.dm

commit e41354b
Author: ss13-beebot <[email protected]>
Date:   Sun Dec 8 15:03:18 2024 +0000

    Automatic changelog compile [ci skip]

commit 4e7fb71
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 8 14:38:39 2024 +0000

    08/12/2024-2

commit 6c75d83
Author: ss13-beebot <[email protected]>
Date:   Sun Dec 8 08:04:34 2024 -0600

    Automatic changelog generation for PR BeeStation#11962 [ci skip]

commit 0a5233c
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 8 14:04:10 2024 +0000

    Buffs changeling combat ability + removes absorb requirements (BeeStation#11962)

    * Update mutations.dm

    * CL combat buff

    * Update mutations.dm

    * Remvoes req_absorbs

    * Removes true absorbs

    * Teratoma limits

commit bc2cb48
Author: PowerfulBacon <[email protected]>
Date:   Sun Dec 8 11:25:44 2024 +0000

    08/12/2024

commit 0483e61
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Dec 8 11:34:34 2024 +0100

    Restores the things i accidentally deleted

commit 1ea51db
Author: ss13-beebot <[email protected]>
Date:   Sun Dec 8 00:16:08 2024 +0000

    Automatic changelog compile [ci skip]

commit 5a69076
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 23:03:27 2024 +0000

    Automatic changelog compile [ci skip]

commit d55ad34
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 17:01:37 2024 -0600

    Automatic changelog generation for PR BeeStation#11994 [ci skip]

commit 286ae09
Author: XeonMations <[email protected]>
Date:   Sun Dec 8 00:51:10 2024 +0200

    Fixes reagent grinder juicing (BeeStation#11994)

    * Update reagentgrinder.dm

    * Icon diff bot PLEASE

commit 96ead5f
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 20:03:33 2024 +0000

    Automatic changelog compile [ci skip]

commit 06b3e02
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 13:35:46 2024 -0600

    Automatic changelog generation for PR BeeStation#11742 [ci skip]

commit 3ad9fb2
Author: Tsar-Salat <[email protected]>
Date:   Sat Dec 7 13:25:43 2024 -0500

    Refactors armor into subtypes. Kills a very hot proc. (BeeStation#11742)

    * permeability

    * change armor

    * addarmordatums

    * remove lists

    * completion

    * we love lists

    * unit test

    * byebye

    * try otherwise

    * why dont you listen

    * hmm

    * try passing penetration?

    * fixed bad uses of atom armor

    * ur dumb

    * hmm

    * kick it

    * man im dumb

    * checkfix

    * oops

commit 1241d88
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 13:20:33 2024 -0600

    Automatic changelog generation for PR BeeStation#11844 [ci skip]

commit 7889f44
Author: Therealdoooc213 <[email protected]>
Date:   Sun Dec 8 02:24:20 2024 +0800

    Emergency response team changes (BeeStation#11844)

    * brah

    * aaaa

    * holeemolee

    * goober

commit a48651c
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 13:05:48 2024 -0600

    Automatic changelog generation for PR BeeStation#11964 [ci skip]

commit 7da21fd
Author: Geatish <[email protected]>
Date:   Sat Dec 7 19:23:24 2024 +0100

    Fixes Changeling Last resort  (BeeStation#11964)

    * monkey fix

    well it the more important part works now

    * digi camo fix

    finally

    * Revert "digi camo fix"

    This reverts commit 416199d.

commit 018c0dc
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 12:50:52 2024 -0600

    Automatic changelog generation for PR BeeStation#11982 [ci skip]

commit 9a72789
Author: Programs-The-Station <[email protected]>
Date:   Sat Dec 7 12:22:16 2024 -0600

    Removes Meteor Shield Sats Deploy Time (BeeStation#11982)

    * Deploy Time to 5 Seconds

    * With Pleasure

commit a26d006
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 12:36:45 2024 -0600

    Automatic changelog generation for PR BeeStation#11406 [ci skip]

commit fce35d1
Author: XeonMations <[email protected]>
Date:   Sat Dec 7 20:18:08 2024 +0200

    [Port] Makes gravity event based, QOL additions as well as bugfixes regarding gravity (BeeStation#11406)

    * floored mobs

    * rahhh

    * Update gravitygenerator.dm

    * rah

    * to do: gravity generator shenanigens

    * rahhh

    * Update fullscreen.dm

    * rahhhhh

    * asfas

    * Update movetype_handler.dm

    * aaa

    * fffhg

    * dassad

    * now it works

    * Update screen_alert.dmi

    * sadasd

    * CI/CD

    * Update screen_alert.dmi

    * 16h icon diff bot moment

    * Update gravity.dm

commit 2dc0e7a
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 12:24:09 2024 -0600

    Automatic changelog generation for PR BeeStation#11960 [ci skip]

commit 1a91fcb
Author: PowerfulBacon <[email protected]>
Date:   Sat Dec 7 18:23:46 2024 +0000

    Buffs the derringer (BeeStation#11960)

    * Buffs the derringer

    * Removes C38 ammo from the uplink

commit 4d29154
Author: ss13-beebot <[email protected]>
Date:   Sat Dec 7 00:14:32 2024 +0000

    Automatic changelog compile [ci skip]

commit a01b63c
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Dec 6 22:04:40 2024 +0100

    minor fixes i noticed

commit 975c3ac
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Dec 6 18:07:13 2024 +0100

    tiny fixes, should cover all, vid soon

commit a89b3bf
Author: ss13-beebot <[email protected]>
Date:   Fri Dec 6 10:04:26 2024 +0000

    Automatic changelog compile [ci skip]

commit 33d6433
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Dec 6 10:22:06 2024 +0100

    Update mob.dm

commit 8f28e9f
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Dec 6 10:17:40 2024 +0100

    Fixes mouse pointers

commit 6034e28
Author: ss13-beebot <[email protected]>
Date:   Fri Dec 6 03:16:37 2024 -0600

    Automatic changelog generation for PR BeeStation#11969 [ci skip]

commit 1442c6e
Author: Therealdoooc213 <[email protected]>
Date:   Fri Dec 6 17:03:28 2024 +0800

    A (BeeStation#11969)

commit 26f8f75
Author: ss13-beebot <[email protected]>
Date:   Fri Dec 6 09:03:55 2024 +0000

    Automatic changelog compile [ci skip]

commit 8e77de0
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Dec 6 09:52:43 2024 +0100

    Uhhhhhhh

commit 2b2bd63
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Dec 6 09:30:49 2024 +0100

    fuck

commit a2c7ad0
Author: ss13-beebot <[email protected]>
Date:   Fri Dec 6 02:17:36 2024 -0600

    Automatic changelog generation for PR BeeStation#11905 [ci skip]

commit 6bd4acb
Author: XeonMations <[email protected]>
Date:   Fri Dec 6 10:08:53 2024 +0200

    Dionae changes (BeeStation#11905)

    * Update nymph.dm

    * Update nymph.dm

commit 3ff3dc0
Author: ss13-beebot <[email protected]>
Date:   Fri Dec 6 00:14:48 2024 +0000

    Automatic changelog compile [ci skip]

commit 2bac87f
Author: ss13-beebot <[email protected]>
Date:   Thu Dec 5 17:16:08 2024 -0600

    Automatic changelog generation for PR BeeStation#11853 [ci skip]

commit 1ea461b
Author: Marshmellow105 <[email protected]>
Date:   Fri Dec 6 08:45:41 2024 +1000

    Ashwalker camp overhaul (BeeStation#11853)

    * limzor camp update

    * increases the dmm size from 20x20 to 22x22 to clean up edges

    * changes it to tgm by making a new map file and copying over the map

    * removes the dmm map I accidentally left in when I was turning the other one into tgm

    * the changes I just said (I also removed a bloodstain)

    * Update lavaland_surface_ash_walker1.dmm

commit a6fa231
Author: ss13-beebot <[email protected]>
Date:   Thu Dec 5 23:03:46 2024 +0000

    Automatic changelog compile [ci skip]

commit e43c0af
Author: ss13-beebot <[email protected]>
Date:   Thu Dec 5 16:52:37 2024 -0600

    Automatic changelog generation for PR BeeStation#11904 [ci skip]

commit 17b453a
Author: XeonMations <[email protected]>
Date:   Fri Dec 6 00:42:48 2024 +0200

    [Recoup] Genetics Cluwnes now have cures. (BeeStation#11904)

    * aaaa

    * Update dna_injector.dm

    * Update cluwne.dm

commit 933122d
Merge: 49b0844 f6552d5
Author: Szyszkrzyneczka <[email protected]>
Date:   Thu Dec 5 23:38:18 2024 +0100

    Merge remote-tracking branch 'upstream/master' into Future

commit 49b0844
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Nov 29 15:24:20 2024 +0100

    slight fixes

commit c0a3a0c
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Nov 29 14:56:20 2024 +0100

    Brings this pr up to speed

commit 335bd6e
Merge: 2d790a5 7ef3063
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Nov 29 14:01:46 2024 +0100

    Merge remote-tracking branch 'upstream/master' into Future

commit 2d790a5
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Nov 12 17:17:04 2024 +0100

    Resolves conflicts

commit 7b17bb4
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Nov 10 22:14:17 2024 +0100

    Everything is nice and dandy :)

commit 349b8a8
Merge: 2aff986 96e861c
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Nov 10 21:52:36 2024 +0100

    Merge remote-tracking branch 'upstream/master' into Future

commit 2aff986
Merge: af3e512 ddd3a7a
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Nov 10 21:49:17 2024 +0100

    Merge remote-tracking branch 'upstream/master' into Future

commit af3e512
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Nov 10 21:49:06 2024 +0100

    Requested changes

commit 36772e4
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Nov 8 12:29:31 2024 +0100

    Smhsmhsmhsmhsmh Tell me when you chance clockies

commit 00c6051
Merge: fc78ea6 5a6e7f6
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Nov 8 12:13:41 2024 +0100

    Merge remote-tracking branch 'upstream/master' into Future

commit fc78ea6
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Nov 6 20:44:08 2024 +0100

    Update EchoStation.dmm

commit c2a23f4
Merge: 9f1b6a4 914c9c7
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Nov 6 20:43:10 2024 +0100

    Merge remote-tracking branch 'upstream/master' into Future

commit 9f1b6a4
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 30 14:08:52 2024 +0100

    bleeeh (merge this pr I am tired of having to readd the stupid fucking books each time a map gets updated)

commit 367e250
Merge: be12cc1 2dc6c8a
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 30 13:53:12 2024 +0100

    Merge remote-tracking branch 'upstream/master' into Future

commit be12cc1
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Oct 27 17:22:27 2024 +0100

    reverts shock touch because i didnt notice whoopsies

commit 0a53ac1
Merge: 6bea488 4a5b0c3
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Oct 27 16:22:38 2024 +0100

    Merge remote-tracking branch 'upstream/master' into Future

commit 6bea488
Merge: aab52bc 6c3aab5
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Oct 27 16:07:26 2024 +0100

    Merge branch 'master' into Future

commit aab52bc
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Oct 25 14:58:18 2024 +0200

    Fixes the wizard issue

commit 03f95ca
Author: Szyszkrzyneczka <[email protected]>
Date:   Thu Oct 24 13:59:54 2024 +0200

    All done and set

    Should be good and dandy

commit 28a066f
Merge: fcf3ab6 6da493c
Author: Szyszkrzyneczka <[email protected]>
Date:   Thu Oct 24 13:49:43 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Future

commit fcf3ab6
Author: Szyszkrzyneczka <[email protected]>
Date:   Thu Oct 24 09:37:12 2024 +0200

    Fixes icons

    Everything should be dandy

commit ddb4876
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 23 09:54:00 2024 +0200

    Removes questionable code

    does anyone know where I can get missing sprites from....

commit ad8bfdf
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 22 09:22:50 2024 +0200

    makes things a little better

    idk what to do now

commit d591859
Author: Szyszkrzyneczka <[email protected]>
Date:   Mon Oct 21 17:44:06 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Future

commit 3cc9eed
Merge: c5f5dd0 11fcb63
Author: Szyszkrzyneczka <[email protected]>
Date:   Mon Oct 21 17:43:56 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Future

commit c5f5dd0
Author: Szyszkrzyneczka <[email protected]>
Date:   Mon Oct 21 17:43:44 2024 +0200

    Okay most code stuffs done

    Some spells still have icons missing, I will have to go through them

commit 3a6febc
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Oct 18 20:46:39 2024 +0200

    Whoopsie doodles forgot about this one

commit d65ad61
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Oct 18 19:52:59 2024 +0200

    CI please dont scream :(

commit b71680b
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Oct 18 19:20:59 2024 +0200

    Action buttons fully work teeheeeee

commit 11a320c
Merge: fd4f6da e6256a9
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Oct 18 15:04:49 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Future

commit fd4f6da
Author: Szyszkrzyneczka <[email protected]>
Date:   Fri Oct 18 14:58:53 2024 +0200

    antimagic finally works back

    yippie

commit c835770
Merge: 11b0a1a 386a881
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 15 22:17:02 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Future

commit 11b0a1a
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 15 22:16:47 2024 +0200

    Fixes a bunch of balooney that I did

    I haven't tested the changes, it's pretty late and I will do that when resolving conversations. Also removes span.dm I am not doing anything with that ever again, what a bunch of doohickey nonsense

commit 1bb816d
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 9 21:38:59 2024 +0200

    whuh

commit a22e3a6
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 9 21:37:44 2024 +0200

    Whoopsie daisies

    Ignore this teehee x3

commit a320f59
Merge: ee58795 9ea5db1
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 9 21:22:47 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Future

commit ee58795
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 9 17:16:55 2024 +0200

    This should be better

commit 6a6e812
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 9 17:09:02 2024 +0200

    Mansussy back at it again to ruin my life :sob:

commit e715303
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 9 16:52:23 2024 +0200

    prodding

commit 0d43855
Merge: a49e925 dc216e2
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Oct 9 16:38:32 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Future

commit a49e925
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 8 21:02:22 2024 +0200

    Shoddily makes clockies stupid slab work

commit b15b100
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 8 10:59:15 2024 +0200

    fixes mansussy icon not showing up proper

commit 226f49a
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 8 10:01:58 2024 +0200

    I hope this is it

    please work

commit 61dc425
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 8 09:14:17 2024 +0200

    is there a way to not have to make a singular commit to check if the test will shit itself or not

commit 1259fe1
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 8 09:03:33 2024 +0200

    please ci shut uppppp

commit ab969d0
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 8 08:46:04 2024 +0200

    Almost shuts the CI off

    Hopefully I can get to actual bugfixing now

commit c7c7f66
Author: Szyszkrzyneczka <[email protected]>
Date:   Mon Oct 7 14:35:20 2024 +0200

    Makes CI less screamy

commit 9979169
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Oct 6 18:58:08 2024 +0200

    Linters should be fine

    Only thing left is to clean up maps

commit 0da4bb4
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Oct 6 18:39:17 2024 +0200

    CI should scream less

commit 8a6c494
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Oct 6 13:30:18 2024 +0200

    Does stuff to make the CI scream less

    What the fuck is a proc helper reference!!!!

commit a6eca8c
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Oct 6 12:52:46 2024 +0200

    Catches up to the rest of the codebase

    why are you guys so fast

commit 45be435
Merge: 2a0c1cf a54bd3c
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Oct 6 11:42:24 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Future

commit 2a0c1cf
Author: Szyszkrzyneczka <[email protected]>
Date:   Sat Oct 5 18:11:38 2024 +0200

    Part two finished

    Now only thing left is bug fixing and merge conflict

    Current bugs to fix
    Clockwork slab empowerment (spells like kindle etc)
    Icons not being correct

commit 977b678
Author: Szyszkrzyneczka <[email protected]>
Date:   Tue Oct 1 18:44:26 2024 +0200

    100+ errors left

    time to port clockcult from yoggers

commit c1ed85d
Author: Szyszkrzyneczka <[email protected]>
Date:   Sun Sep 29 12:04:34 2024 +0200

    300+ erros

    new paradigm, closing the gates of hell

commit a5dc686
Author: Szyszkrzyneczka <[email protected]>
Date:   Wed Sep 25 17:34:45 2024 +0200

    Reduces the error count from >1000 down to <680

    I am still working on this

commit d5ce7fd
Author: Szyszkrzyneczka <[email protected]>
Date:   Thu Sep 19 18:20:02 2024 +0200

    Taken all the files from the base pr

    Second commit will remove all the errors
    In the meantime pretty please tell me if you people want anything else to go with this pr
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PowerfulBacon PowerfulBacon PowerfulBacon approved these changes

Assignees
No one assigned
Labels
Feature Fix Needs Testmerge Priority: High Refactor Sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@XeonMations @PowerfulBacon @Rukofamicom