Skip to content

bugfix: в шахтёрские стореджи нельзя было сувать их одежду + гпс #6820

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

Open
wants to merge 1 commit into
base: master220
Choose a base branch
from
+43 −17
Open

bugfix: в шахтёрские стореджи нельзя было сувать их одежду + гпс #6820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/map_files/Delta/Lavaland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4881,7 +4881,7 @@
/obj/machinery/alarm{
pixel_y = 22
},
/obj/machinery/suit_storage_unit/mining_medic,
/obj/machinery/suit_storage_unit/lavaland/mining_medic,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkblue"
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomZLevels/terrorspiders.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10044,7 +10044,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/UO71/eng)
"wG" = (
/obj/machinery/suit_storage_unit/mining,
/obj/machinery/suit_storage_unit/lavaland/mining,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/awaymission/UO71/mining)
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomZLevels/undergroundoutpost45.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10625,7 +10625,7 @@
/turf/simulated/floor/plating,
/area/awaymission/UO45/mining)
"wb" = (
/obj/machinery/suit_storage_unit/mining,
/obj/machinery/suit_storage_unit/lavaland/mining,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/awaymission/UO45/mining)
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/celestation/Lavaland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3941,7 +3941,7 @@
dir = 8;
id = "inf"
},
/obj/machinery/suit_storage_unit/mining_medic,
/obj/machinery/suit_storage_unit/lavaland/mining_medic,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkyellow"
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/cerestation/Lavaland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6681,7 +6681,7 @@
dir = 8;
id = "inf"
},
/obj/machinery/suit_storage_unit/mining_medic,
/obj/machinery/suit_storage_unit/lavaland/mining_medic,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkyellow"
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/coldcolony/Lavaland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2383,7 +2383,7 @@
},
/area/mine/living_quarters)
"wc" = (
/obj/machinery/suit_storage_unit/mining_medic,
/obj/machinery/suit_storage_unit/lavaland/mining_medic,
/obj/structure/fishingrodcabinet{
pixel_x = 32
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/generic/Lavaland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@
/turf/simulated/floor/plasteel,
/area/mine/production)
"dt" = (
/obj/machinery/suit_storage_unit/mining_medic,
/obj/machinery/suit_storage_unit/lavaland/mining_medic,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "darkblue"
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/nova/Lavaland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3773,7 +3773,7 @@
/obj/machinery/alarm{
pixel_y = 22
},
/obj/machinery/suit_storage_unit/mining_medic,
/obj/machinery/suit_storage_unit/lavaland/mining_medic,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkblue"
Expand Down
40 changes: 33 additions & 7 deletions code/game/machinery/suit_storage_unit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,20 @@
magboots_type = /obj/item/clothing/shoes/magboots/atmos
req_access = list(ACCESS_ATMOSPHERICS)

/obj/machinery/suit_storage_unit/mining
name = "mining suit storage unit"
suit_type = /obj/item/clothing/suit/space/hardsuit/mining
mask_type = /obj/item/clothing/mask/breath
req_access = list(ACCESS_MINING_STATION)

/obj/machinery/suit_storage_unit/lavaland
name = "mining suit storage unit"
suit_type = /obj/item/clothing/suit/hooded/explorer
mask_type = /obj/item/clothing/mask/gas/explorer
storage_type = /obj/item/gps/mining
req_access = list(ACCESS_MINING_STATION)

/obj/machinery/suit_storage_unit/mining_medic
/obj/machinery/suit_storage_unit/lavaland/mining
name = "mining suit storage unit"
suit_type = /obj/item/clothing/suit/space/hardsuit/mining
mask_type = /obj/item/clothing/mask/breath
req_access = list(ACCESS_MINING_STATION)

/obj/machinery/suit_storage_unit/lavaland/mining_medic
name = "mining medical suit storage unit"
suit_type = /obj/item/clothing/suit/hooded/explorer/mining
mask_type = /obj/item/clothing/mask/gas/mining_medic
Expand Down Expand Up @@ -794,3 +794,29 @@
helmet_type = /obj/item/clothing/head/helmet/space/eva/pirate/leader
mask_type = /obj/item/clothing/mask/gas
storage_type = /obj/item/tank/internals/oxygen

//special proc for mining related storages (because they don't just hold space suits)
/obj/machinery/suit_storage_unit/lavaland/store_item(obj/item/I, mob/user)
. = FALSE
if(panel_open)
return .
if((istype(I, /obj/item/clothing/suit/hooded/explorer) || istype(I, /obj/item/clothing/suit/space)) && !suit)
. = user.drop_transfer_item_to_loc(I, src)
if(.)
suit = I
else if(istype(I, /obj/item/clothing/head/helmet) && !helmet)
. = user.drop_transfer_item_to_loc(I, src)
if(.)
helmet = I
else if(istype(I, /obj/item/clothing/mask) && !mask)
. = user.drop_transfer_item_to_loc(I, src)
if(.)
mask = I
else if(istype(I, /obj/item/clothing/shoes/magboots) && !magboots)
. = user.drop_transfer_item_to_loc(I, src)
if(.)
magboots = I
else if((istype(I, /obj/item/tank) || istype(I, /obj/item/gps/mining)) && !storage)
. = user.drop_transfer_item_to_loc(I, src)
if(.)
storage = I
Copy link
Collaborator

Choose a reason for hiding this comment

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

Не нужно таких костылей. Можно вынести проверку костюма в отдельный прок и переопределить ее.

4 changes: 2 additions & 2 deletions code/game/objects/items/stacks/sheets/leather.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
/obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag, params)
if(!proximity_flag)
return
var/uplatable_armor = is_type_in_typecache(target, override_unplatable_armor_typecache)
if(uplatable_armor)
var/unplatable_armor = is_type_in_typecache(target, override_unplatable_armor_typecache)
if(unplatable_armor)
balloon_alert(user, "нельзя улучшить!")
return
var/platable_armor_with_icon = is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache)
Expand Down