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

turns oxygentank into fueltank fixes issue #5512 #5524

Merged
merged 2 commits into from
Jan 25, 2024
Merged

turns oxygentank into fueltank fixes issue #5512 #5524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e290e23
turns oxigentank into fueltank
uuuuhuuuu Jan 23, 2024
e626f2d
catches one fallen apple
uuuuhuuuu Jan 23, 2024
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
14 changes: 7 additions & 7 deletions code/game/objects/structures/reagent_dispensers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,6 @@
icon_state = "ammoniatank"
chemical = "ammonia"

/obj/structure/reagent_dispensers/oxygentank
name = "oxygentank"
desc = "An oxygen tank"
icon = 'icons/obj/objects.dmi'
icon_state = "oxygentank"
chemical = "oxygen"

/obj/structure/reagent_dispensers/acidtank
name = "sulfuric acid tank"
desc = "A sulfuric acid tank"
Expand Down Expand Up @@ -394,6 +387,13 @@
icon_state = "hydrogentank"
chemical = "hydrogen"

/obj/structure/reagent_dispensers/fueltank/oxygentank
name = "oxygentank"
desc = "An oxygen tank"
icon = 'icons/obj/objects.dmi'
icon_state = "oxygentank"
chemical = "oxygen"

/obj/structure/reagent_dispensers/fueltank/custom
name = "reagent tank"
desc = "A reagent tank, typically used to store large quantities of chemicals."
Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24439,7 +24439,7 @@
/area/fiorina/tumor/ice_lab)
"oIg" = (
/obj/structure/platform,
/obj/structure/reagent_dispensers/oxygentank{
/obj/structure/reagent_dispensers/fueltank/oxygentank{
layer = 2.6
},
/turf/open/floor/prison,
Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/FOP_v3_Sciannex/sprinkles/30.repairpanelslz.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
},
/area/template_noop)
"H" = (
/obj/structure/reagent_dispensers/oxygentank,
/obj/structure/reagent_dispensers/fueltank/oxygentank,
/turf/open/space,
/area/template_noop)
"I" = (
Expand Down
4 changes: 2 additions & 2 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79268,7 +79268,7 @@
},
/area/almayer/medical/lower_medical_lobby)
"xgm" = (
/obj/structure/reagent_dispensers/oxygentank,
/obj/structure/reagent_dispensers/fueltank/oxygentank,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -80720,7 +80720,7 @@
},
/area/almayer/hull/upper_hull/u_m_p)
"xHS" = (
/obj/structure/reagent_dispensers/oxygentank{
/obj/structure/reagent_dispensers/fueltank/oxygentank{
anchored = 1
},
/obj/effect/decal/warning_stripes{
Expand Down
Loading