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

ноу слип ботинки больше не защищают от порывов ветра #10432

Merged
merged 4 commits into from
Jan 4, 2023
Merged

ноу слип ботинки больше не защищают от порывов ветра #10432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f709b98
super mega nerf
simb11 Nov 27, 2022
bd8ef61
12345
simb11 Dec 1, 2022
5a6cba5
Revert "12345"
simb11 Dec 1, 2022
15157bc
Update code/modules/clothing/shoes/magboots.dm
simb11 Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions code/__DEFINES/flags.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,18 @@ var/global/list/bitflags = list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204

#define NOSLIP (1<<18) // Prevents from slipping on wet floors, in space etc.

#define NOATTACKANIMATION (1<<19) // Removes attack animation
#define AIR_FLOW_PROTECT (1<<19) // Protects against air flow.
Copy link
Contributor

Choose a reason for hiding this comment

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

@KIBORG04 заставим сделать слип флаги разные?

Copy link
Member

Choose a reason for hiding this comment

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

давай

Copy link
Member

Choose a reason for hiding this comment

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

но он же это и так сделал?

Copy link
Contributor

Choose a reason for hiding this comment

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

я имею ввиду что-то типо

shoes.slip_protection = SLIP_AIRFLOW|SLIP_SLIPPERY

if(shoes.slip_protection & SLIP_AIRFLOW)
   no slip

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Сделал, вроде как.

Copy link
Contributor

Choose a reason for hiding this comment

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

абсолютно нет...

Copy link
Member

Choose a reason for hiding this comment

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

Я может чего-то не понял, но симбака же сделал?... Или тут весь прикол в новой переменной slip_protection ???


#define NOATTACKANIMATION (1<<20) // Removes attack animation

// objects hear flags
// HEAR_PASS_SAY, HEAR_TA_SAY is temporary solution for optimisations reasons before we do hear() code refactoring
#define HEAR_TALK (1<<20) // like old tg HEAR_1, marks objects with hear_talk()
#define HEAR_PASS_SAY (1<<21) // temp for say code, for objects that need to pass SAY to inner mobs through get_listeners()
#define HEAR_TA_SAY (1<<22) // temp for talking_atoms
#define HEAR_TALK (1<<21) // like old tg HEAR_1, marks objects with hear_talk()
#define HEAR_PASS_SAY (1<<22) // temp for say code, for objects that need to pass SAY to inner mobs through get_listeners()
#define HEAR_TA_SAY (1<<23) // temp for talking_atoms

#define IN_INVENTORY (1<<23)
#define IN_STORAGE (1<<23) // reuse of last bit we have
#define IN_INVENTORY (1<<24)
#define IN_STORAGE (1<<24) // reuse of last bit we have
Comment on lines +66 to +67
Copy link
Member

Choose a reason for hiding this comment

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

aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

Copy link
Member

Choose a reason for hiding this comment

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

Че-то разве сломалось

Copy link
Member

Choose a reason for hiding this comment

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

Технически, в мастере, нет. Но на локалке я сейчас минут 20 искал, почему флаги не включаются, ведь 24 бита у бьенда не существует...


/* Secondary atom flags, for the flags_2 var, denoted with a _2 */
#define HOLOGRAM_2 (1<<0)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/atmospheric/ZAS/Airflow.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ Contains helper procs for airflow, handled in /connection_group.
return

/mob/living/carbon/human/airflow_stun()
if(shoes?.flags & NOSLIP)
if(shoes?.flags & AIR_FLOW_PROTECT)
return FALSE
if(wear_suit?.flags & NOSLIP)
if(wear_suit?.flags & AIR_FLOW_PROTECT)
return FALSE
if(HAS_TRAIT(src, TRAIT_FAT))
to_chat(src, "<span class='notice'>Air suddenly rushes past you!</span>")
Expand All @@ -64,9 +64,9 @@ Contains helper procs for airflow, handled in /connection_group.
return FALSE

/mob/living/carbon/human/check_airflow_movable(n)
if(shoes && (shoes.flags & NOSLIP))
if(shoes && (shoes.flags & AIR_FLOW_PROTECT))
return FALSE
if(wear_suit && (wear_suit.flags & NOSLIP))
if(wear_suit && (wear_suit.flags & AIR_FLOW_PROTECT))
return FALSE
return ..()

Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/shoes/magboots.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

/obj/item/clothing/shoes/magboots/attack_self(mob/user)
if(magpulse)
flags &= ~NOSLIP
flags &= ~NOSLIP | AIR_FLOW_PROTECT
slowdown = SHOES_SLOWDOWN
magpulse = 0
icon_state = "[magboot_state]0"
to_chat(user, "You disable the mag-pulse traction system.")
else
flags |= NOSLIP
flags |= NOSLIP | AIR_FLOW_PROTECT
slowdown = slowdown_off
magpulse = 1
icon_state = "[magboot_state]1"
Expand All @@ -29,7 +29,7 @@
/obj/item/clothing/shoes/magboots/examine(mob/user)
..()
var/state = "disabled"
if(src.flags & NOSLIP)
if(src.flags & (NOSLIP | AIR_FLOW_PROTECT))
state = "enabled"
to_chat(user, "Its mag-pulse traction system appears to be [state].")

Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/shoes/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
desc = "A pair of running shoes. Excellent for running and even better for smashing skulls."
icon_state = "s-ninja"
permeability_coefficient = 0.01
flags = NOSLIP
flags = NOSLIP | AIR_FLOW_PROTECT
siemens_coefficient = 0.2

cold_protection = LEGS
Expand Down Expand Up @@ -200,12 +200,12 @@
name = "gorlex magboots"
icon_state = "syndiemag0"
magboot_state = "syndiemag"
slowdown_off = 0
slowdown_off = 1

/obj/item/clothing/shoes/magboots/ert
name = "advanced magboots"
desc = "A pair of advanced magboots designed specifically for ERT."
slowdown_off = 0
slowdown_off = 1
icon_state = "advmag0"
magboot_state = "advmag"

Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/spacesuits/rig/rig.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,13 +478,13 @@
H.update_gravity(H.mob_has_gravity())

/obj/item/clothing/suit/space/rig/proc/enable_magpulse(mob/user)
flags |= NOSLIP
flags |= NOSLIP | AIR_FLOW_PROTECT
slowdown += boots.slowdown_off
magpulse = TRUE
to_chat(user, "You enable \the [src] the mag-pulse traction system.")

/obj/item/clothing/suit/space/rig/proc/disable_magpulse(mob/user)
flags &= ~NOSLIP
flags &= ~NOSLIP | AIR_FLOW_PROTECT
slowdown = initial(slowdown)
magpulse = FALSE
to_chat(user, "You disable \the [src] the mag-pulse traction system.")
Expand Down