Skip to content

Добавлены продвинутые магбутсы в офис СЕ, которые не замедляют #13755

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.

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

Closed
wants to merge 16 commits into from
Closed
8 changes: 8 additions & 0 deletions code/modules/clothing/shoes/magboots.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,11 @@

/obj/item/clothing/shoes/magboots/negates_gravity()
return flags & NOSLIP

/obj/item/clothing/shoes/magboots/ce
name = "advanced magboots"
desc = "Advanced magnetic boots designed for Chief Engineers. They do not slow down the user when activated."
icon_state = "advmag0"
magboot_state = "advmag"
slowdown_off = -1
origin_tech = "materials=5;magnets=5;engineering=5"
2 changes: 1 addition & 1 deletion code/modules/clothing/spacesuits/rig/rig.dm
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@

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

Expand Down
Binary file modified icons/mob/feet.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion maps/boxstation/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -15670,7 +15670,7 @@
/area/station/security/lobby)
"aAZ" = (
/obj/structure/rack,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots/ce,
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/mask/breath,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
Expand Down
2 changes: 1 addition & 1 deletion maps/delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -63128,7 +63128,7 @@
/area/station/rnd/hallway)
"lzo" = (
/obj/structure/rack,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots/ce,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
Expand Down
2 changes: 1 addition & 1 deletion maps/falcon/falcon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20732,7 +20732,7 @@
/area/station/solar/auxstarboard)
"kGV" = (
/obj/structure/rack,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots/ce,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
Expand Down
2 changes: 1 addition & 1 deletion maps/gamma/gamma.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12584,7 +12584,7 @@
network = list("SS13","Engineering")
},
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots/ce,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
/obj/item/clothing/mask/breath,
/turf/simulated/floor{
Expand Down
2 changes: 1 addition & 1 deletion maps/prometheus/prometheus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -57472,7 +57472,7 @@
network = list("SS13","Engineering")
},
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots/ce,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
/obj/item/clothing/mask/breath,
/turf/simulated/floor{
Expand Down
70 changes: 35 additions & 35 deletions maps/stroechka/stroechka.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -634,8 +634,8 @@
/area/station/engineering/engine)
"bn" = (
/obj/machinery/door/airlock/external{
name = "Escape Airlock";
dir = 4
dir = 4;
name = "Escape Airlock"
},
/obj/machinery/door/firedoor{
dir = 4
Expand Down Expand Up @@ -1242,9 +1242,9 @@
dir = 4
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 4;
name = "Engineering largecell apc right";
custom_smartlight_preset = "Engineering";
pixel_x = 27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -1677,9 +1677,9 @@
dir = 8
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
name = "Engineering largecell apc down";
pixel_y = -27;
custom_smartlight_preset = "Engineering"
pixel_y = -27
},
/turf/simulated/floor/plating,
/area/station/maintenance/auxsolarport)
Expand Down Expand Up @@ -1871,9 +1871,9 @@
icon_state = "bot"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Cargo";
dir = 4;
name = "Cargo largecell apc right";
custom_smartlight_preset = "Cargo";
pixel_x = 27
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -2320,8 +2320,8 @@
/area/station/hallway/secondary/exit)
"ee" = (
/obj/machinery/door/airlock/glass{
name = "Escape Hall";
dir = 4
dir = 4;
name = "Escape Hall"
},
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -2938,11 +2938,11 @@
},
/obj/machinery/door/airlock/mining{
autoclose = 0;
dir = 4;
frequency = 1379;
id_tag = "recucler_airlock_interior";
locked = 1;
name = "Recucler Internal Airlock";
dir = 4
name = "Recucler Internal Airlock"
},
/obj/machinery/access_button{
command = "cycle_interior";
Expand Down Expand Up @@ -3662,9 +3662,9 @@
/area/space)
"hK" = (
/obj/machinery/door/airlock/research/glass{
dir = 4;
name = "Mech Bay";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -3838,10 +3838,10 @@
icon_state = "delivery"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "RnD";
dir = 1;
name = "RnD largecell apc top";
pixel_y = 27;
custom_smartlight_preset = "RnD"
pixel_y = 27
},
/turf/simulated/floor,
/area/station/rnd/chargebay)
Expand Down Expand Up @@ -4433,10 +4433,10 @@
icon_state = "damaged_4"
},
/obj/machinery/power/apc{
name = "Engineering left APC";
custom_smartlight_preset = "Engineering";
pixel_x = -27;
dir = 8
dir = 8;
name = "Engineering left APC";
pixel_x = -27
},
/turf/simulated/floor/plating,
/area/station/maintenance/incinerator)
Expand Down Expand Up @@ -4529,9 +4529,9 @@
pixel_y = 5
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 4;
name = "Engineering largecell apc right";
custom_smartlight_preset = "Engineering";
pixel_x = 27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -5312,10 +5312,10 @@
/area/station/hallway/secondary/arrival)
"vT" = (
/obj/machinery/door/airlock/external{
dir = 4;
dock_tag = "arrival_escape";
locked = 1;
name = "Escape Airlock";
dir = 4
name = "Escape Airlock"
},
/obj/effect/decal/turf_decal/alpha/yellow{
icon_state = "delivery"
Expand Down Expand Up @@ -5584,9 +5584,9 @@
/area/station/engineering/equip)
"yW" = (
/obj/machinery/door/airlock/engineering/glass{
dir = 4;
name = "Engineering EVA";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -6103,7 +6103,7 @@
"Cw" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots/ce,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
/obj/item/clothing/mask/breath,
/obj/item/weapon/storage/firstaid/small_firstaid_kit/space,
Expand Down Expand Up @@ -6310,9 +6310,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 4;
name = "Engineering largecell apc right";
custom_smartlight_preset = "Engineering";
pixel_x = 27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -6372,8 +6372,8 @@
/area/station/hallway/secondary/arrival)
"DJ" = (
/obj/machinery/door/airlock/glass{
name = "Escape Hall";
dir = 4
dir = 4;
name = "Escape Hall"
},
/obj/machinery/door/firedoor{
dir = 4
Expand Down Expand Up @@ -6517,9 +6517,9 @@
icon_state = "warn"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 8;
name = "Engineering largecell apc left";
custom_smartlight_preset = "Engineering";
pixel_x = -27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -6664,9 +6664,9 @@
dir = 4
},
/obj/machinery/door/airlock/engineering/glass{
dir = 4;
name = "Engine Room";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/effect/decal/turf_decal/alpha/yellow{
icon_state = "delivery"
Expand Down Expand Up @@ -6932,9 +6932,9 @@
/area/station/hallway/primary/central)
"GM" = (
/obj/machinery/door/airlock/research/glass{
dir = 4;
name = "Research and Development";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -8466,9 +8466,9 @@
icon_state = "bot"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 4;
name = "Engineering largecell apc right";
custom_smartlight_preset = "Engineering";
pixel_x = 27
},
/turf/simulated/floor{
Expand All @@ -8491,9 +8491,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "RnD";
dir = 4;
name = "RnD largecell apc right";
custom_smartlight_preset = "RnD";
pixel_x = 27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -8943,9 +8943,9 @@
/area/shuttle/supply/station)
"Wn" = (
/obj/machinery/door/airlock/engineering/glass{
dir = 4;
name = "Engineering";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/structure/cable{
d1 = 4;
Expand Down
Loading