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

Fixes trash carts not working with fultons #5664

Merged
merged 1 commit into from
Feb 10, 2024
Merged

Fixes trash carts not working with fultons #5664

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
3 changes: 1 addition & 2 deletions code/game/objects/structures/crates_lockers/crates.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
icon_closed = "closed_supply"

/obj/structure/closet/crate/trashcart
name = "\improper trash cart"
name = "trash cart"
desc = "A heavy, metal trashcart with wheels."
icon_state = "closed_trashcart"
icon_opened = "open_trashcart"
Expand Down Expand Up @@ -437,4 +437,3 @@
density = TRUE
icon_opened = "open_mcart_y"
icon_closed = "closed_mcart_y"

4 changes: 3 additions & 1 deletion code/modules/cm_marines/dropship_equipment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,9 +1144,11 @@

var/list/possible_fultons = get_targets()

var/obj/item/stack/fulton/fult = possible_fultons[fulton_choice]
if(!fulton_choice)
return
// Strip any \proper or \improper in order to match the entry in possible_fultons.
fulton_choice = strip_improper(fulton_choice)
var/obj/item/stack/fulton/fult = possible_fultons[fulton_choice]

if(!ship_base) //system was uninstalled midway
return
Expand Down
Loading