Skip to content

Commit

Permalink
trash
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreML committed Feb 4, 2024
1 parent 2657502 commit 800aa73
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions code/game/objects/structures/crates_lockers/crates.dm
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
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

0 comments on commit 800aa73

Please sign in to comment.