Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@tattax
Copy link
Contributor

@tattax tattax commented May 28, 2023

Document the changes in your pull request

some things work again

temporarily removes observe button cause i was solving that but we have bigger problems

closes: #19028
closes: #19022
closes: #19027
closes: #19019
closes: #19018
closes: #19015
closes: #19049
closes: #19045
closes: #19020

also cleans up the internals icon that was supposed to be removed on the original pr
🆑
bugfix: fixed some antag bugs (i.e clockcult and heretic)
bugfix: fixed some action bugs (i.e jumpboots and quickbinds) + correct a typing mistakes that caused a status effect bug
/:cl:

@tattax tattax requested a review from a team as a code owner May 28, 2023 00:27
@Yogbot-13 Yogbot-13 added the Fix This fixes an issue. Please link issues in fix PRs label May 28, 2023
#define ui_internal "EAST-1:28,CENTER:17"
#define ui_mood "EAST-1:28,CENTER-4:10"
#define ui_internal "EAST-1:28,CENTER+1:17"
#define ui_mood "EAST-1:28,CENTER:17"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

moves mood up since we cleaned space

/// Call by name proc reference, checks if the proc exists on this type or as a global proc
#define PROC_REF(X) (.proc/##X)
/// Call by name verb references, checks if the verb exists on either this type or as a global verb.
#define VERB_REF(X) (.verb/##X)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

needed for 515 but wasn't ported before

return FALSE
return ..()

/datum/action/item_action/clock/toggle_visor
Copy link
Contributor Author

Choose a reason for hiding this comment

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

remove this in favor of the cooldown one

if(user && !(src in user.held_items) && slab_ability?.owner) //if we happen to check and we AREN'T in user's hands, remove whatever ability we have
/obj/item/clockwork/slab/proc/check_on_mob(mob/user, slot)
if(!user)
CRASH("No user on dropped slab.")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

for better logging but if we see some edge cases i'll remove in a future pr

@github-actions github-actions bot added the Admin This PR affects administrators label May 28, 2023
Copy link
Contributor

@ToasterBiome ToasterBiome left a comment

Choose a reason for hiding this comment

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

yeah this is totally not gonna break more shit

@ToasterBiome ToasterBiome merged commit 169d320 into yogstation13:master May 29, 2023
Yogbot-13 added a commit that referenced this pull request May 29, 2023
Blundir pushed a commit to Blundir/Yogstation that referenced this pull request Jul 4, 2023
* new

* 2

* e²

* e³

* e£

* glang

* e¢

* e¬

* e

* e12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Admin This PR affects administrators Fix This fixes an issue. Please link issues in fix PRs

Projects

None yet

3 participants